From 811f3165cc302850de65628ffb4e52ad35714359 Mon Sep 17 00:00:00 2001
From: Kevin Aleman <kaleman960@gmail.com>
Date: Tue, 11 Jun 2024 07:29:11 -0600
Subject: [PATCH 01/94] fix: OTR conversation closes automatically when any of
 the peers goes offline (#32430)

---
 apps/meteor/app/otr/client/OTR.ts      | 10 ++++++
 apps/meteor/app/otr/client/OTRRoom.ts  | 45 ++++++++++++++++++++++++++
 apps/meteor/app/otr/client/events.ts   |  7 ++++
 apps/meteor/app/otr/client/index.ts    |  1 +
 packages/i18n/src/locales/en.i18n.json |  1 +
 5 files changed, 64 insertions(+)
 create mode 100644 apps/meteor/app/otr/client/events.ts

diff --git a/apps/meteor/app/otr/client/OTR.ts b/apps/meteor/app/otr/client/OTR.ts
index a855381bd9c0..9f3eea155384 100644
--- a/apps/meteor/app/otr/client/OTR.ts
+++ b/apps/meteor/app/otr/client/OTR.ts
@@ -24,6 +24,16 @@ class OTR implements IOTR {
 		this.instancesByRoomId[rid] = otrRoom;
 		return this.instancesByRoomId[rid];
 	}
+
+	closeAllInstances(): void {
+		// Resets state, but doesnt emit events
+		// Other party should receive event and fire events
+		Object.values(this.instancesByRoomId).forEach((instance) => {
+			instance.softReset();
+		});
+
+		this.instancesByRoomId = {};
+	}
 }
 
 export default new OTR();
diff --git a/apps/meteor/app/otr/client/OTRRoom.ts b/apps/meteor/app/otr/client/OTRRoom.ts
index 8899de13b190..ea5dc86b8319 100644
--- a/apps/meteor/app/otr/client/OTRRoom.ts
+++ b/apps/meteor/app/otr/client/OTRRoom.ts
@@ -1,4 +1,5 @@
 import type { IRoom, IMessage, IUser } from '@rocket.chat/core-typings';
+import { UserStatus } from '@rocket.chat/core-typings';
 import { Random } from '@rocket.chat/random';
 import EJSON from 'ejson';
 import { Meteor } from 'meteor/meteor';
@@ -7,6 +8,7 @@ import { Tracker } from 'meteor/tracker';
 
 import GenericModal from '../../../client/components/GenericModal';
 import { imperativeModal } from '../../../client/lib/imperativeModal';
+import type { UserPresence } from '../../../client/lib/presence';
 import { Presence } from '../../../client/lib/presence';
 import { dispatchToastMessage } from '../../../client/lib/toast';
 import { getUidDirectMessage } from '../../../client/lib/utils/getUidDirectMessage';
@@ -47,6 +49,8 @@ export class OTRRoom implements IOTRRoom {
 
 	private isFirstOTR: boolean;
 
+	private onPresenceEventHook: (event: UserPresence | undefined) => void;
+
 	protected constructor(uid: IUser['_id'], rid: IRoom['_id'], peerId: IUser['_id']) {
 		this._userId = uid;
 		this._roomId = rid;
@@ -54,6 +58,7 @@ export class OTRRoom implements IOTRRoom {
 		this._sessionKey = null;
 		this.peerId = peerId;
 		this.isFirstOTR = true;
+		this.onPresenceEventHook = this.onPresenceEvent.bind(this);
 	}
 
 	public static create(uid: IUser['_id'], rid: IRoom['_id']): OTRRoom | undefined {
@@ -110,6 +115,35 @@ export class OTRRoom implements IOTRRoom {
 		}
 	}
 
+	onPresenceEvent(event: UserPresence | undefined): void {
+		if (!event) {
+			return;
+		}
+		if (event.status !== UserStatus.OFFLINE) {
+			return;
+		}
+		console.warn(`OTR Room ${this._roomId} ended because ${this.peerId} went offline`);
+		this.end();
+
+		imperativeModal.open({
+			component: GenericModal,
+			props: {
+				variant: 'warning',
+				title: t('OTR'),
+				children: t('OTR_Session_ended_other_user_went_offline', { username: event.username }),
+				confirmText: t('Ok'),
+				onClose: imperativeModal.close,
+				onConfirm: imperativeModal.close,
+			},
+		});
+	}
+
+	// Starts listening to other user's status changes and end OTR if any of the Users goes offline
+	// this should be called in 2 places: on acknowledge (meaning user accepted OTR) or on establish (meaning user initiated OTR)
+	listenToUserStatus(): void {
+		Presence.listen(this.peerId, this.onPresenceEventHook);
+	}
+
 	acknowledge(): void {
 		void sdk.rest.post('/v1/statistics.telemetry', { params: [{ eventName: 'otrStats', timestamp: Date.now(), rid: this._roomId }] });
 
@@ -137,10 +171,19 @@ export class OTRRoom implements IOTRRoom {
 		]);
 	}
 
+	softReset(): void {
+		this.isFirstOTR = true;
+		this.setState(OtrRoomState.NOT_STARTED);
+		this._keyPair = null;
+		this._exportedPublicKey = {};
+		this._sessionKey = null;
+	}
+
 	end(): void {
 		this.isFirstOTR = true;
 		this.reset();
 		this.setState(OtrRoomState.NOT_STARTED);
+		Presence.stop(this.peerId, this.onPresenceEventHook);
 		sdk.publish('notify-user', [
 			`${this.peerId}/otr`,
 			'end',
@@ -285,6 +328,7 @@ export class OTRRoom implements IOTRRoom {
 						setTimeout(async () => {
 							this.setState(OtrRoomState.ESTABLISHED);
 							this.acknowledge();
+							this.listenToUserStatus();
 
 							if (data.refresh) {
 								await sdk.rest.post('/v1/chat.otr', {
@@ -362,6 +406,7 @@ export class OTRRoom implements IOTRRoom {
 					this.setState(OtrRoomState.ESTABLISHED);
 
 					if (this.isFirstOTR) {
+						this.listenToUserStatus();
 						await sdk.rest.post('/v1/chat.otr', {
 							roomId: this._roomId,
 							type: otrSystemMessages.USER_JOINED_OTR,
diff --git a/apps/meteor/app/otr/client/events.ts b/apps/meteor/app/otr/client/events.ts
new file mode 100644
index 000000000000..9ff84c465157
--- /dev/null
+++ b/apps/meteor/app/otr/client/events.ts
@@ -0,0 +1,7 @@
+import { Accounts } from 'meteor/accounts-base';
+
+import OTR from './OTR';
+
+Accounts.onLogout(() => {
+	OTR.closeAllInstances();
+});
diff --git a/apps/meteor/app/otr/client/index.ts b/apps/meteor/app/otr/client/index.ts
index 74fea3c003e8..fac7407f54fa 100644
--- a/apps/meteor/app/otr/client/index.ts
+++ b/apps/meteor/app/otr/client/index.ts
@@ -1,3 +1,4 @@
 import './OTRRoom';
 import './OTR';
 import './messageTypes';
+import './events';
diff --git a/packages/i18n/src/locales/en.i18n.json b/packages/i18n/src/locales/en.i18n.json
index b022a4bbe808..9c90020d94d0 100644
--- a/packages/i18n/src/locales/en.i18n.json
+++ b/packages/i18n/src/locales/en.i18n.json
@@ -4070,6 +4070,7 @@
   "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_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",

From 209ea9f2c151ea1ffb5ab4d4c14bb78521cd9b4b Mon Sep 17 00:00:00 2001
From: Matheus Barbosa Silva
 <36537004+matheusbsilva137@users.noreply.github.com>
Date: Tue, 11 Jun 2024 12:27:25 -0300
Subject: [PATCH 02/94] regression: Disable animation on image gallery
 pagination transition (#32581)

---
 apps/meteor/client/components/ImageGallery/ImageGallery.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/meteor/client/components/ImageGallery/ImageGallery.tsx b/apps/meteor/client/components/ImageGallery/ImageGallery.tsx
index 0fb31c5a2560..8dd69ab8fc25 100644
--- a/apps/meteor/client/components/ImageGallery/ImageGallery.tsx
+++ b/apps/meteor/client/components/ImageGallery/ImageGallery.tsx
@@ -176,7 +176,7 @@ export const ImageGallery = ({ images, onClose, loadMore }: { images: IUpload[];
 						modules={[Navigation, Zoom, Keyboard, A11y]}
 						onInit={(swiper) => setSwiperInst(swiper)}
 						onSlidesGridLengthChange={(swiper) => {
-							swiper.slideTo(images.length - gridSize, 2000);
+							swiper.slideTo(images.length - gridSize, 0);
 							setGridSize(images.length);
 						}}
 						onReachBeginning={loadMore}

From 108ec7f1a72ee344b0db61d52f61b9d8c0fa3563 Mon Sep 17 00:00:00 2001
From: Martin Schoeler <martin.schoeler@rocket.chat>
Date: Tue, 11 Jun 2024 15:05:39 -0300
Subject: [PATCH 03/94] fix(Omnichannel): nonstop sound on current chats using
 continuous notifications (#32572)

---
 .changeset/thin-suns-invent.md                              | 5 +++++
 .../client/views/room/body/hooks/useUnreadMessages.ts       | 6 ++++--
 2 files changed, 9 insertions(+), 2 deletions(-)
 create mode 100644 .changeset/thin-suns-invent.md

diff --git a/.changeset/thin-suns-invent.md b/.changeset/thin-suns-invent.md
new file mode 100644
index 000000000000..945f44420797
--- /dev/null
+++ b/.changeset/thin-suns-invent.md
@@ -0,0 +1,5 @@
+---
+"@rocket.chat/meteor": patch
+---
+
+Fixes issues causing nonstop sound notification when taking a chat from the `Current Chats` view
diff --git a/apps/meteor/client/views/room/body/hooks/useUnreadMessages.ts b/apps/meteor/client/views/room/body/hooks/useUnreadMessages.ts
index 5e74164b7882..343b9cb88a98 100644
--- a/apps/meteor/client/views/room/body/hooks/useUnreadMessages.ts
+++ b/apps/meteor/client/views/room/body/hooks/useUnreadMessages.ts
@@ -93,9 +93,11 @@ export const useHandleUnread = (
 	const debouncedReadMessageRead = useMemo(
 		() =>
 			withDebouncing({ wait: 500 })(() => {
-				chat.readStateManager.attemptMarkAsRead();
+				if (subscribed) {
+					chat.readStateManager.attemptMarkAsRead();
+				}
 			}),
-		[chat.readStateManager],
+		[chat.readStateManager, subscribed],
 	);
 
 	useEffect(

From c4e59b9f5853478f9fa7bbd16b8c1b8b3487f2c4 Mon Sep 17 00:00:00 2001
From: csuadev <72958726+csuadev@users.noreply.github.com>
Date: Tue, 11 Jun 2024 22:18:53 +0200
Subject: [PATCH 04/94] test: Add Omnichannel Business Hours E2E tests (#32303)

---
 .../omnichannel-business-hours.spec.ts        | 139 ++++++++++++++++++
 apps/meteor/tests/e2e/page-objects/index.ts   |   1 +
 .../omnichannel-business-hours.ts             |  67 +++++++++
 .../e2e/utils/omnichannel/businessHours.ts    |  47 ++++++
 4 files changed, 254 insertions(+)
 create mode 100644 apps/meteor/tests/e2e/omnichannel/omnichannel-business-hours.spec.ts
 create mode 100644 apps/meteor/tests/e2e/page-objects/omnichannel-business-hours.ts
 create mode 100644 apps/meteor/tests/e2e/utils/omnichannel/businessHours.ts

diff --git a/apps/meteor/tests/e2e/omnichannel/omnichannel-business-hours.spec.ts b/apps/meteor/tests/e2e/omnichannel/omnichannel-business-hours.spec.ts
new file mode 100644
index 000000000000..2c5dc162e509
--- /dev/null
+++ b/apps/meteor/tests/e2e/omnichannel/omnichannel-business-hours.spec.ts
@@ -0,0 +1,139 @@
+import { faker } from '@faker-js/faker';
+import type { Page } from '@playwright/test';
+
+import { IS_EE } from '../config/constants';
+import { Users } from '../fixtures/userStates';
+import { OmnichannelBusinessHours } from '../page-objects';
+import { createAgent } from '../utils/omnichannel/agents';
+import { createBusinessHour } from '../utils/omnichannel/businessHours';
+import { createDepartment } from '../utils/omnichannel/departments';
+import { test, expect } from '../utils/test';
+
+test.use({ storageState: Users.admin.state });
+
+test.describe('OC - Business Hours', () => {
+	test.skip(!IS_EE, 'OC - Manage Business Hours > Enterprise Edition Only');
+
+	let poOmnichannelBusinessHours: OmnichannelBusinessHours;
+	let department: Awaited<ReturnType<typeof createDepartment>>;
+	let department2: Awaited<ReturnType<typeof createDepartment>>;
+	let agent: Awaited<ReturnType<typeof createAgent>>;
+
+	test.beforeAll(async ({ api }) => {
+		department = await createDepartment(api);
+		department2 = await createDepartment(api);
+		agent = await createAgent(api, 'user2');
+		await api.post('/settings/Livechat_enable_business_hours', { value: true }).then((res) => expect(res.status()).toBe(200));
+		await api.post('/settings/Livechat_business_hour_type', { value: 'Multiple' }).then((res) => expect(res.status()).toBe(200));
+	});
+
+	test.afterAll(async ({ api }) => {
+		await department.delete();
+		await department2.delete();
+		await agent.delete();
+		await api.post('/settings/Livechat_enable_business_hours', { value: false }).then((res) => expect(res.status()).toBe(200));
+		await api.post('/settings/Livechat_business_hour_type', { value: 'Single' }).then((res) => expect(res.status()).toBe(200));
+	});
+
+	test.beforeEach(async ({ page }: { page: Page }) => {
+		poOmnichannelBusinessHours = new OmnichannelBusinessHours(page);
+	});
+
+	test('OC - Manage Business Hours - Create Business Hours', async ({ page }) => {
+		const BHName = faker.string.uuid();
+
+		await page.goto('/omnichannel');
+		await poOmnichannelBusinessHours.sidenav.linkBusinessHours.click();
+
+		await test.step('expect correct form default state', async () => {
+			await poOmnichannelBusinessHours.btnCreateBusinessHour.click();
+			await poOmnichannelBusinessHours.btnBack.click();
+			await expect(poOmnichannelBusinessHours.inputSearch).toBeVisible();
+		});
+
+		await test.step('expect to create a new business hours', async () => {
+			await poOmnichannelBusinessHours.btnCreateBusinessHour.click();
+			await poOmnichannelBusinessHours.inputName.fill(BHName);
+			await poOmnichannelBusinessHours.selectDepartment(department.data);
+			await poOmnichannelBusinessHours.btnSave.click();
+
+			await test.step('expect business hours to have been created', async () => {
+				await poOmnichannelBusinessHours.search(BHName);
+				await expect(poOmnichannelBusinessHours.findRowByName(BHName)).toBeVisible();
+			});
+		});
+
+		await test.step('expect to be able to delete business hours', async () => {
+			await test.step('expect to be able to cancel delete', async () => {
+				await poOmnichannelBusinessHours.btnDeleteByName(BHName).click();
+				await expect(poOmnichannelBusinessHours.confirmDeleteModal).toBeVisible();
+				await poOmnichannelBusinessHours.btnCancelDeleteModal.click();
+				await expect(poOmnichannelBusinessHours.confirmDeleteModal).not.toBeVisible();
+			});
+
+			await test.step('expect to confirm delete', async () => {
+				await poOmnichannelBusinessHours.btnDeleteByName(BHName).click();
+				await expect(poOmnichannelBusinessHours.confirmDeleteModal).toBeVisible();
+				await poOmnichannelBusinessHours.btnConfirmDeleteModal.click();
+				await expect(poOmnichannelBusinessHours.confirmDeleteModal).not.toBeVisible();
+			});
+		});
+
+		await test.step('expect business hours to have been deleted', async () => {
+			await poOmnichannelBusinessHours.search(BHName);
+			await expect(poOmnichannelBusinessHours.findRowByName(BHName)).not.toBeVisible();
+		});
+	});
+
+	test('OC - Business hours - Edit BH departments', async ({ api, page }) => {
+		const BHName = faker.string.uuid();
+
+		await test.step('expect to create new businessHours', async () => {
+			const createBH = await createBusinessHour(api, {
+				id: '33',
+				name: BHName,
+				departments: [department.data._id],
+			});
+
+			expect(createBH.status()).toBe(200);
+		});
+
+		await page.goto('/omnichannel');
+		await poOmnichannelBusinessHours.sidenav.linkBusinessHours.click();
+
+		await test.step('expect to add business hours departments', async () => {
+			await poOmnichannelBusinessHours.search(BHName);
+			await poOmnichannelBusinessHours.findRowByName(BHName).click();
+			await poOmnichannelBusinessHours.selectDepartment({ name: department2.data.name, _id: department2.data._id });
+			await poOmnichannelBusinessHours.btnSave.click();
+		});
+
+		await test.step('expect department to be in the chosen departments list', async () => {
+			await poOmnichannelBusinessHours.search(BHName);
+			await poOmnichannelBusinessHours.findRowByName(BHName).click();
+			await expect(page.getByRole('option', { name: department2.data.name })).toBeVisible();
+			await poOmnichannelBusinessHours.btnBack.click();
+		});
+
+		await test.step('expect to remove business hours departments', async () => {
+			await poOmnichannelBusinessHours.search(BHName);
+			await poOmnichannelBusinessHours.findRowByName(BHName).click();
+			await poOmnichannelBusinessHours.selectDepartment({ name: department2.data.name, _id: department2.data._id });
+			await poOmnichannelBusinessHours.btnSave.click();
+		});
+
+		await test.step('expect department to not be in the chosen departments list', async () => {
+			await poOmnichannelBusinessHours.search(BHName);
+			await poOmnichannelBusinessHours.findRowByName(BHName).click();
+			await expect(page.getByRole('option', { name: department2.data.name })).toBeHidden();
+			await poOmnichannelBusinessHours.btnBack.click();
+		});
+
+		await test.step('expect delete business hours', async () => {
+			await poOmnichannelBusinessHours.btnDeleteByName(BHName).click();
+			await expect(poOmnichannelBusinessHours.confirmDeleteModal).toBeVisible();
+			await poOmnichannelBusinessHours.btnConfirmDeleteModal.click();
+			await expect(poOmnichannelBusinessHours.confirmDeleteModal).not.toBeVisible();
+		});
+	});
+});
diff --git a/apps/meteor/tests/e2e/page-objects/index.ts b/apps/meteor/tests/e2e/page-objects/index.ts
index 5d8284fb420b..64126e4daed4 100644
--- a/apps/meteor/tests/e2e/page-objects/index.ts
+++ b/apps/meteor/tests/e2e/page-objects/index.ts
@@ -16,5 +16,6 @@ export * from './omnichannel-units';
 export * from './home-omnichannel';
 export * from './omnichannel-monitors';
 export * from './omnichannel-settings';
+export * from './omnichannel-business-hours';
 export * from './omnichannel-tags';
 export * from './utils';
diff --git a/apps/meteor/tests/e2e/page-objects/omnichannel-business-hours.ts b/apps/meteor/tests/e2e/page-objects/omnichannel-business-hours.ts
new file mode 100644
index 000000000000..19e93cefb307
--- /dev/null
+++ b/apps/meteor/tests/e2e/page-objects/omnichannel-business-hours.ts
@@ -0,0 +1,67 @@
+import type { Locator } from '@playwright/test';
+
+import { OmnichannelAdministration } from './omnichannel-administration';
+
+export class OmnichannelBusinessHours extends OmnichannelAdministration {
+	get btnCreateBusinessHour(): Locator {
+		return this.page.locator('header').locator('role=button[name="New"]');
+	}
+
+	get btnSave(): Locator {
+		return this.page.locator('role=button[name="Save"]');
+	}
+
+	get btnCancel(): Locator {
+		return this.page.locator('role=button[name="Cancel"]');
+	}
+
+	get btnBack(): Locator {
+		return this.page.locator('role=button[name="Back"]');
+	}
+
+	get inputSearch(): Locator {
+		return this.page.locator('[placeholder="Search"]');
+	}
+
+	get inputName(): Locator {
+		return this.page.locator('[name="name"]');
+	}
+
+	get inputDepartments(): Locator {
+		return this.page.locator('input[placeholder="Select an option"]');
+	}
+
+	findRowByName(name: string): Locator {
+		return this.page.locator(`tr:has-text("${name}")`);
+	}
+
+	btnDeleteByName(name: string): Locator {
+		return this.page.locator(`tr:has-text("${name}") button[title="Remove"]`);
+	}
+
+	get confirmDeleteModal(): Locator {
+		return this.page.locator('dialog:has(h2:has-text("Are you sure?"))');
+	}
+
+	get btnCancelDeleteModal(): Locator {
+		return this.confirmDeleteModal.locator('role=button[name="Cancel"]');
+	}
+
+	get btnConfirmDeleteModal(): Locator {
+		return this.confirmDeleteModal.locator('role=button[name="Delete"]');
+	}
+
+	private selectOption(name: string): Locator {
+		return this.page.locator(`[role=option][value="${name}"]`);
+	}
+
+	async selectDepartment({ name, _id }: { name: string; _id: string }) {
+		await this.inputDepartments.click();
+		await this.inputDepartments.fill(name);
+		await this.selectOption(_id).click();
+	}
+
+	async search(text: string) {
+		await this.inputSearch.fill(text);
+	}
+}
diff --git a/apps/meteor/tests/e2e/utils/omnichannel/businessHours.ts b/apps/meteor/tests/e2e/utils/omnichannel/businessHours.ts
new file mode 100644
index 000000000000..7d4aced1e36c
--- /dev/null
+++ b/apps/meteor/tests/e2e/utils/omnichannel/businessHours.ts
@@ -0,0 +1,47 @@
+import type { BaseTest } from '../test';
+
+type CreateBusinessHoursParams = {
+	id?: string | null;
+	name?: string;
+	description?: string;
+	departments?: { departmentId: string }[];
+};
+
+export const createBusinessHour = async (api: BaseTest['api'], { id = null, name, departments = [] }: CreateBusinessHoursParams = {}) => {
+	const departmentIds = departments.join(',');
+
+	const response = await api.post('/method.call/livechat:saveBusinessHour', {
+		message: JSON.stringify({
+			msg: 'method',
+			id: id || '33',
+			method: 'livechat:saveBusinessHour',
+			params: [
+				{
+					name,
+					timezoneName: 'America/Sao_Paulo',
+					daysOpen: ['Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday'],
+					daysTime: [
+						{ day: 'Monday', start: { time: '08:00' }, finish: { time: '18:00' }, open: true },
+						{ day: 'Tuesday', start: { time: '08:00' }, finish: { time: '18:00' }, open: true },
+						{ day: 'Wednesday', start: { time: '08:00' }, finish: { time: '18:00' }, open: true },
+						{ day: 'Thursday', start: { time: '08:00' }, finish: { time: '18:00' }, open: true },
+						{ day: 'Friday', start: { time: '08:00' }, finish: { time: '18:00' }, open: true },
+					],
+					departmentsToApplyBusinessHour: departmentIds,
+					active: true,
+					type: 'custom',
+					timezone: 'America/Sao_Paulo',
+					workHours: [
+						{ day: 'Monday', start: '08:00', finish: '18:00', open: true },
+						{ day: 'Tuesday', start: '08:00', finish: '18:00', open: true },
+						{ day: 'Wednesday', start: '08:00', finish: '18:00', open: true },
+						{ day: 'Thursday', start: '08:00', finish: '18:00', open: true },
+						{ day: 'Friday', start: '08:00', finish: '18:00', open: true },
+					],
+				},
+			],
+		}),
+	});
+
+	return response;
+};

From 972ba42f43c2591df64ad9e40f3bd11d993c446a Mon Sep 17 00:00:00 2001
From: Martin Schoeler <martin.schoeler@rocket.chat>
Date: Wed, 12 Jun 2024 08:53:48 -0300
Subject: [PATCH 05/94] fix: Run QueryClient.clear() on logout (#32587)

---
 .changeset/fuzzy-readers-bake.md              |  5 +++
 .../providers/UserProvider/UserProvider.tsx   |  7 +++--
 ...mnichannel-enterprise-menus-logout.spec.ts | 31 +++++++++++++++++++
 3 files changed, 41 insertions(+), 2 deletions(-)
 create mode 100644 .changeset/fuzzy-readers-bake.md
 create mode 100644 apps/meteor/tests/e2e/omnichannel/omnichannel-enterprise-menus-logout.spec.ts

diff --git a/.changeset/fuzzy-readers-bake.md b/.changeset/fuzzy-readers-bake.md
new file mode 100644
index 000000000000..a487096a312e
--- /dev/null
+++ b/.changeset/fuzzy-readers-bake.md
@@ -0,0 +1,5 @@
+---
+"@rocket.chat/meteor": patch
+---
+
+Fixes issues with loading license modules when loading the page while logged out
diff --git a/apps/meteor/client/providers/UserProvider/UserProvider.tsx b/apps/meteor/client/providers/UserProvider/UserProvider.tsx
index 27c540928e86..27bba21eae95 100644
--- a/apps/meteor/client/providers/UserProvider/UserProvider.tsx
+++ b/apps/meteor/client/providers/UserProvider/UserProvider.tsx
@@ -4,7 +4,7 @@ import type { SubscriptionWithRoom } from '@rocket.chat/ui-contexts';
 import { UserContext, useEndpoint } from '@rocket.chat/ui-contexts';
 import { Meteor } from 'meteor/meteor';
 import type { ContextType, ReactElement, ReactNode } from 'react';
-import React, { useEffect, useMemo } from 'react';
+import React, { useEffect, useMemo, useRef } from 'react';
 
 import { Subscriptions, ChatRoom } from '../../../app/models/client';
 import { getUserPreference } from '../../../app/utils/client';
@@ -43,6 +43,7 @@ type UserProviderProps = {
 
 const UserProvider = ({ children }: UserProviderProps): ReactElement => {
 	const userId = useReactiveValue(getUserId);
+	const previousUserId = useRef(userId);
 	const user = useReactiveValue(getUser);
 	const [userLanguage, setUserLanguage] = useLocalStorage('userLanguage', '');
 	const [preferedLanguage, setPreferedLanguage] = useLocalStorage('preferedLanguage', '');
@@ -94,9 +95,11 @@ const UserProvider = ({ children }: UserProviderProps): ReactElement => {
 	}, [preferedLanguage, setPreferedLanguage, setUserLanguage, user?.language, userLanguage, userId, setUserPreferences]);
 
 	useEffect(() => {
-		if (!userId) {
+		if (previousUserId.current && previousUserId.current !== userId) {
 			queryClient.clear();
 		}
+
+		previousUserId.current = userId;
 	}, [userId]);
 
 	return <UserContext.Provider children={children} value={contextValue} />;
diff --git a/apps/meteor/tests/e2e/omnichannel/omnichannel-enterprise-menus-logout.spec.ts b/apps/meteor/tests/e2e/omnichannel/omnichannel-enterprise-menus-logout.spec.ts
new file mode 100644
index 000000000000..057dd8bd73dc
--- /dev/null
+++ b/apps/meteor/tests/e2e/omnichannel/omnichannel-enterprise-menus-logout.spec.ts
@@ -0,0 +1,31 @@
+import type { Page } from '@playwright/test';
+
+import { ADMIN_CREDENTIALS, IS_EE } from '../config/constants';
+import injectInitialData from '../fixtures/inject-initial-data';
+import { test, expect } from '../utils/test';
+
+test.describe('OC - Enterprise Menu Items After Relogin', () => {
+	// Create page object and redirect to home
+	test.beforeEach(async ({ page }: { page: Page }) => {
+		await page.goto('/omnichannel/current');
+
+		await page.locator('role=textbox[name=/username/i]').waitFor({ state: 'visible' });
+		await page.locator('role=textbox[name=/username/i]').fill(ADMIN_CREDENTIALS.email);
+		await page.locator('[name=password]').fill(ADMIN_CREDENTIALS.password);
+		await page.locator('role=button[name="Login"]').click();
+
+		await page.locator('.main-content').waitFor();
+	});
+
+	// Delete all data
+	test.afterAll(async () => {
+		await injectInitialData();
+	});
+
+	test('OC - Enterprise Menu Items - Logout & Login', async ({ page }) => {
+		test.skip(!IS_EE);
+		await test.step('expect EE menu items to be visible', async () => {
+			await expect(page.locator('a[href="/omnichannel/tags"]')).toBeVisible();
+		});
+	});
+});

From 16b67aa0ff4f0d88be9208098e2a66cfe87b537c Mon Sep 17 00:00:00 2001
From: Gustavo Reis Bauer <gustavoreisbauer@gmail.com>
Date: Wed, 12 Jun 2024 11:10:26 -0300
Subject: [PATCH 06/94] feat: Limit of members that can be added using the
 autojoin feature in a team's channel to the value of the API_Users_Limit
 setting (#31859)

Co-authored-by: Matheus Barbosa Silva <36537004+matheusbsilva137@users.noreply.github.com>
---
 .changeset/clean-moose-cover.md               |  6 ++
 .../channels/TeamsChannelItem.tsx             |  5 +-
 .../channels/TeamsChannelItemMenu.tsx         |  4 +-
 .../contextualBar/channels/TeamsChannels.tsx  |  6 +-
 .../channels/TeamsChannelsWithData.tsx        |  1 +
 .../channels/hooks/useToggleAutoJoin.tsx      | 31 +++++++-
 apps/meteor/server/services/team/service.ts   | 17 +++-
 apps/meteor/tests/data/teams.helper.ts        | 13 ++-
 apps/meteor/tests/end-to-end/api/25-teams.js  | 79 ++++++++++++++++++-
 packages/i18n/src/locales/en.i18n.json        |  2 +
 10 files changed, 148 insertions(+), 16 deletions(-)
 create mode 100644 .changeset/clean-moose-cover.md

diff --git a/.changeset/clean-moose-cover.md b/.changeset/clean-moose-cover.md
new file mode 100644
index 000000000000..39e6204ce9b4
--- /dev/null
+++ b/.changeset/clean-moose-cover.md
@@ -0,0 +1,6 @@
+---
+"@rocket.chat/meteor": minor
+"@rocket.chat/i18n": minor
+---
+
+Introduced the use of the `API_User_Limit` setting to limit amount of members to simultaneously auto-join a room in a team
diff --git a/apps/meteor/client/views/teams/contextualBar/channels/TeamsChannelItem.tsx b/apps/meteor/client/views/teams/contextualBar/channels/TeamsChannelItem.tsx
index 981c65630d0a..01f92d38488c 100644
--- a/apps/meteor/client/views/teams/contextualBar/channels/TeamsChannelItem.tsx
+++ b/apps/meteor/client/views/teams/contextualBar/channels/TeamsChannelItem.tsx
@@ -22,11 +22,12 @@ import TeamsChannelItemMenu from './TeamsChannelItemMenu';
 
 type TeamsChannelItemProps = {
 	room: IRoom;
+	mainRoom: IRoom;
 	onClickView: (room: IRoom) => void;
 	reload: () => void;
 };
 
-const TeamsChannelItem = ({ room, onClickView, reload }: TeamsChannelItemProps) => {
+const TeamsChannelItem = ({ room, mainRoom, onClickView, reload }: TeamsChannelItemProps) => {
 	const t = useTranslation();
 	const rid = room._id;
 	const type = room.t;
@@ -68,7 +69,7 @@ const TeamsChannelItem = ({ room, onClickView, reload }: TeamsChannelItemProps)
 			</OptionContent>
 			{(canRemoveTeamChannel || canEditTeamChannel || canDeleteTeamChannel) && (
 				<OptionMenu onClick={onClick}>
-					{showButton ? <TeamsChannelItemMenu room={room} reload={reload} /> : <IconButton tiny icon='kebab' />}
+					{showButton ? <TeamsChannelItemMenu room={room} mainRoom={mainRoom} reload={reload} /> : <IconButton tiny icon='kebab' />}
 				</OptionMenu>
 			)}
 		</Option>
diff --git a/apps/meteor/client/views/teams/contextualBar/channels/TeamsChannelItemMenu.tsx b/apps/meteor/client/views/teams/contextualBar/channels/TeamsChannelItemMenu.tsx
index 54ee216eaaa0..97b1bdceb670 100644
--- a/apps/meteor/client/views/teams/contextualBar/channels/TeamsChannelItemMenu.tsx
+++ b/apps/meteor/client/views/teams/contextualBar/channels/TeamsChannelItemMenu.tsx
@@ -9,12 +9,12 @@ import { useDeleteRoom } from '../../../hooks/roomActions/useDeleteRoom';
 import { useRemoveRoomFromTeam } from './hooks/useRemoveRoomFromTeam';
 import { useToggleAutoJoin } from './hooks/useToggleAutoJoin';
 
-const TeamsChannelItemMenu = ({ room, reload }: { room: IRoom; reload?: () => void }) => {
+const TeamsChannelItemMenu = ({ room, mainRoom, reload }: { room: IRoom; mainRoom: IRoom; reload?: () => void }) => {
 	const t = useTranslation();
 
 	const { handleRemoveRoom, canRemoveTeamChannel } = useRemoveRoomFromTeam(room, { reload });
 	const { handleDelete, canDeleteRoom } = useDeleteRoom(room, { reload });
-	const { handleToggleAutoJoin, canEditTeamChannel } = useToggleAutoJoin(room, { reload });
+	const { handleToggleAutoJoin, canEditTeamChannel } = useToggleAutoJoin(room, { reload, mainRoom });
 
 	const toggleAutoJoin = {
 		id: 'toggleAutoJoin',
diff --git a/apps/meteor/client/views/teams/contextualBar/channels/TeamsChannels.tsx b/apps/meteor/client/views/teams/contextualBar/channels/TeamsChannels.tsx
index 6d0bfddd8610..d82dd19b1af8 100644
--- a/apps/meteor/client/views/teams/contextualBar/channels/TeamsChannels.tsx
+++ b/apps/meteor/client/views/teams/contextualBar/channels/TeamsChannels.tsx
@@ -23,6 +23,7 @@ import TeamsChannelItem from './TeamsChannelItem';
 type TeamsChannelsProps = {
 	loading: boolean;
 	channels: IRoom[];
+	mainRoom: IRoom;
 	text: string;
 	type: 'all' | 'autoJoin';
 	setType: Dispatch<SetStateAction<'all' | 'autoJoin'>>;
@@ -39,6 +40,7 @@ type TeamsChannelsProps = {
 const TeamsChannels = ({
 	loading,
 	channels = [],
+	mainRoom,
 	text,
 	type,
 	setText,
@@ -123,7 +125,9 @@ const TeamsChannels = ({
 								data={channels}
 								// eslint-disable-next-line react/no-multi-comp
 								components={{ Scroller: VirtuosoScrollbars, Footer: () => <InfiniteListAnchor loadMore={loadMoreChannels} /> }}
-								itemContent={(index, data) => <TeamsChannelItem onClickView={onClickView} room={data} reload={reload} key={index} />}
+								itemContent={(index, data) => (
+									<TeamsChannelItem onClickView={onClickView} room={data} mainRoom={mainRoom} reload={reload} key={index} />
+								)}
 							/>
 						</Box>
 					</>
diff --git a/apps/meteor/client/views/teams/contextualBar/channels/TeamsChannelsWithData.tsx b/apps/meteor/client/views/teams/contextualBar/channels/TeamsChannelsWithData.tsx
index 965414400ee5..a886479b535b 100644
--- a/apps/meteor/client/views/teams/contextualBar/channels/TeamsChannelsWithData.tsx
+++ b/apps/meteor/client/views/teams/contextualBar/channels/TeamsChannelsWithData.tsx
@@ -54,6 +54,7 @@ const TeamsChannelsWithData = () => {
 	return (
 		<TeamsChannels
 			loading={phase === AsyncStatePhase.LOADING}
+			mainRoom={room}
 			type={type}
 			text={text}
 			setType={setType}
diff --git a/apps/meteor/client/views/teams/contextualBar/channels/hooks/useToggleAutoJoin.tsx b/apps/meteor/client/views/teams/contextualBar/channels/hooks/useToggleAutoJoin.tsx
index 3a437cd8e5c7..867225a1d5c0 100644
--- a/apps/meteor/client/views/teams/contextualBar/channels/hooks/useToggleAutoJoin.tsx
+++ b/apps/meteor/client/views/teams/contextualBar/channels/hooks/useToggleAutoJoin.tsx
@@ -1,18 +1,41 @@
 import type { IRoom } from '@rocket.chat/core-typings';
-import { useEndpoint, usePermission, useToastMessageDispatch } from '@rocket.chat/ui-contexts';
+import { useEndpoint, usePermission, useSetting, useToastMessageDispatch } from '@rocket.chat/ui-contexts';
+import { t } from 'i18next';
 
-export const useToggleAutoJoin = (room: IRoom, { reload }: { reload?: () => void }) => {
+import { roomCoordinator } from '../../../../../lib/rooms/roomCoordinator';
+
+export const useToggleAutoJoin = (room: IRoom, { reload, mainRoom }: { reload?: () => void; mainRoom: IRoom }) => {
 	const dispatchToastMessage = useToastMessageDispatch();
 	const updateRoomEndpoint = useEndpoint('POST', '/v1/teams.updateRoom');
 	const canEditTeamChannel = usePermission('edit-team-channel', room._id);
+	const maxNumberOfAutoJoinMembers = useSetting<number>('API_User_Limit');
 
 	const handleToggleAutoJoin = async () => {
+		// Sanity check, the setting has a default value, therefore it should always be defined
+		if (!maxNumberOfAutoJoinMembers) {
+			return;
+		}
+
 		try {
-			await updateRoomEndpoint({
+			const { room: updatedRoom } = await updateRoomEndpoint({
 				roomId: room._id,
 				isDefault: !room.teamDefault,
 			});
-			dispatchToastMessage({ type: 'success', message: room.teamDefault ? 'channel set as non autojoin' : 'channel set as autojoin' });
+			if (updatedRoom.teamDefault) {
+				// If the number of members in the mainRoom (the team) is greater than the limit, show an info message
+				// informing that not all members will be auto-joined to the channel
+				const messageType = mainRoom.usersCount > maxNumberOfAutoJoinMembers ? 'info' : 'success';
+				const message = mainRoom.usersCount > maxNumberOfAutoJoinMembers ? 'Team_Auto-join_exceeded_user_limit' : 'Team_Auto-join_updated';
+
+				dispatchToastMessage({
+					type: messageType,
+					message: t(message, {
+						channelName: roomCoordinator.getRoomName(room.t, room),
+						numberOfMembers: updatedRoom.usersCount,
+						limit: maxNumberOfAutoJoinMembers,
+					}),
+				});
+			}
 			reload?.();
 		} catch (error) {
 			dispatchToastMessage({ type: 'error', message: error });
diff --git a/apps/meteor/server/services/team/service.ts b/apps/meteor/server/services/team/service.ts
index 71d403fd84b5..f81b21d7fa01 100644
--- a/apps/meteor/server/services/team/service.ts
+++ b/apps/meteor/server/services/team/service.ts
@@ -32,6 +32,7 @@ import { addUserToRoom } from '../../../app/lib/server/functions/addUserToRoom';
 import { checkUsernameAvailability } from '../../../app/lib/server/functions/checkUsernameAvailability';
 import { getSubscribedRoomsForUserWithDetails } from '../../../app/lib/server/functions/getRoomsWithSingleOwner';
 import { removeUserFromRoom } from '../../../app/lib/server/functions/removeUserFromRoom';
+import { settings } from '../../../app/settings/server';
 
 export class TeamService extends ServiceClassInternal implements ITeamService {
 	protected name = 'team';
@@ -472,11 +473,21 @@ export class TeamService extends ServiceClassInternal implements ITeamService {
 		room.teamDefault = isDefault;
 		await Rooms.setTeamDefaultById(rid, isDefault);
 
-		if (room.teamDefault) {
-			const teamMembers = await this.members(uid, room.teamId, true, undefined, undefined);
+		if (isDefault) {
+			const maxNumberOfAutoJoinMembers = settings.get<number>('API_User_Limit');
+			const teamMembers = await this.members(
+				uid,
+				room.teamId,
+				true,
+				{ offset: 0, count: maxNumberOfAutoJoinMembers },
+				// We should not get the owner of the room, since he is already a member
+				{ _id: { $ne: room.u._id } },
+			);
 
 			for await (const m of teamMembers.records) {
-				await addUserToRoom(room._id, m.user, user);
+				if (await addUserToRoom(room._id, m.user, user)) {
+					room.usersCount++;
+				}
 			}
 		}
 
diff --git a/apps/meteor/tests/data/teams.helper.ts b/apps/meteor/tests/data/teams.helper.ts
index 308fc60f445e..62da06eea71a 100644
--- a/apps/meteor/tests/data/teams.helper.ts
+++ b/apps/meteor/tests/data/teams.helper.ts
@@ -1,5 +1,6 @@
 import { ITeam, TEAM_TYPE } from "@rocket.chat/core-typings"
 import { api, request } from "./api-data"
+import { IUser } from "@rocket.chat/apps-engine/definition/users";
 
 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({
@@ -14,4 +15,14 @@ export const deleteTeam = async (credentials: Record<string, any>, teamName: str
     await request.post(api('teams.delete')).set(credentials).send({
         teamName,
     });
-};
\ No newline at end of file
+};
+
+export const addMembers = async (credentials: Record<string, any>, teamName: string, members: IUser['id'][]): Promise<void> => {
+    await request
+        .post(api('teams.addMembers'))
+        .set(credentials)
+        .send({
+            teamName: teamName,
+            members: members.map((userId) => ({ userId, roles: ['member'] }))
+        });
+};
diff --git a/apps/meteor/tests/end-to-end/api/25-teams.js b/apps/meteor/tests/end-to-end/api/25-teams.js
index 34383e3aaa69..49a1d663aef2 100644
--- a/apps/meteor/tests/end-to-end/api/25-teams.js
+++ b/apps/meteor/tests/end-to-end/api/25-teams.js
@@ -1,11 +1,11 @@
 import { TEAM_TYPE } from '@rocket.chat/core-typings';
 import { expect } from 'chai';
-import { before, describe, it, after } from 'mocha';
+import { after, afterEach, before, beforeEach, describe, it } from 'mocha';
 
 import { getCredentials, api, request, credentials, methodCall } from '../../data/api-data';
-import { updatePermission } from '../../data/permissions.helper';
+import { updatePermission, updateSetting } from '../../data/permissions.helper';
 import { createRoom, deleteRoom } from '../../data/rooms.helper';
-import { createTeam, deleteTeam } from '../../data/teams.helper';
+import { addMembers, createTeam, deleteTeam } from '../../data/teams.helper';
 import { adminUsername, password } from '../../data/user';
 import { createUser, deleteUser, login } from '../../data/users.helper';
 
@@ -1594,6 +1594,79 @@ describe('[Teams]', () => {
 					.end(done);
 			});
 		});
+
+		describe('team auto-join', () => {
+			let testTeam;
+			let createdRoom;
+			let testUser1;
+			let testUser2;
+
+			before(async () => {
+				const [testUserResult, testUser1Result] = await Promise.all([createUser(), createUser()]);
+				testUser1 = testUserResult;
+				testUser2 = testUser1Result;
+			});
+
+			beforeEach(async () => {
+				const createTeamPromise = createTeam(credentials, `test-team-name${Date.now()}`, 0);
+				const createRoomPromise = createRoom({ name: `test-room-name${Date.now()}`, type: 'c' });
+				const [testTeamCreationResult, testRoomCreationResult] = await Promise.all([createTeamPromise, createRoomPromise]);
+
+				testTeam = testTeamCreationResult;
+				createdRoom = testRoomCreationResult;
+
+				await request
+					.post(api('teams.addRooms'))
+					.set(credentials)
+					.expect(200)
+					.send({
+						rooms: [createdRoom.body.channel._id],
+						teamName: testTeam.name,
+					});
+			});
+
+			afterEach(() =>
+				Promise.all([deleteTeam(credentials, testTeam.name), deleteRoom({ roomId: createdRoom.body.channel._id, type: 'c' })]),
+			);
+
+			after(() => Promise.all([updateSetting('API_User_Limit', 500), deleteUser(testUser1), deleteUser(testUser2)]));
+
+			it('should add members when the members count is less than or equal to the API_User_Limit setting', async () => {
+				await updateSetting('API_User_Limit', 2);
+
+				await addMembers(credentials, testTeam.name, [testUser1._id, testUser2._id]);
+				await request
+					.post(api('teams.updateRoom'))
+					.set(credentials)
+					.send({
+						roomId: createdRoom.body.channel._id,
+						isDefault: true,
+					})
+					.expect(200)
+					.expect((res) => {
+						expect(res.body).to.have.property('success', true);
+						expect(res.body).to.have.nested.property('room.usersCount').and.to.be.equal(3);
+					});
+			});
+
+			it('should not add all members when we update a team channel to be auto-join and the members count is greater than the API_User_Limit setting', async () => {
+				await updateSetting('API_User_Limit', 1);
+
+				await addMembers(credentials, testTeam.name, [testUser1._id, testUser2._id]);
+				await request
+					.post(api('teams.updateRoom'))
+					.set(credentials)
+					.send({
+						roomId: createdRoom.body.channel._id,
+						isDefault: true,
+					})
+					.expect(200)
+					.expect((res) => {
+						expect(res.body).to.have.property('success', true);
+						expect(res.body).to.have.nested.property('room.usersCount').and.to.be.equal(2);
+					});
+			});
+		});
 	});
 
 	describe('/teams.removeRoom', () => {
diff --git a/packages/i18n/src/locales/en.i18n.json b/packages/i18n/src/locales/en.i18n.json
index 9c90020d94d0..3a50e7d39df6 100644
--- a/packages/i18n/src/locales/en.i18n.json
+++ b/packages/i18n/src/locales/en.i18n.json
@@ -5127,6 +5127,8 @@
   "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?",

From 99de6d2ec4e98340971e39493b78e71b355fc7b1 Mon Sep 17 00:00:00 2001
From: Diego Sampaio <chinello@gmail.com>
Date: Wed, 12 Jun 2024 12:10:07 -0300
Subject: [PATCH 07/94] chore: disable db watchers on local envs (#32589)

---
 packages/core-services/src/index.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/core-services/src/index.ts b/packages/core-services/src/index.ts
index ccc936ad6ed5..ce51f4695aec 100644
--- a/packages/core-services/src/index.ts
+++ b/packages/core-services/src/index.ts
@@ -138,7 +138,8 @@ export {
 	IUserService,
 };
 
-export const dbWatchersDisabled = ['yes', 'true'].includes(String(process.env.DISABLE_DB_WATCHERS).toLowerCase());
+export const dbWatchersDisabled =
+	['yes', 'true'].includes(String(process.env.DISABLE_DB_WATCHERS).toLowerCase()) || process.env.NODE_ENV !== 'production';
 
 // TODO think in a way to not have to pass the service name to proxify here as well
 export const Authorization = proxifyWithWait<IAuthorization>('authorization');

From bd9eb6ba84229e6dcf6429e36d939caf3f6d9b17 Mon Sep 17 00:00:00 2001
From: Gustavo Reis Bauer <gustavoreisbauer@gmail.com>
Date: Wed, 12 Jun 2024 14:14:27 -0300
Subject: [PATCH 08/94] chore: Add a way to remove an invalid token if sendFCM
 returns 404 (#32440)

---
 apps/meteor/app/push/server/fcm.ts | 38 ++++++++++++++++++------------
 1 file changed, 23 insertions(+), 15 deletions(-)

diff --git a/apps/meteor/app/push/server/fcm.ts b/apps/meteor/app/push/server/fcm.ts
index 819e26e4f003..87ced6e130df 100644
--- a/apps/meteor/app/push/server/fcm.ts
+++ b/apps/meteor/app/push/server/fcm.ts
@@ -55,15 +55,17 @@ type FCMError = {
 };
 
 /**
- * Set at least a 10 second timeout on send requests before retrying.
- * Most of FCM's internal Remote Procedure Calls use a 10 second timeout.
+ * Send a push notification using Firebase Cloud Messaging (FCM).
+ * implements the Firebase Cloud Messaging HTTP v1 API, and all of its retry logic,
+ * see: https://firebase.google.com/docs/reference/fcm/rest/v1/ErrorCode
  *
  * Errors:
- * - For 400, 401, 403, 404 errors: abort, and do not retry.
+ * - For 400, 401, 403 errors: abort, and do not retry.
+ * - For 404 errors: remove the token from the database.
  * - For 429 errors: retry after waiting for the duration set in the retry-after header. If no retry-after header is set, default to 60 seconds.
  * - For 500 errors: retry with exponential backoff.
  */
-async function fetchWithRetry(url: string, options: RequestInit, retries = 0): Promise<Response> {
+async function fetchWithRetry(url: string, _removeToken: () => void, options: RequestInit, retries = 0): Promise<Response> {
 	const MAX_RETRIES = 5;
 	const response = await fetch(url, options);
 
@@ -79,15 +81,20 @@ async function fetchWithRetry(url: string, options: RequestInit, retries = 0): P
 	const retryAfter = response.headers.get('retry-after');
 	const retryAfterSeconds = retryAfter ? parseInt(retryAfter, 10) : 60;
 
+	if (response.status === 404) {
+		_removeToken();
+		return response;
+	}
+
 	if (response.status === 429) {
 		await new Promise((resolve) => setTimeout(resolve, retryAfterSeconds * 1000));
-		return fetchWithRetry(url, options, retries + 1);
+		return fetchWithRetry(url, _removeToken, options, retries + 1);
 	}
 
 	if (response.status >= 500 && response.status < 600) {
 		const backoff = Math.pow(2, retries) * 10000;
 		await new Promise((resolve) => setTimeout(resolve, backoff));
-		return fetchWithRetry(url, options, retries + 1);
+		return fetchWithRetry(url, _removeToken, options, retries + 1);
 	}
 
 	const error: FCMError = await response.json();
@@ -145,12 +152,7 @@ function getFCMMessagesFromPushData(userTokens: string[], notification: PendingP
 	return userTokens.map((token) => ({ message: { ...message, token } }));
 }
 
-export const sendFCM = function ({ userTokens, notification, _replaceToken, _removeToken, options }: NativeNotificationParameters): void {
-	// We don't use these parameters, but we need to keep them to keep the function signature
-	// TODO: Remove them when we remove the old sendGCM function
-	_replaceToken;
-	_removeToken;
-
+export const sendFCM = function ({ userTokens, notification, _removeToken, options }: NativeNotificationParameters): void {
 	const tokens = typeof userTokens === 'string' ? [userTokens] : userTokens;
 	if (!tokens.length) {
 		logger.log('sendFCM no push tokens found');
@@ -173,9 +175,15 @@ export const sendFCM = function ({ userTokens, notification, _replaceToken, _rem
 
 	const url = `https://fcm.googleapis.com/v1/projects/${options.gcm.projectNumber}/messages:send`;
 
-	for (const message of messages) {
-		logger.debug('sendFCM message', message);
-		const response = fetchWithRetry(url, { method: 'POST', headers, body: JSON.stringify(message) });
+	for (const fcmRequest of messages) {
+		logger.debug('sendFCM message', fcmRequest);
+
+		const removeToken = () => {
+			const { token } = fcmRequest.message;
+			token && _removeToken({ gcm: token });
+		};
+
+		const response = fetchWithRetry(url, removeToken, { method: 'POST', headers, body: JSON.stringify(fcmRequest) });
 
 		response.catch((err) => {
 			logger.error('sendFCM error', err);

From 9a27b427fe39d13bd003413ebef1e3e4a50f1952 Mon Sep 17 00:00:00 2001
From: rocketchat-github-ci <buildmaster@rocket.chat>
Date: Wed, 12 Jun 2024 17:45:02 +0000
Subject: [PATCH 09/94] Bump 6.9.1

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

diff --git a/.changeset/bump-patch-1718214302828.md b/.changeset/bump-patch-1718214302828.md
new file mode 100644
index 000000000000..e1eaa7980afb
--- /dev/null
+++ b/.changeset/bump-patch-1718214302828.md
@@ -0,0 +1,5 @@
+---
+'@rocket.chat/meteor': patch
+---
+
+Bump @rocket.chat/meteor version.
diff --git a/yarn.lock b/yarn.lock
index 8a3e588765df..2688eb2a0cf8 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8795,10 +8795,10 @@ __metadata:
     "@rocket.chat/icons": "*"
     "@rocket.chat/prettier-config": "*"
     "@rocket.chat/styled": "*"
-    "@rocket.chat/ui-avatar": 3.0.0-rc.2
-    "@rocket.chat/ui-contexts": 7.0.0-rc.2
-    "@rocket.chat/ui-kit": 0.34.0-rc.0
-    "@rocket.chat/ui-video-conf": 7.0.0-rc.2
+    "@rocket.chat/ui-avatar": 3.0.0
+    "@rocket.chat/ui-contexts": 7.0.0
+    "@rocket.chat/ui-kit": 0.34.0
+    "@rocket.chat/ui-video-conf": 7.0.0
     "@tanstack/react-query": "*"
     react: "*"
     react-dom: "*"
@@ -8887,8 +8887,8 @@ __metadata:
     "@rocket.chat/fuselage-tokens": "*"
     "@rocket.chat/message-parser": 0.31.29
     "@rocket.chat/styled": "*"
-    "@rocket.chat/ui-client": 7.0.0-rc.2
-    "@rocket.chat/ui-contexts": 7.0.0-rc.2
+    "@rocket.chat/ui-client": 7.0.0
+    "@rocket.chat/ui-contexts": 7.0.0
     katex: "*"
     react: "*"
   languageName: unknown
@@ -10106,7 +10106,7 @@ __metadata:
     typescript: ~5.3.3
   peerDependencies:
     "@rocket.chat/fuselage": "*"
-    "@rocket.chat/ui-contexts": 7.0.0-rc.2
+    "@rocket.chat/ui-contexts": 7.0.0
     react: ~17.0.2
   languageName: unknown
   linkType: soft
@@ -10159,7 +10159,7 @@ __metadata:
     "@rocket.chat/fuselage": "*"
     "@rocket.chat/fuselage-hooks": "*"
     "@rocket.chat/icons": "*"
-    "@rocket.chat/ui-contexts": 7.0.0-rc.2
+    "@rocket.chat/ui-contexts": 7.0.0
     react: ~17.0.2
   languageName: unknown
   linkType: soft
@@ -10335,8 +10335,8 @@ __metadata:
     "@rocket.chat/fuselage-hooks": "*"
     "@rocket.chat/icons": "*"
     "@rocket.chat/styled": "*"
-    "@rocket.chat/ui-avatar": 3.0.0-rc.2
-    "@rocket.chat/ui-contexts": 7.0.0-rc.2
+    "@rocket.chat/ui-avatar": 3.0.0
+    "@rocket.chat/ui-contexts": 7.0.0
     react: ^17.0.2
     react-dom: ^17.0.2
   languageName: unknown
@@ -10426,7 +10426,7 @@ __metadata:
   peerDependencies:
     "@rocket.chat/layout": "*"
     "@rocket.chat/tools": 0.2.1
-    "@rocket.chat/ui-contexts": 7.0.0-rc.2
+    "@rocket.chat/ui-contexts": 7.0.0
     "@tanstack/react-query": "*"
     react: "*"
     react-hook-form: "*"

From 83635aa4f0038e647a4cf08e699562b5f0544256 Mon Sep 17 00:00:00 2001
From: "dionisio-bot[bot]"
 <117394943+dionisio-bot[bot]@users.noreply.github.com>
Date: Wed, 12 Jun 2024 12:13:01 +0000
Subject: [PATCH 10/94] fix: Run QueryClient.clear() on logout (#32591)

Co-authored-by: Martin Schoeler <20868078+MartinSchoeler@users.noreply.github.com>
---
 .changeset/fuzzy-readers-bake.md              |  5 +++
 .../providers/UserProvider/UserProvider.tsx   |  7 +++--
 ...mnichannel-enterprise-menus-logout.spec.ts | 31 +++++++++++++++++++
 3 files changed, 41 insertions(+), 2 deletions(-)
 create mode 100644 .changeset/fuzzy-readers-bake.md
 create mode 100644 apps/meteor/tests/e2e/omnichannel/omnichannel-enterprise-menus-logout.spec.ts

diff --git a/.changeset/fuzzy-readers-bake.md b/.changeset/fuzzy-readers-bake.md
new file mode 100644
index 000000000000..a487096a312e
--- /dev/null
+++ b/.changeset/fuzzy-readers-bake.md
@@ -0,0 +1,5 @@
+---
+"@rocket.chat/meteor": patch
+---
+
+Fixes issues with loading license modules when loading the page while logged out
diff --git a/apps/meteor/client/providers/UserProvider/UserProvider.tsx b/apps/meteor/client/providers/UserProvider/UserProvider.tsx
index 27c540928e86..27bba21eae95 100644
--- a/apps/meteor/client/providers/UserProvider/UserProvider.tsx
+++ b/apps/meteor/client/providers/UserProvider/UserProvider.tsx
@@ -4,7 +4,7 @@ import type { SubscriptionWithRoom } from '@rocket.chat/ui-contexts';
 import { UserContext, useEndpoint } from '@rocket.chat/ui-contexts';
 import { Meteor } from 'meteor/meteor';
 import type { ContextType, ReactElement, ReactNode } from 'react';
-import React, { useEffect, useMemo } from 'react';
+import React, { useEffect, useMemo, useRef } from 'react';
 
 import { Subscriptions, ChatRoom } from '../../../app/models/client';
 import { getUserPreference } from '../../../app/utils/client';
@@ -43,6 +43,7 @@ type UserProviderProps = {
 
 const UserProvider = ({ children }: UserProviderProps): ReactElement => {
 	const userId = useReactiveValue(getUserId);
+	const previousUserId = useRef(userId);
 	const user = useReactiveValue(getUser);
 	const [userLanguage, setUserLanguage] = useLocalStorage('userLanguage', '');
 	const [preferedLanguage, setPreferedLanguage] = useLocalStorage('preferedLanguage', '');
@@ -94,9 +95,11 @@ const UserProvider = ({ children }: UserProviderProps): ReactElement => {
 	}, [preferedLanguage, setPreferedLanguage, setUserLanguage, user?.language, userLanguage, userId, setUserPreferences]);
 
 	useEffect(() => {
-		if (!userId) {
+		if (previousUserId.current && previousUserId.current !== userId) {
 			queryClient.clear();
 		}
+
+		previousUserId.current = userId;
 	}, [userId]);
 
 	return <UserContext.Provider children={children} value={contextValue} />;
diff --git a/apps/meteor/tests/e2e/omnichannel/omnichannel-enterprise-menus-logout.spec.ts b/apps/meteor/tests/e2e/omnichannel/omnichannel-enterprise-menus-logout.spec.ts
new file mode 100644
index 000000000000..057dd8bd73dc
--- /dev/null
+++ b/apps/meteor/tests/e2e/omnichannel/omnichannel-enterprise-menus-logout.spec.ts
@@ -0,0 +1,31 @@
+import type { Page } from '@playwright/test';
+
+import { ADMIN_CREDENTIALS, IS_EE } from '../config/constants';
+import injectInitialData from '../fixtures/inject-initial-data';
+import { test, expect } from '../utils/test';
+
+test.describe('OC - Enterprise Menu Items After Relogin', () => {
+	// Create page object and redirect to home
+	test.beforeEach(async ({ page }: { page: Page }) => {
+		await page.goto('/omnichannel/current');
+
+		await page.locator('role=textbox[name=/username/i]').waitFor({ state: 'visible' });
+		await page.locator('role=textbox[name=/username/i]').fill(ADMIN_CREDENTIALS.email);
+		await page.locator('[name=password]').fill(ADMIN_CREDENTIALS.password);
+		await page.locator('role=button[name="Login"]').click();
+
+		await page.locator('.main-content').waitFor();
+	});
+
+	// Delete all data
+	test.afterAll(async () => {
+		await injectInitialData();
+	});
+
+	test('OC - Enterprise Menu Items - Logout & Login', async ({ page }) => {
+		test.skip(!IS_EE);
+		await test.step('expect EE menu items to be visible', async () => {
+			await expect(page.locator('a[href="/omnichannel/tags"]')).toBeVisible();
+		});
+	});
+});

From 4dd2e62c74f641b1a28cf25ef683c83f3d89919d Mon Sep 17 00:00:00 2001
From: "dionisio-bot[bot]"
 <117394943+dionisio-bot[bot]@users.noreply.github.com>
Date: Tue, 11 Jun 2024 21:56:03 +0000
Subject: [PATCH 11/94] fix(Omnichannel): nonstop sound on current chats using
 continuous notifications (#32588)

Co-authored-by: Martin Schoeler <20868078+MartinSchoeler@users.noreply.github.com>
---
 .changeset/thin-suns-invent.md                              | 5 +++++
 .../client/views/room/body/hooks/useUnreadMessages.ts       | 6 ++++--
 2 files changed, 9 insertions(+), 2 deletions(-)
 create mode 100644 .changeset/thin-suns-invent.md

diff --git a/.changeset/thin-suns-invent.md b/.changeset/thin-suns-invent.md
new file mode 100644
index 000000000000..945f44420797
--- /dev/null
+++ b/.changeset/thin-suns-invent.md
@@ -0,0 +1,5 @@
+---
+"@rocket.chat/meteor": patch
+---
+
+Fixes issues causing nonstop sound notification when taking a chat from the `Current Chats` view
diff --git a/apps/meteor/client/views/room/body/hooks/useUnreadMessages.ts b/apps/meteor/client/views/room/body/hooks/useUnreadMessages.ts
index 5e74164b7882..343b9cb88a98 100644
--- a/apps/meteor/client/views/room/body/hooks/useUnreadMessages.ts
+++ b/apps/meteor/client/views/room/body/hooks/useUnreadMessages.ts
@@ -93,9 +93,11 @@ export const useHandleUnread = (
 	const debouncedReadMessageRead = useMemo(
 		() =>
 			withDebouncing({ wait: 500 })(() => {
-				chat.readStateManager.attemptMarkAsRead();
+				if (subscribed) {
+					chat.readStateManager.attemptMarkAsRead();
+				}
 			}),
-		[chat.readStateManager],
+		[chat.readStateManager, subscribed],
 	);
 
 	useEffect(

From ce7282471e44bb581afcd5ca63c1788c926b4265 Mon Sep 17 00:00:00 2001
From: rocketchat-github-ci <buildmaster@rocket.chat>
Date: Wed, 12 Jun 2024 19:25:38 +0000
Subject: [PATCH 12/94] Release 6.9.1

[no ci]
---
 .changeset/bump-patch-1718214302828.md        |  5 ---
 .changeset/fuzzy-readers-bake.md              |  5 ---
 .changeset/thin-suns-invent.md                |  5 ---
 apps/meteor/CHANGELOG.md                      | 38 +++++++++++++++++++
 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         | 10 ++---
 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 +-
 69 files changed, 413 insertions(+), 60 deletions(-)
 delete mode 100644 .changeset/bump-patch-1718214302828.md
 delete mode 100644 .changeset/fuzzy-readers-bake.md
 delete mode 100644 .changeset/thin-suns-invent.md

diff --git a/.changeset/bump-patch-1718214302828.md b/.changeset/bump-patch-1718214302828.md
deleted file mode 100644
index e1eaa7980afb..000000000000
--- a/.changeset/bump-patch-1718214302828.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@rocket.chat/meteor': patch
----
-
-Bump @rocket.chat/meteor version.
diff --git a/.changeset/fuzzy-readers-bake.md b/.changeset/fuzzy-readers-bake.md
deleted file mode 100644
index a487096a312e..000000000000
--- a/.changeset/fuzzy-readers-bake.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@rocket.chat/meteor": patch
----
-
-Fixes issues with loading license modules when loading the page while logged out
diff --git a/.changeset/thin-suns-invent.md b/.changeset/thin-suns-invent.md
deleted file mode 100644
index 945f44420797..000000000000
--- a/.changeset/thin-suns-invent.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@rocket.chat/meteor": patch
----
-
-Fixes issues causing nonstop sound notification when taking a chat from the `Current Chats` view
diff --git a/apps/meteor/CHANGELOG.md b/apps/meteor/CHANGELOG.md
index 1f1b39852c7b..01f03feede53 100644
--- a/apps/meteor/CHANGELOG.md
+++ b/apps/meteor/CHANGELOG.md
@@ -1,5 +1,43 @@
 # @rocket.chat/meteor
 
+## 6.9.1
+
+### Patch Changes
+
+- Bump @rocket.chat/meteor version.
+
+- Bump @rocket.chat/meteor version.
+
+- ([#32591](https://github.com/RocketChat/Rocket.Chat/pull/32591) by [@dionisio-bot](https://github.com/dionisio-bot)) Fixes issues with loading license modules when loading the page while logged out
+
+- ([#32588](https://github.com/RocketChat/Rocket.Chat/pull/32588) by [@dionisio-bot](https://github.com/dionisio-bot)) Fixes issues causing nonstop sound notification when taking a chat from the `Current Chats` view
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.9.1
+  - @rocket.chat/rest-typings@6.9.1
+  - @rocket.chat/api-client@0.1.34
+  - @rocket.chat/license@0.1.16
+  - @rocket.chat/omnichannel-services@0.1.16
+  - @rocket.chat/pdf-worker@0.0.40
+  - @rocket.chat/presence@0.1.16
+  - @rocket.chat/apps@0.0.7
+  - @rocket.chat/core-services@0.3.16
+  - @rocket.chat/cron@0.0.36
+  - @rocket.chat/fuselage-ui-kit@7.0.1
+  - @rocket.chat/gazzodown@7.0.1
+  - @rocket.chat/model-typings@0.4.2
+  - @rocket.chat/ui-contexts@7.0.1
+  - @rocket.chat/server-cloud-communication@0.0.2
+  - @rocket.chat/models@0.0.40
+  - @rocket.chat/ui-theming@0.1.2
+  - @rocket.chat/ui-avatar@3.0.1
+  - @rocket.chat/ui-client@7.0.1
+  - @rocket.chat/ui-video-conf@7.0.1
+  - @rocket.chat/web-ui-registration@7.0.1
+  - @rocket.chat/instance-status@0.0.40
+  </details>
+
 ## 6.9.0
 
 ### Minor Changes
diff --git a/apps/meteor/app/utils/rocketchat.info b/apps/meteor/app/utils/rocketchat.info
index 4665efe41ce2..0d691fdac398 100644
--- a/apps/meteor/app/utils/rocketchat.info
+++ b/apps/meteor/app/utils/rocketchat.info
@@ -1,3 +1,3 @@
 {
-	"version": "6.9.0"
+	"version": "6.9.1"
 }
diff --git a/apps/meteor/ee/server/services/CHANGELOG.md b/apps/meteor/ee/server/services/CHANGELOG.md
index 9436cdfd7f00..45f79ddff653 100644
--- a/apps/meteor/ee/server/services/CHANGELOG.md
+++ b/apps/meteor/ee/server/services/CHANGELOG.md
@@ -1,5 +1,18 @@
 # rocketchat-services
 
+## 1.1.34
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.9.1
+  - @rocket.chat/rest-typings@6.9.1
+  - @rocket.chat/core-services@0.3.16
+  - @rocket.chat/model-typings@0.4.2
+  - @rocket.chat/models@0.0.40
+  </details>
+
 ## 1.1.33
 
 ### Patch Changes
diff --git a/apps/meteor/ee/server/services/package.json b/apps/meteor/ee/server/services/package.json
index c2119b1d3b24..d06f186c54d2 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.1.33",
+	"version": "1.1.34",
 	"description": "Rocket.Chat Authorization service",
 	"main": "index.js",
 	"scripts": {
diff --git a/apps/meteor/package.json b/apps/meteor/package.json
index 77120b4c9a70..90fb64ffd9b2 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.9.0",
+	"version": "6.9.1",
 	"private": true,
 	"author": {
 		"name": "Rocket.Chat",
diff --git a/ee/apps/account-service/CHANGELOG.md b/ee/apps/account-service/CHANGELOG.md
index 39eaf3f73387..280a3aa42d85 100644
--- a/ee/apps/account-service/CHANGELOG.md
+++ b/ee/apps/account-service/CHANGELOG.md
@@ -1,5 +1,18 @@
 # @rocket.chat/account-service
 
+## 0.3.15
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.9.1
+  - @rocket.chat/rest-typings@6.9.1
+  - @rocket.chat/core-services@0.3.16
+  - @rocket.chat/model-typings@0.4.2
+  - @rocket.chat/models@0.0.40
+  </details>
+
 ## 0.3.14
 
 ### Patch Changes
diff --git a/ee/apps/account-service/package.json b/ee/apps/account-service/package.json
index 6abc5aa783bc..4dfcfddf52f8 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.3.14",
+	"version": "0.3.15",
 	"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 fd73dae11270..154195b03b36 100644
--- a/ee/apps/authorization-service/CHANGELOG.md
+++ b/ee/apps/authorization-service/CHANGELOG.md
@@ -1,5 +1,18 @@
 # @rocket.chat/authorization-service
 
+## 0.3.16
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.9.1
+  - @rocket.chat/rest-typings@6.9.1
+  - @rocket.chat/core-services@0.3.16
+  - @rocket.chat/model-typings@0.4.2
+  - @rocket.chat/models@0.0.40
+  </details>
+
 ## 0.3.15
 
 ### Patch Changes
diff --git a/ee/apps/authorization-service/package.json b/ee/apps/authorization-service/package.json
index 61de30257359..fce4a93c8095 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.3.15",
+	"version": "0.3.16",
 	"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 75409b275c32..9d873f7c8c5d 100644
--- a/ee/apps/ddp-streamer/CHANGELOG.md
+++ b/ee/apps/ddp-streamer/CHANGELOG.md
@@ -1,5 +1,20 @@
 # @rocket.chat/ddp-streamer
 
+## 0.2.15
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.9.1
+  - @rocket.chat/rest-typings@6.9.1
+  - @rocket.chat/core-services@0.3.16
+  - @rocket.chat/model-typings@0.4.2
+  - @rocket.chat/ui-contexts@7.0.1
+  - @rocket.chat/models@0.0.40
+  - @rocket.chat/instance-status@0.0.40
+  </details>
+
 ## 0.2.14
 
 ### Patch Changes
diff --git a/ee/apps/ddp-streamer/package.json b/ee/apps/ddp-streamer/package.json
index c1dd482d2e75..65f1c4c8771c 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.2.14",
+	"version": "0.2.15",
 	"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 1da1ca34fa23..134f9f227233 100644
--- a/ee/apps/omnichannel-transcript/CHANGELOG.md
+++ b/ee/apps/omnichannel-transcript/CHANGELOG.md
@@ -1,5 +1,19 @@
 # @rocket.chat/omnichannel-transcript
 
+## 0.3.16
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.9.1
+  - @rocket.chat/omnichannel-services@0.1.16
+  - @rocket.chat/pdf-worker@0.0.40
+  - @rocket.chat/core-services@0.3.16
+  - @rocket.chat/model-typings@0.4.2
+  - @rocket.chat/models@0.0.40
+  </details>
+
 ## 0.3.15
 
 ### Patch Changes
diff --git a/ee/apps/omnichannel-transcript/package.json b/ee/apps/omnichannel-transcript/package.json
index 9705a4ca2e2c..ed1e72a2f255 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.3.15",
+	"version": "0.3.16",
 	"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 a90edcd821af..f7a1137542f3 100644
--- a/ee/apps/presence-service/CHANGELOG.md
+++ b/ee/apps/presence-service/CHANGELOG.md
@@ -1,5 +1,18 @@
 # @rocket.chat/presence-service
 
+## 0.3.16
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.9.1
+  - @rocket.chat/presence@0.1.16
+  - @rocket.chat/core-services@0.3.16
+  - @rocket.chat/model-typings@0.4.2
+  - @rocket.chat/models@0.0.40
+  </details>
+
 ## 0.3.15
 
 ### Patch Changes
diff --git a/ee/apps/presence-service/package.json b/ee/apps/presence-service/package.json
index 129eae6f6f14..6bb46c544f57 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.3.15",
+	"version": "0.3.16",
 	"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 57508316acbf..d277d3c9b4cb 100644
--- a/ee/apps/queue-worker/CHANGELOG.md
+++ b/ee/apps/queue-worker/CHANGELOG.md
@@ -1,5 +1,18 @@
 # @rocket.chat/queue-worker
 
+## 0.3.16
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.9.1
+  - @rocket.chat/omnichannel-services@0.1.16
+  - @rocket.chat/core-services@0.3.16
+  - @rocket.chat/model-typings@0.4.2
+  - @rocket.chat/models@0.0.40
+  </details>
+
 ## 0.3.15
 
 ### Patch Changes
diff --git a/ee/apps/queue-worker/package.json b/ee/apps/queue-worker/package.json
index d2f07cc5e312..8359965f43f8 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.3.15",
+	"version": "0.3.16",
 	"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 089b9c8fbd3c..bde0be97af7f 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.3.16
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.9.1
+  - @rocket.chat/core-services@0.3.16
+  - @rocket.chat/model-typings@0.4.2
+  - @rocket.chat/models@0.0.40
+  </details>
+
 ## 0.3.15
 
 ### Patch Changes
diff --git a/ee/apps/stream-hub-service/package.json b/ee/apps/stream-hub-service/package.json
index a2ac2464c0aa..920f0ed1a18e 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.3.15",
+	"version": "0.3.16",
 	"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 62278200a94d..2d8287498da8 100644
--- a/ee/packages/api-client/CHANGELOG.md
+++ b/ee/packages/api-client/CHANGELOG.md
@@ -1,5 +1,15 @@
 # @rocket.chat/api-client
 
+## 0.1.34
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.9.1
+  - @rocket.chat/rest-typings@6.9.1
+  </details>
+
 ## 0.1.33
 
 ### Patch Changes
diff --git a/ee/packages/api-client/package.json b/ee/packages/api-client/package.json
index f4b22774490b..a31a69aed784 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.1.33",
+	"version": "0.1.34",
 	"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 8c64d0836416..38c87b8b935b 100644
--- a/ee/packages/ddp-client/CHANGELOG.md
+++ b/ee/packages/ddp-client/CHANGELOG.md
@@ -1,5 +1,15 @@
 # @rocket.chat/ddp-client
 
+## 0.2.25
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/rest-typings@6.9.1
+  - @rocket.chat/api-client@0.1.34
+  </details>
+
 ## 0.2.24
 
 ### Patch Changes
diff --git a/ee/packages/ddp-client/package.json b/ee/packages/ddp-client/package.json
index cbf3bd20c52b..53a4e54e45bc 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.2.24",
+	"version": "0.2.25",
 	"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 80f539b4ed74..62511825e26d 100644
--- a/ee/packages/license/CHANGELOG.md
+++ b/ee/packages/license/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @rocket.chat/license
 
+## 0.1.16
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.9.1
+  </details>
+
 ## 0.1.15
 
 ### Patch Changes
diff --git a/ee/packages/license/package.json b/ee/packages/license/package.json
index 6dc46eea1cf8..d2e88d8baaf7 100644
--- a/ee/packages/license/package.json
+++ b/ee/packages/license/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/license",
-	"version": "0.1.15",
+	"version": "0.1.16",
 	"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 15f0fb538132..1e632412860d 100644
--- a/ee/packages/omnichannel-services/CHANGELOG.md
+++ b/ee/packages/omnichannel-services/CHANGELOG.md
@@ -1,5 +1,19 @@
 # @rocket.chat/omnichannel-services
 
+## 0.1.16
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.9.1
+  - @rocket.chat/rest-typings@6.9.1
+  - @rocket.chat/pdf-worker@0.0.40
+  - @rocket.chat/core-services@0.3.16
+  - @rocket.chat/model-typings@0.4.2
+  - @rocket.chat/models@0.0.40
+  </details>
+
 ## 0.1.15
 
 ### Patch Changes
diff --git a/ee/packages/omnichannel-services/package.json b/ee/packages/omnichannel-services/package.json
index bea077c18386..55abce301be6 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.1.15",
+	"version": "0.1.16",
 	"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 ee34d97dc362..6a48406ea25a 100644
--- a/ee/packages/pdf-worker/CHANGELOG.md
+++ b/ee/packages/pdf-worker/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @rocket.chat/pdf-worker
 
+## 0.0.40
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.9.1
+  </details>
+
 ## 0.0.39
 
 ### Patch Changes
diff --git a/ee/packages/pdf-worker/package.json b/ee/packages/pdf-worker/package.json
index 71a94eee43b5..fdb192d4ada8 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.0.39",
+	"version": "0.0.40",
 	"private": true,
 	"devDependencies": {
 		"@storybook/addon-essentials": "~6.5.16",
diff --git a/ee/packages/presence/CHANGELOG.md b/ee/packages/presence/CHANGELOG.md
index e96a8365cd10..d3579b6166aa 100644
--- a/ee/packages/presence/CHANGELOG.md
+++ b/ee/packages/presence/CHANGELOG.md
@@ -1,5 +1,16 @@
 # @rocket.chat/presence
 
+## 0.1.16
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.9.1
+  - @rocket.chat/core-services@0.3.16
+  - @rocket.chat/models@0.0.40
+  </details>
+
 ## 0.1.15
 
 ### Patch Changes
diff --git a/ee/packages/presence/package.json b/ee/packages/presence/package.json
index 4e609c5d954b..2367b5968e0f 100644
--- a/ee/packages/presence/package.json
+++ b/ee/packages/presence/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/presence",
-	"version": "0.1.15",
+	"version": "0.1.16",
 	"private": true,
 	"devDependencies": {
 		"@babel/core": "~7.22.20",
diff --git a/package.json b/package.json
index b9e63ffa85af..c4e0e5f88083 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "rocket.chat",
-	"version": "6.9.0",
+	"version": "6.9.1",
 	"description": "Rocket.Chat Monorepo",
 	"main": "index.js",
 	"private": true,
diff --git a/packages/apps/CHANGELOG.md b/packages/apps/CHANGELOG.md
index f58d8fbfe387..2d1d944b1ad2 100644
--- a/packages/apps/CHANGELOG.md
+++ b/packages/apps/CHANGELOG.md
@@ -1,5 +1,15 @@
 # @rocket.chat/apps
 
+## 0.0.7
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.9.1
+  - @rocket.chat/model-typings@0.4.2
+  </details>
+
 ## 0.0.6
 
 ### Patch Changes
diff --git a/packages/apps/package.json b/packages/apps/package.json
index ee99ba288fab..23103ffe2a28 100644
--- a/packages/apps/package.json
+++ b/packages/apps/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/apps",
-	"version": "0.0.6",
+	"version": "0.0.7",
 	"private": true,
 	"devDependencies": {
 		"@types/jest": "~29.5.7",
diff --git a/packages/core-services/CHANGELOG.md b/packages/core-services/CHANGELOG.md
index 779db0d7b4ca..929bc8b3147c 100644
--- a/packages/core-services/CHANGELOG.md
+++ b/packages/core-services/CHANGELOG.md
@@ -1,5 +1,16 @@
 # @rocket.chat/core-services
 
+## 0.3.16
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.9.1
+  - @rocket.chat/rest-typings@6.9.1
+  - @rocket.chat/models@0.0.40
+  </details>
+
 ## 0.3.15
 
 ### Patch Changes
diff --git a/packages/core-services/package.json b/packages/core-services/package.json
index 6033814bf2fa..0d7dd248fa7e 100644
--- a/packages/core-services/package.json
+++ b/packages/core-services/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/core-services",
-	"version": "0.3.15",
+	"version": "0.3.16",
 	"private": true,
 	"devDependencies": {
 		"@babel/core": "~7.22.20",
diff --git a/packages/core-typings/CHANGELOG.md b/packages/core-typings/CHANGELOG.md
index cb92dfed9f7f..fed7f005f13f 100644
--- a/packages/core-typings/CHANGELOG.md
+++ b/packages/core-typings/CHANGELOG.md
@@ -1,5 +1,7 @@
 # @rocket.chat/core-typings
 
+## 6.9.1
+
 ## 6.9.0
 
 ### Minor Changes
diff --git a/packages/core-typings/package.json b/packages/core-typings/package.json
index 492fb7be848b..0760888ba467 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.9.0",
+	"version": "6.9.1",
 	"devDependencies": {
 		"@rocket.chat/eslint-config": "workspace:^",
 		"eslint": "~8.45.0",
diff --git a/packages/cron/CHANGELOG.md b/packages/cron/CHANGELOG.md
index b79a1aa46e9d..472bc38c0b03 100644
--- a/packages/cron/CHANGELOG.md
+++ b/packages/cron/CHANGELOG.md
@@ -1,5 +1,15 @@
 # @rocket.chat/cron
 
+## 0.0.36
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.9.1
+  - @rocket.chat/models@0.0.40
+  </details>
+
 ## 0.0.35
 
 ### Patch Changes
diff --git a/packages/cron/package.json b/packages/cron/package.json
index 1755e8a33a2b..4d6d7c999fd3 100644
--- a/packages/cron/package.json
+++ b/packages/cron/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/cron",
-	"version": "0.0.35",
+	"version": "0.0.36",
 	"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 21652a54903b..21714d28c544 100644
--- a/packages/fuselage-ui-kit/CHANGELOG.md
+++ b/packages/fuselage-ui-kit/CHANGELOG.md
@@ -1,5 +1,18 @@
 # Change Log
 
+## 7.0.1
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.9.1
+  - @rocket.chat/gazzodown@7.0.1
+  - @rocket.chat/ui-contexts@7.0.1
+  - @rocket.chat/ui-avatar@3.0.1
+  - @rocket.chat/ui-video-conf@7.0.1
+  </details>
+
 ## 7.0.0
 
 ### Minor Changes
diff --git a/packages/fuselage-ui-kit/package.json b/packages/fuselage-ui-kit/package.json
index 7a2fa548b145..87fd209fc567 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": "7.0.0",
+  "version": "7.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": "3.0.0",
-    "@rocket.chat/ui-contexts": "7.0.0",
+    "@rocket.chat/ui-avatar": "3.0.1",
+    "@rocket.chat/ui-contexts": "7.0.1",
     "@rocket.chat/ui-kit": "0.34.0",
-    "@rocket.chat/ui-video-conf": "7.0.0",
+    "@rocket.chat/ui-video-conf": "7.0.1",
     "@tanstack/react-query": "*",
     "react": "*",
     "react-dom": "*"
@@ -110,7 +110,7 @@
     "typescript": "~5.3.3"
   },
   "dependencies": {
-    "@rocket.chat/core-typings": "6.9.0",
+    "@rocket.chat/core-typings": "6.9.1",
     "@rocket.chat/gazzodown": "workspace:^",
     "@rocket.chat/ui-kit": "workspace:~",
     "tslib": "^2.5.3"
diff --git a/packages/gazzodown/CHANGELOG.md b/packages/gazzodown/CHANGELOG.md
index 61620a5e7eb8..bba54175bf43 100644
--- a/packages/gazzodown/CHANGELOG.md
+++ b/packages/gazzodown/CHANGELOG.md
@@ -1,5 +1,16 @@
 # @rocket.chat/gazzodown
 
+## 7.0.1
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.9.1
+  - @rocket.chat/ui-contexts@7.0.1
+  - @rocket.chat/ui-client@7.0.1
+  </details>
+
 ## 7.0.0
 
 ### Patch Changes
diff --git a/packages/gazzodown/package.json b/packages/gazzodown/package.json
index fe7b6a0df3e2..023fa4975075 100644
--- a/packages/gazzodown/package.json
+++ b/packages/gazzodown/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/gazzodown",
-	"version": "7.0.0",
+	"version": "7.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": "7.0.0",
-		"@rocket.chat/ui-contexts": "7.0.0",
+		"@rocket.chat/ui-client": "7.0.1",
+		"@rocket.chat/ui-contexts": "7.0.1",
 		"katex": "*",
 		"react": "*"
 	},
diff --git a/packages/instance-status/CHANGELOG.md b/packages/instance-status/CHANGELOG.md
index ef804a060a70..6b7d85d501e2 100644
--- a/packages/instance-status/CHANGELOG.md
+++ b/packages/instance-status/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @rocket.chat/instance-status
 
+## 0.0.40
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/models@0.0.40
+  </details>
+
 ## 0.0.39
 
 ### Patch Changes
diff --git a/packages/instance-status/package.json b/packages/instance-status/package.json
index 1b9a81c6f432..d5a199a1b10c 100644
--- a/packages/instance-status/package.json
+++ b/packages/instance-status/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/instance-status",
-	"version": "0.0.39",
+	"version": "0.0.40",
 	"private": true,
 	"devDependencies": {
 		"@rocket.chat/eslint-config": "workspace:^",
diff --git a/packages/livechat/CHANGELOG.md b/packages/livechat/CHANGELOG.md
index 05f50031910d..f7d7ed0299a9 100644
--- a/packages/livechat/CHANGELOG.md
+++ b/packages/livechat/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @rocket.chat/livechat Change Log
 
+## 1.17.1
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/gazzodown@7.0.1
+  </details>
+
 ## 1.17.0
 
 ### Minor Changes
diff --git a/packages/livechat/package.json b/packages/livechat/package.json
index a47edd10bfce..123248dc3c17 100644
--- a/packages/livechat/package.json
+++ b/packages/livechat/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/livechat",
-	"version": "1.17.0",
+	"version": "1.17.1",
 	"files": [
 		"/build"
 	],
diff --git a/packages/model-typings/CHANGELOG.md b/packages/model-typings/CHANGELOG.md
index be6af1a7d7de..7c6fe4aebaa7 100644
--- a/packages/model-typings/CHANGELOG.md
+++ b/packages/model-typings/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @rocket.chat/model-typings
 
+## 0.4.2
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.9.1
+  </details>
+
 ## 0.4.1
 
 ### Patch Changes
diff --git a/packages/model-typings/package.json b/packages/model-typings/package.json
index dac38893963a..fdacc8878eff 100644
--- a/packages/model-typings/package.json
+++ b/packages/model-typings/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/model-typings",
-	"version": "0.4.1",
+	"version": "0.4.2",
 	"private": true,
 	"devDependencies": {
 		"@types/jest": "~29.5.7",
diff --git a/packages/models/CHANGELOG.md b/packages/models/CHANGELOG.md
index 02e520ef1e9b..c572246539df 100644
--- a/packages/models/CHANGELOG.md
+++ b/packages/models/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @rocket.chat/models
 
+## 0.0.40
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/model-typings@0.4.2
+  </details>
+
 ## 0.0.39
 
 ### Patch Changes
diff --git a/packages/models/package.json b/packages/models/package.json
index 7280cb2e36d8..5d2eae9a49bc 100644
--- a/packages/models/package.json
+++ b/packages/models/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/models",
-	"version": "0.0.39",
+	"version": "0.0.40",
 	"private": true,
 	"devDependencies": {
 		"@swc/core": "^1.3.95",
diff --git a/packages/rest-typings/CHANGELOG.md b/packages/rest-typings/CHANGELOG.md
index b2f584d33557..87ea17ff0985 100644
--- a/packages/rest-typings/CHANGELOG.md
+++ b/packages/rest-typings/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @rocket.chat/rest-typings
 
+## 6.9.1
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.9.1
+  </details>
+
 ## 6.9.0
 
 ### Minor Changes
diff --git a/packages/rest-typings/package.json b/packages/rest-typings/package.json
index 9f425ec9521d..864b4264b383 100644
--- a/packages/rest-typings/package.json
+++ b/packages/rest-typings/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/rest-typings",
-	"version": "6.9.0",
+	"version": "6.9.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 0d61eb6eb359..9617d88d5efa 100644
--- a/packages/ui-avatar/CHANGELOG.md
+++ b/packages/ui-avatar/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @rocket.chat/ui-avatar
 
+## 3.0.1
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/ui-contexts@7.0.1
+  </details>
+
 ## 3.0.0
 
 ### Patch Changes
diff --git a/packages/ui-avatar/package.json b/packages/ui-avatar/package.json
index 199129381457..bb0c167de8d9 100644
--- a/packages/ui-avatar/package.json
+++ b/packages/ui-avatar/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/ui-avatar",
-	"version": "3.0.0",
+	"version": "3.0.1",
 	"private": true,
 	"devDependencies": {
 		"@babel/core": "~7.22.20",
@@ -31,7 +31,7 @@
 	],
 	"peerDependencies": {
 		"@rocket.chat/fuselage": "*",
-		"@rocket.chat/ui-contexts": "7.0.0",
+		"@rocket.chat/ui-contexts": "7.0.1",
 		"react": "~17.0.2"
 	},
 	"volta": {
diff --git a/packages/ui-client/CHANGELOG.md b/packages/ui-client/CHANGELOG.md
index 5f68202e7cb0..147cbf298895 100644
--- a/packages/ui-client/CHANGELOG.md
+++ b/packages/ui-client/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @rocket.chat/ui-client
 
+## 7.0.1
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/ui-contexts@7.0.1
+  </details>
+
 ## 7.0.0
 
 ### Patch Changes
diff --git a/packages/ui-client/package.json b/packages/ui-client/package.json
index 3e4dcac33f90..3c43d85aa0ef 100644
--- a/packages/ui-client/package.json
+++ b/packages/ui-client/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/ui-client",
-	"version": "7.0.0",
+	"version": "7.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": "7.0.0",
+		"@rocket.chat/ui-contexts": "7.0.1",
 		"react": "~17.0.2"
 	},
 	"volta": {
diff --git a/packages/ui-contexts/CHANGELOG.md b/packages/ui-contexts/CHANGELOG.md
index 622a99d4d898..5d3fb186fb4d 100644
--- a/packages/ui-contexts/CHANGELOG.md
+++ b/packages/ui-contexts/CHANGELOG.md
@@ -1,5 +1,16 @@
 # @rocket.chat/ui-contexts
 
+## 7.0.1
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.9.1
+  - @rocket.chat/rest-typings@6.9.1
+  - @rocket.chat/ddp-client@0.2.25
+  </details>
+
 ## 7.0.0
 
 ### Patch Changes
diff --git a/packages/ui-contexts/package.json b/packages/ui-contexts/package.json
index 472d10708bfd..96d5d4bdf335 100644
--- a/packages/ui-contexts/package.json
+++ b/packages/ui-contexts/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/ui-contexts",
-	"version": "7.0.0",
+	"version": "7.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 50871b70ebd0..b56b9e522d6d 100644
--- a/packages/ui-video-conf/CHANGELOG.md
+++ b/packages/ui-video-conf/CHANGELOG.md
@@ -1,5 +1,15 @@
 # @rocket.chat/ui-video-conf
 
+## 7.0.1
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/ui-contexts@7.0.1
+  - @rocket.chat/ui-avatar@3.0.1
+  </details>
+
 ## 7.0.0
 
 ### Patch Changes
diff --git a/packages/ui-video-conf/package.json b/packages/ui-video-conf/package.json
index 8f7b18f3ba2b..5398fe901457 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": "7.0.0",
+	"version": "7.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": "3.0.0",
-		"@rocket.chat/ui-contexts": "7.0.0",
+		"@rocket.chat/ui-avatar": "3.0.1",
+		"@rocket.chat/ui-contexts": "7.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 1de746cfaf6c..914f4a8c5941 100644
--- a/packages/uikit-playground/CHANGELOG.md
+++ b/packages/uikit-playground/CHANGELOG.md
@@ -1,5 +1,16 @@
 # @rocket.chat/uikit-playground
 
+## 0.2.24
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/fuselage-ui-kit@7.0.1
+  - @rocket.chat/ui-contexts@7.0.1
+  - @rocket.chat/ui-avatar@3.0.1
+  </details>
+
 ## 0.2.23
 
 ### Patch Changes
diff --git a/packages/uikit-playground/package.json b/packages/uikit-playground/package.json
index d12ece478b7c..3a63ac38a3ec 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.2.23",
+  "version": "0.2.24",
   "type": "module",
   "scripts": {
     "dev": "vite",
diff --git a/packages/web-ui-registration/CHANGELOG.md b/packages/web-ui-registration/CHANGELOG.md
index 16398fd01f1e..955775cb3873 100644
--- a/packages/web-ui-registration/CHANGELOG.md
+++ b/packages/web-ui-registration/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @rocket.chat/web-ui-registration
 
+## 7.0.1
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/ui-contexts@7.0.1
+  </details>
+
 ## 7.0.0
 
 ### Patch Changes
diff --git a/packages/web-ui-registration/package.json b/packages/web-ui-registration/package.json
index 35bcc20bee17..837e150bbb0f 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": "7.0.0",
+	"version": "7.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.1",
-		"@rocket.chat/ui-contexts": "7.0.0",
+		"@rocket.chat/ui-contexts": "7.0.1",
 		"@tanstack/react-query": "*",
 		"react": "*",
 		"react-hook-form": "*",

From 65d16883dc606df032e5fc013644aac42a76e8d3 Mon Sep 17 00:00:00 2001
From: Gustavo Reis Bauer <gustavoreisbauer@gmail.com>
Date: Wed, 12 Jun 2024 17:55:12 -0300
Subject: [PATCH 13/94] test: Rewrote the rooms.helper file in typescript
 (#32556)

---
 apps/meteor/tests/data/rooms.helper.js        | 118 -------------
 apps/meteor/tests/data/rooms.helper.ts        | 167 ++++++++++++++++++
 apps/meteor/tests/data/uploads.helper.ts      |  43 +++--
 apps/meteor/tests/end-to-end/api/05-chat.js   |   2 +-
 .../api/07-incoming-integrations.js           |   2 +-
 .../tests/end-to-end/api/16-commands.js       |   2 +-
 .../end-to-end/apps/05-video-conferences.ts   |   4 +-
 7 files changed, 197 insertions(+), 141 deletions(-)
 delete mode 100644 apps/meteor/tests/data/rooms.helper.js
 create mode 100644 apps/meteor/tests/data/rooms.helper.ts

diff --git a/apps/meteor/tests/data/rooms.helper.js b/apps/meteor/tests/data/rooms.helper.js
deleted file mode 100644
index 6e74509deab4..000000000000
--- a/apps/meteor/tests/data/rooms.helper.js
+++ /dev/null
@@ -1,118 +0,0 @@
-import { resolve } from 'path';
-import { api, credentials, request } from './api-data';
-
-export const createRoom = ({
-	name,
-	type,
-	username,
-	token,
-	agentId,
-	members,
-	credentials: customCredentials,
-	extraData,
-	voipCallDirection = 'inbound',
-}) => {
-	if (!type) {
-		throw new Error('"type" is required in "createRoom.ts" test helper');
-	}
-	if (type === 'v') {
-		/* Special handling for voip type of rooms.
-		 * The endpoints below do not have a way to create
-		 * a voip room. Hence creation of a voip room
-		 * is handled separately here.
-		 */
-		return request
-			.get(api(`voip/room?token=${token}&agentId=${agentId}&direction=${voipCallDirection}`))
-			.set(customCredentials || credentials)
-			.send();
-	}
-	if (type === 'd' && !username) {
-		throw new Error('To be able to create DM Room, you must provide the username');
-	}
-	const endpoints = {
-		c: 'channels.create',
-		p: 'groups.create',
-		d: 'im.create',
-	};
-	const params = type === 'd' ? { username } : { name };
-
-	return request
-		.post(api(endpoints[type]))
-		.set(customCredentials || credentials)
-		.send({
-			...params,
-			...(members && { members }),
-			...(extraData && { extraData }),
-		});
-};
-
-export const asyncCreateRoom = ({ name, type, username, members = [] }) =>
-	new Promise((resolve) => {
-		createRoom({ name, type, username, members }).end(resolve);
-	});
-
-function actionRoom({ action, type, roomId, overrideCredentials = credentials, extraData = {} }) {
-	if (!type) {
-		throw new Error(`"type" is required in "${action}Room" test helper`);
-	}
-	if (!roomId) {
-		throw new Error(`"roomId" is required in "${action}Room" test helper`);
-	}
-	const endpoints = {
-		c: 'channels',
-		p: 'groups',
-		d: 'im',
-	};
-	return new Promise((resolve) => {
-		request
-			.post(api(`${endpoints[type]}.${action}`))
-			.set(overrideCredentials)
-			.send({
-				roomId,
-				...extraData,
-			})
-			.end(resolve);
-	});
-}
-
-export const deleteRoom = ({ type, roomId }) => actionRoom({ action: 'delete', type, roomId, overrideCredentials: credentials });
-
-export const closeRoom = ({ type, roomId }) => actionRoom({ action: 'close', type, roomId });
-
-export const joinChannel = ({ overrideCredentials = credentials, roomId }) =>
-	request.post(api('channels.join')).set(overrideCredentials).send({
-		roomId,
-	});
-
-export const inviteToChannel = ({ overrideCredentials = credentials, roomId, userId }) =>
-	request.post(api('channels.invite')).set(credentials).send({
-		userId,
-		roomId,
-	});
-
-export const addRoomOwner = ({ type, roomId, userId }) => actionRoom({ action: 'addOwner', type, roomId, extraData: { userId } });
-
-export const removeRoomOwner = ({ type, roomId, userId }) => actionRoom({ action: 'removeOwner', type, roomId, extraData: { userId } });
-
-export const getChannelRoles = async ({ roomId, overrideCredentials = credentials }) =>
-	(
-		await request.get(api('channels.roles')).set(overrideCredentials).query({
-			roomId,
-		})
-	).body.roles;
-
-export const setRoomConfig = ({ roomId, favorite, isDefault }) => {
-	return request
-		.post(api('rooms.saveRoomSettings'))
-		.set(credentials)
-		.send({
-			rid: roomId,
-			default: isDefault,
-			favorite: favorite
-				? {
-						defaultValue: true,
-						favorite: false,
-				  }
-				: undefined,
-		});
-};
diff --git a/apps/meteor/tests/data/rooms.helper.ts b/apps/meteor/tests/data/rooms.helper.ts
new file mode 100644
index 000000000000..384ac5614e41
--- /dev/null
+++ b/apps/meteor/tests/data/rooms.helper.ts
@@ -0,0 +1,167 @@
+import type { IRoom } from '@rocket.chat/core-typings';
+import { api, credentials, request } from './api-data';
+import type { IUser } from '@rocket.chat/core-typings';
+
+type Credentials = { 'X-Auth-Token'?: string; 'X-User-Id'?: string };
+
+type CreateRoomParams = {
+	name?: IRoom['name'];
+	type: IRoom['t'];
+	username?: string;
+	token?: string;
+	agentId?: string;
+	members?: string[];
+	credentials?: Credentials;
+	extraData?: Record<string, any>;
+	voipCallDirection?: 'inbound' | 'outbound';
+};
+
+export const createRoom = ({
+	name,
+	type,
+	username,
+	token,
+	agentId,
+	members,
+	credentials: customCredentials,
+	extraData,
+	voipCallDirection = 'inbound',
+}: CreateRoomParams) => {
+	if (!type) {
+		throw new Error('"type" is required in "createRoom.ts" test helper');
+	}
+
+	if (type === 'v') {
+		/* Special handling for voip type of rooms.
+		 * The endpoints below do not have a way to create
+		 * a voip room. Hence creation of a voip room
+		 * is handled separately here.
+		 */
+		return request
+			.get(api(`voip/room?token=${token}&agentId=${agentId}&direction=${voipCallDirection}`))
+			.set(customCredentials || credentials)
+			.send();
+	}
+
+	if (type === 'd' && !username) {
+		throw new Error('To be able to create DM Room, you must provide the username');
+	}
+
+	const endpoints = {
+		c: 'channels.create',
+		p: 'groups.create',
+		d: 'im.create',
+	};
+	const params = type === 'd' ? { username } : { name };
+
+	// Safe assertion because we already checked the type is not 'v'
+	// which is the only case where type is not in the endpoints object
+	const roomType = endpoints[type as keyof typeof endpoints];
+
+	return request
+		.post(api(roomType))
+		.set(customCredentials || credentials)
+		.send({
+			...params,
+			...(members && { members }),
+			...(extraData && { extraData }),
+		});
+};
+
+export const asyncCreateRoom = ({ name, type, username, members = [] }: Pick<CreateRoomParams, 'name' | 'type' | 'username' | 'members'>) =>
+	new Promise((resolve) => {
+		createRoom({ name, type, username, members }).end(resolve);
+	});
+
+type ActionType = 'delete' | 'close' | 'addOwner' | 'removeOwner';
+type ActionRoomParams = {
+	action: ActionType;
+	type: Exclude<IRoom['t'], 'v' | 'l'>;
+	roomId: IRoom['_id'];
+	overrideCredentials?: Credentials;
+	extraData?: Record<string, any>;
+};
+
+function actionRoom({ action, type, roomId, overrideCredentials = credentials, extraData = {} }: ActionRoomParams) {
+	if (!type) {
+		throw new Error(`"type" is required in "${action}Room" test helper`);
+	}
+	if (!roomId) {
+		throw new Error(`"roomId" is required in "${action}Room" test helper`);
+	}
+	const endpoints = {
+		c: 'channels',
+		p: 'groups',
+		d: 'im',
+	};
+	return new Promise((resolve) => {
+		request
+			.post(api(`${endpoints[type]}.${action}`))
+			.set(overrideCredentials)
+			.send({
+				roomId,
+				...extraData,
+			})
+			.end(resolve);
+	});
+}
+
+export const deleteRoom = ({ type, roomId }: { type: ActionRoomParams['type']; roomId: IRoom['_id'] }) =>
+	actionRoom({ action: 'delete', type, roomId, overrideCredentials: credentials });
+
+export const closeRoom = ({ type, roomId }: { type: ActionRoomParams['type']; roomId: IRoom['_id'] }) =>
+	actionRoom({ action: 'close', type, roomId });
+
+export const joinChannel = ({ overrideCredentials = credentials, roomId }: { overrideCredentials: Credentials; roomId: IRoom['_id'] }) =>
+	request.post(api('channels.join')).set(overrideCredentials).send({
+		roomId,
+	});
+
+export const inviteToChannel = ({
+	overrideCredentials = credentials,
+	roomId,
+	userId,
+}: {
+	overrideCredentials: Credentials;
+	roomId: IRoom['_id'];
+	userId: IUser['_id'];
+}) =>
+	request.post(api('channels.invite')).set(overrideCredentials).send({
+		userId,
+		roomId,
+	});
+
+export const addRoomOwner = ({ type, roomId, userId }: { type: ActionRoomParams['type']; roomId: IRoom['_id']; userId: IUser['_id'] }) =>
+	actionRoom({ action: 'addOwner', type, roomId, extraData: { userId } });
+
+export const removeRoomOwner = ({ type, roomId, userId }: { type: ActionRoomParams['type']; roomId: IRoom['_id']; userId: IUser['_id'] }) =>
+	actionRoom({ action: 'removeOwner', type, roomId, extraData: { userId } });
+
+export const getChannelRoles = async ({
+	roomId,
+	overrideCredentials = credentials,
+}: {
+	roomId: IRoom['_id'];
+	overrideCredentials: Credentials;
+}) =>
+	(
+		await request.get(api('channels.roles')).set(overrideCredentials).query({
+			roomId,
+		})
+	).body.roles;
+
+export const setRoomConfig = ({ roomId, favorite, isDefault }: { roomId: IRoom['_id']; favorite: boolean; isDefault: boolean }) => {
+	return request
+		.post(api('rooms.saveRoomSettings'))
+		.set(credentials)
+		.send({
+			rid: roomId,
+			default: isDefault,
+			favorite: favorite
+				? {
+						defaultValue: true,
+						favorite: false,
+				  }
+				: undefined,
+		});
+};
diff --git a/apps/meteor/tests/data/uploads.helper.ts b/apps/meteor/tests/data/uploads.helper.ts
index eabd49e11a3b..5f6e4924d9ff 100644
--- a/apps/meteor/tests/data/uploads.helper.ts
+++ b/apps/meteor/tests/data/uploads.helper.ts
@@ -9,29 +9,38 @@ import { imgURL } from './interactions';
 import { updateSetting } from './permissions.helper';
 import { createRoom, deleteRoom } from './rooms.helper';
 import { createVisitor } from './livechat/rooms';
-
-export async function testFileUploads(filesEndpoint: 'channels.files' | 'groups.files' | 'im.files', roomType: 'c' | 'd' | 'p', invalidRoomError = 'error-room-not-found') {
-	let testRoom: Record<string, any>;
+import { IRoom } from '@rocket.chat/core-typings';
+
+export async function testFileUploads(
+	filesEndpoint: 'channels.files' | 'groups.files' | 'im.files',
+	roomType: 'c' | 'd' | 'p',
+	invalidRoomError = 'error-room-not-found',
+) {
+	let testRoom: IRoom;
 	const propertyMap = {
-		'c': 'channel',
-		'p': 'group',
-		'd': 'room',
+		c: 'channel',
+		p: 'group',
+		d: 'room',
 	};
 
-	before(async function () {
-		await updateSetting('VoIP_Enabled', true);
-		await updateSetting('Message_KeepHistory', true);
+	before(async () => {
+		await Promise.all([updateSetting('VoIP_Enabled', true), updateSetting('Message_KeepHistory', true)]);
 
-		testRoom = (await createRoom({ type: roomType, ...(roomType === 'd' ? { username: 'rocket.cat' } : { name: `channel-files-${Date.now()}` }) } as any)).body[propertyMap[roomType]];
+		testRoom = (
+			await createRoom({
+				type: roomType,
+				...(roomType === 'd' ? { username: 'rocket.cat' } : { name: `channel-files-${Date.now()}` }),
+			} as any)
+		).body[propertyMap[roomType]];
 	});
 
-	after(async function () {
-		await Promise.all([
-			deleteRoom({ type: 'c', roomId: testRoom._id }),
+	after(() =>
+		Promise.all([
+			deleteRoom({ type: 'c' as const, roomId: testRoom._id }),
 			updateSetting('VoIP_Enabled', false),
 			updateSetting('Message_KeepHistory', false),
-		]);
-	});
+		]),
+	);
 
 	const createVoipRoom = async function () {
 		const testUser = await createUser({ roles: ['user', 'livechat-agent'] });
@@ -42,10 +51,6 @@ export async function testFileUploads(filesEndpoint: 'channels.files' | 'groups.
 			type: 'v',
 			agentId: testUser._id,
 			credentials: testUserCredentials,
-			name: null,
-			username: null,
-			members: null,
-			extraData: null,
 		});
 
 		return roomResponse.body.room;
diff --git a/apps/meteor/tests/end-to-end/api/05-chat.js b/apps/meteor/tests/end-to-end/api/05-chat.js
index fe02112c2811..96aa276e1a9c 100644
--- a/apps/meteor/tests/end-to-end/api/05-chat.js
+++ b/apps/meteor/tests/end-to-end/api/05-chat.js
@@ -5,7 +5,7 @@ import { getCredentials, api, request, credentials, message } from '../../data/a
 import { sendSimpleMessage, deleteMessage, pinMessage } from '../../data/chat.helper.js';
 import { imgURL } from '../../data/interactions';
 import { updatePermission, updateSetting } from '../../data/permissions.helper';
-import { createRoom, deleteRoom } from '../../data/rooms.helper.js';
+import { createRoom, deleteRoom } from '../../data/rooms.helper';
 import { password } from '../../data/user';
 import { createUser, deleteUser, login } from '../../data/users.helper';
 
diff --git a/apps/meteor/tests/end-to-end/api/07-incoming-integrations.js b/apps/meteor/tests/end-to-end/api/07-incoming-integrations.js
index 37ce98ade6c5..7c325a9e3cd2 100644
--- a/apps/meteor/tests/end-to-end/api/07-incoming-integrations.js
+++ b/apps/meteor/tests/end-to-end/api/07-incoming-integrations.js
@@ -4,7 +4,7 @@ import { after, before, describe, it } from 'mocha';
 import { getCredentials, api, request, credentials } from '../../data/api-data.js';
 import { createIntegration, removeIntegration } from '../../data/integration.helper';
 import { updatePermission } from '../../data/permissions.helper';
-import { createRoom, deleteRoom } from '../../data/rooms.helper.js';
+import { createRoom, deleteRoom } from '../../data/rooms.helper';
 import { password } from '../../data/user';
 import { createUser, deleteUser, login } from '../../data/users.helper';
 
diff --git a/apps/meteor/tests/end-to-end/api/16-commands.js b/apps/meteor/tests/end-to-end/api/16-commands.js
index 74e9255524c4..c0781167b67f 100644
--- a/apps/meteor/tests/end-to-end/api/16-commands.js
+++ b/apps/meteor/tests/end-to-end/api/16-commands.js
@@ -3,7 +3,7 @@ import { before, describe, it, after } from 'mocha';
 
 import { getCredentials, api, request, credentials } from '../../data/api-data.js';
 import { sendSimpleMessage } from '../../data/chat.helper.js';
-import { createRoom, deleteRoom } from '../../data/rooms.helper.js';
+import { createRoom, deleteRoom } from '../../data/rooms.helper';
 import { password } from '../../data/user';
 import { createUser, deleteUser, login } from '../../data/users.helper.js';
 
diff --git a/apps/meteor/tests/end-to-end/apps/05-video-conferences.ts b/apps/meteor/tests/end-to-end/apps/05-video-conferences.ts
index fb7f42ccdabd..d7772b7a233a 100644
--- a/apps/meteor/tests/end-to-end/apps/05-video-conferences.ts
+++ b/apps/meteor/tests/end-to-end/apps/05-video-conferences.ts
@@ -31,7 +31,9 @@ describe('Apps - Video Conferences', function () {
 		roomId = res.body.group._id;
 	});
 
-	after(() => Promise.all([cleanupApps(), deleteRoom({ type: 'p', roomId }), updateSetting('VideoConf_Default_Provider', '')]));
+	after(() =>
+		Promise.all([cleanupApps(), deleteRoom({ type: 'p', roomId: roomId as string }), updateSetting('VideoConf_Default_Provider', '')]),
+	);
 
 	describe('[With No App]', () => {
 		before(async () => {

From 4afd41cc604f97f1e19f70648dd4b8a66bee26b9 Mon Sep 17 00:00:00 2001
From: Hugo Costa <hugocarreiracosta@gmail.com>
Date: Thu, 13 Jun 2024 10:09:51 -0300
Subject: [PATCH 14/94] chore: change e2e password placeholder (#32569)

---
 apps/meteor/client/views/e2e/EnterE2EPasswordModal.tsx | 5 +++--
 packages/i18n/src/locales/ar.i18n.json                 | 3 +--
 packages/i18n/src/locales/ca.i18n.json                 | 3 +--
 packages/i18n/src/locales/cs.i18n.json                 | 3 +--
 packages/i18n/src/locales/da.i18n.json                 | 3 +--
 packages/i18n/src/locales/de-IN.i18n.json              | 3 +--
 packages/i18n/src/locales/de.i18n.json                 | 3 +--
 packages/i18n/src/locales/en.i18n.json                 | 7 ++++---
 packages/i18n/src/locales/es.i18n.json                 | 3 +--
 packages/i18n/src/locales/fi.i18n.json                 | 3 +--
 packages/i18n/src/locales/fr.i18n.json                 | 3 +--
 packages/i18n/src/locales/hr.i18n.json                 | 3 +--
 packages/i18n/src/locales/hu.i18n.json                 | 3 +--
 packages/i18n/src/locales/ja.i18n.json                 | 3 +--
 packages/i18n/src/locales/ka-GE.i18n.json              | 3 +--
 packages/i18n/src/locales/km.i18n.json                 | 3 +--
 packages/i18n/src/locales/ko.i18n.json                 | 3 +--
 packages/i18n/src/locales/nl.i18n.json                 | 3 +--
 packages/i18n/src/locales/pl.i18n.json                 | 3 +--
 packages/i18n/src/locales/pt-BR.i18n.json              | 7 ++++---
 packages/i18n/src/locales/pt.i18n.json                 | 3 +--
 packages/i18n/src/locales/ru.i18n.json                 | 3 +--
 packages/i18n/src/locales/sv.i18n.json                 | 3 +--
 packages/i18n/src/locales/tr.i18n.json                 | 3 +--
 packages/i18n/src/locales/uk.i18n.json                 | 3 +--
 packages/i18n/src/locales/zh-TW.i18n.json              | 3 +--
 packages/i18n/src/locales/zh.i18n.json                 | 3 +--
 27 files changed, 35 insertions(+), 56 deletions(-)

diff --git a/apps/meteor/client/views/e2e/EnterE2EPasswordModal.tsx b/apps/meteor/client/views/e2e/EnterE2EPasswordModal.tsx
index 161500da0cc3..711b5a6d21a1 100644
--- a/apps/meteor/client/views/e2e/EnterE2EPasswordModal.tsx
+++ b/apps/meteor/client/views/e2e/EnterE2EPasswordModal.tsx
@@ -42,8 +42,9 @@ const EnterE2EPasswordModal = ({
 			wrapperFunction={(props) => <Box is='form' onSubmit={handleConfirm} {...props} />}
 			variant='warning'
 			title={t('Enter_E2E_password')}
+			icon='warning'
 			cancelText={t('Do_It_Later')}
-			confirmText={t('Decode_Key')}
+			confirmText={t('Enable_encryption')}
 			onClose={onClose}
 			onCancel={onCancel}
 		>
@@ -51,7 +52,7 @@ const EnterE2EPasswordModal = ({
 			<FieldGroup mbs={24} w='full'>
 				<Field>
 					<FieldRow>
-						<PasswordInput error={passwordError} value={password} onChange={handleChange} placeholder={t('New_Password_Placeholder')} />
+						<PasswordInput error={passwordError} value={password} onChange={handleChange} placeholder={t('Please_enter_E2EE_password')} />
 					</FieldRow>
 					<FieldError>{passwordError}</FieldError>
 				</Field>
diff --git a/packages/i18n/src/locales/ar.i18n.json b/packages/i18n/src/locales/ar.i18n.json
index 85dfe30a4839..5b011c5663e2 100644
--- a/packages/i18n/src/locales/ar.i18n.json
+++ b/packages/i18n/src/locales/ar.i18n.json
@@ -1331,7 +1331,6 @@
   "DDP_Rate_Limit_User_Requests_Allowed": "الحد حسب المستخدم: الطلبات المسموح بها",
   "Deactivate": "إلغاء التنشيط",
   "Decline": "تراجع",
-  "Decode_Key": "مفتاح إلغاء التشفير",
   "Default": "افتراضي",
   "Default_value": "القيمة الافتراضية",
   "Delete": "حذف",
@@ -4897,4 +4896,4 @@
   "Enterprise": "مؤسسة",
   "UpgradeToGetMore_engagement-dashboard_Title": "التحليلات",
   "UpgradeToGetMore_auditing_Title": "تدقيق الرسائل"
-}
\ No newline at end of file
+}
diff --git a/packages/i18n/src/locales/ca.i18n.json b/packages/i18n/src/locales/ca.i18n.json
index 02908f809714..6c61025e16cf 100644
--- a/packages/i18n/src/locales/ca.i18n.json
+++ b/packages/i18n/src/locales/ca.i18n.json
@@ -1320,7 +1320,6 @@
   "DDP_Rate_Limit_User_Requests_Allowed": "Límit per usuari: peticions permeses",
   "Deactivate": "Desactivar",
   "Decline": "Rebutja",
-  "Decode_Key": "Clau de descodificació",
   "Default": "Per defecte",
   "Default_value": "Valor per defecte",
   "Delete": "Elimina",
@@ -4696,4 +4695,4 @@
   "Enterprise": "Empresa",
   "UpgradeToGetMore_engagement-dashboard_Title": "Analítiques",
   "UpgradeToGetMore_auditing_Title": "Auditoria de missatges"
-}
\ No newline at end of file
+}
diff --git a/packages/i18n/src/locales/cs.i18n.json b/packages/i18n/src/locales/cs.i18n.json
index a02152a66277..d122f1d89337 100644
--- a/packages/i18n/src/locales/cs.i18n.json
+++ b/packages/i18n/src/locales/cs.i18n.json
@@ -1131,7 +1131,6 @@
   "DDP_Rate_Limit_User_Requests_Allowed": "Limit podle uživatele: požadavky povoleny",
   "Deactivate": "Deaktivovat",
   "Decline": "Zamítnout",
-  "Decode_Key": "Dekódovat klíč",
   "Default": "Výchozí",
   "Default_value": "Výchozí hodnota",
   "Delete": "Smazat",
@@ -3982,4 +3981,4 @@
   "Enterprise": "Korporace",
   "UpgradeToGetMore_engagement-dashboard_Title": "Analytika",
   "UpgradeToGetMore_auditing_Title": "Audit zpráv"
-}
\ No newline at end of file
+}
diff --git a/packages/i18n/src/locales/da.i18n.json b/packages/i18n/src/locales/da.i18n.json
index 68f5b4a146d3..22183a5a0604 100644
--- a/packages/i18n/src/locales/da.i18n.json
+++ b/packages/i18n/src/locales/da.i18n.json
@@ -1210,7 +1210,6 @@
   "DDP_Rate_Limit_User_Requests_Allowed": "Begræns efter bruger: anmodninger tilladt",
   "Deactivate": "Deaktivér",
   "Decline": "Afslå",
-  "Decode_Key": "Afkodningsnøgle",
   "Default": "Standard",
   "Default_value": "Standardværdi",
   "Delete": "Slet",
@@ -4097,4 +4096,4 @@
   "Enterprise": "Firma",
   "UpgradeToGetMore_engagement-dashboard_Title": "Analyse",
   "UpgradeToGetMore_auditing_Title": "Meddelelsesovervågning"
-}
\ No newline at end of file
+}
diff --git a/packages/i18n/src/locales/de-IN.i18n.json b/packages/i18n/src/locales/de-IN.i18n.json
index 719cfe9da4fd..afb9dade56f5 100644
--- a/packages/i18n/src/locales/de-IN.i18n.json
+++ b/packages/i18n/src/locales/de-IN.i18n.json
@@ -931,7 +931,6 @@
   "DDP_Rate_Limit_User_Requests_Allowed": "Beschränkung durch Benutzer: Anforderungen zulässig",
   "Deactivate": "Deaktivieren",
   "Decline": "ablehnen",
-  "Decode_Key": "Entschlüsseln",
   "Default": "Voreinstellung",
   "Delete": "Löschen",
   "Delete_message": "Nachricht löschen",
@@ -3099,4 +3098,4 @@
   "Your_question": "Deine Frage",
   "Your_server_link": "Dein Server-Link",
   "Your_workspace_is_ready": "Dein Arbeitsbereich ist einsatzbereit 🎉"
-}
\ No newline at end of file
+}
diff --git a/packages/i18n/src/locales/de.i18n.json b/packages/i18n/src/locales/de.i18n.json
index ae2e193ec30e..b67d318f1176 100644
--- a/packages/i18n/src/locales/de.i18n.json
+++ b/packages/i18n/src/locales/de.i18n.json
@@ -1463,7 +1463,6 @@
   "DDP_Rate_Limit_User_Requests_Allowed": "Beschränkung durch Benutzer: Anforderungen zulässig",
   "Deactivate": "Deaktivieren",
   "Decline": "Ablehnen",
-  "Decode_Key": "Entschlüsseln",
   "default": "Standard",
   "Default": "Voreinstellung",
   "Default_provider": "Standardanbieter",
@@ -5517,4 +5516,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/en.i18n.json b/packages/i18n/src/locales/en.i18n.json
index 3a50e7d39df6..4e658735e130 100644
--- a/packages/i18n/src/locales/en.i18n.json
+++ b/packages/i18n/src/locales/en.i18n.json
@@ -1576,7 +1576,6 @@
   "Deactivate": "Deactivate",
   "Deactivated": "Deactivated",
   "Decline": "Decline",
-  "Decode_Key": "Decode Key",
   "default": "default",
   "Default": "Default",
   "Default_provider": "Default provider",
@@ -1798,7 +1797,7 @@
   "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 private groups and direct messages, enter your encryption password. <br/>You need to enter this password to encode/decode your messages on every client you use, since the key is not stored on the server.",
+  "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 login again, Rocket.Chat will generate a new key and restore your access to any encrypted room that has one or more members online. Due to the nature of the E2E encryption, Rocket.Chat will not be able to restore access to any encrypted room that has no member online.",
@@ -1925,6 +1924,7 @@
   "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",
@@ -1974,7 +1974,7 @@
   "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 E2E password",
+  "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.",
@@ -4179,6 +4179,7 @@
   "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",
diff --git a/packages/i18n/src/locales/es.i18n.json b/packages/i18n/src/locales/es.i18n.json
index d79d3fa71cb1..bbaaff711afb 100644
--- a/packages/i18n/src/locales/es.i18n.json
+++ b/packages/i18n/src/locales/es.i18n.json
@@ -1336,7 +1336,6 @@
   "DDP_Rate_Limit_User_Requests_Allowed": "Limitar por usuario: solicitudes permitidas",
   "Deactivate": "Desactivar",
   "Decline": "Rechazar",
-  "Decode_Key": "Clave de decodificación",
   "Default": "Por defecto",
   "Default_value": "Valor por defecto",
   "Delete": "Eliminar",
@@ -5095,4 +5094,4 @@
   "Unlimited_seats": "Puestos ilimitados",
   "Unlimited_MACs": "Contactos Activos por Mes (MAC) ilimitados",
   "Unlimited_seats_MACs": "Puestos y Contactos Activos por Mes (MAC) ilimitados"
-}
\ No newline at end of file
+}
diff --git a/packages/i18n/src/locales/fi.i18n.json b/packages/i18n/src/locales/fi.i18n.json
index bfdc4b6f872c..a55af647ff04 100644
--- a/packages/i18n/src/locales/fi.i18n.json
+++ b/packages/i18n/src/locales/fi.i18n.json
@@ -1484,7 +1484,6 @@
   "DDP_Rate_Limit_User_Requests_Allowed": "Rajoitus käyttäjän mukaan: sallitut pyynnöt",
   "Deactivate": "Poista käytöstä",
   "Decline": "Hylkää",
-  "Decode_Key": "Purkuavain",
   "default": "oletus",
   "Default": "Oletus",
   "Default_provider": "Oletuspalveluntarjoaja",
@@ -5755,4 +5754,4 @@
   "Theme_Appearence": "Teeman ulkoasu",
   "Enterprise": "Yritys",
   "UpgradeToGetMore_engagement-dashboard_Title": "Analytics"
-}
\ No newline at end of file
+}
diff --git a/packages/i18n/src/locales/fr.i18n.json b/packages/i18n/src/locales/fr.i18n.json
index ff96989499f8..d5f92179372f 100644
--- a/packages/i18n/src/locales/fr.i18n.json
+++ b/packages/i18n/src/locales/fr.i18n.json
@@ -1333,7 +1333,6 @@
   "DDP_Rate_Limit_User_Requests_Allowed": "Limite par utilisateur : demandes autorisées",
   "Deactivate": "Désactiver",
   "Decline": "Refuser",
-  "Decode_Key": "Décoder la clé",
   "Default": "Défaut",
   "Default_value": "Valeur par défaut",
   "Delete": "Supprimer",
@@ -4892,4 +4891,4 @@
   "Enterprise": "Entreprise",
   "UpgradeToGetMore_engagement-dashboard_Title": "Analyses",
   "UpgradeToGetMore_auditing_Title": "Audit des messages"
-}
\ No newline at end of file
+}
diff --git a/packages/i18n/src/locales/hr.i18n.json b/packages/i18n/src/locales/hr.i18n.json
index 1228f11009fb..c1046fdac669 100644
--- a/packages/i18n/src/locales/hr.i18n.json
+++ b/packages/i18n/src/locales/hr.i18n.json
@@ -916,7 +916,6 @@
   "DDP_Rate_Limit_User_Requests_Allowed": "Ograniči po korisniku: dopušteni zahtjevi",
   "Deactivate": "Isključi",
   "Decline": "Odbij",
-  "Decode_Key": "Ključ za dekodiranje",
   "Default": "Zadano",
   "Delete": "Obriši",
   "Delete_message": "Obriši poruku",
@@ -2904,4 +2903,4 @@
   "registration.component.form.sendConfirmationEmail": "Pošalji potvrdni email",
   "Enterprise": "Poduzeće",
   "UpgradeToGetMore_engagement-dashboard_Title": "Analitika"
-}
\ 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 aebe30ba343d..74fa10105efd 100644
--- a/packages/i18n/src/locales/hu.i18n.json
+++ b/packages/i18n/src/locales/hu.i18n.json
@@ -1440,7 +1440,6 @@
   "DDP_Rate_Limit_User_Requests_Allowed": "Korlátozás felhasználó szerint: kérések engedélyezve",
   "Deactivate": "Inaktiválás",
   "Decline": "Elutasítás",
-  "Decode_Key": "Visszafejtő kulcs",
   "default": "alapértelmezett",
   "Default": "Alapértelmezett",
   "Default_value": "Alapértelmezett érték",
@@ -5432,4 +5431,4 @@
   "Enterprise": "Vállalati",
   "UpgradeToGetMore_engagement-dashboard_Title": "Analitika",
   "UpgradeToGetMore_auditing_Title": "Üzenet ellenőrzés"
-}
\ No newline at end of file
+}
diff --git a/packages/i18n/src/locales/ja.i18n.json b/packages/i18n/src/locales/ja.i18n.json
index 7000ad51998b..e976c9559a78 100644
--- a/packages/i18n/src/locales/ja.i18n.json
+++ b/packages/i18n/src/locales/ja.i18n.json
@@ -1314,7 +1314,6 @@
   "DDP_Rate_Limit_User_Requests_Allowed": "ユーザーによる制限：許可された要求",
   "Deactivate": "無効にする",
   "Decline": "拒否",
-  "Decode_Key": "キーのデコード",
   "Default": "デフォルト",
   "Default_value": "デフォルト値",
   "Delete": "削除",
@@ -4835,4 +4834,4 @@
   "Enterprise": "エンタープライズ",
   "UpgradeToGetMore_engagement-dashboard_Title": "分析",
   "UpgradeToGetMore_auditing_Title": "メッセージ監査"
-}
\ No newline at end of file
+}
diff --git a/packages/i18n/src/locales/ka-GE.i18n.json b/packages/i18n/src/locales/ka-GE.i18n.json
index 7e28a9792559..ea1cde6e162e 100644
--- a/packages/i18n/src/locales/ka-GE.i18n.json
+++ b/packages/i18n/src/locales/ka-GE.i18n.json
@@ -1069,7 +1069,6 @@
   "DDP_Rate_Limit_User_Requests_Allowed": "მომხმარებლის მიერ შეზღუდვა: მოთხოვნა დაშვებულია",
   "Deactivate": "გამორთვა",
   "Decline": "უარყოფა",
-  "Decode_Key": "დეკოდირების გასაღები",
   "Default": "ნაგულისხმევი (default)",
   "Default_value": "ნაგულისხმევი მნიშვნელობა",
   "Delete": "წაშლა",
@@ -3683,4 +3682,4 @@
   "onboarding.form.registerOfflineForm.title": "ხელით დარეგისტრირება",
   "UpgradeToGetMore_engagement-dashboard_Title": "ანალიტიკა",
   "UpgradeToGetMore_auditing_Title": "შეტყობინებების შემოწმება"
-}
\ No newline at end of file
+}
diff --git a/packages/i18n/src/locales/km.i18n.json b/packages/i18n/src/locales/km.i18n.json
index 6254254f89cf..cc6d2f815193 100644
--- a/packages/i18n/src/locales/km.i18n.json
+++ b/packages/i18n/src/locales/km.i18n.json
@@ -996,7 +996,6 @@
   "DDP_Rate_Limit_User_Requests_Allowed": "កំណត់ដោយអ្នកប្រើ: ការស្នើសុំត្រូវបានអនុញ្ញាត",
   "Deactivate": "ធ្វើឲ្យមិនសកម្ម",
   "Decline": "បដិសេធ",
-  "Decode_Key": "សោរដោះលេខកូដ",
   "Default": "លំនាំដើម",
   "Default_value": "តម្លៃ​លំនាំដើម",
   "Delete": "លុប",
@@ -3128,4 +3127,4 @@
   "Enterprise": "សហគ្រាស",
   "UpgradeToGetMore_engagement-dashboard_Title": "វិភាគ",
   "UpgradeToGetMore_auditing_Title": "សវនកម្មសារ"
-}
\ No newline at end of file
+}
diff --git a/packages/i18n/src/locales/ko.i18n.json b/packages/i18n/src/locales/ko.i18n.json
index 49a542171868..b4b4ed006b47 100644
--- a/packages/i18n/src/locales/ko.i18n.json
+++ b/packages/i18n/src/locales/ko.i18n.json
@@ -1170,7 +1170,6 @@
   "DDP_Rate_Limit_User_Requests_Allowed": "사용자 제한 : 요청 허용",
   "Deactivate": "비활성화",
   "Decline": "거절",
-  "Decode_Key": "복호화 키",
   "Default": "기본",
   "Default_value": "기본값",
   "Delete": "삭제",
@@ -4040,4 +4039,4 @@
   "Enterprise": "기업",
   "UpgradeToGetMore_engagement-dashboard_Title": "분석(에널리틱스)",
   "UpgradeToGetMore_auditing_Title": "메시지 감사"
-}
\ No newline at end of file
+}
diff --git a/packages/i18n/src/locales/nl.i18n.json b/packages/i18n/src/locales/nl.i18n.json
index 7665b7a4ea54..41052e0fe06e 100644
--- a/packages/i18n/src/locales/nl.i18n.json
+++ b/packages/i18n/src/locales/nl.i18n.json
@@ -1325,7 +1325,6 @@
   "DDP_Rate_Limit_User_Requests_Allowed": "Limiet per gebruiker: verzoeken toegestaan",
   "Deactivate": "Deactiveren",
   "Decline": "Weigeren",
-  "Decode_Key": "Decodeer sleutel",
   "Default": "Standaard",
   "Default_value": "Standaardwaarde",
   "Delete": "Verwijderen",
@@ -4877,4 +4876,4 @@
   "Enterprise": "Onderneming",
   "UpgradeToGetMore_engagement-dashboard_Title": "Analytics",
   "UpgradeToGetMore_auditing_Title": "Bericht auditing"
-}
\ No newline at end of file
+}
diff --git a/packages/i18n/src/locales/pl.i18n.json b/packages/i18n/src/locales/pl.i18n.json
index 0936ec845df1..27e8e712d978 100644
--- a/packages/i18n/src/locales/pl.i18n.json
+++ b/packages/i18n/src/locales/pl.i18n.json
@@ -1429,7 +1429,6 @@
   "DDP_Rate_Limit_User_Requests_Allowed": "Limit według użytkowników: dozwolone żądania",
   "Deactivate": "Dezaktywuj",
   "Decline": "Odrzuć",
-  "Decode_Key": "Klucz dekodowania",
   "default": "Domyślny",
   "Default": "Domyślny",
   "Default_value": "Domyślna wartość",
@@ -5353,4 +5352,4 @@
   "Enterprise": "Enterprise",
   "UpgradeToGetMore_engagement-dashboard_Title": "Analityka",
   "UpgradeToGetMore_auditing_Title": "Audyt wiadomości"
-}
\ No newline at end of file
+}
diff --git a/packages/i18n/src/locales/pt-BR.i18n.json b/packages/i18n/src/locales/pt-BR.i18n.json
index 0fecc1fa944a..2259e79d64d6 100644
--- a/packages/i18n/src/locales/pt-BR.i18n.json
+++ b/packages/i18n/src/locales/pt-BR.i18n.json
@@ -1372,7 +1372,6 @@
   "DDP_Rate_Limit_User_Requests_Allowed": "Limite por usuário: solicitações permitidas",
   "Deactivate": "Desativar",
   "Decline": "Recusar",
-  "Decode_Key": "Chave de decodificação",
   "Default": "Padrão",
   "Default_value": "Valor padrão",
   "Delete": "Excluir",
@@ -1633,6 +1632,7 @@
   "Enable_CSP": "Habilitar política de segurança de conteúdo",
   "Enable_CSP_Description": "Não desative esta opção a não ser que você tenha uma versão personalizada e esteja tendo problemas devido a scrips inline",
   "Enable_Desktop_Notifications": "Habilitar notificações da área de trabalho",
+  "Enable_encryption" : "Ativar criptografia",
   "Enable_inquiry_fetch_by_stream": "Habilitar carga de dados de novas pesquisas de omnichannel utilizando stream",
   "Enable_omnichannel_auto_close_abandoned_rooms": "Habilitar o fechamento automático de salas abandonadas pelo visitante",
   "Enable_Password_History": "Habilitar histórico de senha",
@@ -1669,7 +1669,7 @@
   "Enter_authentication_code": "Digite o código de autenticação",
   "Enter_Behaviour": "Insira o comportamento da tecla",
   "Enter_Behaviour_Description": "Muda se a tecla Enter enviará uma mensagem ou fará quebra de linha",
-  "Enter_E2E_password": "Entre com senha E2E",
+  "Enter_E2E_password": "Entre com senha E2EE",
   "Enter_name_here": "Insira o nome aqui",
   "Enter_Normal": "Modo normal (enviar com Enter)",
   "Enter_to": "Enter para",
@@ -3380,6 +3380,7 @@
   "Please_enter_value_for_url": "Insira um valor para o URL do seu avatar.",
   "Please_enter_your_new_password_below": "Digite sua nova senha abaixo:",
   "Please_enter_your_password": "Digite sua senha",
+  "Please_enter_E2EE_password": "Por favor, digite a senha de E2EE",
   "Please_fill_a_label": "Preencha um rótulo",
   "Please_fill_a_name": "Preencha um nome",
   "Please_fill_a_token_name": "Preencha um nome de token válido",
@@ -5014,4 +5015,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 22dacb356003..3f9bfe543dcc 100644
--- a/packages/i18n/src/locales/pt.i18n.json
+++ b/packages/i18n/src/locales/pt.i18n.json
@@ -973,7 +973,6 @@
   "DDP_Rate_Limit_User_Requests_Allowed": "Limite por Usuário: Solicitações permitidas",
   "Deactivate": "Desactivar",
   "Decline": "Recusar",
-  "Decode_Key": "Chave de decodificação",
   "Default": "Padrão",
   "Delete": "Apagar",
   "Delete_message": "Apagar mensagem",
@@ -3187,4 +3186,4 @@
   "registration.component.form.sendConfirmationEmail": "Enviar email de confirmação",
   "Enterprise": "Empreendimento",
   "UpgradeToGetMore_engagement-dashboard_Title": "Analytics"
-}
\ No newline at end of file
+}
diff --git a/packages/i18n/src/locales/ru.i18n.json b/packages/i18n/src/locales/ru.i18n.json
index 9b4b31910ba4..3af2f4dfdf88 100644
--- a/packages/i18n/src/locales/ru.i18n.json
+++ b/packages/i18n/src/locales/ru.i18n.json
@@ -1444,7 +1444,6 @@
   "DDP_Rate_Limit_User_Requests_Allowed": "Ограничение по пользователю: запросы разрешены",
   "Deactivate": "Деактивировать",
   "Decline": "Отклонить",
-  "Decode_Key": "Код декодирования",
   "Default": "По умолчанию",
   "Default_value": "Значение по умолчанию",
   "Delete": "Удалить",
@@ -5104,4 +5103,4 @@
   "Enterprise": "Корпорация",
   "UpgradeToGetMore_engagement-dashboard_Title": "Аналитика",
   "UpgradeToGetMore_auditing_Title": "Аудит сообщений"
-}
\ No newline at end of file
+}
diff --git a/packages/i18n/src/locales/sv.i18n.json b/packages/i18n/src/locales/sv.i18n.json
index bea0ea1cb238..67f1912f25f0 100644
--- a/packages/i18n/src/locales/sv.i18n.json
+++ b/packages/i18n/src/locales/sv.i18n.json
@@ -1485,7 +1485,6 @@
   "DDP_Rate_Limit_User_Requests_Allowed": "Gräns per användare: förfrågningar tillåts",
   "Deactivate": "Inaktivera",
   "Decline": "Tacka nej",
-  "Decode_Key": "Avkodningsnyckel",
   "default": "standard",
   "Default": "Standard",
   "Default_provider": "Standardleverantör",
@@ -5759,4 +5758,4 @@
   "Theme_Appearence": "Utseende för tema",
   "Enterprise": "Enterprise",
   "UpgradeToGetMore_engagement-dashboard_Title": "Analytics"
-}
\ No newline at end of file
+}
diff --git a/packages/i18n/src/locales/tr.i18n.json b/packages/i18n/src/locales/tr.i18n.json
index 232b7eef4607..e8475e235715 100644
--- a/packages/i18n/src/locales/tr.i18n.json
+++ b/packages/i18n/src/locales/tr.i18n.json
@@ -976,7 +976,6 @@
   "DDP_Rate_Limit_User_Requests_Allowed": "Kullanıcı ile sınırlama: istekler izinli",
   "Deactivate": "Devre dışı bırak",
   "Decline": "Reddet",
-  "Decode_Key": "Kod Çözme Anahtarı",
   "Default": "Varsayılan",
   "Delete": "Sil",
   "Delete_all_closed_chats": "Tüm kapalı sohbetleri sil",
@@ -3276,4 +3275,4 @@
   "RegisterWorkspace_Features_Omnichannel_Title": "Çoklu Kanal",
   "Enterprise": "Kuruluş",
   "UpgradeToGetMore_engagement-dashboard_Title": "Mantıksal Analiz"
-}
\ No newline at end of file
+}
diff --git a/packages/i18n/src/locales/uk.i18n.json b/packages/i18n/src/locales/uk.i18n.json
index 7cf127f8c8bf..70dca33be576 100644
--- a/packages/i18n/src/locales/uk.i18n.json
+++ b/packages/i18n/src/locales/uk.i18n.json
@@ -1059,7 +1059,6 @@
   "DDP_Rate_Limit_User_Requests_Allowed": "Обмеження по користувачу: запити дозволені",
   "Deactivate": "Деактивувати",
   "Decline": "Відхилити",
-  "Decode_Key": "Ключ декодування",
   "Default": "За замовчуванням",
   "Default_value": "Значення за замовчуванням",
   "Delete": "Видалити",
@@ -3363,4 +3362,4 @@
   "Enterprise": "Підприємство",
   "UpgradeToGetMore_engagement-dashboard_Title": "Аналітика",
   "UpgradeToGetMore_auditing_Title": "Аудит повідомлень"
-}
\ No newline at end of file
+}
diff --git a/packages/i18n/src/locales/zh-TW.i18n.json b/packages/i18n/src/locales/zh-TW.i18n.json
index dee0b0e801f4..93360b12c6b5 100644
--- a/packages/i18n/src/locales/zh-TW.i18n.json
+++ b/packages/i18n/src/locales/zh-TW.i18n.json
@@ -1312,7 +1312,6 @@
   "DDP_Rate_Limit_User_Requests_Allowed": "限制使用者: 允許需求",
   "Deactivate": "停用",
   "Decline": "拒絕",
-  "Decode_Key": "解鎖金鑰",
   "Default": "預設",
   "Default_value": "預設值",
   "Delete": "刪除",
@@ -4590,4 +4589,4 @@
   "Enterprise": "企業",
   "UpgradeToGetMore_engagement-dashboard_Title": "分析",
   "UpgradeToGetMore_auditing_Title": "訊息稽核"
-}
\ No newline at end of file
+}
diff --git a/packages/i18n/src/locales/zh.i18n.json b/packages/i18n/src/locales/zh.i18n.json
index 2c72cc0d4151..2445fd2b3b08 100644
--- a/packages/i18n/src/locales/zh.i18n.json
+++ b/packages/i18n/src/locales/zh.i18n.json
@@ -1191,7 +1191,6 @@
   "DDP_Rate_Limit_User_Requests_Allowed": "用户限制: 允许请求",
   "Deactivate": "禁用",
   "Decline": "下降",
-  "Decode_Key": "解码密钥",
   "Default": "默认",
   "Default_value": "默认值",
   "Delete": "删除",
@@ -4147,4 +4146,4 @@
   "Enterprise": "企业",
   "UpgradeToGetMore_engagement-dashboard_Title": "分析",
   "UpgradeToGetMore_auditing_Title": "消息审计"
-}
\ No newline at end of file
+}

From 1056f220dfc2316cad7540f7f7f18d9b98b5b9cf Mon Sep 17 00:00:00 2001
From: Hugo Costa <hugocarreiracosta@gmail.com>
Date: Thu, 13 Jun 2024 10:50:51 -0300
Subject: [PATCH 15/94] fix: prevent OTR in E2EE (#32459)

---
 .changeset/famous-scissors-teach.md           |   6 +
 .../roomActions/useE2EERoomAction.spec.ts     | 122 ++++++++++++++++++
 .../hooks/roomActions/useE2EERoomAction.ts    |  13 +-
 apps/meteor/client/hooks/useOTR.spec.tsx      |  70 ++++++++++
 apps/meteor/client/hooks/useOTR.ts            |  28 ++++
 .../views/room/contextualBar/OTR/OTR.tsx      |  22 +++-
 .../room/contextualBar/OTR/OTRWithData.tsx    |  17 +--
 apps/meteor/tests/e2e/e2e-encryption.spec.ts  |  26 ++++
 .../page-objects/fragments/home-flextab.ts    |   4 +
 packages/i18n/src/locales/en.i18n.json        |   3 +
 10 files changed, 293 insertions(+), 18 deletions(-)
 create mode 100644 .changeset/famous-scissors-teach.md
 create mode 100644 apps/meteor/client/hooks/roomActions/useE2EERoomAction.spec.ts
 create mode 100644 apps/meteor/client/hooks/useOTR.spec.tsx
 create mode 100644 apps/meteor/client/hooks/useOTR.ts

diff --git a/.changeset/famous-scissors-teach.md b/.changeset/famous-scissors-teach.md
new file mode 100644
index 000000000000..05d4cbbf8ea5
--- /dev/null
+++ b/.changeset/famous-scissors-teach.md
@@ -0,0 +1,6 @@
+---
+"@rocket.chat/meteor": patch
+"@rocket.chat/i18n": patch
+---
+
+Prevent usage of OTR messages with End-to-end Encryption, both feature shouldn't and can't work together.
diff --git a/apps/meteor/client/hooks/roomActions/useE2EERoomAction.spec.ts b/apps/meteor/client/hooks/roomActions/useE2EERoomAction.spec.ts
new file mode 100644
index 000000000000..eb0cbe5b24f4
--- /dev/null
+++ b/apps/meteor/client/hooks/roomActions/useE2EERoomAction.spec.ts
@@ -0,0 +1,122 @@
+import { useSetting, usePermission, useEndpoint } from '@rocket.chat/ui-contexts';
+import { act, renderHook } from '@testing-library/react-hooks';
+
+import { E2EEState } from '../../../app/e2e/client/E2EEState';
+import { e2e } from '../../../app/e2e/client/rocketchat.e2e';
+import { OtrRoomState } from '../../../app/otr/lib/OtrRoomState';
+import { dispatchToastMessage } from '../../lib/toast';
+import { useRoom, useRoomSubscription } from '../../views/room/contexts/RoomContext';
+import { useE2EEState } from '../../views/room/hooks/useE2EEState';
+import { useOTR } from '../useOTR';
+import { useE2EERoomAction } from './useE2EERoomAction';
+
+jest.mock('@rocket.chat/ui-contexts', () => ({
+	useSetting: jest.fn(),
+	usePermission: jest.fn(),
+	useEndpoint: jest.fn(),
+}));
+
+jest.mock('../../lib/toast', () => ({
+	dispatchToastMessage: jest.fn(),
+}));
+
+jest.mock('../../views/room/contexts/RoomContext', () => ({
+	useRoom: jest.fn(),
+	useRoomSubscription: jest.fn(),
+}));
+
+jest.mock('../useOTR', () => ({
+	useOTR: jest.fn(),
+}));
+
+jest.mock('../../../app/e2e/client/rocketchat.e2e', () => ({
+	e2e: {
+		isReady: jest.fn(),
+	},
+}));
+
+jest.mock('../../views/room/hooks/useE2EEState', () => ({
+	useE2EEState: jest.fn(),
+}));
+
+jest.mock('react-i18next', () => ({
+	useTranslation: () => ({
+		t: (key: string) => key,
+	}),
+}));
+
+jest.mock('meteor/tracker', () => ({
+	Tracker: {
+		autorun: jest.fn(),
+	},
+}));
+
+describe('useE2EERoomAction', () => {
+	const mockRoom = { _id: 'roomId', encrypted: false, t: 'd', name: 'Test Room' };
+	const mockSubscription = { autoTranslate: false };
+
+	beforeEach(() => {
+		(useSetting as jest.Mock).mockReturnValue(true);
+		(useRoom as jest.Mock).mockReturnValue(mockRoom);
+		(useRoomSubscription as jest.Mock).mockReturnValue(mockSubscription);
+		(useE2EEState as jest.Mock).mockReturnValue(E2EEState.READY);
+		(usePermission as jest.Mock).mockReturnValue(true);
+		(useEndpoint as jest.Mock).mockReturnValue(jest.fn().mockResolvedValue({ success: true }));
+		(e2e.isReady as jest.Mock).mockReturnValue(true);
+	});
+
+	afterEach(() => {
+		jest.clearAllMocks();
+	});
+
+	it('should dispatch error toast message when otrState is ESTABLISHED', async () => {
+		(useOTR as jest.Mock).mockReturnValue({ otrState: OtrRoomState.ESTABLISHED });
+
+		const { result } = renderHook(() => useE2EERoomAction());
+
+		await act(async () => {
+			await result?.current?.action?.();
+		});
+
+		expect(dispatchToastMessage).toHaveBeenCalledWith({ type: 'error', message: 'E2EE_not_available_OTR' });
+	});
+
+	it('should dispatch error toast message when otrState is ESTABLISHING', async () => {
+		(useOTR as jest.Mock).mockReturnValue({ otrState: OtrRoomState.ESTABLISHING });
+
+		const { result } = renderHook(() => useE2EERoomAction());
+
+		await act(async () => {
+			await result?.current?.action?.();
+		});
+
+		expect(dispatchToastMessage).toHaveBeenCalledWith({ type: 'error', message: 'E2EE_not_available_OTR' });
+	});
+
+	it('should dispatch error toast message when otrState is REQUESTED', async () => {
+		(useOTR as jest.Mock).mockReturnValue({ otrState: OtrRoomState.REQUESTED });
+
+		const { result } = renderHook(() => useE2EERoomAction());
+
+		await act(async () => {
+			await result?.current?.action?.();
+		});
+
+		expect(dispatchToastMessage).toHaveBeenCalledWith({ type: 'error', message: 'E2EE_not_available_OTR' });
+	});
+
+	it('should dispatch success toast message when encryption is enabled', async () => {
+		(useOTR as jest.Mock).mockReturnValue({ otrState: OtrRoomState.NOT_STARTED });
+
+		const { result } = renderHook(() => useE2EERoomAction());
+
+		await act(async () => {
+			await result?.current?.action?.();
+		});
+
+		expect(dispatchToastMessage).toHaveBeenCalledWith({
+			type: 'success',
+			message: 'E2E_Encryption_enabled_for_room',
+		});
+	});
+});
diff --git a/apps/meteor/client/hooks/roomActions/useE2EERoomAction.ts b/apps/meteor/client/hooks/roomActions/useE2EERoomAction.ts
index abc84f372594..bed73ab45c6b 100644
--- a/apps/meteor/client/hooks/roomActions/useE2EERoomAction.ts
+++ b/apps/meteor/client/hooks/roomActions/useE2EERoomAction.ts
@@ -1,14 +1,16 @@
 import { isRoomFederated } from '@rocket.chat/core-typings';
-import { useMutableCallback } from '@rocket.chat/fuselage-hooks';
+import { useEffectEvent } from '@rocket.chat/fuselage-hooks';
 import { useSetting, usePermission, useEndpoint } from '@rocket.chat/ui-contexts';
 import { useMemo } from 'react';
 import { useTranslation } from 'react-i18next';
 
 import { E2EEState } from '../../../app/e2e/client/E2EEState';
+import { OtrRoomState } from '../../../app/otr/lib/OtrRoomState';
 import { dispatchToastMessage } from '../../lib/toast';
 import { useRoom, useRoomSubscription } from '../../views/room/contexts/RoomContext';
 import type { RoomToolboxActionConfig } from '../../views/room/contexts/RoomToolboxContext';
 import { useE2EEState } from '../../views/room/hooks/useE2EEState';
+import { useOTR } from '../useOTR';
 
 export const useE2EERoomAction = () => {
 	const enabled = useSetting('E2E_Enable', false);
@@ -22,10 +24,17 @@ export const useE2EERoomAction = () => {
 	const permitted = (room.t === 'd' || (permittedToEditRoom && permittedToToggleEncryption)) && readyToEncrypt;
 	const federated = isRoomFederated(room);
 	const { t } = useTranslation();
+	const { otrState } = useOTR();
 
 	const toggleE2E = useEndpoint('POST', '/v1/rooms.saveRoomSettings');
 
-	const action = useMutableCallback(async () => {
+	const action = useEffectEvent(async () => {
+		if (otrState === OtrRoomState.ESTABLISHED || otrState === OtrRoomState.ESTABLISHING || otrState === OtrRoomState.REQUESTED) {
+			dispatchToastMessage({ type: 'error', message: t('E2EE_not_available_OTR') });
+
+			return;
+		}
+
 		const { success } = await toggleE2E({ rid: room._id, encrypted: !room.encrypted });
 		if (!success) {
 			return;
diff --git a/apps/meteor/client/hooks/useOTR.spec.tsx b/apps/meteor/client/hooks/useOTR.spec.tsx
new file mode 100644
index 000000000000..0206d96ca176
--- /dev/null
+++ b/apps/meteor/client/hooks/useOTR.spec.tsx
@@ -0,0 +1,70 @@
+import { useUserId } from '@rocket.chat/ui-contexts';
+import { renderHook } from '@testing-library/react-hooks';
+
+import OTR from '../../app/otr/client/OTR';
+import { OtrRoomState } from '../../app/otr/lib/OtrRoomState';
+import { useRoom } from '../views/room/contexts/RoomContext';
+import { useOTR } from './useOTR';
+
+jest.mock('@rocket.chat/ui-contexts', () => ({
+	useUserId: jest.fn(),
+}));
+
+jest.mock('../views/room/contexts/RoomContext', () => ({
+	useRoom: jest.fn(),
+}));
+
+jest.mock('../../app/otr/client/OTR', () => ({
+	getInstanceByRoomId: jest.fn(),
+}));
+
+jest.mock('./useReactiveValue', () => ({
+	useReactiveValue: jest.fn((fn) => fn()),
+}));
+
+describe('useOTR', () => {
+	it('should return error state when user ID is not available', () => {
+		(useUserId as jest.Mock).mockReturnValue(undefined);
+		(useRoom as jest.Mock).mockReturnValue({ _id: 'roomId' });
+
+		const { result } = renderHook(() => useOTR());
+
+		expect(result.current.otr).toBeUndefined();
+		expect(result.current.otrState).toBe(OtrRoomState.ERROR);
+	});
+
+	it('should return error state when room ID is not available', () => {
+		(useUserId as jest.Mock).mockReturnValue('userId');
+		(useRoom as jest.Mock).mockReturnValue(undefined);
+
+		const { result } = renderHook(() => useOTR());
+
+		expect(result.current.otr).toBeUndefined();
+		expect(result.current.otrState).toBe(OtrRoomState.ERROR);
+	});
+
+	it('should return error state when OTR instance is not available', () => {
+		(useUserId as jest.Mock).mockReturnValue('userId');
+		(useRoom as jest.Mock).mockReturnValue({ _id: 'roomId' });
+		(OTR.getInstanceByRoomId as jest.Mock).mockReturnValue(undefined);
+
+		const { result } = renderHook(() => useOTR());
+
+		expect(result.current.otr).toBeUndefined();
+		expect(result.current.otrState).toBe(OtrRoomState.ERROR);
+	});
+
+	it('should return the correct OTR instance and state when available', () => {
+		const mockOtrInstance = {
+			getState: jest.fn().mockReturnValue(OtrRoomState.NOT_STARTED),
+		};
+		(useUserId as jest.Mock).mockReturnValue('userId');
+		(useRoom as jest.Mock).mockReturnValue({ _id: 'roomId' });
+		(OTR.getInstanceByRoomId as jest.Mock).mockReturnValue(mockOtrInstance);
+
+		const { result } = renderHook(() => useOTR());
+
+		expect(result.current.otr).toBe(mockOtrInstance);
+		expect(result.current.otrState).toBe(OtrRoomState.NOT_STARTED);
+	});
+});
diff --git a/apps/meteor/client/hooks/useOTR.ts b/apps/meteor/client/hooks/useOTR.ts
new file mode 100644
index 000000000000..65f9004cf323
--- /dev/null
+++ b/apps/meteor/client/hooks/useOTR.ts
@@ -0,0 +1,28 @@
+import { useUserId } from '@rocket.chat/ui-contexts';
+import { useMemo, useCallback } from 'react';
+
+import OTR from '../../app/otr/client/OTR';
+import type { OTRRoom } from '../../app/otr/client/OTRRoom';
+import { OtrRoomState } from '../../app/otr/lib/OtrRoomState';
+import { useRoom } from '../views/room/contexts/RoomContext';
+import { useReactiveValue } from './useReactiveValue';
+
+export const useOTR = (): { otr: OTRRoom | undefined; otrState: OtrRoomState } => {
+	const uid = useUserId();
+	const room = useRoom();
+
+	const otr = useMemo(() => {
+		if (!uid || !room) {
+			return;
+		}
+
+		return OTR.getInstanceByRoomId(uid, room._id);
+	}, [uid, room]);
+
+	const otrState = useReactiveValue(useCallback(() => (otr ? otr.getState() : OtrRoomState.ERROR), [otr]));
+
+	return {
+		otr,
+		otrState,
+	};
+};
diff --git a/apps/meteor/client/views/room/contextualBar/OTR/OTR.tsx b/apps/meteor/client/views/room/contextualBar/OTR/OTR.tsx
index 6b980dfcc390..aaf119e703ff 100644
--- a/apps/meteor/client/views/room/contextualBar/OTR/OTR.tsx
+++ b/apps/meteor/client/views/room/contextualBar/OTR/OTR.tsx
@@ -1,5 +1,5 @@
 import type { IUser } from '@rocket.chat/core-typings';
-import { Box, Button, Throbber } from '@rocket.chat/fuselage';
+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';
@@ -12,6 +12,7 @@ import {
 	ContextualbarClose,
 	ContextualbarScrollableContent,
 } from '../../../../components/Contextualbar';
+import { useRoom } from '../../contexts/RoomContext';
 import OTREstablished from './components/OTREstablished';
 import OTRStates from './components/OTRStates';
 
@@ -27,6 +28,7 @@ type OTRProps = {
 
 const OTR = ({ isOnline, onClickClose, onClickStart, onClickEnd, onClickRefresh, otrState, peerUsername }: OTRProps): ReactElement => {
 	const t = useTranslation();
+	const room = useRoom();
 
 	const renderOTRState = (): ReactElement => {
 		switch (otrState) {
@@ -77,6 +79,22 @@ const OTR = ({ isOnline, onClickClose, onClickStart, onClickEnd, onClickRefresh,
 		}
 	};
 
+	const renderOTRBody = (): ReactElement => {
+		if (room.encrypted) {
+			return (
+				<Callout title={t('OTR_not_available')} type='warning'>
+					{t('OTR_not_available_e2ee')}
+				</Callout>
+			);
+		}
+
+		if (!isOnline) {
+			return <Box fontScale='p2m'>{t('OTR_is_only_available_when_both_users_are_online')}</Box>;
+		}
+
+		return renderOTRState();
+	};
+
 	return (
 		<>
 			<ContextualbarHeader>
@@ -86,7 +104,7 @@ const OTR = ({ isOnline, onClickClose, onClickStart, onClickEnd, onClickRefresh,
 			</ContextualbarHeader>
 			<ContextualbarScrollableContent p={24} color='default'>
 				<Box fontScale='h4'>{t('Off_the_record_conversation')}</Box>
-				{isOnline ? renderOTRState() : <Box fontScale='p2m'>{t('OTR_is_only_available_when_both_users_are_online')}</Box>}
+				{renderOTRBody()}
 			</ContextualbarScrollableContent>
 		</>
 	);
diff --git a/apps/meteor/client/views/room/contextualBar/OTR/OTRWithData.tsx b/apps/meteor/client/views/room/contextualBar/OTR/OTRWithData.tsx
index a4c642bdea64..c64d76892cb2 100644
--- a/apps/meteor/client/views/room/contextualBar/OTR/OTRWithData.tsx
+++ b/apps/meteor/client/views/room/contextualBar/OTR/OTRWithData.tsx
@@ -1,27 +1,16 @@
-import { useUserId } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
-import React, { useCallback, useEffect, useMemo } from 'react';
+import React, { useEffect } from 'react';
 
-import OTR from '../../../../../app/otr/client/OTR';
 import { OtrRoomState } from '../../../../../app/otr/lib/OtrRoomState';
+import { useOTR } from '../../../../hooks/useOTR';
 import { usePresence } from '../../../../hooks/usePresence';
-import { useReactiveValue } from '../../../../hooks/useReactiveValue';
-import { useRoom } from '../../contexts/RoomContext';
 import { useRoomToolbox } from '../../contexts/RoomToolboxContext';
 import OTRComponent from './OTR';
 
 const OTRWithData = (): ReactElement => {
-	const uid = useUserId();
-	const room = useRoom();
+	const { otr, otrState } = useOTR();
 	const { closeTab } = useRoomToolbox();
-	const otr = useMemo(() => {
-		if (!uid) {
-			return;
-		}
 
-		return OTR.getInstanceByRoomId(uid, room._id);
-	}, [uid, room._id]);
-	const otrState = useReactiveValue(useCallback(() => (otr ? otr.getState() : OtrRoomState.ERROR), [otr]));
 	const peerUserPresence = usePresence(otr?.getPeerId());
 	const userStatus = peerUserPresence?.status;
 	const peerUsername = peerUserPresence?.username;
diff --git a/apps/meteor/tests/e2e/e2e-encryption.spec.ts b/apps/meteor/tests/e2e/e2e-encryption.spec.ts
index b33365c5dce0..bb4d2f478219 100644
--- a/apps/meteor/tests/e2e/e2e-encryption.spec.ts
+++ b/apps/meteor/tests/e2e/e2e-encryption.spec.ts
@@ -205,6 +205,32 @@ test.describe.serial('e2e-encryption', () => {
 		await expect(poHomeChannel.content.lastUserMessage.locator('.rcx-icon--name-key')).toBeVisible();
 	});
 
+	test('expect create a Direct message, encrypt it and attempt to enable OTR', async ({ page }) => {
+		await poHomeChannel.sidenav.openNewByLabel('Direct message');
+		await poHomeChannel.sidenav.inputDirectUsername.click();
+		await page.keyboard.type('user2');
+		await page.waitForTimeout(1000);
+		await page.keyboard.press('Enter');
+		await poHomeChannel.sidenav.btnCreate.click();
+
+		await expect(page).toHaveURL(`/direct/rocketchat.internal.admin.testuser2`);
+
+		await poHomeChannel.tabs.kebab.click({ force: true });
+		await expect(poHomeChannel.tabs.btnEnableE2E).toBeVisible();
+		await poHomeChannel.tabs.btnEnableE2E.click({ force: true });
+		await page.waitForTimeout(1000);
+
+		await expect(poHomeChannel.content.encryptedRoomHeaderIcon).toBeVisible();
+
+		await poHomeChannel.dismissToast();
+
+		await poHomeChannel.tabs.kebab.click({ force: true });
+		await expect(poHomeChannel.tabs.btnEnableOTR).toBeVisible();
+		await poHomeChannel.tabs.btnEnableOTR.click({ force: true });
+
+		await expect(page.getByText('OTR not available')).toBeVisible();
+	});
+
 	test('expect placeholder text in place of encrypted message, when E2EE is not setup', async ({ page }) => {
 		const channelName = faker.string.uuid();
 
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 8e4a6961a790..b8bd673c9cf3 100644
--- a/apps/meteor/tests/e2e/page-objects/fragments/home-flextab.ts
+++ b/apps/meteor/tests/e2e/page-objects/fragments/home-flextab.ts
@@ -52,6 +52,10 @@ export class HomeFlextab {
 		return this.page.locator('role=menuitem[name="Enable E2E"]');
 	}
 
+	get btnEnableOTR(): Locator {
+		return this.page.locator('role=menuitem[name="OTR"]');
+	}
+
 	get flexTabViewThreadMessage(): Locator {
 		return this.page.locator('div.thread-list ul.thread [data-qa-type="message"]').last().locator('[data-qa-type="message-body"]');
 	}
diff --git a/packages/i18n/src/locales/en.i18n.json b/packages/i18n/src/locales/en.i18n.json
index 4e658735e130..e9d1894ef74e 100644
--- a/packages/i18n/src/locales/en.i18n.json
+++ b/packages/i18n/src/locales/en.i18n.json
@@ -1782,6 +1782,7 @@
   "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.",
@@ -4069,6 +4070,8 @@
   "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",

From afa560da52749c46802c1016cafddf0e8071c078 Mon Sep 17 00:00:00 2001
From: Guilherme Gazzo <guilhermegazzo@gmail.com>
Date: Thu, 13 Jun 2024 11:07:07 -0300
Subject: [PATCH 16/94] chore: bump meteor 2.16 (#32585)

---
 apps/meteor/.meteor/packages                  | 14 +++++-----
 apps/meteor/.meteor/release                   |  2 +-
 apps/meteor/.meteor/versions                  | 26 +++++++++----------
 .../.npm/package/npm-shrinkwrap.json          |  2 +-
 4 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/apps/meteor/.meteor/packages b/apps/meteor/.meteor/packages
index 8107c249add2..307b0d89eb0d 100644
--- a/apps/meteor/.meteor/packages
+++ b/apps/meteor/.meteor/packages
@@ -15,12 +15,12 @@ rocketchat:streamer
 rocketchat:version
 rocketchat:user-presence
 
-accounts-base@2.2.10
+accounts-base@2.2.11
 accounts-facebook@1.3.3
 accounts-github@1.5.0
 accounts-google@1.4.0
 accounts-meteor-developer@1.5.0
-accounts-oauth@1.4.3
+accounts-oauth@1.4.4
 accounts-password@2.4.0
 accounts-twitter@1.5.0
 
@@ -29,20 +29,20 @@ google-oauth@1.4.4
 oauth@2.2.1
 oauth2@1.3.2
 
-check@1.3.2
+check@1.4.1
 ddp-rate-limiter@1.2.1
 rate-limit@1.1.1
-email@2.2.5
+email@2.2.6
 http@2.0.0
 
 meteor-base@1.5.1
-ddp-common@1.4.0
+ddp-common@1.4.1
 webapp@1.13.8
 
-mongo@1.16.8
+mongo@1.16.10
 
 reload@1.3.1
-service-configuration@1.3.3
+service-configuration@1.3.4
 session@1.2.1
 shell-server@0.5.0
 
diff --git a/apps/meteor/.meteor/release b/apps/meteor/.meteor/release
index 966586ce54fe..5152abe9d582 100644
--- a/apps/meteor/.meteor/release
+++ b/apps/meteor/.meteor/release
@@ -1 +1 @@
-METEOR@2.15
+METEOR@2.16
diff --git a/apps/meteor/.meteor/versions b/apps/meteor/.meteor/versions
index a4483a5cf40e..416ae456f05b 100644
--- a/apps/meteor/.meteor/versions
+++ b/apps/meteor/.meteor/versions
@@ -1,9 +1,9 @@
-accounts-base@2.2.10
+accounts-base@2.2.11
 accounts-facebook@1.3.3
 accounts-github@1.5.0
 accounts-google@1.4.0
 accounts-meteor-developer@1.5.0
-accounts-oauth@1.4.3
+accounts-oauth@1.4.4
 accounts-password@2.4.0
 accounts-twitter@1.5.0
 allow-deny@1.1.1
@@ -15,14 +15,14 @@ binary-heap@1.0.11
 boilerplate-generator@1.7.2
 caching-compiler@1.2.2
 callback-hook@1.5.1
-check@1.3.2
+check@1.4.1
 coffeescript@2.7.0
 coffeescript-compiler@2.4.1
 ddp@1.4.1
-ddp-client@2.6.1
-ddp-common@1.4.0
+ddp-client@2.6.2
+ddp-common@1.4.1
 ddp-rate-limiter@1.2.1
-ddp-server@2.7.0
+ddp-server@2.7.1
 diff-sequence@1.1.2
 dispatch:run-as-user@1.1.1
 dynamic-import@0.7.3
@@ -31,7 +31,7 @@ ecmascript-runtime@0.8.1
 ecmascript-runtime-client@0.12.1
 ecmascript-runtime-server@0.11.0
 ejson@1.1.3
-email@2.2.5
+email@2.2.6
 es5-shim@4.8.0
 facebook-oauth@1.11.3
 facts-base@1.0.1
@@ -45,17 +45,17 @@ id-map@1.1.1
 inter-process-messaging@0.1.1
 kadira:flow-router@2.12.1
 localstorage@1.2.0
-logging@1.3.3
+logging@1.3.4
 meteor@1.11.5
 meteor-base@1.5.1
 meteor-developer-oauth@1.3.2
 meteorhacks:inject-initial@1.0.5
 minifier-css@1.6.4
-minimongo@1.9.3
+minimongo@1.9.4
 modern-browsers@0.1.10
 modules@0.20.0
 modules-runtime@0.13.1
-mongo@1.16.8
+mongo@1.16.10
 mongo-decimal@0.1.3
 mongo-dev-server@1.1.0
 mongo-id@1.0.8
@@ -84,7 +84,7 @@ rocketchat:streamer@1.1.0
 rocketchat:user-presence@2.6.3
 rocketchat:version@1.0.0
 routepolicy@1.1.1
-service-configuration@1.3.3
+service-configuration@1.3.4
 session@1.2.1
 sha@1.0.9
 shell-server@0.5.0
@@ -93,10 +93,10 @@ standard-minifier-css@1.9.2
 tracker@1.3.3
 twitter-oauth@1.3.3
 typescript@4.9.5
-underscore@1.6.0
+underscore@1.6.1
 url@1.3.2
 webapp@1.13.8
 webapp-hashing@1.1.1
 zodern:caching-minifier@0.5.0
 zodern:standard-minifier-js@5.3.1
-zodern:types@1.0.11
+zodern:types@1.0.13
diff --git a/apps/meteor/packages/flow-router/.npm/package/npm-shrinkwrap.json b/apps/meteor/packages/flow-router/.npm/package/npm-shrinkwrap.json
index 47445b724946..8110d45c9f30 100644
--- a/apps/meteor/packages/flow-router/.npm/package/npm-shrinkwrap.json
+++ b/apps/meteor/packages/flow-router/.npm/package/npm-shrinkwrap.json
@@ -25,4 +25,4 @@
       "integrity": "sha512-VH4FeG98gs6AkHivaW2O14vsOPBL9E80Sj7fITunoDijiYQ1lsVwJYmm1CSL+oLyO2N5HPdo23GXAG64uKOAZQ=="
     }
   }
-}
\ No newline at end of file
+}

From 97eaa176807a64d9cf10833eeda789d9c964d42b Mon Sep 17 00:00:00 2001
From: Hugo Costa <hugocarreiracosta@gmail.com>
Date: Fri, 14 Jun 2024 08:09:31 -0300
Subject: [PATCH 17/94] fix: Accepted Media Types settings validation (#32478)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Henrique Guimarães Ribeiro <43561537+rique223@users.noreply.github.com>
---
 .changeset/chilly-toys-hunt.md                |  5 ++
 .../app/file-upload/server/lib/FileUpload.ts  |  3 +-
 apps/meteor/app/utils/client/restrictions.ts  |  2 +-
 apps/meteor/app/utils/lib/restrictions.ts     | 34 ++++++++-----
 apps/meteor/app/utils/server/restrictions.ts  |  2 +-
 .../client/lib/chats/flows/uploadFiles.ts     |  2 +-
 .../unit/app/utils/lib/restrictions.spec.ts   | 49 +++++++++++++++++++
 7 files changed, 79 insertions(+), 18 deletions(-)
 create mode 100644 .changeset/chilly-toys-hunt.md
 create mode 100644 apps/meteor/tests/unit/app/utils/lib/restrictions.spec.ts

diff --git a/.changeset/chilly-toys-hunt.md b/.changeset/chilly-toys-hunt.md
new file mode 100644
index 000000000000..79be3fcfc74c
--- /dev/null
+++ b/.changeset/chilly-toys-hunt.md
@@ -0,0 +1,5 @@
+---
+"@rocket.chat/meteor": patch
+---
+
+Fixed "File Upload > Accepted Media Types" setting to allow all type of files uploads
diff --git a/apps/meteor/app/file-upload/server/lib/FileUpload.ts b/apps/meteor/app/file-upload/server/lib/FileUpload.ts
index 4458f9d61881..c824ba6c31a5 100644
--- a/apps/meteor/app/file-upload/server/lib/FileUpload.ts
+++ b/apps/meteor/app/file-upload/server/lib/FileUpload.ts
@@ -170,7 +170,7 @@ export const FileUpload = {
 			throw new Meteor.Error('error-file-too-large', reason);
 		}
 
-		if (!fileUploadIsValidContentType(file.type as string, '')) {
+		if (!fileUploadIsValidContentType(file?.type)) {
 			const reason = i18n.t('File_type_is_not_accepted', { lng: language });
 			throw new Meteor.Error('error-invalid-file-type', reason);
 		}
@@ -420,7 +420,6 @@ export const FileUpload = {
 			await Avatars.deleteFile(oldAvatar._id);
 		}
 		await Avatars.updateFileNameById(file._id, user.username);
-		// console.log('upload finished ->', file);
 	},
 
 	async requestCanAccessFiles({ headers = {}, url }: http.IncomingMessage, file?: IUpload) {
diff --git a/apps/meteor/app/utils/client/restrictions.ts b/apps/meteor/app/utils/client/restrictions.ts
index 261eddf4467d..d4c6b62d68dd 100644
--- a/apps/meteor/app/utils/client/restrictions.ts
+++ b/apps/meteor/app/utils/client/restrictions.ts
@@ -1,7 +1,7 @@
 import { settings } from '../../settings/client';
 import { fileUploadIsValidContentTypeFromSettings } from '../lib/restrictions';
 
-export const fileUploadIsValidContentType = function (type: string, customWhiteList?: string): boolean {
+export const fileUploadIsValidContentType = function (type: string | undefined, customWhiteList?: string): boolean {
 	const blackList = settings.get<string>('FileUpload_MediaTypeBlackList');
 	const whiteList = customWhiteList || settings.get<string>('FileUpload_MediaTypeWhiteList');
 
diff --git a/apps/meteor/app/utils/lib/restrictions.ts b/apps/meteor/app/utils/lib/restrictions.ts
index ebebe113f31e..bf859e5b4700 100644
--- a/apps/meteor/app/utils/lib/restrictions.ts
+++ b/apps/meteor/app/utils/lib/restrictions.ts
@@ -1,12 +1,10 @@
-import _ from 'underscore';
-
 export const fileUploadMediaWhiteList = function (customWhiteList: string): string[] | undefined {
 	const mediaTypeWhiteList = customWhiteList;
 
 	if (!mediaTypeWhiteList || mediaTypeWhiteList === '*') {
 		return;
 	}
-	return _.map(mediaTypeWhiteList.split(','), (item) => {
+	return mediaTypeWhiteList.split(',').map((item) => {
 		return item.trim();
 	});
 };
@@ -17,37 +15,47 @@ const fileUploadMediaBlackList = function (customBlackList: string): string[] |
 		return;
 	}
 
-	return _.map(blacklist.split(','), (item) => item.trim());
+	return blacklist.split(',').map((item) => item.trim());
 };
 
-const isTypeOnList = function (type: string, list: string[]): boolean | undefined {
-	if (_.contains(list, type)) {
+const isTypeOnList = function (type?: string, list?: string[]): boolean {
+	if (!type || !list) {
+		return false;
+	}
+
+	if (list.includes(type)) {
 		return true;
 	}
 	const wildCardGlob = '/*';
-	const wildcards = _.filter(list, (item) => {
+	const wildcards = list.filter((item) => {
 		return item.indexOf(wildCardGlob) > 0;
 	});
-	if (_.contains(wildcards, type.replace(/(\/.*)$/, wildCardGlob))) {
+	if (wildcards.includes(type.replace(/(\/.*)$/, wildCardGlob))) {
 		return true;
 	}
+
+	return false;
 };
 
-export const fileUploadIsValidContentTypeFromSettings = function (type: string, customWhiteList: string, customBlackList: string): boolean {
+export const fileUploadIsValidContentTypeFromSettings = function (
+	type: string | undefined,
+	customWhiteList: string,
+	customBlackList: string,
+): boolean {
 	const blackList = fileUploadMediaBlackList(customBlackList);
 	const whiteList = fileUploadMediaWhiteList(customWhiteList);
 
-	if (!type && blackList) {
+	if (blackList && type && isTypeOnList(type, blackList)) {
 		return false;
 	}
 
-	if (blackList && isTypeOnList(type, blackList)) {
-		return false;
+	if (whiteList) {
+		return isTypeOnList(type, whiteList);
 	}
 
 	if (!whiteList) {
 		return true;
 	}
 
-	return !!isTypeOnList(type, whiteList);
+	return false;
 };
diff --git a/apps/meteor/app/utils/server/restrictions.ts b/apps/meteor/app/utils/server/restrictions.ts
index ca524b09d351..6eb1c9a655d4 100644
--- a/apps/meteor/app/utils/server/restrictions.ts
+++ b/apps/meteor/app/utils/server/restrictions.ts
@@ -1,7 +1,7 @@
 import { settings } from '../../settings/server';
 import { fileUploadIsValidContentTypeFromSettings } from '../lib/restrictions';
 
-export const fileUploadIsValidContentType = function (type: string, customWhiteList?: string): boolean {
+export const fileUploadIsValidContentType = function (type: string | undefined, customWhiteList?: string): boolean {
 	const blackList = settings.get<string>('FileUpload_MediaTypeBlackList');
 	const whiteList = customWhiteList || settings.get<string>('FileUpload_MediaTypeWhiteList');
 
diff --git a/apps/meteor/client/lib/chats/flows/uploadFiles.ts b/apps/meteor/client/lib/chats/flows/uploadFiles.ts
index 82572aa2dbf5..62458d53fd60 100644
--- a/apps/meteor/client/lib/chats/flows/uploadFiles.ts
+++ b/apps/meteor/client/lib/chats/flows/uploadFiles.ts
@@ -46,7 +46,7 @@ export const uploadFiles = async (chat: ChatAPI, files: readonly File[], resetFi
 					imperativeModal.close();
 					uploadNextFile();
 				},
-				invalidContentType: !(file.type && fileUploadIsValidContentType(file.type)),
+				invalidContentType: !fileUploadIsValidContentType(file?.type),
 			},
 		});
 	};
diff --git a/apps/meteor/tests/unit/app/utils/lib/restrictions.spec.ts b/apps/meteor/tests/unit/app/utils/lib/restrictions.spec.ts
new file mode 100644
index 000000000000..f7a6b4439f21
--- /dev/null
+++ b/apps/meteor/tests/unit/app/utils/lib/restrictions.spec.ts
@@ -0,0 +1,49 @@
+import { expect } from 'chai';
+
+import { fileUploadIsValidContentTypeFromSettings } from '../../../../../app/utils/lib/restrictions';
+
+describe('fileUploadIsValidContentTypeFromSettings', () => {
+	it('should return true if type is not defined and whiteList is not defined', () => {
+		expect(fileUploadIsValidContentTypeFromSettings(undefined, '', '')).to.be.true;
+	});
+
+	it('should return false if type is not defined and whiteList is defined', () => {
+		expect(fileUploadIsValidContentTypeFromSettings(undefined, 'image/jpeg', '')).to.be.false;
+	});
+
+	it('should return true if type is defined and whiteList is not defined', () => {
+		expect(fileUploadIsValidContentTypeFromSettings('image/jpeg', '', '')).to.be.true;
+	});
+
+	it('should return true if type is defined and whiteList is defined and type is in whiteList', () => {
+		expect(fileUploadIsValidContentTypeFromSettings('image/jpeg', 'image/jpeg', '')).to.be.true;
+	});
+
+	it('should return false if type is defined and whiteList is defined and type is not in whiteList', () => {
+		expect(fileUploadIsValidContentTypeFromSettings('image/png', 'image/jpeg', '')).to.be.false;
+	});
+
+	it('should return false if type is defined and whiteList is not defined and type is in blackList', () => {
+		expect(fileUploadIsValidContentTypeFromSettings('image/jpeg', '', 'image/jpeg')).to.be.false;
+	});
+
+	it('should return true if type is defined and whiteList is not defined and type is not in blackList', () => {
+		expect(fileUploadIsValidContentTypeFromSettings('image/png', '', 'image/jpeg')).to.be.true;
+	});
+
+	it('should return true if type is defined and whiteList is defined and type is in whiteList with wildcard', () => {
+		expect(fileUploadIsValidContentTypeFromSettings('image/jpeg', 'image/*', '')).to.be.true;
+	});
+
+	it('should return false if type is defined and whiteList is defined and type is not in whiteList with wildcard', () => {
+		expect(fileUploadIsValidContentTypeFromSettings('text/plain', 'image/*', '')).to.be.false;
+	});
+
+	it('should return false if type is defined and whiteList is not defined and type is in blackList with wildcard', () => {
+		expect(fileUploadIsValidContentTypeFromSettings('image/jpeg', '', 'image/*')).to.be.false;
+	});
+
+	it('should return true if type is defined and whiteList is defined and type is not in blackList with wildcard', () => {
+		expect(fileUploadIsValidContentTypeFromSettings('text/plain', '', 'image/*')).to.be.true;
+	});
+});

From d3ab41681e1b4061209987d1c1811ad8310707ea Mon Sep 17 00:00:00 2001
From: csuadev <72958726+csuadev@users.noreply.github.com>
Date: Fri, 14 Jun 2024 16:50:11 +0200
Subject: [PATCH 18/94] chore: remove message column on moderation console
 (#32432)

---
 .../views/admin/moderation/ModerationConsoleTable.tsx  | 10 ----------
 .../admin/moderation/ModerationConsoleTableRow.tsx     |  3 +--
 2 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/apps/meteor/client/views/admin/moderation/ModerationConsoleTable.tsx b/apps/meteor/client/views/admin/moderation/ModerationConsoleTable.tsx
index 6de7cdda1675..805d89c54c37 100644
--- a/apps/meteor/client/views/admin/moderation/ModerationConsoleTable.tsx
+++ b/apps/meteor/client/views/admin/moderation/ModerationConsoleTable.tsx
@@ -85,16 +85,6 @@ const ModerationConsoleTable: FC = () => {
 			>
 				{t('User')}
 			</GenericTableHeaderCell>,
-
-			<GenericTableHeaderCell
-				key='reportedMessage'
-				direction={sortDirection}
-				active={sortBy === 'reports.description'}
-				onClick={setSort}
-				sort='reports.description'
-			>
-				{t('Moderation_Reported_message')}
-			</GenericTableHeaderCell>,
 			<GenericTableHeaderCell key='room' direction={sortDirection}>
 				{t('Room')}
 			</GenericTableHeaderCell>,
diff --git a/apps/meteor/client/views/admin/moderation/ModerationConsoleTableRow.tsx b/apps/meteor/client/views/admin/moderation/ModerationConsoleTableRow.tsx
index 56419c61223c..65bf7069e074 100644
--- a/apps/meteor/client/views/admin/moderation/ModerationConsoleTableRow.tsx
+++ b/apps/meteor/client/views/admin/moderation/ModerationConsoleTableRow.tsx
@@ -13,7 +13,7 @@ export type ModerationConsoleRowProps = {
 };
 
 const ModerationConsoleTableRow = ({ report, onClick, isDesktopOrLarger }: ModerationConsoleRowProps): JSX.Element => {
-	const { userId: _id, rooms, name, count, message, username, ts } = report;
+	const { userId: _id, rooms, name, count, username, ts } = report;
 
 	const roomNames = rooms.map((room) => {
 		if (room.t === 'd') {
@@ -31,7 +31,6 @@ const ModerationConsoleTableRow = ({ report, onClick, isDesktopOrLarger }: Moder
 			<GenericTableCell withTruncatedText>
 				<UserColumn username={username} name={name} fontSize='micro' size={isDesktopOrLarger ? 'x20' : 'x40'} />
 			</GenericTableCell>
-			<GenericTableCell withTruncatedText>{message}</GenericTableCell>
 			<GenericTableCell withTruncatedText>{concatenatedRoomNames}</GenericTableCell>
 			<GenericTableCell withTruncatedText>{formatDateAndTime(ts)}</GenericTableCell>
 			<GenericTableCell withTruncatedText>{count}</GenericTableCell>

From eaf2f11a6c7fbd1635f777b88019355c3fb4f9be Mon Sep 17 00:00:00 2001
From: Hugo Costa <hugocarreiracosta@gmail.com>
Date: Mon, 17 Jun 2024 09:52:53 -0300
Subject: [PATCH 19/94] fix: sidebar last message E2EE (#32431)

---
 .changeset/lastmessage-e2ee.md                |  6 +++
 .../lib/server/functions/cleanRoomHistory.ts  |  2 +-
 .../app/lib/server/functions/deleteMessage.ts |  2 +-
 apps/meteor/server/models/raw/Messages.ts     |  9 ++--
 apps/meteor/tests/e2e/e2e-encryption.spec.ts  | 45 +++++++++++++++++++
 .../page-objects/fragments/home-sidenav.ts    |  6 +++
 .../src/models/IMessagesModel.ts              |  2 +-
 7 files changed, 64 insertions(+), 8 deletions(-)
 create mode 100644 .changeset/lastmessage-e2ee.md

diff --git a/.changeset/lastmessage-e2ee.md b/.changeset/lastmessage-e2ee.md
new file mode 100644
index 000000000000..b3c8642dcff6
--- /dev/null
+++ b/.changeset/lastmessage-e2ee.md
@@ -0,0 +1,6 @@
+---
+"@rocket.chat/meteor": patch
+"@rocket.chat/model-typings": patch
+---
+
+Fixed last message preview in Sidebar for E2E Ecrypted channels 
diff --git a/apps/meteor/app/lib/server/functions/cleanRoomHistory.ts b/apps/meteor/app/lib/server/functions/cleanRoomHistory.ts
index f53061995152..2bfb1086c635 100644
--- a/apps/meteor/app/lib/server/functions/cleanRoomHistory.ts
+++ b/apps/meteor/app/lib/server/functions/cleanRoomHistory.ts
@@ -111,7 +111,7 @@ export async function cleanRoomHistory({
 	}
 
 	if (count) {
-		const lastMessage = await Messages.getLastVisibleMessageSentWithNoTypeByRoomId(rid);
+		const lastMessage = await Messages.getLastVisibleUserMessageSentByRoomId(rid);
 
 		await Rooms.resetLastMessageById(rid, lastMessage, -count);
 
diff --git a/apps/meteor/app/lib/server/functions/deleteMessage.ts b/apps/meteor/app/lib/server/functions/deleteMessage.ts
index 4582a88823ec..e977874b3454 100644
--- a/apps/meteor/app/lib/server/functions/deleteMessage.ts
+++ b/apps/meteor/app/lib/server/functions/deleteMessage.ts
@@ -81,7 +81,7 @@ export async function deleteMessage(message: IMessage, user: IUser): Promise<voi
 
 	// update last message
 	if (settings.get('Store_Last_Message') && (!room?.lastMessage || room.lastMessage._id === message._id)) {
-		const lastMessageNotDeleted = await Messages.getLastVisibleMessageSentWithNoTypeByRoomId(message.rid);
+		const lastMessageNotDeleted = await Messages.getLastVisibleUserMessageSentByRoomId(message.rid);
 		await Rooms.resetLastMessageById(message.rid, lastMessageNotDeleted, -1);
 	} else {
 		// decrease message count
diff --git a/apps/meteor/server/models/raw/Messages.ts b/apps/meteor/server/models/raw/Messages.ts
index 9f9ff7882d32..49f46a8e09af 100644
--- a/apps/meteor/server/models/raw/Messages.ts
+++ b/apps/meteor/server/models/raw/Messages.ts
@@ -1040,12 +1040,11 @@ export class MessagesRaw extends BaseRaw<IMessage> implements IMessagesModel {
 		return this.findOne(query, options);
 	}
 
-	getLastVisibleMessageSentWithNoTypeByRoomId(rid: string, messageId?: string): Promise<IMessage | null> {
-		const query = {
+	getLastVisibleUserMessageSentByRoomId(rid: string, messageId?: string): Promise<IMessage | null> {
+		const query: Filter<IMessage> = {
 			rid,
 			_hidden: { $ne: true },
-			t: { $exists: false },
-			$or: [{ tmid: { $exists: false } }, { tshow: true }],
+			$or: [{ t: 'e2e' }, { t: { $exists: false }, tmid: { $exists: false } }, { t: { $exists: false }, tshow: true }],
 			...(messageId && { _id: { $ne: messageId } }),
 		};
 
@@ -1055,7 +1054,7 @@ export class MessagesRaw extends BaseRaw<IMessage> implements IMessagesModel {
 			},
 		};
 
-		return this.findOne(query, options);
+		return this.findOne<IMessage>(query, options);
 	}
 
 	async cloneAndSaveAsHistoryByRecord(record: IMessage, user: IMessage['u']): Promise<InsertOneResult<IMessage>> {
diff --git a/apps/meteor/tests/e2e/e2e-encryption.spec.ts b/apps/meteor/tests/e2e/e2e-encryption.spec.ts
index bb4d2f478219..c2d1fcc24cb7 100644
--- a/apps/meteor/tests/e2e/e2e-encryption.spec.ts
+++ b/apps/meteor/tests/e2e/e2e-encryption.spec.ts
@@ -265,6 +265,51 @@ test.describe.serial('e2e-encryption', () => {
 		await expect(poHomeChannel.content.lastUserMessage.locator('.rcx-icon--name-key')).toBeVisible();
 	});
 
+	test('expect create a private channel, send unecrypted messages, encrypt the channel and delete the last message and check the last message in the sidebar', async ({
+		page,
+	}) => {
+		const channelName = faker.string.uuid();
+
+		// Enable Sidebar Extended display mode
+		await poHomeChannel.sidenav.setDisplayMode('Extended');
+
+		// Create private channel
+		await poHomeChannel.sidenav.openNewByLabel('Channel');
+		await poHomeChannel.sidenav.inputChannelName.fill(channelName);
+		await poHomeChannel.sidenav.btnCreate.click();
+		await expect(page).toHaveURL(`/group/${channelName}`);
+		await expect(poHomeChannel.toastSuccess).toBeVisible();
+		await poHomeChannel.dismissToast();
+
+		// Send Unencrypted Messages
+		await poHomeChannel.content.sendMessage('first unencrypted message');
+		await poHomeChannel.content.sendMessage('second unencrypted message');
+
+		// Encrypt channel
+		await poHomeChannel.tabs.kebab.click({ force: true });
+		await expect(poHomeChannel.tabs.btnEnableE2E).toBeVisible();
+		await poHomeChannel.tabs.btnEnableE2E.click({ force: true });
+		await page.waitForTimeout(1000);
+		await expect(poHomeChannel.content.encryptedRoomHeaderIcon).toBeVisible();
+
+		// Send Encrypted Messages
+		const encriptedMessage1 = 'first ENCRYPTED message';
+		const encriptedMessage2 = 'second ENCRYPTED message';
+		await poHomeChannel.content.sendMessage(encriptedMessage1);
+		await poHomeChannel.content.sendMessage(encriptedMessage2);
+
+		//  Delete last message
+		await expect(poHomeChannel.content.lastUserMessageBody).toHaveText(encriptedMessage2);
+		await poHomeChannel.content.openLastMessageMenu();
+		await page.locator('role=menuitem[name="Delete"]').click();
+		await page.locator('#modal-root .rcx-button-group--align-end .rcx-button--danger').click();
+
+		// Check last message in the sidebar
+		const sidebarChannel = await poHomeChannel.sidenav.getSidebarItemByName(channelName);
+		await expect(sidebarChannel).toBeVisible();
+		await expect(sidebarChannel.locator('span')).toContainText(encriptedMessage1);
+	});
+
 	test.describe('reset keys', () => {
 		let anotherClientPage: Page;
 
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 3d689b27e3fc..dfae6c668bb9 100644
--- a/apps/meteor/tests/e2e/page-objects/fragments/home-sidenav.ts
+++ b/apps/meteor/tests/e2e/page-objects/fragments/home-sidenav.ts
@@ -49,6 +49,12 @@ export class HomeSidenav {
 		return this.page.getByRole('toolbar', { name: 'Sidebar actions' });
 	}
 
+	async setDisplayMode(mode: 'Extended' | 'Medium' | 'Condensed'): Promise<void> {
+		await this.sidebarToolbar.getByRole('button', { name: 'Display' }).click();
+		await this.sidebarToolbar.getByRole('menuitemcheckbox', { name: mode }).click();
+		await this.sidebarToolbar.click();
+	}
+
 	// Note: this is different from openChat because queued chats are not searchable
 	getQueuedChat(name: string): Locator {
 		return this.page.locator('[data-qa="sidebar-item-title"]', { hasText: name }).first();
diff --git a/packages/model-typings/src/models/IMessagesModel.ts b/packages/model-typings/src/models/IMessagesModel.ts
index 143080799671..0fb02a778c9d 100644
--- a/packages/model-typings/src/models/IMessagesModel.ts
+++ b/packages/model-typings/src/models/IMessagesModel.ts
@@ -205,7 +205,7 @@ export interface IMessagesModel extends IBaseModel<IMessage> {
 	updateAllUsernamesByUserId(userId: string, username: string): Promise<UpdateResult | Document>;
 
 	setUrlsById(_id: string, urls: NonNullable<IMessage['urls']>): Promise<UpdateResult>;
-	getLastVisibleMessageSentWithNoTypeByRoomId(rid: string, messageId?: string): Promise<IMessage | null>;
+	getLastVisibleUserMessageSentByRoomId(rid: string, messageId?: string): Promise<IMessage | null>;
 
 	findOneBySlackTs(slackTs: Date): Promise<IMessage | null>;
 

From 9795e58c2cc9bbb40760706c16d88f57f42f554a Mon Sep 17 00:00:00 2001
From: Douglas Fabris <devfabris@gmail.com>
Date: Mon, 17 Jun 2024 11:46:46 -0300
Subject: [PATCH 20/94] fix: Force highlighted code language registration
 (#32507)

---
 .changeset/weak-books-tell.md                 |  5 ++
 .../meteor/client/hooks/useHighlightedCode.ts | 16 +++++-
 .../admin/integrations/IntegrationsTable.tsx  |  2 +-
 apps/meteor/tests/e2e/administration.spec.ts  | 49 ++++++++++++++++++-
 apps/meteor/tests/e2e/page-objects/admin.ts   | 40 ++++++++++++++-
 apps/meteor/tests/e2e/utils/index.ts          |  1 +
 packages/i18n/src/locales/en.i18n.json        |  1 +
 7 files changed, 107 insertions(+), 7 deletions(-)
 create mode 100644 .changeset/weak-books-tell.md

diff --git a/.changeset/weak-books-tell.md b/.changeset/weak-books-tell.md
new file mode 100644
index 000000000000..675901263f31
--- /dev/null
+++ b/.changeset/weak-books-tell.md
@@ -0,0 +1,5 @@
+---
+'@rocket.chat/meteor': patch
+---
+
+Forces the highlight code language registration, preventing it to not being available when trying to use on the UI
diff --git a/apps/meteor/client/hooks/useHighlightedCode.ts b/apps/meteor/client/hooks/useHighlightedCode.ts
index 43c4a5e6ea58..4e3405ca3034 100644
--- a/apps/meteor/client/hooks/useHighlightedCode.ts
+++ b/apps/meteor/client/hooks/useHighlightedCode.ts
@@ -1,7 +1,19 @@
+import { useTranslation } from '@rocket.chat/ui-contexts';
+import { useQuery } from '@tanstack/react-query';
 import { useMemo } from 'react';
 
-import hljs from '../../app/markdown/lib/hljs';
+import hljs, { register } from '../../app/markdown/lib/hljs';
 
 export function useHighlightedCode(language: string, text: string): string {
-	return useMemo(() => hljs.highlight(language, text).value, [language, text]);
+	const t = useTranslation();
+	const { isLoading } = useQuery(['register-highlight-language', language], async () => {
+		try {
+			await register(language);
+			return true;
+		} catch (error) {
+			console.error('Not possible to register the provided language');
+		}
+	});
+
+	return useMemo(() => (isLoading ? t('Loading') : hljs.highlight(language, text).value), [isLoading, language, text, t]);
 }
diff --git a/apps/meteor/client/views/admin/integrations/IntegrationsTable.tsx b/apps/meteor/client/views/admin/integrations/IntegrationsTable.tsx
index 206458e09c9b..e2942f384c9d 100644
--- a/apps/meteor/client/views/admin/integrations/IntegrationsTable.tsx
+++ b/apps/meteor/client/views/admin/integrations/IntegrationsTable.tsx
@@ -107,7 +107,7 @@ const IntegrationsTable = ({ type }: { type?: string }) => {
 			)}
 			{isSuccess && data && data.integrations.length > 0 && (
 				<>
-					<GenericTable>
+					<GenericTable aria-label={t('Integrations_table')}>
 						<GenericTableHeader>{headers}</GenericTableHeader>
 						<GenericTableBody>
 							{isSuccess &&
diff --git a/apps/meteor/tests/e2e/administration.spec.ts b/apps/meteor/tests/e2e/administration.spec.ts
index 902d4f09b12c..e4af3c26c106 100644
--- a/apps/meteor/tests/e2e/administration.spec.ts
+++ b/apps/meteor/tests/e2e/administration.spec.ts
@@ -3,8 +3,7 @@ import { faker } from '@faker-js/faker';
 import { IS_EE } from './config/constants';
 import { Users } from './fixtures/userStates';
 import { Admin, Utils } from './page-objects';
-import { createTargetChannel } from './utils';
-import { setSettingValueById } from './utils/setSettingValueById';
+import { createTargetChannel, setSettingValueById } from './utils';
 import { test, expect } from './utils/test';
 
 test.use({ storageState: Users.admin.state });
@@ -275,6 +274,52 @@ test.describe.parallel('administration', () => {
 		});
 	});
 
+	test.describe('Integrations', () => {
+		const messageCodeHighlightDefault =
+			'javascript,css,markdown,dockerfile,json,go,rust,clean,bash,plaintext,powershell,scss,shell,yaml,vim';
+		const incomingIntegrationName = faker.string.uuid();
+
+		test.beforeAll(async ({ api }) => {
+			await setSettingValueById(api, 'Message_Code_highlight', '');
+		});
+
+		test.beforeEach(async ({ page }) => {
+			await page.goto('/admin/integrations');
+		});
+
+		test.afterAll(async ({ api }) => {
+			await setSettingValueById(api, 'Message_Code_highlight', messageCodeHighlightDefault);
+		});
+
+		test('should display the example payload correctly', async () => {
+			await poAdmin.btnNew.click();
+			await poAdmin.btnInstructions.click();
+
+			await expect(poAdmin.codeExamplePayload('Loading')).not.toBeVisible();
+		});
+
+		test('should be able to create new incoming integration', async () => {
+			await poAdmin.btnNew.click();
+			await poAdmin.inputName.fill(incomingIntegrationName);
+			await poAdmin.inputPostToChannel.fill('#general');
+			await poAdmin.inputPostAs.fill(Users.admin.data.username);
+			await poAdmin.btnSave.click();
+
+			await expect(poAdmin.inputWebhookUrl).not.toHaveValue('Will be available here after saving.');
+
+			await poAdmin.btnBack.click();
+			await expect(poAdmin.getIntegrationByName(incomingIntegrationName)).toBeVisible();
+		});
+
+		test('should be able to delete an incoming integration', async () => {
+			await poAdmin.getIntegrationByName(incomingIntegrationName).click();
+			await poAdmin.btnDelete.click();
+			await poUtils.btnModalConfirmDelete.click();
+
+			await expect(poAdmin.getIntegrationByName(incomingIntegrationName)).not.toBeVisible();
+		});
+	});
+
 	test.describe('Settings', () => {
 		test.describe('General', () => {
 			test.beforeEach(async ({ page }) => {
diff --git a/apps/meteor/tests/e2e/page-objects/admin.ts b/apps/meteor/tests/e2e/page-objects/admin.ts
index f3567652fe6e..210dbc95f326 100644
--- a/apps/meteor/tests/e2e/page-objects/admin.ts
+++ b/apps/meteor/tests/e2e/page-objects/admin.ts
@@ -213,11 +213,47 @@ export class Admin {
 		return this.page.getByRole('button', { name: 'Add' });
 	}
 
+	getUserRowByUsername(username: string): Locator {
+		return this.page.locator('tr', { hasText: username });
+	}
+
 	get btnBack(): Locator {
 		return this.page.getByRole('button', { name: 'Back' });
 	}
 
-	getUserRowByUsername(username: string): Locator {
-		return this.page.locator('tr', { hasText: username });
+	get btnNew(): Locator {
+		return this.page.getByRole('button', { name: 'New' });
+	}
+
+	get btnDelete(): Locator {
+		return this.page.getByRole('button', { name: 'Delete' });
+	}
+
+	get btnInstructions(): Locator {
+		return this.page.getByRole('button', { name: 'Instructions' });
+	}
+
+	get inputName(): Locator {
+		return this.page.getByRole('textbox', { name: 'Name' });
+	}
+
+	get inputPostToChannel(): Locator {
+		return this.page.getByRole('textbox', { name: 'Post to Channel' });
+	}
+
+	get inputPostAs(): Locator {
+		return this.page.getByRole('textbox', { name: 'Post as' });
+	}
+
+	codeExamplePayload(text: string): Locator {
+		return this.page.locator('code', { hasText: text });
+	}
+
+	getIntegrationByName(name: string): Locator {
+		return this.page.getByRole('table', { name: 'Integrations table' }).locator('tr', { hasText: name });
+	}
+
+	get inputWebhookUrl(): Locator {
+		return this.page.getByRole('textbox', { name: 'Webhook URL' });
 	}
 }
diff --git a/apps/meteor/tests/e2e/utils/index.ts b/apps/meteor/tests/e2e/utils/index.ts
index 9f83fc0ae246..e1daf601f648 100644
--- a/apps/meteor/tests/e2e/utils/index.ts
+++ b/apps/meteor/tests/e2e/utils/index.ts
@@ -1,2 +1,3 @@
 export * from './create-target-channel';
 export * from './setSettingValueById';
+export * from './getSettingValueById';
diff --git a/packages/i18n/src/locales/en.i18n.json b/packages/i18n/src/locales/en.i18n.json
index e9d1894ef74e..779c71c9d755 100644
--- a/packages/i18n/src/locales/en.i18n.json
+++ b/packages/i18n/src/locales/en.i18n.json
@@ -2763,6 +2763,7 @@
   "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",

From 59df102d0cdcb6968ef04fd5f683d3ef6af9b1f3 Mon Sep 17 00:00:00 2001
From: Martin Schoeler <martin.schoeler@rocket.chat>
Date: Mon, 17 Jun 2024 15:16:17 -0300
Subject: [PATCH 21/94] fix: Long katex strings breaking overflow in x axis
 (#32609)

---
 .changeset/healthy-clouds-hide.md           | 5 +++++
 packages/gazzodown/src/katex/KatexBlock.tsx | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)
 create mode 100644 .changeset/healthy-clouds-hide.md

diff --git a/.changeset/healthy-clouds-hide.md b/.changeset/healthy-clouds-hide.md
new file mode 100644
index 000000000000..528a1bf27568
--- /dev/null
+++ b/.changeset/healthy-clouds-hide.md
@@ -0,0 +1,5 @@
+---
+"@rocket.chat/gazzodown": patch
+---
+
+Fixes long katex lines overflowing the message component
diff --git a/packages/gazzodown/src/katex/KatexBlock.tsx b/packages/gazzodown/src/katex/KatexBlock.tsx
index 25e9c77dc863..5913185d3969 100644
--- a/packages/gazzodown/src/katex/KatexBlock.tsx
+++ b/packages/gazzodown/src/katex/KatexBlock.tsx
@@ -19,7 +19,7 @@ const KatexBlock = ({ code }: KatexBlockProps): ReactElement => {
 		[code],
 	);
 
-	return <div role='math' aria-label={code} dangerouslySetInnerHTML={{ __html: html }} />;
+	return <div role='math' style={{ overflowX: 'auto' }} aria-label={code} dangerouslySetInnerHTML={{ __html: html }} />;
 };
 
 export default KatexBlock;

From 1c4b7024880c1ba6a77464a8bd24da0361113d43 Mon Sep 17 00:00:00 2001
From: Aaron Ogle <geekgonecrazy@users.noreply.github.com>
Date: Mon, 17 Jun 2024 14:47:04 -0500
Subject: [PATCH 22/94] chore: Add telemetry to CI so we can get a better
 understanding of resource usage (#32113)

---
 .github/workflows/ci-test-e2e.yml  |  7 +++++++
 .github/workflows/ci-test-unit.yml |  6 ++++++
 .github/workflows/ci.yml           | 12 ++++++++++++
 3 files changed, 25 insertions(+)

diff --git a/.github/workflows/ci-test-e2e.yml b/.github/workflows/ci-test-e2e.yml
index 1dc8993bfa87..b46c124d149b 100644
--- a/.github/workflows/ci-test-e2e.yml
+++ b/.github/workflows/ci-test-e2e.yml
@@ -90,6 +90,13 @@ jobs:
     name: MongoDB ${{ matrix.mongodb-version }}${{ inputs.db-watcher-disabled == 'true' && ' [no watchers]' || '' }} (${{ matrix.shard }}/${{ inputs.total-shard }})${{ matrix.mongodb-version == '6.0' && ' - Alpine' || '' }}
 
     steps:
+      - name: Collect Workflow Telemetry
+        uses: catchpoint/workflow-telemetry-action@v2
+        with:
+          theme: dark
+          job_summary: true
+          comment_on_pr: false
+
       - name: Login to GitHub Container Registry
         if: (github.event.pull_request.head.repo.full_name == github.repository || github.event_name == 'release' || github.ref == 'refs/heads/develop')
         uses: docker/login-action@v2
diff --git a/.github/workflows/ci-test-unit.yml b/.github/workflows/ci-test-unit.yml
index 066cc2e3773e..cf28bbdfc01a 100644
--- a/.github/workflows/ci-test-unit.yml
+++ b/.github/workflows/ci-test-unit.yml
@@ -21,6 +21,12 @@ jobs:
     name: Unit Tests
 
     steps:
+      - name: Collect Workflow Telemetry
+        uses: catchpoint/workflow-telemetry-action@v2
+        with:
+          theme: dark
+          job_summary: true
+          comment_on_pr: false
       - uses: actions/checkout@v4
 
       - name: Setup NodeJS
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index b16ab459d6bd..b9aa8f616857 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -168,6 +168,12 @@ jobs:
     runs-on: ubuntu-20.04
 
     steps:
+      - name: Collect Workflow Telemetry
+        uses: catchpoint/workflow-telemetry-action@v2
+        with:
+          theme: dark
+          job_summary: true
+          comment_on_pr: false
       - name: Github Info
         run: |
           echo "GITHUB_ACTION: $GITHUB_ACTION"
@@ -192,6 +198,12 @@ jobs:
     runs-on: ubuntu-20.04
 
     steps:
+      - name: Collect Workflow Telemetry
+        uses: catchpoint/workflow-telemetry-action@v2
+        with:
+          theme: dark
+          job_summary: true
+          comment_on_pr: false
       - name: Github Info
         run: |
           echo "GITHUB_ACTION: $GITHUB_ACTION"

From 465c8edff56ecbcd10c2f10be613cf1f25f106c7 Mon Sep 17 00:00:00 2001
From: Yash Rajpal <58601732+yash-rajpal@users.noreply.github.com>
Date: Tue, 18 Jun 2024 02:05:30 +0530
Subject: [PATCH 23/94] fix: E2EE thread main message reactivity (#32381)

---
 .changeset/three-squids-brake.md              |  5 +++
 .../hooks/useThreadMainMessageQuery.ts        |  6 ++--
 apps/meteor/tests/e2e/e2e-encryption.spec.ts  | 34 +++++++++++++++++++
 .../page-objects/fragments/home-content.ts    |  4 +++
 4 files changed, 47 insertions(+), 2 deletions(-)
 create mode 100644 .changeset/three-squids-brake.md

diff --git a/.changeset/three-squids-brake.md b/.changeset/three-squids-brake.md
new file mode 100644
index 000000000000..89ed21f8048c
--- /dev/null
+++ b/.changeset/three-squids-brake.md
@@ -0,0 +1,5 @@
+---
+'@rocket.chat/meteor': patch
+---
+
+Fixed Encrypted thread main message reactivity issues. Earlier the encrypted thread main message was having some reactivity issues and flaky behavior.
diff --git a/apps/meteor/client/views/room/contextualBar/Threads/hooks/useThreadMainMessageQuery.ts b/apps/meteor/client/views/room/contextualBar/Threads/hooks/useThreadMainMessageQuery.ts
index ecf2d54a45f7..76e80d774ca3 100644
--- a/apps/meteor/client/views/room/contextualBar/Threads/hooks/useThreadMainMessageQuery.ts
+++ b/apps/meteor/client/views/room/contextualBar/Threads/hooks/useThreadMainMessageQuery.ts
@@ -7,6 +7,7 @@ import { useCallback, useEffect, useRef } from 'react';
 import { withDebouncing } from '../../../../../../lib/utils/highOrderFunctions';
 import type { FieldExpression, Query } from '../../../../../lib/minimongo';
 import { createFilterFromQuery } from '../../../../../lib/minimongo';
+import { onClientMessageReceived } from '../../../../../lib/onClientMessageReceived';
 import { useRoom } from '../../../contexts/RoomContext';
 import { useGetMessageByID } from './useGetMessageByID';
 
@@ -107,8 +108,9 @@ export const useThreadMainMessageQuery = (
 		unsubscribeRef.current =
 			unsubscribeRef.current ||
 			subscribeToMessage(mainMessage, {
-				onMutate: (message) => {
-					queryClient.setQueryData(queryKey, () => message);
+				onMutate: async (message) => {
+					const msg = await onClientMessageReceived(message);
+					queryClient.setQueryData(queryKey, () => msg);
 					debouncedInvalidate();
 				},
 				onDelete: () => {
diff --git a/apps/meteor/tests/e2e/e2e-encryption.spec.ts b/apps/meteor/tests/e2e/e2e-encryption.spec.ts
index c2d1fcc24cb7..69b77d1ceffb 100644
--- a/apps/meteor/tests/e2e/e2e-encryption.spec.ts
+++ b/apps/meteor/tests/e2e/e2e-encryption.spec.ts
@@ -179,6 +179,40 @@ test.describe.serial('e2e-encryption', () => {
 		await expect(poHomeChannel.content.lastUserMessage.locator('.rcx-icon--name-key')).toBeVisible();
 	});
 
+	test('expect create a private encrypted channel and send a encrypted thread message', 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('This is the thread main message.');
+
+		await expect(poHomeChannel.content.lastUserMessageBody).toHaveText('This is the thread main message.');
+		await expect(poHomeChannel.content.lastUserMessage.locator('.rcx-icon--name-key')).toBeVisible();
+
+		await page.locator('[data-qa-type="message"]').last().hover();
+		await page.locator('role=button[name="Reply in thread"]').click();
+
+		await expect(page).toHaveURL(/.*thread/);
+
+		await expect(poHomeChannel.content.mainThreadMessageText).toContainText('This is the thread main message.');
+		await expect(poHomeChannel.content.mainThreadMessageText.locator('.rcx-icon--name-key')).toBeVisible();
+
+		await poHomeChannel.content.toggleAlsoSendThreadToChannel(true);
+		await page.getByRole('dialog').locator('[name="msg"]').last().fill('This is an encrypted thread message also sent in channel');
+		await page.keyboard.press('Enter');
+		await expect(poHomeChannel.content.lastThreadMessageText).toContainText('This is an encrypted thread message also sent in channel');
+		await expect(poHomeChannel.content.lastThreadMessageText.locator('.rcx-icon--name-key')).toBeVisible();
+		await expect(poHomeChannel.content.lastUserMessage).toContainText('This is an encrypted thread message also sent in channel');
+		await expect(poHomeChannel.content.mainThreadMessageText).toContainText('This is the thread main message.');
+		await expect(poHomeChannel.content.mainThreadMessageText.locator('.rcx-icon--name-key')).toBeVisible();
+	});
+
 	test('expect create a private channel, encrypt it and send an encrypted message', 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 02f7dde09a85..786c5217dadf 100644
--- a/apps/meteor/tests/e2e/page-objects/fragments/home-content.ts
+++ b/apps/meteor/tests/e2e/page-objects/fragments/home-content.ts
@@ -143,6 +143,10 @@ export class HomeContent {
 		return this.page.locator('div.thread-list ul.thread [data-qa-type="message"]').last().locator('.rcx-attachment__details');
 	}
 
+	get mainThreadMessageText(): Locator {
+		return this.page.locator('div.thread-list ul.thread [data-qa-type="message"]').first();
+	}
+
 	get lastThreadMessageText(): Locator {
 		return this.page.locator('div.thread-list ul.thread [data-qa-type="message"]').last();
 	}

From 2ef71e8ea6793a59af45a8089b04177a2f48d153 Mon Sep 17 00:00:00 2001
From: Yash Rajpal <58601732+yash-rajpal@users.noreply.github.com>
Date: Tue, 18 Jun 2024 02:58:53 +0530
Subject: [PATCH 24/94] feat: E2EE room setup header (#32446)

Co-authored-by: gabriellsh <40830821+gabriellsh@users.noreply.github.com>
Co-authored-by: Hugo Costa <20212776+hugocostadev@users.noreply.github.com>
---
 .changeset/gold-flowers-shake.md              |  6 +++
 apps/meteor/client/ui.ts                      |  2 +
 .../client/views/room/Header/Header.tsx       | 24 +++++++----
 .../client/views/room/Header/RoomHeader.tsx   |  5 ++-
 .../views/room/Header/RoomHeaderE2EESetup.tsx | 29 +++++++++++++
 .../RoomToolbox/RoomToolboxE2EESetup.tsx      | 41 +++++++++++++++++++
 apps/meteor/tests/e2e/e2e-encryption.spec.ts  | 23 +++++++++--
 .../page-objects/fragments/home-flextab.ts    |  4 ++
 8 files changed, 121 insertions(+), 13 deletions(-)
 create mode 100644 .changeset/gold-flowers-shake.md
 create mode 100644 apps/meteor/client/views/room/Header/RoomHeaderE2EESetup.tsx
 create mode 100644 apps/meteor/client/views/room/Header/RoomToolbox/RoomToolboxE2EESetup.tsx

diff --git a/.changeset/gold-flowers-shake.md b/.changeset/gold-flowers-shake.md
new file mode 100644
index 000000000000..26182d785c22
--- /dev/null
+++ b/.changeset/gold-flowers-shake.md
@@ -0,0 +1,6 @@
+---
+'@rocket.chat/i18n': minor
+'@rocket.chat/meteor': minor
+---
+
+Added E2EE room setup header, with just limited functionality and room actions.
diff --git a/apps/meteor/client/ui.ts b/apps/meteor/client/ui.ts
index 98d3233134a5..6c7971a8cca0 100644
--- a/apps/meteor/client/ui.ts
+++ b/apps/meteor/client/ui.ts
@@ -78,3 +78,5 @@ export const quickActionHooks = [
 	useCloseChatQuickAction,
 	useOnHoldChatQuickAction,
 ] satisfies (() => QuickActionsActionConfig | undefined)[];
+
+export const roomActionHooksForE2EESetup = [useChannelSettingsRoomAction, useMembersListRoomAction, useE2EERoomAction];
diff --git a/apps/meteor/client/views/room/Header/Header.tsx b/apps/meteor/client/views/room/Header/Header.tsx
index bd5537e0098f..c350544e8157 100644
--- a/apps/meteor/client/views/room/Header/Header.tsx
+++ b/apps/meteor/client/views/room/Header/Header.tsx
@@ -1,15 +1,16 @@
 import type { IRoom } from '@rocket.chat/core-typings';
-import { isVoipRoom } from '@rocket.chat/core-typings';
+import { isDirectMessageRoom, isVoipRoom } from '@rocket.chat/core-typings';
 import { HeaderToolbar } from '@rocket.chat/ui-client';
-import { useLayout } from '@rocket.chat/ui-contexts';
+import { useLayout, useSetting } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React, { lazy, memo, useMemo } from 'react';
 
 import SidebarToggler from '../../../components/SidebarToggler';
 
-const DirectRoomHeader = lazy(() => import('./DirectRoomHeader'));
 const OmnichannelRoomHeader = lazy(() => import('./Omnichannel/OmnichannelRoomHeader'));
 const VoipRoomHeader = lazy(() => import('./Omnichannel/VoipRoomHeader'));
+const RoomHeaderE2EESetup = lazy(() => import('./RoomHeaderE2EESetup'));
+const DirectRoomHeader = lazy(() => import('./DirectRoomHeader'));
 const RoomHeader = lazy(() => import('./RoomHeader'));
 
 type HeaderProps<T> = {
@@ -18,6 +19,9 @@ type HeaderProps<T> = {
 
 const Header = ({ room }: HeaderProps<IRoom>): ReactElement | null => {
 	const { isMobile, isEmbedded, showTopNavbarEmbeddedLayout } = useLayout();
+	const encrypted = Boolean(room.encrypted);
+	const unencryptedMessagesAllowed = useSetting<boolean>('E2E_Allow_Unencrypted_Messages');
+	const shouldDisplayE2EESetup = encrypted && !unencryptedMessagesAllowed;
 
 	const slots = useMemo(
 		() => ({
@@ -34,10 +38,6 @@ const Header = ({ room }: HeaderProps<IRoom>): ReactElement | null => {
 		return null;
 	}
 
-	if (room.t === 'd' && (room.uids?.length ?? 0) < 3) {
-		return <DirectRoomHeader slots={slots} room={room} />;
-	}
-
 	if (room.t === 'l') {
 		return <OmnichannelRoomHeader slots={slots} />;
 	}
@@ -46,7 +46,15 @@ const Header = ({ room }: HeaderProps<IRoom>): ReactElement | null => {
 		return <VoipRoomHeader slots={slots} room={room} />;
 	}
 
-	return <RoomHeader slots={slots} room={room} topic={room.topic} />;
+	if (shouldDisplayE2EESetup) {
+		return <RoomHeaderE2EESetup room={room} topic={room.topic} slots={slots} />;
+	}
+
+	if (isDirectMessageRoom(room) && (room.uids?.length ?? 0) < 3) {
+		return <DirectRoomHeader slots={slots} room={room} />;
+	}
+
+	return <RoomHeader room={room} topic={room.topic} slots={slots} />;
 };
 
 export default memo(Header);
diff --git a/apps/meteor/client/views/room/Header/RoomHeader.tsx b/apps/meteor/client/views/room/Header/RoomHeader.tsx
index 05f80a984982..fee9be6a55a6 100644
--- a/apps/meteor/client/views/room/Header/RoomHeader.tsx
+++ b/apps/meteor/client/views/room/Header/RoomHeader.tsx
@@ -30,9 +30,10 @@ export type RoomHeaderProps = {
 			pos?: unknown;
 		};
 	};
+	roomToolbox?: JSX.Element;
 };
 
-const RoomHeader = ({ room, topic = '', slots = {} }: RoomHeaderProps) => {
+const RoomHeader = ({ room, topic = '', slots = {}, roomToolbox }: RoomHeaderProps) => {
 	const t = useTranslation();
 
 	return (
@@ -65,7 +66,7 @@ const RoomHeader = ({ room, topic = '', slots = {} }: RoomHeaderProps) => {
 			<Suspense fallback={null}>
 				<HeaderToolbar aria-label={t('Toolbox_room_actions')}>
 					{slots?.toolbox?.pre}
-					{slots?.toolbox?.content || <RoomToolbox />}
+					{slots?.toolbox?.content || roomToolbox || <RoomToolbox />}
 					{slots?.toolbox?.pos}
 				</HeaderToolbar>
 			</Suspense>
diff --git a/apps/meteor/client/views/room/Header/RoomHeaderE2EESetup.tsx b/apps/meteor/client/views/room/Header/RoomHeaderE2EESetup.tsx
new file mode 100644
index 000000000000..2b868c28882d
--- /dev/null
+++ b/apps/meteor/client/views/room/Header/RoomHeaderE2EESetup.tsx
@@ -0,0 +1,29 @@
+import { isDirectMessageRoom } from '@rocket.chat/core-typings';
+import React, { lazy } from 'react';
+
+import { E2EEState } from '../../../../app/e2e/client/E2EEState';
+import { E2ERoomState } from '../../../../app/e2e/client/E2ERoomState';
+import { useE2EERoomState } from '../hooks/useE2EERoomState';
+import { useE2EEState } from '../hooks/useE2EEState';
+import DirectRoomHeader from './DirectRoomHeader';
+import RoomHeader from './RoomHeader';
+import type { RoomHeaderProps } from './RoomHeader';
+
+const RoomToolboxE2EESetup = lazy(() => import('./RoomToolbox/RoomToolboxE2EESetup'));
+
+const RoomHeaderE2EESetup = ({ room, topic = '', slots = {} }: RoomHeaderProps) => {
+	const e2eeState = useE2EEState();
+	const e2eRoomState = useE2EERoomState(room._id);
+
+	if (e2eeState === E2EEState.SAVE_PASSWORD || e2eeState === E2EEState.ENTER_PASSWORD || e2eRoomState === E2ERoomState.WAITING_KEYS) {
+		return <RoomHeader room={room} topic={topic} slots={slots} roomToolbox={<RoomToolboxE2EESetup />} />;
+	}
+
+	if (isDirectMessageRoom(room) && (room.uids?.length ?? 0) < 3) {
+		return <DirectRoomHeader slots={slots} room={room} />;
+	}
+
+	return <RoomHeader room={room} topic={topic} slots={slots} />;
+};
+
+export default RoomHeaderE2EESetup;
diff --git a/apps/meteor/client/views/room/Header/RoomToolbox/RoomToolboxE2EESetup.tsx b/apps/meteor/client/views/room/Header/RoomToolbox/RoomToolboxE2EESetup.tsx
new file mode 100644
index 000000000000..9b79dff5a6bd
--- /dev/null
+++ b/apps/meteor/client/views/room/Header/RoomToolbox/RoomToolboxE2EESetup.tsx
@@ -0,0 +1,41 @@
+import { useStableArray } from '@rocket.chat/fuselage-hooks';
+import { HeaderToolbarAction } from '@rocket.chat/ui-client';
+import { useTranslation } from '@rocket.chat/ui-contexts';
+import React from 'react';
+
+import { roomActionHooksForE2EESetup } from '../../../../ui';
+import type { RoomToolboxActionConfig } from '../../contexts/RoomToolboxContext';
+import { useRoomToolbox } from '../../contexts/RoomToolboxContext';
+
+const RoomToolboxE2EESetup = () => {
+	const t = useTranslation();
+	const toolbox = useRoomToolbox();
+
+	const { tab } = toolbox;
+
+	const actions = useStableArray(
+		roomActionHooksForE2EESetup
+			.map((roomActionHook) => roomActionHook())
+			.filter((roomAction): roomAction is RoomToolboxActionConfig => !!roomAction),
+	);
+
+	return (
+		<>
+			{actions.map(({ id, icon, title, action, disabled, tooltip }, index) => (
+				<HeaderToolbarAction
+					key={id}
+					index={index}
+					id={id}
+					icon={icon}
+					title={t(title)}
+					pressed={id === tab?.id}
+					action={action ?? (() => toolbox.openTab(id))}
+					disabled={disabled}
+					tooltip={tooltip}
+				/>
+			))}
+		</>
+	);
+};
+
+export default RoomToolboxE2EESetup;
diff --git a/apps/meteor/tests/e2e/e2e-encryption.spec.ts b/apps/meteor/tests/e2e/e2e-encryption.spec.ts
index 69b77d1ceffb..8b0753c952d2 100644
--- a/apps/meteor/tests/e2e/e2e-encryption.spec.ts
+++ b/apps/meteor/tests/e2e/e2e-encryption.spec.ts
@@ -429,11 +429,17 @@ test.describe.serial('e2ee room setup', () => {
 
 		await poHomeChannel.dismissToast();
 
-		await expect(poHomeChannel.content.encryptedRoomHeaderIcon).toBeVisible();
+		await poHomeChannel.content.encryptedRoomHeaderIcon.first().waitFor();
+		await expect(poHomeChannel.content.encryptedRoomHeaderIcon.first()).toBeVisible();
 
 		await page.locator('role=button[name="Save E2EE password"]').waitFor();
 		await expect(page.locator('role=button[name="Save E2EE password"]')).toBeVisible();
 
+		await poHomeChannel.tabs.btnE2EERoomSetupDisableE2E.waitFor();
+		await expect(poHomeChannel.tabs.btnE2EERoomSetupDisableE2E).toBeVisible();
+		await expect(poHomeChannel.tabs.btnTabMembers).toBeVisible();
+		await expect(poHomeChannel.tabs.btnRoomInfo).toBeVisible();
+
 		await expect(poHomeChannel.content.inputMessage).not.toBeVisible();
 
 		await page.locator('role=button[name="Save E2EE password"]').click();
@@ -477,11 +483,17 @@ test.describe.serial('e2ee room setup', () => {
 
 		await poHomeChannel.dismissToast();
 
-		await expect(poHomeChannel.content.encryptedRoomHeaderIcon).toBeVisible();
+		await expect(poHomeChannel.content.encryptedRoomHeaderIcon.first()).toBeVisible();
 
 		await page.locator('role=button[name="Enter your E2E password"]').waitFor();
 
 		await expect(page.locator('role=banner >> text="Enter your E2E password"')).toBeVisible();
+
+		await poHomeChannel.tabs.btnE2EERoomSetupDisableE2E.waitFor();
+		await expect(poHomeChannel.tabs.btnE2EERoomSetupDisableE2E).toBeVisible();
+		await expect(poHomeChannel.tabs.btnTabMembers).toBeVisible();
+		await expect(poHomeChannel.tabs.btnRoomInfo).toBeVisible();
+
 		await expect(poHomeChannel.content.inputMessage).not.toBeVisible();
 
 		await page.locator('role=button[name="Enter your E2E password"]').click();
@@ -518,7 +530,7 @@ test.describe.serial('e2ee room setup', () => {
 
 		await poHomeChannel.dismissToast();
 
-		await expect(poHomeChannel.content.encryptedRoomHeaderIcon).toBeVisible();
+		await expect(poHomeChannel.content.encryptedRoomHeaderIcon.first()).toBeVisible();
 
 		await poHomeChannel.content.sendMessage('hello world');
 
@@ -551,5 +563,10 @@ test.describe.serial('e2ee room setup', () => {
 
 		await expect(poHomeChannel.content.inputMessage).not.toBeVisible();
 		await expect(page.locator('.rcx-states__title')).toContainText('Check back later');
+
+		await poHomeChannel.tabs.btnE2EERoomSetupDisableE2E.waitFor();
+		await expect(poHomeChannel.tabs.btnE2EERoomSetupDisableE2E).toBeVisible();
+		await expect(poHomeChannel.tabs.btnTabMembers).toBeVisible();
+		await expect(poHomeChannel.tabs.btnRoomInfo).toBeVisible();
 	});
 });
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 b8bd673c9cf3..a6d91bc6fc34 100644
--- a/apps/meteor/tests/e2e/page-objects/fragments/home-flextab.ts
+++ b/apps/meteor/tests/e2e/page-objects/fragments/home-flextab.ts
@@ -44,6 +44,10 @@ export class HomeFlextab {
 		return this.page.locator('role=menuitem[name="Notifications Preferences"]');
 	}
 
+	get btnE2EERoomSetupDisableE2E(): Locator {
+		return this.page.locator('[data-qa-id=ToolBoxAction-key]');
+	}
+
 	get btnDisableE2E(): Locator {
 		return this.page.locator('role=menuitem[name="Disable E2E"]');
 	}

From 4f72d62aa73b12456280861be884c99a1e12c2a1 Mon Sep 17 00:00:00 2001
From: Douglas Gubert <douglas.gubert@gmail.com>
Date: Mon, 17 Jun 2024 19:17:08 -0300
Subject: [PATCH 25/94] feat: Apps-Engine Deno Runtime update (#31821)

Co-authored-by: Rafael Tapia <18501599+tapiarafael@users.noreply.github.com>
---
 .changeset/tame-weeks-shout.md                |  41 +++
 .github/actions/setup-node/action.yml         |   8 +
 apps/meteor/.docker/Dockerfile                |  25 +-
 apps/meteor/.docker/Dockerfile.alpine         |  73 ++++-
 .../app/apps/server/bridges/commands.ts       |   8 +-
 apps/meteor/app/apps/server/bridges/http.ts   |  94 +++---
 .../app/metrics/server/lib/collectMetrics.ts  |   2 +-
 .../server/lib/getAppsStatistics.js           |  18 -
 .../server/lib/getAppsStatistics.ts           |  51 +++
 .../app/statistics/server/lib/statistics.ts   |   2 +-
 .../ee/lib/misc/formatAppInstanceForRest.ts   |   4 +-
 .../endpoints/appsCountHandler.ts             |   4 +-
 .../ee/server/apps/communication/rest.ts      |  26 +-
 .../server/apps/communication/websockets.ts   |   4 +-
 apps/meteor/ee/server/apps/cron.ts            |   2 +-
 apps/meteor/ee/server/apps/orchestrator.js    |  49 +--
 .../server/apps/storage/AppRealLogStorage.ts  |  36 ++
 apps/meteor/ee/server/apps/storage/index.js   |   2 +-
 .../ee/server/apps/storage/logs-storage.js    |  32 --
 apps/meteor/ee/server/services/package.json   |   2 +-
 apps/meteor/package.json                      |   2 +-
 .../server/services/apps-engine/service.ts    |   7 +-
 .../apps/02-send-messages-as-user.js          |   2 +-
 docker-compose-ci.yml                         |   1 +
 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 +-
 .../model-typings/src/models/IAppLogsModel.ts |   3 +
 packages/rest-typings/package.json            |   2 +-
 yarn.lock                                     | 310 +++++++++++++++++-
 33 files changed, 622 insertions(+), 200 deletions(-)
 create mode 100644 .changeset/tame-weeks-shout.md
 delete mode 100644 apps/meteor/app/statistics/server/lib/getAppsStatistics.js
 create mode 100644 apps/meteor/app/statistics/server/lib/getAppsStatistics.ts
 create mode 100644 apps/meteor/ee/server/apps/storage/AppRealLogStorage.ts
 delete mode 100644 apps/meteor/ee/server/apps/storage/logs-storage.js

diff --git a/.changeset/tame-weeks-shout.md b/.changeset/tame-weeks-shout.md
new file mode 100644
index 000000000000..72bfc864274f
--- /dev/null
+++ b/.changeset/tame-weeks-shout.md
@@ -0,0 +1,41 @@
+---
+'@rocket.chat/omnichannel-services': minor
+'rocketchat-services': minor
+'@rocket.chat/omnichannel-transcript': minor
+'@rocket.chat/authorization-service': minor
+'@rocket.chat/web-ui-registration': minor
+'@rocket.chat/stream-hub-service': minor
+'@rocket.chat/uikit-playground': minor
+'@rocket.chat/presence-service': minor
+'@rocket.chat/fuselage-ui-kit': minor
+'@rocket.chat/instance-status': minor
+'@rocket.chat/account-service': minor
+'@rocket.chat/mock-providers': minor
+'@rocket.chat/api-client': minor
+'@rocket.chat/ddp-client': minor
+'@rocket.chat/pdf-worker': minor
+'@rocket.chat/ui-theming': minor
+'@rocket.chat/core-services': minor
+'@rocket.chat/model-typings': minor
+'@rocket.chat/ui-video-conf': minor
+'@rocket.chat/core-typings': minor
+'@rocket.chat/rest-typings': minor
+'@rocket.chat/ddp-streamer': minor
+'@rocket.chat/queue-worker': minor
+'@rocket.chat/presence': minor
+'@rocket.chat/ui-composer': minor
+'@rocket.chat/ui-contexts': minor
+'@rocket.chat/license': minor
+'@rocket.chat/gazzodown': minor
+'@rocket.chat/ui-avatar': minor
+'@rocket.chat/ui-client': minor
+'@rocket.chat/livechat': minor
+'@rocket.chat/models': minor
+'@rocket.chat/ui-kit': minor
+'@rocket.chat/apps': minor
+'@rocket.chat/cron': minor
+'@rocket.chat/i18n': minor
+'@rocket.chat/meteor': minor
+---
+
+New runtime for apps in the Apps-Engine based on the Deno platform
diff --git a/.github/actions/setup-node/action.yml b/.github/actions/setup-node/action.yml
index 0e921e81f1f3..caa3c63e00f0 100644
--- a/.github/actions/setup-node/action.yml
+++ b/.github/actions/setup-node/action.yml
@@ -10,6 +10,10 @@ inputs:
   install:
     required: false
     type: boolean
+  deno-dir:
+    required: false
+    type: string
+    default: ~/.deno-cache
 
 outputs:
   node-version:
@@ -19,6 +23,9 @@ runs:
   using: composite
 
   steps:
+    - run: echo 'DENO_DIR=${{ inputs.deno-dir }}' >> $GITHUB_ENV
+      shell: bash
+
     - name: Cache Node Modules
       if: inputs.cache-modules
       id: cache-node-modules
@@ -26,6 +33,7 @@ runs:
       with:
         path: |
           node_modules
+          ${{ env.DENO_DIR }}
           apps/meteor/node_modules
           apps/meteor/ee/server/services/node_modules
         key: node-modules-${{ hashFiles('yarn.lock') }}
diff --git a/apps/meteor/.docker/Dockerfile b/apps/meteor/.docker/Dockerfile
index 456ed4becafd..1e9ed3f5e592 100644
--- a/apps/meteor/.docker/Dockerfile
+++ b/apps/meteor/.docker/Dockerfile
@@ -13,12 +13,24 @@ RUN groupadd -g 65533 -r rocketchat \
 # --chown requires Docker 17.12 and works only on Linux
 ADD --chown=rocketchat:rocketchat . /app
 
+# needs a mongoinstance - defaults to container linking with alias 'mongo'
+ENV DEPLOY_METHOD=docker \
+    NODE_ENV=production \
+    MONGO_URL=mongodb://mongo:27017/rocketchat \
+    HOME=/tmp \
+    PORT=3000 \
+    ROOT_URL=http://localhost:3000 \
+    Accounts_AvatarStorePath=/app/uploads \
+    DENO_DIR=/usr/share/deno
+
 RUN aptMark="$(apt-mark showmanual)" \
     && apt-get install -y --no-install-recommends g++ make python3 ca-certificates \
     && cd /app/bundle/programs/server \
     && npm install \
-	&& cd npm/node_modules/isolated-vm \
-	&& 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 '{}' ';' \
@@ -37,15 +49,6 @@ VOLUME /app/uploads
 
 WORKDIR /app/bundle
 
-# needs a mongoinstance - defaults to container linking with alias 'mongo'
-ENV DEPLOY_METHOD=docker \
-    NODE_ENV=production \
-    MONGO_URL=mongodb://mongo:27017/rocketchat \
-    HOME=/tmp \
-    PORT=3000 \
-    ROOT_URL=http://localhost:3000 \
-    Accounts_AvatarStorePath=/app/uploads
-
 EXPOSE 3000
 
 CMD ["node", "main.js"]
diff --git a/apps/meteor/.docker/Dockerfile.alpine b/apps/meteor/.docker/Dockerfile.alpine
index 94baef809217..feebf76a03e7 100644
--- a/apps/meteor/.docker/Dockerfile.alpine
+++ b/apps/meteor/.docker/Dockerfile.alpine
@@ -1,13 +1,68 @@
 FROM node:14.21.3-alpine3.16
 
-RUN apk add --no-cache ttf-dejavu
+ENV LANG=C.UTF-8
+
+# 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
+# NOTE: Glibc 2.35 package is broken: https://github.com/sgerrand/alpine-pkg-glibc/issues/176, so we stick to 2.34 for now
+RUN ALPINE_GLIBC_BASE_URL="https://github.com/sgerrand/alpine-pkg-glibc/releases/download" && \
+    ALPINE_GLIBC_PACKAGE_VERSION="2.34-r0" && \
+    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 && \
+    echo \
+        "-----BEGIN PUBLIC KEY-----\
+        MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApZ2u1KJKUu/fW4A25y9m\
+        y70AGEa/J3Wi5ibNVGNn1gT1r0VfgeWd0pUybS4UmcHdiNzxJPgoWQhV2SSW1JYu\
+        tOqKZF5QSN6X937PTUpNBjUvLtTQ1ve1fp39uf/lEXPpFpOPL88LKnDBgbh7wkCp\
+        m2KzLVGChf83MS0ShL6G9EQIAUxLm99VpgRjwqTQ/KfzGtpke1wqws4au0Ab4qPY\
+        KXvMLSPLUp7cfulWvhmZSegr5AdhNw5KNizPqCJT8ZrGvgHypXyiFvvAH5YRtSsc\
+        Zvo9GI2e2MaZyo9/lvb+LbLEJZKEQckqRj4P26gmASrZEPStwc+yqy1ShHLA0j6m\
+        1QIDAQAB\
+        -----END PUBLIC KEY-----" | sed 's/   */\n/g' > "/etc/apk/keys/sgerrand.rsa.pub" && \
+    wget \
+        "$ALPINE_GLIBC_BASE_URL/$ALPINE_GLIBC_PACKAGE_VERSION/$ALPINE_GLIBC_BASE_PACKAGE_FILENAME" \
+        "$ALPINE_GLIBC_BASE_URL/$ALPINE_GLIBC_PACKAGE_VERSION/$ALPINE_GLIBC_BIN_PACKAGE_FILENAME" \
+        "$ALPINE_GLIBC_BASE_URL/$ALPINE_GLIBC_PACKAGE_VERSION/$ALPINE_GLIBC_I18N_PACKAGE_FILENAME" && \
+    mv /etc/nsswitch.conf /etc/nsswitch.conf.bak && \
+    apk add --no-cache --force-overwrite \
+        "$ALPINE_GLIBC_BASE_PACKAGE_FILENAME" \
+        "$ALPINE_GLIBC_BIN_PACKAGE_FILENAME" \
+        "$ALPINE_GLIBC_I18N_PACKAGE_FILENAME" && \
+    \
+    mv /etc/nsswitch.conf.bak /etc/nsswitch.conf && \
+    rm "/etc/apk/keys/sgerrand.rsa.pub" && \
+    (/usr/glibc-compat/bin/localedef --force --inputfile POSIX --charmap UTF-8 "$LANG" || true) && \
+    echo "export LANG=$LANG" > /etc/profile.d/locale.sh && \
+    \
+    apk del glibc-i18n && \
+    \
+    rm "/root/.wget-hsts" && \
+    apk del .build-dependencies && \
+    rm \
+        "$ALPINE_GLIBC_BASE_PACKAGE_FILENAME" \
+        "$ALPINE_GLIBC_BIN_PACKAGE_FILENAME" \
+        "$ALPINE_GLIBC_I18N_PACKAGE_FILENAME" && \
+    apk add --no-cache ttf-dejavu
 
 ADD . /app
 
 LABEL maintainer="buildmaster@rocket.chat"
 
+# needs a mongo instance - defaults to container linking with alias 'mongo'
+ENV DEPLOY_METHOD=docker \
+    NODE_ENV=production \
+    MONGO_URL=mongodb://mongo:27017/rocketchat \
+    HOME=/tmp \
+    PORT=3000 \
+    ROOT_URL=http://localhost:3000 \
+    Accounts_AvatarStorePath=/app/uploads \
+    DENO_DIR=/usr/share/deno
+
 RUN set -x \
-    && apk add --no-cache --virtual .fetch-deps python3 make g++ libc6-compat \
+    && apk add --no-cache --virtual .fetch-deps python3 make g++ \
     && cd /app/bundle/programs/server \
     && npm install --production \
     # Start hack for sharp...
@@ -20,20 +75,14 @@ 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
-    && cd npm \
+    # 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 \
     && apk del .fetch-deps
 
-# needs a mongo instance - defaults to container linking with alias 'mongo'
-ENV DEPLOY_METHOD=docker \
-    NODE_ENV=production \
-    MONGO_URL=mongodb://mongo:27017/rocketchat \
-    HOME=/tmp \
-    PORT=3000 \
-    ROOT_URL=http://localhost:3000 \
-    Accounts_AvatarStorePath=/app/uploads
-
 VOLUME /app/uploads
 
 WORKDIR /app/bundle
diff --git a/apps/meteor/app/apps/server/bridges/commands.ts b/apps/meteor/app/apps/server/bridges/commands.ts
index 5e018c51de89..5ffef6473051 100644
--- a/apps/meteor/app/apps/server/bridges/commands.ts
+++ b/apps/meteor/app/apps/server/bridges/commands.ts
@@ -111,8 +111,8 @@ export class AppCommandsBridge extends CommandBridge {
 			permission: command.permission,
 			callback: this._appCommandExecutor.bind(this),
 			providesPreview: command.providesPreview,
-			previewer: !command.previewer ? undefined : this._appCommandPreviewer.bind(this),
-			previewCallback: (!command.executePreviewItem ? undefined : this._appCommandPreviewExecutor.bind(this)) as
+			previewer: command.providesPreview ? this._appCommandPreviewer.bind(this) : undefined,
+			previewCallback: (command.providesPreview ? this._appCommandPreviewExecutor.bind(this) : undefined) as
 				| (typeof slashCommands.commands)[string]['previewCallback']
 				| undefined,
 		} as SlashCommand;
@@ -155,10 +155,6 @@ export class AppCommandsBridge extends CommandBridge {
 		if (typeof command.providesPreview !== 'boolean') {
 			throw new Error('Invalid Slash Command parameter provided, it must be a valid ISlashCommand object.');
 		}
-
-		if (typeof command.executor !== 'function') {
-			throw new Error('Invalid Slash Command parameter provided, it must be a valid ISlashCommand object.');
-		}
 	}
 
 	private async _appCommandExecutor({ command, message, params, triggerId, userId }: SlashCommandCallbackParams<string>): Promise<void> {
diff --git a/apps/meteor/app/apps/server/bridges/http.ts b/apps/meteor/app/apps/server/bridges/http.ts
index 1535a18823c5..9d62769336a2 100644
--- a/apps/meteor/app/apps/server/bridges/http.ts
+++ b/apps/meteor/app/apps/server/bridges/http.ts
@@ -72,55 +72,51 @@ export class AppHttpBridge extends HttpBridge {
 
 		this.orch.debugLog(`The App ${info.appId} is requesting from the outter webs:`, info);
 
-		try {
-			const response = await fetch(
-				url.href,
-				{
-					method,
-					body: content,
-					headers,
-					timeout,
-				},
-				(request.hasOwnProperty('strictSSL') && !request.strictSSL) ||
-					(request.hasOwnProperty('rejectUnauthorized') && request.rejectUnauthorized),
-			);
-
-			const result: IHttpResponse = {
-				url: info.url,
-				method: info.method,
-				statusCode: response.status,
-				headers: Object.fromEntries(response.headers as unknown as any),
-			};
-
-			const body = Buffer.from(await response.arrayBuffer());
-
-			if (request.encoding === null) {
-				/**
-				 * The property `content` is not appropriately typed in the
-				 * Apps-engine definition, and we can't simply change it there
-				 * as it would be a breaking change. Thus, we're left with this
-				 * type assertion.
-				 */
-				result.content = body as any;
-			} else {
-				result.content = body.toString(request.encoding as BufferEncoding);
-				result.data = ((): any => {
-					const contentType = (response.headers.get('content-type') || '').split(';')[0];
-					if (!['application/json', 'text/javascript', 'application/javascript', 'application/x-javascript'].includes(contentType)) {
-						return null;
-					}
-
-					try {
-						return JSON.parse(result.content);
-					} catch {
-						return null;
-					}
-				})();
-			}
-
-			return result;
-		} catch (e: any) {
-			return e.response;
+		const response = await fetch(
+			url.href,
+			{
+				method,
+				body: content,
+				headers,
+				timeout,
+			},
+			(request.hasOwnProperty('strictSSL') && !request.strictSSL) ||
+				(request.hasOwnProperty('rejectUnauthorized') && request.rejectUnauthorized),
+		);
+
+		const result: IHttpResponse = {
+			url: info.url,
+			method: info.method,
+			statusCode: response.status,
+			headers: Object.fromEntries(response.headers as unknown as any),
+		};
+
+		const body = Buffer.from(await response.arrayBuffer());
+
+		if (request.encoding === null) {
+			/**
+			 * The property `content` is not appropriately typed in the
+			 * Apps-engine definition, and we can't simply change it there
+			 * as it would be a breaking change. Thus, we're left with this
+			 * type assertion.
+			 */
+			result.content = body as any;
+		} else {
+			result.content = body.toString(request.encoding as BufferEncoding);
+			result.data = ((): any => {
+				const contentType = (response.headers.get('content-type') || '').split(';')[0];
+				if (!['application/json', 'text/javascript', 'application/javascript', 'application/x-javascript'].includes(contentType)) {
+					return null;
+				}
+
+				try {
+					return JSON.parse(result.content);
+				} catch {
+					return null;
+				}
+			})();
 		}
+
+		return result;
 	}
 }
diff --git a/apps/meteor/app/metrics/server/lib/collectMetrics.ts b/apps/meteor/app/metrics/server/lib/collectMetrics.ts
index 136686f49c9e..978b3d59ec98 100644
--- a/apps/meteor/app/metrics/server/lib/collectMetrics.ts
+++ b/apps/meteor/app/metrics/server/lib/collectMetrics.ts
@@ -39,7 +39,7 @@ const setPrometheusData = async (): Promise<void> => {
 	metrics.ddpConnectedUsers.set(_.unique(authenticatedSessions.map((s) => s.userId)).length);
 
 	// Apps metrics
-	const { totalInstalled, totalActive, totalFailed } = getAppsStatistics();
+	const { totalInstalled, totalActive, totalFailed } = await getAppsStatistics();
 
 	metrics.totalAppsInstalled.set(totalInstalled || 0);
 	metrics.totalAppsEnabled.set(totalActive || 0);
diff --git a/apps/meteor/app/statistics/server/lib/getAppsStatistics.js b/apps/meteor/app/statistics/server/lib/getAppsStatistics.js
deleted file mode 100644
index 1d84bead3e85..000000000000
--- a/apps/meteor/app/statistics/server/lib/getAppsStatistics.js
+++ /dev/null
@@ -1,18 +0,0 @@
-import { Apps } from '@rocket.chat/apps';
-import { AppStatus } from '@rocket.chat/apps-engine/definition/AppStatus';
-
-import { Info } from '../../../utils/rocketchat.info';
-
-export function getAppsStatistics() {
-	return {
-		engineVersion: Info.marketplaceApiVersion,
-		totalInstalled: (Apps.self?.isInitialized() && Apps.getManager().get().length) ?? 0,
-		totalActive: (Apps.self?.isInitialized() && Apps.getManager().get({ enabled: true }).length) ?? 0,
-		totalFailed:
-			(Apps.self?.isInitialized() &&
-				Apps.getManager()
-					.get({ disabled: true })
-					.filter(({ app: { status } }) => status !== AppStatus.MANUALLY_DISABLED).length) ??
-			0,
-	};
-}
diff --git a/apps/meteor/app/statistics/server/lib/getAppsStatistics.ts b/apps/meteor/app/statistics/server/lib/getAppsStatistics.ts
new file mode 100644
index 000000000000..930fc15a9c55
--- /dev/null
+++ b/apps/meteor/app/statistics/server/lib/getAppsStatistics.ts
@@ -0,0 +1,51 @@
+import { Apps } from '@rocket.chat/apps';
+import { AppStatus, AppStatusUtils } from '@rocket.chat/apps-engine/definition/AppStatus';
+
+import { Info } from '../../../utils/rocketchat.info';
+
+export type AppsStatistics = {
+	engineVersion: string;
+	totalInstalled: number | false;
+	totalActive: number | false;
+	totalFailed: number | false;
+};
+
+export async function getAppsStatistics(): Promise<AppsStatistics> {
+	if (!Apps.self?.isInitialized()) {
+		return {
+			engineVersion: Info.marketplaceApiVersion,
+			totalInstalled: false,
+			totalActive: false,
+			totalFailed: false,
+		};
+	}
+
+	const apps = await Apps.getManager().get();
+
+	let totalInstalled = 0;
+	let totalActive = 0;
+	let totalFailed = 0;
+
+	await Promise.all(
+		apps.map(async (app) => {
+			totalInstalled++;
+
+			const status = await app.getStatus();
+
+			if (status === AppStatus.MANUALLY_DISABLED) {
+				totalFailed++;
+			}
+
+			if (AppStatusUtils.isEnabled(status)) {
+				totalActive++;
+			}
+		}),
+	);
+
+	return {
+		engineVersion: Info.marketplaceApiVersion,
+		totalInstalled,
+		totalActive,
+		totalFailed,
+	};
+}
diff --git a/apps/meteor/app/statistics/server/lib/statistics.ts b/apps/meteor/app/statistics/server/lib/statistics.ts
index a6fcc5b17b5b..cff2aaefcc5a 100644
--- a/apps/meteor/app/statistics/server/lib/statistics.ts
+++ b/apps/meteor/app/statistics/server/lib/statistics.ts
@@ -467,7 +467,7 @@ export const statistics = {
 			}),
 		);
 
-		statistics.apps = getAppsStatistics();
+		statistics.apps = await getAppsStatistics();
 		statistics.services = await getServicesStatistics();
 		statistics.importer = getImporterStatistics();
 		statistics.videoConf = await VideoConf.getStatistics();
diff --git a/apps/meteor/ee/lib/misc/formatAppInstanceForRest.ts b/apps/meteor/ee/lib/misc/formatAppInstanceForRest.ts
index d76b7ae59aeb..bf096122c50f 100644
--- a/apps/meteor/ee/lib/misc/formatAppInstanceForRest.ts
+++ b/apps/meteor/ee/lib/misc/formatAppInstanceForRest.ts
@@ -14,10 +14,10 @@ interface IAppInfoRest extends IAppInfo {
 	migrated: boolean;
 }
 
-export function formatAppInstanceForRest(app: ProxiedApp): IAppInfoRest {
+export async function formatAppInstanceForRest(app: ProxiedApp): Promise<IAppInfoRest> {
 	const appRest: IAppInfoRest = {
 		...app.getInfo(),
-		status: app.getStatus(),
+		status: await app.getStatus(),
 		languages: app.getStorageItem().languageContent,
 		private: getInstallationSourceFromAppStorageItem(app.getStorageItem()) === 'private',
 		migrated: !!app.getStorageItem().migrated,
diff --git a/apps/meteor/ee/server/apps/communication/endpoints/appsCountHandler.ts b/apps/meteor/ee/server/apps/communication/endpoints/appsCountHandler.ts
index fc436b8229cf..878dd9aab92c 100644
--- a/apps/meteor/ee/server/apps/communication/endpoints/appsCountHandler.ts
+++ b/apps/meteor/ee/server/apps/communication/endpoints/appsCountHandler.ts
@@ -19,10 +19,10 @@ export const appsCountHandler = (apiManager: AppsRestApi) =>
 			authRequired: false,
 		},
 		{
-			get(): SuccessResult<AppsCountResult> {
+			async get(): Promise<SuccessResult<AppsCountResult>> {
 				const manager = apiManager._manager as AppManager;
 
-				const apps = manager.get({ enabled: true });
+				const apps = await manager.get({ enabled: true });
 				const { maxMarketplaceApps, maxPrivateApps } = License.getAppsConfig();
 
 				return API.v1.success({
diff --git a/apps/meteor/ee/server/apps/communication/rest.ts b/apps/meteor/ee/server/apps/communication/rest.ts
index df30cccc8e73..02f8aeb7b344 100644
--- a/apps/meteor/ee/server/apps/communication/rest.ts
+++ b/apps/meteor/ee/server/apps/communication/rest.ts
@@ -209,8 +209,9 @@ export class AppsRestApi {
 			{ authRequired: true },
 			{
 				async get() {
-					const apps = manager.get().map(formatAppInstanceForRest);
-					return API.v1.success({ apps });
+					const apps = await manager.get();
+					const formatted = await Promise.all(apps.map(formatAppInstanceForRest));
+					return API.v1.success({ apps: formatted });
 				},
 			},
 		);
@@ -302,7 +303,8 @@ export class AppsRestApi {
 					}
 					apiDeprecationLogger.endpoint(this.request.route, '7.0.0', this.response, 'Use /apps/installed to get the installed apps list.');
 
-					const apps = manager.get().map(formatAppInstanceForRest);
+					const proxiedApps = await manager.get();
+					const apps = await Promise.all(proxiedApps.map(formatAppInstanceForRest));
 
 					return API.v1.success({ apps });
 				},
@@ -412,7 +414,7 @@ export class AppsRestApi {
 						});
 					}
 
-					info.status = aff.getApp().getStatus();
+					info.status = await aff.getApp().getStatus();
 
 					void notifyAppInstall(orchestrator.getMarketplaceUrl() as string, 'install', info);
 
@@ -508,8 +510,8 @@ export class AppsRestApi {
 			'languages',
 			{ authRequired: false },
 			{
-				get() {
-					const apps = manager.get().map((prl) => ({
+				async get() {
+					const apps = (await manager.get()).map((prl) => ({
 						id: prl.getID(),
 						languages: prl.getStorageItem().languageContent,
 					}));
@@ -760,7 +762,7 @@ export class AppsRestApi {
 						});
 					}
 
-					info.status = aff.getApp().getStatus();
+					info.status = await aff.getApp().getStatus();
 
 					void notifyAppInstall(orchestrator.getMarketplaceUrl() as string, 'update', info);
 
@@ -784,10 +786,14 @@ export class AppsRestApi {
 						?.get('users')
 						.convertToApp(await Meteor.userAsync());
 
-					await manager.remove(prl.getID(), { user });
-
 					const info: IAppInfo & { status?: AppStatus } = prl.getInfo();
-					info.status = prl.getStatus();
+					try {
+						await manager.remove(prl.getID(), { user });
+						info.status = AppStatus.DISABLED;
+					} catch (e) {
+						info.status = await prl.getStatus();
+						return API.v1.failure({ app: info });
+					}
 
 					void notifyAppInstall(orchestrator.getMarketplaceUrl() as string, 'uninstall', info);
 
diff --git a/apps/meteor/ee/server/apps/communication/websockets.ts b/apps/meteor/ee/server/apps/communication/websockets.ts
index 65a2a73ca063..83a161427143 100644
--- a/apps/meteor/ee/server/apps/communication/websockets.ts
+++ b/apps/meteor/ee/server/apps/communication/websockets.ts
@@ -51,7 +51,7 @@ export class AppServerListener {
 	async onAppStatusUpdated({ appId, status }: { appId: string; status: AppStatus }): Promise<void> {
 		const app = this.orch.getManager()?.getOneById(appId);
 
-		if (!app || app.getStatus() === status) {
+		if (!app || (await app.getStatus()) === status) {
 			return;
 		}
 
@@ -76,10 +76,12 @@ export class AppServerListener {
 			setting,
 			when: new Date(),
 		});
+
 		await this.orch
 			.getManager()!
 			.getSettingsManager()
 			.updateAppSetting(appId, setting as any); // TO-DO: fix type of `setting`
+
 		this.clientStreamer.emitWithoutBroadcast(AppEvents.APP_SETTING_UPDATED, { appId, setting });
 	}
 
diff --git a/apps/meteor/ee/server/apps/cron.ts b/apps/meteor/ee/server/apps/cron.ts
index e58610d2cbf0..f904486bf610 100644
--- a/apps/meteor/ee/server/apps/cron.ts
+++ b/apps/meteor/ee/server/apps/cron.ts
@@ -57,7 +57,7 @@ const notifyAdminsAboutRenewedApps = async function _notifyAdminsAboutRenewedApp
 	}
 
 	const renewedApps = apps.filter(
-		(app) => app.getStatus() === AppStatus.DISABLED && app.getPreviousStatus() === AppStatus.INVALID_LICENSE_DISABLED,
+		async (app) => (await app.getStatus()) === AppStatus.DISABLED && app.getPreviousStatus() === AppStatus.INVALID_LICENSE_DISABLED,
 	);
 
 	if (renewedApps.length === 0) {
diff --git a/apps/meteor/ee/server/apps/orchestrator.js b/apps/meteor/ee/server/apps/orchestrator.js
index 37c31e890e89..c252579138cb 100644
--- a/apps/meteor/ee/server/apps/orchestrator.js
+++ b/apps/meteor/ee/server/apps/orchestrator.js
@@ -21,7 +21,7 @@ import { AppThreadsConverter } from '../../../app/apps/server/converters/threads
 import { settings } from '../../../app/settings/server';
 import { canEnableApp } from '../../app/license/server/canEnableApp';
 import { AppServerNotifier, AppsRestApi, AppUIKitInteractionApi } from './communication';
-import { AppRealLogsStorage, AppRealStorage, ConfigurableAppSourceStorage } from './storage';
+import { AppRealLogStorage, AppRealStorage, ConfigurableAppSourceStorage } from './storage';
 
 function isTesting() {
 	return process.env.TEST_MODE === 'true';
@@ -54,7 +54,7 @@ export class AppServerOrchestrator {
 		this._logModel = AppLogs;
 		this._persistModel = AppsPersistence;
 		this._storage = new AppRealStorage(this._model);
-		this._logStorage = new AppRealLogsStorage(this._logModel);
+		this._logStorage = new AppRealLogStorage(this._logModel);
 		this._appSourceStorage = new ConfigurableAppSourceStorage(appsSourceStorageType, appsSourceStorageFilesystemPath);
 
 		this._converters = new Map();
@@ -172,34 +172,35 @@ export class AppServerOrchestrator {
 		await this.getManager().load();
 
 		// Before enabling each app we verify if there is still room for it
-		await this.getManager()
-			.get()
-			// We reduce everything to a promise chain so it runs sequentially
-			.reduce(
-				(control, app) =>
-					control.then(async () => {
-						const canEnable = await canEnableApp(app.getStorageItem());
-
-						if (canEnable) {
-							return this.getManager().loadOne(app.getID());
-						}
-
-						this._rocketchatLogger.warn(`App "${app.getInfo().name}" can't be enabled due to CE limits.`);
-					}),
-				Promise.resolve(),
-			);
+		const apps = await this.getManager().get();
+
+		/* eslint-disable no-await-in-loop */
+		// This needs to happen sequentially to keep track of app limits
+		for (const app of apps) {
+			const canEnable = await canEnableApp(app.getStorageItem());
+
+			if (!canEnable) {
+				this._rocketchatLogger.warn(`App "${app.getInfo().name}" can't be enabled due to CE limits.`);
+				// We need to continue as the limits are applied depending on the app installation source
+				// i.e. if one limit is hit, we can't break the loop as the following apps might still be valid
+				continue;
+			}
+
+			await this.getManager().loadOne(app.getID());
+		}
+		/* eslint-enable no-await-in-loop */
 
 		await this.getBridges().getSchedulerBridge().startScheduler();
 
-		this._rocketchatLogger.info(`Loaded the Apps Framework and loaded a total of ${this.getManager().get({ enabled: true }).length} Apps!`);
+		const appCount = (await this.getManager().get({ enabled: true })).length;
+
+		this._rocketchatLogger.info(`Loaded the Apps Framework and loaded a total of ${appCount} Apps!`);
 	}
 
 	async disableApps() {
-		await this.getManager()
-			.get()
-			.forEach((app) => {
-				this.getManager().disable(app.getID());
-			});
+		const apps = await this.getManager().get();
+
+		await Promise.all(apps.map((app) => this.getManager().disable(app.getID())));
 	}
 
 	async unload() {
diff --git a/apps/meteor/ee/server/apps/storage/AppRealLogStorage.ts b/apps/meteor/ee/server/apps/storage/AppRealLogStorage.ts
new file mode 100644
index 000000000000..17a8f2f838aa
--- /dev/null
+++ b/apps/meteor/ee/server/apps/storage/AppRealLogStorage.ts
@@ -0,0 +1,36 @@
+import type { ILoggerStorageEntry } from '@rocket.chat/apps-engine/server/logging';
+import type { IAppLogStorageFindOptions } from '@rocket.chat/apps-engine/server/storage';
+import { AppLogStorage } from '@rocket.chat/apps-engine/server/storage';
+import { InstanceStatus } from '@rocket.chat/instance-status';
+import type { AppLogs } from '@rocket.chat/models';
+
+export class AppRealLogStorage extends AppLogStorage {
+	constructor(private db: typeof AppLogs) {
+		super('mongodb');
+	}
+
+	async find(
+		query: {
+			[field: string]: any;
+		},
+		{ fields, ...options }: IAppLogStorageFindOptions,
+	): Promise<ILoggerStorageEntry[]> {
+		return this.db.findPaginated(query, { projection: fields, ...options }).cursor.toArray();
+	}
+
+	async storeEntries(logEntry: ILoggerStorageEntry): Promise<ILoggerStorageEntry> {
+		logEntry.instanceId = InstanceStatus.id();
+
+		const id = (await this.db.insertOne(logEntry)).insertedId;
+
+		return this.db.findOneById(id);
+	}
+
+	async getEntriesFor(appId: string): Promise<ILoggerStorageEntry[]> {
+		return this.db.find({ appId }).toArray();
+	}
+
+	async removeEntriesFor(appId: string): Promise<void> {
+		await this.db.deleteOne({ appId });
+	}
+}
diff --git a/apps/meteor/ee/server/apps/storage/index.js b/apps/meteor/ee/server/apps/storage/index.js
index 7f8d90715a96..7b8d2f5af96e 100644
--- a/apps/meteor/ee/server/apps/storage/index.js
+++ b/apps/meteor/ee/server/apps/storage/index.js
@@ -1,6 +1,6 @@
 import './AppFileSystemSourceStorage';
 import './AppGridFSSourceStorage';
 
-export { AppRealLogsStorage } from './logs-storage';
+export { AppRealLogStorage } from './AppRealLogStorage';
 export { AppRealStorage } from './AppRealStorage';
 export { ConfigurableAppSourceStorage } from './ConfigurableAppSourceStorage';
diff --git a/apps/meteor/ee/server/apps/storage/logs-storage.js b/apps/meteor/ee/server/apps/storage/logs-storage.js
deleted file mode 100644
index b48599ca2d38..000000000000
--- a/apps/meteor/ee/server/apps/storage/logs-storage.js
+++ /dev/null
@@ -1,32 +0,0 @@
-import { AppConsole } from '@rocket.chat/apps-engine/server/logging';
-import { AppLogStorage } from '@rocket.chat/apps-engine/server/storage';
-import { InstanceStatus } from '@rocket.chat/instance-status';
-
-export class AppRealLogsStorage extends AppLogStorage {
-	constructor(model) {
-		super('mongodb');
-		this.db = model;
-	}
-
-	async find(...args) {
-		return this.db.find(...args).toArray();
-	}
-
-	async storeEntries(appId, logger) {
-		const item = AppConsole.toStorageEntry(appId, logger);
-
-		item.instanceId = InstanceStatus.id();
-
-		const id = (await this.db.insertOne(item)).insertedId;
-
-		return this.db.findOneById(id);
-	}
-
-	async getEntriesFor(appId) {
-		return this.db.find({ appId }).toArray();
-	}
-
-	async removeEntriesFor(appId) {
-		await this.db.remove({ appId });
-	}
-}
diff --git a/apps/meteor/ee/server/services/package.json b/apps/meteor/ee/server/services/package.json
index c2119b1d3b24..20af1002f738 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.42.2",
+		"@rocket.chat/apps-engine": "alpha",
 		"@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 d79155167845..9d02e91c6cba 100644
--- a/apps/meteor/package.json
+++ b/apps/meteor/package.json
@@ -231,7 +231,7 @@
 		"@rocket.chat/agenda": "workspace:^",
 		"@rocket.chat/api-client": "workspace:^",
 		"@rocket.chat/apps": "workspace:^",
-		"@rocket.chat/apps-engine": "1.42.2",
+		"@rocket.chat/apps-engine": "alpha",
 		"@rocket.chat/base64": "workspace:^",
 		"@rocket.chat/cas-validate": "workspace:^",
 		"@rocket.chat/core-services": "workspace:^",
diff --git a/apps/meteor/server/services/apps-engine/service.ts b/apps/meteor/server/services/apps-engine/service.ts
index 41a53cf5bbb6..19838fd8411d 100644
--- a/apps/meteor/server/services/apps-engine/service.ts
+++ b/apps/meteor/server/services/apps-engine/service.ts
@@ -75,7 +75,7 @@ export class AppsEngineService extends ServiceClassInternal implements IAppsEngi
 				return;
 			}
 
-			if (app.getStatus() === status) {
+			if ((await app.getStatus()) === status) {
 				Apps.self?.getRocketChatLogger().info(`"apps.statusUpdate" event received for app "${appId}", but the status is the same`);
 				return;
 			}
@@ -116,10 +116,7 @@ export class AppsEngineService extends ServiceClassInternal implements IAppsEngi
 	}
 
 	async getApps(query: IGetAppsFilter): Promise<IAppInfo[] | undefined> {
-		return Apps.self
-			?.getManager()
-			?.get(query)
-			.map((app) => app.getApp().getInfo());
+		return (await Apps.self?.getManager()?.get(query))?.map((app) => app.getInfo());
 	}
 
 	async getAppStorageItemById(appId: string): Promise<IAppStorageItem | undefined> {
diff --git a/apps/meteor/tests/end-to-end/apps/02-send-messages-as-user.js b/apps/meteor/tests/end-to-end/apps/02-send-messages-as-user.js
index a0be32734306..61d812571d7d 100644
--- a/apps/meteor/tests/end-to-end/apps/02-send-messages-as-user.js
+++ b/apps/meteor/tests/end-to-end/apps/02-send-messages-as-user.js
@@ -95,7 +95,7 @@ describe('Apps - Send Messages As User', function () {
 
 			after(() => Promise.all([deleteRoom({ type: 'p', roomId: group._id }), deleteUser(user)]));
 
-			it('should send a message as app user', (done) => {
+			it('should return 500 when sending a message as user that has no permissions', (done) => {
 				request
 					.post(apps(`/public/${app.id}/send-message-as-user?userId=${user._id}`))
 					.set(userCredentials)
diff --git a/docker-compose-ci.yml b/docker-compose-ci.yml
index a533ae29d2df..67b89d61ef52 100644
--- a/docker-compose-ci.yml
+++ b/docker-compose-ci.yml
@@ -11,6 +11,7 @@ services:
     image: ghcr.io/${LOWERCASE_REPOSITORY}/rocket.chat:${RC_DOCKER_TAG}
     environment:
       - TEST_MODE=true
+      - DEBUG=${DEBUG}
       - EXIT_UNHANDLEDPROMISEREJECTION=true
       - 'MONGO_URL=${MONGO_URL}'
       - 'MONGO_OPLOG_URL=${MONGO_OPLOG_URL}'
diff --git a/ee/apps/ddp-streamer/package.json b/ee/apps/ddp-streamer/package.json
index c1dd482d2e75..9a2fd6065765 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.42.2",
+		"@rocket.chat/apps-engine": "alpha",
 		"@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 4e609c5d954b..4de31f3214b4 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.42.2",
+		"@rocket.chat/apps-engine": "alpha",
 		"@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 ee99ba288fab..359bb605e82f 100644
--- a/packages/apps/package.json
+++ b/packages/apps/package.json
@@ -22,7 +22,7 @@
 		"/dist"
 	],
 	"dependencies": {
-		"@rocket.chat/apps-engine": "1.42.2",
+		"@rocket.chat/apps-engine": "alpha",
 		"@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 6033814bf2fa..9a4705673b18 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.42.2",
+		"@rocket.chat/apps-engine": "alpha",
 		"@rocket.chat/core-typings": "workspace:^",
 		"@rocket.chat/icons": "^0.36.0",
 		"@rocket.chat/message-parser": "workspace:^",
diff --git a/packages/core-typings/package.json b/packages/core-typings/package.json
index 9256b3e8b6e7..b9b259a1b78e 100644
--- a/packages/core-typings/package.json
+++ b/packages/core-typings/package.json
@@ -22,7 +22,7 @@
 		"/dist"
 	],
 	"dependencies": {
-		"@rocket.chat/apps-engine": "1.42.2",
+		"@rocket.chat/apps-engine": "alpha",
 		"@rocket.chat/icons": "^0.36.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 25d44e876dff..119a23759280 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.42.2",
+    "@rocket.chat/apps-engine": "alpha",
     "@rocket.chat/core-typings": "workspace:^",
     "@rocket.chat/eslint-config": "workspace:^",
     "@rocket.chat/fuselage": "^0.54.2",
diff --git a/packages/model-typings/src/models/IAppLogsModel.ts b/packages/model-typings/src/models/IAppLogsModel.ts
index f73964c57687..6a6bc765cd8e 100644
--- a/packages/model-typings/src/models/IAppLogsModel.ts
+++ b/packages/model-typings/src/models/IAppLogsModel.ts
@@ -1,6 +1,9 @@
+import type { DeleteResult, Filter } from 'mongodb';
+
 import type { IBaseModel } from './IBaseModel';
 
 // TODO: type for AppLogs
 export interface IAppLogsModel extends IBaseModel<any> {
 	resetTTLIndex(expireAfterSeconds: number): Promise<void>;
+	remove(query: Filter<any>): Promise<DeleteResult>;
 }
diff --git a/packages/rest-typings/package.json b/packages/rest-typings/package.json
index 2d567eb10fab..91ec61eb40e7 100644
--- a/packages/rest-typings/package.json
+++ b/packages/rest-typings/package.json
@@ -24,7 +24,7 @@
 		"/dist"
 	],
 	"dependencies": {
-		"@rocket.chat/apps-engine": "1.42.2",
+		"@rocket.chat/apps-engine": "alpha",
 		"@rocket.chat/core-typings": "workspace:^",
 		"@rocket.chat/message-parser": "workspace:^",
 		"@rocket.chat/ui-kit": "workspace:~",
diff --git a/yarn.lock b/yarn.lock
index 1f73a73df3e1..6321b0aff77f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3653,6 +3653,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@esbuild/aix-ppc64@npm:0.20.2":
+  version: 0.20.2
+  resolution: "@esbuild/aix-ppc64@npm:0.20.2"
+  conditions: os=aix & cpu=ppc64
+  languageName: node
+  linkType: hard
+
 "@esbuild/android-arm64@npm:0.17.19":
   version: 0.17.19
   resolution: "@esbuild/android-arm64@npm:0.17.19"
@@ -3660,6 +3667,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@esbuild/android-arm64@npm:0.20.2":
+  version: 0.20.2
+  resolution: "@esbuild/android-arm64@npm:0.20.2"
+  conditions: os=android & cpu=arm64
+  languageName: node
+  linkType: hard
+
 "@esbuild/android-arm@npm:0.17.19":
   version: 0.17.19
   resolution: "@esbuild/android-arm@npm:0.17.19"
@@ -3667,6 +3681,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@esbuild/android-arm@npm:0.20.2":
+  version: 0.20.2
+  resolution: "@esbuild/android-arm@npm:0.20.2"
+  conditions: os=android & cpu=arm
+  languageName: node
+  linkType: hard
+
 "@esbuild/android-x64@npm:0.17.19":
   version: 0.17.19
   resolution: "@esbuild/android-x64@npm:0.17.19"
@@ -3674,6 +3695,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@esbuild/android-x64@npm:0.20.2":
+  version: 0.20.2
+  resolution: "@esbuild/android-x64@npm:0.20.2"
+  conditions: os=android & cpu=x64
+  languageName: node
+  linkType: hard
+
 "@esbuild/darwin-arm64@npm:0.17.19":
   version: 0.17.19
   resolution: "@esbuild/darwin-arm64@npm:0.17.19"
@@ -3681,6 +3709,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@esbuild/darwin-arm64@npm:0.20.2":
+  version: 0.20.2
+  resolution: "@esbuild/darwin-arm64@npm:0.20.2"
+  conditions: os=darwin & cpu=arm64
+  languageName: node
+  linkType: hard
+
 "@esbuild/darwin-x64@npm:0.17.19":
   version: 0.17.19
   resolution: "@esbuild/darwin-x64@npm:0.17.19"
@@ -3688,6 +3723,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@esbuild/darwin-x64@npm:0.20.2":
+  version: 0.20.2
+  resolution: "@esbuild/darwin-x64@npm:0.20.2"
+  conditions: os=darwin & cpu=x64
+  languageName: node
+  linkType: hard
+
 "@esbuild/freebsd-arm64@npm:0.17.19":
   version: 0.17.19
   resolution: "@esbuild/freebsd-arm64@npm:0.17.19"
@@ -3695,6 +3737,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@esbuild/freebsd-arm64@npm:0.20.2":
+  version: 0.20.2
+  resolution: "@esbuild/freebsd-arm64@npm:0.20.2"
+  conditions: os=freebsd & cpu=arm64
+  languageName: node
+  linkType: hard
+
 "@esbuild/freebsd-x64@npm:0.17.19":
   version: 0.17.19
   resolution: "@esbuild/freebsd-x64@npm:0.17.19"
@@ -3702,6 +3751,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@esbuild/freebsd-x64@npm:0.20.2":
+  version: 0.20.2
+  resolution: "@esbuild/freebsd-x64@npm:0.20.2"
+  conditions: os=freebsd & cpu=x64
+  languageName: node
+  linkType: hard
+
 "@esbuild/linux-arm64@npm:0.17.19":
   version: 0.17.19
   resolution: "@esbuild/linux-arm64@npm:0.17.19"
@@ -3709,6 +3765,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@esbuild/linux-arm64@npm:0.20.2":
+  version: 0.20.2
+  resolution: "@esbuild/linux-arm64@npm:0.20.2"
+  conditions: os=linux & cpu=arm64
+  languageName: node
+  linkType: hard
+
 "@esbuild/linux-arm@npm:0.17.19":
   version: 0.17.19
   resolution: "@esbuild/linux-arm@npm:0.17.19"
@@ -3716,6 +3779,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@esbuild/linux-arm@npm:0.20.2":
+  version: 0.20.2
+  resolution: "@esbuild/linux-arm@npm:0.20.2"
+  conditions: os=linux & cpu=arm
+  languageName: node
+  linkType: hard
+
 "@esbuild/linux-ia32@npm:0.17.19":
   version: 0.17.19
   resolution: "@esbuild/linux-ia32@npm:0.17.19"
@@ -3723,6 +3793,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@esbuild/linux-ia32@npm:0.20.2":
+  version: 0.20.2
+  resolution: "@esbuild/linux-ia32@npm:0.20.2"
+  conditions: os=linux & cpu=ia32
+  languageName: node
+  linkType: hard
+
 "@esbuild/linux-loong64@npm:0.17.19":
   version: 0.17.19
   resolution: "@esbuild/linux-loong64@npm:0.17.19"
@@ -3730,6 +3807,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@esbuild/linux-loong64@npm:0.20.2":
+  version: 0.20.2
+  resolution: "@esbuild/linux-loong64@npm:0.20.2"
+  conditions: os=linux & cpu=loong64
+  languageName: node
+  linkType: hard
+
 "@esbuild/linux-mips64el@npm:0.17.19":
   version: 0.17.19
   resolution: "@esbuild/linux-mips64el@npm:0.17.19"
@@ -3737,6 +3821,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@esbuild/linux-mips64el@npm:0.20.2":
+  version: 0.20.2
+  resolution: "@esbuild/linux-mips64el@npm:0.20.2"
+  conditions: os=linux & cpu=mips64el
+  languageName: node
+  linkType: hard
+
 "@esbuild/linux-ppc64@npm:0.17.19":
   version: 0.17.19
   resolution: "@esbuild/linux-ppc64@npm:0.17.19"
@@ -3744,6 +3835,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@esbuild/linux-ppc64@npm:0.20.2":
+  version: 0.20.2
+  resolution: "@esbuild/linux-ppc64@npm:0.20.2"
+  conditions: os=linux & cpu=ppc64
+  languageName: node
+  linkType: hard
+
 "@esbuild/linux-riscv64@npm:0.17.19":
   version: 0.17.19
   resolution: "@esbuild/linux-riscv64@npm:0.17.19"
@@ -3751,6 +3849,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@esbuild/linux-riscv64@npm:0.20.2":
+  version: 0.20.2
+  resolution: "@esbuild/linux-riscv64@npm:0.20.2"
+  conditions: os=linux & cpu=riscv64
+  languageName: node
+  linkType: hard
+
 "@esbuild/linux-s390x@npm:0.17.19":
   version: 0.17.19
   resolution: "@esbuild/linux-s390x@npm:0.17.19"
@@ -3758,6 +3863,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@esbuild/linux-s390x@npm:0.20.2":
+  version: 0.20.2
+  resolution: "@esbuild/linux-s390x@npm:0.20.2"
+  conditions: os=linux & cpu=s390x
+  languageName: node
+  linkType: hard
+
 "@esbuild/linux-x64@npm:0.17.19":
   version: 0.17.19
   resolution: "@esbuild/linux-x64@npm:0.17.19"
@@ -3765,6 +3877,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@esbuild/linux-x64@npm:0.20.2":
+  version: 0.20.2
+  resolution: "@esbuild/linux-x64@npm:0.20.2"
+  conditions: os=linux & cpu=x64
+  languageName: node
+  linkType: hard
+
 "@esbuild/netbsd-x64@npm:0.17.19":
   version: 0.17.19
   resolution: "@esbuild/netbsd-x64@npm:0.17.19"
@@ -3772,6 +3891,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@esbuild/netbsd-x64@npm:0.20.2":
+  version: 0.20.2
+  resolution: "@esbuild/netbsd-x64@npm:0.20.2"
+  conditions: os=netbsd & cpu=x64
+  languageName: node
+  linkType: hard
+
 "@esbuild/openbsd-x64@npm:0.17.19":
   version: 0.17.19
   resolution: "@esbuild/openbsd-x64@npm:0.17.19"
@@ -3779,6 +3905,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@esbuild/openbsd-x64@npm:0.20.2":
+  version: 0.20.2
+  resolution: "@esbuild/openbsd-x64@npm:0.20.2"
+  conditions: os=openbsd & cpu=x64
+  languageName: node
+  linkType: hard
+
 "@esbuild/sunos-x64@npm:0.17.19":
   version: 0.17.19
   resolution: "@esbuild/sunos-x64@npm:0.17.19"
@@ -3786,6 +3919,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@esbuild/sunos-x64@npm:0.20.2":
+  version: 0.20.2
+  resolution: "@esbuild/sunos-x64@npm:0.20.2"
+  conditions: os=sunos & cpu=x64
+  languageName: node
+  linkType: hard
+
 "@esbuild/win32-arm64@npm:0.17.19":
   version: 0.17.19
   resolution: "@esbuild/win32-arm64@npm:0.17.19"
@@ -3793,6 +3933,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@esbuild/win32-arm64@npm:0.20.2":
+  version: 0.20.2
+  resolution: "@esbuild/win32-arm64@npm:0.20.2"
+  conditions: os=win32 & cpu=arm64
+  languageName: node
+  linkType: hard
+
 "@esbuild/win32-ia32@npm:0.17.19":
   version: 0.17.19
   resolution: "@esbuild/win32-ia32@npm:0.17.19"
@@ -3800,6 +3947,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@esbuild/win32-ia32@npm:0.20.2":
+  version: 0.20.2
+  resolution: "@esbuild/win32-ia32@npm:0.20.2"
+  conditions: os=win32 & cpu=ia32
+  languageName: node
+  linkType: hard
+
 "@esbuild/win32-x64@npm:0.17.19":
   version: 0.17.19
   resolution: "@esbuild/win32-x64@npm:0.17.19"
@@ -3807,6 +3961,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@esbuild/win32-x64@npm:0.20.2":
+  version: 0.20.2
+  resolution: "@esbuild/win32-x64@npm:0.20.2"
+  conditions: os=win32 & cpu=x64
+  languageName: node
+  linkType: hard
+
 "@eslint-community/eslint-utils@npm:^4.2.0":
   version: 4.4.0
   resolution: "@eslint-community/eslint-utils@npm:4.4.0"
@@ -4725,6 +4886,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@msgpack/msgpack@npm:3.0.0-beta2":
+  version: 3.0.0-beta2
+  resolution: "@msgpack/msgpack@npm:3.0.0-beta2"
+  checksum: d86e5d48146051952d6bea35a6cf733a401cf65ad5614d79689aa48c7076021737ca2c782978dd1b6c0c9c45888b246e379e45ae906179e3a0e8ef4ee6f221c1
+  languageName: node
+  linkType: hard
+
 "@napi-rs/cli@npm:^2.2.0":
   version: 2.6.2
   resolution: "@napi-rs/cli@npm:2.6.2"
@@ -8340,21 +8508,25 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@rocket.chat/apps-engine@npm:1.42.2, @rocket.chat/apps-engine@npm:^1.42.2":
-  version: 1.42.2
-  resolution: "@rocket.chat/apps-engine@npm:1.42.2"
+"@rocket.chat/apps-engine@npm:alpha":
+  version: 1.43.0-alpha.763
+  resolution: "@rocket.chat/apps-engine@npm:1.43.0-alpha.763"
   dependencies:
+    "@msgpack/msgpack": 3.0.0-beta2
     adm-zip: ^0.5.9
     cryptiles: ^4.1.3
+    debug: ^4.3.4
+    deno-bin: 1.37.1
+    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
-    vm2: ^3.9.19
   peerDependencies:
     "@rocket.chat/ui-kit": "*"
-  checksum: d7aa23249823e37072b6b7af16a40d9a4e7cb6b8047f2a87e52163dfe516d6c8a09b21cafd4f28dfbe4dd3da9cd0190d71f7623fec8c573a3f215ca4f9529b56
+  checksum: f4498febb2f11766c6cab98c3738ca8ba50e9cfa68d129577a781a6fbbe91cfc48c82d6e418f05f0db6b3561becd6aab09b5b19b26652deb5e5621d7fd7b4c4a
   languageName: node
   linkType: hard
 
@@ -8362,7 +8534,7 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@rocket.chat/apps@workspace:packages/apps"
   dependencies:
-    "@rocket.chat/apps-engine": 1.42.2
+    "@rocket.chat/apps-engine": alpha
     "@rocket.chat/core-typings": "workspace:^"
     "@rocket.chat/model-typings": "workspace:^"
     "@types/jest": ~29.5.7
@@ -8441,7 +8613,7 @@ __metadata:
     "@babel/core": ~7.22.20
     "@babel/preset-env": ~7.22.20
     "@babel/preset-typescript": ~7.22.15
-    "@rocket.chat/apps-engine": 1.42.2
+    "@rocket.chat/apps-engine": alpha
     "@rocket.chat/core-typings": "workspace:^"
     "@rocket.chat/eslint-config": "workspace:^"
     "@rocket.chat/icons": ^0.36.0
@@ -8467,7 +8639,7 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@rocket.chat/core-typings@workspace:packages/core-typings"
   dependencies:
-    "@rocket.chat/apps-engine": 1.42.2
+    "@rocket.chat/apps-engine": alpha
     "@rocket.chat/eslint-config": "workspace:^"
     "@rocket.chat/icons": ^0.36.0
     "@rocket.chat/message-parser": "workspace:^"
@@ -8544,7 +8716,7 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@rocket.chat/ddp-streamer@workspace:ee/apps/ddp-streamer"
   dependencies:
-    "@rocket.chat/apps-engine": 1.42.2
+    "@rocket.chat/apps-engine": alpha
     "@rocket.chat/core-services": "workspace:^"
     "@rocket.chat/core-typings": "workspace:^"
     "@rocket.chat/emitter": ~0.31.25
@@ -8740,7 +8912,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.42.2
+    "@rocket.chat/apps-engine": alpha
     "@rocket.chat/core-typings": "workspace:^"
     "@rocket.chat/eslint-config": "workspace:^"
     "@rocket.chat/fuselage": ^0.54.2
@@ -9184,7 +9356,7 @@ __metadata:
     "@rocket.chat/agenda": "workspace:^"
     "@rocket.chat/api-client": "workspace:^"
     "@rocket.chat/apps": "workspace:^"
-    "@rocket.chat/apps-engine": 1.42.2
+    "@rocket.chat/apps-engine": alpha
     "@rocket.chat/base64": "workspace:^"
     "@rocket.chat/cas-validate": "workspace:^"
     "@rocket.chat/core-services": "workspace:^"
@@ -9822,7 +9994,7 @@ __metadata:
     "@babel/core": ~7.22.20
     "@babel/preset-env": ~7.22.20
     "@babel/preset-typescript": ~7.22.15
-    "@rocket.chat/apps-engine": 1.42.2
+    "@rocket.chat/apps-engine": alpha
     "@rocket.chat/core-services": "workspace:^"
     "@rocket.chat/core-typings": "workspace:^"
     "@rocket.chat/eslint-config": "workspace:^"
@@ -9937,7 +10109,7 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@rocket.chat/rest-typings@workspace:packages/rest-typings"
   dependencies:
-    "@rocket.chat/apps-engine": 1.42.2
+    "@rocket.chat/apps-engine": alpha
     "@rocket.chat/core-typings": "workspace:^"
     "@rocket.chat/eslint-config": "workspace:^"
     "@rocket.chat/message-parser": "workspace:^"
@@ -20891,6 +21063,19 @@ __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"
@@ -22166,6 +22351,86 @@ __metadata:
   languageName: node
   linkType: hard
 
+"esbuild@npm:^0.20.2":
+  version: 0.20.2
+  resolution: "esbuild@npm:0.20.2"
+  dependencies:
+    "@esbuild/aix-ppc64": 0.20.2
+    "@esbuild/android-arm": 0.20.2
+    "@esbuild/android-arm64": 0.20.2
+    "@esbuild/android-x64": 0.20.2
+    "@esbuild/darwin-arm64": 0.20.2
+    "@esbuild/darwin-x64": 0.20.2
+    "@esbuild/freebsd-arm64": 0.20.2
+    "@esbuild/freebsd-x64": 0.20.2
+    "@esbuild/linux-arm": 0.20.2
+    "@esbuild/linux-arm64": 0.20.2
+    "@esbuild/linux-ia32": 0.20.2
+    "@esbuild/linux-loong64": 0.20.2
+    "@esbuild/linux-mips64el": 0.20.2
+    "@esbuild/linux-ppc64": 0.20.2
+    "@esbuild/linux-riscv64": 0.20.2
+    "@esbuild/linux-s390x": 0.20.2
+    "@esbuild/linux-x64": 0.20.2
+    "@esbuild/netbsd-x64": 0.20.2
+    "@esbuild/openbsd-x64": 0.20.2
+    "@esbuild/sunos-x64": 0.20.2
+    "@esbuild/win32-arm64": 0.20.2
+    "@esbuild/win32-ia32": 0.20.2
+    "@esbuild/win32-x64": 0.20.2
+  dependenciesMeta:
+    "@esbuild/aix-ppc64":
+      optional: true
+    "@esbuild/android-arm":
+      optional: true
+    "@esbuild/android-arm64":
+      optional: true
+    "@esbuild/android-x64":
+      optional: true
+    "@esbuild/darwin-arm64":
+      optional: true
+    "@esbuild/darwin-x64":
+      optional: true
+    "@esbuild/freebsd-arm64":
+      optional: true
+    "@esbuild/freebsd-x64":
+      optional: true
+    "@esbuild/linux-arm":
+      optional: true
+    "@esbuild/linux-arm64":
+      optional: true
+    "@esbuild/linux-ia32":
+      optional: true
+    "@esbuild/linux-loong64":
+      optional: true
+    "@esbuild/linux-mips64el":
+      optional: true
+    "@esbuild/linux-ppc64":
+      optional: true
+    "@esbuild/linux-riscv64":
+      optional: true
+    "@esbuild/linux-s390x":
+      optional: true
+    "@esbuild/linux-x64":
+      optional: true
+    "@esbuild/netbsd-x64":
+      optional: true
+    "@esbuild/openbsd-x64":
+      optional: true
+    "@esbuild/sunos-x64":
+      optional: true
+    "@esbuild/win32-arm64":
+      optional: true
+    "@esbuild/win32-ia32":
+      optional: true
+    "@esbuild/win32-x64":
+      optional: true
+  bin:
+    esbuild: bin/esbuild
+  checksum: bc88050fc1ca5c1bd03648f9979e514bdefb956a63aa3974373bb7b9cbac0b3aac9b9da1b5bdca0b3490e39d6b451c72815dbd6b7d7f978c91fbe9c9e9aa4e4c
+  languageName: node
+  linkType: hard
+
 "escalade@npm:^3.1.1":
   version: 3.1.1
   resolution: "escalade@npm:3.1.1"
@@ -23826,6 +24091,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"follow-redirects@npm:^1.10.0":
+  version: 1.15.4
+  resolution: "follow-redirects@npm:1.15.4"
+  peerDependenciesMeta:
+    debug:
+      optional: true
+  checksum: e178d1deff8b23d5d24ec3f7a94cde6e47d74d0dc649c35fc9857041267c12ec5d44650a0c5597ef83056ada9ea6ca0c30e7c4f97dbf07d035086be9e6a5b7b6
+  languageName: node
+  linkType: hard
+
 "fontkit@npm:^2.0.2":
   version: 2.0.2
   resolution: "fontkit@npm:2.0.2"
@@ -28792,6 +29067,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"jsonrpc-lite@npm:^2.2.0":
+  version: 2.2.0
+  resolution: "jsonrpc-lite@npm:2.2.0"
+  checksum: 3062101d3c93401d176c1c24b90e0feebdd063546f8ed89c299531dd792c4d37c6766666d160efb83b94f17f7e2deed4346cdd9124b99581ed4620779e8733bb
+  languageName: node
+  linkType: hard
+
 "jsonwebtoken@npm:^8.1.0, jsonwebtoken@npm:^8.5.1":
   version: 8.5.1
   resolution: "jsonwebtoken@npm:8.5.1"
@@ -36853,7 +37135,7 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "rocketchat-services@workspace:apps/meteor/ee/server/services"
   dependencies:
-    "@rocket.chat/apps-engine": 1.42.2
+    "@rocket.chat/apps-engine": alpha
     "@rocket.chat/core-services": "workspace:^"
     "@rocket.chat/core-typings": "workspace:^"
     "@rocket.chat/emitter": ~0.31.25

From 94b12edfc6a561a4db0c318c65c6f40786b1fbf8 Mon Sep 17 00:00:00 2001
From: Douglas Fabris <devfabris@gmail.com>
Date: Tue, 18 Jun 2024 08:44:05 -0300
Subject: [PATCH 26/94] fix: Not possible to edit room without proper
 permission with retention policy enabled (#32547)

---
 .changeset/nervous-wolves-collect.md          |  5 +++
 .../EditRoomInfo/useEditRoomInitialValues.ts  | 19 +++++++-----
 .../meteor/tests/e2e/retention-policy.spec.ts | 31 ++++++++++++++-----
 3 files changed, 40 insertions(+), 15 deletions(-)
 create mode 100644 .changeset/nervous-wolves-collect.md

diff --git a/.changeset/nervous-wolves-collect.md b/.changeset/nervous-wolves-collect.md
new file mode 100644
index 000000000000..e32377f54179
--- /dev/null
+++ b/.changeset/nervous-wolves-collect.md
@@ -0,0 +1,5 @@
+---
+'@rocket.chat/meteor': patch
+---
+
+Fixes the issue not allowing users without edit-room-retention-policy permission try to edit the room with the retention policy enabled
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 128f6c3c66f8..1cb76cadd335 100644
--- a/apps/meteor/client/views/room/contextualBar/Info/EditRoomInfo/useEditRoomInitialValues.ts
+++ b/apps/meteor/client/views/room/contextualBar/Info/EditRoomInfo/useEditRoomInitialValues.ts
@@ -1,4 +1,5 @@
 import type { IRoomWithRetentionPolicy } from '@rocket.chat/core-typings';
+import { usePermission } from '@rocket.chat/ui-contexts';
 import { useMemo } from 'react';
 
 import { roomCoordinator } from '../../../../../lib/rooms/roomCoordinator';
@@ -6,6 +7,8 @@ import { useRetentionPolicy } from '../../../hooks/useRetentionPolicy';
 
 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;
 
 	return useMemo(
@@ -24,13 +27,14 @@ export const useEditRoomInitialValues = (room: IRoomWithRetentionPolicy) => {
 			systemMessages: Array.isArray(sysMes) ? sysMes : [],
 			hideSysMes: Array.isArray(sysMes) ? !!sysMes?.length : !!sysMes,
 			encrypted,
-			...(retentionPolicy?.enabled && {
-				retentionEnabled: retention?.enabled ?? retentionPolicy.isActive,
-				retentionOverrideGlobal: !!retention?.overrideGlobal,
-				retentionMaxAge: retention?.maxAge ?? retentionPolicy.maxAge,
-				retentionExcludePinned: retention?.excludePinned ?? retentionPolicy.excludePinned,
-				retentionFilesOnly: retention?.filesOnly ?? retentionPolicy.filesOnly,
-			}),
+			...(canEditRoomRetentionPolicy &&
+				retentionPolicy?.enabled && {
+					retentionEnabled: retention?.enabled ?? retentionPolicy.isActive,
+					retentionOverrideGlobal: !!retention?.overrideGlobal,
+					retentionMaxAge: retention?.maxAge ?? retentionPolicy.maxAge,
+					retentionExcludePinned: retention?.excludePinned ?? retentionPolicy.excludePinned,
+					retentionFilesOnly: retention?.filesOnly ?? retentionPolicy.filesOnly,
+				}),
 		}),
 		[
 			announcement,
@@ -46,6 +50,7 @@ export const useEditRoomInitialValues = (room: IRoomWithRetentionPolicy) => {
 			topic,
 			encrypted,
 			reactWhenReadOnly,
+			canEditRoomRetentionPolicy,
 		],
 	);
 };
diff --git a/apps/meteor/tests/e2e/retention-policy.spec.ts b/apps/meteor/tests/e2e/retention-policy.spec.ts
index 9c18edcf4af3..d17276a160af 100644
--- a/apps/meteor/tests/e2e/retention-policy.spec.ts
+++ b/apps/meteor/tests/e2e/retention-policy.spec.ts
@@ -85,15 +85,30 @@ test.describe.serial('retention-policy', () => {
 			await expect(poHomeChannel.tabs.room.pruneAccordion).toBeVisible();
 		});
 
-		test('should not show prune section in edit channel for users without permission', async ({ browser }) => {
-			const { page } = await createAuxContext(browser, Users.user1);
-			const auxContext = { page, poHomeChannel: new HomeChannel(page) };
-			await auxContext.poHomeChannel.sidenav.openChat(targetChannel);
-			await auxContext.poHomeChannel.tabs.btnRoomInfo.click();
-			await auxContext.poHomeChannel.tabs.room.btnEdit.click();
+		test.describe('edit-room-retention-policy permission', async () => {
+			test('should not show prune section in edit channel for users without permission', async ({ browser }) => {
+				const { page } = await createAuxContext(browser, Users.user1);
+				const auxContext = { page, poHomeChannel: new HomeChannel(page) };
+				await auxContext.poHomeChannel.sidenav.openChat(targetChannel);
+				await auxContext.poHomeChannel.tabs.btnRoomInfo.click();
+				await auxContext.poHomeChannel.tabs.room.btnEdit.click();
+
+				await expect(poHomeChannel.tabs.room.pruneAccordion).not.toBeVisible();
+				await auxContext.page.close();
+			});
 
-			await expect(poHomeChannel.tabs.room.pruneAccordion).not.toBeVisible();
-			await auxContext.page.close();
+			test('users without permission should be able to edit the channel', async ({ browser }) => {
+				const { page } = await createAuxContext(browser, Users.user1);
+				const auxContext = { page, poHomeChannel: new HomeChannel(page) };
+				await auxContext.poHomeChannel.sidenav.openChat(targetChannel);
+				await auxContext.poHomeChannel.tabs.btnRoomInfo.click();
+				await auxContext.poHomeChannel.tabs.room.btnEdit.click();
+				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 auxContext.page.close();
+			});
 		});
 
 		test.describe('retention policy applies enabled by default', () => {

From faf386bf65ea76bdec78dd3fe6c710f4ad89b571 Mon Sep 17 00:00:00 2001
From: Allan RIbeiro <35040806+AllanPazRibeiro@users.noreply.github.com>
Date: Tue, 18 Jun 2024 09:30:37 -0300
Subject: [PATCH 27/94] fix: prevent broadcasting of system messages when hide
 setting is enabled (#32522)

---
 .changeset/grumpy-games-greet.md              |   4 +
 .../server/functions/loadMessageHistory.ts    |   7 +-
 .../lib/server/lib/getHiddenSystemMessages.ts |  24 +-
 .../lib/server/methods/getChannelHistory.ts   |   7 +-
 .../lib/systemMessage/hideSystemMessage.ts    |  13 ++
 .../server/modules/watchers/lib/messages.ts   |  15 +-
 .../server/lib/getHiddenSystemMessage.spec.ts |  90 ++++++++
 .../systemMessage/hideSystemMessage.spec.ts   |  48 ++++
 .../modules/watchers/lib/messages.spec.ts     | 215 ++++++++++++++++++
 9 files changed, 397 insertions(+), 26 deletions(-)
 create mode 100644 .changeset/grumpy-games-greet.md
 create mode 100644 apps/meteor/server/lib/systemMessage/hideSystemMessage.ts
 create mode 100644 apps/meteor/tests/unit/app/lib/server/lib/getHiddenSystemMessage.spec.ts
 create mode 100644 apps/meteor/tests/unit/server/lib/systemMessage/hideSystemMessage.spec.ts
 create mode 100644 apps/meteor/tests/unit/server/modules/watchers/lib/messages.spec.ts

diff --git a/.changeset/grumpy-games-greet.md b/.changeset/grumpy-games-greet.md
new file mode 100644
index 000000000000..1e7f03658ad3
--- /dev/null
+++ b/.changeset/grumpy-games-greet.md
@@ -0,0 +1,4 @@
+---
+'@rocket.chat/meteor': patch
+---
+Changed streaming logic to prevent hidden system messages from being broadcasted through `stream-room-messages`.
diff --git a/apps/meteor/app/lib/server/functions/loadMessageHistory.ts b/apps/meteor/app/lib/server/functions/loadMessageHistory.ts
index 2f6b7a1f694d..fee7061cae96 100644
--- a/apps/meteor/app/lib/server/functions/loadMessageHistory.ts
+++ b/apps/meteor/app/lib/server/functions/loadMessageHistory.ts
@@ -1,7 +1,8 @@
-import type { IMessage } from '@rocket.chat/core-typings';
+import type { IMessage, MessageTypesValues } from '@rocket.chat/core-typings';
 import { Messages, Rooms } from '@rocket.chat/models';
 import type { FindOptions } from 'mongodb';
 
+import { settings } from '../../../settings/server/cached';
 import { normalizeMessagesForUser } from '../../../utils/server/lib/normalizeMessagesForUser';
 import { getHiddenSystemMessages } from '../lib/getHiddenSystemMessages';
 
@@ -29,7 +30,9 @@ export async function loadMessageHistory({
 		throw new Error('error-invalid-room');
 	}
 
-	const hiddenMessageTypes = getHiddenSystemMessages(room);
+	const hiddenSystemMessages = settings.get<MessageTypesValues[]>('Hide_System_Messages');
+
+	const hiddenMessageTypes = getHiddenSystemMessages(room, hiddenSystemMessages);
 
 	const options: FindOptions<IMessage> = {
 		sort: {
diff --git a/apps/meteor/app/lib/server/lib/getHiddenSystemMessages.ts b/apps/meteor/app/lib/server/lib/getHiddenSystemMessages.ts
index 74b31b63da6a..08f52620e080 100644
--- a/apps/meteor/app/lib/server/lib/getHiddenSystemMessages.ts
+++ b/apps/meteor/app/lib/server/lib/getHiddenSystemMessages.ts
@@ -1,26 +1,10 @@
 import type { MessageTypesValues, IRoom } from '@rocket.chat/core-typings';
 
-import { settings } from '../../../settings/server';
-
-const hideMessagesOfTypeServer = new Set<MessageTypesValues>();
-
-settings.watch<MessageTypesValues[]>('Hide_System_Messages', (values) => {
-	if (!values || !Array.isArray(values)) {
-		return;
-	}
-
-	const hiddenTypes = values.reduce((array, value): MessageTypesValues[] => {
+export const getHiddenSystemMessages = (room: IRoom, hiddenSystemMessages: MessageTypesValues[]): MessageTypesValues[] => {
+	const hiddenTypes = hiddenSystemMessages.reduce((array, value): MessageTypesValues[] => {
 		const newValue: MessageTypesValues[] = value === 'mute_unmute' ? ['user-muted', 'user-unmuted'] : [value];
-
 		return [...array, ...newValue];
 	}, [] as MessageTypesValues[]);
 
-	hideMessagesOfTypeServer.clear();
-
-	hiddenTypes.forEach((item) => hideMessagesOfTypeServer.add(item));
-});
-
-// TODO probably remove on chained event system
-export function getHiddenSystemMessages(room: IRoom): MessageTypesValues[] {
-	return Array.isArray(room?.sysMes) ? room.sysMes : [...hideMessagesOfTypeServer];
-}
+	return Array.isArray(room?.sysMes) ? room.sysMes : hiddenTypes;
+};
diff --git a/apps/meteor/app/lib/server/methods/getChannelHistory.ts b/apps/meteor/app/lib/server/methods/getChannelHistory.ts
index 3c68fb7a2bf2..00ff01639593 100644
--- a/apps/meteor/app/lib/server/methods/getChannelHistory.ts
+++ b/apps/meteor/app/lib/server/methods/getChannelHistory.ts
@@ -1,4 +1,4 @@
-import type { IMessage } from '@rocket.chat/core-typings';
+import type { IMessage, MessageTypesValues } from '@rocket.chat/core-typings';
 import { Messages, Subscriptions, Rooms } from '@rocket.chat/models';
 import type { ServerMethods } from '@rocket.chat/ui-contexts';
 import { check } from 'meteor/check';
@@ -7,6 +7,7 @@ import _ from 'underscore';
 
 import { canAccessRoomAsync } from '../../../authorization/server';
 import { hasPermissionAsync } from '../../../authorization/server/functions/hasPermission';
+import { settings } from '../../../settings/server/cached';
 import { normalizeMessagesForUser } from '../../../utils/server/lib/normalizeMessagesForUser';
 import { getHiddenSystemMessages } from '../lib/getHiddenSystemMessages';
 
@@ -67,7 +68,9 @@ Meteor.methods<ServerMethods>({
 			throw new Meteor.Error('error-invalid-date', 'Invalid date', { method: 'getChannelHistory' });
 		}
 
-		const hiddenMessageTypes = getHiddenSystemMessages(room);
+		const hiddenSystemMessages = settings.get<MessageTypesValues[]>('Hide_System_Messages');
+
+		const hiddenMessageTypes = getHiddenSystemMessages(room, hiddenSystemMessages);
 
 		const options: Record<string, unknown> = {
 			sort: {
diff --git a/apps/meteor/server/lib/systemMessage/hideSystemMessage.ts b/apps/meteor/server/lib/systemMessage/hideSystemMessage.ts
new file mode 100644
index 000000000000..cc6b7c13b85e
--- /dev/null
+++ b/apps/meteor/server/lib/systemMessage/hideSystemMessage.ts
@@ -0,0 +1,13 @@
+import type { MessageTypesValues } from '@rocket.chat/core-typings';
+
+export const isMutedUnmuted = (messageType: string): boolean => {
+	return messageType === 'user-muted' || messageType === 'user-unmuted';
+};
+
+export const shouldHideSystemMessage = (messageType: MessageTypesValues, hideSystemMessage?: MessageTypesValues[]): boolean => {
+	if (!hideSystemMessage?.length) {
+		return false;
+	}
+
+	return hideSystemMessage.includes(messageType) || (isMutedUnmuted(messageType) && hideSystemMessage.includes('mute_unmute'));
+};
diff --git a/apps/meteor/server/modules/watchers/lib/messages.ts b/apps/meteor/server/modules/watchers/lib/messages.ts
index 576f27f83b96..2f71e0ed1b66 100644
--- a/apps/meteor/server/modules/watchers/lib/messages.ts
+++ b/apps/meteor/server/modules/watchers/lib/messages.ts
@@ -1,9 +1,9 @@
 import { api, dbWatchersDisabled } from '@rocket.chat/core-services';
-import type { IMessage, SettingValue, IUser } from '@rocket.chat/core-typings';
+import type { IMessage, IUser, MessageTypesValues } from '@rocket.chat/core-typings';
 import { Messages, Settings, Users } from '@rocket.chat/models';
 import mem from 'mem';
 
-const getSettingCached = mem(async (setting: string): Promise<SettingValue> => Settings.getValueById(setting), { maxAge: 10000 });
+import { shouldHideSystemMessage } from '../../../lib/systemMessage/hideSystemMessage';
 
 const getUserNameCached = mem(
 	async (userId: string): Promise<string | undefined> => {
@@ -13,12 +13,23 @@ const getUserNameCached = mem(
 	{ maxAge: 10000 },
 );
 
+const getSettingCached = mem(Settings.getValueById, { maxAge: 10000 });
+
 export async function getMessageToBroadcast({ id, data }: { id: IMessage['_id']; data?: IMessage }): Promise<IMessage | void> {
 	const message = data ?? (await Messages.findOneById(id));
 	if (!message) {
 		return;
 	}
 
+	if (message.t) {
+		const hiddenSystemMessages = (await getSettingCached('Hide_System_Messages')) as MessageTypesValues[];
+		const shouldHide = shouldHideSystemMessage(message.t, hiddenSystemMessages);
+
+		if (shouldHide) {
+			return;
+		}
+	}
+
 	if (message._hidden || message.imported != null) {
 		return;
 	}
diff --git a/apps/meteor/tests/unit/app/lib/server/lib/getHiddenSystemMessage.spec.ts b/apps/meteor/tests/unit/app/lib/server/lib/getHiddenSystemMessage.spec.ts
new file mode 100644
index 000000000000..4fb3df00b8c5
--- /dev/null
+++ b/apps/meteor/tests/unit/app/lib/server/lib/getHiddenSystemMessage.spec.ts
@@ -0,0 +1,90 @@
+import type { MessageTypesValues, IRoom, IUser } from '@rocket.chat/core-typings';
+import { expect } from 'chai';
+
+import { getHiddenSystemMessages } from '../../../../../../app/lib/server/lib/getHiddenSystemMessages';
+
+describe('getHiddenSystemMessages', () => {
+	it('should return room.sysMes if it is an array', async () => {
+		const room: IRoom = {
+			_id: 'roomId',
+			sysMes: ['mute_unmute', 'room_changed_description'] as MessageTypesValues[],
+			t: 'c',
+			msgs: 0,
+			u: {} as IUser,
+			usersCount: 0,
+			_updatedAt: new Date(),
+		};
+
+		const result = getHiddenSystemMessages(room, []);
+
+		expect(result).to.deep.equal(room.sysMes);
+	});
+
+	it('should return cached hidden system messages if room.sysMes is not an array', async () => {
+		const cachedHiddenSystemMessage: MessageTypesValues[] = ['mute_unmute', 'room_changed_description'];
+
+		const room: IRoom = {
+			_id: 'roomId',
+			t: 'c',
+			msgs: 0,
+			u: {} as IUser,
+			usersCount: 0,
+			_updatedAt: new Date(),
+		};
+
+		const result = getHiddenSystemMessages(room, cachedHiddenSystemMessage);
+
+		expect(result).to.deep.equal(['user-muted', 'user-unmuted', 'room_changed_description']);
+	});
+
+	it('should return an empty array if both room.sysMes and cached hidden system messages are undefined', async () => {
+		const room: IRoom = {
+			_id: 'roomId',
+			t: 'c',
+			msgs: 0,
+			u: {} as IUser,
+			usersCount: 0,
+			_updatedAt: new Date(),
+		};
+
+		const result = getHiddenSystemMessages(room, []);
+
+		expect(result).to.deep.equal([]);
+	});
+
+	it('should return cached hidden system messages if room.sysMes is null', async () => {
+		const cachedHiddenSystemMessage: MessageTypesValues[] = ['subscription-role-added', 'room_changed_announcement'];
+
+		const room: IRoom = {
+			_id: 'roomId',
+			sysMes: undefined,
+			t: 'c',
+			msgs: 0,
+			u: {} as IUser,
+			usersCount: 0,
+			_updatedAt: new Date(),
+		};
+
+		const result = getHiddenSystemMessages(room, cachedHiddenSystemMessage);
+
+		expect(result).to.deep.equal(cachedHiddenSystemMessage);
+	});
+
+	it('should return cached hidden system messages if room.sysMes array and hidden system message is available', async () => {
+		const cachedHiddenSystemMessage: MessageTypesValues[] = ['room_changed_announcement', 'room-archived'];
+
+		const room: IRoom = {
+			_id: 'roomId',
+			sysMes: ['mute_unmute', 'room_changed_description'] as MessageTypesValues[],
+			t: 'c',
+			msgs: 0,
+			u: {} as IUser,
+			usersCount: 0,
+			_updatedAt: new Date(),
+		};
+
+		const result = getHiddenSystemMessages(room, cachedHiddenSystemMessage);
+
+		expect(result).to.deep.equal(['mute_unmute', 'room_changed_description']);
+	});
+});
diff --git a/apps/meteor/tests/unit/server/lib/systemMessage/hideSystemMessage.spec.ts b/apps/meteor/tests/unit/server/lib/systemMessage/hideSystemMessage.spec.ts
new file mode 100644
index 000000000000..61d2696068ae
--- /dev/null
+++ b/apps/meteor/tests/unit/server/lib/systemMessage/hideSystemMessage.spec.ts
@@ -0,0 +1,48 @@
+import type { MessageTypesValues } from '@rocket.chat/core-typings';
+import { expect } from 'chai';
+
+import { isMutedUnmuted, shouldHideSystemMessage } from '../../../../../server/lib/systemMessage/hideSystemMessage';
+
+describe('hideSystemMessage', () => {
+	describe('isMutedUnmuted', () => {
+		it('should return true for user-muted', () => {
+			expect(isMutedUnmuted('user-muted')).to.be.true;
+		});
+
+		it('should return true for user-unmuted', () => {
+			expect(isMutedUnmuted('user-unmuted')).to.be.true;
+		});
+
+		it('should return false for other message types', () => {
+			expect(isMutedUnmuted('some-other-type')).to.be.false;
+		});
+	});
+
+	describe('shouldHideSystemMessage', () => {
+		it('should return true if message type is in hidden system messages', async () => {
+			const hiddenMessages: MessageTypesValues[] = ['user-muted', 'mute_unmute'];
+
+			const result = shouldHideSystemMessage('user-muted', hiddenMessages);
+			expect(result).to.be.true;
+		});
+
+		it('should return true if message type is user-muted and mute_unmute is in hidden system messages', async () => {
+			const hiddenMessages: MessageTypesValues[] = ['mute_unmute'];
+
+			const result = shouldHideSystemMessage('user-muted', hiddenMessages);
+			expect(result).to.be.true;
+		});
+
+		it('should return false if message type is not in hidden system messages', async () => {
+			const hiddenMessages: MessageTypesValues[] = ['room-archived'];
+
+			const result = shouldHideSystemMessage('user-muted', hiddenMessages);
+			expect(result).to.be.false;
+		});
+
+		it('should return false if hidden system messages are undefined', async () => {
+			const result = shouldHideSystemMessage('user-muted', undefined);
+			expect(result).to.be.false;
+		});
+	});
+});
diff --git a/apps/meteor/tests/unit/server/modules/watchers/lib/messages.spec.ts b/apps/meteor/tests/unit/server/modules/watchers/lib/messages.spec.ts
new file mode 100644
index 000000000000..5ef8bbdd1634
--- /dev/null
+++ b/apps/meteor/tests/unit/server/modules/watchers/lib/messages.spec.ts
@@ -0,0 +1,215 @@
+import type { IMessage } from '@rocket.chat/core-typings';
+import { expect } from 'chai';
+import proxyquire from 'proxyquire';
+import sinon from 'sinon';
+
+describe('Message Broadcast Tests', () => {
+	let getSettingValueByIdStub: sinon.SinonStub;
+	let usersFindOneStub: sinon.SinonStub;
+	let messagesFindOneStub: sinon.SinonStub;
+	let broadcastStub: sinon.SinonStub;
+	let getMessageToBroadcast: any;
+	let broadcastMessageFromData: any;
+	let memStub: sinon.SinonStub;
+
+	const sampleMessage: IMessage = {
+		_id: '123',
+		rid: 'room1',
+		msg: 'Hello',
+		ts: new Date(),
+		u: { _id: 'user1', username: 'user1', name: 'Real User' },
+		mentions: [],
+		t: 'user-muted',
+		_updatedAt: new Date(),
+	};
+
+	const modelsStubs = () => ({
+		Messages: {
+			findOneById: messagesFindOneStub,
+		},
+		Users: {
+			findOne: usersFindOneStub,
+		},
+		Settings: {
+			getValueById: getSettingValueByIdStub,
+		},
+	});
+
+	const coreStubs = (dbWatchersDisabled: boolean) => ({
+		api: {
+			broadcast: broadcastStub,
+		},
+		dbWatchersDisabled,
+	});
+
+	beforeEach(() => {
+		getSettingValueByIdStub = sinon.stub();
+		usersFindOneStub = sinon.stub();
+		messagesFindOneStub = sinon.stub();
+		broadcastStub = sinon.stub();
+		memStub = sinon.stub().callsFake((fn: any) => fn);
+
+		const proxyMock = proxyquire.noCallThru().load('../../../../../../server/modules/watchers/lib/messages', {
+			'@rocket.chat/models': modelsStubs(),
+			'@rocket.chat/core-services': coreStubs(false),
+			'mem': memStub,
+		});
+
+		getMessageToBroadcast = proxyMock.getMessageToBroadcast;
+		broadcastMessageFromData = proxyMock.broadcastMessageFromData;
+	});
+
+	afterEach(() => {
+		sinon.reset();
+	});
+
+	describe('getMessageToBroadcast', () => {
+		let originalEnv: NodeJS.ProcessEnv;
+
+		beforeEach(() => {
+			originalEnv = { ...process.env };
+			sinon.resetHistory();
+		});
+
+		afterEach(() => {
+			process.env = originalEnv;
+		});
+
+		const testCases = [
+			{
+				description: 'should return undefined if message is hidden or imported',
+				message: { ...sampleMessage, _hidden: true },
+				hideSystemMessages: [],
+				useRealName: false,
+				expectedResult: undefined,
+			},
+			{
+				description: 'should hide message if type is in hideSystemMessage settings',
+				message: sampleMessage,
+				hideSystemMessages: ['user-muted', 'mute_unmute'],
+				useRealName: false,
+				expectedResult: undefined,
+			},
+			{
+				description: 'should return the message with real name if useRealName is true',
+				message: sampleMessage,
+				hideSystemMessages: [],
+				useRealName: true,
+				expectedResult: { ...sampleMessage, u: { ...sampleMessage.u, name: 'Real User' } },
+			},
+			{
+				description: 'should return the message if Hide_System_Messages is undefined',
+				message: sampleMessage,
+				hideSystemMessages: undefined,
+				useRealName: false,
+				expectedResult: sampleMessage,
+			},
+			{
+				description: 'should return undefined if the message type is muted and a mute_unmute is received',
+				message: { ...sampleMessage, t: 'mute_unmute' },
+				hideSystemMessages: ['user-muted', 'mute_unmute'],
+				useRealName: false,
+				expectedResult: undefined,
+			},
+			{
+				description: 'should return the message if no system messages are muted',
+				message: sampleMessage,
+				hideSystemMessages: [],
+				useRealName: false,
+				expectedResult: sampleMessage,
+			},
+			{
+				description: 'should hide message if type is room-archived',
+				message: { ...sampleMessage, t: 'room-archived' },
+				hideSystemMessages: ['room-archived'],
+				useRealName: false,
+				expectedResult: undefined,
+			},
+			{
+				description: 'should hide message if type is user-unmuted',
+				message: { ...sampleMessage, t: 'user-unmuted' },
+				hideSystemMessages: ['user-unmuted'],
+				useRealName: false,
+				expectedResult: undefined,
+			},
+			{
+				description: 'should hide message if type is subscription-role-added',
+				message: { ...sampleMessage, t: 'subscription-role-added' },
+				hideSystemMessages: ['subscription-role-added'],
+				useRealName: false,
+				expectedResult: undefined,
+			},
+			{
+				description: 'should hide message if type is message_pinned',
+				message: { ...sampleMessage, t: 'message_pinned' },
+				hideSystemMessages: ['message_pinned'],
+				useRealName: false,
+				expectedResult: undefined,
+			},
+			{
+				description: 'should hide message if type is new-owner',
+				message: { ...sampleMessage, t: 'new-owner' },
+				hideSystemMessages: ['new-owner'],
+				useRealName: false,
+				expectedResult: undefined,
+			},
+		];
+
+		testCases.forEach(({ description, message, hideSystemMessages, useRealName, expectedResult }) => {
+			it(description, async () => {
+				messagesFindOneStub.resolves(message);
+				getSettingValueByIdStub.withArgs('Hide_System_Messages').resolves(hideSystemMessages);
+				getSettingValueByIdStub.withArgs('UI_Use_Real_Name').resolves(useRealName);
+
+				if (useRealName) {
+					usersFindOneStub.resolves({ name: 'Real User' });
+				}
+
+				const result = await getMessageToBroadcast({ id: '123' });
+
+				expect(result).to.deep.equal(expectedResult);
+			});
+		});
+	});
+
+	describe('broadcastMessageFromData', () => {
+		const setupProxyMock = (dbWatchersDisabled: boolean) => {
+			const proxyMock = proxyquire.noCallThru().load('../../../../../../server/modules/watchers/lib/messages', {
+				'@rocket.chat/models': modelsStubs(),
+				'@rocket.chat/core-services': coreStubs(dbWatchersDisabled),
+				'mem': memStub,
+			});
+			broadcastMessageFromData = proxyMock.broadcastMessageFromData;
+		};
+
+		const testCases = [
+			{
+				description: 'should broadcast the message if dbWatchersDisabled is true',
+				dbWatchersDisabled: true,
+				expectBroadcast: true,
+			},
+			{
+				description: 'should not broadcast the message if dbWatchersDisabled is false',
+				dbWatchersDisabled: false,
+				expectBroadcast: false,
+			},
+		];
+
+		testCases.forEach(({ description, dbWatchersDisabled, expectBroadcast }) => {
+			it(description, async () => {
+				setupProxyMock(dbWatchersDisabled);
+				messagesFindOneStub.resolves(sampleMessage);
+				getSettingValueByIdStub.resolves([]);
+
+				await broadcastMessageFromData({ id: '123', data: sampleMessage });
+
+				if (expectBroadcast) {
+					expect(broadcastStub.calledOnce).to.be.true;
+					expect(broadcastStub.calledOnceWith('watch.messages', { message: sampleMessage })).to.be.true;
+				} else {
+					expect(broadcastStub.called).to.be.false;
+				}
+			});
+		});
+	});
+});

From ffbbd8c40bb7a7cd7fe16cb41464a543adabc344 Mon Sep 17 00:00:00 2001
From: Diego Sampaio <chinello@gmail.com>
Date: Tue, 18 Jun 2024 10:11:23 -0300
Subject: [PATCH 28/94] regression: don't notify role changes during startup
 (#32619)

---
 .../server/lib/roles/createOrUpdateProtectedRole.ts       | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/apps/meteor/server/lib/roles/createOrUpdateProtectedRole.ts b/apps/meteor/server/lib/roles/createOrUpdateProtectedRole.ts
index cdc43cdad93a..ea59a2961ea4 100644
--- a/apps/meteor/server/lib/roles/createOrUpdateProtectedRole.ts
+++ b/apps/meteor/server/lib/roles/createOrUpdateProtectedRole.ts
@@ -1,8 +1,6 @@
 import type { IRole, AtLeast } from '@rocket.chat/core-typings';
 import { Roles } from '@rocket.chat/models';
 
-import { notifyOnRoleChanged, notifyOnRoleChangedById } from '../../../app/lib/server/lib/notifyListener';
-
 export const createOrUpdateProtectedRoleAsync = async (
 	roleId: string,
 	roleData: AtLeast<Omit<IRole, '_id' | 'protected'>, 'name'>,
@@ -12,7 +10,7 @@ export const createOrUpdateProtectedRoleAsync = async (
 	});
 
 	if (role) {
-		const updatedRole = await Roles.updateById(
+		await Roles.updateById(
 			roleId,
 			roleData.name || role.name,
 			roleData.scope || role.scope,
@@ -20,8 +18,6 @@ export const createOrUpdateProtectedRoleAsync = async (
 			roleData.mandatory2fa || role.mandatory2fa,
 		);
 
-		void notifyOnRoleChanged(updatedRole);
-
 		return;
 	}
 
@@ -33,6 +29,4 @@ export const createOrUpdateProtectedRoleAsync = async (
 		...roleData,
 		protected: true,
 	});
-
-	void notifyOnRoleChangedById(roleId);
 };

From b23f9ed91ab21ad83ff01bc512fafc0c9987a3e5 Mon Sep 17 00:00:00 2001
From: Guilherme Gazzo <guilhermegazzo@gmail.com>
Date: Tue, 18 Jun 2024 11:32:29 -0300
Subject: [PATCH 29/94] fix: Supported Versions misbehaving (#32610)

---
 .changeset/dry-shoes-tap.md                   |  5 ++++
 .../supportedVersionsChooseLatest.ts          |  2 +-
 .../supportedVersionsToken.ts                 | 26 +++++++++++++++++++
 apps/meteor/jest.config.ts                    |  1 +
 .../plugin/compile-version.js                 | 23 ++++++++++++----
 5 files changed, 51 insertions(+), 6 deletions(-)
 create mode 100644 .changeset/dry-shoes-tap.md

diff --git a/.changeset/dry-shoes-tap.md b/.changeset/dry-shoes-tap.md
new file mode 100644
index 000000000000..f5abf51c0df0
--- /dev/null
+++ b/.changeset/dry-shoes-tap.md
@@ -0,0 +1,5 @@
+---
+"@rocket.chat/meteor": patch
+---
+
+Fixes the supported versions problem, where in most cases the data chosen was the oldest
diff --git a/apps/meteor/app/cloud/server/functions/supportedVersionsToken/supportedVersionsChooseLatest.ts b/apps/meteor/app/cloud/server/functions/supportedVersionsToken/supportedVersionsChooseLatest.ts
index 3493401144cf..32753ba00429 100644
--- a/apps/meteor/app/cloud/server/functions/supportedVersionsToken/supportedVersionsChooseLatest.ts
+++ b/apps/meteor/app/cloud/server/functions/supportedVersionsToken/supportedVersionsChooseLatest.ts
@@ -2,7 +2,7 @@ import type { SignedSupportedVersions } from '@rocket.chat/server-cloud-communic
 
 export const supportedVersionsChooseLatest = async (...tokens: (SignedSupportedVersions | undefined)[]) => {
 	const [token] = (tokens.filter((r) => r?.timestamp != null) as SignedSupportedVersions[]).sort((a, b) => {
-		return new Date(a.timestamp).getTime() - new Date(b.timestamp).getTime();
+		return new Date(b.timestamp).getTime() - new Date(a.timestamp).getTime();
 	});
 
 	return token;
diff --git a/apps/meteor/app/cloud/server/functions/supportedVersionsToken/supportedVersionsToken.ts b/apps/meteor/app/cloud/server/functions/supportedVersionsToken/supportedVersionsToken.ts
index 473acef88c29..a543c0681f38 100644
--- a/apps/meteor/app/cloud/server/functions/supportedVersionsToken/supportedVersionsToken.ts
+++ b/apps/meteor/app/cloud/server/functions/supportedVersionsToken/supportedVersionsToken.ts
@@ -62,6 +62,7 @@ const cacheValueInSettings = <T extends SettingValue>(
 	reset: () => Promise<T>;
 } => {
 	const reset = async () => {
+		SystemLogger.debug(`Resetting cached value ${key} in settings`);
 		const value = await fn();
 
 		await Settings.updateValueById(key, value);
@@ -134,6 +135,31 @@ const getSupportedVersionsToken = async () => {
 		(response.success && response.result) || undefined,
 	);
 
+	SystemLogger.debug({
+		msg: 'Supported versions',
+		supportedVersionsFromBuild: supportedVersionsFromBuild.timestamp,
+		versionsFromLicense: versionsFromLicense?.supportedVersions?.timestamp,
+		response: response.success && response.result?.timestamp,
+	});
+
+	switch (supportedVersions) {
+		case supportedVersionsFromBuild:
+			SystemLogger.info({
+				msg: 'Using supported versions from build',
+			});
+			break;
+		case versionsFromLicense?.supportedVersions:
+			SystemLogger.info({
+				msg: 'Using supported versions from license',
+			});
+			break;
+		case response.success && response.result:
+			SystemLogger.info({
+				msg: 'Using supported versions from cloud',
+			});
+			break;
+	}
+
 	await buildVersionUpdateMessage(supportedVersions?.versions);
 
 	return supportedVersions?.signed;
diff --git a/apps/meteor/jest.config.ts b/apps/meteor/jest.config.ts
index adbd8c26344f..72538cf14d16 100644
--- a/apps/meteor/jest.config.ts
+++ b/apps/meteor/jest.config.ts
@@ -33,6 +33,7 @@ const config: Config = {
 				'<rootDir>/app/livechat/server/business-hour/**/*.spec.ts?(x)',
 				'<rootDir>/app/livechat/server/api/**/*.spec.ts',
 				'<rootDir>/ee/app/authorization/server/validateUserRoles.spec.ts',
+				'<rootDir>/app/cloud/server/functions/supportedVersionsToken/**.spec.ts',
 			],
 			transformIgnorePatterns: ['!/node_modules/jose'],
 			errorOnDeprecated: true,
diff --git a/apps/meteor/packages/rocketchat-version/plugin/compile-version.js b/apps/meteor/packages/rocketchat-version/plugin/compile-version.js
index e737f07663f3..8750c6851202 100644
--- a/apps/meteor/packages/rocketchat-version/plugin/compile-version.js
+++ b/apps/meteor/packages/rocketchat-version/plugin/compile-version.js
@@ -21,10 +21,10 @@ class VersionCompiler {
 				function handleError(err) {
 					console.error(err);
 					// TODO remove this when we are ready to fail
-					// if (process.env.NODE_ENV !== 'development') {
-					// 	reject(err);
-					// 	return;
-					// }
+					if (process.env.NODE_ENV !== 'development') {
+						reject(err);
+						return;
+					}
 					resolve({});
 				}
 
@@ -34,11 +34,24 @@ class VersionCompiler {
 						response.on('data', function (chunk) {
 							data += chunk;
 						});
-						response.on('end', function () {
+						response.on('end', async function () {
 							const supportedVersions = JSON.parse(data);
 							if (!supportedVersions?.signed) {
 								return handleError(new Error(`Invalid supportedVersions result:\n  URL: ${url} \n  RESULT: ${data}`));
 							}
+
+							// check if timestamp is inside 1 hour within build
+							if (Math.abs(new Date().getTime() - new Date(supportedVersions.timestamp).getTime()) > 1000 * 60 * 60) {
+								return handleError(new Error(`Invalid supportedVersions timestamp:\n  URL: ${url} \n  RESULT: ${data}`));
+							}
+
+							for await (const version of supportedVersions.versions) {
+								// check if expiration is after the first rocket.chat release
+								if (new Date(version.expiration) < new Date('2019-04-01T00:00:00.000Z')) {
+									return handleError(new Error(`Invalid supportedVersions expiration:\n  URL: ${url} \n  RESULT: ${data}`));
+								}
+							}
+
 							resolve(supportedVersions);
 						});
 						response.on('error', function (err) {

From 1bdffcde914bf21cb947c8636574096060fbe9bd Mon Sep 17 00:00:00 2001
From: Kevin Aleman <kaleman960@gmail.com>
Date: Tue, 18 Jun 2024 10:58:22 -0600
Subject: [PATCH 30/94] fix: `QueueInactivityMonitor` not processing inquiries
 (#32452)

---
 .changeset/green-camels-repair.md             |   5 +
 .../server/hooks/afterInquiryQueued.ts        |  20 +--
 .../server/hooks/afterInquiryQueued.spec.ts   | 120 ++++++++++++++++++
 3 files changed, 135 insertions(+), 10 deletions(-)
 create mode 100644 .changeset/green-camels-repair.md
 create mode 100644 apps/meteor/ee/tests/unit/apps/livechat-enterprise/server/hooks/afterInquiryQueued.spec.ts

diff --git a/.changeset/green-camels-repair.md b/.changeset/green-camels-repair.md
new file mode 100644
index 000000000000..58b0f6f1a00c
--- /dev/null
+++ b/.changeset/green-camels-repair.md
@@ -0,0 +1,5 @@
+---
+"@rocket.chat/meteor": patch
+---
+
+Fixed 2 issues with `QueueInactivityMonitor` callback. This callback was in charge of scheduling the job that would close the inquiry, but it was checking on a property that didn't exist. This caused the callback to early return without scheduling the job, making the feature to not to work.
diff --git a/apps/meteor/ee/app/livechat-enterprise/server/hooks/afterInquiryQueued.ts b/apps/meteor/ee/app/livechat-enterprise/server/hooks/afterInquiryQueued.ts
index cb6993b38aec..4dfb3fc9d6eb 100644
--- a/apps/meteor/ee/app/livechat-enterprise/server/hooks/afterInquiryQueued.ts
+++ b/apps/meteor/ee/app/livechat-enterprise/server/hooks/afterInquiryQueued.ts
@@ -1,3 +1,4 @@
+import type { ILivechatInquiryRecord } from '@rocket.chat/core-typings';
 import moment from 'moment';
 
 import { settings } from '../../../../../app/settings/server';
@@ -5,28 +6,27 @@ import { callbacks } from '../../../../../lib/callbacks';
 import { OmnichannelQueueInactivityMonitor } from '../lib/QueueInactivityMonitor';
 import { cbLogger } from '../lib/logger';
 
-let timer = 0;
-
-const scheduleInquiry = async (inquiry: any): Promise<void> => {
-	if (!inquiry?._id) {
+export const afterInquiryQueued = async (inquiry: ILivechatInquiryRecord) => {
+	if (!inquiry?._id || !inquiry?._updatedAt) {
 		return;
 	}
 
-	if (!inquiry?._updatedAt || !inquiry?._createdAt) {
+	const timer = settings.get<number>('Livechat_max_queue_wait_time');
+
+	if (timer <= 0) {
 		return;
 	}
 
 	// schedule individual jobs instead of property for close inactivty
-	const newQueueTime = moment(inquiry._updatedAt || inquiry._createdAt).add(timer, 'minutes');
+	const newQueueTime = moment(inquiry._updatedAt).add(timer, 'minutes');
 	cbLogger.debug(`Scheduling estimated close time at ${newQueueTime} for queued inquiry ${inquiry._id}`);
 	await OmnichannelQueueInactivityMonitor.scheduleInquiry(inquiry._id, new Date(newQueueTime.format()));
 };
 
-settings.watch('Livechat_max_queue_wait_time', (value) => {
-	timer = value as number;
-	if (timer <= 0) {
+settings.watch<number>('Livechat_max_queue_wait_time', (value) => {
+	if (value <= 0) {
 		callbacks.remove('livechat.afterInquiryQueued', 'livechat-inquiry-queued-set-queue-timer');
 		return;
 	}
-	callbacks.add('livechat.afterInquiryQueued', scheduleInquiry, callbacks.priority.HIGH, 'livechat-inquiry-queued-set-queue-timer');
+	callbacks.add('livechat.afterInquiryQueued', afterInquiryQueued, callbacks.priority.HIGH, 'livechat-inquiry-queued-set-queue-timer');
 });
diff --git a/apps/meteor/ee/tests/unit/apps/livechat-enterprise/server/hooks/afterInquiryQueued.spec.ts b/apps/meteor/ee/tests/unit/apps/livechat-enterprise/server/hooks/afterInquiryQueued.spec.ts
new file mode 100644
index 000000000000..dcbefd1dfd6e
--- /dev/null
+++ b/apps/meteor/ee/tests/unit/apps/livechat-enterprise/server/hooks/afterInquiryQueued.spec.ts
@@ -0,0 +1,120 @@
+import { expect } from 'chai';
+import { describe, it } from 'mocha';
+import moment from 'moment';
+import proxyquire from 'proxyquire';
+import sinon from 'sinon';
+
+const settingStub = {
+	watch: sinon.stub(),
+	get: sinon.stub(),
+};
+
+const callbackStub = {
+	add: sinon.stub(),
+	remove: sinon.stub(),
+	priority: { HIGH: 'high' },
+};
+
+const queueMonitorStub = {
+	scheduleInquiry: sinon.stub(),
+};
+
+const { afterInquiryQueued } = proxyquire
+	.noCallThru()
+	.load('../../../../../../app/livechat-enterprise/server/hooks/afterInquiryQueued.ts', {
+		'../../../../../app/settings/server': {
+			settings: settingStub,
+		},
+		'../../../../../lib/callbacks': {
+			callbacks: callbackStub,
+		},
+		'../lib/QueueInactivityMonitor': {
+			OmnichannelQueueInactivityMonitor: queueMonitorStub,
+		},
+		'../lib/logger': {
+			cbLogger: { debug: sinon.stub() },
+		},
+	});
+
+describe('hooks/afterInquiryQueued', () => {
+	beforeEach(() => {
+		callbackStub.add.resetHistory();
+		callbackStub.remove.resetHistory();
+		queueMonitorStub.scheduleInquiry.resetHistory();
+		settingStub.get.resetHistory();
+	});
+
+	it('should call settings.watch at first', () => {
+		expect(settingStub.watch.callCount).to.be.equal(1);
+	});
+
+	it('should call the callback on settings.watch with proper values', () => {
+		const func = settingStub.watch.getCall(0).args[1];
+
+		func(1);
+		expect(callbackStub.add.callCount).to.be.equal(1);
+
+		func(2);
+		expect(callbackStub.add.callCount).to.be.equal(2);
+
+		func(0);
+		expect(callbackStub.remove.callCount).to.be.equal(1);
+
+		func(-1);
+		expect(callbackStub.remove.callCount).to.be.equal(2);
+
+		func(3);
+		expect(callbackStub.add.callCount).to.be.equal(3);
+	});
+
+	it('should return undefined if no inquiry is passed, or if inquiry doesnt have valid properties', async () => {
+		expect(await afterInquiryQueued(null)).to.be.equal(undefined);
+		expect(await afterInquiryQueued({})).to.be.equal(undefined);
+		expect(await afterInquiryQueued({ _id: 'invalid' })).to.be.equal(undefined);
+		expect(await afterInquiryQueued({ _updatedAt: new Date() }));
+		expect(await afterInquiryQueued({ _updatedAt: null, _id: 'afsd34asdX' })).to.be.equal(undefined);
+	});
+
+	it('should do nothing if timer is set to 0 or less', async () => {
+		const inquiry = {
+			_id: 'afsd34asdX',
+			_updatedAt: new Date(),
+		};
+
+		settingStub.get.returns(0);
+		await afterInquiryQueued(inquiry);
+		expect(queueMonitorStub.scheduleInquiry.callCount).to.be.equal(0);
+
+		settingStub.get.returns(-1);
+		await afterInquiryQueued(inquiry);
+		expect(queueMonitorStub.scheduleInquiry.callCount).to.be.equal(0);
+	});
+
+	it('should call .scheduleInquiry with proper data', async () => {
+		const inquiry = {
+			_id: 'afsd34asdX',
+			_updatedAt: new Date(),
+		};
+
+		settingStub.get.returns(1);
+		await afterInquiryQueued(inquiry);
+
+		const newQueueTime = moment(inquiry._updatedAt).add(1, 'minutes');
+
+		expect(queueMonitorStub.scheduleInquiry.calledWith(inquiry._id, new Date(newQueueTime.format()))).to.be.true;
+	});
+
+	it('should call .scheduleInquiry with proper data when more than 1 min is passed as param', async () => {
+		const inquiry = {
+			_id: 'afv34avzx',
+			_updatedAt: new Date(),
+		};
+
+		settingStub.get.returns(3);
+		await afterInquiryQueued(inquiry);
+
+		const newQueueTime = moment(inquiry._updatedAt).add(3, 'minutes');
+
+		expect(queueMonitorStub.scheduleInquiry.calledWith(inquiry._id, new Date(newQueueTime.format()))).to.be.true;
+	});
+});

From 30399688fce5bb1482b7737c34cfa92a896ea877 Mon Sep 17 00:00:00 2001
From: Kevin Aleman <kaleman960@gmail.com>
Date: Tue, 18 Jun 2024 13:45:38 -0600
Subject: [PATCH 31/94] fix: PDFs uploaded by "PDF transcript" feature were
 returnig 403 when attempting to download (#32329)

---
 .changeset/rude-llamas-notice.md              |  8 ++
 .../app/file-upload/server/lib/FileUpload.ts  | 18 ++++-
 apps/meteor/server/settings/file-upload.ts    | 28 ++++++-
 apps/meteor/tests/end-to-end/api/09-rooms.js  | 34 +++++++++
 .../src/OmnichannelTranscript.ts              | 76 +++++++++++++------
 packages/i18n/src/locales/en.i18n.json        |  2 +
 6 files changed, 136 insertions(+), 30 deletions(-)
 create mode 100644 .changeset/rude-llamas-notice.md

diff --git a/.changeset/rude-llamas-notice.md b/.changeset/rude-llamas-notice.md
new file mode 100644
index 000000000000..90c0ca3bd20a
--- /dev/null
+++ b/.changeset/rude-llamas-notice.md
@@ -0,0 +1,8 @@
+---
+"@rocket.chat/meteor": patch
+"@rocket.chat/i18n": patch
+"@rocket.chat/omnichannel-services": patch
+---
+
+Added a new setting `Restrict files access to users who can access room` that controls file visibility. This new setting allows users that "can access a room" to also download the files that are there. This is specially important for users with livechat manager or monitor roles, or agents that have special permissions to view closed rooms, since this allows them to download files on the conversation even after the conversation is closed.
+New setting is disabled by default and it is mutually exclusive with the setting `Restrict file access to room members` since this allows _more_ types of users to download files.
diff --git a/apps/meteor/app/file-upload/server/lib/FileUpload.ts b/apps/meteor/app/file-upload/server/lib/FileUpload.ts
index c824ba6c31a5..08e2ccb0a52b 100644
--- a/apps/meteor/app/file-upload/server/lib/FileUpload.ts
+++ b/apps/meteor/app/file-upload/server/lib/FileUpload.ts
@@ -28,7 +28,7 @@ import { roomCoordinator } from '../../../../server/lib/rooms/roomCoordinator';
 import { UploadFS } from '../../../../server/ufs';
 import { ufsComplete } from '../../../../server/ufs/ufs-methods';
 import type { Store, StoreOptions } from '../../../../server/ufs/ufs-store';
-import { canAccessRoomAsync } from '../../../authorization/server/functions/canAccessRoom';
+import { canAccessRoomAsync, canAccessRoomIdAsync } from '../../../authorization/server/functions/canAccessRoom';
 import { settings } from '../../../settings/server';
 import { mime } from '../../../utils/lib/mimeTypes';
 import { isValidJWT, generateJWT } from '../../../utils/server/lib/JWTHelper';
@@ -463,16 +463,26 @@ export const FileUpload = {
 			return false;
 		}
 
-		if (!settings.get('FileUpload_Restrict_to_room_members') || !file?.rid) {
+		if (!file?.rid) {
 			return true;
 		}
 
-		const subscription = await Subscriptions.findOneByRoomIdAndUserId(file.rid, user._id, { projection: { _id: 1 } });
+		const fileUploadRestrictedToMembers = settings.get<boolean>('FileUpload_Restrict_to_room_members');
+		const fileUploadRestrictToUsersWhoCanAccessRoom = settings.get<boolean>('FileUpload_Restrict_to_users_who_can_access_room');
 
-		if (subscription) {
+		if (!fileUploadRestrictToUsersWhoCanAccessRoom && !fileUploadRestrictedToMembers) {
 			return true;
 		}
 
+		if (fileUploadRestrictedToMembers && !fileUploadRestrictToUsersWhoCanAccessRoom) {
+			const sub = await Subscriptions.findOneByRoomIdAndUserId(file.rid, user._id, { projection: { _id: 1 } });
+			return !!sub;
+		}
+
+		if (fileUploadRestrictToUsersWhoCanAccessRoom && !fileUploadRestrictedToMembers) {
+			return canAccessRoomIdAsync(file.rid, user._id);
+		}
+
 		return false;
 	},
 
diff --git a/apps/meteor/server/settings/file-upload.ts b/apps/meteor/server/settings/file-upload.ts
index 76e788cda0e2..505520b73e57 100644
--- a/apps/meteor/server/settings/file-upload.ts
+++ b/apps/meteor/server/settings/file-upload.ts
@@ -33,10 +33,30 @@ export const createFileUploadSettings = () =>
 
 		await this.add('FileUpload_Restrict_to_room_members', true, {
 			type: 'boolean',
-			enableQuery: {
-				_id: 'FileUpload_ProtectFiles',
-				value: true,
-			},
+			enableQuery: [
+				{
+					_id: 'FileUpload_ProtectFiles',
+					value: true,
+				},
+				{
+					_id: 'FileUpload_Restrict_to_users_who_can_access_room',
+					value: false,
+				},
+			],
+		});
+
+		await this.add('FileUpload_Restrict_to_users_who_can_access_room', false, {
+			type: 'boolean',
+			enableQuery: [
+				{
+					_id: 'FileUpload_ProtectFiles',
+					value: true,
+				},
+				{
+					_id: 'FileUpload_Restrict_to_room_members',
+					value: false,
+				},
+			],
 		});
 
 		await this.add('FileUpload_RotateImages', true, {
diff --git a/apps/meteor/tests/end-to-end/api/09-rooms.js b/apps/meteor/tests/end-to-end/api/09-rooms.js
index dc8a6a209300..72bd5819593e 100644
--- a/apps/meteor/tests/end-to-end/api/09-rooms.js
+++ b/apps/meteor/tests/end-to-end/api/09-rooms.js
@@ -87,11 +87,13 @@ describe('[Rooms]', function () {
 		let userCredentials;
 		const testChannelName = `channel.test.upload.${Date.now()}-${Math.random()}`;
 		let blockedMediaTypes;
+		let testPrivateChannel;
 
 		before(async () => {
 			user = await createUser({ joinDefaultChannels: false });
 			userCredentials = await login(user.username, password);
 			testChannel = (await createRoom({ type: 'c', name: testChannelName })).body.channel;
+			testPrivateChannel = (await createRoom({ type: 'p', name: `channel.test.private.${Date.now()}-${Math.random()}` })).body.group;
 			blockedMediaTypes = await getSettingValueById('FileUpload_MediaTypeBlackList');
 			const newBlockedMediaTypes = blockedMediaTypes
 				.split(',')
@@ -105,8 +107,10 @@ describe('[Rooms]', function () {
 				deleteRoom({ type: 'c', roomId: testChannel._id }),
 				deleteUser(user),
 				updateSetting('FileUpload_Restrict_to_room_members', true),
+				updateSetting('FileUpload_Restrict_to_users_who_can_access_room', false),
 				updateSetting('FileUpload_ProtectFiles', true),
 				updateSetting('FileUpload_MediaTypeBlackList', blockedMediaTypes),
+				deleteRoom({ roomId: testPrivateChannel._id, type: 'p' }),
 			]),
 		);
 
@@ -221,6 +225,7 @@ describe('[Rooms]', function () {
 
 		it('should be able to get the file when no access to the room if setting allows it', async () => {
 			await updateSetting('FileUpload_Restrict_to_room_members', false);
+			await updateSetting('FileUpload_Restrict_to_users_who_can_access_room', false);
 			await request.get(fileNewUrl).set(userCredentials).expect('Content-Type', 'image/png').expect(200);
 			await request.get(fileOldUrl).set(userCredentials).expect('Content-Type', 'image/png').expect(200);
 		});
@@ -237,6 +242,35 @@ describe('[Rooms]', function () {
 			await request.get(fileOldUrl).set(credentials).expect('Content-Type', 'image/png').expect(200);
 		});
 
+		it('should be able to get the file if not member but can access room if setting allows', async () => {
+			await updateSetting('FileUpload_Restrict_to_room_members', false);
+			await updateSetting('FileUpload_Restrict_to_users_who_can_access_room', true);
+
+			await request.get(fileNewUrl).set(userCredentials).expect('Content-Type', 'image/png').expect(200);
+			await request.get(fileOldUrl).set(userCredentials).expect('Content-Type', 'image/png').expect(200);
+		});
+
+		it('should not be able to get the file if not member and cannot access room', async () => {
+			const { body } = await request
+				.post(api(`rooms.upload/${testPrivateChannel._id}`))
+				.set(credentials)
+				.attach('file', imgURL)
+				.expect('Content-Type', 'application/json')
+				.expect(200);
+
+			const fileUrl = `/file-upload/${body.message.file._id}/${body.message.file.name}`;
+
+			await request.get(fileUrl).set(userCredentials).expect(403);
+		});
+
+		it('should respect the setting with less permissions when both are true', async () => {
+			await updateSetting('FileUpload_ProtectFiles', true);
+			await updateSetting('FileUpload_Restrict_to_room_members', true);
+			await updateSetting('FileUpload_Restrict_to_users_who_can_access_room', true);
+			await request.get(fileNewUrl).set(userCredentials).expect(403);
+			await request.get(fileOldUrl).set(userCredentials).expect(403);
+		});
+
 		it('should not be able to get the file without credentials', async () => {
 			await request.get(fileNewUrl).attach('file', imgURL).expect(403);
 			await request.get(fileOldUrl).attach('file', imgURL).expect(403);
diff --git a/ee/packages/omnichannel-services/src/OmnichannelTranscript.ts b/ee/packages/omnichannel-services/src/OmnichannelTranscript.ts
index 2d273991508b..5f99269f671b 100644
--- a/ee/packages/omnichannel-services/src/OmnichannelTranscript.ts
+++ b/ee/packages/omnichannel-services/src/OmnichannelTranscript.ts
@@ -336,22 +336,15 @@ export class OmnichannelTranscript extends ServiceClass implements IOmnichannelT
 		const outBuff = await streamToBuffer(stream as Readable);
 
 		try {
-			const file = await uploadService.uploadFile({
-				userId: details.userId,
+			const { rid } = await roomService.createDirectMessage({ to: details.userId, from: 'rocket.cat' });
+			const [rocketCatFile, transcriptFile] = await this.uploadFiles({
+				details,
 				buffer: outBuff,
-				details: {
-					// transcript_{company-name)_{date}_{hour}.pdf
-					name: `${transcriptText}_${data.siteName}_${new Intl.DateTimeFormat('en-US').format(new Date())}_${
-						data.visitor?.name || data.visitor?.username || 'Visitor'
-					}.pdf`,
-					type: 'application/pdf',
-					rid: details.rid,
-					// Rocket.cat is the goat
-					userId: 'rocket.cat',
-					size: outBuff.length,
-				},
+				roomIds: [rid, details.rid],
+				data,
+				transcriptText,
 			});
-			await this.pdfComplete({ details, file });
+			await this.pdfComplete({ details, transcriptFile, rocketCatFile });
 		} catch (e: any) {
 			this.pdfFailed({ details, e });
 		}
@@ -380,7 +373,49 @@ export class OmnichannelTranscript extends ServiceClass implements IOmnichannelT
 		});
 	}
 
-	private async pdfComplete({ details, file }: { details: WorkDetailsWithSource; file: IUpload }): Promise<void> {
+	private async uploadFiles({
+		details,
+		buffer,
+		roomIds,
+		data,
+		transcriptText,
+	}: {
+		details: WorkDetailsWithSource;
+		buffer: Buffer;
+		roomIds: string[];
+		data: any;
+		transcriptText: string;
+	}): Promise<IUpload[]> {
+		return Promise.all(
+			roomIds.map((roomId) => {
+				return uploadService.uploadFile({
+					userId: details.userId,
+					buffer,
+					details: {
+						// transcript_{company-name}_{date}_{hour}.pdf
+						name: `${transcriptText}_${data.siteName}_${new Intl.DateTimeFormat('en-US').format(new Date())}_${
+							data.visitor?.name || data.visitor?.username || 'Visitor'
+						}.pdf`,
+						type: 'application/pdf',
+						rid: roomId,
+						// Rocket.cat is the goat
+						userId: 'rocket.cat',
+						size: buffer.length,
+					},
+				});
+			}),
+		);
+	}
+
+	private async pdfComplete({
+		details,
+		transcriptFile,
+		rocketCatFile,
+	}: {
+		details: WorkDetailsWithSource;
+		transcriptFile: IUpload;
+		rocketCatFile: IUpload;
+	}): Promise<void> {
 		this.log.info(`Transcript for room ${details.rid} by user ${details.userId} - Complete`);
 		const user = await Users.findOneById(details.userId);
 		if (!user) {
@@ -388,17 +423,14 @@ export class OmnichannelTranscript extends ServiceClass implements IOmnichannelT
 		}
 		// Send the file to the livechat room where this was requested, to keep it in context
 		try {
-			const [, { rid }] = await Promise.all([
-				LivechatRooms.setPdfTranscriptFileIdById(details.rid, file._id),
-				roomService.createDirectMessage({ to: details.userId, from: 'rocket.cat' }),
-			]);
+			await LivechatRooms.setPdfTranscriptFileIdById(details.rid, transcriptFile._id);
 
 			this.log.info(`Transcript for room ${details.rid} by user ${details.userId} - Sending success message to user`);
 			const result = await Promise.allSettled([
 				uploadService.sendFileMessage({
 					roomId: details.rid,
 					userId: 'rocket.cat',
-					file,
+					file: transcriptFile,
 					message: {
 						// Translate from service
 						msg: await translationService.translateToServerLanguage('pdf_success_message'),
@@ -406,9 +438,9 @@ export class OmnichannelTranscript extends ServiceClass implements IOmnichannelT
 				}),
 				// Send the file to the user who requested it, so they can download it
 				uploadService.sendFileMessage({
-					roomId: rid,
+					roomId: rocketCatFile.rid || '',
 					userId: 'rocket.cat',
-					file,
+					file: rocketCatFile,
 					message: {
 						// Translate from service
 						msg: await translationService.translate('pdf_success_message', user),
diff --git a/packages/i18n/src/locales/en.i18n.json b/packages/i18n/src/locales/en.i18n.json
index 779c71c9d755..836b534df601 100644
--- a/packages/i18n/src/locales/en.i18n.json
+++ b/packages/i18n/src/locales/en.i18n.json
@@ -2354,6 +2354,8 @@
   "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",

From 6c4977f8ce0eb31f44ff62fd6bcfa8aa81139d01 Mon Sep 17 00:00:00 2001
From: rocketchat-github-ci <buildmaster@rocket.chat>
Date: Tue, 18 Jun 2024 20:39:14 +0000
Subject: [PATCH 32/94] Bump 6.9.2

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

diff --git a/.changeset/bump-patch-1718743154258.md b/.changeset/bump-patch-1718743154258.md
new file mode 100644
index 000000000000..e1eaa7980afb
--- /dev/null
+++ b/.changeset/bump-patch-1718743154258.md
@@ -0,0 +1,5 @@
+---
+'@rocket.chat/meteor': patch
+---
+
+Bump @rocket.chat/meteor version.
diff --git a/yarn.lock b/yarn.lock
index 2688eb2a0cf8..55ea08d561de 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8795,10 +8795,10 @@ __metadata:
     "@rocket.chat/icons": "*"
     "@rocket.chat/prettier-config": "*"
     "@rocket.chat/styled": "*"
-    "@rocket.chat/ui-avatar": 3.0.0
-    "@rocket.chat/ui-contexts": 7.0.0
+    "@rocket.chat/ui-avatar": 3.0.1
+    "@rocket.chat/ui-contexts": 7.0.1
     "@rocket.chat/ui-kit": 0.34.0
-    "@rocket.chat/ui-video-conf": 7.0.0
+    "@rocket.chat/ui-video-conf": 7.0.1
     "@tanstack/react-query": "*"
     react: "*"
     react-dom: "*"
@@ -8887,8 +8887,8 @@ __metadata:
     "@rocket.chat/fuselage-tokens": "*"
     "@rocket.chat/message-parser": 0.31.29
     "@rocket.chat/styled": "*"
-    "@rocket.chat/ui-client": 7.0.0
-    "@rocket.chat/ui-contexts": 7.0.0
+    "@rocket.chat/ui-client": 7.0.1
+    "@rocket.chat/ui-contexts": 7.0.1
     katex: "*"
     react: "*"
   languageName: unknown
@@ -10106,7 +10106,7 @@ __metadata:
     typescript: ~5.3.3
   peerDependencies:
     "@rocket.chat/fuselage": "*"
-    "@rocket.chat/ui-contexts": 7.0.0
+    "@rocket.chat/ui-contexts": 7.0.1
     react: ~17.0.2
   languageName: unknown
   linkType: soft
@@ -10159,7 +10159,7 @@ __metadata:
     "@rocket.chat/fuselage": "*"
     "@rocket.chat/fuselage-hooks": "*"
     "@rocket.chat/icons": "*"
-    "@rocket.chat/ui-contexts": 7.0.0
+    "@rocket.chat/ui-contexts": 7.0.1
     react: ~17.0.2
   languageName: unknown
   linkType: soft
@@ -10335,8 +10335,8 @@ __metadata:
     "@rocket.chat/fuselage-hooks": "*"
     "@rocket.chat/icons": "*"
     "@rocket.chat/styled": "*"
-    "@rocket.chat/ui-avatar": 3.0.0
-    "@rocket.chat/ui-contexts": 7.0.0
+    "@rocket.chat/ui-avatar": 3.0.1
+    "@rocket.chat/ui-contexts": 7.0.1
     react: ^17.0.2
     react-dom: ^17.0.2
   languageName: unknown
@@ -10426,7 +10426,7 @@ __metadata:
   peerDependencies:
     "@rocket.chat/layout": "*"
     "@rocket.chat/tools": 0.2.1
-    "@rocket.chat/ui-contexts": 7.0.0
+    "@rocket.chat/ui-contexts": 7.0.1
     "@tanstack/react-query": "*"
     react: "*"
     react-hook-form: "*"

From 4ddf08e77bf743d6ede2ef98f81a0dcd44750660 Mon Sep 17 00:00:00 2001
From: "dionisio-bot[bot]"
 <117394943+dionisio-bot[bot]@users.noreply.github.com>
Date: Tue, 18 Jun 2024 16:58:10 +0000
Subject: [PATCH 33/94] fix: Not possible to edit room without proper
 permission with retention policy enabled (#32622)

Co-authored-by: Douglas Fabris <27704687+dougfabris@users.noreply.github.com>
---
 .changeset/nervous-wolves-collect.md          |  5 +++
 .../EditRoomInfo/useEditRoomInitialValues.ts  | 19 +++++++----
 .../meteor/tests/e2e/retention-policy.spec.ts | 33 ++++++++++++++-----
 3 files changed, 41 insertions(+), 16 deletions(-)
 create mode 100644 .changeset/nervous-wolves-collect.md

diff --git a/.changeset/nervous-wolves-collect.md b/.changeset/nervous-wolves-collect.md
new file mode 100644
index 000000000000..e32377f54179
--- /dev/null
+++ b/.changeset/nervous-wolves-collect.md
@@ -0,0 +1,5 @@
+---
+'@rocket.chat/meteor': patch
+---
+
+Fixes the issue not allowing users without edit-room-retention-policy permission try to edit the room with the retention policy enabled
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 128f6c3c66f8..1cb76cadd335 100644
--- a/apps/meteor/client/views/room/contextualBar/Info/EditRoomInfo/useEditRoomInitialValues.ts
+++ b/apps/meteor/client/views/room/contextualBar/Info/EditRoomInfo/useEditRoomInitialValues.ts
@@ -1,4 +1,5 @@
 import type { IRoomWithRetentionPolicy } from '@rocket.chat/core-typings';
+import { usePermission } from '@rocket.chat/ui-contexts';
 import { useMemo } from 'react';
 
 import { roomCoordinator } from '../../../../../lib/rooms/roomCoordinator';
@@ -6,6 +7,8 @@ import { useRetentionPolicy } from '../../../hooks/useRetentionPolicy';
 
 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;
 
 	return useMemo(
@@ -24,13 +27,14 @@ export const useEditRoomInitialValues = (room: IRoomWithRetentionPolicy) => {
 			systemMessages: Array.isArray(sysMes) ? sysMes : [],
 			hideSysMes: Array.isArray(sysMes) ? !!sysMes?.length : !!sysMes,
 			encrypted,
-			...(retentionPolicy?.enabled && {
-				retentionEnabled: retention?.enabled ?? retentionPolicy.isActive,
-				retentionOverrideGlobal: !!retention?.overrideGlobal,
-				retentionMaxAge: retention?.maxAge ?? retentionPolicy.maxAge,
-				retentionExcludePinned: retention?.excludePinned ?? retentionPolicy.excludePinned,
-				retentionFilesOnly: retention?.filesOnly ?? retentionPolicy.filesOnly,
-			}),
+			...(canEditRoomRetentionPolicy &&
+				retentionPolicy?.enabled && {
+					retentionEnabled: retention?.enabled ?? retentionPolicy.isActive,
+					retentionOverrideGlobal: !!retention?.overrideGlobal,
+					retentionMaxAge: retention?.maxAge ?? retentionPolicy.maxAge,
+					retentionExcludePinned: retention?.excludePinned ?? retentionPolicy.excludePinned,
+					retentionFilesOnly: retention?.filesOnly ?? retentionPolicy.filesOnly,
+				}),
 		}),
 		[
 			announcement,
@@ -46,6 +50,7 @@ export const useEditRoomInitialValues = (room: IRoomWithRetentionPolicy) => {
 			topic,
 			encrypted,
 			reactWhenReadOnly,
+			canEditRoomRetentionPolicy,
 		],
 	);
 };
diff --git a/apps/meteor/tests/e2e/retention-policy.spec.ts b/apps/meteor/tests/e2e/retention-policy.spec.ts
index ba9ec90eff3b..8a808aae579f 100644
--- a/apps/meteor/tests/e2e/retention-policy.spec.ts
+++ b/apps/meteor/tests/e2e/retention-policy.spec.ts
@@ -85,16 +85,31 @@ test.describe.serial('retention-policy', () => {
 			await expect(poHomeChannel.tabs.room.pruneAccordion).toBeVisible();
 		});
 
-		test('should not show prune section in edit channel for users without permission', async ({ browser }) => {
-			const { page } = await createAuxContext(browser, Users.user1);
-			const auxContext = { page, poHomeChannel: new HomeChannel(page) };
-			await auxContext.poHomeChannel.sidenav.openChat(targetChannel);
-			await auxContext.poHomeChannel.tabs.btnRoomInfo.click();
-			await auxContext.poHomeChannel.tabs.room.btnEdit.click();
+		test.describe('edit-room-retention-policy permission', async () => {
+			test('should not show prune section in edit channel for users without permission', async ({ browser }) => {
+				const { page } = await createAuxContext(browser, Users.user1);
+				const auxContext = { page, poHomeChannel: new HomeChannel(page) };
+				await auxContext.poHomeChannel.sidenav.openChat(targetChannel);
+				await auxContext.poHomeChannel.tabs.btnRoomInfo.click();
+				await auxContext.poHomeChannel.tabs.room.btnEdit.click();
+
+				await expect(poHomeChannel.tabs.room.pruneAccordion).not.toBeVisible();
+				await auxContext.page.close();
+			});
 
-			await expect(poHomeChannel.tabs.room.pruneAccordion).not.toBeVisible();
-			await auxContext.page.close();
-		})
+			test('users without permission should be able to edit the channel', async ({ browser }) => {
+				const { page } = await createAuxContext(browser, Users.user1);
+				const auxContext = { page, poHomeChannel: new HomeChannel(page) };
+				await auxContext.poHomeChannel.sidenav.openChat(targetChannel);
+				await auxContext.poHomeChannel.tabs.btnRoomInfo.click();
+				await auxContext.poHomeChannel.tabs.room.btnEdit.click();
+				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 auxContext.page.close();
+			});
+		});
 
 		test.describe('retention policy applies enabled by default', () => {
 			test.beforeAll(async ({ api }) => {

From 904f970154b5a5ae33896cfedd4f588278ae4702 Mon Sep 17 00:00:00 2001
From: "dionisio-bot[bot]"
 <117394943+dionisio-bot[bot]@users.noreply.github.com>
Date: Tue, 18 Jun 2024 16:36:46 +0000
Subject: [PATCH 34/94] fix: Supported Versions misbehaving (#32621)

Co-authored-by: Guilherme Gazzo <5263975+ggazzo@users.noreply.github.com>
---
 .changeset/dry-shoes-tap.md                   |  5 ++++
 .../supportedVersionsChooseLatest.ts          |  2 +-
 .../supportedVersionsToken.ts                 | 26 +++++++++++++++++++
 apps/meteor/jest.config.ts                    |  1 +
 .../plugin/compile-version.js                 | 23 ++++++++++++----
 5 files changed, 51 insertions(+), 6 deletions(-)
 create mode 100644 .changeset/dry-shoes-tap.md

diff --git a/.changeset/dry-shoes-tap.md b/.changeset/dry-shoes-tap.md
new file mode 100644
index 000000000000..f5abf51c0df0
--- /dev/null
+++ b/.changeset/dry-shoes-tap.md
@@ -0,0 +1,5 @@
+---
+"@rocket.chat/meteor": patch
+---
+
+Fixes the supported versions problem, where in most cases the data chosen was the oldest
diff --git a/apps/meteor/app/cloud/server/functions/supportedVersionsToken/supportedVersionsChooseLatest.ts b/apps/meteor/app/cloud/server/functions/supportedVersionsToken/supportedVersionsChooseLatest.ts
index 3493401144cf..32753ba00429 100644
--- a/apps/meteor/app/cloud/server/functions/supportedVersionsToken/supportedVersionsChooseLatest.ts
+++ b/apps/meteor/app/cloud/server/functions/supportedVersionsToken/supportedVersionsChooseLatest.ts
@@ -2,7 +2,7 @@ import type { SignedSupportedVersions } from '@rocket.chat/server-cloud-communic
 
 export const supportedVersionsChooseLatest = async (...tokens: (SignedSupportedVersions | undefined)[]) => {
 	const [token] = (tokens.filter((r) => r?.timestamp != null) as SignedSupportedVersions[]).sort((a, b) => {
-		return new Date(a.timestamp).getTime() - new Date(b.timestamp).getTime();
+		return new Date(b.timestamp).getTime() - new Date(a.timestamp).getTime();
 	});
 
 	return token;
diff --git a/apps/meteor/app/cloud/server/functions/supportedVersionsToken/supportedVersionsToken.ts b/apps/meteor/app/cloud/server/functions/supportedVersionsToken/supportedVersionsToken.ts
index 473acef88c29..a543c0681f38 100644
--- a/apps/meteor/app/cloud/server/functions/supportedVersionsToken/supportedVersionsToken.ts
+++ b/apps/meteor/app/cloud/server/functions/supportedVersionsToken/supportedVersionsToken.ts
@@ -62,6 +62,7 @@ const cacheValueInSettings = <T extends SettingValue>(
 	reset: () => Promise<T>;
 } => {
 	const reset = async () => {
+		SystemLogger.debug(`Resetting cached value ${key} in settings`);
 		const value = await fn();
 
 		await Settings.updateValueById(key, value);
@@ -134,6 +135,31 @@ const getSupportedVersionsToken = async () => {
 		(response.success && response.result) || undefined,
 	);
 
+	SystemLogger.debug({
+		msg: 'Supported versions',
+		supportedVersionsFromBuild: supportedVersionsFromBuild.timestamp,
+		versionsFromLicense: versionsFromLicense?.supportedVersions?.timestamp,
+		response: response.success && response.result?.timestamp,
+	});
+
+	switch (supportedVersions) {
+		case supportedVersionsFromBuild:
+			SystemLogger.info({
+				msg: 'Using supported versions from build',
+			});
+			break;
+		case versionsFromLicense?.supportedVersions:
+			SystemLogger.info({
+				msg: 'Using supported versions from license',
+			});
+			break;
+		case response.success && response.result:
+			SystemLogger.info({
+				msg: 'Using supported versions from cloud',
+			});
+			break;
+	}
+
 	await buildVersionUpdateMessage(supportedVersions?.versions);
 
 	return supportedVersions?.signed;
diff --git a/apps/meteor/jest.config.ts b/apps/meteor/jest.config.ts
index adbd8c26344f..72538cf14d16 100644
--- a/apps/meteor/jest.config.ts
+++ b/apps/meteor/jest.config.ts
@@ -33,6 +33,7 @@ const config: Config = {
 				'<rootDir>/app/livechat/server/business-hour/**/*.spec.ts?(x)',
 				'<rootDir>/app/livechat/server/api/**/*.spec.ts',
 				'<rootDir>/ee/app/authorization/server/validateUserRoles.spec.ts',
+				'<rootDir>/app/cloud/server/functions/supportedVersionsToken/**.spec.ts',
 			],
 			transformIgnorePatterns: ['!/node_modules/jose'],
 			errorOnDeprecated: true,
diff --git a/apps/meteor/packages/rocketchat-version/plugin/compile-version.js b/apps/meteor/packages/rocketchat-version/plugin/compile-version.js
index e737f07663f3..8750c6851202 100644
--- a/apps/meteor/packages/rocketchat-version/plugin/compile-version.js
+++ b/apps/meteor/packages/rocketchat-version/plugin/compile-version.js
@@ -21,10 +21,10 @@ class VersionCompiler {
 				function handleError(err) {
 					console.error(err);
 					// TODO remove this when we are ready to fail
-					// if (process.env.NODE_ENV !== 'development') {
-					// 	reject(err);
-					// 	return;
-					// }
+					if (process.env.NODE_ENV !== 'development') {
+						reject(err);
+						return;
+					}
 					resolve({});
 				}
 
@@ -34,11 +34,24 @@ class VersionCompiler {
 						response.on('data', function (chunk) {
 							data += chunk;
 						});
-						response.on('end', function () {
+						response.on('end', async function () {
 							const supportedVersions = JSON.parse(data);
 							if (!supportedVersions?.signed) {
 								return handleError(new Error(`Invalid supportedVersions result:\n  URL: ${url} \n  RESULT: ${data}`));
 							}
+
+							// check if timestamp is inside 1 hour within build
+							if (Math.abs(new Date().getTime() - new Date(supportedVersions.timestamp).getTime()) > 1000 * 60 * 60) {
+								return handleError(new Error(`Invalid supportedVersions timestamp:\n  URL: ${url} \n  RESULT: ${data}`));
+							}
+
+							for await (const version of supportedVersions.versions) {
+								// check if expiration is after the first rocket.chat release
+								if (new Date(version.expiration) < new Date('2019-04-01T00:00:00.000Z')) {
+									return handleError(new Error(`Invalid supportedVersions expiration:\n  URL: ${url} \n  RESULT: ${data}`));
+								}
+							}
+
 							resolve(supportedVersions);
 						});
 						response.on('error', function (err) {

From f9a125f7517bd224955940ac7af68ec1e250265b Mon Sep 17 00:00:00 2001
From: rocketchat-github-ci <buildmaster@rocket.chat>
Date: Tue, 18 Jun 2024 21:46:12 +0000
Subject: [PATCH 35/94] Release 6.9.2

[no ci]
---
 .changeset/bump-patch-1718743154258.md        |  5 ---
 .changeset/dry-shoes-tap.md                   |  5 ---
 .changeset/nervous-wolves-collect.md          |  5 ---
 apps/meteor/CHANGELOG.md                      | 38 +++++++++++++++++++
 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         | 10 ++---
 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 +-
 69 files changed, 413 insertions(+), 60 deletions(-)
 delete mode 100644 .changeset/bump-patch-1718743154258.md
 delete mode 100644 .changeset/dry-shoes-tap.md
 delete mode 100644 .changeset/nervous-wolves-collect.md

diff --git a/.changeset/bump-patch-1718743154258.md b/.changeset/bump-patch-1718743154258.md
deleted file mode 100644
index e1eaa7980afb..000000000000
--- a/.changeset/bump-patch-1718743154258.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@rocket.chat/meteor': patch
----
-
-Bump @rocket.chat/meteor version.
diff --git a/.changeset/dry-shoes-tap.md b/.changeset/dry-shoes-tap.md
deleted file mode 100644
index f5abf51c0df0..000000000000
--- a/.changeset/dry-shoes-tap.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@rocket.chat/meteor": patch
----
-
-Fixes the supported versions problem, where in most cases the data chosen was the oldest
diff --git a/.changeset/nervous-wolves-collect.md b/.changeset/nervous-wolves-collect.md
deleted file mode 100644
index e32377f54179..000000000000
--- a/.changeset/nervous-wolves-collect.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@rocket.chat/meteor': patch
----
-
-Fixes the issue not allowing users without edit-room-retention-policy permission try to edit the room with the retention policy enabled
diff --git a/apps/meteor/CHANGELOG.md b/apps/meteor/CHANGELOG.md
index 01f03feede53..568551d83efc 100644
--- a/apps/meteor/CHANGELOG.md
+++ b/apps/meteor/CHANGELOG.md
@@ -1,5 +1,43 @@
 # @rocket.chat/meteor
 
+## 6.9.2
+
+### Patch Changes
+
+- Bump @rocket.chat/meteor version.
+
+- Bump @rocket.chat/meteor version.
+
+- ([#32621](https://github.com/RocketChat/Rocket.Chat/pull/32621) by [@dionisio-bot](https://github.com/dionisio-bot)) Fixes the supported versions problem, where in most cases the data chosen was the oldest
+
+- ([#32622](https://github.com/RocketChat/Rocket.Chat/pull/32622) by [@dionisio-bot](https://github.com/dionisio-bot)) Fixes the issue not allowing users without edit-room-retention-policy permission try to edit the room with the retention policy enabled
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.9.2
+  - @rocket.chat/rest-typings@6.9.2
+  - @rocket.chat/api-client@0.1.35
+  - @rocket.chat/license@0.1.17
+  - @rocket.chat/omnichannel-services@0.1.17
+  - @rocket.chat/pdf-worker@0.0.41
+  - @rocket.chat/presence@0.1.17
+  - @rocket.chat/apps@0.0.8
+  - @rocket.chat/core-services@0.3.17
+  - @rocket.chat/cron@0.0.37
+  - @rocket.chat/fuselage-ui-kit@7.0.2
+  - @rocket.chat/gazzodown@7.0.2
+  - @rocket.chat/model-typings@0.4.3
+  - @rocket.chat/ui-contexts@7.0.2
+  - @rocket.chat/server-cloud-communication@0.0.2
+  - @rocket.chat/models@0.0.41
+  - @rocket.chat/ui-theming@0.1.2
+  - @rocket.chat/ui-avatar@3.0.2
+  - @rocket.chat/ui-client@7.0.2
+  - @rocket.chat/ui-video-conf@7.0.2
+  - @rocket.chat/web-ui-registration@7.0.2
+  - @rocket.chat/instance-status@0.0.41
+  </details>
+
 ## 6.9.1
 
 ### Patch Changes
diff --git a/apps/meteor/app/utils/rocketchat.info b/apps/meteor/app/utils/rocketchat.info
index 0d691fdac398..cc8e5187532e 100644
--- a/apps/meteor/app/utils/rocketchat.info
+++ b/apps/meteor/app/utils/rocketchat.info
@@ -1,3 +1,3 @@
 {
-	"version": "6.9.1"
+	"version": "6.9.2"
 }
diff --git a/apps/meteor/ee/server/services/CHANGELOG.md b/apps/meteor/ee/server/services/CHANGELOG.md
index 45f79ddff653..8f290fdfc02f 100644
--- a/apps/meteor/ee/server/services/CHANGELOG.md
+++ b/apps/meteor/ee/server/services/CHANGELOG.md
@@ -1,5 +1,18 @@
 # rocketchat-services
 
+## 1.1.35
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.9.2
+  - @rocket.chat/rest-typings@6.9.2
+  - @rocket.chat/core-services@0.3.17
+  - @rocket.chat/model-typings@0.4.3
+  - @rocket.chat/models@0.0.41
+  </details>
+
 ## 1.1.34
 
 ### Patch Changes
diff --git a/apps/meteor/ee/server/services/package.json b/apps/meteor/ee/server/services/package.json
index d06f186c54d2..ef22c256b16a 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.1.34",
+	"version": "1.1.35",
 	"description": "Rocket.Chat Authorization service",
 	"main": "index.js",
 	"scripts": {
diff --git a/apps/meteor/package.json b/apps/meteor/package.json
index 90fb64ffd9b2..a2e16b1fc2d3 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.9.1",
+	"version": "6.9.2",
 	"private": true,
 	"author": {
 		"name": "Rocket.Chat",
diff --git a/ee/apps/account-service/CHANGELOG.md b/ee/apps/account-service/CHANGELOG.md
index 280a3aa42d85..671adfd9ce11 100644
--- a/ee/apps/account-service/CHANGELOG.md
+++ b/ee/apps/account-service/CHANGELOG.md
@@ -1,5 +1,18 @@
 # @rocket.chat/account-service
 
+## 0.3.16
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.9.2
+  - @rocket.chat/rest-typings@6.9.2
+  - @rocket.chat/core-services@0.3.17
+  - @rocket.chat/model-typings@0.4.3
+  - @rocket.chat/models@0.0.41
+  </details>
+
 ## 0.3.15
 
 ### Patch Changes
diff --git a/ee/apps/account-service/package.json b/ee/apps/account-service/package.json
index 4dfcfddf52f8..5eecfad9c85b 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.3.15",
+	"version": "0.3.16",
 	"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 154195b03b36..c67b683c7de5 100644
--- a/ee/apps/authorization-service/CHANGELOG.md
+++ b/ee/apps/authorization-service/CHANGELOG.md
@@ -1,5 +1,18 @@
 # @rocket.chat/authorization-service
 
+## 0.3.17
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.9.2
+  - @rocket.chat/rest-typings@6.9.2
+  - @rocket.chat/core-services@0.3.17
+  - @rocket.chat/model-typings@0.4.3
+  - @rocket.chat/models@0.0.41
+  </details>
+
 ## 0.3.16
 
 ### Patch Changes
diff --git a/ee/apps/authorization-service/package.json b/ee/apps/authorization-service/package.json
index fce4a93c8095..11dca4b9486a 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.3.16",
+	"version": "0.3.17",
 	"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 9d873f7c8c5d..c1e756872a04 100644
--- a/ee/apps/ddp-streamer/CHANGELOG.md
+++ b/ee/apps/ddp-streamer/CHANGELOG.md
@@ -1,5 +1,20 @@
 # @rocket.chat/ddp-streamer
 
+## 0.2.16
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.9.2
+  - @rocket.chat/rest-typings@6.9.2
+  - @rocket.chat/core-services@0.3.17
+  - @rocket.chat/model-typings@0.4.3
+  - @rocket.chat/ui-contexts@7.0.2
+  - @rocket.chat/models@0.0.41
+  - @rocket.chat/instance-status@0.0.41
+  </details>
+
 ## 0.2.15
 
 ### Patch Changes
diff --git a/ee/apps/ddp-streamer/package.json b/ee/apps/ddp-streamer/package.json
index 65f1c4c8771c..16e720c32f1a 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.2.15",
+	"version": "0.2.16",
 	"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 134f9f227233..2cc91503c175 100644
--- a/ee/apps/omnichannel-transcript/CHANGELOG.md
+++ b/ee/apps/omnichannel-transcript/CHANGELOG.md
@@ -1,5 +1,19 @@
 # @rocket.chat/omnichannel-transcript
 
+## 0.3.17
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.9.2
+  - @rocket.chat/omnichannel-services@0.1.17
+  - @rocket.chat/pdf-worker@0.0.41
+  - @rocket.chat/core-services@0.3.17
+  - @rocket.chat/model-typings@0.4.3
+  - @rocket.chat/models@0.0.41
+  </details>
+
 ## 0.3.16
 
 ### Patch Changes
diff --git a/ee/apps/omnichannel-transcript/package.json b/ee/apps/omnichannel-transcript/package.json
index ed1e72a2f255..1125b97465c8 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.3.16",
+	"version": "0.3.17",
 	"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 f7a1137542f3..7e91a67a33c9 100644
--- a/ee/apps/presence-service/CHANGELOG.md
+++ b/ee/apps/presence-service/CHANGELOG.md
@@ -1,5 +1,18 @@
 # @rocket.chat/presence-service
 
+## 0.3.17
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.9.2
+  - @rocket.chat/presence@0.1.17
+  - @rocket.chat/core-services@0.3.17
+  - @rocket.chat/model-typings@0.4.3
+  - @rocket.chat/models@0.0.41
+  </details>
+
 ## 0.3.16
 
 ### Patch Changes
diff --git a/ee/apps/presence-service/package.json b/ee/apps/presence-service/package.json
index 6bb46c544f57..3cfc4e1f774b 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.3.16",
+	"version": "0.3.17",
 	"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 d277d3c9b4cb..68e08fc6f24d 100644
--- a/ee/apps/queue-worker/CHANGELOG.md
+++ b/ee/apps/queue-worker/CHANGELOG.md
@@ -1,5 +1,18 @@
 # @rocket.chat/queue-worker
 
+## 0.3.17
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.9.2
+  - @rocket.chat/omnichannel-services@0.1.17
+  - @rocket.chat/core-services@0.3.17
+  - @rocket.chat/model-typings@0.4.3
+  - @rocket.chat/models@0.0.41
+  </details>
+
 ## 0.3.16
 
 ### Patch Changes
diff --git a/ee/apps/queue-worker/package.json b/ee/apps/queue-worker/package.json
index 8359965f43f8..5078bc7688a2 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.3.16",
+	"version": "0.3.17",
 	"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 bde0be97af7f..c99d7fe17a90 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.3.17
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.9.2
+  - @rocket.chat/core-services@0.3.17
+  - @rocket.chat/model-typings@0.4.3
+  - @rocket.chat/models@0.0.41
+  </details>
+
 ## 0.3.16
 
 ### Patch Changes
diff --git a/ee/apps/stream-hub-service/package.json b/ee/apps/stream-hub-service/package.json
index 920f0ed1a18e..c0d5d4c3a0c5 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.3.16",
+	"version": "0.3.17",
 	"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 2d8287498da8..9aedd3e31b8e 100644
--- a/ee/packages/api-client/CHANGELOG.md
+++ b/ee/packages/api-client/CHANGELOG.md
@@ -1,5 +1,15 @@
 # @rocket.chat/api-client
 
+## 0.1.35
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.9.2
+  - @rocket.chat/rest-typings@6.9.2
+  </details>
+
 ## 0.1.34
 
 ### Patch Changes
diff --git a/ee/packages/api-client/package.json b/ee/packages/api-client/package.json
index a31a69aed784..bf8b4a265633 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.1.34",
+	"version": "0.1.35",
 	"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 38c87b8b935b..8be607b752a7 100644
--- a/ee/packages/ddp-client/CHANGELOG.md
+++ b/ee/packages/ddp-client/CHANGELOG.md
@@ -1,5 +1,15 @@
 # @rocket.chat/ddp-client
 
+## 0.2.26
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/rest-typings@6.9.2
+  - @rocket.chat/api-client@0.1.35
+  </details>
+
 ## 0.2.25
 
 ### Patch Changes
diff --git a/ee/packages/ddp-client/package.json b/ee/packages/ddp-client/package.json
index 53a4e54e45bc..eeea113b6d09 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.2.25",
+	"version": "0.2.26",
 	"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 62511825e26d..36256098a621 100644
--- a/ee/packages/license/CHANGELOG.md
+++ b/ee/packages/license/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @rocket.chat/license
 
+## 0.1.17
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.9.2
+  </details>
+
 ## 0.1.16
 
 ### Patch Changes
diff --git a/ee/packages/license/package.json b/ee/packages/license/package.json
index d2e88d8baaf7..110cc52e665c 100644
--- a/ee/packages/license/package.json
+++ b/ee/packages/license/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/license",
-	"version": "0.1.16",
+	"version": "0.1.17",
 	"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 1e632412860d..53cc775f3078 100644
--- a/ee/packages/omnichannel-services/CHANGELOG.md
+++ b/ee/packages/omnichannel-services/CHANGELOG.md
@@ -1,5 +1,19 @@
 # @rocket.chat/omnichannel-services
 
+## 0.1.17
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.9.2
+  - @rocket.chat/rest-typings@6.9.2
+  - @rocket.chat/pdf-worker@0.0.41
+  - @rocket.chat/core-services@0.3.17
+  - @rocket.chat/model-typings@0.4.3
+  - @rocket.chat/models@0.0.41
+  </details>
+
 ## 0.1.16
 
 ### Patch Changes
diff --git a/ee/packages/omnichannel-services/package.json b/ee/packages/omnichannel-services/package.json
index 55abce301be6..f3742ae8cf28 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.1.16",
+	"version": "0.1.17",
 	"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 6a48406ea25a..cc698cfe6eda 100644
--- a/ee/packages/pdf-worker/CHANGELOG.md
+++ b/ee/packages/pdf-worker/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @rocket.chat/pdf-worker
 
+## 0.0.41
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.9.2
+  </details>
+
 ## 0.0.40
 
 ### Patch Changes
diff --git a/ee/packages/pdf-worker/package.json b/ee/packages/pdf-worker/package.json
index fdb192d4ada8..6333076d7d92 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.0.40",
+	"version": "0.0.41",
 	"private": true,
 	"devDependencies": {
 		"@storybook/addon-essentials": "~6.5.16",
diff --git a/ee/packages/presence/CHANGELOG.md b/ee/packages/presence/CHANGELOG.md
index d3579b6166aa..2b95edf08955 100644
--- a/ee/packages/presence/CHANGELOG.md
+++ b/ee/packages/presence/CHANGELOG.md
@@ -1,5 +1,16 @@
 # @rocket.chat/presence
 
+## 0.1.17
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.9.2
+  - @rocket.chat/core-services@0.3.17
+  - @rocket.chat/models@0.0.41
+  </details>
+
 ## 0.1.16
 
 ### Patch Changes
diff --git a/ee/packages/presence/package.json b/ee/packages/presence/package.json
index 2367b5968e0f..2d2c0e0812e8 100644
--- a/ee/packages/presence/package.json
+++ b/ee/packages/presence/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/presence",
-	"version": "0.1.16",
+	"version": "0.1.17",
 	"private": true,
 	"devDependencies": {
 		"@babel/core": "~7.22.20",
diff --git a/package.json b/package.json
index c4e0e5f88083..58b95aae2f5e 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "rocket.chat",
-	"version": "6.9.1",
+	"version": "6.9.2",
 	"description": "Rocket.Chat Monorepo",
 	"main": "index.js",
 	"private": true,
diff --git a/packages/apps/CHANGELOG.md b/packages/apps/CHANGELOG.md
index 2d1d944b1ad2..d02ee61e3287 100644
--- a/packages/apps/CHANGELOG.md
+++ b/packages/apps/CHANGELOG.md
@@ -1,5 +1,15 @@
 # @rocket.chat/apps
 
+## 0.0.8
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.9.2
+  - @rocket.chat/model-typings@0.4.3
+  </details>
+
 ## 0.0.7
 
 ### Patch Changes
diff --git a/packages/apps/package.json b/packages/apps/package.json
index 23103ffe2a28..9e0e3fd50370 100644
--- a/packages/apps/package.json
+++ b/packages/apps/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/apps",
-	"version": "0.0.7",
+	"version": "0.0.8",
 	"private": true,
 	"devDependencies": {
 		"@types/jest": "~29.5.7",
diff --git a/packages/core-services/CHANGELOG.md b/packages/core-services/CHANGELOG.md
index 929bc8b3147c..0f4cbd1a25ee 100644
--- a/packages/core-services/CHANGELOG.md
+++ b/packages/core-services/CHANGELOG.md
@@ -1,5 +1,16 @@
 # @rocket.chat/core-services
 
+## 0.3.17
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.9.2
+  - @rocket.chat/rest-typings@6.9.2
+  - @rocket.chat/models@0.0.41
+  </details>
+
 ## 0.3.16
 
 ### Patch Changes
diff --git a/packages/core-services/package.json b/packages/core-services/package.json
index 0d7dd248fa7e..dbe14d65b44e 100644
--- a/packages/core-services/package.json
+++ b/packages/core-services/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/core-services",
-	"version": "0.3.16",
+	"version": "0.3.17",
 	"private": true,
 	"devDependencies": {
 		"@babel/core": "~7.22.20",
diff --git a/packages/core-typings/CHANGELOG.md b/packages/core-typings/CHANGELOG.md
index fed7f005f13f..d84b2e22394c 100644
--- a/packages/core-typings/CHANGELOG.md
+++ b/packages/core-typings/CHANGELOG.md
@@ -1,5 +1,7 @@
 # @rocket.chat/core-typings
 
+## 6.9.2
+
 ## 6.9.1
 
 ## 6.9.0
diff --git a/packages/core-typings/package.json b/packages/core-typings/package.json
index 0760888ba467..0cde77f14653 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.9.1",
+	"version": "6.9.2",
 	"devDependencies": {
 		"@rocket.chat/eslint-config": "workspace:^",
 		"eslint": "~8.45.0",
diff --git a/packages/cron/CHANGELOG.md b/packages/cron/CHANGELOG.md
index 472bc38c0b03..8c4de9eeb866 100644
--- a/packages/cron/CHANGELOG.md
+++ b/packages/cron/CHANGELOG.md
@@ -1,5 +1,15 @@
 # @rocket.chat/cron
 
+## 0.0.37
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.9.2
+  - @rocket.chat/models@0.0.41
+  </details>
+
 ## 0.0.36
 
 ### Patch Changes
diff --git a/packages/cron/package.json b/packages/cron/package.json
index 4d6d7c999fd3..196e5e0aff88 100644
--- a/packages/cron/package.json
+++ b/packages/cron/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/cron",
-	"version": "0.0.36",
+	"version": "0.0.37",
 	"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 21714d28c544..703f201c2e6d 100644
--- a/packages/fuselage-ui-kit/CHANGELOG.md
+++ b/packages/fuselage-ui-kit/CHANGELOG.md
@@ -1,5 +1,18 @@
 # Change Log
 
+## 7.0.2
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.9.2
+  - @rocket.chat/gazzodown@7.0.2
+  - @rocket.chat/ui-contexts@7.0.2
+  - @rocket.chat/ui-avatar@3.0.2
+  - @rocket.chat/ui-video-conf@7.0.2
+  </details>
+
 ## 7.0.1
 
 ### Patch Changes
diff --git a/packages/fuselage-ui-kit/package.json b/packages/fuselage-ui-kit/package.json
index 87fd209fc567..95ca5fb02e9d 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": "7.0.1",
+  "version": "7.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": "3.0.1",
-    "@rocket.chat/ui-contexts": "7.0.1",
+    "@rocket.chat/ui-avatar": "3.0.2",
+    "@rocket.chat/ui-contexts": "7.0.2",
     "@rocket.chat/ui-kit": "0.34.0",
-    "@rocket.chat/ui-video-conf": "7.0.1",
+    "@rocket.chat/ui-video-conf": "7.0.2",
     "@tanstack/react-query": "*",
     "react": "*",
     "react-dom": "*"
@@ -110,7 +110,7 @@
     "typescript": "~5.3.3"
   },
   "dependencies": {
-    "@rocket.chat/core-typings": "6.9.1",
+    "@rocket.chat/core-typings": "6.9.2",
     "@rocket.chat/gazzodown": "workspace:^",
     "@rocket.chat/ui-kit": "workspace:~",
     "tslib": "^2.5.3"
diff --git a/packages/gazzodown/CHANGELOG.md b/packages/gazzodown/CHANGELOG.md
index bba54175bf43..e2e1d386e084 100644
--- a/packages/gazzodown/CHANGELOG.md
+++ b/packages/gazzodown/CHANGELOG.md
@@ -1,5 +1,16 @@
 # @rocket.chat/gazzodown
 
+## 7.0.2
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.9.2
+  - @rocket.chat/ui-contexts@7.0.2
+  - @rocket.chat/ui-client@7.0.2
+  </details>
+
 ## 7.0.1
 
 ### Patch Changes
diff --git a/packages/gazzodown/package.json b/packages/gazzodown/package.json
index 023fa4975075..f7e9a0285e15 100644
--- a/packages/gazzodown/package.json
+++ b/packages/gazzodown/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/gazzodown",
-	"version": "7.0.1",
+	"version": "7.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": "7.0.1",
-		"@rocket.chat/ui-contexts": "7.0.1",
+		"@rocket.chat/ui-client": "7.0.2",
+		"@rocket.chat/ui-contexts": "7.0.2",
 		"katex": "*",
 		"react": "*"
 	},
diff --git a/packages/instance-status/CHANGELOG.md b/packages/instance-status/CHANGELOG.md
index 6b7d85d501e2..b8573dd5266f 100644
--- a/packages/instance-status/CHANGELOG.md
+++ b/packages/instance-status/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @rocket.chat/instance-status
 
+## 0.0.41
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/models@0.0.41
+  </details>
+
 ## 0.0.40
 
 ### Patch Changes
diff --git a/packages/instance-status/package.json b/packages/instance-status/package.json
index d5a199a1b10c..4b6aa0e2ae69 100644
--- a/packages/instance-status/package.json
+++ b/packages/instance-status/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/instance-status",
-	"version": "0.0.40",
+	"version": "0.0.41",
 	"private": true,
 	"devDependencies": {
 		"@rocket.chat/eslint-config": "workspace:^",
diff --git a/packages/livechat/CHANGELOG.md b/packages/livechat/CHANGELOG.md
index f7d7ed0299a9..3197453ab223 100644
--- a/packages/livechat/CHANGELOG.md
+++ b/packages/livechat/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @rocket.chat/livechat Change Log
 
+## 1.17.2
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/gazzodown@7.0.2
+  </details>
+
 ## 1.17.1
 
 ### Patch Changes
diff --git a/packages/livechat/package.json b/packages/livechat/package.json
index 123248dc3c17..5e81124af9e5 100644
--- a/packages/livechat/package.json
+++ b/packages/livechat/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/livechat",
-	"version": "1.17.1",
+	"version": "1.17.2",
 	"files": [
 		"/build"
 	],
diff --git a/packages/model-typings/CHANGELOG.md b/packages/model-typings/CHANGELOG.md
index 7c6fe4aebaa7..9747271d17c2 100644
--- a/packages/model-typings/CHANGELOG.md
+++ b/packages/model-typings/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @rocket.chat/model-typings
 
+## 0.4.3
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.9.2
+  </details>
+
 ## 0.4.2
 
 ### Patch Changes
diff --git a/packages/model-typings/package.json b/packages/model-typings/package.json
index fdacc8878eff..79a30873f55b 100644
--- a/packages/model-typings/package.json
+++ b/packages/model-typings/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/model-typings",
-	"version": "0.4.2",
+	"version": "0.4.3",
 	"private": true,
 	"devDependencies": {
 		"@types/jest": "~29.5.7",
diff --git a/packages/models/CHANGELOG.md b/packages/models/CHANGELOG.md
index c572246539df..2c2b98e4782b 100644
--- a/packages/models/CHANGELOG.md
+++ b/packages/models/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @rocket.chat/models
 
+## 0.0.41
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/model-typings@0.4.3
+  </details>
+
 ## 0.0.40
 
 ### Patch Changes
diff --git a/packages/models/package.json b/packages/models/package.json
index 5d2eae9a49bc..8478daa44a15 100644
--- a/packages/models/package.json
+++ b/packages/models/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/models",
-	"version": "0.0.40",
+	"version": "0.0.41",
 	"private": true,
 	"devDependencies": {
 		"@swc/core": "^1.3.95",
diff --git a/packages/rest-typings/CHANGELOG.md b/packages/rest-typings/CHANGELOG.md
index 87ea17ff0985..341eaba24b2e 100644
--- a/packages/rest-typings/CHANGELOG.md
+++ b/packages/rest-typings/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @rocket.chat/rest-typings
 
+## 6.9.2
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.9.2
+  </details>
+
 ## 6.9.1
 
 ### Patch Changes
diff --git a/packages/rest-typings/package.json b/packages/rest-typings/package.json
index 864b4264b383..e1aea379a724 100644
--- a/packages/rest-typings/package.json
+++ b/packages/rest-typings/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/rest-typings",
-	"version": "6.9.1",
+	"version": "6.9.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 9617d88d5efa..120c996ee337 100644
--- a/packages/ui-avatar/CHANGELOG.md
+++ b/packages/ui-avatar/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @rocket.chat/ui-avatar
 
+## 3.0.2
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/ui-contexts@7.0.2
+  </details>
+
 ## 3.0.1
 
 ### Patch Changes
diff --git a/packages/ui-avatar/package.json b/packages/ui-avatar/package.json
index bb0c167de8d9..dceb7d4b4d19 100644
--- a/packages/ui-avatar/package.json
+++ b/packages/ui-avatar/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/ui-avatar",
-	"version": "3.0.1",
+	"version": "3.0.2",
 	"private": true,
 	"devDependencies": {
 		"@babel/core": "~7.22.20",
@@ -31,7 +31,7 @@
 	],
 	"peerDependencies": {
 		"@rocket.chat/fuselage": "*",
-		"@rocket.chat/ui-contexts": "7.0.1",
+		"@rocket.chat/ui-contexts": "7.0.2",
 		"react": "~17.0.2"
 	},
 	"volta": {
diff --git a/packages/ui-client/CHANGELOG.md b/packages/ui-client/CHANGELOG.md
index 147cbf298895..b368d3282f18 100644
--- a/packages/ui-client/CHANGELOG.md
+++ b/packages/ui-client/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @rocket.chat/ui-client
 
+## 7.0.2
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/ui-contexts@7.0.2
+  </details>
+
 ## 7.0.1
 
 ### Patch Changes
diff --git a/packages/ui-client/package.json b/packages/ui-client/package.json
index 3c43d85aa0ef..a611a191d7cd 100644
--- a/packages/ui-client/package.json
+++ b/packages/ui-client/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/ui-client",
-	"version": "7.0.1",
+	"version": "7.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": "7.0.1",
+		"@rocket.chat/ui-contexts": "7.0.2",
 		"react": "~17.0.2"
 	},
 	"volta": {
diff --git a/packages/ui-contexts/CHANGELOG.md b/packages/ui-contexts/CHANGELOG.md
index 5d3fb186fb4d..be571cce3c21 100644
--- a/packages/ui-contexts/CHANGELOG.md
+++ b/packages/ui-contexts/CHANGELOG.md
@@ -1,5 +1,16 @@
 # @rocket.chat/ui-contexts
 
+## 7.0.2
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@6.9.2
+  - @rocket.chat/rest-typings@6.9.2
+  - @rocket.chat/ddp-client@0.2.26
+  </details>
+
 ## 7.0.1
 
 ### Patch Changes
diff --git a/packages/ui-contexts/package.json b/packages/ui-contexts/package.json
index 96d5d4bdf335..5e4f7ba63440 100644
--- a/packages/ui-contexts/package.json
+++ b/packages/ui-contexts/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/ui-contexts",
-	"version": "7.0.1",
+	"version": "7.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 b56b9e522d6d..a524dc81e307 100644
--- a/packages/ui-video-conf/CHANGELOG.md
+++ b/packages/ui-video-conf/CHANGELOG.md
@@ -1,5 +1,15 @@
 # @rocket.chat/ui-video-conf
 
+## 7.0.2
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/ui-contexts@7.0.2
+  - @rocket.chat/ui-avatar@3.0.2
+  </details>
+
 ## 7.0.1
 
 ### Patch Changes
diff --git a/packages/ui-video-conf/package.json b/packages/ui-video-conf/package.json
index 5398fe901457..41532ca53714 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": "7.0.1",
+	"version": "7.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": "3.0.1",
-		"@rocket.chat/ui-contexts": "7.0.1",
+		"@rocket.chat/ui-avatar": "3.0.2",
+		"@rocket.chat/ui-contexts": "7.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 914f4a8c5941..5242d3ad96a9 100644
--- a/packages/uikit-playground/CHANGELOG.md
+++ b/packages/uikit-playground/CHANGELOG.md
@@ -1,5 +1,16 @@
 # @rocket.chat/uikit-playground
 
+## 0.2.25
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/fuselage-ui-kit@7.0.2
+  - @rocket.chat/ui-contexts@7.0.2
+  - @rocket.chat/ui-avatar@3.0.2
+  </details>
+
 ## 0.2.24
 
 ### Patch Changes
diff --git a/packages/uikit-playground/package.json b/packages/uikit-playground/package.json
index 3a63ac38a3ec..a37f6bbd3d1d 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.2.24",
+  "version": "0.2.25",
   "type": "module",
   "scripts": {
     "dev": "vite",
diff --git a/packages/web-ui-registration/CHANGELOG.md b/packages/web-ui-registration/CHANGELOG.md
index 955775cb3873..79c08ded7098 100644
--- a/packages/web-ui-registration/CHANGELOG.md
+++ b/packages/web-ui-registration/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @rocket.chat/web-ui-registration
 
+## 7.0.2
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/ui-contexts@7.0.2
+  </details>
+
 ## 7.0.1
 
 ### Patch Changes
diff --git a/packages/web-ui-registration/package.json b/packages/web-ui-registration/package.json
index 837e150bbb0f..95ee383c3c21 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": "7.0.1",
+	"version": "7.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.1",
-		"@rocket.chat/ui-contexts": "7.0.1",
+		"@rocket.chat/ui-contexts": "7.0.2",
 		"@tanstack/react-query": "*",
 		"react": "*",
 		"react-hook-form": "*",

From 02dd87574bc0939fb38a428c1fb623c3b752d6ca Mon Sep 17 00:00:00 2001
From: Matheus Barbosa Silva
 <36537004+matheusbsilva137@users.noreply.github.com>
Date: Wed, 19 Jun 2024 08:13:21 -0300
Subject: [PATCH 36/94] feat: Use `application/octet-stream` as a fallback
 media type to avoid "Unknown media type" errors (#32471)

---
 .changeset/breezy-pens-sing.md                |  6 +++
 .../app/api/server/lib/getUploadFormData.ts   |  6 ++-
 apps/meteor/app/utils/lib/mimeTypes.ts        |  7 ++-
 .../body/hooks/useFileUploadDropTarget.ts     |  7 ++-
 .../hooks/useFileUploadAction.ts              |  6 +--
 apps/meteor/server/settings/file-upload.ts    |  1 +
 apps/meteor/tests/data/interactions.ts        |  1 +
 apps/meteor/tests/e2e/file-upload.spec.ts     | 21 +++++++++
 .../tests/e2e/fixtures/files/diagram.drawio   | 13 +++++
 apps/meteor/tests/end-to-end/api/09-rooms.js  | 47 ++++++++++++++++---
 packages/i18n/src/locales/en.i18n.json        |  1 +
 11 files changed, 100 insertions(+), 16 deletions(-)
 create mode 100644 .changeset/breezy-pens-sing.md
 create mode 100644 apps/meteor/tests/e2e/fixtures/files/diagram.drawio

diff --git a/.changeset/breezy-pens-sing.md b/.changeset/breezy-pens-sing.md
new file mode 100644
index 000000000000..0725999ef62b
--- /dev/null
+++ b/.changeset/breezy-pens-sing.md
@@ -0,0 +1,6 @@
+---
+"@rocket.chat/meteor": minor
+"@rocket.chat/i18n": minor
+---
+
+Removed "Unknown media type" errors on the client side by using `application/octet-stream` as a fallback media type (MIME type) for all files
diff --git a/apps/meteor/app/api/server/lib/getUploadFormData.ts b/apps/meteor/app/api/server/lib/getUploadFormData.ts
index 9b8f69fb3a66..85fc0658542d 100644
--- a/apps/meteor/app/api/server/lib/getUploadFormData.ts
+++ b/apps/meteor/app/api/server/lib/getUploadFormData.ts
@@ -5,6 +5,8 @@ import type { ValidateFunction } from 'ajv';
 import busboy from 'busboy';
 import type { Request } from 'express';
 
+import { getMimeType } from '../../../utils/lib/mimeTypes';
+
 type UploadResult<K> = {
 	file: Readable & { truncated: boolean };
 	fieldname: string;
@@ -61,7 +63,7 @@ export async function getUploadFormData<
 	function onFile(
 		fieldname: string,
 		file: Readable & { truncated: boolean },
-		{ filename, encoding, mimeType: mimetype }: { filename: string; encoding: string; mimeType: string },
+		{ filename, encoding }: { filename: string; encoding: string },
 	) {
 		if (options.field && fieldname !== options.field) {
 			file.resume();
@@ -83,7 +85,7 @@ export async function getUploadFormData<
 				file,
 				filename,
 				encoding,
-				mimetype,
+				mimetype: getMimeType(filename),
 				fieldname,
 				fields,
 				fileBuffer: Buffer.concat(fileChunks),
diff --git a/apps/meteor/app/utils/lib/mimeTypes.ts b/apps/meteor/app/utils/lib/mimeTypes.ts
index f2da185f84ba..909a955d6724 100644
--- a/apps/meteor/app/utils/lib/mimeTypes.ts
+++ b/apps/meteor/app/utils/lib/mimeTypes.ts
@@ -12,4 +12,9 @@ const getExtension = (param: string): string => {
 	return !extension || typeof extension === 'boolean' ? '' : extension;
 };
 
-export { mime, getExtension };
+const getMimeType = (fileName: string): string => {
+	const fileMimeType = mime.lookup(fileName);
+	return typeof fileMimeType === 'string' ? fileMimeType : 'application/octet-stream';
+};
+
+export { mime, getExtension, getMimeType };
diff --git a/apps/meteor/client/views/room/body/hooks/useFileUploadDropTarget.ts b/apps/meteor/client/views/room/body/hooks/useFileUploadDropTarget.ts
index 2427f7217401..414b91c52493 100644
--- a/apps/meteor/client/views/room/body/hooks/useFileUploadDropTarget.ts
+++ b/apps/meteor/client/views/room/body/hooks/useFileUploadDropTarget.ts
@@ -29,7 +29,7 @@ export const useFileUploadDropTarget = (): readonly [
 
 	const t = useTranslation();
 
-	const fileUploadEnabled = useSetting('FileUpload_Enabled') as boolean;
+	const fileUploadEnabled = useSetting<boolean>('FileUpload_Enabled');
 	const user = useUser();
 	const fileUploadAllowedForUser = useReactiveValue(
 		useCallback(() => !roomCoordinator.readOnly(room._id, { username: user?.username }), [room._id, user?.username]),
@@ -38,8 +38,7 @@ export const useFileUploadDropTarget = (): readonly [
 	const chat = useChat();
 
 	const onFileDrop = useMutableCallback(async (files: File[]) => {
-		const { mime } = await import('../../../../../app/utils/lib/mimeTypes');
-
+		const { getMimeType } = await import('../../../../../app/utils/lib/mimeTypes');
 		const getUniqueFiles = () => {
 			const uniqueFiles: File[] = [];
 			const st: Set<number> = new Set();
@@ -55,7 +54,7 @@ export const useFileUploadDropTarget = (): readonly [
 		const uniqueFiles = getUniqueFiles();
 
 		const uploads = Array.from(uniqueFiles).map((file) => {
-			Object.defineProperty(file, 'type', { value: mime.lookup(file.name) });
+			Object.defineProperty(file, 'type', { value: getMimeType(file.name) });
 			return file;
 		});
 
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 aba008a353a5..03229c5dceb3 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
@@ -9,7 +9,7 @@ const fileInputProps = { type: 'file', multiple: true };
 
 export const useFileUploadAction = (disabled: boolean): GenericMenuItemProps => {
 	const t = useTranslation();
-	const fileUploadEnabled = useSetting('FileUpload_Enabled');
+	const fileUploadEnabled = useSetting<boolean>('FileUpload_Enabled');
 	const fileInputRef = useFileInput(fileInputProps);
 	const chat = useChat();
 
@@ -23,10 +23,10 @@ export const useFileUploadAction = (disabled: boolean): GenericMenuItemProps =>
 		};
 
 		const handleUploadChange = async () => {
-			const { mime } = await import('../../../../../../../app/utils/lib/mimeTypes');
+			const { getMimeType } = await import('../../../../../../../app/utils/lib/mimeTypes');
 			const filesToUpload = Array.from(fileInputRef?.current?.files ?? []).map((file) => {
 				Object.defineProperty(file, 'type', {
-					value: mime.lookup(file.name),
+					value: getMimeType(file.name),
 				});
 				return file;
 			});
diff --git a/apps/meteor/server/settings/file-upload.ts b/apps/meteor/server/settings/file-upload.ts
index 505520b73e57..90032266651c 100644
--- a/apps/meteor/server/settings/file-upload.ts
+++ b/apps/meteor/server/settings/file-upload.ts
@@ -23,6 +23,7 @@ export const createFileUploadSettings = () =>
 			type: 'string',
 			public: true,
 			i18nDescription: 'FileUpload_MediaTypeBlackListDescription',
+			alert: 'FileUpload_MediaTypeBlackList_Alert',
 		});
 
 		await this.add('FileUpload_ProtectFiles', true, {
diff --git a/apps/meteor/tests/data/interactions.ts b/apps/meteor/tests/data/interactions.ts
index d14749181193..085d97d4ece3 100644
--- a/apps/meteor/tests/data/interactions.ts
+++ b/apps/meteor/tests/data/interactions.ts
@@ -1,5 +1,6 @@
 export const targetUser = 'rocket.cat';
 export const imgURL = './public/images/logo/1024x1024.png';
 export const lstURL = './tests/e2e/fixtures/files/lst-test.lst';
+export const drawioURL = './tests/e2e/fixtures/files/diagram.drawio';
 export const svgLogoURL = './public/images/logo/logo.svg';
 export const svgLogoFileName = 'logo.svg';
diff --git a/apps/meteor/tests/e2e/file-upload.spec.ts b/apps/meteor/tests/e2e/file-upload.spec.ts
index b382476c0a2f..0a5d1cfd2512 100644
--- a/apps/meteor/tests/e2e/file-upload.spec.ts
+++ b/apps/meteor/tests/e2e/file-upload.spec.ts
@@ -1,6 +1,7 @@
 import { Users } from './fixtures/userStates';
 import { HomeChannel } from './page-objects';
 import { createTargetChannel } from './utils';
+import { setSettingValueById } from './utils/setSettingValueById';
 import { expect, test } from './utils/test';
 
 test.use({ storageState: Users.user1.state });
@@ -10,6 +11,7 @@ test.describe.serial('file-upload', () => {
 	let targetChannel: string;
 
 	test.beforeAll(async ({ api }) => {
+		await setSettingValueById(api, 'FileUpload_MediaTypeBlackList', 'image/svg+xml');
 		targetChannel = await createTargetChannel(api);
 	});
 
@@ -21,6 +23,7 @@ test.describe.serial('file-upload', () => {
 	});
 
 	test.afterAll(async ({ api }) => {
+		await setSettingValueById(api, 'FileUpload_MediaTypeBlackList', 'image/svg+xml');
 		expect((await api.post('/channels.delete', { roomName: targetChannel })).status()).toBe(200);
 	});
 
@@ -54,4 +57,22 @@ test.describe.serial('file-upload', () => {
 		await expect(poHomeChannel.content.getFileDescription).toHaveText('lst_description');
 		await expect(poHomeChannel.content.lastMessageFileName).toContainText('lst-test.lst');
 	});
+
+	test('expect send drawio (unknown media type) file succesfully', async ({ page }) => {
+		await page.reload();
+		await poHomeChannel.content.sendFileMessage('diagram.drawio');
+		await poHomeChannel.content.descriptionInput.fill('drawio_description');
+		await poHomeChannel.content.btnModalConfirm.click();
+
+		await expect(poHomeChannel.content.getFileDescription).toHaveText('drawio_description');
+		await expect(poHomeChannel.content.lastMessageFileName).toContainText('diagram.drawio');
+	});
+
+	test('expect not to send drawio file (unknown media type) when the default media type is blocked', async ({ api, page }) => {
+		await setSettingValueById(api, 'FileUpload_MediaTypeBlackList', 'application/octet-stream');
+
+		await page.reload();
+		await poHomeChannel.content.sendFileMessage('diagram.drawio');
+		await expect(poHomeChannel.content.btnModalConfirm).not.toBeVisible();
+	});
 });
diff --git a/apps/meteor/tests/e2e/fixtures/files/diagram.drawio b/apps/meteor/tests/e2e/fixtures/files/diagram.drawio
new file mode 100644
index 000000000000..a86c2673ab98
--- /dev/null
+++ b/apps/meteor/tests/e2e/fixtures/files/diagram.drawio
@@ -0,0 +1,13 @@
+<mxfile host="app.diagrams.net" modified="2024-05-21T16:10:09.295Z" agent="Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/124.0.0.0 Safari/537.36" etag="ZxZRCTHi-kxhlzk7b9_Z" version="24.4.4" type="device">
+  <diagram name="Página-1" id="9eBILa8281JaQ4yUkDbp">
+    <mxGraphModel dx="1434" dy="786" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="827" pageHeight="1169" math="0" shadow="0">
+      <root>
+        <mxCell id="0" />
+        <mxCell id="1" parent="0" />
+        <mxCell id="dopCU4gkJe7Sfp6IDYO1-1" value="&lt;b&gt;&lt;font style=&quot;font-size: 30px;&quot;&gt;Rocket.Chat&lt;/font&gt;&lt;/b&gt;" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;" vertex="1" parent="1">
+          <mxGeometry x="314" y="350" width="200" height="50" as="geometry" />
+        </mxCell>
+      </root>
+    </mxGraphModel>
+  </diagram>
+</mxfile>
diff --git a/apps/meteor/tests/end-to-end/api/09-rooms.js b/apps/meteor/tests/end-to-end/api/09-rooms.js
index 72bd5819593e..0809d06b324d 100644
--- a/apps/meteor/tests/end-to-end/api/09-rooms.js
+++ b/apps/meteor/tests/end-to-end/api/09-rooms.js
@@ -7,7 +7,7 @@ import { after, afterEach, before, beforeEach, describe, it } from 'mocha';
 import { sleep } from '../../../lib/utils/sleep';
 import { getCredentials, api, request, credentials } from '../../data/api-data.js';
 import { sendSimpleMessage, deleteMessage } from '../../data/chat.helper';
-import { imgURL, lstURL, svgLogoFileName, svgLogoURL } from '../../data/interactions';
+import { drawioURL, imgURL, lstURL, svgLogoFileName, svgLogoURL } from '../../data/interactions';
 import { getSettingValueById, updateEEPermission, updatePermission, updateSetting } from '../../data/permissions.helper';
 import { createRoom, deleteRoom } from '../../data/rooms.helper';
 import { deleteTeam } from '../../data/teams.helper';
@@ -183,8 +183,8 @@ describe('[Rooms]', function () {
 				});
 		});
 
-		it('should upload a LST file to room', (done) => {
-			request
+		it('should upload a LST file to room', () => {
+			return request
 				.post(api(`rooms.upload/${testChannel._id}`))
 				.set(credentials)
 				.attach('file', lstURL)
@@ -200,12 +200,33 @@ describe('[Rooms]', function () {
 					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('name', 'lst-test.lst');
-				})
-				.end(done);
+					expect(res.body.message.files[0]).to.have.property('type', 'text/plain');
+				});
+		});
+
+		it('should upload a DRAWIO file (unknown media type) to room', () => {
+			return request
+				.post(api(`rooms.upload/${testChannel._id}`))
+				.set(credentials)
+				.attach('file', drawioURL)
+				.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('attachments');
+					expect(res.body.message.attachments).to.be.an('array').of.length(1);
+					expect(res.body.message.attachments[0]).to.have.property('format', 'DRAWIO');
+					expect(res.body.message.attachments[0]).to.have.property('title', 'diagram.drawio');
+					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('name', 'diagram.drawio');
+					expect(res.body.message.files[0]).to.have.property('type', 'application/octet-stream');
+				});
 		});
 
 		it('should not allow uploading a blocked media type to a room', async () => {
-			await updateSetting('FileUpload_MediaTypeBlackList', 'application/octet-stream');
+			await updateSetting('FileUpload_MediaTypeBlackList', 'text/plain');
 			await request
 				.post(api(`rooms.upload/${testChannel._id}`))
 				.set(credentials)
@@ -218,6 +239,20 @@ describe('[Rooms]', function () {
 				});
 		});
 
+		it('should not allow uploading an unknown media type to a room if the default one is blocked', async () => {
+			await updateSetting('FileUpload_MediaTypeBlackList', 'application/octet-stream');
+			await request
+				.post(api(`rooms.upload/${testChannel._id}`))
+				.set(credentials)
+				.attach('file', drawioURL)
+				.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-invalid-file-type');
+				});
+		});
+
 		it('should be able to get the file', async () => {
 			await request.get(fileNewUrl).set(credentials).expect('Content-Type', 'image/png').expect(200);
 			await request.get(fileOldUrl).set(credentials).expect('Content-Type', 'image/png').expect(200);
diff --git a/packages/i18n/src/locales/en.i18n.json b/packages/i18n/src/locales/en.i18n.json
index 836b534df601..1277a02375bf 100644
--- a/packages/i18n/src/locales/en.i18n.json
+++ b/packages/i18n/src/locales/en.i18n.json
@@ -2383,6 +2383,7 @@
   "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",

From 70e39680ab6736f4a254900f8e60829e242726cc Mon Sep 17 00:00:00 2001
From: Tiago Evangelista Pinto <tiago.evangelista@rocket.chat>
Date: Wed, 19 Jun 2024 11:40:03 -0300
Subject: [PATCH 37/94] fix(Omnichannel): Contact Center sort by date (#32566)

---
 .changeset/proud-coats-repair.md              |  5 ++
 .../directory/contacts/ContactTable.tsx       | 10 +++-
 apps/meteor/tests/data/livechat/rooms.ts      |  4 +-
 .../end-to-end/api/livechat/11-livechat.ts    | 46 +++++++++++++++++--
 4 files changed, 58 insertions(+), 7 deletions(-)
 create mode 100644 .changeset/proud-coats-repair.md

diff --git a/.changeset/proud-coats-repair.md b/.changeset/proud-coats-repair.md
new file mode 100644
index 000000000000..ba1e16b7e05d
--- /dev/null
+++ b/.changeset/proud-coats-repair.md
@@ -0,0 +1,5 @@
+---
+"@rocket.chat/meteor": patch
+---
+
+Fix the sorting by last chat in Contact Center table
diff --git a/apps/meteor/client/views/omnichannel/directory/contacts/ContactTable.tsx b/apps/meteor/client/views/omnichannel/directory/contacts/ContactTable.tsx
index 1238732edf66..76fdce05c9bb 100644
--- a/apps/meteor/client/views/omnichannel/directory/contacts/ContactTable.tsx
+++ b/apps/meteor/client/views/omnichannel/directory/contacts/ContactTable.tsx
@@ -26,7 +26,7 @@ import { useCurrentContacts } from './hooks/useCurrentContacts';
 
 function ContactTable(): ReactElement {
 	const { current, itemsPerPage, setItemsPerPage, setCurrent, ...paginationProps } = usePagination();
-	const { sortBy, sortDirection, setSort } = useSort<'username' | 'phone' | 'name' | 'visitorEmails.address' | 'lastchat'>('username');
+	const { sortBy, sortDirection, setSort } = useSort<'username' | 'phone' | 'name' | 'visitorEmails.address' | 'lastChat.ts'>('username');
 	const isCallReady = useIsCallReady();
 
 	const [term, setTerm] = useDebouncedState('', 500);
@@ -90,7 +90,13 @@ function ContactTable(): ReactElement {
 			>
 				{t('Email')}
 			</GenericTableHeaderCell>
-			<GenericTableHeaderCell key='lastchat' direction={sortDirection} active={sortBy === 'lastchat'} onClick={setSort} sort='lastchat'>
+			<GenericTableHeaderCell
+				key='lastchat'
+				direction={sortDirection}
+				active={sortBy === 'lastChat.ts'}
+				onClick={setSort}
+				sort='lastChat.ts'
+			>
 				{t('Last_Chat')}
 			</GenericTableHeaderCell>
 			<GenericTableHeaderCell key='call' width={44} />
diff --git a/apps/meteor/tests/data/livechat/rooms.ts b/apps/meteor/tests/data/livechat/rooms.ts
index ff7819a6365b..921e7bb08582 100644
--- a/apps/meteor/tests/data/livechat/rooms.ts
+++ b/apps/meteor/tests/data/livechat/rooms.ts
@@ -32,7 +32,7 @@ export const createLivechatRoom = async (visitorToken: string, extraRoomParams?:
 	return response.body.room;
 };
 
-export const createVisitor = (department?: string): Promise<ILivechatVisitor> =>
+export const createVisitor = (department?: string, visitorName?: string): Promise<ILivechatVisitor> =>
 	new Promise((resolve, reject) => {
 		const token = getRandomVisitorToken();
 		const email = `${token}@${token}.com`;
@@ -46,7 +46,7 @@ export const createVisitor = (department?: string): Promise<ILivechatVisitor> =>
 				.set(credentials)
 				.send({
 					visitor: {
-						name: `Visitor ${Date.now()}`,
+						name: visitorName || `Visitor ${Date.now()}`,
 						email,
 						token,
 						phone,
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 3fa2b9f6b89e..09d90b7da8d1 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
@@ -1,11 +1,18 @@
 import { expect } from 'chai';
-import { before, describe, it } from 'mocha';
+import { after, before, describe, it } from 'mocha';
 
 import { sleep } from '../../../../lib/utils/sleep';
 import { getCredentials, api, request, credentials } from '../../../data/api-data';
 import { createCustomField, deleteCustomField } from '../../../data/livechat/custom-fields';
 import { addOrRemoveAgentFromDepartment, createDepartmentWithAnOnlineAgent } from '../../../data/livechat/department';
-import { createVisitor, createLivechatRoom, makeAgentUnavailable, closeOmnichannelRoom, sendMessage } from '../../../data/livechat/rooms';
+import {
+	createVisitor,
+	createLivechatRoom,
+	makeAgentUnavailable,
+	closeOmnichannelRoom,
+	sendMessage,
+	deleteVisitor,
+} from '../../../data/livechat/rooms';
 import { createBotAgent, getRandomVisitorToken } from '../../../data/livechat/users';
 import { removePermissionFromAllRoles, restorePermissionToRoles, updatePermission, updateSetting } from '../../../data/permissions.helper';
 import { IS_EE } from '../../../e2e/config/constants';
@@ -15,8 +22,9 @@ describe('LIVECHAT - Utils', function () {
 
 	before((done) => getCredentials(done));
 
-	before(async () => {
+	after(async () => {
 		await updateSetting('Livechat_enabled', true);
+		await updateSetting('Livechat_offline_email', '');
 	});
 
 	describe('livechat/offline.message', () => {
@@ -453,6 +461,38 @@ describe('LIVECHAT - Utils', function () {
 			expect(body).to.have.property('token', visitor.token);
 		});
 	});
+	describe('livechat/visitors.search', () => {
+		it('should bring sorted data by last chat time', async () => {
+			const visitor1 = await createVisitor(undefined, 'VisitorInPast');
+			const room1 = await createLivechatRoom(visitor1.token);
+
+			const visitor2 = await createVisitor(undefined, 'VisitorInPresent');
+			const room2 = await createLivechatRoom(visitor2.token);
+
+			const { body: result1 } = await request
+				.get(api('livechat/visitors.search?term=VisitorIn&sort={"lastChat.ts":1}'))
+				.set(credentials)
+				.send();
+
+			expect(result1).to.have.property('visitors').that.is.an('array');
+			expect(result1.visitors[0]).to.have.property('name');
+			expect(result1.visitors[0].name).to.be.eq('VisitorInPast');
+
+			const { body: result2 } = await request
+				.get(api('livechat/visitors.search?term=VisitorIn&sort={"lastChat.ts":-1}'))
+				.set(credentials)
+				.send();
+
+			expect(result2).to.have.property('visitors').that.is.an('array');
+			expect(result2.visitors[0]).to.have.property('name');
+			expect(result2.visitors[0].name).to.be.eq('VisitorInPresent');
+
+			await closeOmnichannelRoom(room1._id);
+			await closeOmnichannelRoom(room2._id);
+			await deleteVisitor(visitor1.token);
+			await deleteVisitor(visitor2.token);
+		});
+	});
 
 	describe('livechat/message', () => {
 		it('should fail if no token', async () => {

From c5edd0435268d3f813c6c256cefe80a06e34c31c Mon Sep 17 00:00:00 2001
From: Douglas Fabris <devfabris@gmail.com>
Date: Wed, 19 Jun 2024 14:49:46 -0300
Subject: [PATCH 38/94] fix: Settings code mirror broken on full screen mode
 (#32625)

---
 .changeset/odd-goats-fix.md                   |  5 +++++
 .../CustomScrollbars/CustomScrollbars.tsx     | 21 ++++++++++++-------
 .../CustomScrollbars/VirtuosoScrollbars.tsx   | 10 +++------
 .../inputs/CodeMirror/CodeMirrorBox.tsx       |  4 +++-
 apps/meteor/tests/e2e/administration.spec.ts  | 13 ++++++++++++
 apps/meteor/tests/e2e/page-objects/admin.ts   |  8 +++++++
 6 files changed, 46 insertions(+), 15 deletions(-)
 create mode 100644 .changeset/odd-goats-fix.md

diff --git a/.changeset/odd-goats-fix.md b/.changeset/odd-goats-fix.md
new file mode 100644
index 000000000000..9178620391be
--- /dev/null
+++ b/.changeset/odd-goats-fix.md
@@ -0,0 +1,5 @@
+---
+'@rocket.chat/meteor': patch
+---
+
+Fixes an issue where settings code mirror is not being displayed correctly in full screen mode
diff --git a/apps/meteor/client/components/CustomScrollbars/CustomScrollbars.tsx b/apps/meteor/client/components/CustomScrollbars/CustomScrollbars.tsx
index 18bdbdead14e..ca718199076e 100644
--- a/apps/meteor/client/components/CustomScrollbars/CustomScrollbars.tsx
+++ b/apps/meteor/client/components/CustomScrollbars/CustomScrollbars.tsx
@@ -1,8 +1,8 @@
 import { Palette } from '@rocket.chat/fuselage';
 import type { ScrollValues } from 'rc-scrollbars';
 import { Scrollbars } from 'rc-scrollbars';
-import type { MutableRefObject, CSSProperties, ReactNode, ReactElement } from 'react';
-import React, { memo, forwardRef, useCallback } from 'react';
+import type { MutableRefObject, CSSProperties, ReactNode } from 'react';
+import React, { memo, forwardRef, useCallback, useMemo } from 'react';
 
 export type CustomScrollbarsProps = {
 	overflowX?: boolean;
@@ -14,10 +14,18 @@ export type CustomScrollbarsProps = {
 	autoHide?: boolean;
 };
 
+const styleDefault: CSSProperties = {
+	flexGrow: 1,
+	willChange: 'transform',
+	overflowY: 'hidden',
+};
+
 const CustomScrollbars = forwardRef<HTMLElement, CustomScrollbarsProps>(function CustomScrollbars(
-	{ children, onScroll, overflowX, renderView, ...props },
+	{ children, style, onScroll, overflowX, renderView, ...props },
 	ref,
 ) {
+	const scrollbarsStyle = useMemo(() => ({ ...style, ...styleDefault }), [style]);
+
 	const refSetter = useCallback(
 		(scrollbarRef) => {
 			if (ref && scrollbarRef) {
@@ -38,12 +46,11 @@ const CustomScrollbars = forwardRef<HTMLElement, CustomScrollbarsProps>(function
 			autoHide
 			autoHideTimeout={2000}
 			autoHideDuration={500}
+			style={scrollbarsStyle}
 			onScrollFrame={onScroll}
 			renderView={renderView}
-			renderTrackHorizontal={
-				overflowX ? undefined : (props): ReactElement => <div {...props} className='track-horizontal' style={{ display: 'none' }} />
-			}
-			renderThumbVertical={({ style, ...props }): JSX.Element => (
+			renderTrackHorizontal={overflowX ? undefined : (props) => <div {...props} className='track-horizontal' style={{ display: 'none' }} />}
+			renderThumbVertical={({ style, ...props }) => (
 				<div {...props} style={{ ...style, backgroundColor: Palette.stroke['stroke-dark'].toString(), borderRadius: '4px' }} />
 			)}
 			children={children}
diff --git a/apps/meteor/client/components/CustomScrollbars/VirtuosoScrollbars.tsx b/apps/meteor/client/components/CustomScrollbars/VirtuosoScrollbars.tsx
index a7d0371e4ab8..b07083be1a03 100644
--- a/apps/meteor/client/components/CustomScrollbars/VirtuosoScrollbars.tsx
+++ b/apps/meteor/client/components/CustomScrollbars/VirtuosoScrollbars.tsx
@@ -1,4 +1,4 @@
-import type { ComponentProps, ReactElement, Ref } from 'react';
+import type { ComponentProps, Ref } from 'react';
 import React, { forwardRef } from 'react';
 
 import CustomScrollbars from './CustomScrollbars';
@@ -8,13 +8,9 @@ type VirtuosoScrollbarsProps = ComponentProps<typeof CustomScrollbars>;
 const VirtuosoScrollbars = forwardRef(function VirtuosoScrollbars(
 	{ style, children, ...props }: VirtuosoScrollbarsProps,
 	ref: Ref<HTMLDivElement>,
-): ReactElement {
+) {
 	return (
-		<CustomScrollbars
-			style={{ ...style, flexGrow: 1, overflowY: 'hidden', width: '100%', willChange: 'transform' }}
-			ref={ref}
-			renderView={(viewProps): ReactElement => <div {...viewProps} {...props} />}
-		>
+		<CustomScrollbars style={style} ref={ref} renderView={(viewProps) => <div {...viewProps} {...props} />}>
 			{children}
 		</CustomScrollbars>
 	);
diff --git a/apps/meteor/client/views/admin/settings/inputs/CodeMirror/CodeMirrorBox.tsx b/apps/meteor/client/views/admin/settings/inputs/CodeMirror/CodeMirrorBox.tsx
index ce6d2dfd6000..3f61417e4fa6 100644
--- a/apps/meteor/client/views/admin/settings/inputs/CodeMirror/CodeMirrorBox.tsx
+++ b/apps/meteor/client/views/admin/settings/inputs/CodeMirror/CodeMirrorBox.tsx
@@ -39,7 +39,9 @@ const CodeMirrorBox = ({ label, children }: { label: ReactNode; children: ReactE
 					{label}
 				</Box>
 			)}
-			{children}
+			<Box display='flex' flexDirection='column' height='100%' role='code' aria-label={typeof label === 'string' ? label : undefined}>
+				{children}
+			</Box>
 			<Box mbs={8}>
 				<ButtonGroup>
 					<Button primary onClick={(): void => toggleFullScreen()}>
diff --git a/apps/meteor/tests/e2e/administration.spec.ts b/apps/meteor/tests/e2e/administration.spec.ts
index e4af3c26c106..703c4a4bd8b1 100644
--- a/apps/meteor/tests/e2e/administration.spec.ts
+++ b/apps/meteor/tests/e2e/administration.spec.ts
@@ -335,5 +335,18 @@ test.describe.parallel('administration', () => {
 				await poAdmin.btnResetSiteURL.click();
 			});
 		});
+
+		test.describe('Layout', () => {
+			test.beforeEach(async ({ page }) => {
+				await page.goto('/admin/settings/Layout');
+			});
+
+			test('should code mirror full screen be displayed correctly', async ({ page }) => {
+				await poAdmin.getAccordionBtnByName('Custom CSS').click();
+				await poAdmin.btnFullScreen.click();
+
+				await expect(page.getByRole('code')).toHaveCSS('width', '920px');
+			});
+		});
 	});
 });
diff --git a/apps/meteor/tests/e2e/page-objects/admin.ts b/apps/meteor/tests/e2e/page-objects/admin.ts
index 210dbc95f326..43f33d3a3359 100644
--- a/apps/meteor/tests/e2e/page-objects/admin.ts
+++ b/apps/meteor/tests/e2e/page-objects/admin.ts
@@ -256,4 +256,12 @@ export class Admin {
 	get inputWebhookUrl(): Locator {
 		return this.page.getByRole('textbox', { name: 'Webhook URL' });
 	}
+
+	getAccordionBtnByName(name: string): Locator {
+		return this.page.getByRole('button', { name });
+	}
+
+	get btnFullScreen(): Locator {
+		return this.page.getByRole('button', { name: 'Full Screen' });
+	}
 }

From ee43f2c57c87a6dda64b3250bfb3cc04caa8bda2 Mon Sep 17 00:00:00 2001
From: Yash Rajpal <58601732+yash-rajpal@users.noreply.github.com>
Date: Thu, 20 Jun 2024 01:16:05 +0530
Subject: [PATCH 39/94] feat: Disable slash commands for encrypted rooms
 (#32548)

---
 .changeset/popular-bulldogs-accept.md         |  6 ++
 apps/meteor/client/lib/chats/ChatAPI.ts       | 10 ++-
 .../client/lib/chats/flows/sendMessage.ts     | 13 ++--
 .../views/room/composer/ComposerBoxPopup.tsx  | 11 +++-
 .../composer/ComposerBoxPopupSlashCommand.tsx |  8 ++-
 .../views/room/composer/ComposerMessage.tsx   | 13 +++-
 .../room/composer/messageBox/MessageBox.tsx   |  8 ++-
 .../room/contexts/ComposerPopupContext.ts     |  1 +
 .../room/providers/ComposerPopupProvider.tsx  |  9 ++-
 apps/meteor/tests/e2e/e2e-encryption.spec.ts  | 63 +++++++++++++++++++
 packages/i18n/src/locales/en.i18n.json        |  1 +
 11 files changed, 130 insertions(+), 13 deletions(-)
 create mode 100644 .changeset/popular-bulldogs-accept.md

diff --git a/.changeset/popular-bulldogs-accept.md b/.changeset/popular-bulldogs-accept.md
new file mode 100644
index 000000000000..b18e3382148b
--- /dev/null
+++ b/.changeset/popular-bulldogs-accept.md
@@ -0,0 +1,6 @@
+---
+'@rocket.chat/i18n': patch
+'@rocket.chat/meteor': patch
+---
+
+Disable slash commands in encrypted rooms and show a disabled warning.
diff --git a/apps/meteor/client/lib/chats/ChatAPI.ts b/apps/meteor/client/lib/chats/ChatAPI.ts
index ceffab987a64..10589b8b7c97 100644
--- a/apps/meteor/client/lib/chats/ChatAPI.ts
+++ b/apps/meteor/client/lib/chats/ChatAPI.ts
@@ -140,7 +140,15 @@ export type ChatAPI = {
 
 	readonly flows: {
 		readonly uploadFiles: (files: readonly File[], resetFileInput?: () => void) => Promise<void>;
-		readonly sendMessage: ({ text, tshow }: { text: string; tshow?: boolean; previewUrls?: string[] }) => Promise<boolean>;
+		readonly sendMessage: ({
+			text,
+			tshow,
+		}: {
+			text: string;
+			tshow?: boolean;
+			previewUrls?: string[];
+			isSlashCommandAllowed?: boolean;
+		}) => Promise<boolean>;
 		readonly processSlashCommand: (message: IMessage, userId: string | null) => Promise<boolean>;
 		readonly processTooLongMessage: (message: IMessage) => Promise<boolean>;
 		readonly processMessageEditing: (
diff --git a/apps/meteor/client/lib/chats/flows/sendMessage.ts b/apps/meteor/client/lib/chats/flows/sendMessage.ts
index 62adbd80eb3e..c691c40b3faf 100644
--- a/apps/meteor/client/lib/chats/flows/sendMessage.ts
+++ b/apps/meteor/client/lib/chats/flows/sendMessage.ts
@@ -10,7 +10,7 @@ import { processSetReaction } from './processSetReaction';
 import { processSlashCommand } from './processSlashCommand';
 import { processTooLongMessage } from './processTooLongMessage';
 
-const process = async (chat: ChatAPI, message: IMessage, previewUrls?: string[]): Promise<void> => {
+const process = async (chat: ChatAPI, message: IMessage, previewUrls?: string[], isSlashCommandAllowed?: boolean): Promise<void> => {
 	KonchatNotification.removeRoomNotification(message.rid);
 
 	if (await processSetReaction(chat, message)) {
@@ -25,7 +25,7 @@ const process = async (chat: ChatAPI, message: IMessage, previewUrls?: string[])
 		return;
 	}
 
-	if (await processSlashCommand(chat, message)) {
+	if (isSlashCommandAllowed && (await processSlashCommand(chat, message))) {
 		return;
 	}
 
@@ -34,7 +34,12 @@ const process = async (chat: ChatAPI, message: IMessage, previewUrls?: string[])
 
 export const sendMessage = async (
 	chat: ChatAPI,
-	{ text, tshow, previewUrls }: { text: string; tshow?: boolean; previewUrls?: string[] },
+	{
+		text,
+		tshow,
+		previewUrls,
+		isSlashCommandAllowed,
+	}: { text: string; tshow?: boolean; previewUrls?: string[]; isSlashCommandAllowed?: boolean },
 ): Promise<boolean> => {
 	if (!(await chat.data.isSubscribedToRoom())) {
 		try {
@@ -63,7 +68,7 @@ export const sendMessage = async (
 		});
 
 		try {
-			await process(chat, message, previewUrls);
+			await process(chat, message, previewUrls, isSlashCommandAllowed);
 			chat.composer?.dismissAllQuotedMessages();
 		} catch (error) {
 			dispatchToastMessage({ type: 'error', message: error });
diff --git a/apps/meteor/client/views/room/composer/ComposerBoxPopup.tsx b/apps/meteor/client/views/room/composer/ComposerBoxPopup.tsx
index dd7b19797530..523c0e44af86 100644
--- a/apps/meteor/client/views/room/composer/ComposerBoxPopup.tsx
+++ b/apps/meteor/client/views/room/composer/ComposerBoxPopup.tsx
@@ -9,6 +9,7 @@ export type ComposerBoxPopupProps<
 	T extends {
 		_id: string;
 		sort?: number;
+		disabled?: boolean;
 	},
 > = {
 	title?: string;
@@ -22,6 +23,7 @@ function ComposerBoxPopup<
 	T extends {
 		_id: string;
 		sort?: number;
+		disabled?: boolean;
 	},
 >({
 	title,
@@ -37,7 +39,9 @@ function ComposerBoxPopup<
 
 	const variant = popupSizes && popupSizes.inlineSize < 480 ? 'small' : 'large';
 
-	const getOptionTitle = <T extends { _id: string; sort?: number; outside?: boolean; suggestion?: boolean }>(item: T) => {
+	const getOptionTitle = <T extends { _id: string; sort?: number; outside?: boolean; suggestion?: boolean; disabled?: boolean }>(
+		item: T,
+	) => {
 		if (variant !== 'small') {
 			return undefined;
 		}
@@ -49,6 +53,10 @@ function ComposerBoxPopup<
 		if (item.suggestion) {
 			return t('Suggestion_from_recent_messages');
 		}
+
+		if (item.disabled) {
+			return t('Unavailable_in_encrypted_channels');
+		}
 	};
 
 	const itemsFlat = useMemo(
@@ -96,6 +104,7 @@ function ComposerBoxPopup<
 								id={`popup-item-${item._id}`}
 								tabIndex={item === focused ? 0 : -1}
 								aria-selected={item === focused}
+								disabled={item.disabled}
 							>
 								{renderItem({ item: { ...item, variant } })}
 							</Option>
diff --git a/apps/meteor/client/views/room/composer/ComposerBoxPopupSlashCommand.tsx b/apps/meteor/client/views/room/composer/ComposerBoxPopupSlashCommand.tsx
index 24dd07d067b3..fe69136c3d26 100644
--- a/apps/meteor/client/views/room/composer/ComposerBoxPopupSlashCommand.tsx
+++ b/apps/meteor/client/views/room/composer/ComposerBoxPopupSlashCommand.tsx
@@ -1,20 +1,24 @@
 import { OptionColumn, OptionContent, OptionDescription, OptionInput } from '@rocket.chat/fuselage';
+import { useTranslation } from '@rocket.chat/ui-contexts';
 import React from 'react';
 
 export type ComposerBoxPopupSlashCommandProps = {
 	_id: string;
 	description?: string;
 	params?: string;
+	disabled?: boolean;
 };
 
-function ComposerBoxPopupSlashCommand({ _id, description, params }: ComposerBoxPopupSlashCommandProps) {
+function ComposerBoxPopupSlashCommand({ _id, description, params, disabled }: ComposerBoxPopupSlashCommandProps) {
+	const t = useTranslation();
+
 	return (
 		<>
 			<OptionContent>
 				{_id} <OptionDescription>{params}</OptionDescription>
 			</OptionContent>
 			<OptionColumn>
-				<OptionInput>{description}</OptionInput>
+				<OptionInput>{disabled ? t('Unavailable_in_encrypted_channels') : description}</OptionInput>
 			</OptionColumn>
 		</>
 	);
diff --git a/apps/meteor/client/views/room/composer/ComposerMessage.tsx b/apps/meteor/client/views/room/composer/ComposerMessage.tsx
index 28824acab05a..790b1739bde7 100644
--- a/apps/meteor/client/views/room/composer/ComposerMessage.tsx
+++ b/apps/meteor/client/views/room/composer/ComposerMessage.tsx
@@ -41,13 +41,24 @@ const ComposerMessage = ({ tmid, readOnly, onSend, ...props }: ComposerMessagePr
 				}
 			},
 
-			onSend: async ({ value: text, tshow, previewUrls }: { value: string; tshow?: boolean; previewUrls?: string[] }): Promise<void> => {
+			onSend: async ({
+				value: text,
+				tshow,
+				previewUrls,
+				isSlashCommandAllowed,
+			}: {
+				value: string;
+				tshow?: boolean;
+				previewUrls?: string[];
+				isSlashCommandAllowed?: boolean;
+			}): Promise<void> => {
 				try {
 					await chat?.action.stop('typing');
 					const newMessageSent = await chat?.flows.sendMessage({
 						text,
 						tshow,
 						previewUrls,
+						isSlashCommandAllowed,
 					});
 					if (newMessageSent) onSend?.();
 				} catch (error) {
diff --git a/apps/meteor/client/views/room/composer/messageBox/MessageBox.tsx b/apps/meteor/client/views/room/composer/messageBox/MessageBox.tsx
index 043837f8c8c6..4b7a466d6de0 100644
--- a/apps/meteor/client/views/room/composer/messageBox/MessageBox.tsx
+++ b/apps/meteor/client/views/room/composer/messageBox/MessageBox.tsx
@@ -12,7 +12,7 @@ import {
 	MessageComposerHint,
 	MessageComposerButton,
 } from '@rocket.chat/ui-composer';
-import { useTranslation, useUserPreference, useLayout } from '@rocket.chat/ui-contexts';
+import { useTranslation, useUserPreference, useLayout, useSetting } from '@rocket.chat/ui-contexts';
 import { useMutation } from '@tanstack/react-query';
 import type {
 	ReactElement,
@@ -92,7 +92,7 @@ const getEmptyArray = () => a;
 type MessageBoxProps = {
 	tmid?: IMessage['_id'];
 	readOnly: boolean;
-	onSend?: (params: { value: string; tshow?: boolean; previewUrls?: string[] }) => Promise<void>;
+	onSend?: (params: { value: string; tshow?: boolean; previewUrls?: string[]; isSlashCommandAllowed?: boolean }) => Promise<void>;
 	onJoin?: () => Promise<void>;
 	onResize?: () => void;
 	onTyping?: () => void;
@@ -123,6 +123,9 @@ const MessageBox = ({
 	const chat = useChat();
 	const room = useRoom();
 	const t = useTranslation();
+	const e2eEnabled = useSetting<boolean>('E2E_Enable');
+	const unencryptedMessagesAllowed = useSetting<boolean>('E2E_Allow_Unencrypted_Messages');
+	const isSlashCommandAllowed = !e2eEnabled || !room.encrypted || unencryptedMessagesAllowed;
 	const composerPlaceholder = useMessageBoxPlaceholder(t('Message'), room);
 
 	const [typing, setTyping] = useReducer(reducer, false);
@@ -176,6 +179,7 @@ const MessageBox = ({
 			value: text,
 			tshow,
 			previewUrls,
+			isSlashCommandAllowed,
 		});
 	});
 
diff --git a/apps/meteor/client/views/room/contexts/ComposerPopupContext.ts b/apps/meteor/client/views/room/contexts/ComposerPopupContext.ts
index 21d239ee6bd7..e42bbe5e38fe 100644
--- a/apps/meteor/client/views/room/contexts/ComposerPopupContext.ts
+++ b/apps/meteor/client/views/room/contexts/ComposerPopupContext.ts
@@ -21,6 +21,7 @@ export type ComposerPopupOption<T extends { _id: string; sort?: number } = { _id
 	getValue: (item: T) => string;
 
 	renderItem?: ({ item }: { item: T }) => ReactElement;
+	disabled?: boolean;
 };
 
 export type ComposerPopupContextValue = ComposerPopupOption[];
diff --git a/apps/meteor/client/views/room/providers/ComposerPopupProvider.tsx b/apps/meteor/client/views/room/providers/ComposerPopupProvider.tsx
index cb8e74fbe142..245a2a0112f3 100644
--- a/apps/meteor/client/views/room/providers/ComposerPopupProvider.tsx
+++ b/apps/meteor/client/views/room/providers/ComposerPopupProvider.tsx
@@ -25,7 +25,7 @@ import type { ComposerPopupContextValue } from '../contexts/ComposerPopupContext
 import { ComposerPopupContext, createMessageBoxPopupConfig } from '../contexts/ComposerPopupContext';
 
 const ComposerPopupProvider = ({ children, room }: { children: ReactNode; room: IRoom }) => {
-	const { _id: rid } = room;
+	const { _id: rid, encrypted: isRoomEncrypted } = room;
 	const userSpotlight = useMethod('spotlight');
 	const suggestionsCount = useSetting<number>('Number_of_users_autocomplete_suggestions');
 	const cannedResponseEnabled = useSetting<boolean>('Canned_Responses_Enable');
@@ -33,6 +33,9 @@ const ComposerPopupProvider = ({ children, room }: { children: ReactNode; room:
 	const isOmnichannel = isOmnichannelRoom(room);
 	const useEmoji = useUserPreference('useEmojis');
 	const t = useTranslation();
+	const e2eEnabled = useSetting<boolean>('E2E_Enable');
+	const unencryptedMessagesAllowed = useSetting<boolean>('E2E_Allow_Unencrypted_Messages');
+	const encrypted = isRoomEncrypted && e2eEnabled && !unencryptedMessagesAllowed;
 
 	const call = useMethod('getSlashCommandPreviews');
 	const value: ComposerPopupContextValue = useMemo(() => {
@@ -278,6 +281,7 @@ const ComposerPopupProvider = ({ children, room }: { children: ReactNode; room:
 				trigger: '/',
 				suffix: ' ',
 				triggerAnywhere: false,
+				disabled: encrypted,
 				renderItem: ({ item }) => <ComposerBoxPopupSlashCommand {...item} />,
 				getItemsFromLocal: async (filter: string) => {
 					return Object.keys(slashCommands.commands)
@@ -288,6 +292,7 @@ const ComposerPopupProvider = ({ children, room }: { children: ReactNode; room:
 								params: item.params && t.has(item.params) ? t(item.params) : item.params ?? '',
 								description: item.description && t.has(item.description) ? t(item.description) : item.description,
 								permission: item.permission,
+								...(encrypted && { disabled: encrypted }),
 							};
 						})
 						.filter((command) => {
@@ -360,7 +365,7 @@ const ComposerPopupProvider = ({ children, room }: { children: ReactNode; room:
 				},
 			}),
 		].filter(Boolean);
-	}, [t, cannedResponseEnabled, isOmnichannel, recentEmojis, suggestionsCount, userSpotlight, rid, call, useEmoji]);
+	}, [t, cannedResponseEnabled, isOmnichannel, recentEmojis, suggestionsCount, userSpotlight, rid, call, useEmoji, encrypted]);
 
 	return <ComposerPopupContext.Provider value={value} children={children} />;
 };
diff --git a/apps/meteor/tests/e2e/e2e-encryption.spec.ts b/apps/meteor/tests/e2e/e2e-encryption.spec.ts
index 8b0753c952d2..58adc3e8654b 100644
--- a/apps/meteor/tests/e2e/e2e-encryption.spec.ts
+++ b/apps/meteor/tests/e2e/e2e-encryption.spec.ts
@@ -299,6 +299,69 @@ test.describe.serial('e2e-encryption', () => {
 		await expect(poHomeChannel.content.lastUserMessage.locator('.rcx-icon--name-key')).toBeVisible();
 	});
 
+	test('expect slash commands to be enabled in an e2ee room', 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('This is an encrypted message.');
+
+		await expect(poHomeChannel.content.lastUserMessageBody).toHaveText('This is an encrypted message.');
+		await expect(poHomeChannel.content.lastUserMessage.locator('.rcx-icon--name-key')).toBeVisible();
+
+		await page.locator('[name="msg"]').type('/');
+		await expect(page.locator('#popup-item-contextualbar')).not.toHaveClass(/disabled/);
+		await page.locator('[name="msg"]').clear();
+
+		await poHomeChannel.content.dispatchSlashCommand('/contextualbar');
+		await expect(poHomeChannel.btnContextualbarClose).toBeVisible();
+
+		await poHomeChannel.btnContextualbarClose.click();
+		await expect(poHomeChannel.btnContextualbarClose).toBeHidden();
+	});
+
+	test.describe('un-encrypted messages not allowed in e2ee rooms', () => {
+		let poHomeChannel: HomeChannel;
+
+		test.beforeEach(async ({ page }) => {
+			poHomeChannel = new HomeChannel(page);
+			await page.goto('/home');
+		});
+		test.beforeAll(async ({ api }) => {
+			expect((await api.post('/settings/E2E_Allow_Unencrypted_Messages', { value: false })).status()).toBe(200);
+		});
+
+		test.afterAll(async ({ api }) => {
+			expect((await api.post('/settings/E2E_Allow_Unencrypted_Messages', { value: true })).status()).toBe(200);
+		});
+
+		test('expect slash commands to be disabled in an e2ee room', 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('This is an encrypted message.');
+
+			await expect(poHomeChannel.content.lastUserMessageBody).toHaveText('This is an encrypted message.');
+			await expect(poHomeChannel.content.lastUserMessage.locator('.rcx-icon--name-key')).toBeVisible();
+
+			await page.locator('[name="msg"]').type('/');
+			await expect(page.locator('#popup-item-contextualbar')).toHaveClass(/disabled/);
+		});
+	});
+
 	test('expect create a private channel, send unecrypted messages, encrypt the channel and delete the last message and check the last message in the sidebar', async ({
 		page,
 	}) => {
diff --git a/packages/i18n/src/locales/en.i18n.json b/packages/i18n/src/locales/en.i18n.json
index 1277a02375bf..863a773d45c6 100644
--- a/packages/i18n/src/locales/en.i18n.json
+++ b/packages/i18n/src/locales/en.i18n.json
@@ -5475,6 +5475,7 @@
   "Unassigned": "Unassigned",
   "unauthorized": "Not authorized",
   "Unavailable": "Unavailable",
+  "Unavailable_in_encrypted_channels": "Unavailable in encrypted channels",
   "Unblock": "Unblock",
   "Unblock_User": "Unblock User",
   "Uncheck_All": "Uncheck All",

From 6c17292ce813c8e33a00e5b7fbfc3f06a2d584d9 Mon Sep 17 00:00:00 2001
From: Guilherme Gazzo <guilhermegazzo@gmail.com>
Date: Wed, 19 Jun 2024 17:21:56 -0300
Subject: [PATCH 40/94] test: fix flaky `Team join` api tests (#32634)

---
 apps/meteor/tests/data/users.helper.js       | 4 ++--
 apps/meteor/tests/end-to-end/api/25-teams.js | 7 ++++---
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/apps/meteor/tests/data/users.helper.js b/apps/meteor/tests/data/users.helper.js
index 841ec56d7db1..5f4d93204886 100644
--- a/apps/meteor/tests/data/users.helper.js
+++ b/apps/meteor/tests/data/users.helper.js
@@ -5,8 +5,8 @@ import { MongoClient } from 'mongodb';
 import { URL_MONGODB } from '../e2e/config/constants';
 
 export const createUser = (userData = {}) =>
-	new Promise((resolve) => {
-		const username = userData.username || `user.test.${Date.now()}`;
+	new Promise((resolve, reject) => {
+		const username = userData.username || `user.test.${Date.now()}.${Math.random()}`;
 		const email = userData.email || `${username}@rocket.chat`;
 		request
 			.post(api('users.create'))
diff --git a/apps/meteor/tests/end-to-end/api/25-teams.js b/apps/meteor/tests/end-to-end/api/25-teams.js
index 49a1d663aef2..6fc9899e403b 100644
--- a/apps/meteor/tests/end-to-end/api/25-teams.js
+++ b/apps/meteor/tests/end-to-end/api/25-teams.js
@@ -1602,9 +1602,10 @@ describe('[Teams]', () => {
 			let testUser2;
 
 			before(async () => {
-				const [testUserResult, testUser1Result] = await Promise.all([createUser(), createUser()]);
-				testUser1 = testUserResult;
-				testUser2 = testUser1Result;
+				const [testUser1Result, testUser2Result] = await Promise.all([createUser(), createUser()]);
+
+				testUser1 = testUser1Result;
+				testUser2 = testUser2Result;
 			});
 
 			beforeEach(async () => {

From f5e0d1eb421e082a1764735660ee115caa25ac17 Mon Sep 17 00:00:00 2001
From: Matheus Barbosa Silva
 <36537004+matheusbsilva137@users.noreply.github.com>
Date: Wed, 19 Jun 2024 17:31:51 -0300
Subject: [PATCH 41/94] fix: Client sends incorrect file name when uploading
 assets (#32636)

---
 .changeset/hungry-waves-lick.md                              | 5 +++++
 .../client/views/admin/settings/inputs/AssetSettingInput.tsx | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)
 create mode 100644 .changeset/hungry-waves-lick.md

diff --git a/.changeset/hungry-waves-lick.md b/.changeset/hungry-waves-lick.md
new file mode 100644
index 000000000000..294ece663c32
--- /dev/null
+++ b/.changeset/hungry-waves-lick.md
@@ -0,0 +1,5 @@
+---
+"@rocket.chat/meteor": patch
+---
+
+Fixed file name being incorrectly sent from the client when uploading assets
diff --git a/apps/meteor/client/views/admin/settings/inputs/AssetSettingInput.tsx b/apps/meteor/client/views/admin/settings/inputs/AssetSettingInput.tsx
index 9ebde75e7316..14ba6f27b4c5 100644
--- a/apps/meteor/client/views/admin/settings/inputs/AssetSettingInput.tsx
+++ b/apps/meteor/client/views/admin/settings/inputs/AssetSettingInput.tsx
@@ -35,7 +35,7 @@ function AssetSettingInput({ _id, label, value, asset, required, disabled, fileC
 			dispatchToastMessage({ type: 'info', message: t('Uploading_file') });
 
 			const fileData = new FormData();
-			fileData.append('asset', blob, asset);
+			fileData.append('asset', blob, blob.name);
 			fileData.append('assetName', asset);
 
 			try {

From cd97aac0f62b272857cb5c5b4f038bfb701d2f11 Mon Sep 17 00:00:00 2001
From: Yash Rajpal <58601732+yash-rajpal@users.noreply.github.com>
Date: Thu, 20 Jun 2024 03:20:58 +0530
Subject: [PATCH 42/94] fix: Enable encryption for direct/private rooms by
 default is overriding E2EE setting (#32624)

---
 .changeset/happy-cameras-mix.md                              | 5 +++++
 .../sidebar/header/CreateChannel/CreateChannelModal.tsx      | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)
 create mode 100644 .changeset/happy-cameras-mix.md

diff --git a/.changeset/happy-cameras-mix.md b/.changeset/happy-cameras-mix.md
new file mode 100644
index 000000000000..005d6742a686
--- /dev/null
+++ b/.changeset/happy-cameras-mix.md
@@ -0,0 +1,5 @@
+---
+'@rocket.chat/meteor': patch
+---
+
+Fixed an issue where private encrypted room creation was being forced even when E2EE feature was disabled.
diff --git a/apps/meteor/client/sidebar/header/CreateChannel/CreateChannelModal.tsx b/apps/meteor/client/sidebar/header/CreateChannel/CreateChannelModal.tsx
index 818bb689d778..c45d300dc4c7 100644
--- a/apps/meteor/client/sidebar/header/CreateChannel/CreateChannelModal.tsx
+++ b/apps/meteor/client/sidebar/header/CreateChannel/CreateChannelModal.tsx
@@ -66,7 +66,7 @@ const CreateChannelModal = ({ teamId = '', onClose, reload }: CreateChannelModal
 	const namesValidation = useSetting('UTF8_Channel_Names_Validation');
 	const allowSpecialNames = useSetting('UI_Allow_room_names_with_special_chars');
 	const federationEnabled = useSetting<boolean>('Federation_Matrix_enabled') || false;
-	const e2eEnabledForPrivateByDefault = useSetting('E2E_Enabled_Default_PrivateRooms');
+	const e2eEnabledForPrivateByDefault = useSetting('E2E_Enabled_Default_PrivateRooms') && e2eEnabled;
 
 	const canCreateChannel = usePermission('create-c');
 	const canCreatePrivateChannel = usePermission('create-p');

From 45dc3d5f725e395aad485d24d10e8f31feb15db0 Mon Sep 17 00:00:00 2001
From: Yash Rajpal <58601732+yash-rajpal@users.noreply.github.com>
Date: Thu, 20 Jun 2024 04:00:40 +0530
Subject: [PATCH 43/94] feat: Disable some message menu items for encrypted
 messages. (#32559)

---
 .changeset/plenty-buses-kneel.md              |  6 +++
 .../app/ui-utils/client/lib/MessageAction.ts  |  3 +-
 .../client/lib/messageActionDefault.ts        | 11 +++++-
 .../components/GenericMenu/GenericMenu.tsx    |  2 +-
 .../GenericMenu/GenericMenuItem.tsx           |  5 ++-
 .../message/toolbar/MessageActionMenu.tsx     | 38 +++++++++++++++++--
 .../message/toolbar/MessageToolbar.tsx        | 11 +++++-
 apps/meteor/package.json                      |  2 +-
 apps/meteor/tests/e2e/e2e-encryption.spec.ts  | 25 ++++++++++++
 ee/packages/ui-theming/package.json           |  2 +-
 packages/fuselage-ui-kit/package.json         |  2 +-
 packages/gazzodown/package.json               |  2 +-
 packages/i18n/src/locales/en.i18n.json        |  1 +
 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 ++++++-------
 19 files changed, 113 insertions(+), 33 deletions(-)
 create mode 100644 .changeset/plenty-buses-kneel.md

diff --git a/.changeset/plenty-buses-kneel.md b/.changeset/plenty-buses-kneel.md
new file mode 100644
index 000000000000..5c21bdb0bb69
--- /dev/null
+++ b/.changeset/plenty-buses-kneel.md
@@ -0,0 +1,6 @@
+---
+'@rocket.chat/i18n': minor
+'@rocket.chat/meteor': minor
+---
+
+Disable "Reply in direct message", "Copy link" and "Forward message" message menu items for encrypted messages as they don't apply to encrypted messages and also disable apps menu items and show a warning.
diff --git a/apps/meteor/app/ui-utils/client/lib/MessageAction.ts b/apps/meteor/app/ui-utils/client/lib/MessageAction.ts
index 6a3ddd45ca66..c1f9590b98ee 100644
--- a/apps/meteor/app/ui-utils/client/lib/MessageAction.ts
+++ b/apps/meteor/app/ui-utils/client/lib/MessageAction.ts
@@ -25,7 +25,7 @@ export type MessageActionContext =
 
 type MessageActionType = 'communication' | 'interaction' | 'duplication' | 'apps' | 'management';
 
-type MessageActionConditionProps = {
+export type MessageActionConditionProps = {
 	message: IMessage;
 	user: IUser | undefined;
 	room: IRoom;
@@ -65,6 +65,7 @@ export type MessageActionConfig = {
 	) => any;
 	condition?: (props: MessageActionConditionProps) => Promise<boolean> | boolean;
 	type?: MessageActionType;
+	disabled?: (props: MessageActionConditionProps) => boolean;
 };
 
 class MessageAction {
diff --git a/apps/meteor/app/ui-utils/client/lib/messageActionDefault.ts b/apps/meteor/app/ui-utils/client/lib/messageActionDefault.ts
index 589c387772fb..2f2793f7493b 100644
--- a/apps/meteor/app/ui-utils/client/lib/messageActionDefault.ts
+++ b/apps/meteor/app/ui-utils/client/lib/messageActionDefault.ts
@@ -1,5 +1,5 @@
 import type { IMessage } from '@rocket.chat/core-typings';
-import { isRoomFederated } from '@rocket.chat/core-typings';
+import { isE2EEMessage, isRoomFederated } from '@rocket.chat/core-typings';
 import { Meteor } from 'meteor/meteor';
 import moment from 'moment';
 
@@ -63,6 +63,9 @@ Meteor.startup(async () => {
 		},
 		order: 0,
 		group: 'menu',
+		disabled({ message }) {
+			return isE2EEMessage(message);
+		},
 	});
 
 	MessageAction.addButton({
@@ -87,6 +90,9 @@ Meteor.startup(async () => {
 		},
 		order: 0,
 		group: 'message',
+		disabled({ message }) {
+			return isE2EEMessage(message);
+		},
 	});
 
 	MessageAction.addButton({
@@ -139,6 +145,9 @@ Meteor.startup(async () => {
 		},
 		order: 5,
 		group: 'menu',
+		disabled({ message }) {
+			return isE2EEMessage(message);
+		},
 	});
 
 	MessageAction.addButton({
diff --git a/apps/meteor/client/components/GenericMenu/GenericMenu.tsx b/apps/meteor/client/components/GenericMenu/GenericMenu.tsx
index 9d8367f7ad98..ddde6122b99d 100644
--- a/apps/meteor/client/components/GenericMenu/GenericMenu.tsx
+++ b/apps/meteor/client/components/GenericMenu/GenericMenu.tsx
@@ -41,7 +41,7 @@ const GenericMenu = ({ title, icon = 'menu', disabled, onAction, ...props }: Gen
 
 	const hasIcon = itemsList.some(({ icon }) => icon);
 	const handleItems = (items: GenericMenuItemProps[]) =>
-		hasIcon ? items.map((item) => ({ ...item, gap: !item.icon && !item.status })) : items;
+		hasIcon ? items.map((item) => ({ ...item, gap: item.gap ?? (!item.icon && !item.status) })) : items;
 
 	const isMenuEmpty = !(sections && sections.length > 0) && !(items && items.length > 0);
 
diff --git a/apps/meteor/client/components/GenericMenu/GenericMenuItem.tsx b/apps/meteor/client/components/GenericMenu/GenericMenuItem.tsx
index ec987a1ee28d..44feedf86115 100644
--- a/apps/meteor/client/components/GenericMenu/GenericMenuItem.tsx
+++ b/apps/meteor/client/components/GenericMenu/GenericMenuItem.tsx
@@ -12,14 +12,15 @@ export type GenericMenuItemProps = {
 	disabled?: boolean;
 	description?: ReactNode;
 	gap?: boolean;
+	tooltip?: string;
 };
 
-const GenericMenuItem = ({ icon, content, addon, status, gap }: GenericMenuItemProps) => (
+const GenericMenuItem = ({ icon, content, addon, status, gap, tooltip }: GenericMenuItemProps) => (
 	<>
 		{gap && <MenuItemColumn />}
 		{icon && <MenuItemIcon name={icon} />}
 		{status && <MenuItemColumn>{status}</MenuItemColumn>}
-		{content && <MenuItemContent>{content}</MenuItemContent>}
+		{content && <MenuItemContent title={tooltip}>{content}</MenuItemContent>}
 		{addon && <MenuItemInput>{addon}</MenuItemInput>}
 	</>
 );
diff --git a/apps/meteor/client/components/message/toolbar/MessageActionMenu.tsx b/apps/meteor/client/components/message/toolbar/MessageActionMenu.tsx
index 8d266fe35d0e..6c35f7b73dbd 100644
--- a/apps/meteor/client/components/message/toolbar/MessageActionMenu.tsx
+++ b/apps/meteor/client/components/message/toolbar/MessageActionMenu.tsx
@@ -1,8 +1,9 @@
+import { useUniqueId } from '@rocket.chat/fuselage-hooks';
 import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { MouseEvent, ReactElement } from 'react';
 import React from 'react';
 
-import type { MessageActionConfig } from '../../../../app/ui-utils/client/lib/MessageAction';
+import type { MessageActionConditionProps, MessageActionConfig } from '../../../../app/ui-utils/client/lib/MessageAction';
 import GenericMenu from '../../GenericMenu/GenericMenu';
 import type { GenericMenuItemProps } from '../../GenericMenu/GenericMenuItem';
 
@@ -19,11 +20,13 @@ type MessageActionSection = {
 type MessageActionMenuProps = {
 	onChangeMenuVisibility: (visible: boolean) => void;
 	options: MessageActionConfigOption[];
+	context: MessageActionConditionProps;
+	isMessageEncrypted: boolean;
 };
 
-const MessageActionMenu = ({ options, onChangeMenuVisibility }: MessageActionMenuProps): ReactElement => {
+const MessageActionMenu = ({ options, onChangeMenuVisibility, context, isMessageEncrypted }: MessageActionMenuProps): ReactElement => {
 	const t = useTranslation();
-
+	const id = useUniqueId();
 	const groupOptions = options
 		.map((option) => ({
 			variant: option.color === 'alert' ? 'danger' : '',
@@ -32,6 +35,9 @@ const MessageActionMenu = ({ options, onChangeMenuVisibility }: MessageActionMen
 			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) }) }),
 		}))
 		.reduce((acc, option) => {
 			const group = option.type ? option.type : '';
@@ -44,7 +50,31 @@ const MessageActionMenu = ({ options, onChangeMenuVisibility }: MessageActionMen
 			acc.push(newSection);
 
 			return acc;
-		}, [] as unknown as MessageActionSection[]);
+		}, [] as unknown as MessageActionSection[])
+		.map((section) => {
+			if (section.id !== 'apps') {
+				return section;
+			}
+
+			if (!isMessageEncrypted) {
+				return section;
+			}
+
+			return {
+				id: 'apps',
+				title: t('Apps'),
+				items: [
+					{
+						content: t('Unavailable'),
+						type: 'apps',
+						id,
+						disabled: true,
+						gap: false,
+						tooltip: t('Action_not_available_encrypted_content', { action: t('Apps') }),
+					},
+				],
+			};
+		});
 
 	return (
 		<GenericMenu
diff --git a/apps/meteor/client/components/message/toolbar/MessageToolbar.tsx b/apps/meteor/client/components/message/toolbar/MessageToolbar.tsx
index a51ca4f3b3d4..183aea7190d9 100644
--- a/apps/meteor/client/components/message/toolbar/MessageToolbar.tsx
+++ b/apps/meteor/client/components/message/toolbar/MessageToolbar.tsx
@@ -1,6 +1,6 @@
 import { useToolbar } from '@react-aria/toolbar';
 import type { IMessage, IRoom, ISubscription, ITranslatedMessage } from '@rocket.chat/core-typings';
-import { isThreadMessage, isRoomFederated, isVideoConfMessage } from '@rocket.chat/core-typings';
+import { isThreadMessage, isRoomFederated, isVideoConfMessage, isE2EEMessage } from '@rocket.chat/core-typings';
 import { MessageToolbar as FuselageMessageToolbar, MessageToolbarItem } from '@rocket.chat/fuselage';
 import { useFeaturePreview } from '@rocket.chat/ui-client';
 import { useUser, useSettings, useTranslation, useMethod, useLayoutHiddenActions } from '@rocket.chat/ui-contexts';
@@ -125,9 +125,14 @@ const MessageToolbar = ({
 						onClick={(e): void => action.action(e, { message, tabbar: toolbox, room, chat, autoTranslateOptions })}
 						key={action.id}
 						icon={action.icon}
-						title={t(action.label)}
+						title={
+							action?.disabled?.({ message, room, user, subscription, settings: mapSettings, chat, context })
+								? t('Action_not_available_encrypted_content', { action: t(action.label) })
+								: t(action.label)
+						}
 						data-qa-id={action.label}
 						data-qa-type='message-action-menu'
+						disabled={action?.disabled?.({ message, room, user, subscription, settings: mapSettings, chat, context })}
 					/>
 				))}
 			{actionsQueryResult.isSuccess && actionsQueryResult.data.menu.length > 0 && (
@@ -138,6 +143,8 @@ const MessageToolbar = ({
 					}))}
 					onChangeMenuVisibility={onChangeMenuVisibility}
 					data-qa-type='message-action-menu-options'
+					context={{ message, room, user, subscription, settings: mapSettings, chat, context }}
+					isMessageEncrypted={isE2EEMessage(message)}
 				/>
 			)}
 		</FuselageMessageToolbar>
diff --git a/apps/meteor/package.json b/apps/meteor/package.json
index 9d02e91c6cba..b060c09a53b4 100644
--- a/apps/meteor/package.json
+++ b/apps/meteor/package.json
@@ -242,7 +242,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.54.2",
+		"@rocket.chat/fuselage": "^0.54.3",
 		"@rocket.chat/fuselage-hooks": "^0.33.1",
 		"@rocket.chat/fuselage-polyfills": "~0.31.25",
 		"@rocket.chat/fuselage-toastbar": "^0.31.26",
diff --git a/apps/meteor/tests/e2e/e2e-encryption.spec.ts b/apps/meteor/tests/e2e/e2e-encryption.spec.ts
index 58adc3e8654b..14d407aaf81d 100644
--- a/apps/meteor/tests/e2e/e2e-encryption.spec.ts
+++ b/apps/meteor/tests/e2e/e2e-encryption.spec.ts
@@ -213,6 +213,31 @@ test.describe.serial('e2e-encryption', () => {
 		await expect(poHomeChannel.content.mainThreadMessageText.locator('.rcx-icon--name-key')).toBeVisible();
 	});
 
+	test('expect create a private encrypted channel and check disabled message menu actions on an encrypted message', 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('This is an encrypted message.');
+
+		await expect(poHomeChannel.content.lastUserMessageBody).toHaveText('This is an encrypted message.');
+		await expect(poHomeChannel.content.lastUserMessage.locator('.rcx-icon--name-key')).toBeVisible();
+
+		await page.locator('[data-qa-type="message"]').last().hover();
+		await expect(page.locator('role=button[name="Forward message"]')).toBeDisabled();
+
+		await poHomeChannel.content.openLastMessageMenu();
+
+		await expect(page.locator('role=menuitem[name="Reply in direct message"]')).toHaveClass(/disabled/);
+		await expect(page.locator('role=menuitem[name="Copy link"]')).toHaveClass(/disabled/);
+	});
+
 	test('expect create a private channel, encrypt it and send an encrypted message', async ({ page }) => {
 		const channelName = faker.string.uuid();
 
diff --git a/ee/packages/ui-theming/package.json b/ee/packages/ui-theming/package.json
index 437f1fda92ab..dca631587d3c 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.54.2",
+		"@rocket.chat/fuselage": "^0.54.3",
 		"@rocket.chat/fuselage-hooks": "^0.33.1",
 		"@rocket.chat/icons": "^0.36.0",
 		"@rocket.chat/ui-contexts": "workspace:~",
diff --git a/packages/fuselage-ui-kit/package.json b/packages/fuselage-ui-kit/package.json
index 119a23759280..6f8b6dfefe13 100644
--- a/packages/fuselage-ui-kit/package.json
+++ b/packages/fuselage-ui-kit/package.json
@@ -66,7 +66,7 @@
     "@rocket.chat/apps-engine": "alpha",
     "@rocket.chat/core-typings": "workspace:^",
     "@rocket.chat/eslint-config": "workspace:^",
-    "@rocket.chat/fuselage": "^0.54.2",
+    "@rocket.chat/fuselage": "^0.54.3",
     "@rocket.chat/fuselage-hooks": "^0.33.1",
     "@rocket.chat/fuselage-polyfills": "~0.31.25",
     "@rocket.chat/icons": "^0.36.0",
diff --git a/packages/gazzodown/package.json b/packages/gazzodown/package.json
index 0ce09b0aa79b..ace746bfb5d0 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.54.2",
+		"@rocket.chat/fuselage": "^0.54.3",
 		"@rocket.chat/fuselage-tokens": "^0.33.1",
 		"@rocket.chat/message-parser": "workspace:^",
 		"@rocket.chat/styled": "~0.31.25",
diff --git a/packages/i18n/src/locales/en.i18n.json b/packages/i18n/src/locales/en.i18n.json
index 863a773d45c6..cfaecfe2c924 100644
--- a/packages/i18n/src/locales/en.i18n.json
+++ b/packages/i18n/src/locales/en.i18n.json
@@ -304,6 +304,7 @@
   "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",
   "Active": "Active",
   "Active_users": "Active users",
diff --git a/packages/ui-avatar/package.json b/packages/ui-avatar/package.json
index a5300bc5648a..1db9cc6c1eb9 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.54.2",
+		"@rocket.chat/fuselage": "^0.54.3",
 		"@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 6b6429df099c..a56e6dcc757e 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.54.2",
+		"@rocket.chat/fuselage": "^0.54.3",
 		"@rocket.chat/fuselage-hooks": "^0.33.1",
 		"@rocket.chat/icons": "^0.36.0",
 		"@rocket.chat/mock-providers": "workspace:^",
diff --git a/packages/ui-composer/package.json b/packages/ui-composer/package.json
index e256334c3eb4..a36c0c3df151 100644
--- a/packages/ui-composer/package.json
+++ b/packages/ui-composer/package.json
@@ -6,7 +6,7 @@
     "@babel/core": "~7.22.20",
     "@react-aria/toolbar": "^3.0.0-beta.1",
     "@rocket.chat/eslint-config": "workspace:^",
-    "@rocket.chat/fuselage": "^0.54.2",
+    "@rocket.chat/fuselage": "^0.54.3",
     "@rocket.chat/icons": "^0.36.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 2e92e8158113..4ecf8699aeca 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.54.2",
+		"@rocket.chat/fuselage": "^0.54.3",
 		"@rocket.chat/fuselage-hooks": "^0.33.1",
 		"@rocket.chat/icons": "^0.36.0",
 		"@rocket.chat/styled": "~0.31.25",
diff --git a/packages/uikit-playground/package.json b/packages/uikit-playground/package.json
index 133faa8c75ee..732b74c0d3d3 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.54.2",
+    "@rocket.chat/fuselage": "^0.54.3",
     "@rocket.chat/fuselage-hooks": "^0.33.1",
     "@rocket.chat/fuselage-polyfills": "~0.31.25",
     "@rocket.chat/fuselage-toastbar": "^0.31.26",
diff --git a/yarn.lock b/yarn.lock
index 6321b0aff77f..ce099ca48a7f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8915,7 +8915,7 @@ __metadata:
     "@rocket.chat/apps-engine": alpha
     "@rocket.chat/core-typings": "workspace:^"
     "@rocket.chat/eslint-config": "workspace:^"
-    "@rocket.chat/fuselage": ^0.54.2
+    "@rocket.chat/fuselage": ^0.54.3
     "@rocket.chat/fuselage-hooks": ^0.33.1
     "@rocket.chat/fuselage-polyfills": ~0.31.25
     "@rocket.chat/gazzodown": "workspace:^"
@@ -8977,9 +8977,9 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@rocket.chat/fuselage@npm:^0.54.2":
-  version: 0.54.2
-  resolution: "@rocket.chat/fuselage@npm:0.54.2"
+"@rocket.chat/fuselage@npm:^0.54.3":
+  version: 0.54.3
+  resolution: "@rocket.chat/fuselage@npm:0.54.3"
   dependencies:
     "@rocket.chat/css-in-js": ^0.31.25
     "@rocket.chat/css-supports": ^0.31.25
@@ -8997,7 +8997,7 @@ __metadata:
     react: ^17.0.2
     react-dom: ^17.0.2
     react-virtuoso: 1.2.4
-  checksum: 1e49b3324f50525a002dd450a28dc8c6fca559e51c8e93449e167b50ca88767cc3dd11ac3c89ea794597c6c06a4a681aea1043b8f8bb42c49df0362bb5791019
+  checksum: bec4d0b92e919103cda927520040f46004266ec5e1b3964c5bec6c6be59f8f051f2940689785f4e78984a9a18230a175b9f5f8e548f2b8f951387d567570735c
   languageName: node
   linkType: hard
 
@@ -9008,7 +9008,7 @@ __metadata:
     "@babel/core": ~7.22.20
     "@rocket.chat/core-typings": "workspace:^"
     "@rocket.chat/css-in-js": ~0.31.25
-    "@rocket.chat/fuselage": ^0.54.2
+    "@rocket.chat/fuselage": ^0.54.3
     "@rocket.chat/fuselage-tokens": ^0.33.1
     "@rocket.chat/message-parser": "workspace:^"
     "@rocket.chat/styled": ~0.31.25
@@ -9368,7 +9368,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.54.2
+    "@rocket.chat/fuselage": ^0.54.3
     "@rocket.chat/fuselage-hooks": ^0.33.1
     "@rocket.chat/fuselage-polyfills": ~0.31.25
     "@rocket.chat/fuselage-toastbar": ^0.31.26
@@ -10264,7 +10264,7 @@ __metadata:
   resolution: "@rocket.chat/ui-avatar@workspace:packages/ui-avatar"
   dependencies:
     "@babel/core": ~7.22.20
-    "@rocket.chat/fuselage": ^0.54.2
+    "@rocket.chat/fuselage": ^0.54.3
     "@rocket.chat/ui-contexts": "workspace:^"
     "@types/babel__core": ~7.20.3
     "@types/react": ~17.0.69
@@ -10290,7 +10290,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.54.2
+    "@rocket.chat/fuselage": ^0.54.3
     "@rocket.chat/fuselage-hooks": ^0.33.1
     "@rocket.chat/icons": ^0.36.0
     "@rocket.chat/mock-providers": "workspace:^"
@@ -10343,7 +10343,7 @@ __metadata:
     "@babel/core": ~7.22.20
     "@react-aria/toolbar": ^3.0.0-beta.1
     "@rocket.chat/eslint-config": "workspace:^"
-    "@rocket.chat/fuselage": ^0.54.2
+    "@rocket.chat/fuselage": ^0.54.3
     "@rocket.chat/icons": ^0.36.0
     "@storybook/addon-actions": ~6.5.16
     "@storybook/addon-docs": ~6.5.16
@@ -10435,7 +10435,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.54.2
+    "@rocket.chat/fuselage": ^0.54.3
     "@rocket.chat/fuselage-hooks": ^0.33.1
     "@rocket.chat/icons": ^0.36.0
     "@rocket.chat/ui-contexts": "workspace:~"
@@ -10478,7 +10478,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.54.2
+    "@rocket.chat/fuselage": ^0.54.3
     "@rocket.chat/fuselage-hooks": ^0.33.1
     "@rocket.chat/icons": ^0.36.0
     "@rocket.chat/styled": ~0.31.25
@@ -10523,7 +10523,7 @@ __metadata:
     "@codemirror/tooltip": ^0.19.16
     "@lezer/highlight": ^1.1.6
     "@rocket.chat/css-in-js": ~0.31.25
-    "@rocket.chat/fuselage": ^0.54.2
+    "@rocket.chat/fuselage": ^0.54.3
     "@rocket.chat/fuselage-hooks": ^0.33.1
     "@rocket.chat/fuselage-polyfills": ~0.31.25
     "@rocket.chat/fuselage-toastbar": ^0.31.26

From ae968fcb57b4e1424b2b7ef8fa09b7f25695455c Mon Sep 17 00:00:00 2001
From: Guilherme Gazzo <guilhermegazzo@gmail.com>
Date: Thu, 20 Jun 2024 08:47:08 -0300
Subject: [PATCH 44/94] regression: `Error: Model ISettingsModel not found`
 (#32644)

---
 apps/meteor/server/modules/watchers/lib/messages.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/meteor/server/modules/watchers/lib/messages.ts b/apps/meteor/server/modules/watchers/lib/messages.ts
index 2f71e0ed1b66..e127f465efe9 100644
--- a/apps/meteor/server/modules/watchers/lib/messages.ts
+++ b/apps/meteor/server/modules/watchers/lib/messages.ts
@@ -1,5 +1,5 @@
 import { api, dbWatchersDisabled } from '@rocket.chat/core-services';
-import type { IMessage, IUser, MessageTypesValues } from '@rocket.chat/core-typings';
+import type { IMessage, IUser, SettingValue, MessageTypesValues } from '@rocket.chat/core-typings';
 import { Messages, Settings, Users } from '@rocket.chat/models';
 import mem from 'mem';
 
@@ -13,7 +13,7 @@ const getUserNameCached = mem(
 	{ maxAge: 10000 },
 );
 
-const getSettingCached = mem(Settings.getValueById, { maxAge: 10000 });
+const getSettingCached = mem(async (setting: string): Promise<SettingValue> => Settings.getValueById(setting), { maxAge: 10000 });
 
 export async function getMessageToBroadcast({ id, data }: { id: IMessage['_id']; data?: IMessage }): Promise<IMessage | void> {
 	const message = data ?? (await Messages.findOneById(id));

From efba929e3b7a13b67c7d2045fdc1090c659aa650 Mon Sep 17 00:00:00 2001
From: Guilherme Gazzo <guilhermegazzo@gmail.com>
Date: Thu, 20 Jun 2024 12:16:56 -0300
Subject: [PATCH 45/94] test: flaky e2ee tests (#32645)

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

diff --git a/apps/meteor/tests/e2e/e2e-encryption.spec.ts b/apps/meteor/tests/e2e/e2e-encryption.spec.ts
index 14d407aaf81d..6d1d2a2fc770 100644
--- a/apps/meteor/tests/e2e/e2e-encryption.spec.ts
+++ b/apps/meteor/tests/e2e/e2e-encryption.spec.ts
@@ -230,7 +230,7 @@ test.describe.serial('e2e-encryption', () => {
 		await expect(poHomeChannel.content.lastUserMessage.locator('.rcx-icon--name-key')).toBeVisible();
 
 		await page.locator('[data-qa-type="message"]').last().hover();
-		await expect(page.locator('role=button[name="Forward message"]')).toBeDisabled();
+		await expect(page.locator('role=button[name="Forward message not available on encrypted content"]')).toBeDisabled();
 
 		await poHomeChannel.content.openLastMessageMenu();
 

From 142877891b37fa4f328003ee36a3b828bb8b81ae Mon Sep 17 00:00:00 2001
From: Guilherme Gazzo <guilhermegazzo@gmail.com>
Date: Thu, 20 Jun 2024 13:54:31 -0300
Subject: [PATCH 46/94] test: fix canned-response/business hours flaky test
 (#32642)

---
 apps/meteor/app/livechat/server/startup.ts | 24 ++++++++++++++--------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/apps/meteor/app/livechat/server/startup.ts b/apps/meteor/app/livechat/server/startup.ts
index aba8578dcea9..098fa803711c 100644
--- a/apps/meteor/app/livechat/server/startup.ts
+++ b/apps/meteor/app/livechat/server/startup.ts
@@ -64,14 +64,22 @@ Meteor.startup(async () => {
 	});
 	await createDefaultBusinessHourIfNotExists();
 
-	settings.watch<boolean>('Livechat_enable_business_hours', async (value) => {
-		logger.debug(`Starting business hour manager ${value}`);
-		if (value) {
-			await businessHourManager.startManager();
-			return;
-		}
-		await businessHourManager.stopManager();
-	});
+	settings.watch<boolean>(
+		'Livechat_enable_business_hours',
+		async (value) => {
+			logger.debug(`Starting business hour manager ${value}`);
+			if (value) {
+				await businessHourManager.startManager();
+				return;
+			}
+			await businessHourManager.stopManager();
+		},
+		process.env.TEST_MODE === 'true'
+			? {
+					debounce: 10,
+			  }
+			: undefined,
+	);
 
 	settings.watch<string>('Livechat_Routing_Method', () => {
 		void RoutingManager.startQueue();

From e6bfb4eafb77e49bda704303d039d9a2337e90dd Mon Sep 17 00:00:00 2001
From: Douglas Fabris <devfabris@gmail.com>
Date: Thu, 20 Jun 2024 16:44:57 -0300
Subject: [PATCH 47/94] fix: Emoji picker's object and symbols category icon
 swapped (#32612)

---
 .changeset/red-cheetahs-heal.md                              | 5 +++++
 .../views/composer/EmojiPicker/EmojiPickerCategoryItem.tsx   | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)
 create mode 100644 .changeset/red-cheetahs-heal.md

diff --git a/.changeset/red-cheetahs-heal.md b/.changeset/red-cheetahs-heal.md
new file mode 100644
index 000000000000..5b9934203da0
--- /dev/null
+++ b/.changeset/red-cheetahs-heal.md
@@ -0,0 +1,5 @@
+---
+'@rocket.chat/meteor': patch
+---
+
+Fixes a cosmetic issue where emoji picker object and symbols category icon are swapped
diff --git a/apps/meteor/client/views/composer/EmojiPicker/EmojiPickerCategoryItem.tsx b/apps/meteor/client/views/composer/EmojiPicker/EmojiPickerCategoryItem.tsx
index 7aea040c8721..701a3eb3872e 100644
--- a/apps/meteor/client/views/composer/EmojiPicker/EmojiPickerCategoryItem.tsx
+++ b/apps/meteor/client/views/composer/EmojiPicker/EmojiPickerCategoryItem.tsx
@@ -30,10 +30,10 @@ const mapCategoryIcon = (category: string) => {
 			return 'airplane';
 
 		case 'objects':
-			return 'percentage';
+			return 'lamp-bulb';
 
 		case 'symbols':
-			return 'lamp-bulb';
+			return 'percentage';
 
 		case 'flags':
 			return 'flag';

From fade5a2c822785831cf009d1a32576cdd6b57a25 Mon Sep 17 00:00:00 2001
From: Diego Sampaio <chinello@gmail.com>
Date: Thu, 20 Jun 2024 16:49:10 -0300
Subject: [PATCH 48/94] test: make playwright reporter less verbose by showing
 only errors (#32637)

---
 apps/meteor/reporters/rocketchat.ts | 28 ++++++++++++++++++----------
 1 file changed, 18 insertions(+), 10 deletions(-)

diff --git a/apps/meteor/reporters/rocketchat.ts b/apps/meteor/reporters/rocketchat.ts
index d27424a1874b..82d8b43431ac 100644
--- a/apps/meteor/reporters/rocketchat.ts
+++ b/apps/meteor/reporters/rocketchat.ts
@@ -20,7 +20,7 @@ class RocketChatReporter implements Reporter {
 		this.run = options.run;
 	}
 
-	onTestEnd(test: TestCase, result: TestResult) {
+	async onTestEnd(test: TestCase, result: TestResult) {
 		if (process.env.REPORTER_ROCKETCHAT_REPORT !== 'true') {
 			console.log('REPORTER_ROCKETCHAT_REPORT is not true, skipping', {
 				draft: this.draft,
@@ -36,15 +36,23 @@ class RocketChatReporter implements Reporter {
 			draft: this.draft,
 			run: this.run,
 		};
-		console.log(`Sending test result to Rocket.Chat: ${JSON.stringify(payload)}`);
-		return fetch(this.url, {
-			method: 'POST',
-			body: JSON.stringify(payload),
-			headers: {
-				'Content-Type': 'application/json',
-				'X-Api-Key': this.apiKey,
-			},
-		});
+
+		try {
+			const res = await fetch(this.url, {
+				method: 'POST',
+				body: JSON.stringify(payload),
+				headers: {
+					'Content-Type': 'application/json',
+					'X-Api-Key': this.apiKey,
+				},
+			});
+
+			if (!res.ok) {
+				console.error('Error sending test result to Rocket.Chat', JSON.stringify(payload), res);
+			}
+		} catch (error) {
+			console.error('Unknown error while sending test result to Rocket.Chat', JSON.stringify(payload), error);
+		}
 	}
 }
 

From 8ac631da62a3349690e55092b2f0e23c01eac9a1 Mon Sep 17 00:00:00 2001
From: Ricardo Garim <rswarovsky@gmail.com>
Date: Thu, 20 Jun 2024 17:52:24 -0300
Subject: [PATCH 49/94] refactor: Settings out of DB Watcher (#32518)

Co-authored-by: Diego Sampaio <chinello@gmail.com>
---
 apps/meteor/app/api/server/v1/misc.ts         | 59 +++++++++----
 apps/meteor/app/api/server/v1/settings.ts     | 28 ++++--
 .../app/apps/server/bridges/settings.ts       |  9 +-
 apps/meteor/app/assets/server/assets.ts       | 20 ++++-
 .../authentication/server/startup/index.js    |  4 +-
 .../functions/getOAuthAuthorizationUrl.ts     |  3 +
 .../functions/getWorkspaceAccessToken.ts      | 11 ++-
 .../removeWorkspaceRegistrationInfo.ts        | 35 +++++---
 .../server/functions/saveRegistrationData.ts  | 71 ++++++++-------
 .../functions/startRegisterWorkspace.ts       |  3 +-
 .../supportedVersionsToken.ts                 |  3 +-
 .../syncWorkspace/legacySyncWorkspace.ts      |  7 +-
 .../server/lib/RocketChat.ErrorHandler.ts     |  9 +-
 .../federation/server/functions/helpers.ts    |  4 +-
 .../app/importer-csv/server/CsvImporter.ts    |  6 +-
 .../server/HipChatEnterpriseImporter.js       |  7 +-
 .../server/SlackUsersImporter.ts              |  8 +-
 .../importer-slack/server/SlackImporter.ts    |  6 +-
 .../app/importer/server/classes/Importer.ts   | 19 +++-
 .../server/functions/sendInvitationEmail.ts   |  7 +-
 .../meteor/app/irc/server/irc-bridge/index.js | 17 ++--
 .../irc/server/methods/resetIrcConnection.ts  | 31 ++-----
 .../app/lib/server/lib/notifyListener.ts      | 34 +++++--
 .../lib/server/methods/removeOAuthService.ts  | 74 +++++++++-------
 .../app/lib/server/methods/saveSetting.ts     |  6 +-
 .../app/lib/server/methods/saveSettings.ts    |  9 +-
 .../imports/server/rest/appearance.ts         | 13 +--
 .../app/livechat/server/api/v1/integration.ts | 76 +++++++---------
 .../app/livechat/server/api/v1/videoCall.ts   | 14 ++-
 .../app/livechat/server/lib/QueueManager.ts   |  7 +-
 .../livechat/server/methods/saveAppearance.ts | 14 +--
 .../server/methods/saveIntegration.ts         | 88 ++++++++++---------
 apps/meteor/app/mailer/server/api.ts          |  6 +-
 .../server/functions/updateStatsCounter.ts    |  8 +-
 .../functions/buildVersionUpdateMessage.ts    |  4 +-
 apps/meteor/ee/app/license/server/startup.ts  | 38 +++++---
 apps/meteor/ee/server/api/licenses.ts         |  4 +-
 apps/meteor/ee/server/startup/upsell.ts       |  7 +-
 apps/meteor/server/cron/federation.ts         |  3 +-
 .../server/database/watchCollections.ts       |  2 +-
 apps/meteor/server/lib/settingsRegenerator.ts |  1 +
 .../meteor/server/models/raw/LivechatRooms.ts | 14 +--
 .../server/models/raw/LivechatVisitors.ts     | 18 ++--
 apps/meteor/server/models/raw/Settings.ts     | 28 ++++--
 .../rocket-chat/adapters/Settings.ts          |  4 +-
 apps/meteor/server/settings/misc.ts           |  8 +-
 .../server/startup/cloudRegistration.ts       |  5 +-
 apps/meteor/server/startup/initialData.js     | 11 ++-
 .../tests/e2e/fixtures/inject-initial-data.ts | 16 ----
 apps/meteor/tests/e2e/saml.spec.ts            | 58 ++++--------
 .../src/models/ISettingsModel.ts              | 14 ++-
 51 files changed, 568 insertions(+), 383 deletions(-)

diff --git a/apps/meteor/app/api/server/v1/misc.ts b/apps/meteor/app/api/server/v1/misc.ts
index bdf6fa2dd1c6..dd4da47bff05 100644
--- a/apps/meteor/app/api/server/v1/misc.ts
+++ b/apps/meteor/app/api/server/v1/misc.ts
@@ -24,6 +24,7 @@ import { SystemLogger } from '../../../../server/lib/logger/system';
 import { getLogs } from '../../../../server/stream/stdout';
 import { hasPermissionAsync } from '../../../authorization/server/functions/hasPermission';
 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 { isSMTPConfigured } from '../../../utils/server/functions/isSMTPConfigured';
@@ -687,27 +688,49 @@ API.v1.addRoute(
 				setDeploymentAs: String,
 			});
 
+			const settingsIds: string[] = [];
+
 			if (this.bodyParams.setDeploymentAs === 'new-workspace') {
-				await Promise.all([
-					Settings.resetValueById('uniqueID', process.env.DEPLOYMENT_ID || uuidv4()),
-					// Settings.resetValueById('Cloud_Url'),
-					Settings.resetValueById('Cloud_Service_Agree_PrivacyTerms'),
-					Settings.resetValueById('Cloud_Workspace_Id'),
-					Settings.resetValueById('Cloud_Workspace_Name'),
-					Settings.resetValueById('Cloud_Workspace_Client_Id'),
-					Settings.resetValueById('Cloud_Workspace_Client_Secret'),
-					Settings.resetValueById('Cloud_Workspace_Client_Secret_Expires_At'),
-					Settings.resetValueById('Cloud_Workspace_Registration_Client_Uri'),
-					Settings.resetValueById('Cloud_Workspace_PublicKey'),
-					Settings.resetValueById('Cloud_Workspace_License'),
-					Settings.resetValueById('Cloud_Workspace_Had_Trial'),
-					Settings.resetValueById('Cloud_Workspace_Access_Token'),
-					Settings.resetValueById('Cloud_Workspace_Access_Token_Expires_At', new Date(0)),
-					Settings.resetValueById('Cloud_Workspace_Registration_State'),
-				]);
+				settingsIds.push(
+					'Cloud_Service_Agree_PrivacyTerms',
+					'Cloud_Workspace_Id',
+					'Cloud_Workspace_Name',
+					'Cloud_Workspace_Client_Id',
+					'Cloud_Workspace_Client_Secret',
+					'Cloud_Workspace_Client_Secret_Expires_At',
+					'Cloud_Workspace_Registration_Client_Uri',
+					'Cloud_Workspace_PublicKey',
+					'Cloud_Workspace_License',
+					'Cloud_Workspace_Had_Trial',
+					'Cloud_Workspace_Access_Token',
+					'uniqueID',
+					'Cloud_Workspace_Access_Token_Expires_At',
+				);
 			}
 
-			await Settings.updateValueById('Deployment_FingerPrint_Verified', true);
+			settingsIds.push('Deployment_FingerPrint_Verified');
+
+			const promises = settingsIds.map((settingId) => {
+				if (settingId === 'uniqueID') {
+					return Settings.resetValueById('uniqueID', process.env.DEPLOYMENT_ID || uuidv4());
+				}
+
+				if (settingId === 'Cloud_Workspace_Access_Token_Expires_At') {
+					return Settings.resetValueById('Cloud_Workspace_Access_Token_Expires_At', new Date(0));
+				}
+
+				if (settingId === 'Deployment_FingerPrint_Verified') {
+					return Settings.updateValueById('Deployment_FingerPrint_Verified', true);
+				}
+
+				return Settings.resetValueById(settingId);
+			});
+
+			(await Promise.all(promises)).forEach((value, index) => {
+				if (value?.modifiedCount) {
+					void notifyOnSettingChangedById(settingsIds[index]);
+				}
+			});
 
 			return API.v1.success({});
 		},
diff --git a/apps/meteor/app/api/server/v1/settings.ts b/apps/meteor/app/api/server/v1/settings.ts
index bccfc8d91fc7..574f4ee64194 100644
--- a/apps/meteor/app/api/server/v1/settings.ts
+++ b/apps/meteor/app/api/server/v1/settings.ts
@@ -13,6 +13,7 @@ import type { FindOptions } from 'mongodb';
 import _ from 'underscore';
 
 import { hasPermissionAsync } from '../../../authorization/server/functions/hasPermission';
+import { notifyOnSettingChanged, notifyOnSettingChangedById } from '../../../lib/server/lib/notifyListener';
 import { SettingsEvents, settings } from '../../../settings/server';
 import { setValue } from '../../../settings/server/raw';
 import { API } from '../api';
@@ -186,23 +187,34 @@ API.v1.addRoute(
 				}
 
 				if (isSettingColor(setting) && isSettingsUpdatePropsColor(this.bodyParams)) {
-					await Settings.updateOptionsById<ISettingColor>(this.urlParams._id, {
-						editor: this.bodyParams.editor,
-					});
-					await Settings.updateValueNotHiddenById(this.urlParams._id, this.bodyParams.value);
+					const updateOptionsPromise = Settings.updateOptionsById<ISettingColor>(this.urlParams._id, { editor: this.bodyParams.editor });
+					const updateValuePromise = Settings.updateValueNotHiddenById(this.urlParams._id, this.bodyParams.value);
+
+					const [updateOptionsResult, updateValueResult] = await Promise.all([updateOptionsPromise, updateValuePromise]);
+
+					if (updateOptionsResult.modifiedCount || updateValueResult.modifiedCount) {
+						await notifyOnSettingChangedById(this.urlParams._id);
+					}
+
 					return API.v1.success();
 				}
 
-				if (
-					isSettingsUpdatePropDefault(this.bodyParams) &&
-					(await Settings.updateValueNotHiddenById(this.urlParams._id, this.bodyParams.value))
-				) {
+				if (isSettingsUpdatePropDefault(this.bodyParams)) {
+					const { matchedCount } = await Settings.updateValueNotHiddenById(this.urlParams._id, this.bodyParams.value);
+					if (!matchedCount) {
+						return API.v1.failure();
+					}
+
 					const s = await Settings.findOneNotHiddenById(this.urlParams._id);
 					if (!s) {
 						return API.v1.failure();
 					}
+
 					settings.set(s);
 					setValue(this.urlParams._id, this.bodyParams.value);
+
+					await notifyOnSettingChanged(s);
+
 					return API.v1.success();
 				}
 
diff --git a/apps/meteor/app/apps/server/bridges/settings.ts b/apps/meteor/app/apps/server/bridges/settings.ts
index e90171813df8..37803d4f94f3 100644
--- a/apps/meteor/app/apps/server/bridges/settings.ts
+++ b/apps/meteor/app/apps/server/bridges/settings.ts
@@ -3,6 +3,8 @@ import type { ISetting } from '@rocket.chat/apps-engine/definition/settings';
 import { ServerSettingBridge } from '@rocket.chat/apps-engine/server/bridges/ServerSettingBridge';
 import { Settings } from '@rocket.chat/models';
 
+import { notifyOnSettingChanged, notifyOnSettingChangedById } from '../../../lib/server/lib/notifyListener';
+
 export class AppSettingBridge extends ServerSettingBridge {
 	constructor(private readonly orch: IAppServerOrchestrator) {
 		super();
@@ -54,7 +56,7 @@ export class AppSettingBridge extends ServerSettingBridge {
 			throw new Error(`The setting "${setting.id}" is not readable.`);
 		}
 
-		await Settings.updateValueById(setting.id, setting.value);
+		(await Settings.updateValueById(setting.id, setting.value)).modifiedCount && void notifyOnSettingChangedById(setting.id);
 	}
 
 	protected async incrementValue(id: string, value: number, appId: string): Promise<void> {
@@ -64,6 +66,9 @@ export class AppSettingBridge extends ServerSettingBridge {
 			throw new Error(`The setting "${id}" is not readable.`);
 		}
 
-		await Settings.incrementValueById(id, value);
+		const { value: setting } = await Settings.incrementValueById(id, value, { returnDocument: 'after' });
+		if (setting) {
+			void notifyOnSettingChanged(setting);
+		}
 	}
 }
diff --git a/apps/meteor/app/assets/server/assets.ts b/apps/meteor/app/assets/server/assets.ts
index 0acba139d5f4..b9653a2f1b9a 100644
--- a/apps/meteor/app/assets/server/assets.ts
+++ b/apps/meteor/app/assets/server/assets.ts
@@ -13,6 +13,7 @@ import sharp from 'sharp';
 import { hasPermissionAsync } from '../../authorization/server/functions/hasPermission';
 import { RocketChatFile } from '../../file/server';
 import { methodDeprecationLogger } from '../../lib/server/lib/deprecationWarningLogger';
+import { notifyOnSettingChangedById } from '../../lib/server/lib/notifyListener';
 import { settings, settingsRegistry } from '../../settings/server';
 import { getExtension } from '../../utils/lib/mimeTypes';
 import { getURL } from '../../utils/server/getURL';
@@ -261,7 +262,13 @@ class RocketChatAssetsClass {
 					defaultUrl: assetInstance.defaultUrl,
 				};
 
-				void Settings.updateValueById(key, value);
+				void (async () => {
+					const { modifiedCount } = await Settings.updateValueById(key, value);
+					if (modifiedCount) {
+						void notifyOnSettingChangedById(key);
+					}
+				})();
+
 				return RocketChatAssets.processAsset(key, value);
 			}, 200);
 		});
@@ -282,7 +289,13 @@ class RocketChatAssetsClass {
 			defaultUrl: getAssetByKey(asset).defaultUrl,
 		};
 
-		void Settings.updateValueById(key, value);
+		void (async () => {
+			const { modifiedCount } = await Settings.updateValueById(key, value);
+			if (modifiedCount) {
+				void notifyOnSettingChangedById(key);
+			}
+		})();
+
 		await RocketChatAssets.processAsset(key, value);
 	}
 
@@ -371,7 +384,8 @@ export async function addAssetToSetting(asset: string, value: IRocketChatAsset,
 
 	if (currentValue && typeof currentValue === 'object' && currentValue.defaultUrl !== getAssetByKey(asset).defaultUrl) {
 		currentValue.defaultUrl = getAssetByKey(asset).defaultUrl;
-		await Settings.updateValueById(key, currentValue);
+
+		(await Settings.updateValueById(key, currentValue)).modifiedCount && void notifyOnSettingChangedById(key);
 	}
 }
 
diff --git a/apps/meteor/app/authentication/server/startup/index.js b/apps/meteor/app/authentication/server/startup/index.js
index cc5a04c275b7..bffbe1f9876d 100644
--- a/apps/meteor/app/authentication/server/startup/index.js
+++ b/apps/meteor/app/authentication/server/startup/index.js
@@ -19,6 +19,7 @@ import { getNewUserRoles } from '../../../../server/services/user/lib/getNewUser
 import { getAvatarSuggestionForUser } from '../../../lib/server/functions/getAvatarSuggestionForUser';
 import { joinDefaultChannels } from '../../../lib/server/functions/joinDefaultChannels';
 import { setAvatarFromServiceWithValidation } from '../../../lib/server/functions/setUserAvatar';
+import { notifyOnSettingChangedById } from '../../../lib/server/lib/notifyListener';
 import * as Mailer from '../../../mailer/server/api';
 import { settings } from '../../../settings/server';
 import { safeGetMeteorUser } from '../../../utils/server/functions/safeGetMeteorUser';
@@ -323,7 +324,8 @@ const insertUserDocAsync = async function (options, user) {
 		if (!roles.includes('admin') && !hasAdmin) {
 			roles.push('admin');
 			if (settings.get('Show_Setup_Wizard') === 'pending') {
-				await Settings.updateValueById('Show_Setup_Wizard', 'in_progress');
+				(await Settings.updateValueById('Show_Setup_Wizard', 'in_progress')).modifiedCount &&
+					void notifyOnSettingChangedById('Show_Setup_Wizard');
 			}
 		}
 	}
diff --git a/apps/meteor/app/cloud/server/functions/getOAuthAuthorizationUrl.ts b/apps/meteor/app/cloud/server/functions/getOAuthAuthorizationUrl.ts
index 14cb2f4a57ce..0550a3d7f238 100644
--- a/apps/meteor/app/cloud/server/functions/getOAuthAuthorizationUrl.ts
+++ b/apps/meteor/app/cloud/server/functions/getOAuthAuthorizationUrl.ts
@@ -1,6 +1,7 @@
 import { Settings } from '@rocket.chat/models';
 import { Random } from '@rocket.chat/random';
 
+import { notifyOnSettingChangedById } from '../../../lib/server/lib/notifyListener';
 import { settings } from '../../../settings/server';
 import { userScopes } from '../oauthScopes';
 import { getRedirectUri } from './getRedirectUri';
@@ -10,6 +11,8 @@ export async function getOAuthAuthorizationUrl() {
 
 	await Settings.updateValueById('Cloud_Workspace_Registration_State', state);
 
+	void notifyOnSettingChangedById('Cloud_Workspace_Registration_State');
+
 	const cloudUrl = settings.get('Cloud_Url');
 	const clientId = settings.get('Cloud_Workspace_Client_Id');
 	const redirectUri = getRedirectUri();
diff --git a/apps/meteor/app/cloud/server/functions/getWorkspaceAccessToken.ts b/apps/meteor/app/cloud/server/functions/getWorkspaceAccessToken.ts
index 7e970edfdfc2..1ea20812c062 100644
--- a/apps/meteor/app/cloud/server/functions/getWorkspaceAccessToken.ts
+++ b/apps/meteor/app/cloud/server/functions/getWorkspaceAccessToken.ts
@@ -1,5 +1,6 @@
 import { Settings } from '@rocket.chat/models';
 
+import { notifyOnSettingChangedById } from '../../../lib/server/lib/notifyListener';
 import { settings } from '../../../settings/server';
 import { getWorkspaceAccessTokenWithScope } from './getWorkspaceAccessTokenWithScope';
 import { retrieveRegistrationStatus } from './retrieveRegistrationStatus';
@@ -32,11 +33,13 @@ export async function getWorkspaceAccessToken(forceNew = false, scope = '', save
 	const accessToken = await getWorkspaceAccessTokenWithScope(scope, throwOnError);
 
 	if (save) {
-		await Promise.all([
-			Settings.updateValueById('Cloud_Workspace_Access_Token', accessToken.token),
-			Settings.updateValueById('Cloud_Workspace_Access_Token_Expires_At', accessToken.expiresAt),
-		]);
+		(await Settings.updateValueById('Cloud_Workspace_Access_Token', accessToken.token)).modifiedCount &&
+			void notifyOnSettingChangedById('Cloud_Workspace_Access_Token');
+
+		(await Settings.updateValueById('Cloud_Workspace_Access_Token_Expires_At', accessToken.expiresAt)).modifiedCount &&
+			void notifyOnSettingChangedById('Cloud_Workspace_Access_Token_Expires_At');
 	}
+
 	return accessToken.token;
 }
 
diff --git a/apps/meteor/app/cloud/server/functions/removeWorkspaceRegistrationInfo.ts b/apps/meteor/app/cloud/server/functions/removeWorkspaceRegistrationInfo.ts
index b4e5362f5ac7..45e1738e11e6 100644
--- a/apps/meteor/app/cloud/server/functions/removeWorkspaceRegistrationInfo.ts
+++ b/apps/meteor/app/cloud/server/functions/removeWorkspaceRegistrationInfo.ts
@@ -1,5 +1,6 @@
 import { Settings } from '@rocket.chat/models';
 
+import { notifyOnSettingChangedById } from '../../../lib/server/lib/notifyListener';
 import { retrieveRegistrationStatus } from './retrieveRegistrationStatus';
 
 export async function removeWorkspaceRegistrationInfo() {
@@ -8,16 +9,30 @@ export async function removeWorkspaceRegistrationInfo() {
 		return true;
 	}
 
-	await Promise.all([
-		Settings.resetValueById('Cloud_Workspace_Id', null),
-		Settings.resetValueById('Cloud_Workspace_Name', null),
-		Settings.resetValueById('Cloud_Workspace_Client_Id', null),
-		Settings.resetValueById('Cloud_Workspace_Client_Secret', null),
-		Settings.resetValueById('Cloud_Workspace_Client_Secret_Expires_At', null),
-		Settings.resetValueById('Cloud_Workspace_PublicKey', null),
-		Settings.resetValueById('Cloud_Workspace_Registration_Client_Uri', null),
-	]);
+	const settingsIds = [
+		'Cloud_Workspace_Id',
+		'Cloud_Workspace_Name',
+		'Cloud_Workspace_Client_Id',
+		'Cloud_Workspace_Client_Secret',
+		'Cloud_Workspace_Client_Secret_Expires_At',
+		'Cloud_Workspace_PublicKey',
+		'Cloud_Workspace_Registration_Client_Uri',
+		'Show_Setup_Wizard',
+	];
+
+	const promises = settingsIds.map((settingId) => {
+		if (settingId === 'Show_Setup_Wizard') {
+			return Settings.updateValueById('Show_Setup_Wizard', 'in_progress');
+		}
+
+		return Settings.resetValueById(settingId, null);
+	});
+
+	(await Promise.all(promises)).forEach((value, index) => {
+		if (value?.modifiedCount) {
+			void notifyOnSettingChangedById(settingsIds[index]);
+		}
+	});
 
-	await Settings.updateValueById('Show_Setup_Wizard', 'in_progress');
 	return true;
 }
diff --git a/apps/meteor/app/cloud/server/functions/saveRegistrationData.ts b/apps/meteor/app/cloud/server/functions/saveRegistrationData.ts
index cb2d19cfb92e..d92273302442 100644
--- a/apps/meteor/app/cloud/server/functions/saveRegistrationData.ts
+++ b/apps/meteor/app/cloud/server/functions/saveRegistrationData.ts
@@ -1,6 +1,7 @@
 import { applyLicense } from '@rocket.chat/license';
 import { Settings } from '@rocket.chat/models';
 
+import { notifyOnSettingChangedById } from '../../../lib/server/lib/notifyListener';
 import { settings } from '../../../settings/server';
 import { syncCloudData } from './syncWorkspace/syncCloudData';
 
@@ -33,7 +34,8 @@ export async function saveRegistrationData({
 
 	await syncCloudData();
 }
-function saveRegistrationDataBase({
+
+async function saveRegistrationDataBase({
 	workspaceId,
 	client_name,
 	client_id,
@@ -50,38 +52,47 @@ function saveRegistrationDataBase({
 	publicKey: string;
 	registration_client_uri: string;
 }) {
-	return Promise.all([
-		Settings.updateValueById('Register_Server', true),
-		Settings.updateValueById('Cloud_Workspace_Id', workspaceId),
-		Settings.updateValueById('Cloud_Workspace_Name', client_name),
-		Settings.updateValueById('Cloud_Workspace_Client_Id', client_id),
-		Settings.updateValueById('Cloud_Workspace_Client_Secret', client_secret),
-		Settings.updateValueById('Cloud_Workspace_Client_Secret_Expires_At', client_secret_expires_at),
-		Settings.updateValueById('Cloud_Workspace_PublicKey', publicKey),
-		Settings.updateValueById('Cloud_Workspace_Registration_Client_Uri', registration_client_uri),
-	]).then(async (...results) => {
-		// wait until all the settings are updated before syncing the data
-		for await (const retry of Array.from({ length: 10 })) {
-			if (
-				settings.get('Register_Server') === true &&
-				settings.get('Cloud_Workspace_Id') === workspaceId &&
-				settings.get('Cloud_Workspace_Name') === client_name &&
-				settings.get('Cloud_Workspace_Client_Id') === client_id &&
-				settings.get('Cloud_Workspace_Client_Secret') === client_secret &&
-				settings.get('Cloud_Workspace_Client_Secret_Expires_At') === client_secret_expires_at &&
-				settings.get('Cloud_Workspace_PublicKey') === publicKey &&
-				settings.get('Cloud_Workspace_Registration_Client_Uri') === registration_client_uri
-			) {
-				break;
-			}
+	const settingsData = [
+		{ _id: 'Register_Server', value: true },
+		{ _id: 'Cloud_Workspace_Id', value: workspaceId },
+		{ _id: 'Cloud_Workspace_Name', value: client_name },
+		{ _id: 'Cloud_Workspace_Client_Id', value: client_id },
+		{ _id: 'Cloud_Workspace_Client_Secret', value: client_secret },
+		{ _id: 'Cloud_Workspace_Client_Secret_Expires_At', value: client_secret_expires_at },
+		{ _id: 'Cloud_Workspace_PublicKey', value: publicKey },
+		{ _id: 'Cloud_Workspace_Registration_Client_Uri', value: registration_client_uri },
+	];
+
+	const promises = settingsData.map(({ _id, value }) => Settings.updateValueById(_id, value));
 
-			if (retry === 9) {
-				throw new Error('Failed to save registration data');
-			}
-			await new Promise((resolve) => setTimeout(resolve, 1000));
+	(await Promise.all(promises)).forEach((value, index) => {
+		if (value?.modifiedCount) {
+			void notifyOnSettingChangedById(settingsData[index]._id);
 		}
-		return results;
 	});
+
+	// TODO: Why is this taking so long that needs a timeout?
+	for await (const retry of Array.from({ length: 10 })) {
+		const isSettingsUpdated =
+			settings.get('Register_Server') === true &&
+			settings.get('Cloud_Workspace_Id') === workspaceId &&
+			settings.get('Cloud_Workspace_Name') === client_name &&
+			settings.get('Cloud_Workspace_Client_Id') === client_id &&
+			settings.get('Cloud_Workspace_Client_Secret') === client_secret &&
+			settings.get('Cloud_Workspace_Client_Secret_Expires_At') === client_secret_expires_at &&
+			settings.get('Cloud_Workspace_PublicKey') === publicKey &&
+			settings.get('Cloud_Workspace_Registration_Client_Uri') === registration_client_uri;
+
+		if (isSettingsUpdated) {
+			return;
+		}
+
+		if (retry === 9) {
+			throw new Error('Failed to save registration data');
+		}
+
+		await new Promise((resolve) => setTimeout(resolve, 1000));
+	}
 }
 
 export async function saveRegistrationDataManual({
diff --git a/apps/meteor/app/cloud/server/functions/startRegisterWorkspace.ts b/apps/meteor/app/cloud/server/functions/startRegisterWorkspace.ts
index 5f5df80d0d3d..1fb2dcc06449 100644
--- a/apps/meteor/app/cloud/server/functions/startRegisterWorkspace.ts
+++ b/apps/meteor/app/cloud/server/functions/startRegisterWorkspace.ts
@@ -2,6 +2,7 @@ import { Settings } from '@rocket.chat/models';
 import { serverFetch as fetch } from '@rocket.chat/server-fetch';
 
 import { SystemLogger } from '../../../../server/lib/logger/system';
+import { notifyOnSettingChangedById } from '../../../lib/server/lib/notifyListener';
 import { settings } from '../../../settings/server';
 import { buildWorkspaceRegistrationData } from './buildRegistrationData';
 import { retrieveRegistrationStatus } from './retrieveRegistrationStatus';
@@ -15,7 +16,7 @@ export async function startRegisterWorkspace(resend = false) {
 		return true;
 	}
 
-	await Settings.updateValueById('Register_Server', true);
+	(await Settings.updateValueById('Register_Server', true)).modifiedCount && void notifyOnSettingChangedById('Register_Server');
 
 	const regInfo = await buildWorkspaceRegistrationData(undefined);
 
diff --git a/apps/meteor/app/cloud/server/functions/supportedVersionsToken/supportedVersionsToken.ts b/apps/meteor/app/cloud/server/functions/supportedVersionsToken/supportedVersionsToken.ts
index a543c0681f38..f4334bd04d64 100644
--- a/apps/meteor/app/cloud/server/functions/supportedVersionsToken/supportedVersionsToken.ts
+++ b/apps/meteor/app/cloud/server/functions/supportedVersionsToken/supportedVersionsToken.ts
@@ -6,6 +6,7 @@ import type { Response } from '@rocket.chat/server-fetch';
 import { serverFetch as fetch } from '@rocket.chat/server-fetch';
 
 import { SystemLogger } from '../../../../../server/lib/logger/system';
+import { notifyOnSettingChangedById } from '../../../../lib/server/lib/notifyListener';
 import { settings } from '../../../../settings/server';
 import { supportedVersions as supportedVersionsFromBuild } from '../../../../utils/rocketchat-supported-versions.info';
 import { buildVersionUpdateMessage } from '../../../../version-check/server/functions/buildVersionUpdateMessage';
@@ -65,7 +66,7 @@ const cacheValueInSettings = <T extends SettingValue>(
 		SystemLogger.debug(`Resetting cached value ${key} in settings`);
 		const value = await fn();
 
-		await Settings.updateValueById(key, value);
+		(await Settings.updateValueById(key, value)).modifiedCount && void notifyOnSettingChangedById(key);
 
 		return value;
 	};
diff --git a/apps/meteor/app/cloud/server/functions/syncWorkspace/legacySyncWorkspace.ts b/apps/meteor/app/cloud/server/functions/syncWorkspace/legacySyncWorkspace.ts
index 91202d973170..f2e66bfdf9f7 100644
--- a/apps/meteor/app/cloud/server/functions/syncWorkspace/legacySyncWorkspace.ts
+++ b/apps/meteor/app/cloud/server/functions/syncWorkspace/legacySyncWorkspace.ts
@@ -5,6 +5,7 @@ import { v, compile } from 'suretype';
 
 import { CloudWorkspaceConnectionError } from '../../../../../lib/errors/CloudWorkspaceConnectionError';
 import { CloudWorkspaceRegistrationError } from '../../../../../lib/errors/CloudWorkspaceRegistrationError';
+import { notifyOnSettingChangedById } from '../../../../lib/server/lib/notifyListener';
 import { settings } from '../../../../settings/server';
 import type { WorkspaceRegistrationData } from '../buildRegistrationData';
 import { buildWorkspaceRegistrationData } from '../buildRegistrationData';
@@ -126,11 +127,13 @@ const fetchWorkspaceClientPayload = async ({
 /** @deprecated */
 const consumeWorkspaceSyncPayload = async (result: Serialized<Cloud.WorkspaceSyncPayload>) => {
 	if (result.publicKey) {
-		await Settings.updateValueById('Cloud_Workspace_PublicKey', result.publicKey);
+		(await Settings.updateValueById('Cloud_Workspace_PublicKey', result.publicKey)).modifiedCount &&
+			void notifyOnSettingChangedById('Cloud_Workspace_PublicKey');
 	}
 
 	if (result.trial?.trialID) {
-		await Settings.updateValueById('Cloud_Workspace_Had_Trial', true);
+		(await Settings.updateValueById('Cloud_Workspace_Had_Trial', true)).modifiedCount &&
+			void notifyOnSettingChangedById('Cloud_Workspace_Had_Trial');
 	}
 
 	// add banners
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 99a7497f13c7..264443a1378b 100644
--- a/apps/meteor/app/error-handler/server/lib/RocketChat.ErrorHandler.ts
+++ b/apps/meteor/app/error-handler/server/lib/RocketChat.ErrorHandler.ts
@@ -3,10 +3,17 @@ 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).catch(console.error);
+	Settings.incrementValueById('Uncaught_Exceptions_Count', counter, { returnDocument: 'after' })
+		.then(({ value }) => {
+			if (value) {
+				void notifyOnSettingChanged(value);
+			}
+		})
+		.catch(console.error);
 }, 10000);
 
 class ErrorHandler {
diff --git a/apps/meteor/app/federation/server/functions/helpers.ts b/apps/meteor/app/federation/server/functions/helpers.ts
index 3b9090311e01..c684b7b8f74a 100644
--- a/apps/meteor/app/federation/server/functions/helpers.ts
+++ b/apps/meteor/app/federation/server/functions/helpers.ts
@@ -2,6 +2,7 @@ import { isDirectMessageRoom } from '@rocket.chat/core-typings';
 import type { ISubscription, IUser, IRoom } from '@rocket.chat/core-typings';
 import { Settings, Users, Subscriptions } from '@rocket.chat/models';
 
+import { notifyOnSettingChangedById } from '../../../lib/server/lib/notifyListener';
 import { STATUS_ENABLED, STATUS_REGISTERING } from '../constants';
 
 export const getNameAndDomain = (fullyQualifiedName: string): string[] => fullyQualifiedName.split('@');
@@ -14,11 +15,12 @@ export async function isRegisteringOrEnabled(): Promise<boolean> {
 }
 
 export async function updateStatus(status: string): Promise<void> {
+	// No need to call ws listener because current function is called on startup
 	await Settings.updateValueById('FEDERATION_Status', status);
 }
 
 export async function updateEnabled(enabled: boolean): Promise<void> {
-	await Settings.updateValueById('FEDERATION_Enabled', enabled);
+	(await Settings.updateValueById('FEDERATION_Enabled', enabled)).modifiedCount && void notifyOnSettingChangedById('FEDERATION_Enabled');
 }
 
 export const checkRoomType = (room: IRoom): boolean => room.t === 'p' || room.t === 'd';
diff --git a/apps/meteor/app/importer-csv/server/CsvImporter.ts b/apps/meteor/app/importer-csv/server/CsvImporter.ts
index 302aeb882ac5..60c07c3288ce 100644
--- a/apps/meteor/app/importer-csv/server/CsvImporter.ts
+++ b/apps/meteor/app/importer-csv/server/CsvImporter.ts
@@ -7,6 +7,7 @@ import { Importer, ProgressStep, ImporterWebsocket } from '../../importer/server
 import type { IConverterOptions } from '../../importer/server/classes/ImportDataConverter';
 import type { ImporterProgress } from '../../importer/server/classes/ImporterProgress';
 import type { ImporterInfo } from '../../importer/server/definitions/ImporterInfo';
+import { notifyOnSettingChanged } from '../../lib/server/lib/notifyListener';
 
 export class CsvImporter extends Importer {
 	private csvParser: (csv: string) => string[];
@@ -236,7 +237,10 @@ export class CsvImporter extends Importer {
 		}
 
 		if (usersCount) {
-			await Settings.incrementValueById('CSV_Importer_Count', usersCount);
+			const { value } = await Settings.incrementValueById('CSV_Importer_Count', usersCount, { returnDocument: 'after' });
+			if (value) {
+				void notifyOnSettingChanged(value);
+			}
 		}
 
 		// Check if any of the message usernames was not in the imported list of users
diff --git a/apps/meteor/app/importer-hipchat-enterprise/server/HipChatEnterpriseImporter.js b/apps/meteor/app/importer-hipchat-enterprise/server/HipChatEnterpriseImporter.js
index ac3d278d82ab..663300e44154 100644
--- a/apps/meteor/app/importer-hipchat-enterprise/server/HipChatEnterpriseImporter.js
+++ b/apps/meteor/app/importer-hipchat-enterprise/server/HipChatEnterpriseImporter.js
@@ -6,6 +6,7 @@ import { Settings } from '@rocket.chat/models';
 import { Meteor } from 'meteor/meteor';
 
 import { Importer, ProgressStep } from '../../importer/server';
+import { notifyOnSettingChanged } from '../../lib/server/lib/notifyListener';
 
 /** @deprecated HipChat was discontinued at 2019-02-15 */
 export class HipChatEnterpriseImporter extends Importer {
@@ -54,7 +55,11 @@ export class HipChatEnterpriseImporter extends Importer {
 			this.converter.addUser(newUser);
 		}
 
-		await Settings.incrementValueById('Hipchat_Enterprise_Importer_Count', count);
+		const { value } = await Settings.incrementValueById('Hipchat_Enterprise_Importer_Count', count, { returnDocument: 'after' });
+		if (value) {
+			void notifyOnSettingChanged(value);
+		}
+
 		await super.updateRecord({ 'count.users': count });
 		await super.addCountToTotal(count);
 	}
diff --git a/apps/meteor/app/importer-slack-users/server/SlackUsersImporter.ts b/apps/meteor/app/importer-slack-users/server/SlackUsersImporter.ts
index 2c26531bd5c4..95461820bf2d 100644
--- a/apps/meteor/app/importer-slack-users/server/SlackUsersImporter.ts
+++ b/apps/meteor/app/importer-slack-users/server/SlackUsersImporter.ts
@@ -9,6 +9,7 @@ import { Importer, ProgressStep } from '../../importer/server';
 import type { IConverterOptions } from '../../importer/server/classes/ImportDataConverter';
 import type { ImporterProgress } from '../../importer/server/classes/ImporterProgress';
 import type { ImporterInfo } from '../../importer/server/definitions/ImporterInfo';
+import { notifyOnSettingChanged } from '../../lib/server/lib/notifyListener';
 
 export class SlackUsersImporter extends Importer {
 	private csvParser: (csv: string) => string[];
@@ -93,7 +94,12 @@ export class SlackUsersImporter extends Importer {
 
 		await super.updateProgress(ProgressStep.USER_SELECTION);
 		await super.addCountToTotal(userCount);
-		await Settings.incrementValueById('Slack_Users_Importer_Count', userCount);
+
+		const { value } = await Settings.incrementValueById('Slack_Users_Importer_Count', userCount, { returnDocument: 'after' });
+		if (value) {
+			void notifyOnSettingChanged(value);
+		}
+
 		await super.updateRecord({ 'count.users': userCount });
 		return super.getProgress();
 	}
diff --git a/apps/meteor/app/importer-slack/server/SlackImporter.ts b/apps/meteor/app/importer-slack/server/SlackImporter.ts
index 0ef81c69a1e0..344db6656531 100644
--- a/apps/meteor/app/importer-slack/server/SlackImporter.ts
+++ b/apps/meteor/app/importer-slack/server/SlackImporter.ts
@@ -4,6 +4,7 @@ import type { IZipEntry } from 'adm-zip';
 
 import { Importer, ProgressStep, ImporterWebsocket } from '../../importer/server';
 import type { ImporterProgress } from '../../importer/server/classes/ImporterProgress';
+import { notifyOnSettingChanged } from '../../lib/server/lib/notifyListener';
 import { MentionsParser } from '../../mentions/lib/MentionsParser';
 import { settings } from '../../settings/server';
 import { getUserAvatarURL } from '../../utils/server/getUserAvatarURL';
@@ -337,7 +338,10 @@ export class SlackImporter extends Importer {
 			}
 
 			if (userCount) {
-				await Settings.incrementValueById('Slack_Importer_Count', userCount);
+				const { value } = await Settings.incrementValueById('Slack_Importer_Count', userCount, { returnDocument: 'after' });
+				if (value) {
+					void notifyOnSettingChanged(value);
+				}
 			}
 
 			const missedTypes: Record<string, SlackMessage> = {};
diff --git a/apps/meteor/app/importer/server/classes/Importer.ts b/apps/meteor/app/importer/server/classes/Importer.ts
index 68a12513a06c..846f9ef4b4f5 100644
--- a/apps/meteor/app/importer/server/classes/Importer.ts
+++ b/apps/meteor/app/importer/server/classes/Importer.ts
@@ -7,6 +7,7 @@ import type { MatchKeysAndValues, MongoServerError } from 'mongodb';
 
 import { Selection, SelectionChannel, SelectionUser } from '..';
 import { callbacks } from '../../../../lib/callbacks';
+import { notifyOnSettingChangedById } from '../../../lib/server/lib/notifyListener';
 import { t } from '../../../utils/lib/i18n';
 import { ProgressStep, ImportPreparingStartedStates } from '../../lib/ImporterProgressStep';
 import type { ImporterInfo } from '../definitions/ImporterInfo';
@@ -245,10 +246,20 @@ export class Importer {
 	}
 
 	async applySettingValues(settingValues: OldSettings) {
-		await Settings.updateValueById('Accounts_AllowUsernameChange', settingValues.allowUsernameChange ?? true);
-		await Settings.updateValueById('FileUpload_MaxFileSize', settingValues.maxFileSize ?? -1);
-		await Settings.updateValueById('FileUpload_MediaTypeWhiteList', settingValues.mediaTypeWhiteList ?? '*');
-		await Settings.updateValueById('FileUpload_MediaTypeBlackList', settingValues.mediaTypeBlackList ?? '');
+		const settingsIds = [
+			{ _id: 'Accounts_AllowUsernameChange', value: settingValues.allowUsernameChange ?? true },
+			{ _id: 'FileUpload_MaxFileSize', value: settingValues.maxFileSize ?? -1 },
+			{ _id: 'FileUpload_MediaTypeWhiteList', value: settingValues.mediaTypeWhiteList ?? '*' },
+			{ _id: 'FileUpload_MediaTypeBlackList', value: settingValues.mediaTypeBlackList ?? '' },
+		];
+
+		const promises = settingsIds.map((setting) => Settings.updateValueById(setting._id, setting.value));
+
+		(await Promise.all(promises)).forEach((value, index) => {
+			if (value?.modifiedCount) {
+				void notifyOnSettingChangedById(settingsIds[index]._id);
+			}
+		});
 	}
 
 	getProgress(): ImporterProgress {
diff --git a/apps/meteor/app/invites/server/functions/sendInvitationEmail.ts b/apps/meteor/app/invites/server/functions/sendInvitationEmail.ts
index 1c00671ae41d..87b8133e3491 100644
--- a/apps/meteor/app/invites/server/functions/sendInvitationEmail.ts
+++ b/apps/meteor/app/invites/server/functions/sendInvitationEmail.ts
@@ -3,6 +3,7 @@ import { check } from 'meteor/check';
 import { Meteor } from 'meteor/meteor';
 
 import { hasPermissionAsync } from '../../../authorization/server/functions/hasPermission';
+import { notifyOnSettingChanged } from '../../../lib/server/lib/notifyListener';
 import * as Mailer from '../../../mailer/server/api';
 import { settings } from '../../../settings/server';
 
@@ -53,7 +54,11 @@ export const sendInvitationEmail = async (userId: string, emails: string[]) => {
 				},
 			});
 
-			await Settings.incrementValueById('Invitation_Email_Count');
+			const { value } = await Settings.incrementValueById('Invitation_Email_Count', 1, { returnDocument: 'after' });
+			if (value) {
+				void notifyOnSettingChanged(value);
+			}
+
 			continue;
 		} catch ({ message }: any) {
 			throw new Meteor.Error('error-email-send-failed', `Error trying to send email: ${message}`, {
diff --git a/apps/meteor/app/irc/server/irc-bridge/index.js b/apps/meteor/app/irc/server/irc-bridge/index.js
index 9ab6c47987d0..09b7a3568362 100644
--- a/apps/meteor/app/irc/server/irc-bridge/index.js
+++ b/apps/meteor/app/irc/server/irc-bridge/index.js
@@ -7,6 +7,7 @@ import { callbacks } from '../../../../lib/callbacks';
 import { afterLeaveRoomCallback } from '../../../../lib/callbacks/afterLeaveRoomCallback';
 import { afterLogoutCleanUpCallback } from '../../../../lib/callbacks/afterLogoutCleanUpCallback';
 import { withThrottling } from '../../../../lib/utils/highOrderFunctions';
+import { notifyOnSettingChangedById } from '../../../lib/server/lib/notifyListener';
 import * as servers from '../servers';
 import * as localCommandHandlers from './localHandlers';
 import * as peerCommandHandlers from './peerHandlers';
@@ -19,15 +20,13 @@ const updateLastPing = withThrottling({ wait: 10_000 })(() => {
 	if (removed) {
 		return;
 	}
-	void Settings.updateOne(
-		{ _id: 'IRC_Bridge_Last_Ping' },
-		{
-			$set: {
-				value: new Date(),
-			},
-		},
-		{ upsert: true },
-	);
+
+	void (async () => {
+		const updatedValue = await Settings.updateValueById('IRC_Bridge_Last_Ping', new Date(), { upsert: true });
+		if (updatedValue.modifiedCount || updatedValue.upsertedCount) {
+			void notifyOnSettingChangedById('IRC_Bridge_Last_Ping');
+		}
+	})();
 });
 
 class Bridge {
diff --git a/apps/meteor/app/irc/server/methods/resetIrcConnection.ts b/apps/meteor/app/irc/server/methods/resetIrcConnection.ts
index 1bbc5b6a3ef8..24eef975d5d5 100644
--- a/apps/meteor/app/irc/server/methods/resetIrcConnection.ts
+++ b/apps/meteor/app/irc/server/methods/resetIrcConnection.ts
@@ -2,6 +2,7 @@ import { Settings } from '@rocket.chat/models';
 import type { ServerMethods } from '@rocket.chat/ui-contexts';
 import { Meteor } from 'meteor/meteor';
 
+import { notifyOnSettingChangedById } from '../../../lib/server/lib/notifyListener';
 import { settings } from '../../../settings/server';
 import Bridge from '../irc-bridge';
 
@@ -16,29 +17,15 @@ Meteor.methods<ServerMethods>({
 	async resetIrcConnection() {
 		const ircEnabled = Boolean(settings.get('IRC_Enabled'));
 
-		await Settings.updateOne(
-			{ _id: 'IRC_Bridge_Last_Ping' },
-			{
-				$set: {
-					value: new Date(0),
-				},
-			},
-			{
-				upsert: true,
-			},
-		);
+		const updatedLastPingValue = await Settings.updateValueById('IRC_Bridge_Last_Ping', new Date(0), { upsert: true });
+		if (updatedLastPingValue.modifiedCount || updatedLastPingValue.upsertedCount) {
+			void notifyOnSettingChangedById('IRC_Bridge_Last_Ping');
+		}
 
-		await Settings.updateOne(
-			{ _id: 'IRC_Bridge_Reset_Time' },
-			{
-				$set: {
-					value: new Date(),
-				},
-			},
-			{
-				upsert: true,
-			},
-		);
+		const updatedResetTimeValue = await Settings.updateValueById('IRC_Bridge_Reset_Time', new Date(), { upsert: true });
+		if (updatedResetTimeValue.modifiedCount || updatedResetTimeValue.upsertedCount) {
+			void notifyOnSettingChangedById('IRC_Bridge_Last_Ping');
+		}
 
 		if (!ircEnabled) {
 			return {
diff --git a/apps/meteor/app/lib/server/lib/notifyListener.ts b/apps/meteor/app/lib/server/lib/notifyListener.ts
index 8ba5f45c4ae7..5fae0b083980 100644
--- a/apps/meteor/app/lib/server/lib/notifyListener.ts
+++ b/apps/meteor/app/lib/server/lib/notifyListener.ts
@@ -14,6 +14,7 @@ import type {
 	IEmailInbox,
 	IIntegrationHistory,
 	AtLeast,
+	ISettingColor,
 } from '@rocket.chat/core-typings';
 import {
 	Rooms,
@@ -105,14 +106,6 @@ export async function notifyOnRoomChangedByUserDM<T extends IRoom>(
 	}
 }
 
-export async function notifyOnSettingChanged(setting: ISetting, clientAction: ClientAction = 'updated'): Promise<void> {
-	if (!dbWatchersDisabled) {
-		return;
-	}
-
-	void api.broadcast('watch.settings', { clientAction, setting });
-}
-
 export async function notifyOnPermissionChanged(permission: IPermission, clientAction: ClientAction = 'updated'): Promise<void> {
 	if (!dbWatchersDisabled) {
 		return;
@@ -353,3 +346,28 @@ export async function notifyOnLivechatDepartmentAgentChangedByAgentsAndDepartmen
 		void api.broadcast('watch.livechatDepartmentAgents', { clientAction, id: item._id, data: item });
 	}
 }
+
+export async function notifyOnSettingChanged(
+	setting: ISetting & { editor?: ISettingColor['editor'] },
+	clientAction: ClientAction = 'updated',
+): Promise<void> {
+	if (!dbWatchersDisabled) {
+		return;
+	}
+
+	void api.broadcast('watch.settings', { clientAction, setting });
+}
+
+export async function notifyOnSettingChangedById(id: ISetting['_id'], clientAction: ClientAction = 'updated'): Promise<void> {
+	if (!dbWatchersDisabled) {
+		return;
+	}
+
+	const item = clientAction === 'removed' ? await Settings.trashFindOneById(id) : await Settings.findOneById(id);
+
+	if (!item) {
+		return;
+	}
+
+	void api.broadcast('watch.settings', { clientAction, setting: item });
+}
diff --git a/apps/meteor/app/lib/server/methods/removeOAuthService.ts b/apps/meteor/app/lib/server/methods/removeOAuthService.ts
index 6d1bb688979d..6e16dc8d2d5b 100644
--- a/apps/meteor/app/lib/server/methods/removeOAuthService.ts
+++ b/apps/meteor/app/lib/server/methods/removeOAuthService.ts
@@ -5,6 +5,7 @@ import { check } from 'meteor/check';
 import { Meteor } from 'meteor/meteor';
 
 import { hasPermissionAsync } from '../../../authorization/server/functions/hasPermission';
+import { notifyOnSettingChangedById } from '../lib/notifyListener';
 
 declare module '@rocket.chat/ui-contexts' {
 	// eslint-disable-next-line @typescript-eslint/naming-convention
@@ -31,37 +32,46 @@ Meteor.methods<ServerMethods>({
 
 		name = name.toLowerCase().replace(/[^a-z0-9_]/g, '');
 		name = capitalize(name);
-		await Promise.all([
-			Settings.removeById(`Accounts_OAuth_Custom-${name}`),
-			Settings.removeById(`Accounts_OAuth_Custom-${name}-url`),
-			Settings.removeById(`Accounts_OAuth_Custom-${name}-token_path`),
-			Settings.removeById(`Accounts_OAuth_Custom-${name}-identity_path`),
-			Settings.removeById(`Accounts_OAuth_Custom-${name}-authorize_path`),
-			Settings.removeById(`Accounts_OAuth_Custom-${name}-scope`),
-			Settings.removeById(`Accounts_OAuth_Custom-${name}-access_token_param`),
-			Settings.removeById(`Accounts_OAuth_Custom-${name}-token_sent_via`),
-			Settings.removeById(`Accounts_OAuth_Custom-${name}-identity_token_sent_via`),
-			Settings.removeById(`Accounts_OAuth_Custom-${name}-id`),
-			Settings.removeById(`Accounts_OAuth_Custom-${name}-secret`),
-			Settings.removeById(`Accounts_OAuth_Custom-${name}-button_label_text`),
-			Settings.removeById(`Accounts_OAuth_Custom-${name}-button_label_color`),
-			Settings.removeById(`Accounts_OAuth_Custom-${name}-button_color`),
-			Settings.removeById(`Accounts_OAuth_Custom-${name}-login_style`),
-			Settings.removeById(`Accounts_OAuth_Custom-${name}-key_field`),
-			Settings.removeById(`Accounts_OAuth_Custom-${name}-username_field`),
-			Settings.removeById(`Accounts_OAuth_Custom-${name}-email_field`),
-			Settings.removeById(`Accounts_OAuth_Custom-${name}-name_field`),
-			Settings.removeById(`Accounts_OAuth_Custom-${name}-avatar_field`),
-			Settings.removeById(`Accounts_OAuth_Custom-${name}-roles_claim`),
-			Settings.removeById(`Accounts_OAuth_Custom-${name}-merge_roles`),
-			Settings.removeById(`Accounts_OAuth_Custom-${name}-roles_to_sync`),
-			Settings.removeById(`Accounts_OAuth_Custom-${name}-merge_users`),
-			Settings.removeById(`Accounts_OAuth_Custom-${name}-show_button`),
-			Settings.removeById(`Accounts_OAuth_Custom-${name}-groups_claim`),
-			Settings.removeById(`Accounts_OAuth_Custom-${name}-channels_admin`),
-			Settings.removeById(`Accounts_OAuth_Custom-${name}-map_channels`),
-			Settings.removeById(`Accounts_OAuth_Custom-${name}-groups_channel_map`),
-			Settings.removeById(`Accounts_OAuth_Custom-${name}-merge_users_distinct_services`),
-		]);
+
+		const settingsIds = [
+			`Accounts_OAuth_Custom-${name}`,
+			`Accounts_OAuth_Custom-${name}-url`,
+			`Accounts_OAuth_Custom-${name}-token_path`,
+			`Accounts_OAuth_Custom-${name}-identity_path`,
+			`Accounts_OAuth_Custom-${name}-authorize_path`,
+			`Accounts_OAuth_Custom-${name}-scope`,
+			`Accounts_OAuth_Custom-${name}-access_token_param`,
+			`Accounts_OAuth_Custom-${name}-token_sent_via`,
+			`Accounts_OAuth_Custom-${name}-identity_token_sent_via`,
+			`Accounts_OAuth_Custom-${name}-id`,
+			`Accounts_OAuth_Custom-${name}-secret`,
+			`Accounts_OAuth_Custom-${name}-button_label_text`,
+			`Accounts_OAuth_Custom-${name}-button_label_color`,
+			`Accounts_OAuth_Custom-${name}-button_color`,
+			`Accounts_OAuth_Custom-${name}-login_style`,
+			`Accounts_OAuth_Custom-${name}-key_field`,
+			`Accounts_OAuth_Custom-${name}-username_field`,
+			`Accounts_OAuth_Custom-${name}-email_field`,
+			`Accounts_OAuth_Custom-${name}-name_field`,
+			`Accounts_OAuth_Custom-${name}-avatar_field`,
+			`Accounts_OAuth_Custom-${name}-roles_claim`,
+			`Accounts_OAuth_Custom-${name}-merge_roles`,
+			`Accounts_OAuth_Custom-${name}-roles_to_sync`,
+			`Accounts_OAuth_Custom-${name}-merge_users`,
+			`Accounts_OAuth_Custom-${name}-show_button`,
+			`Accounts_OAuth_Custom-${name}-groups_claim`,
+			`Accounts_OAuth_Custom-${name}-channels_admin`,
+			`Accounts_OAuth_Custom-${name}-map_channels`,
+			`Accounts_OAuth_Custom-${name}-groups_channel_map`,
+			`Accounts_OAuth_Custom-${name}-merge_users_distinct_services`,
+		];
+
+		const promises = settingsIds.map((id) => Settings.removeById(id));
+
+		(await Promise.all(promises)).forEach((value, index) => {
+			if (value?.deletedCount) {
+				void notifyOnSettingChangedById(settingsIds[index], 'removed');
+			}
+		});
 	},
 });
diff --git a/apps/meteor/app/lib/server/methods/saveSetting.ts b/apps/meteor/app/lib/server/methods/saveSetting.ts
index d6cd62dc7470..7f900d1751d8 100644
--- a/apps/meteor/app/lib/server/methods/saveSetting.ts
+++ b/apps/meteor/app/lib/server/methods/saveSetting.ts
@@ -7,6 +7,7 @@ import { Meteor } from 'meteor/meteor';
 import { twoFactorRequired } from '../../../2fa/server/twoFactorRequired';
 import { getSettingPermissionId } from '../../../authorization/lib';
 import { hasPermissionAsync, hasAllPermissionAsync } from '../../../authorization/server/functions/hasPermission';
+import { notifyOnSettingChanged } from '../lib/notifyListener';
 
 declare module '@rocket.chat/ui-contexts' {
 	// eslint-disable-next-line @typescript-eslint/naming-convention
@@ -56,7 +57,10 @@ Meteor.methods<ServerMethods>({
 				break;
 		}
 
-		await Settings.updateValueAndEditorById(_id, value as SettingValue, editor);
+		(await Settings.updateValueAndEditorById(_id, value as SettingValue, editor)).modifiedCount &&
+			setting &&
+			void notifyOnSettingChanged({ ...setting, editor, value: value as SettingValue });
+
 		return true;
 	}),
 });
diff --git a/apps/meteor/app/lib/server/methods/saveSettings.ts b/apps/meteor/app/lib/server/methods/saveSettings.ts
index 6d7c0927c3f8..93e884c9f77e 100644
--- a/apps/meteor/app/lib/server/methods/saveSettings.ts
+++ b/apps/meteor/app/lib/server/methods/saveSettings.ts
@@ -9,6 +9,7 @@ import { twoFactorRequired } from '../../../2fa/server/twoFactorRequired';
 import { getSettingPermissionId } from '../../../authorization/lib';
 import { hasPermissionAsync } from '../../../authorization/server/functions/hasPermission';
 import { settings } from '../../../settings/server';
+import { notifyOnSettingChangedById } from '../lib/notifyListener';
 
 declare module '@rocket.chat/ui-contexts' {
 	// eslint-disable-next-line @typescript-eslint/naming-convention
@@ -107,7 +108,13 @@ Meteor.methods<ServerMethods>({
 				});
 			}
 
-			await Promise.all(params.map(({ _id, value }) => Settings.updateValueById(_id, value)));
+			const promises = params.map(({ _id, value }) => Settings.updateValueById(_id, value));
+
+			(await Promise.all(promises)).forEach((value, index) => {
+				if (value?.modifiedCount) {
+					void notifyOnSettingChangedById(params[index]._id);
+				}
+			});
 
 			return true;
 		},
diff --git a/apps/meteor/app/livechat/imports/server/rest/appearance.ts b/apps/meteor/app/livechat/imports/server/rest/appearance.ts
index 02239bc0edc5..48863fc9e5d3 100644
--- a/apps/meteor/app/livechat/imports/server/rest/appearance.ts
+++ b/apps/meteor/app/livechat/imports/server/rest/appearance.ts
@@ -4,6 +4,7 @@ import { isPOSTLivechatAppearanceParams } from '@rocket.chat/rest-typings';
 
 import { isTruthy } from '../../../../../lib/isTruthy';
 import { API } from '../../../../api/server';
+import { notifyOnSettingChangedById } from '../../../../lib/server/lib/notifyListener';
 import { findAppearance } from '../../../server/api/lib/appearance';
 
 API.v1.addRoute(
@@ -89,11 +90,13 @@ API.v1.addRoute(
 				})
 				.toArray();
 
-			await Promise.all(
-				dbSettings.filter(isTruthy).map((setting) => {
-					return Settings.updateValueById(setting._id, setting.value);
-				}),
-			);
+			const eligibleSettings = dbSettings.filter(isTruthy);
+			const promises = eligibleSettings.map(({ _id, value }) => Settings.updateValueById(_id, value));
+			(await Promise.all(promises)).forEach((value, index) => {
+				if (value?.modifiedCount) {
+					void notifyOnSettingChangedById(eligibleSettings[index]._id);
+				}
+			});
 
 			return API.v1.success();
 		},
diff --git a/apps/meteor/app/livechat/server/api/v1/integration.ts b/apps/meteor/app/livechat/server/api/v1/integration.ts
index 6cf8ffd52192..a1f9c59ffb87 100644
--- a/apps/meteor/app/livechat/server/api/v1/integration.ts
+++ b/apps/meteor/app/livechat/server/api/v1/integration.ts
@@ -3,6 +3,7 @@ import { isPOSTomnichannelIntegrations } from '@rocket.chat/rest-typings';
 
 import { trim } from '../../../../../lib/utils/stringUtils';
 import { API } from '../../../../api/server';
+import { notifyOnSettingChangedById } from '../../../../lib/server/lib/notifyListener';
 
 API.v1.addRoute(
 	'omnichannel/integrations',
@@ -23,53 +24,40 @@ API.v1.addRoute(
 				LivechatWebhookOnAgentMessage,
 			} = this.bodyParams;
 
-			const promises = [];
+			const settingsIds = [
+				typeof LivechatWebhookUrl !== 'undefined' && { _id: 'Livechat_webhookUrl', value: trim(LivechatWebhookUrl) },
+				typeof LivechatSecretToken !== 'undefined' && { _id: 'Livechat_secret_token', value: trim(LivechatSecretToken) },
+				typeof LivechatHttpTimeout !== 'undefined' && { _id: 'Livechat_http_timeout', value: LivechatHttpTimeout },
+				typeof LivechatWebhookOnStart !== 'undefined' && { _id: 'Livechat_webhook_on_start', value: !!LivechatWebhookOnStart },
+				typeof LivechatWebhookOnClose !== 'undefined' && { _id: 'Livechat_webhook_on_close', value: !!LivechatWebhookOnClose },
+				typeof LivechatWebhookOnChatTaken !== 'undefined' && { _id: 'Livechat_webhook_on_chat_taken', value: !!LivechatWebhookOnChatTaken },
+				typeof LivechatWebhookOnChatQueued !== 'undefined' && {
+					_id: 'Livechat_webhook_on_chat_queued',
+					value: !!LivechatWebhookOnChatQueued,
+				},
+				typeof LivechatWebhookOnForward !== 'undefined' && { _id: 'Livechat_webhook_on_forward', value: !!LivechatWebhookOnForward },
+				typeof LivechatWebhookOnOfflineMsg !== 'undefined' && {
+					_id: 'Livechat_webhook_on_offline_msg',
+					value: !!LivechatWebhookOnOfflineMsg,
+				},
+				typeof LivechatWebhookOnVisitorMessage !== 'undefined' && {
+					_id: 'Livechat_webhook_on_visitor_message',
+					value: !!LivechatWebhookOnVisitorMessage,
+				},
+				typeof LivechatWebhookOnAgentMessage !== 'undefined' && {
+					_id: 'Livechat_webhook_on_agent_message',
+					value: !!LivechatWebhookOnAgentMessage,
+				},
+			].filter(Boolean) as unknown as { _id: string; value: any }[];
 
-			if (typeof LivechatWebhookUrl !== 'undefined') {
-				promises.push(Settings.updateValueById('Livechat_webhookUrl', trim(LivechatWebhookUrl)));
-			}
+			const promises = settingsIds.map((setting) => Settings.updateValueById(setting._id, setting.value));
 
-			if (typeof LivechatSecretToken !== 'undefined') {
-				promises.push(Settings.updateValueById('Livechat_secret_token', trim(LivechatSecretToken)));
-			}
+			(await Promise.all(promises)).forEach((value, index) => {
+				if (value?.modifiedCount) {
+					void notifyOnSettingChangedById(settingsIds[index]._id);
+				}
+			});
 
-			if (typeof LivechatHttpTimeout !== 'undefined') {
-				promises.push(Settings.updateValueById('Livechat_http_timeout', LivechatHttpTimeout));
-			}
-
-			if (typeof LivechatWebhookOnStart !== 'undefined') {
-				promises.push(Settings.updateValueById('Livechat_webhook_on_start', !!LivechatWebhookOnStart));
-			}
-
-			if (typeof LivechatWebhookOnClose !== 'undefined') {
-				promises.push(Settings.updateValueById('Livechat_webhook_on_close', !!LivechatWebhookOnClose));
-			}
-
-			if (typeof LivechatWebhookOnChatTaken !== 'undefined') {
-				promises.push(Settings.updateValueById('Livechat_webhook_on_chat_taken', !!LivechatWebhookOnChatTaken));
-			}
-
-			if (typeof LivechatWebhookOnChatQueued !== 'undefined') {
-				promises.push(Settings.updateValueById('Livechat_webhook_on_chat_queued', !!LivechatWebhookOnChatQueued));
-			}
-
-			if (typeof LivechatWebhookOnForward !== 'undefined') {
-				promises.push(Settings.updateValueById('Livechat_webhook_on_forward', !!LivechatWebhookOnForward));
-			}
-
-			if (typeof LivechatWebhookOnOfflineMsg !== 'undefined') {
-				promises.push(Settings.updateValueById('Livechat_webhook_on_offline_msg', !!LivechatWebhookOnOfflineMsg));
-			}
-
-			if (typeof LivechatWebhookOnVisitorMessage !== 'undefined') {
-				promises.push(Settings.updateValueById('Livechat_webhook_on_visitor_message', !!LivechatWebhookOnVisitorMessage));
-			}
-
-			if (typeof LivechatWebhookOnAgentMessage !== 'undefined') {
-				promises.push(Settings.updateValueById('Livechat_webhook_on_agent_message', !!LivechatWebhookOnAgentMessage));
-			}
-
-			await Promise.all(promises);
 			return API.v1.success();
 		},
 	},
diff --git a/apps/meteor/app/livechat/server/api/v1/videoCall.ts b/apps/meteor/app/livechat/server/api/v1/videoCall.ts
index 8cbf9e100deb..dd9c701e6495 100644
--- a/apps/meteor/app/livechat/server/api/v1/videoCall.ts
+++ b/apps/meteor/app/livechat/server/api/v1/videoCall.ts
@@ -6,7 +6,7 @@ import { isGETWebRTCCall, isPUTWebRTCCallId } from '@rocket.chat/rest-typings';
 import { i18n } from '../../../../../server/lib/i18n';
 import { API } from '../../../../api/server';
 import { canSendMessageAsync } from '../../../../authorization/server/functions/canSendMessage';
-import { notifyOnRoomChangedById } from '../../../../lib/server/lib/notifyListener';
+import { notifyOnRoomChangedById, notifyOnSettingChanged } from '../../../../lib/server/lib/notifyListener';
 import { settings as rcSettings } from '../../../../settings/server';
 import { Livechat } from '../../lib/LivechatTyped';
 import { settings } from '../lib/livechat';
@@ -46,14 +46,20 @@ API.v1.addRoute(
 			let { callStatus } = room;
 
 			if (!callStatus || callStatus === 'ended' || callStatus === 'declined') {
-				await Settings.incrementValueById('WebRTC_Calls_Count');
+				const { value } = await Settings.incrementValueById('WebRTC_Calls_Count', 1, { returnDocument: 'after' });
+				if (value) {
+					void notifyOnSettingChanged(value);
+				}
+
 				callStatus = 'ringing';
-				await Rooms.setCallStatusAndCallStartTime(room._id, callStatus);
-				void notifyOnRoomChangedById(room._id);
+
+				(await Rooms.setCallStatusAndCallStartTime(room._id, callStatus)).modifiedCount && void notifyOnRoomChangedById(room._id);
+
 				await Message.saveSystemMessage('livechat_webrtc_video_call', room._id, i18n.t('Join_my_room_to_start_the_video_call'), this.user, {
 					actionLinks: config.theme.actionLinks.webrtc,
 				});
 			}
+
 			const videoCall = {
 				rid: room._id,
 				provider: 'webrtc',
diff --git a/apps/meteor/app/livechat/server/lib/QueueManager.ts b/apps/meteor/app/livechat/server/lib/QueueManager.ts
index 8be71aa4c991..e4f422e25788 100644
--- a/apps/meteor/app/livechat/server/lib/QueueManager.ts
+++ b/apps/meteor/app/livechat/server/lib/QueueManager.ts
@@ -7,6 +7,7 @@ import { Match, check } from 'meteor/check';
 import { Meteor } from 'meteor/meteor';
 
 import { callbacks } from '../../../../lib/callbacks';
+import { notifyOnSettingChanged } from '../../../lib/server/lib/notifyListener';
 import { checkServiceStatus, createLivechatRoom, createLivechatInquiry } from './Helper';
 import { RoutingManager } from './RoutingManager';
 
@@ -106,7 +107,11 @@ export const QueueManager: queueManager = {
 		}
 
 		void Apps.self?.triggerEvent(AppEvents.IPostLivechatRoomStarted, room);
-		await LivechatRooms.updateRoomCount();
+
+		const livechatSetting = await LivechatRooms.updateRoomCount();
+		if (livechatSetting) {
+			void notifyOnSettingChanged(livechatSetting);
+		}
 
 		await queueInquiry(inquiry, agent);
 		logger.debug(`Inquiry ${inquiry._id} queued`);
diff --git a/apps/meteor/app/livechat/server/methods/saveAppearance.ts b/apps/meteor/app/livechat/server/methods/saveAppearance.ts
index 35152d136afd..cac5d34264d2 100644
--- a/apps/meteor/app/livechat/server/methods/saveAppearance.ts
+++ b/apps/meteor/app/livechat/server/methods/saveAppearance.ts
@@ -4,6 +4,7 @@ import { Meteor } from 'meteor/meteor';
 
 import { hasPermissionAsync } from '../../../authorization/server/functions/hasPermission';
 import { methodDeprecationLogger } from '../../../lib/server/lib/deprecationWarningLogger';
+import { notifyOnSettingChangedById } from '../../../lib/server/lib/notifyListener';
 
 declare module '@rocket.chat/ui-contexts' {
 	// eslint-disable-next-line @typescript-eslint/naming-convention
@@ -15,6 +16,7 @@ declare module '@rocket.chat/ui-contexts' {
 Meteor.methods<ServerMethods>({
 	async 'livechat:saveAppearance'(settings) {
 		methodDeprecationLogger.method('livechat:saveAppearance', '7.0.0');
+
 		const uid = Meteor.userId();
 		if (!uid || !(await hasPermissionAsync(uid, 'view-livechat-manager'))) {
 			throw new Meteor.Error('error-not-allowed', 'Not allowed', {
@@ -50,10 +52,12 @@ Meteor.methods<ServerMethods>({
 			throw new Meteor.Error('invalid-setting');
 		}
 
-		await Promise.all(
-			settings.map((setting) => {
-				return Settings.updateValueById(setting._id, setting.value);
-			}),
-		);
+		const promises = settings.map((setting) => Settings.updateValueById(setting._id, setting.value));
+
+		(await Promise.all(promises)).forEach((value, index) => {
+			if (value?.modifiedCount) {
+				void notifyOnSettingChangedById(settings[index]._id);
+			}
+		});
 	},
 });
diff --git a/apps/meteor/app/livechat/server/methods/saveIntegration.ts b/apps/meteor/app/livechat/server/methods/saveIntegration.ts
index 18bad34f0aea..de7461d08e10 100644
--- a/apps/meteor/app/livechat/server/methods/saveIntegration.ts
+++ b/apps/meteor/app/livechat/server/methods/saveIntegration.ts
@@ -5,6 +5,7 @@ import { Meteor } from 'meteor/meteor';
 import { trim } from '../../../../lib/utils/stringUtils';
 import { hasPermissionAsync } from '../../../authorization/server/functions/hasPermission';
 import { methodDeprecationLogger } from '../../../lib/server/lib/deprecationWarningLogger';
+import { notifyOnSettingChangedById } from '../../../lib/server/lib/notifyListener';
 
 declare module '@rocket.chat/ui-contexts' {
 	// eslint-disable-next-line @typescript-eslint/naming-convention
@@ -15,56 +16,59 @@ declare module '@rocket.chat/ui-contexts' {
 
 Meteor.methods<ServerMethods>({
 	async 'livechat:saveIntegration'(values) {
+		methodDeprecationLogger.method('livechat:saveIntegration', '7.0.0');
+
 		const uid = Meteor.userId();
 		if (!uid || !(await hasPermissionAsync(uid, 'view-livechat-manager'))) {
 			throw new Meteor.Error('error-not-allowed', 'Not allowed', {
 				method: 'livechat:saveIntegration',
 			});
 		}
-		methodDeprecationLogger.method('livechat:saveIntegration', '7.0.0');
-
-		if (typeof values.Livechat_webhookUrl !== 'undefined') {
-			await Settings.updateValueById('Livechat_webhookUrl', trim(values.Livechat_webhookUrl));
-		}
-
-		if (typeof values.Livechat_secret_token !== 'undefined') {
-			await Settings.updateValueById('Livechat_secret_token', trim(values.Livechat_secret_token));
-		}
-
-		if (typeof values.Livechat_http_timeout === 'number') {
-			await Settings.updateValueById('Livechat_http_timeout', values.Livechat_http_timeout);
-		}
-
-		if (typeof values.Livechat_webhook_on_start !== 'undefined') {
-			await Settings.updateValueById('Livechat_webhook_on_start', !!values.Livechat_webhook_on_start);
-		}
 
-		if (typeof values.Livechat_webhook_on_close !== 'undefined') {
-			await Settings.updateValueById('Livechat_webhook_on_close', !!values.Livechat_webhook_on_close);
-		}
-
-		if (typeof values.Livechat_webhook_on_chat_taken !== 'undefined') {
-			await Settings.updateValueById('Livechat_webhook_on_chat_taken', !!values.Livechat_webhook_on_chat_taken);
-		}
+		const settingsIds = [
+			typeof values.Livechat_webhookUrl !== 'undefined' && { _id: 'Livechat_webhookUrl', value: trim(values.Livechat_webhookUrl) },
+			typeof values.Livechat_secret_token !== 'undefined' && { _id: 'Livechat_secret_token', value: trim(values.Livechat_secret_token) },
+			typeof values.Livechat_http_timeout !== 'undefined' && { _id: 'Livechat_http_timeout', value: values.Livechat_http_timeout },
+			typeof values.Livechat_webhook_on_start !== 'undefined' && {
+				_id: 'Livechat_webhook_on_start',
+				value: !!values.Livechat_webhook_on_start,
+			},
+			typeof values.Livechat_webhook_on_close !== 'undefined' && {
+				_id: 'Livechat_webhook_on_close',
+				value: !!values.Livechat_webhook_on_close,
+			},
+			typeof values.Livechat_webhook_on_forward !== 'undefined' && {
+				_id: 'Livechat_webhook_on_forward',
+				value: !!values.Livechat_webhook_on_forward,
+			},
+			typeof values.Livechat_webhook_on_chat_taken !== 'undefined' && {
+				_id: 'Livechat_webhook_on_chat_taken',
+				value: !!values.Livechat_webhook_on_chat_taken,
+			},
+			typeof values.Livechat_webhook_on_chat_queued !== 'undefined' && {
+				_id: 'Livechat_webhook_on_chat_queued',
+				value: !!values.Livechat_webhook_on_chat_queued,
+			},
+			typeof values.Livechat_webhook_on_offline_msg !== 'undefined' && {
+				_id: 'Livechat_webhook_on_offline_msg',
+				value: !!values.Livechat_webhook_on_offline_msg,
+			},
+			typeof values.Livechat_webhook_on_visitor_message !== 'undefined' && {
+				_id: 'Livechat_webhook_on_visitor_message',
+				value: !!values.Livechat_webhook_on_visitor_message,
+			},
+			typeof values.Livechat_webhook_on_agent_message !== 'undefined' && {
+				_id: 'Livechat_webhook_on_agent_message',
+				value: !!values.Livechat_webhook_on_agent_message,
+			},
+		].filter(Boolean) as unknown as { _id: string; value: any }[];
 
-		if (typeof values.Livechat_webhook_on_chat_queued !== 'undefined') {
-			await Settings.updateValueById('Livechat_webhook_on_chat_queued', !!values.Livechat_webhook_on_chat_queued);
-		}
-
-		if (typeof values.Livechat_webhook_on_forward !== 'undefined') {
-			await Settings.updateValueById('Livechat_webhook_on_forward', !!values.Livechat_webhook_on_forward);
-		}
+		const promises = settingsIds.map((setting) => Settings.updateValueById(setting._id, setting.value));
 
-		if (typeof values.Livechat_webhook_on_offline_msg !== 'undefined') {
-			await Settings.updateValueById('Livechat_webhook_on_offline_msg', !!values.Livechat_webhook_on_offline_msg);
-		}
-
-		if (typeof values.Livechat_webhook_on_visitor_message !== 'undefined') {
-			await Settings.updateValueById('Livechat_webhook_on_visitor_message', !!values.Livechat_webhook_on_visitor_message);
-		}
-
-		if (typeof values.Livechat_webhook_on_agent_message !== 'undefined') {
-			await Settings.updateValueById('Livechat_webhook_on_agent_message', !!values.Livechat_webhook_on_agent_message);
-		}
+		(await Promise.all(promises)).forEach((value, index) => {
+			if (value?.modifiedCount) {
+				void notifyOnSettingChangedById(settingsIds[index]._id);
+			}
+		});
 	},
 });
diff --git a/apps/meteor/app/mailer/server/api.ts b/apps/meteor/app/mailer/server/api.ts
index e562fc8e7b39..7e0ad0380b11 100644
--- a/apps/meteor/app/mailer/server/api.ts
+++ b/apps/meteor/app/mailer/server/api.ts
@@ -11,6 +11,7 @@ import _ from 'underscore';
 import { validateEmail } from '../../../lib/emailValidator';
 import { strLeft, strRightBack } from '../../../lib/utils/stringUtils';
 import { i18n } from '../../../server/lib/i18n';
+import { notifyOnSettingChanged } from '../../lib/server/lib/notifyListener';
 import { settings } from '../../settings/server';
 import { replaceVariables } from './replaceVariables';
 
@@ -166,7 +167,10 @@ export const sendNoWrap = async ({
 		html = undefined;
 	}
 
-	await Settings.incrementValueById('Triggered_Emails_Count');
+	const { value } = await Settings.incrementValueById('Triggered_Emails_Count', 1, { returnDocument: 'after' });
+	if (value) {
+		void notifyOnSettingChanged(value);
+	}
 
 	const email = { to, from, replyTo, subject, html, text, headers };
 
diff --git a/apps/meteor/app/statistics/server/functions/updateStatsCounter.ts b/apps/meteor/app/statistics/server/functions/updateStatsCounter.ts
index c9eb356841be..af88e3c548ad 100644
--- a/apps/meteor/app/statistics/server/functions/updateStatsCounter.ts
+++ b/apps/meteor/app/statistics/server/functions/updateStatsCounter.ts
@@ -1,11 +1,17 @@
 import { Settings } from '@rocket.chat/models';
 
+import { notifyOnSettingChanged } from '../../../lib/server/lib/notifyListener';
 import telemetryEvent from '../lib/telemetryEvents';
 
 type updateCounterDataType = { settingsId: string };
 
 export function updateCounter(data: updateCounterDataType): void {
-	void Settings.incrementValueById(data.settingsId);
+	void (async () => {
+		const { value } = await Settings.incrementValueById(data.settingsId, 1, { returnDocument: 'after' });
+		if (value) {
+			void notifyOnSettingChanged(value);
+		}
+	})();
 }
 
 telemetryEvent.register('updateCounter', updateCounter);
diff --git a/apps/meteor/app/version-check/server/functions/buildVersionUpdateMessage.ts b/apps/meteor/app/version-check/server/functions/buildVersionUpdateMessage.ts
index fb55d478b6f5..4cca28f1d5a9 100644
--- a/apps/meteor/app/version-check/server/functions/buildVersionUpdateMessage.ts
+++ b/apps/meteor/app/version-check/server/functions/buildVersionUpdateMessage.ts
@@ -3,6 +3,7 @@ import semver from 'semver';
 
 import { i18n } from '../../../../server/lib/i18n';
 import { sendMessagesToAdmins } from '../../../../server/lib/sendMessagesToAdmins';
+import { notifyOnSettingChangedById } from '../../../lib/server/lib/notifyListener';
 import { settings } from '../../../settings/server';
 import { Info } from '../../../utils/rocketchat.info';
 
@@ -37,7 +38,8 @@ export const buildVersionUpdateMessage = async (
 			continue;
 		}
 
-		await Settings.updateValueById('Update_LatestAvailableVersion', version.version);
+		(await Settings.updateValueById('Update_LatestAvailableVersion', version.version)).modifiedCount &&
+			void notifyOnSettingChangedById('Update_LatestAvailableVersion');
 
 		await sendMessagesToAdmins({
 			msgs: async ({ adminUser }) => [
diff --git a/apps/meteor/ee/app/license/server/startup.ts b/apps/meteor/ee/app/license/server/startup.ts
index a14837df8beb..3c47c8738613 100644
--- a/apps/meteor/ee/app/license/server/startup.ts
+++ b/apps/meteor/ee/app/license/server/startup.ts
@@ -6,6 +6,7 @@ import { wrapExceptions } from '@rocket.chat/tools';
 import moment from 'moment';
 
 import { syncWorkspace } from '../../../../app/cloud/server/functions/syncWorkspace';
+import { notifyOnSettingChangedById } from '../../../../app/lib/server/lib/notifyListener';
 import { settings } from '../../../../app/settings/server';
 import { callbacks } from '../../../../lib/callbacks';
 import { getAppCount } from './lib/getAppCount';
@@ -18,17 +19,24 @@ export const startLicense = async () => {
 	});
 
 	License.onValidateLicense(async () => {
-		await Settings.updateValueById('Enterprise_License', License.encryptedLicense);
-		await Settings.updateValueById('Enterprise_License_Status', 'Valid');
+		(await Settings.updateValueById('Enterprise_License', License.encryptedLicense)).modifiedCount &&
+			void notifyOnSettingChangedById('Enterprise_License');
+
+		(await Settings.updateValueById('Enterprise_License_Status', 'Valid')).modifiedCount &&
+			void notifyOnSettingChangedById('Enterprise_License_Status');
 	});
 
 	License.onInvalidateLicense(async () => {
-		await Settings.updateValueById('Enterprise_License_Status', 'Invalid');
+		(await Settings.updateValueById('Enterprise_License_Status', 'Invalid')).modifiedCount &&
+			void notifyOnSettingChangedById('Enterprise_License_Status');
 	});
 
 	License.onRemoveLicense(async () => {
-		await Settings.updateValueById('Enterprise_License', '');
-		await Settings.updateValueById('Enterprise_License_Status', 'Invalid');
+		(await Settings.updateValueById('Enterprise_License', '')).modifiedCount &&
+			void notifyOnSettingChangedById('Enterprise_License_Status');
+
+		(await Settings.updateValueById('Enterprise_License_Status', 'Invalid')).modifiedCount &&
+			void notifyOnSettingChangedById('Enterprise_License_Status');
 	});
 
 	/**
@@ -78,15 +86,17 @@ export const startLicense = async () => {
 
 		const obj = Object.fromEntries(contexts.map((context) => [context, period]));
 
-		await Settings.updateValueById(
-			'Enterprise_License_Data',
-			JSON.stringify({
-				...(existingData.signed === signed && existingData),
-				...existingData,
-				...obj,
-				signed,
-			}),
-		);
+		(
+			await Settings.updateValueById(
+				'Enterprise_License_Data',
+				JSON.stringify({
+					...(existingData.signed === signed && existingData),
+					...existingData,
+					...obj,
+					signed,
+				}),
+			)
+		).modifiedCount && void notifyOnSettingChangedById('Enterprise_License_Data');
 
 		try {
 			await syncWorkspace();
diff --git a/apps/meteor/ee/server/api/licenses.ts b/apps/meteor/ee/server/api/licenses.ts
index db3d73911ef0..28b0b2e080f3 100644
--- a/apps/meteor/ee/server/api/licenses.ts
+++ b/apps/meteor/ee/server/api/licenses.ts
@@ -5,6 +5,7 @@ import { check } from 'meteor/check';
 
 import { API } from '../../../app/api/server/api';
 import { hasPermissionAsync } from '../../../app/authorization/server/functions/hasPermission';
+import { notifyOnSettingChangedById } from '../../../app/lib/server/lib/notifyListener';
 
 API.v1.addRoute(
 	'licenses.get',
@@ -56,7 +57,8 @@ API.v1.addRoute(
 				return API.v1.failure('Invalid license');
 			}
 
-			await Settings.updateValueById('Enterprise_License', license);
+			(await Settings.updateValueById('Enterprise_License', license)).modifiedCount &&
+				void notifyOnSettingChangedById('Enterprise_License');
 
 			return API.v1.success();
 		},
diff --git a/apps/meteor/ee/server/startup/upsell.ts b/apps/meteor/ee/server/startup/upsell.ts
index b31bf0635060..f2fdfc50ba29 100644
--- a/apps/meteor/ee/server/startup/upsell.ts
+++ b/apps/meteor/ee/server/startup/upsell.ts
@@ -2,9 +2,14 @@ import { License } from '@rocket.chat/license';
 import { Settings } from '@rocket.chat/models';
 import { Meteor } from 'meteor/meteor';
 
+import { notifyOnSettingChangedById } from '../../../app/lib/server/lib/notifyListener';
+
 const handleHadTrial = (): void => {
 	if (License.getLicense()?.information.trial) {
-		void Settings.updateValueById('Cloud_Workspace_Had_Trial', true);
+		void (async () => {
+			(await Settings.updateValueById('Cloud_Workspace_Had_Trial', true)).modifiedCount &&
+				void notifyOnSettingChangedById('Cloud_Workspace_Had_Trial');
+		})();
 	}
 };
 
diff --git a/apps/meteor/server/cron/federation.ts b/apps/meteor/server/cron/federation.ts
index 56b1134f9b20..2bcd4ba27e9b 100644
--- a/apps/meteor/server/cron/federation.ts
+++ b/apps/meteor/server/cron/federation.ts
@@ -6,6 +6,7 @@ import { Users, Settings } from '@rocket.chat/models';
 import { resolveSRV, resolveTXT } from '../../app/federation/server/functions/resolveDNS';
 import { dispatchEvent } from '../../app/federation/server/handler';
 import { getFederationDomain } from '../../app/federation/server/lib/getFederationDomain';
+import { notifyOnSettingChangedById } from '../../app/lib/server/lib/notifyListener';
 import { settings, settingsRegistry } from '../../app/settings/server';
 
 async function updateSetting(id: string, value: SettingValue | null): Promise<void> {
@@ -15,7 +16,7 @@ async function updateSetting(id: string, value: SettingValue | null): Promise<vo
 		if (setting === undefined) {
 			await settingsRegistry.add(id, value);
 		} else {
-			await Settings.updateValueById(id, value);
+			(await Settings.updateValueById(id, value)).modifiedCount && void notifyOnSettingChangedById(id);
 		}
 	} else {
 		await Settings.updateValueById(id, null);
diff --git a/apps/meteor/server/database/watchCollections.ts b/apps/meteor/server/database/watchCollections.ts
index d8862ab47a53..995af7efc580 100644
--- a/apps/meteor/server/database/watchCollections.ts
+++ b/apps/meteor/server/database/watchCollections.ts
@@ -33,7 +33,6 @@ export function getWatchCollections(): string[] {
 		Users.getCollectionName(),
 		LivechatInquiry.getCollectionName(),
 		InstanceStatus.getCollectionName(),
-		Settings.getCollectionName(),
 		Subscriptions.getCollectionName(),
 	];
 
@@ -49,6 +48,7 @@ export function getWatchCollections(): string[] {
 		collections.push(LoginServiceConfiguration.getCollectionName());
 		collections.push(EmailInbox.getCollectionName());
 		collections.push(IntegrationHistory.getCollectionName());
+		collections.push(Settings.getCollectionName());
 		collections.push(LivechatDepartmentAgents.getCollectionName());
 	}
 
diff --git a/apps/meteor/server/lib/settingsRegenerator.ts b/apps/meteor/server/lib/settingsRegenerator.ts
index 8a566b989a8c..afc430c59d61 100644
--- a/apps/meteor/server/lib/settingsRegenerator.ts
+++ b/apps/meteor/server/lib/settingsRegenerator.ts
@@ -28,6 +28,7 @@ export async function settingsRegenerator() {
 			settings: invalidSettings.map(({ _id }) => _id),
 		});
 		await Settings.deleteMany({ _id: { $in: invalidSettings.map(({ _id }) => _id) } });
+		// No need to notify listener
 	} else {
 		logger.info('No invalid settings found on DB.');
 	}
diff --git a/apps/meteor/server/models/raw/LivechatRooms.ts b/apps/meteor/server/models/raw/LivechatRooms.ts
index c85b633dd677..5fbf856d5b38 100644
--- a/apps/meteor/server/models/raw/LivechatRooms.ts
+++ b/apps/meteor/server/models/raw/LivechatRooms.ts
@@ -3,7 +3,6 @@ import type {
 	RocketChatRecordDeleted,
 	IOmnichannelRoomClosingInfo,
 	DeepWritable,
-	ISetting,
 	IMessage,
 	ILivechatPriority,
 	IOmnichannelServiceLevelAgreements,
@@ -1853,18 +1852,7 @@ export class LivechatRoomsRaw extends BaseRaw<IOmnichannelRoom> implements ILive
 	}
 
 	async updateRoomCount() {
-		const query: Filter<ISetting> = {
-			_id: 'Livechat_Room_Count',
-		};
-
-		const update: UpdateFilter<ISetting> = {
-			$inc: {
-				// @ts-expect-error - Caused by `OnlyFieldsOfType` on mongo which excludes `SettingValue` from $inc
-				value: 1,
-			},
-		};
-
-		const livechatCount = await Settings.findOneAndUpdate(query, update, { returnDocument: 'after' });
+		const livechatCount = await Settings.incrementValueById('Livechat_Room_Count', 1, { returnDocument: 'after' });
 		return livechatCount.value;
 	}
 
diff --git a/apps/meteor/server/models/raw/LivechatVisitors.ts b/apps/meteor/server/models/raw/LivechatVisitors.ts
index 7974867a289b..e5234a8d5712 100644
--- a/apps/meteor/server/models/raw/LivechatVisitors.ts
+++ b/apps/meteor/server/models/raw/LivechatVisitors.ts
@@ -1,4 +1,4 @@
-import type { ILivechatVisitor, ISetting, RocketChatRecordDeleted } from '@rocket.chat/core-typings';
+import type { ILivechatVisitor, RocketChatRecordDeleted } from '@rocket.chat/core-typings';
 import type { FindPaginated, ILivechatVisitorsModel } from '@rocket.chat/model-typings';
 import { Settings } from '@rocket.chat/models';
 import { escapeRegExp } from '@rocket.chat/string-helpers';
@@ -16,6 +16,7 @@ import type {
 	UpdateFilter,
 } from 'mongodb';
 
+import { notifyOnSettingChanged } from '../../../app/lib/server/lib/notifyListener';
 import { BaseRaw } from './BaseRaw';
 
 export class LivechatVisitorsRaw extends BaseRaw<ILivechatVisitor> implements ILivechatVisitorsModel {
@@ -115,24 +116,15 @@ export class LivechatVisitorsRaw extends BaseRaw<ILivechatVisitor> implements IL
 	}
 
 	async getNextVisitorUsername(): Promise<string> {
-		const query = {
-			_id: 'Livechat_guest_count',
-		};
-
-		const update: UpdateFilter<ISetting> = {
-			$inc: {
-				// @ts-expect-error looks like the typings of ISetting.value conflict with this type of update
-				value: 1,
-			},
-		};
-
 		// TODO remove dependency from another model - this logic should be inside a service/function
-		const livechatCount = await Settings.findOneAndUpdate(query, update, { returnDocument: 'after' });
+		const livechatCount = await Settings.incrementValueById('Livechat_guest_count', 1, { returnDocument: 'after' });
 
 		if (!livechatCount.value) {
 			throw new Error("Can't find Livechat_guest_count setting");
 		}
 
+		void notifyOnSettingChanged(livechatCount.value);
+
 		return `guest-${livechatCount.value.value}`;
 	}
 
diff --git a/apps/meteor/server/models/raw/Settings.ts b/apps/meteor/server/models/raw/Settings.ts
index 16ccdc788fdf..3bb735c28905 100644
--- a/apps/meteor/server/models/raw/Settings.ts
+++ b/apps/meteor/server/models/raw/Settings.ts
@@ -1,6 +1,18 @@
 import type { ISetting, ISettingColor, ISettingSelectOption, RocketChatRecordDeleted } from '@rocket.chat/core-typings';
 import type { ISettingsModel } from '@rocket.chat/model-typings';
-import type { Collection, FindCursor, Db, Filter, UpdateFilter, UpdateResult, Document, FindOptions } from 'mongodb';
+import type {
+	Collection,
+	FindCursor,
+	Db,
+	Filter,
+	UpdateFilter,
+	UpdateResult,
+	Document,
+	FindOptions,
+	FindOneAndUpdateOptions,
+	ModifyResult,
+	UpdateOptions,
+} from 'mongodb';
 
 import { BaseRaw } from './BaseRaw';
 
@@ -53,6 +65,7 @@ export class SettingsRaw extends BaseRaw<ISetting> implements ISettingsModel {
 	updateValueById(
 		_id: string,
 		value: (ISetting['value'] extends undefined ? never : ISetting['value']) | null,
+		options?: UpdateOptions,
 	): Promise<Document | UpdateResult> {
 		const query = {
 			blocked: { $ne: true },
@@ -66,7 +79,7 @@ export class SettingsRaw extends BaseRaw<ISetting> implements ISettingsModel {
 			},
 		};
 
-		return this.updateOne(query, update);
+		return this.updateOne(query, update, options);
 	}
 
 	async resetValueById(
@@ -88,17 +101,22 @@ export class SettingsRaw extends BaseRaw<ISetting> implements ISettingsModel {
 		return this.updateValueById(_id, value);
 	}
 
-	async incrementValueById(_id: ISetting['_id'], value = 1): Promise<Document | UpdateResult> {
-		return this.updateOne(
+	async incrementValueById(
+		_id: ISetting['_id'],
+		value?: ISetting['value'],
+		options?: FindOneAndUpdateOptions,
+	): Promise<ModifyResult<ISetting>> {
+		return this.findOneAndUpdate(
 			{
 				blocked: { $ne: true },
 				_id,
 			},
 			{
 				$inc: {
-					value,
+					value: value || 1,
 				},
 			} as unknown as UpdateFilter<ISetting>,
+			options,
 		);
 	}
 
diff --git a/apps/meteor/server/services/federation/infrastructure/rocket-chat/adapters/Settings.ts b/apps/meteor/server/services/federation/infrastructure/rocket-chat/adapters/Settings.ts
index 219c9277a619..9d447e881e78 100644
--- a/apps/meteor/server/services/federation/infrastructure/rocket-chat/adapters/Settings.ts
+++ b/apps/meteor/server/services/federation/infrastructure/rocket-chat/adapters/Settings.ts
@@ -4,6 +4,7 @@ import { Settings } from '@rocket.chat/models';
 import yaml from 'js-yaml';
 import { v4 as uuidv4 } from 'uuid';
 
+import { notifyOnSettingChangedById } from '../../../../../../app/lib/server/lib/notifyListener';
 import { settings, settingsRegistry } from '../../../../../../app/settings/server';
 import type { IFederationBridgeRegistrationFile } from '../../../domain/IFederationBridge';
 
@@ -55,7 +56,8 @@ export class RocketChatSettingsAdapter {
 	}
 
 	public async disableFederation(): Promise<void> {
-		await Settings.updateValueById('Federation_Matrix_enabled', false);
+		(await Settings.updateValueById('Federation_Matrix_enabled', false)).modifiedCount &&
+			void notifyOnSettingChangedById('Federation_Matrix_enabled');
 	}
 
 	public isFederationEnabled(): boolean {
diff --git a/apps/meteor/server/settings/misc.ts b/apps/meteor/server/settings/misc.ts
index ae8371276533..af2725628ec3 100644
--- a/apps/meteor/server/settings/misc.ts
+++ b/apps/meteor/server/settings/misc.ts
@@ -17,9 +17,11 @@ const generateFingerprint = function () {
 };
 
 const updateFingerprint = async function (fingerprint: string, verified: boolean) {
-	await Settings.updateValueById('Deployment_FingerPrint_Hash', fingerprint);
-
-	await Settings.updateValueById('Deployment_FingerPrint_Verified', verified);
+	// No need to call ws listener because current function is called on startup
+	await Promise.all([
+		Settings.updateValueById('Deployment_FingerPrint_Hash', fingerprint),
+		Settings.updateValueById('Deployment_FingerPrint_Verified', verified),
+	]);
 };
 
 const verifyFingerPrint = async function () {
diff --git a/apps/meteor/server/startup/cloudRegistration.ts b/apps/meteor/server/startup/cloudRegistration.ts
index e69d4446d6ec..65d870de4d89 100644
--- a/apps/meteor/server/startup/cloudRegistration.ts
+++ b/apps/meteor/server/startup/cloudRegistration.ts
@@ -1,5 +1,7 @@
 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');
@@ -16,5 +18,6 @@ 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');
+	(await Settings.updateValueById('Show_Setup_Wizard', 'in_progress')).modifiedCount &&
+		void notifyOnSettingChangedById('Show_Setup_Wizard');
 }
diff --git a/apps/meteor/server/startup/initialData.js b/apps/meteor/server/startup/initialData.js
index 8e008191ea44..cefed3eef922 100644
--- a/apps/meteor/server/startup/initialData.js
+++ b/apps/meteor/server/startup/initialData.js
@@ -8,6 +8,7 @@ import { FileUpload } from '../../app/file-upload/server';
 import { RocketChatFile } from '../../app/file/server';
 import { addUserToDefaultChannels } from '../../app/lib/server/functions/addUserToDefaultChannels';
 import { checkUsernameAvailability } from '../../app/lib/server/functions/checkUsernameAvailability';
+import { notifyOnSettingChangedById } from '../../app/lib/server/lib/notifyListener';
 import { settings } from '../../app/settings/server';
 import { validateEmail } from '../../lib/emailValidator';
 import { addUserRolesAsync } from '../lib/roles/addUserRoles';
@@ -126,7 +127,8 @@ Meteor.startup(async () => {
 			});
 		}
 
-		Settings.updateValueById('Initial_Channel_Created', true);
+		(await Settings.updateValueById('Initial_Channel_Created', true)).modifiedCount &&
+			void notifyOnSettingChangedById('Initial_Channel_Created');
 	}
 
 	try {
@@ -198,7 +200,9 @@ Meteor.startup(async () => {
 	if ((await (await getUsersInRole('admin')).count()) !== 0) {
 		if (settings.get('Show_Setup_Wizard') === 'pending') {
 			console.log('Setting Setup Wizard to "in_progress" because, at least, one admin was found');
-			Settings.updateValueById('Show_Setup_Wizard', 'in_progress');
+
+			(await Settings.updateValueById('Show_Setup_Wizard', 'in_progress')).modifiedCount &&
+				void notifyOnSettingChangedById('Show_Setup_Wizard');
 		}
 	}
 
@@ -244,7 +248,8 @@ Meteor.startup(async () => {
 		await addUserRolesAsync(adminUser._id, ['admin']);
 
 		if (settings.get('Show_Setup_Wizard') === 'pending') {
-			Settings.updateValueById('Show_Setup_Wizard', 'in_progress');
+			(await Settings.updateValueById('Show_Setup_Wizard', 'in_progress')).modifiedCount &&
+				void notifyOnSettingChangedById('Show_Setup_Wizard');
 		}
 
 		return addUserToDefaultChannels(adminUser, true);
diff --git a/apps/meteor/tests/e2e/fixtures/inject-initial-data.ts b/apps/meteor/tests/e2e/fixtures/inject-initial-data.ts
index e7e68790cf3d..38835db4aaa6 100644
--- a/apps/meteor/tests/e2e/fixtures/inject-initial-data.ts
+++ b/apps/meteor/tests/e2e/fixtures/inject-initial-data.ts
@@ -57,22 +57,6 @@ export default async function injectInitialData() {
 				_id: 'API_Enable_Rate_Limiter_Dev',
 				value: false,
 			},
-			{
-				_id: 'SAML_Custom_Default_provider',
-				value: 'test-sp',
-			},
-			{
-				_id: 'SAML_Custom_Default_issuer',
-				value: 'http://localhost:3000/_saml/metadata/test-sp',
-			},
-			{
-				_id: 'SAML_Custom_Default_entry_point',
-				value: 'http://localhost:8080/simplesaml/saml2/idp/SSOService.php',
-			},
-			{
-				_id: 'SAML_Custom_Default_idp_slo_redirect_url',
-				value: 'http://localhost:8080/simplesaml/saml2/idp/SingleLogoutService.php',
-			},
 			{
 				_id: 'Accounts_OAuth_Google',
 				value: false,
diff --git a/apps/meteor/tests/e2e/saml.spec.ts b/apps/meteor/tests/e2e/saml.spec.ts
index b1c1687bfa6a..de4cca395be9 100644
--- a/apps/meteor/tests/e2e/saml.spec.ts
+++ b/apps/meteor/tests/e2e/saml.spec.ts
@@ -17,7 +17,7 @@ import { setSettingValueById } from './utils/setSettingValueById';
 import type { BaseTest } from './utils/test';
 import { test, expect } from './utils/test';
 
-const resetTestData = async (cleanupOnly = false) => {
+const resetTestData = async ({ api, cleanupOnly = false }: { api?: any; cleanupOnly?: boolean } = {}) => {
 	// Reset saml users' data on mongo in the beforeAll hook to allow re-running the tests within the same playwright session
 	// This is needed because those tests will modify this data and running them a second time would trigger different code paths
 	const connection = await MongoClient.connect(constants.URL_MONGODB);
@@ -45,43 +45,21 @@ const resetTestData = async (cleanupOnly = false) => {
 		),
 	);
 
-	await Promise.all(
-		[
-			{
-				_id: 'Accounts_AllowAnonymousRead',
-				value: false,
-			},
-			{
-				_id: 'SAML_Custom_Default_logout_behaviour',
-				value: 'SAML',
-			},
-			{
-				_id: 'SAML_Custom_Default_immutable_property',
-				value: 'EMail',
-			},
-			{
-				_id: 'SAML_Custom_Default_mail_overwrite',
-				value: false,
-			},
-			{
-				_id: 'SAML_Custom_Default',
-				value: false,
-			},
-			{
-				_id: 'SAML_Custom_Default_role_attribute_sync',
-				value: true,
-			},
-			{
-				_id: 'SAML_Custom_Default_role_attribute_name',
-				value: 'role',
-			},
-		].map((setting) =>
-			connection
-				.db()
-				.collection('rocketchat_settings')
-				.updateOne({ _id: setting._id }, { $set: { value: setting.value } }),
-		),
-	);
+	const settings = [
+		{ _id: 'Accounts_AllowAnonymousRead', value: false },
+		{ _id: 'SAML_Custom_Default_logout_behaviour', value: 'SAML' },
+		{ _id: 'SAML_Custom_Default_immutable_property', value: 'EMail' },
+		{ _id: 'SAML_Custom_Default_mail_overwrite', value: false },
+		{ _id: 'SAML_Custom_Default', value: false },
+		{ _id: 'SAML_Custom_Default_role_attribute_sync', value: true },
+		{ _id: 'SAML_Custom_Default_role_attribute_name', value: 'role' },
+		{ _id: 'SAML_Custom_Default_provider', value: 'test-sp' },
+		{ _id: 'SAML_Custom_Default_issuer', value: 'http://localhost:3000/_saml/metadata/test-sp' },
+		{ _id: 'SAML_Custom_Default_entry_point', value: 'http://localhost:8080/simplesaml/saml2/idp/SSOService.php' },
+		{ _id: 'SAML_Custom_Default_idp_slo_redirect_url', value: 'http://localhost:8080/simplesaml/saml2/idp/SingleLogoutService.php' },
+	];
+
+	await Promise.all(settings.map(({ _id, value }) => setSettingValueById(api, _id, value)));
 };
 
 const setupCustomRole = async (api: BaseTest['api']) => {
@@ -102,7 +80,7 @@ test.describe('SAML', () => {
 	const containerPath = path.join(__dirname, 'containers', 'saml');
 
 	test.beforeAll(async ({ api }) => {
-		await resetTestData();
+		await resetTestData({ api });
 
 		// Only one setting updated through the API to avoid refreshing the service configurations several times
 		await expect((await setSettingValueById(api, 'SAML_Custom_Default', true)).status()).toBe(200);
@@ -149,7 +127,7 @@ test.describe('SAML', () => {
 		}
 
 		// Remove saml test users so they don't interfere with other tests
-		await resetTestData(true);
+		await resetTestData({ cleanupOnly: true });
 
 		// Remove created custom role
 		if (constants.IS_EE) {
diff --git a/packages/model-typings/src/models/ISettingsModel.ts b/packages/model-typings/src/models/ISettingsModel.ts
index cb11d4b1b405..196b1a6bce1c 100644
--- a/packages/model-typings/src/models/ISettingsModel.ts
+++ b/packages/model-typings/src/models/ISettingsModel.ts
@@ -1,5 +1,14 @@
 import type { ISetting, ISettingColor, ISettingSelectOption } from '@rocket.chat/core-typings';
-import type { FindCursor, UpdateFilter, UpdateResult, Document, FindOptions } from 'mongodb';
+import type {
+	FindCursor,
+	UpdateFilter,
+	UpdateResult,
+	Document,
+	FindOptions,
+	FindOneAndUpdateOptions,
+	ModifyResult,
+	UpdateOptions,
+} from 'mongodb';
 
 import type { IBaseModel } from './IBaseModel';
 
@@ -15,6 +24,7 @@ export interface ISettingsModel extends IBaseModel<ISetting> {
 	updateValueById(
 		_id: string,
 		value: (ISetting['value'] extends undefined ? never : ISetting['value']) | null,
+		options?: UpdateOptions,
 	): Promise<Document | UpdateResult>;
 
 	resetValueById(
@@ -22,7 +32,7 @@ export interface ISettingsModel extends IBaseModel<ISetting> {
 		value?: (ISetting['value'] extends undefined ? never : ISetting['value']) | null,
 	): Promise<Document | UpdateResult | undefined>;
 
-	incrementValueById(_id: ISetting['_id'], value?: number): Promise<Document | UpdateResult>;
+	incrementValueById(_id: ISetting['_id'], value?: ISetting['value'], options?: FindOneAndUpdateOptions): Promise<ModifyResult<ISetting>>;
 
 	updateOptionsById<T extends ISetting = ISetting>(
 		_id: ISetting['_id'],

From 68b624e080da6aab61efb2641bbd5dffb822bdd9 Mon Sep 17 00:00:00 2001
From: Douglas Gubert <douglas.gubert@gmail.com>
Date: Thu, 20 Jun 2024 23:01:31 -0300
Subject: [PATCH 50/94] regression: Incorrect translation of room data on
 listeners of message events (#32641)

---
 yarn.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index ce099ca48a7f..99edf76b94dd 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8509,8 +8509,8 @@ __metadata:
   linkType: soft
 
 "@rocket.chat/apps-engine@npm:alpha":
-  version: 1.43.0-alpha.763
-  resolution: "@rocket.chat/apps-engine@npm:1.43.0-alpha.763"
+  version: 1.43.0-alpha.765
+  resolution: "@rocket.chat/apps-engine@npm:1.43.0-alpha.765"
   dependencies:
     "@msgpack/msgpack": 3.0.0-beta2
     adm-zip: ^0.5.9
@@ -8526,7 +8526,7 @@ __metadata:
     uuid: ~8.3.2
   peerDependencies:
     "@rocket.chat/ui-kit": "*"
-  checksum: f4498febb2f11766c6cab98c3738ca8ba50e9cfa68d129577a781a6fbbe91cfc48c82d6e418f05f0db6b3561becd6aab09b5b19b26652deb5e5621d7fd7b4c4a
+  checksum: 97fb5773c8d99e63e8c1d6f6002956d35b031cbe60d640d637b28a65ebbc37b89366e91f5c8bda254f634987a66fef37b70716c20d9a75bae86171447d477bb6
   languageName: node
   linkType: hard
 

From 4a0480bdf67feb81ec1c90c8f9bf4a7791871ee1 Mon Sep 17 00:00:00 2001
From: Douglas Fabris <devfabris@gmail.com>
Date: Thu, 20 Jun 2024 23:02:03 -0300
Subject: [PATCH 51/94] fix: Override retention policy missing ignore threads
 option (#32485)

---
 .changeset/rare-dancers-own.md                |  5 ++++
 .../Info/EditRoomInfo/EditRoomInfo.tsx        | 15 ++++++++++
 .../EditRoomInfo/useEditRoomInitialValues.ts  |  1 +
 .../views/room/hooks/useRetentionPolicy.ts    | 12 ++++++++
 apps/meteor/server/models/raw/Rooms.ts        |  5 ++--
 .../fragments/home-flextab-room.ts            | 12 ++++++--
 .../meteor/tests/e2e/retention-policy.spec.ts | 30 ++++++++++++++++++-
 7 files changed, 74 insertions(+), 6 deletions(-)
 create mode 100644 .changeset/rare-dancers-own.md

diff --git a/.changeset/rare-dancers-own.md b/.changeset/rare-dancers-own.md
new file mode 100644
index 000000000000..358963661bef
--- /dev/null
+++ b/.changeset/rare-dancers-own.md
@@ -0,0 +1,5 @@
+---
+'@rocket.chat/meteor': patch
+---
+
+Adds the missing `ignoreThreads` param fixing the issue not allowing ignoring threads when overriding retention policy
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 a32df8a44580..2bdf5ff395f6 100644
--- a/apps/meteor/client/views/room/contextualBar/Info/EditRoomInfo/EditRoomInfo.tsx
+++ b/apps/meteor/client/views/room/contextualBar/Info/EditRoomInfo/EditRoomInfo.tsx
@@ -152,6 +152,7 @@ const EditRoomInfo = ({ room, onClickClose, onClickBack }: EditRoomInfoProps) =>
 			retentionMaxAge,
 			retentionExcludePinned,
 			retentionFilesOnly,
+			retentionIgnoreThreads,
 			...formData
 		}) => {
 			const data = getDirtyFields(formData, dirtyFields);
@@ -172,6 +173,7 @@ const EditRoomInfo = ({ room, onClickClose, onClickBack }: EditRoomInfoProps) =>
 							retentionMaxAge,
 							retentionExcludePinned,
 							retentionFilesOnly,
+							retentionIgnoreThreads,
 						}),
 				});
 
@@ -218,6 +220,7 @@ const EditRoomInfo = ({ room, onClickClose, onClickBack }: EditRoomInfoProps) =>
 	const retentionMaxAgeField = useUniqueId();
 	const retentionExcludePinnedField = useUniqueId();
 	const retentionFilesOnlyField = useUniqueId();
+	const retentionIgnoreThreads = useUniqueId();
 
 	return (
 		<>
@@ -538,6 +541,18 @@ const EditRoomInfo = ({ room, onClickClose, onClickBack }: EditRoomInfoProps) =>
 													/>
 												</FieldRow>
 											</Field>
+											<Field>
+												<FieldRow>
+													<FieldLabel htmlFor={retentionIgnoreThreads}>{t('RetentionPolicy_DoNotPruneThreads')}</FieldLabel>
+													<Controller
+														control={control}
+														name='retentionIgnoreThreads'
+														render={({ field: { value, ...field } }) => (
+															<ToggleSwitch id={retentionIgnoreThreads} {...field} checked={value} />
+														)}
+													/>
+												</FieldRow>
+											</Field>
 											{canViewEncrypted && (
 												<Field>
 													<FieldRow>
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 1cb76cadd335..fa25dab96f0d 100644
--- a/apps/meteor/client/views/room/contextualBar/Info/EditRoomInfo/useEditRoomInitialValues.ts
+++ b/apps/meteor/client/views/room/contextualBar/Info/EditRoomInfo/useEditRoomInitialValues.ts
@@ -34,6 +34,7 @@ export const useEditRoomInitialValues = (room: IRoomWithRetentionPolicy) => {
 					retentionMaxAge: retention?.maxAge ?? retentionPolicy.maxAge,
 					retentionExcludePinned: retention?.excludePinned ?? retentionPolicy.excludePinned,
 					retentionFilesOnly: retention?.filesOnly ?? retentionPolicy.filesOnly,
+					retentionIgnoreThreads: retention?.ignoreThreads ?? retentionPolicy.ignoreThreads,
 				}),
 		}),
 		[
diff --git a/apps/meteor/client/views/room/hooks/useRetentionPolicy.ts b/apps/meteor/client/views/room/hooks/useRetentionPolicy.ts
index ce16df8bc329..1b048630ce74 100644
--- a/apps/meteor/client/views/room/hooks/useRetentionPolicy.ts
+++ b/apps/meteor/client/views/room/hooks/useRetentionPolicy.ts
@@ -8,6 +8,7 @@ type RetentionPolicySettings = {
 	enabled: boolean;
 	filesOnly: boolean;
 	doNotPrunePinned: boolean;
+	ignoreThreads: boolean;
 	appliesToChannels: boolean;
 	maxAgeChannels: number;
 	appliesToGroups: boolean;
@@ -55,6 +56,14 @@ const extractExcludePinned = (room: IRoom, { doNotPrunePinned }: RetentionPolicy
 	return doNotPrunePinned;
 };
 
+const extractIgnoreThreads = (room: IRoom, { ignoreThreads }: RetentionPolicySettings): boolean => {
+	if (hasRetentionPolicy(room) && room.retention.overrideGlobal) {
+		return room.retention.ignoreThreads;
+	}
+
+	return ignoreThreads;
+};
+
 const getMaxAge = (room: IRoom, { maxAgeChannels, maxAgeGroups, maxAgeDMs }: RetentionPolicySettings): number => {
 	if (hasRetentionPolicy(room) && room.retention.overrideGlobal) {
 		return room.retention.maxAge;
@@ -81,6 +90,7 @@ export const useRetentionPolicy = (
 			isActive: boolean;
 			filesOnly: boolean;
 			excludePinned: boolean;
+			ignoreThreads: boolean;
 			maxAge: number;
 	  }
 	| undefined => {
@@ -88,6 +98,7 @@ export const useRetentionPolicy = (
 		enabled: useSetting('RetentionPolicy_Enabled') as boolean,
 		filesOnly: useSetting('RetentionPolicy_FilesOnly') as boolean,
 		doNotPrunePinned: useSetting('RetentionPolicy_DoNotPrunePinned') as boolean,
+		ignoreThreads: useSetting('RetentionPolicy_DoNotPruneThreads') as boolean,
 		appliesToChannels: useSetting('RetentionPolicy_AppliesToChannels') as boolean,
 		maxAgeChannels: useSetting('RetentionPolicy_MaxAge_Channels') as number,
 		appliesToGroups: useSetting('RetentionPolicy_AppliesToGroups') as boolean,
@@ -105,6 +116,7 @@ export const useRetentionPolicy = (
 		isActive: isActive(room, settings),
 		filesOnly: extractFilesOnly(room, settings),
 		excludePinned: extractExcludePinned(room, settings),
+		ignoreThreads: extractIgnoreThreads(room, settings),
 		maxAge: getMaxAge(room, settings),
 	};
 };
diff --git a/apps/meteor/server/models/raw/Rooms.ts b/apps/meteor/server/models/raw/Rooms.ts
index 64bde1c32924..78efa845ba34 100644
--- a/apps/meteor/server/models/raw/Rooms.ts
+++ b/apps/meteor/server/models/raw/Rooms.ts
@@ -1838,13 +1838,12 @@ export class RoomsRaw extends BaseRaw<IRoom> implements IRoomsModel {
 		return this.updateOne(query, update);
 	}
 
-	// 5
 	saveRetentionIgnoreThreadsById(_id: IRoom['_id'], value: boolean): Promise<UpdateResult> {
 		const query: Filter<IRoom> = { _id };
 
 		const update: UpdateFilter<IRoom> = {
-			[value === true ? '$set' : '$unset']: {
-				'retention.ignoreThreads': true,
+			$set: {
+				'retention.ignoreThreads': value === true,
 			},
 		};
 
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 041b37da9919..038409eceec9 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
@@ -56,10 +56,18 @@ export class HomeFlextabRoom {
 	}
 
 	get checkboxPruneMessages(): Locator {
-		return this.page.locator('label', { has: this.page.getByRole('checkbox', { name: 'Automatically prune old messages' }) });
+		return this.page
+			.getByRole('dialog')
+			.locator('label', { has: this.page.getByRole('checkbox', { name: 'Automatically prune old messages' }) });
 	}
 
 	get checkboxOverrideGlobalRetention(): Locator {
-		return this.page.locator('label', { has: this.page.getByRole('checkbox', { name: 'Override global retention policy' }) });
+		return this.page
+			.getByRole('dialog')
+			.locator('label', { has: this.page.getByRole('checkbox', { name: 'Override global retention policy' }) });
+	}
+
+	get checkboxIgnoreThreads(): Locator {
+		return this.page.getByRole('dialog').locator('label', { has: this.page.getByRole('checkbox', { name: 'Do not prune Threads' }) });
 	}
 }
diff --git a/apps/meteor/tests/e2e/retention-policy.spec.ts b/apps/meteor/tests/e2e/retention-policy.spec.ts
index d17276a160af..c5db60384d92 100644
--- a/apps/meteor/tests/e2e/retention-policy.spec.ts
+++ b/apps/meteor/tests/e2e/retention-policy.spec.ts
@@ -3,7 +3,7 @@ import { faker } from '@faker-js/faker';
 import { createAuxContext } from './fixtures/createAuxContext';
 import { Users } from './fixtures/userStates';
 import { HomeChannel } from './page-objects';
-import { createTargetPrivateChannel, createTargetTeam, setSettingValueById } from './utils';
+import { createTargetTeam, createTargetPrivateChannel, getSettingValueById, setSettingValueById } from './utils';
 import { test, expect } from './utils/test';
 
 test.use({ storageState: Users.admin.state });
@@ -155,7 +155,10 @@ test.describe.serial('retention-policy', () => {
 		});
 
 		test.describe('retention policy override', () => {
+			let ignoreThreadsSetting: boolean;
+
 			test.beforeAll(async ({ api }) => {
+				ignoreThreadsSetting = (await getSettingValueById(api, 'RetentionPolicy_DoNotPruneThreads')) as boolean;
 				expect((await setSettingValueById(api, 'RetentionPolicy_MaxAge_Channels', 15)).status()).toBe(200);
 			});
 
@@ -186,6 +189,31 @@ test.describe.serial('retention-policy', () => {
 				await expect(poHomeChannel.tabs.room.getMaxAgeLabel('15')).toBeVisible();
 				await expect(poHomeChannel.tabs.room.inputRetentionMaxAge).toHaveValue('365');
 			});
+
+			test('should ignore threads be checked accordingly with the global default value', async () => {
+				await poHomeChannel.sidenav.openChat(targetChannel);
+				await poHomeChannel.tabs.btnRoomInfo.click();
+				await poHomeChannel.tabs.room.btnEdit.click();
+				await poHomeChannel.tabs.room.pruneAccordion.click();
+
+				await expect(poHomeChannel.tabs.room.checkboxIgnoreThreads).toBeChecked({ checked: ignoreThreadsSetting });
+			});
+
+			test('should override ignore threads default value', async () => {
+				await poHomeChannel.sidenav.openChat(targetChannel);
+				await poHomeChannel.tabs.btnRoomInfo.click();
+				await poHomeChannel.tabs.room.btnEdit.click();
+				await poHomeChannel.tabs.room.pruneAccordion.click();
+				await poHomeChannel.tabs.room.checkboxIgnoreThreads.click();
+				await poHomeChannel.tabs.room.btnSave.click();
+				await poHomeChannel.dismissToast();
+
+				await poHomeChannel.tabs.btnRoomInfo.click();
+				await poHomeChannel.tabs.room.btnEdit.click();
+				await poHomeChannel.tabs.room.pruneAccordion.click();
+
+				await expect(poHomeChannel.tabs.room.checkboxIgnoreThreads).toBeChecked({ checked: !ignoreThreadsSetting });
+			});
 		});
 	});
 });

From 832ae0f70c9c26473f2d26e42dbcc0d2d8aa54e2 Mon Sep 17 00:00:00 2001
From: Martin Schoeler <martin.schoeler@rocket.chat>
Date: Thu, 20 Jun 2024 23:02:27 -0300
Subject: [PATCH 52/94] feat: Change Quote Position (#32605)

---
 .changeset/nasty-windows-reply.md                     |  5 +++++
 .../message/content/attachments/QuoteAttachment.tsx   |  2 +-
 .../message/variants/room/RoomMessageContent.tsx      | 11 ++++++++---
 .../message/variants/thread/ThreadMessageContent.tsx  | 10 ++++++++--
 .../views/admin/moderation/helpers/ContextMessage.tsx | 11 ++++++++---
 .../MessageList/ContactHistoryMessage.tsx             |  9 +++++++--
 6 files changed, 37 insertions(+), 11 deletions(-)
 create mode 100644 .changeset/nasty-windows-reply.md

diff --git a/.changeset/nasty-windows-reply.md b/.changeset/nasty-windows-reply.md
new file mode 100644
index 000000000000..be62ea558762
--- /dev/null
+++ b/.changeset/nasty-windows-reply.md
@@ -0,0 +1,5 @@
+---
+"@rocket.chat/meteor": minor
+---
+
+Moves the quotes to be on top of the message for better readability
diff --git a/apps/meteor/client/components/message/content/attachments/QuoteAttachment.tsx b/apps/meteor/client/components/message/content/attachments/QuoteAttachment.tsx
index 7c2c2011cac9..394bf24995dc 100644
--- a/apps/meteor/client/components/message/content/attachments/QuoteAttachment.tsx
+++ b/apps/meteor/client/components/message/content/attachments/QuoteAttachment.tsx
@@ -67,12 +67,12 @@ export const QuoteAttachment = ({ attachment }: QuoteAttachmentProps): ReactElem
 							</Box>
 						)}
 					</AttachmentAuthor>
-					{attachment.md ? <MessageContentBody md={attachment.md} /> : attachment.text.substring(attachment.text.indexOf('\n') + 1)}
 					{attachment.attachments && (
 						<AttachmentInner>
 							<Attachments attachments={attachment.attachments} id={attachment.attachments[0]?.title_link} />
 						</AttachmentInner>
 					)}
+					{attachment.md ? <MessageContentBody md={attachment.md} /> : attachment.text.substring(attachment.text.indexOf('\n') + 1)}
 				</AttachmentDetails>
 			</AttachmentContent>
 		</>
diff --git a/apps/meteor/client/components/message/variants/room/RoomMessageContent.tsx b/apps/meteor/client/components/message/variants/room/RoomMessageContent.tsx
index 84ea4039ca93..247f51173530 100644
--- a/apps/meteor/client/components/message/variants/room/RoomMessageContent.tsx
+++ b/apps/meteor/client/components/message/variants/room/RoomMessageContent.tsx
@@ -1,5 +1,5 @@
 import type { IMessage } from '@rocket.chat/core-typings';
-import { isDiscussionMessage, isThreadMainMessage, isE2EEMessage } from '@rocket.chat/core-typings';
+import { isDiscussionMessage, isThreadMainMessage, isE2EEMessage, isQuoteAttachment } from '@rocket.chat/core-typings';
 import type { TranslationKey } from '@rocket.chat/ui-contexts';
 import { useSetting, useTranslation, useUserId } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
@@ -44,8 +44,13 @@ const RoomMessageContent = ({ message, unread, all, mention, searchText }: RoomM
 
 	const normalizedMessage = useNormalizedMessage(message);
 
+	const quotes = normalizedMessage?.attachments?.filter(isQuoteAttachment) || [];
+
+	const attachments = normalizedMessage?.attachments?.filter((attachment) => !isQuoteAttachment(attachment)) || [];
+
 	return (
 		<>
+			{!!quotes?.length && <Attachments attachments={quotes} />}
 			{!normalizedMessage.blocks?.length && !!normalizedMessage.md?.length && (
 				<>
 					{(!encrypted || normalizedMessage.e2e === 'done') && (
@@ -61,12 +66,12 @@ const RoomMessageContent = ({ message, unread, all, mention, searchText }: RoomM
 				</>
 			)}
 
+			{!!attachments && <Attachments id={message.files?.[0]?._id} attachments={attachments} />}
+
 			{normalizedMessage.blocks && (
 				<UiKitMessageBlock rid={normalizedMessage.rid} mid={normalizedMessage._id} blocks={normalizedMessage.blocks} />
 			)}
 
-			{!!normalizedMessage?.attachments?.length && <Attachments id={message.files?.[0]._id} attachments={normalizedMessage.attachments} />}
-
 			{oembedEnabled && !!normalizedMessage.urls?.length && <UrlPreviews urls={normalizedMessage.urls} />}
 
 			{normalizedMessage.actionLinks?.length && (
diff --git a/apps/meteor/client/components/message/variants/thread/ThreadMessageContent.tsx b/apps/meteor/client/components/message/variants/thread/ThreadMessageContent.tsx
index 7098a2709d5b..bec9b8a15c90 100644
--- a/apps/meteor/client/components/message/variants/thread/ThreadMessageContent.tsx
+++ b/apps/meteor/client/components/message/variants/thread/ThreadMessageContent.tsx
@@ -1,5 +1,5 @@
 import type { IThreadMainMessage, IThreadMessage } from '@rocket.chat/core-typings';
-import { isE2EEMessage } from '@rocket.chat/core-typings';
+import { isE2EEMessage, isQuoteAttachment } from '@rocket.chat/core-typings';
 import type { TranslationKey } from '@rocket.chat/ui-contexts';
 import { useSetting, useUserId, useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
@@ -37,8 +37,14 @@ const ThreadMessageContent = ({ message }: ThreadMessageContentProps): ReactElem
 
 	const normalizedMessage = useNormalizedMessage(message);
 
+	const quotes = normalizedMessage?.attachments?.filter(isQuoteAttachment) || [];
+
+	const attachments = normalizedMessage?.attachments?.filter((attachment) => !isQuoteAttachment(attachment)) || [];
+
 	return (
 		<>
+			{!!quotes?.length && <Attachments attachments={quotes} />}
+
 			{!normalizedMessage.blocks?.length && !!normalizedMessage.md?.length && (
 				<>
 					{(!encrypted || normalizedMessage.e2e === 'done') && (
@@ -52,7 +58,7 @@ const ThreadMessageContent = ({ message }: ThreadMessageContentProps): ReactElem
 				<UiKitMessageBlock rid={normalizedMessage.rid} mid={normalizedMessage._id} blocks={normalizedMessage.blocks} />
 			)}
 
-			{normalizedMessage.attachments && <Attachments attachments={normalizedMessage.attachments} id={normalizedMessage.files?.[0]._id} />}
+			{!!attachments && <Attachments id={message.files?.[0]?._id} attachments={attachments} />}
 
 			{oembedEnabled && !!normalizedMessage.urls?.length && <UrlPreviews urls={normalizedMessage.urls} />}
 
diff --git a/apps/meteor/client/views/admin/moderation/helpers/ContextMessage.tsx b/apps/meteor/client/views/admin/moderation/helpers/ContextMessage.tsx
index 51a2be087276..afca74f7528c 100644
--- a/apps/meteor/client/views/admin/moderation/helpers/ContextMessage.tsx
+++ b/apps/meteor/client/views/admin/moderation/helpers/ContextMessage.tsx
@@ -1,5 +1,5 @@
-import type { IMessage, MessageReport } from '@rocket.chat/core-typings';
-import { isE2EEMessage } from '@rocket.chat/core-typings';
+import type { IMessage, MessageReport, MessageAttachment } from '@rocket.chat/core-typings';
+import { isE2EEMessage, isQuoteAttachment } from '@rocket.chat/core-typings';
 import { Message, MessageName, MessageToolbarItem, MessageToolbarWrapper, MessageUsername } from '@rocket.chat/fuselage';
 import { UserAvatar } from '@rocket.chat/ui-avatar';
 import { useSetting, useTranslation } from '@rocket.chat/ui-contexts';
@@ -47,6 +47,10 @@ const ContextMessage = ({
 
 	const displayName = useUserDisplayName({ name, username });
 
+	const quotes = message?.attachments?.filter(isQuoteAttachment) || [];
+
+	const attachments = message?.attachments?.filter((attachment: MessageAttachment) => !isQuoteAttachment(attachment)) || [];
+
 	return (
 		<>
 			<Message.Divider>{formatDate(message._updatedAt)}</Message.Divider>
@@ -65,6 +69,7 @@ const ContextMessage = ({
 						<Message.Role>{room.name || room.fname || 'DM'}</Message.Role>
 					</Message.Header>
 					<Message.Body>
+						{!!quotes?.length && <Attachments attachments={quotes} />}
 						{!message.blocks?.length && !!message.md?.length ? (
 							<>
 								{(!isEncryptedMessage || message.e2e === 'done') && (
@@ -76,8 +81,8 @@ const ContextMessage = ({
 							message.msg
 						)}
 
+						{!!attachments && <Attachments id={message.files?.[0]?._id} attachments={attachments} />}
 						{message.blocks && <UiKitMessageBlock rid={message.rid} mid={message._id} blocks={message.blocks} />}
-						{message.attachments?.length > 0 && <Attachments id={message.files?.[0]._id} attachments={message.attachments} />}
 					</Message.Body>
 					<ReportReasonCollapsible>
 						<MessageReportInfo msgId={message._id} />
diff --git a/apps/meteor/client/views/omnichannel/contactHistory/MessageList/ContactHistoryMessage.tsx b/apps/meteor/client/views/omnichannel/contactHistory/MessageList/ContactHistoryMessage.tsx
index 9c779d1d5ea3..e6e3ef534be1 100644
--- a/apps/meteor/client/views/omnichannel/contactHistory/MessageList/ContactHistoryMessage.tsx
+++ b/apps/meteor/client/views/omnichannel/contactHistory/MessageList/ContactHistoryMessage.tsx
@@ -1,4 +1,4 @@
-import type { IMessage } from '@rocket.chat/core-typings';
+import { isQuoteAttachment, type IMessage, type MessageAttachment } from '@rocket.chat/core-typings';
 import {
 	Message as MessageTemplate,
 	MessageLeftContainer,
@@ -43,6 +43,10 @@ const ContactHistoryMessage: FC<{
 	const format = useFormatDate();
 	const formatTime = useFormatTime();
 
+	const quotes = message?.attachments?.filter(isQuoteAttachment) || [];
+
+	const attachments = message?.attachments?.filter((attachment: MessageAttachment) => !isQuoteAttachment(attachment)) || [];
+
 	if (message.t === 'livechat-close') {
 		return (
 			<MessageSystem>
@@ -104,13 +108,14 @@ const ContactHistoryMessage: FC<{
 							<StatusIndicators message={message} />
 						</MessageHeaderTemplate>
 					)}
+					{!!quotes?.length && <Attachments attachments={quotes} />}
 					{!message.blocks && message.md && (
 						<MessageBody data-qa-type='message-body' dir='auto'>
 							<MessageContentBody md={message.md} mentions={message.mentions} channels={message.channels} />
 						</MessageBody>
 					)}
 					{message.blocks && <UiKitMessageBlock rid={message.rid} mid={message._id} blocks={message.blocks} />}
-					{message.attachments && <Attachments attachments={message.attachments} />}
+					{!!attachments && <Attachments attachments={attachments} />}
 				</MessageContainer>
 			</MessageTemplate>
 		</>

From c0828b4d22e1070bf7cd5e404b22ba0342705879 Mon Sep 17 00:00:00 2001
From: Douglas Fabris <devfabris@gmail.com>
Date: Thu, 20 Jun 2024 23:03:57 -0300
Subject: [PATCH 53/94] feat: Upgrade `fuselage-toastbar` adding RTL support
 (#32604)

---
 .changeset/spotty-seals-whisper.md     |  6 ++++++
 apps/meteor/package.json               |  2 +-
 packages/uikit-playground/package.json |  2 +-
 yarn.lock                              | 12 ++++++------
 4 files changed, 14 insertions(+), 8 deletions(-)
 create mode 100644 .changeset/spotty-seals-whisper.md

diff --git a/.changeset/spotty-seals-whisper.md b/.changeset/spotty-seals-whisper.md
new file mode 100644
index 000000000000..242b5f6dde63
--- /dev/null
+++ b/.changeset/spotty-seals-whisper.md
@@ -0,0 +1,6 @@
+---
+'@rocket.chat/uikit-playground': minor
+'@rocket.chat/meteor': minor
+---
+
+Upgrades fuselage-toastbar version in order to add RTL support to the component
diff --git a/apps/meteor/package.json b/apps/meteor/package.json
index b060c09a53b4..ff44a6053a68 100644
--- a/apps/meteor/package.json
+++ b/apps/meteor/package.json
@@ -245,7 +245,7 @@
 		"@rocket.chat/fuselage": "^0.54.3",
 		"@rocket.chat/fuselage-hooks": "^0.33.1",
 		"@rocket.chat/fuselage-polyfills": "~0.31.25",
-		"@rocket.chat/fuselage-toastbar": "^0.31.26",
+		"@rocket.chat/fuselage-toastbar": "^0.32.0",
 		"@rocket.chat/fuselage-tokens": "^0.33.1",
 		"@rocket.chat/fuselage-ui-kit": "workspace:^",
 		"@rocket.chat/gazzodown": "workspace:^",
diff --git a/packages/uikit-playground/package.json b/packages/uikit-playground/package.json
index 732b74c0d3d3..d73bf87bf968 100644
--- a/packages/uikit-playground/package.json
+++ b/packages/uikit-playground/package.json
@@ -18,7 +18,7 @@
     "@rocket.chat/fuselage": "^0.54.3",
     "@rocket.chat/fuselage-hooks": "^0.33.1",
     "@rocket.chat/fuselage-polyfills": "~0.31.25",
-    "@rocket.chat/fuselage-toastbar": "^0.31.26",
+    "@rocket.chat/fuselage-toastbar": "^0.32.0",
     "@rocket.chat/fuselage-tokens": "^0.33.1",
     "@rocket.chat/fuselage-ui-kit": "workspace:~",
     "@rocket.chat/icons": "^0.36.0",
diff --git a/yarn.lock b/yarn.lock
index 99edf76b94dd..367068d93f56 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8883,9 +8883,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@rocket.chat/fuselage-toastbar@npm:^0.31.26":
-  version: 0.31.26
-  resolution: "@rocket.chat/fuselage-toastbar@npm:0.31.26"
+"@rocket.chat/fuselage-toastbar@npm:^0.32.0":
+  version: 0.32.0
+  resolution: "@rocket.chat/fuselage-toastbar@npm:0.32.0"
   peerDependencies:
     "@rocket.chat/fuselage": "*"
     "@rocket.chat/fuselage-hooks": "*"
@@ -8893,7 +8893,7 @@ __metadata:
     "@rocket.chat/styled": "*"
     react: ^17.0.2
     react-dom: ^17.0.2
-  checksum: 92b80ee312b03cfd36f3fbbceafaf81f57ce1c7bbe3232cf93ea1aeb26f73ec034f4eded9b57e1fc85e3141609af02af3ffcaa15f82c57163e398eef22fc1467
+  checksum: 5e78516aee6446da4c76dac10ff83adb4deeb86d6111c42419f0629c35ec64b19ae6ab563f20b5efa2600c9c723b9096edc3c166e960fd25cfda1f07c4df3f3f
   languageName: node
   linkType: hard
 
@@ -9371,7 +9371,7 @@ __metadata:
     "@rocket.chat/fuselage": ^0.54.3
     "@rocket.chat/fuselage-hooks": ^0.33.1
     "@rocket.chat/fuselage-polyfills": ~0.31.25
-    "@rocket.chat/fuselage-toastbar": ^0.31.26
+    "@rocket.chat/fuselage-toastbar": ^0.32.0
     "@rocket.chat/fuselage-tokens": ^0.33.1
     "@rocket.chat/fuselage-ui-kit": "workspace:^"
     "@rocket.chat/gazzodown": "workspace:^"
@@ -10526,7 +10526,7 @@ __metadata:
     "@rocket.chat/fuselage": ^0.54.3
     "@rocket.chat/fuselage-hooks": ^0.33.1
     "@rocket.chat/fuselage-polyfills": ~0.31.25
-    "@rocket.chat/fuselage-toastbar": ^0.31.26
+    "@rocket.chat/fuselage-toastbar": ^0.32.0
     "@rocket.chat/fuselage-tokens": ^0.33.1
     "@rocket.chat/fuselage-ui-kit": "workspace:~"
     "@rocket.chat/icons": ^0.36.0

From 2ad192b6615c176eb84e3a4c0e53153e5096e32e Mon Sep 17 00:00:00 2001
From: Ricardo Garim <rswarovsky@gmail.com>
Date: Thu, 20 Jun 2024 23:09:10 -0300
Subject: [PATCH 54/94] refactor: LivechatInquiry out of DB Watcher (#32358)

Co-authored-by: Diego Sampaio <chinello@gmail.com>
---
 .../app/lib/server/lib/notifyListener.ts      | 72 +++++++++++++++++++
 .../server/hooks/markRoomResponded.ts         |  6 +-
 .../server/hooks/saveLastMessageToInquiry.ts  |  6 +-
 .../app/livechat/server/lib/Contacts.ts       |  3 +-
 .../app/livechat/server/lib/LivechatTyped.ts  | 41 +++++++++--
 .../app/livechat/server/lib/QueueManager.ts   | 30 ++++++--
 .../app/livechat/server/lib/RoutingManager.ts | 23 +++++-
 .../server/hooks/beforeRoutingChat.ts         | 12 +++-
 .../hooks/handleNextAgentPreferredEvents.ts   | 10 ++-
 .../services/omnichannel.internalService.ts   | 11 ++-
 .../server/database/watchCollections.ts       |  8 +--
 .../server/models/raw/LivechatInquiry.ts      | 25 ++++---
 .../server/services/omnichannel/queue.ts      |  3 +-
 .../src/models/ILivechatInquiryModel.ts       |  9 +--
 14 files changed, 219 insertions(+), 40 deletions(-)

diff --git a/apps/meteor/app/lib/server/lib/notifyListener.ts b/apps/meteor/app/lib/server/lib/notifyListener.ts
index 5fae0b083980..3bc2f6c27526 100644
--- a/apps/meteor/app/lib/server/lib/notifyListener.ts
+++ b/apps/meteor/app/lib/server/lib/notifyListener.ts
@@ -9,6 +9,7 @@ import type {
 	IIntegration,
 	IPbxEvent,
 	LoginServiceConfiguration as LoginServiceConfigurationData,
+	ILivechatInquiryRecord,
 	ILivechatPriority,
 	ILivechatDepartmentAgents,
 	IEmailInbox,
@@ -25,6 +26,7 @@ import {
 	Integrations,
 	LoginServiceConfiguration,
 	IntegrationHistory,
+	LivechatInquiry,
 	LivechatDepartmentAgents,
 } from '@rocket.chat/models';
 
@@ -273,6 +275,76 @@ export async function notifyOnEmailInboxChanged<T extends IEmailInbox>(
 	void api.broadcast('watch.emailInbox', { clientAction, id: data._id, data });
 }
 
+export async function notifyOnLivechatInquiryChanged(
+	data: ILivechatInquiryRecord | ILivechatInquiryRecord[],
+	clientAction: ClientAction = 'updated',
+	diff?: Partial<Record<keyof ILivechatInquiryRecord, unknown> & { queuedAt: unknown; takenAt: unknown }>,
+): Promise<void> {
+	if (!dbWatchersDisabled) {
+		return;
+	}
+
+	const items = Array.isArray(data) ? data : [data];
+
+	for (const item of items) {
+		void api.broadcast('watch.inquiries', { clientAction, inquiry: item, diff });
+	}
+}
+
+export async function notifyOnLivechatInquiryChangedById(
+	id: ILivechatInquiryRecord['_id'],
+	clientAction: ClientAction = 'updated',
+	diff?: Partial<Record<keyof ILivechatInquiryRecord, unknown> & { queuedAt: unknown; takenAt: unknown }>,
+): Promise<void> {
+	if (!dbWatchersDisabled) {
+		return;
+	}
+
+	const inquiry = clientAction === 'removed' ? await LivechatInquiry.trashFindOneById(id) : await LivechatInquiry.findOneById(id);
+
+	if (!inquiry) {
+		return;
+	}
+
+	void api.broadcast('watch.inquiries', { clientAction, inquiry, diff });
+}
+
+export async function notifyOnLivechatInquiryChangedByRoom(
+	rid: ILivechatInquiryRecord['rid'],
+	clientAction: ClientAction = 'updated',
+	diff?: Partial<Record<keyof ILivechatInquiryRecord, unknown> & { queuedAt: unknown; takenAt: unknown }>,
+): Promise<void> {
+	if (!dbWatchersDisabled) {
+		return;
+	}
+
+	const inquiry = await LivechatInquiry.findOneByRoomId(rid, {});
+
+	if (!inquiry) {
+		return;
+	}
+
+	void api.broadcast('watch.inquiries', { clientAction, inquiry, diff });
+}
+
+export async function notifyOnLivechatInquiryChangedByToken(
+	token: ILivechatInquiryRecord['v']['token'],
+	clientAction: ClientAction = 'updated',
+	diff?: Partial<Record<keyof ILivechatInquiryRecord, unknown> & { queuedAt: unknown; takenAt: unknown }>,
+): Promise<void> {
+	if (!dbWatchersDisabled) {
+		return;
+	}
+
+	const inquiry = await LivechatInquiry.findOneByToken(token);
+
+	if (!inquiry) {
+		return;
+	}
+
+	void api.broadcast('watch.inquiries', { clientAction, inquiry, diff });
+}
+
 export async function notifyOnIntegrationHistoryChanged<T extends IIntegrationHistory>(
 	data: AtLeast<T, '_id'>,
 	clientAction: ClientAction = 'updated',
diff --git a/apps/meteor/app/livechat/server/hooks/markRoomResponded.ts b/apps/meteor/app/livechat/server/hooks/markRoomResponded.ts
index 4a37dc4f0abe..48ec985aa42c 100644
--- a/apps/meteor/app/livechat/server/hooks/markRoomResponded.ts
+++ b/apps/meteor/app/livechat/server/hooks/markRoomResponded.ts
@@ -4,6 +4,7 @@ import { LivechatRooms, LivechatVisitors, LivechatInquiry } from '@rocket.chat/m
 import moment from 'moment';
 
 import { callbacks } from '../../../../lib/callbacks';
+import { notifyOnLivechatInquiryChanged } from '../../../lib/server/lib/notifyListener';
 
 callbacks.add(
 	'afterSaveMessage',
@@ -37,10 +38,13 @@ callbacks.add(
 		}
 
 		if (!room.v?.activity?.includes(monthYear)) {
-			await Promise.all([
+			const [, livechatInquiry] = await Promise.all([
 				LivechatRooms.markVisitorActiveForPeriod(room._id, monthYear),
 				LivechatInquiry.markInquiryActiveForPeriod(room._id, monthYear),
 			]);
+			if (livechatInquiry) {
+				void notifyOnLivechatInquiryChanged(livechatInquiry, 'updated', { v: livechatInquiry.v });
+			}
 		}
 
 		if (room.responseBy) {
diff --git a/apps/meteor/app/livechat/server/hooks/saveLastMessageToInquiry.ts b/apps/meteor/app/livechat/server/hooks/saveLastMessageToInquiry.ts
index 648337a8c2a1..e65f1d99b884 100644
--- a/apps/meteor/app/livechat/server/hooks/saveLastMessageToInquiry.ts
+++ b/apps/meteor/app/livechat/server/hooks/saveLastMessageToInquiry.ts
@@ -2,6 +2,7 @@ import { isOmnichannelRoom, isEditedMessage } from '@rocket.chat/core-typings';
 import { LivechatInquiry } from '@rocket.chat/models';
 
 import { callbacks } from '../../../../lib/callbacks';
+import { notifyOnLivechatInquiryChanged } from '../../../lib/server/lib/notifyListener';
 import { settings } from '../../../settings/server';
 import { RoutingManager } from '../lib/RoutingManager';
 
@@ -21,7 +22,10 @@ callbacks.add(
 			return message;
 		}
 
-		await LivechatInquiry.setLastMessageByRoomId(room._id, message);
+		const livechatInquiry = await LivechatInquiry.setLastMessageByRoomId(room._id, message);
+		if (livechatInquiry) {
+			void notifyOnLivechatInquiryChanged(livechatInquiry, 'updated', { lastMessage: message });
+		}
 
 		return message;
 	},
diff --git a/apps/meteor/app/livechat/server/lib/Contacts.ts b/apps/meteor/app/livechat/server/lib/Contacts.ts
index 4105ae8f500f..2e648b02f5dd 100644
--- a/apps/meteor/app/livechat/server/lib/Contacts.ts
+++ b/apps/meteor/app/livechat/server/lib/Contacts.ts
@@ -6,7 +6,7 @@ import type { MatchKeysAndValues, OnlyFieldsOfType } from 'mongodb';
 
 import { callbacks } from '../../../../lib/callbacks';
 import { trim } from '../../../../lib/utils/stringUtils';
-import { notifyOnRoomChangedById } from '../../../lib/server/lib/notifyListener';
+import { notifyOnRoomChangedById, notifyOnLivechatInquiryChangedByRoom } from '../../../lib/server/lib/notifyListener';
 import { i18n } from '../../../utils/lib/i18n';
 
 type RegisterContactProps = {
@@ -144,6 +144,7 @@ export const Contacts = {
 					Subscriptions.updateDisplayNameByRoomId(rid, name),
 				]);
 
+				void notifyOnLivechatInquiryChangedByRoom(rid, 'updated', { name });
 				void notifyOnRoomChangedById(rid);
 			}
 		}
diff --git a/apps/meteor/app/livechat/server/lib/LivechatTyped.ts b/apps/meteor/app/livechat/server/lib/LivechatTyped.ts
index 27d9b4b9bdae..13fc8ff37b49 100644
--- a/apps/meteor/app/livechat/server/lib/LivechatTyped.ts
+++ b/apps/meteor/app/livechat/server/lib/LivechatTyped.ts
@@ -57,7 +57,13 @@ import { FileUpload } from '../../../file-upload/server';
 import { deleteMessage } from '../../../lib/server/functions/deleteMessage';
 import { sendMessage } from '../../../lib/server/functions/sendMessage';
 import { updateMessage } from '../../../lib/server/functions/updateMessage';
-import { notifyOnLivechatDepartmentAgentChangedByDepartmentId, notifyOnRoomChangedById } from '../../../lib/server/lib/notifyListener';
+import {
+	notifyOnLivechatInquiryChanged,
+	notifyOnLivechatInquiryChangedByRoom,
+	notifyOnRoomChangedById,
+	notifyOnLivechatInquiryChangedByToken,
+	notifyOnLivechatDepartmentAgentChangedByDepartmentId,
+} from '../../../lib/server/lib/notifyListener';
 import * as Mailer from '../../../mailer/server/api';
 import { metrics } from '../../../metrics/server';
 import { settings } from '../../../settings/server';
@@ -293,10 +299,15 @@ class LivechatClass {
 
 		this.logger.debug(`Updating DB for room ${room._id} with close data`);
 
+		const inquiry = await LivechatInquiry.findOneByRoomId(rid);
+
 		const removedInquiry = await LivechatInquiry.removeByRoomId(rid);
 		if (removedInquiry && removedInquiry.deletedCount !== 1) {
 			throw new Error('Error removing inquiry');
 		}
+		if (inquiry) {
+			void notifyOnLivechatInquiryChanged(inquiry, 'removed');
+		}
 
 		const updatedRoom = await LivechatRooms.closeRoomById(rid, closeData);
 		if (!updatedRoom || updatedRoom.modifiedCount !== 1) {
@@ -500,6 +511,8 @@ class LivechatClass {
 			throw new Meteor.Error('error-invalid-room', 'Invalid room');
 		}
 
+		const inquiry = await LivechatInquiry.findOneByRoomId(rid);
+
 		const result = await Promise.allSettled([
 			Messages.removeByRoomId(rid),
 			ReadReceipts.removeByRoomId(rid),
@@ -508,6 +521,10 @@ class LivechatClass {
 			LivechatRooms.removeById(rid),
 		]);
 
+		if (inquiry) {
+			void notifyOnLivechatInquiryChanged(inquiry, 'removed');
+		}
+
 		for (const r of result) {
 			if (r.status === 'rejected') {
 				this.logger.error(`Error removing room ${rid}: ${r.reason}`);
@@ -1270,11 +1287,11 @@ class LivechatClass {
 			]);
 		}
 
-		await Promise.all([
-			Subscriptions.removeByVisitorToken(token),
-			LivechatRooms.removeByVisitorToken(token),
-			LivechatInquiry.removeByVisitorToken(token),
-		]);
+		await Promise.all([Subscriptions.removeByVisitorToken(token), LivechatRooms.removeByVisitorToken(token)]);
+
+		const livechatInquiries = await LivechatInquiry.findIdsByVisitorToken(token).toArray();
+		await LivechatInquiry.removeByIds(livechatInquiries.map(({ _id }) => _id));
+		void notifyOnLivechatInquiryChanged(livechatInquiries, 'removed');
 	}
 
 	async deleteMessage({ guest, message }: { guest: ILivechatVisitor; message: IMessage }) {
@@ -1663,8 +1680,13 @@ class LivechatClass {
 	}
 
 	async notifyGuestStatusChanged(token: string, status: UserStatus) {
-		await LivechatInquiry.updateVisitorStatus(token, status);
 		await LivechatRooms.updateVisitorStatus(token, status);
+
+		const inquiryVisitorStatus = await LivechatInquiry.updateVisitorStatus(token, status);
+
+		if (inquiryVisitorStatus.modifiedCount) {
+			void notifyOnLivechatInquiryChangedByToken(token, 'updated', { v: { status } });
+		}
 	}
 
 	async setUserStatusLivechat(userId: string, status: ILivechatAgentStatus) {
@@ -1809,14 +1831,19 @@ class LivechatClass {
 		if (guestData?.name?.trim().length) {
 			const { _id: rid } = roomData;
 			const { name } = guestData;
+
 			await Promise.all([
 				Rooms.setFnameById(rid, name),
 				LivechatInquiry.setNameByRoomId(rid, name),
 				Subscriptions.updateDisplayNameByRoomId(rid, name),
 			]);
+
+			void notifyOnLivechatInquiryChangedByRoom(rid, 'updated', { name });
 		}
 
 		void notifyOnRoomChangedById(roomData._id);
+
+		return true;
 	}
 
 	/**
diff --git a/apps/meteor/app/livechat/server/lib/QueueManager.ts b/apps/meteor/app/livechat/server/lib/QueueManager.ts
index e4f422e25788..576b29990b33 100644
--- a/apps/meteor/app/livechat/server/lib/QueueManager.ts
+++ b/apps/meteor/app/livechat/server/lib/QueueManager.ts
@@ -1,21 +1,42 @@
 import { Apps, AppEvents } from '@rocket.chat/apps';
 import { Omnichannel } from '@rocket.chat/core-services';
-import type { ILivechatInquiryRecord, ILivechatVisitor, IMessage, IOmnichannelRoom, SelectedAgent } from '@rocket.chat/core-typings';
+import {
+	LivechatInquiryStatus,
+	type ILivechatInquiryRecord,
+	type ILivechatVisitor,
+	type IMessage,
+	type IOmnichannelRoom,
+	type SelectedAgent,
+} from '@rocket.chat/core-typings';
 import { Logger } from '@rocket.chat/logger';
 import { LivechatInquiry, LivechatRooms, Users } from '@rocket.chat/models';
 import { Match, check } from 'meteor/check';
 import { Meteor } from 'meteor/meteor';
 
 import { callbacks } from '../../../../lib/callbacks';
-import { notifyOnSettingChanged } from '../../../lib/server/lib/notifyListener';
+import {
+	notifyOnLivechatInquiryChangedById,
+	notifyOnLivechatInquiryChanged,
+	notifyOnSettingChanged,
+} from '../../../lib/server/lib/notifyListener';
 import { checkServiceStatus, createLivechatRoom, createLivechatInquiry } from './Helper';
 import { RoutingManager } from './RoutingManager';
 
 const logger = new Logger('QueueManager');
 
 export const saveQueueInquiry = async (inquiry: ILivechatInquiryRecord) => {
-	await LivechatInquiry.queueInquiry(inquiry._id);
-	await callbacks.run('livechat.afterInquiryQueued', inquiry);
+	const queuedInquiry = await LivechatInquiry.queueInquiry(inquiry._id);
+	if (!queuedInquiry) {
+		return;
+	}
+
+	await callbacks.run('livechat.afterInquiryQueued', queuedInquiry);
+
+	void notifyOnLivechatInquiryChanged(queuedInquiry, 'updated', {
+		status: LivechatInquiryStatus.QUEUED,
+		queuedAt: new Date(),
+		takenAt: undefined,
+	});
 };
 
 export const queueInquiry = async (inquiry: ILivechatInquiryRecord, defaultAgent?: SelectedAgent) => {
@@ -142,6 +163,7 @@ export const QueueManager: queueManager = {
 		if (oldInquiry) {
 			logger.debug(`Removing old inquiry (${oldInquiry._id}) for room ${rid}`);
 			await LivechatInquiry.removeByRoomId(rid);
+			void notifyOnLivechatInquiryChangedById(oldInquiry._id, 'removed');
 		}
 
 		const guest = {
diff --git a/apps/meteor/app/livechat/server/lib/RoutingManager.ts b/apps/meteor/app/livechat/server/lib/RoutingManager.ts
index 19437d800ee2..5782d01e318f 100644
--- a/apps/meteor/app/livechat/server/lib/RoutingManager.ts
+++ b/apps/meteor/app/livechat/server/lib/RoutingManager.ts
@@ -11,6 +11,7 @@ import type {
 	InquiryWithAgentInfo,
 	TransferData,
 } from '@rocket.chat/core-typings';
+import { LivechatInquiryStatus } from '@rocket.chat/core-typings';
 import { License } from '@rocket.chat/license';
 import { Logger } from '@rocket.chat/logger';
 import { LivechatInquiry, LivechatRooms, Subscriptions, Rooms, Users } from '@rocket.chat/models';
@@ -18,6 +19,7 @@ import { Match, check } from 'meteor/check';
 import { Meteor } from 'meteor/meteor';
 
 import { callbacks } from '../../../../lib/callbacks';
+import { notifyOnLivechatInquiryChangedById, notifyOnLivechatInquiryChanged } from '../../../lib/server/lib/notifyListener';
 import { settings } from '../../../settings/server';
 import {
 	createLivechatSubscription,
@@ -182,7 +184,15 @@ export const RoutingManager: Routing = {
 		const { servedBy } = room;
 
 		if (shouldQueue) {
-			await LivechatInquiry.queueInquiry(inquiry._id);
+			const queuedInquiry = await LivechatInquiry.queueInquiry(inquiry._id);
+			if (queuedInquiry) {
+				inquiry = queuedInquiry;
+				void notifyOnLivechatInquiryChanged(inquiry, 'updated', {
+					status: LivechatInquiryStatus.QUEUED,
+					queuedAt: new Date(),
+					takenAt: undefined,
+				});
+			}
 		}
 
 		if (servedBy) {
@@ -192,6 +202,7 @@ export const RoutingManager: Routing = {
 		}
 
 		await dispatchInquiryQueued(inquiry);
+
 		return true;
 	},
 
@@ -250,11 +261,20 @@ export const RoutingManager: Routing = {
 		}
 
 		await LivechatInquiry.takeInquiry(_id);
+
 		const inq = await this.assignAgent(inquiry as InquiryWithAgentInfo, agent);
 		logger.info(`Inquiry ${inquiry._id} taken by agent ${agent.agentId}`);
 
 		callbacks.runAsync('livechat.afterTakeInquiry', inq, agent);
 
+		void notifyOnLivechatInquiryChangedById(inquiry._id, 'updated', {
+			status: LivechatInquiryStatus.TAKEN,
+			takenAt: new Date(),
+			defaultAgent: undefined,
+			estimatedInactivityCloseTimeAt: undefined,
+			queuedAt: undefined,
+		});
+
 		return LivechatRooms.findOneById(rid);
 	},
 
@@ -282,6 +302,7 @@ export const RoutingManager: Routing = {
 		if (defaultAgent) {
 			logger.debug(`Delegating Inquiry ${inquiry._id} to agent ${defaultAgent.username}`);
 			await LivechatInquiry.setDefaultAgentById(inquiry._id, defaultAgent);
+			void notifyOnLivechatInquiryChanged(inquiry, 'updated', { defaultAgent });
 		}
 
 		logger.debug(`Queueing inquiry ${inquiry._id}`);
diff --git a/apps/meteor/ee/app/livechat-enterprise/server/hooks/beforeRoutingChat.ts b/apps/meteor/ee/app/livechat-enterprise/server/hooks/beforeRoutingChat.ts
index 69c3914cb4d8..92c17b91b3df 100644
--- a/apps/meteor/ee/app/livechat-enterprise/server/hooks/beforeRoutingChat.ts
+++ b/apps/meteor/ee/app/livechat-enterprise/server/hooks/beforeRoutingChat.ts
@@ -1,6 +1,7 @@
 import type { ILivechatDepartment } from '@rocket.chat/core-typings';
 import { LivechatDepartment, LivechatInquiry, LivechatRooms } from '@rocket.chat/models';
 
+import { notifyOnLivechatInquiryChanged } from '../../../../../app/lib/server/lib/notifyListener';
 import { online } from '../../../../../app/livechat/server/api/lib/livechat';
 import { allowAgentSkipQueue } from '../../../../../app/livechat/server/lib/Helper';
 import { Livechat } from '../../../../../app/livechat/server/lib/LivechatTyped';
@@ -30,13 +31,22 @@ callbacks.add(
 				cbLogger.info(
 					`Inquiry ${inquiry._id} will be moved from department ${department._id} to fallback department ${department.fallbackForwardDepartment}`,
 				);
+
 				// update visitor
 				await Livechat.setDepartmentForGuest({
 					token: inquiry?.v?.token,
 					department: department.fallbackForwardDepartment,
 				});
+
 				// update inquiry
-				inquiry = (await LivechatInquiry.setDepartmentByInquiryId(inquiry._id, department.fallbackForwardDepartment)) ?? inquiry;
+				const updatedLivechatInquiry = await LivechatInquiry.setDepartmentByInquiryId(inquiry._id, department.fallbackForwardDepartment);
+
+				if (updatedLivechatInquiry) {
+					void notifyOnLivechatInquiryChanged(updatedLivechatInquiry, 'updated', { department: updatedLivechatInquiry.department });
+				}
+
+				inquiry = updatedLivechatInquiry ?? inquiry;
+
 				// update room
 				await LivechatRooms.setDepartmentByRoomId(inquiry.rid, department.fallbackForwardDepartment);
 			}
diff --git a/apps/meteor/ee/app/livechat-enterprise/server/hooks/handleNextAgentPreferredEvents.ts b/apps/meteor/ee/app/livechat-enterprise/server/hooks/handleNextAgentPreferredEvents.ts
index 21fae96e3555..e2efadddc8ca 100644
--- a/apps/meteor/ee/app/livechat-enterprise/server/hooks/handleNextAgentPreferredEvents.ts
+++ b/apps/meteor/ee/app/livechat-enterprise/server/hooks/handleNextAgentPreferredEvents.ts
@@ -1,6 +1,7 @@
 import type { IUser, SelectedAgent } from '@rocket.chat/core-typings';
 import { LivechatVisitors, LivechatInquiry, LivechatRooms, Users } from '@rocket.chat/models';
 
+import { notifyOnLivechatInquiryChanged } from '../../../../../app/lib/server/lib/notifyListener';
 import { RoutingManager } from '../../../../../app/livechat/server/lib/RoutingManager';
 import { settings } from '../../../../../app/settings/server';
 import { callbacks } from '../../../../../lib/callbacks';
@@ -68,10 +69,13 @@ settings.watch<boolean>('Livechat_last_chatted_agent_routing', (value) => {
 				return inquiry;
 			}
 
-			const { _id } = inquiry;
+			await LivechatInquiry.removeDefaultAgentById(inquiry._id);
 
-			await LivechatInquiry.removeDefaultAgentById(_id);
-			return LivechatInquiry.findOneById(_id);
+			void notifyOnLivechatInquiryChanged(inquiry, 'updated', {
+				defaultAgent: undefined,
+			});
+
+			return LivechatInquiry.findOneById(inquiry._id);
 		},
 		callbacks.priority.MEDIUM,
 		'livechat-on-max-number-simultaneous-chats-reached',
diff --git a/apps/meteor/ee/app/livechat-enterprise/server/services/omnichannel.internalService.ts b/apps/meteor/ee/app/livechat-enterprise/server/services/omnichannel.internalService.ts
index 980d0e644a99..c3133387865d 100644
--- a/apps/meteor/ee/app/livechat-enterprise/server/services/omnichannel.internalService.ts
+++ b/apps/meteor/ee/app/livechat-enterprise/server/services/omnichannel.internalService.ts
@@ -1,11 +1,11 @@
 import { ServiceClassInternal, Message } from '@rocket.chat/core-services';
 import type { IOmnichannelEEService } from '@rocket.chat/core-services';
-import { isOmnichannelRoom } from '@rocket.chat/core-typings';
+import { isOmnichannelRoom, LivechatInquiryStatus } from '@rocket.chat/core-typings';
 import type { IOmnichannelRoom, IUser, ILivechatInquiryRecord, IOmnichannelSystemMessage } from '@rocket.chat/core-typings';
 import { Logger } from '@rocket.chat/logger';
 import { LivechatRooms, Subscriptions, LivechatInquiry } from '@rocket.chat/models';
 
-import { notifyOnRoomChangedById } from '../../../../../app/lib/server/lib/notifyListener';
+import { notifyOnLivechatInquiryChangedById, notifyOnRoomChangedById } from '../../../../../app/lib/server/lib/notifyListener';
 import { dispatchAgentDelegated } from '../../../../../app/livechat/server/lib/Helper';
 import { queueInquiry } from '../../../../../app/livechat/server/lib/QueueManager';
 import { RoutingManager } from '../../../../../app/livechat/server/lib/RoutingManager';
@@ -178,6 +178,13 @@ export class OmnichannelEE extends ServiceClassInternal implements IOmnichannelE
 			RoutingManager.removeAllRoomSubscriptions(room),
 		]);
 
+		void notifyOnLivechatInquiryChangedById(inquiryId, 'updated', {
+			status: LivechatInquiryStatus.QUEUED,
+			queuedAt: new Date(),
+			takenAt: undefined,
+			defaultAgent: undefined,
+		});
+
 		await dispatchAgentDelegated(roomId);
 
 		void notifyOnRoomChangedById(roomId);
diff --git a/apps/meteor/server/database/watchCollections.ts b/apps/meteor/server/database/watchCollections.ts
index 995af7efc580..0207b425a350 100644
--- a/apps/meteor/server/database/watchCollections.ts
+++ b/apps/meteor/server/database/watchCollections.ts
@@ -29,16 +29,12 @@ const onlyCollections = DBWATCHER_ONLY_COLLECTIONS.split(',')
 	.filter(Boolean);
 
 export function getWatchCollections(): string[] {
-	const collections = [
-		Users.getCollectionName(),
-		LivechatInquiry.getCollectionName(),
-		InstanceStatus.getCollectionName(),
-		Subscriptions.getCollectionName(),
-	];
+	const collections = [Users.getCollectionName(), InstanceStatus.getCollectionName(), Subscriptions.getCollectionName()];
 
 	// add back to the list of collections in case db watchers are enabled
 	if (!dbWatchersDisabled) {
 		collections.push(Messages.getCollectionName());
+		collections.push(LivechatInquiry.getCollectionName());
 		collections.push(Roles.getCollectionName());
 		collections.push(Rooms.getCollectionName());
 		collections.push(PbxEvents.getCollectionName());
diff --git a/apps/meteor/server/models/raw/LivechatInquiry.ts b/apps/meteor/server/models/raw/LivechatInquiry.ts
index 6f492c0005d7..3178d217be4f 100644
--- a/apps/meteor/server/models/raw/LivechatInquiry.ts
+++ b/apps/meteor/server/models/raw/LivechatInquiry.ts
@@ -13,8 +13,8 @@ import type {
 	Document,
 	FindOptions,
 	DistinctOptions,
-	UpdateResult,
 	ModifyResult,
+	UpdateResult,
 	Filter,
 	DeleteResult,
 	IndexDescription,
@@ -114,7 +114,7 @@ export class LivechatInquiryRaw extends BaseRaw<ILivechatInquiryRecord> implemen
 
 	findOneByRoomId<T extends Document = ILivechatInquiryRecord>(
 		rid: string,
-		options: FindOptions<T extends ILivechatInquiryRecord ? ILivechatInquiryRecord : T>,
+		options?: FindOptions<T extends ILivechatInquiryRecord ? ILivechatInquiryRecord : T>,
 	): Promise<T | null> {
 		const query = {
 			rid,
@@ -122,6 +122,10 @@ export class LivechatInquiryRaw extends BaseRaw<ILivechatInquiryRecord> implemen
 		return this.findOne(query, options);
 	}
 
+	findIdsByVisitorToken(token: ILivechatInquiryRecord['v']['token']): FindCursor<ILivechatInquiryRecord> {
+		return this.find({ 'v.token': token }, { projection: { _id: 1 } });
+	}
+
 	getDistinctQueuedDepartments(options: DistinctOptions): Promise<(string | undefined)[]> {
 		return this.col.distinct('department', { status: LivechatInquiryStatus.QUEUED }, options);
 	}
@@ -131,8 +135,9 @@ export class LivechatInquiryRaw extends BaseRaw<ILivechatInquiryRecord> implemen
 		return updated?.value;
 	}
 
-	async setLastMessageByRoomId(rid: string, message: IMessage): Promise<UpdateResult> {
-		return this.updateOne({ rid }, { $set: { lastMessage: message } });
+	async setLastMessageByRoomId(rid: ILivechatInquiryRecord['rid'], message: IMessage): Promise<ILivechatInquiryRecord | null> {
+		const updated = await this.findOneAndUpdate({ rid }, { $set: { lastMessage: message } }, { returnDocument: 'after' });
+		return updated?.value;
 	}
 
 	async findNextAndLock(queueSortBy: OmnichannelSortingMechanismSettingType, department?: string): Promise<ILivechatInquiryRecord | null> {
@@ -303,8 +308,8 @@ export class LivechatInquiryRaw extends BaseRaw<ILivechatInquiryRecord> implemen
 		);
 	}
 
-	queueInquiry(inquiryId: string): Promise<UpdateResult> {
-		return this.updateOne(
+	async queueInquiry(inquiryId: string): Promise<ILivechatInquiryRecord | null> {
+		const result = await this.findOneAndUpdate(
 			{
 				_id: inquiryId,
 			},
@@ -312,7 +317,10 @@ export class LivechatInquiryRaw extends BaseRaw<ILivechatInquiryRecord> implemen
 				$set: { status: LivechatInquiryStatus.QUEUED, queuedAt: new Date() },
 				$unset: { takenAt: 1 },
 			},
+			{ returnDocument: 'after' },
 		);
+
+		return result?.value;
 	}
 
 	queueInquiryAndRemoveDefaultAgent(inquiryId: string): Promise<UpdateResult> {
@@ -424,7 +432,8 @@ export class LivechatInquiryRaw extends BaseRaw<ILivechatInquiryRecord> implemen
 		await this.deleteMany(query);
 	}
 
-	async markInquiryActiveForPeriod(rid: string, period: string): Promise<UpdateResult> {
-		return this.updateOne({ rid }, { $addToSet: { 'v.activity': period } });
+	async markInquiryActiveForPeriod(rid: ILivechatInquiryRecord['rid'], period: string): Promise<ILivechatInquiryRecord | null> {
+		const updated = await this.findOneAndUpdate({ rid }, { $addToSet: { 'v.activity': period } });
+		return updated?.value;
 	}
 }
diff --git a/apps/meteor/server/services/omnichannel/queue.ts b/apps/meteor/server/services/omnichannel/queue.ts
index 642575c06db5..2e1579072e44 100644
--- a/apps/meteor/server/services/omnichannel/queue.ts
+++ b/apps/meteor/server/services/omnichannel/queue.ts
@@ -100,7 +100,8 @@ export class OmnichannelQueue implements IOmnichannelQueue {
 				// And sorting them by _updatedAt: -1 will make it so that the oldest inquiries are taken first
 				// preventing us from playing with the same inquiry over and over again
 				queueLogger.debug(`Inquiry ${nextInquiry._id} not taken. Unlocking and re-queueing`);
-				return await LivechatInquiry.unlockAndQueue(nextInquiry._id);
+				const updatedQueue = await LivechatInquiry.unlockAndQueue(nextInquiry._id);
+				return updatedQueue;
 			}
 
 			queueLogger.debug(`Inquiry ${nextInquiry._id} taken successfully. Unlocking`);
diff --git a/packages/model-typings/src/models/ILivechatInquiryModel.ts b/packages/model-typings/src/models/ILivechatInquiryModel.ts
index 6cad9d91865e..6f16c3337b4d 100644
--- a/packages/model-typings/src/models/ILivechatInquiryModel.ts
+++ b/packages/model-typings/src/models/ILivechatInquiryModel.ts
@@ -12,11 +12,11 @@ export interface ILivechatInquiryModel extends IBaseModel<ILivechatInquiryRecord
 	findOneQueuedByRoomId(rid: string): Promise<(ILivechatInquiryRecord & { status: LivechatInquiryStatus.QUEUED }) | null>;
 	findOneByRoomId<T extends Document = ILivechatInquiryRecord>(
 		rid: string,
-		options: FindOptions<T extends ILivechatInquiryRecord ? ILivechatInquiryRecord : T>,
+		options?: FindOptions<T extends ILivechatInquiryRecord ? ILivechatInquiryRecord : T>,
 	): Promise<T | null>;
 	getDistinctQueuedDepartments(options: DistinctOptions): Promise<(string | undefined)[]>;
 	setDepartmentByInquiryId(inquiryId: string, department: string): Promise<ILivechatInquiryRecord | null>;
-	setLastMessageByRoomId(rid: string, message: IMessage): Promise<UpdateResult>;
+	setLastMessageByRoomId(rid: ILivechatInquiryRecord['rid'], message: IMessage): Promise<ILivechatInquiryRecord | null>;
 	findNextAndLock(queueSortBy: OmnichannelSortingMechanismSettingType, department?: string): Promise<ILivechatInquiryRecord | null>;
 	unlock(inquiryId: string): Promise<UpdateResult>;
 	unlockAndQueue(inquiryId: string): Promise<UpdateResult>;
@@ -30,7 +30,7 @@ export interface ILivechatInquiryModel extends IBaseModel<ILivechatInquiryRecord
 	getQueuedInquiries(options?: FindOptions<ILivechatInquiryRecord>): FindCursor<ILivechatInquiryRecord>;
 	takeInquiry(inquiryId: string): Promise<void>;
 	openInquiry(inquiryId: string): Promise<UpdateResult>;
-	queueInquiry(inquiryId: string): Promise<UpdateResult>;
+	queueInquiry(inquiryId: string): Promise<ILivechatInquiryRecord | null>;
 	queueInquiryAndRemoveDefaultAgent(inquiryId: string): Promise<UpdateResult>;
 	readyInquiry(inquiryId: string): Promise<UpdateResult>;
 	changeDepartmentIdByRoomId(rid: string, department: string): Promise<void>;
@@ -41,5 +41,6 @@ export interface ILivechatInquiryModel extends IBaseModel<ILivechatInquiryRecord
 	findOneByToken(token: string): Promise<ILivechatInquiryRecord | null>;
 	removeDefaultAgentById(inquiryId: string): Promise<UpdateResult | Document>;
 	removeByVisitorToken(token: string): Promise<void>;
-	markInquiryActiveForPeriod(rid: string, period: string): Promise<UpdateResult>;
+	markInquiryActiveForPeriod(rid: ILivechatInquiryRecord['rid'], period: string): Promise<ILivechatInquiryRecord | null>;
+	findIdsByVisitorToken(token: ILivechatInquiryRecord['v']['token']): FindCursor<ILivechatInquiryRecord>;
 }

From 2f7597e0fadddf04f99f72cf47642d28195945a4 Mon Sep 17 00:00:00 2001
From: Martin Schoeler <martin.schoeler@rocket.chat>
Date: Thu, 20 Jun 2024 23:30:12 -0300
Subject: [PATCH 55/94] fix(Marketplace): Wrong modal if app already purchased
 (#32563)

Co-authored-by: Guilherme Gazzo <guilhermegazzo@gmail.com>
---
 .changeset/five-monkeys-applaud.md                          | 5 +++++
 .../marketplace/AppDetailsPage/tabs/AppStatus/AppStatus.tsx | 6 +++---
 2 files changed, 8 insertions(+), 3 deletions(-)
 create mode 100644 .changeset/five-monkeys-applaud.md

diff --git a/.changeset/five-monkeys-applaud.md b/.changeset/five-monkeys-applaud.md
new file mode 100644
index 000000000000..aaa1c0ae367c
--- /dev/null
+++ b/.changeset/five-monkeys-applaud.md
@@ -0,0 +1,5 @@
+---
+"@rocket.chat/meteor": patch
+---
+
+fixes not being able to reinstall app after installation failure
diff --git a/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppStatus/AppStatus.tsx b/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppStatus/AppStatus.tsx
index cfd93ef59260..26adddffae79 100644
--- a/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppStatus/AppStatus.tsx
+++ b/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppStatus/AppStatus.tsx
@@ -54,7 +54,6 @@ const AppStatus = ({ app, showStatus = true, isAppDetailsPage, installed, ...pro
 		async (action, permissionsGranted) => {
 			if (action) {
 				if (action !== 'request') {
-					setPurchased(true);
 					await marketplaceActions[action]({ ...app, permissionsGranted });
 				} else {
 					setEndUserRequested(true);
@@ -63,7 +62,7 @@ const AppStatus = ({ app, showStatus = true, isAppDetailsPage, installed, ...pro
 
 			setLoading(false);
 		},
-		[app, marketplaceActions, setLoading, setPurchased],
+		[app, marketplaceActions, setLoading],
 	);
 
 	const cancelAction = useCallback(() => {
@@ -81,8 +80,9 @@ const AppStatus = ({ app, showStatus = true, isAppDetailsPage, installed, ...pro
 
 	const handleAcquireApp = useCallback(() => {
 		setLoading(true);
+		setPurchased(true);
 		appInstallationHandler();
-	}, [appInstallationHandler, setLoading]);
+	}, [appInstallationHandler, setLoading, setPurchased]);
 
 	// @TODO we should refactor this to not use the label to determine the variant
 	const getStatusVariant = (status: appStatusSpanResponseProps) => {

From dfa49bdbb2507829c4548dc8876502989875dc92 Mon Sep 17 00:00:00 2001
From: gabriellsh <40830821+gabriellsh@users.noreply.github.com>
Date: Thu, 20 Jun 2024 23:36:31 -0300
Subject: [PATCH 56/94] feat: Allow different time units for retention policy
 (#32425)

Co-authored-by: Kevin Aleman <kaleman960@gmail.com>
Co-authored-by: Guilherme Gazzo <guilhermegazzo@gmail.com>
---
 .changeset/ten-stingrays-eat.md               |   7 +
 .../app/lib/server/methods/saveSettings.ts    |   1 +
 .../server/cronPruneMessages.ts               |  14 +-
 .../InfoPanel/RetentionPolicyCallout.tsx      |   3 +-
 .../meteor/client/lib/convertTimeUnit.spec.ts |  65 ++++++++
 apps/meteor/client/lib/convertTimeUnit.ts     |  58 +++++++
 .../priorities/PriorityEditForm.tsx           |   1 +
 .../views/admin/settings/MemoizedSetting.tsx  |   3 +
 .../views/admin/settings/Setting.stories.tsx  |  22 +--
 .../inputs/TimespanSettingInput.spec.tsx      | 157 ++++++++++++++++++
 .../settings/inputs/TimespanSettingInput.tsx  | 112 +++++++++++++
 .../views/admin/settings/inputs/types.ts      |   1 +
 .../tabs/AppSettings/AppSetting.tsx           |   1 +
 .../room/body/RetentionPolicyWarning.tsx      |   3 +-
 .../Info/EditRoomInfo/EditRoomInfo.tsx        |   9 +-
 .../EditRoomInfo/useEditRoomInitialValues.ts  |   3 +-
 .../views/room/hooks/useRetentionPolicy.ts    |  12 +-
 .../server/settings/retention-policy.ts       |  49 +++++-
 apps/meteor/server/startup/migrations/xrun.ts |  40 +++++
 .../meteor/tests/e2e/retention-policy.spec.ts |   5 +-
 packages/core-typings/src/ISetting.ts         |   3 +-
 packages/i18n/src/locales/af.i18n.json        |   9 +-
 packages/i18n/src/locales/ar.i18n.json        |   7 -
 packages/i18n/src/locales/az.i18n.json        |   9 +-
 packages/i18n/src/locales/be-BY.i18n.json     |   9 +-
 packages/i18n/src/locales/bg.i18n.json        |   9 +-
 packages/i18n/src/locales/bs.i18n.json        |   9 +-
 packages/i18n/src/locales/ca.i18n.json        |   7 -
 packages/i18n/src/locales/cs.i18n.json        |   7 -
 packages/i18n/src/locales/cy.i18n.json        |   9 +-
 packages/i18n/src/locales/da.i18n.json        |   7 -
 packages/i18n/src/locales/de-AT.i18n.json     |   9 +-
 packages/i18n/src/locales/de-IN.i18n.json     |   7 -
 packages/i18n/src/locales/de.i18n.json        |   7 -
 packages/i18n/src/locales/el.i18n.json        |   9 +-
 packages/i18n/src/locales/en.i18n.json        |  11 +-
 packages/i18n/src/locales/eo.i18n.json        |   9 +-
 packages/i18n/src/locales/es.i18n.json        |   7 -
 packages/i18n/src/locales/fa.i18n.json        |   9 +-
 packages/i18n/src/locales/fi.i18n.json        |   7 -
 packages/i18n/src/locales/fr.i18n.json        |   7 -
 packages/i18n/src/locales/hr.i18n.json        |   7 -
 packages/i18n/src/locales/hu.i18n.json        |   7 -
 packages/i18n/src/locales/id.i18n.json        |   9 +-
 packages/i18n/src/locales/it.i18n.json        |   9 +-
 packages/i18n/src/locales/ja.i18n.json        |   7 -
 packages/i18n/src/locales/ka-GE.i18n.json     |   6 -
 packages/i18n/src/locales/km.i18n.json        |   7 -
 packages/i18n/src/locales/ko.i18n.json        |   7 -
 packages/i18n/src/locales/ku.i18n.json        |   9 +-
 packages/i18n/src/locales/lo.i18n.json        |   9 +-
 packages/i18n/src/locales/lt.i18n.json        |   9 +-
 packages/i18n/src/locales/lv.i18n.json        |   9 +-
 packages/i18n/src/locales/mn.i18n.json        |   9 +-
 packages/i18n/src/locales/ms-MY.i18n.json     |   9 +-
 packages/i18n/src/locales/nl.i18n.json        |   7 -
 packages/i18n/src/locales/no.i18n.json        |   9 +-
 packages/i18n/src/locales/pl.i18n.json        |   7 -
 packages/i18n/src/locales/pt-BR.i18n.json     |   7 -
 packages/i18n/src/locales/pt.i18n.json        |   7 -
 packages/i18n/src/locales/ro.i18n.json        |   9 +-
 packages/i18n/src/locales/ru.i18n.json        |   7 -
 packages/i18n/src/locales/sk-SK.i18n.json     |   9 +-
 packages/i18n/src/locales/sl-SI.i18n.json     |   9 +-
 packages/i18n/src/locales/sq.i18n.json        |   9 +-
 packages/i18n/src/locales/sr.i18n.json        |   9 +-
 packages/i18n/src/locales/sv.i18n.json        |   7 -
 packages/i18n/src/locales/ta-IN.i18n.json     |   9 +-
 packages/i18n/src/locales/th-TH.i18n.json     |   9 +-
 packages/i18n/src/locales/tr.i18n.json        |   7 -
 packages/i18n/src/locales/uk.i18n.json        |   7 -
 packages/i18n/src/locales/vi-VN.i18n.json     |   9 +-
 packages/i18n/src/locales/zh-HK.i18n.json     |   9 +-
 packages/i18n/src/locales/zh-TW.i18n.json     |   7 -
 packages/i18n/src/locales/zh.i18n.json        |   7 -
 75 files changed, 566 insertions(+), 440 deletions(-)
 create mode 100644 .changeset/ten-stingrays-eat.md
 create mode 100644 apps/meteor/client/lib/convertTimeUnit.spec.ts
 create mode 100644 apps/meteor/client/lib/convertTimeUnit.ts
 create mode 100644 apps/meteor/client/views/admin/settings/inputs/TimespanSettingInput.spec.tsx
 create mode 100644 apps/meteor/client/views/admin/settings/inputs/TimespanSettingInput.tsx

diff --git a/.changeset/ten-stingrays-eat.md b/.changeset/ten-stingrays-eat.md
new file mode 100644
index 000000000000..8a8988bd77c2
--- /dev/null
+++ b/.changeset/ten-stingrays-eat.md
@@ -0,0 +1,7 @@
+---
+"@rocket.chat/meteor": minor
+"@rocket.chat/core-typings": minor
+"@rocket.chat/i18n": minor
+---
+
+Added the possibility to choose the time unit (days, hours, minutes) to the global retention policy settings
diff --git a/apps/meteor/app/lib/server/methods/saveSettings.ts b/apps/meteor/app/lib/server/methods/saveSettings.ts
index 93e884c9f77e..7c6a2a801361 100644
--- a/apps/meteor/app/lib/server/methods/saveSettings.ts
+++ b/apps/meteor/app/lib/server/methods/saveSettings.ts
@@ -82,6 +82,7 @@ Meteor.methods<ServerMethods>({
 						case 'boolean':
 							check(value, Boolean);
 							break;
+						case 'timespan':
 						case 'int':
 							check(value, Number);
 							break;
diff --git a/apps/meteor/app/retention-policy/server/cronPruneMessages.ts b/apps/meteor/app/retention-policy/server/cronPruneMessages.ts
index fb0e691abd69..d12b734c8906 100644
--- a/apps/meteor/app/retention-policy/server/cronPruneMessages.ts
+++ b/apps/meteor/app/retention-policy/server/cronPruneMessages.ts
@@ -29,7 +29,7 @@ async function job(): Promise<void> {
 	// get all rooms with default values
 	for await (const type of types) {
 		const maxAge = maxTimes[type] || 0;
-		const latest = new Date(now.getTime() - toDays(maxAge));
+		const latest = new Date(now.getTime() - maxAge);
 
 		const rooms = await Rooms.find(
 			{
@@ -107,9 +107,9 @@ settings.watchMultiple(
 		'RetentionPolicy_AppliesToChannels',
 		'RetentionPolicy_AppliesToGroups',
 		'RetentionPolicy_AppliesToDMs',
-		'RetentionPolicy_MaxAge_Channels',
-		'RetentionPolicy_MaxAge_Groups',
-		'RetentionPolicy_MaxAge_DMs',
+		'RetentionPolicy_TTL_Channels',
+		'RetentionPolicy_TTL_Groups',
+		'RetentionPolicy_TTL_DMs',
 		'RetentionPolicy_Advanced_Precision',
 		'RetentionPolicy_Advanced_Precision_Cron',
 		'RetentionPolicy_Precision',
@@ -132,9 +132,9 @@ settings.watchMultiple(
 			types.push('d');
 		}
 
-		maxTimes.c = settings.get('RetentionPolicy_MaxAge_Channels');
-		maxTimes.p = settings.get('RetentionPolicy_MaxAge_Groups');
-		maxTimes.d = settings.get('RetentionPolicy_MaxAge_DMs');
+		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')) ||
diff --git a/apps/meteor/client/components/InfoPanel/RetentionPolicyCallout.tsx b/apps/meteor/client/components/InfoPanel/RetentionPolicyCallout.tsx
index 06f6ed133dc3..be513e477cd9 100644
--- a/apps/meteor/client/components/InfoPanel/RetentionPolicyCallout.tsx
+++ b/apps/meteor/client/components/InfoPanel/RetentionPolicyCallout.tsx
@@ -4,7 +4,6 @@ import type { FC } from 'react';
 import React from 'react';
 
 import { useFormattedRelativeTime } from '../../hooks/useFormattedRelativeTime';
-import { getMaxAgeInMS } from '../../views/room/hooks/useRetentionPolicy';
 
 type RetentionPolicyCalloutProps = {
 	filesOnly: boolean;
@@ -14,7 +13,7 @@ type RetentionPolicyCalloutProps = {
 
 const RetentionPolicyCallout: FC<RetentionPolicyCalloutProps> = ({ filesOnly, excludePinned, maxAge }) => {
 	const t = useTranslation();
-	const time = useFormattedRelativeTime(getMaxAgeInMS(maxAge));
+	const time = useFormattedRelativeTime(maxAge);
 
 	return (
 		<Callout arial-label={t('Retention_policy_warning_callout')} role='alert' aria-live='polite' type='warning'>
diff --git a/apps/meteor/client/lib/convertTimeUnit.spec.ts b/apps/meteor/client/lib/convertTimeUnit.spec.ts
new file mode 100644
index 000000000000..e781d2d953a0
--- /dev/null
+++ b/apps/meteor/client/lib/convertTimeUnit.spec.ts
@@ -0,0 +1,65 @@
+import { TIMEUNIT, timeUnitToMs, msToTimeUnit } from './convertTimeUnit';
+
+describe('timeUnitToMs function', () => {
+	it('should correctly convert days to milliseconds', () => {
+		expect(timeUnitToMs(TIMEUNIT.days, 1)).toBe(86400000);
+		expect(timeUnitToMs(TIMEUNIT.days, 2)).toBe(172800000);
+		expect(timeUnitToMs(TIMEUNIT.days, 0.5)).toBe(43200000);
+	});
+
+	it('should correctly convert hours to milliseconds', () => {
+		expect(timeUnitToMs(TIMEUNIT.hours, 1)).toBe(3600000);
+		expect(timeUnitToMs(TIMEUNIT.hours, 2)).toBe(7200000);
+		expect(timeUnitToMs(TIMEUNIT.hours, 0.5)).toBe(1800000);
+	});
+
+	it('should correctly convert minutes to milliseconds', () => {
+		expect(timeUnitToMs(TIMEUNIT.minutes, 1)).toBe(60000);
+		expect(timeUnitToMs(TIMEUNIT.minutes, 2)).toBe(120000);
+		expect(timeUnitToMs(TIMEUNIT.minutes, 0.5)).toBe(30000);
+	});
+
+	it('should throw an error for invalid time units', () => {
+		expect(() => timeUnitToMs('invalidUnit' as TIMEUNIT, 1)).toThrow('timeUnitToMs - invalid time unit');
+	});
+
+	it('should throw an error for invalid timespan', () => {
+		const errorMessage = 'timeUnitToMs - invalid timespan';
+		expect(() => timeUnitToMs(TIMEUNIT.days, NaN)).toThrow(errorMessage);
+		expect(() => timeUnitToMs(TIMEUNIT.days, Infinity)).toThrow(errorMessage);
+		expect(() => timeUnitToMs(TIMEUNIT.days, -Infinity)).toThrow(errorMessage);
+		expect(() => timeUnitToMs(TIMEUNIT.days, -1)).toThrow(errorMessage);
+	});
+});
+
+describe('msToTimeUnit function', () => {
+	it('should correctly convert milliseconds to days', () => {
+		expect(msToTimeUnit(TIMEUNIT.days, 86400000)).toBe(1); // 1 day
+		expect(msToTimeUnit(TIMEUNIT.days, 172800000)).toBe(2); // 2 days
+		expect(msToTimeUnit(TIMEUNIT.days, 43200000)).toBe(0.5); // .5 days
+	});
+
+	it('should correctly convert milliseconds to hours', () => {
+		expect(msToTimeUnit(TIMEUNIT.hours, 3600000)).toBe(1); // 1 hour
+		expect(msToTimeUnit(TIMEUNIT.hours, 7200000)).toBe(2); // 2 hours
+		expect(msToTimeUnit(TIMEUNIT.hours, 1800000)).toBe(0.5); // .5 hours
+	});
+
+	it('should correctly convert milliseconds to minutes', () => {
+		expect(msToTimeUnit(TIMEUNIT.minutes, 60000)).toBe(1); // 1 min
+		expect(msToTimeUnit(TIMEUNIT.minutes, 120000)).toBe(2); // 2 min
+		expect(msToTimeUnit(TIMEUNIT.minutes, 30000)).toBe(0.5); // .5 min
+	});
+
+	it('should throw an error for invalid time units', () => {
+		expect(() => msToTimeUnit('invalidUnit' as TIMEUNIT, 1)).toThrow('msToTimeUnit - invalid time unit');
+	});
+
+	it('should throw an error for invalid timespan', () => {
+		const errorMessage = 'msToTimeUnit - invalid timespan';
+		expect(() => msToTimeUnit(TIMEUNIT.days, NaN)).toThrow(errorMessage);
+		expect(() => msToTimeUnit(TIMEUNIT.days, Infinity)).toThrow(errorMessage);
+		expect(() => msToTimeUnit(TIMEUNIT.days, -Infinity)).toThrow(errorMessage);
+		expect(() => msToTimeUnit(TIMEUNIT.days, -1)).toThrow(errorMessage);
+	});
+});
diff --git a/apps/meteor/client/lib/convertTimeUnit.ts b/apps/meteor/client/lib/convertTimeUnit.ts
new file mode 100644
index 000000000000..f87f595b6902
--- /dev/null
+++ b/apps/meteor/client/lib/convertTimeUnit.ts
@@ -0,0 +1,58 @@
+export enum TIMEUNIT {
+	days = 'days',
+	hours = 'hours',
+	minutes = 'minutes',
+}
+
+const isValidTimespan = (timespan: number): boolean => {
+	if (Number.isNaN(timespan)) {
+		return false;
+	}
+
+	if (!Number.isFinite(timespan)) {
+		return false;
+	}
+
+	if (timespan < 0) {
+		return false;
+	}
+
+	return true;
+};
+
+export const timeUnitToMs = (unit: TIMEUNIT, timespan: number) => {
+	if (!isValidTimespan(timespan)) {
+		throw new Error('timeUnitToMs - invalid timespan');
+	}
+
+	switch (unit) {
+		case TIMEUNIT.days:
+			return timespan * 24 * 60 * 60 * 1000;
+
+		case TIMEUNIT.hours:
+			return timespan * 60 * 60 * 1000;
+
+		case TIMEUNIT.minutes:
+			return timespan * 60 * 1000;
+
+		default:
+			throw new Error('timeUnitToMs - invalid time unit');
+	}
+};
+
+export const msToTimeUnit = (unit: TIMEUNIT, timespan: number) => {
+	if (!isValidTimespan(timespan)) {
+		throw new Error('msToTimeUnit - invalid timespan');
+	}
+
+	switch (unit) {
+		case TIMEUNIT.days:
+			return timespan / 24 / 60 / 60 / 1000;
+		case TIMEUNIT.hours:
+			return timespan / 60 / 60 / 1000;
+		case TIMEUNIT.minutes:
+			return timespan / 60 / 1000;
+		default:
+			throw new Error('msToTimeUnit - invalid time unit');
+	}
+};
diff --git a/apps/meteor/client/omnichannel/priorities/PriorityEditForm.tsx b/apps/meteor/client/omnichannel/priorities/PriorityEditForm.tsx
index 38157e435b8c..d67f637a2b4e 100644
--- a/apps/meteor/client/omnichannel/priorities/PriorityEditForm.tsx
+++ b/apps/meteor/client/omnichannel/priorities/PriorityEditForm.tsx
@@ -81,6 +81,7 @@ const PriorityEditForm = ({ data, onSave, onCancel }: PriorityEditFormProps): Re
 					render={({ field: { value, onChange } }): ReactElement => (
 						<StringSettingInput
 							_id=''
+							packageValue={defaultName}
 							disabled={isSaving}
 							error={errors.name?.message}
 							label={`${t('Name')}*`}
diff --git a/apps/meteor/client/views/admin/settings/MemoizedSetting.tsx b/apps/meteor/client/views/admin/settings/MemoizedSetting.tsx
index d0b5c10e2c80..5d08909d6950 100644
--- a/apps/meteor/client/views/admin/settings/MemoizedSetting.tsx
+++ b/apps/meteor/client/views/admin/settings/MemoizedSetting.tsx
@@ -20,6 +20,7 @@ import RoomPickSettingInput from './inputs/RoomPickSettingInput';
 import SelectSettingInput from './inputs/SelectSettingInput';
 import SelectTimezoneSettingInput from './inputs/SelectTimezoneSettingInput';
 import StringSettingInput from './inputs/StringSettingInput';
+import TimespanSettingInput from './inputs/TimespanSettingInput';
 
 // @todo: the props are loosely typed because `Setting` needs to typecheck them.
 const inputsByType: Record<ISettingBase['type'], ElementType<any>> = {
@@ -39,6 +40,7 @@ const inputsByType: Record<ISettingBase['type'], ElementType<any>> = {
 	roomPick: RoomPickSettingInput,
 	timezone: SelectTimezoneSettingInput,
 	lookup: LookupSettingInput,
+	timespan: TimespanSettingInput,
 	date: GenericSettingInput, // @todo: implement
 	group: GenericSettingInput, // @todo: implement
 };
@@ -46,6 +48,7 @@ const inputsByType: Record<ISettingBase['type'], ElementType<any>> = {
 type MemoizedSettingProps = {
 	_id?: string;
 	type: ISettingBase['type'];
+	packageValue: ISettingBase['packageValue'];
 	hint?: ReactNode;
 	callout?: ReactNode;
 	value?: SettingValue;
diff --git a/apps/meteor/client/views/admin/settings/Setting.stories.tsx b/apps/meteor/client/views/admin/settings/Setting.stories.tsx
index e80db37d821e..18ff3801dbc9 100644
--- a/apps/meteor/client/views/admin/settings/Setting.stories.tsx
+++ b/apps/meteor/client/views/admin/settings/Setting.stories.tsx
@@ -42,17 +42,17 @@ WithCallout.args = {
 
 export const types = () => (
 	<FieldGroup>
-		<Setting.Memoized _id='setting-id-1' label='Label' type='action' actionText='Action text' />
-		<Setting.Memoized _id='setting-id-2' label='Label' type='asset' />
-		<Setting.Memoized _id='setting-id-3' label='Label' type='boolean' />
-		<Setting.Memoized _id='setting-id-4' label='Label' type='code' />
-		<Setting.Memoized _id='setting-id-5' label='Label' type='font' />
-		<Setting.Memoized _id='setting-id-6' label='Label' type='int' />
-		<Setting.Memoized _id='setting-id-7' label='Label' type='language' />
-		<Setting.Memoized _id='setting-id-8' label='Label' type='password' />
-		<Setting.Memoized _id='setting-id-9' label='Label' type='relativeUrl' />
-		<Setting.Memoized _id='setting-id-10' label='Label' type='select' />
-		<Setting.Memoized _id='setting-id-11' label='Label' type='string' />
+		<Setting.Memoized packageValue _id='setting-id-1' label='Label' type='action' actionText='Action text' />
+		<Setting.Memoized packageValue='' _id='setting-id-2' label='Label' type='asset' />
+		<Setting.Memoized packageValue _id='setting-id-3' label='Label' type='boolean' />
+		<Setting.Memoized packageValue='' _id='setting-id-4' label='Label' type='code' />
+		<Setting.Memoized packageValue='' _id='setting-id-5' label='Label' type='font' />
+		<Setting.Memoized packageValue={1} _id='setting-id-6' label='Label' type='int' />
+		<Setting.Memoized packageValue='' _id='setting-id-7' label='Label' type='language' />
+		<Setting.Memoized packageValue='' _id='setting-id-8' label='Label' type='password' />
+		<Setting.Memoized packageValue='' _id='setting-id-9' label='Label' type='relativeUrl' />
+		<Setting.Memoized packageValue='' _id='setting-id-10' label='Label' type='select' />
+		<Setting.Memoized packageValue='' _id='setting-id-11' label='Label' type='string' />
 	</FieldGroup>
 );
 
diff --git a/apps/meteor/client/views/admin/settings/inputs/TimespanSettingInput.spec.tsx b/apps/meteor/client/views/admin/settings/inputs/TimespanSettingInput.spec.tsx
new file mode 100644
index 000000000000..cd345b0f1ede
--- /dev/null
+++ b/apps/meteor/client/views/admin/settings/inputs/TimespanSettingInput.spec.tsx
@@ -0,0 +1,157 @@
+import { render, screen } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
+import React from 'react';
+
+import { TIMEUNIT } from '../../../../lib/convertTimeUnit';
+import { default as TimespanSettingInput, getHighestTimeUnit } from './TimespanSettingInput';
+
+global.ResizeObserver = jest.fn().mockImplementation(() => ({
+	observe: jest.fn(),
+	unobserve: jest.fn(),
+	disconnect: jest.fn(),
+}));
+
+describe('getHighestTimeUnit function', () => {
+	it('should return minutes if milliseconds cannot be evenly divided into hours or days', () => {
+		expect(getHighestTimeUnit(900000)).toBe(TIMEUNIT.minutes); // 15 min
+		expect(getHighestTimeUnit(2100000)).toBe(TIMEUNIT.minutes); // 35 min
+		expect(getHighestTimeUnit(3660000)).toBe(TIMEUNIT.minutes); // 61 minutes
+		expect(getHighestTimeUnit(86460000)).toBe(TIMEUNIT.minutes); // 1441 minutes
+	});
+
+	it('should return hours if milliseconds can be evenly divided into hours but not days', () => {
+		expect(getHighestTimeUnit(3600000)).toBe(TIMEUNIT.hours); // 1 hour
+		expect(getHighestTimeUnit(7200000)).toBe(TIMEUNIT.hours); // 2 hours
+		expect(getHighestTimeUnit(90000000)).toBe(TIMEUNIT.hours); // 25 hours
+	});
+
+	it('should return days if milliseconds can be evenly divided into days', () => {
+		expect(getHighestTimeUnit(86400000)).toBe(TIMEUNIT.days); // 1 day
+		expect(getHighestTimeUnit(172800000)).toBe(TIMEUNIT.days); // 2 days
+		expect(getHighestTimeUnit(604800000)).toBe(TIMEUNIT.days); // 7 days
+	});
+});
+
+describe('TimespanSettingInput component', () => {
+	const onChangeValueMock = jest.fn();
+	const onResetButtonClickMock = jest.fn();
+
+	afterEach(() => {
+		jest.clearAllMocks();
+	});
+
+	it('should call onChangeValue with the correct value when inputting a value and changing time unit', () => {
+		render(
+			<TimespanSettingInput
+				disabled={false}
+				packageValue='2592000000'
+				hasResetButton={false}
+				_id='timespanInput'
+				label='Timespan'
+				value='86400000' // 1 day
+				placeholder='Enter timespan'
+				onChangeValue={onChangeValueMock}
+			/>,
+		);
+
+		const numberInput = screen.getByRole('spinbutton');
+		userEvent.clear(numberInput); // Change value to 2
+		userEvent.type(numberInput, '2');
+
+		expect(onChangeValueMock).toHaveBeenCalledWith(2 * 24 * 60 * 60 * 1000); // 2 days in milliseconds
+	});
+
+	it('should update value to minutes when changing time unit to minutes', () => {
+		render(
+			<TimespanSettingInput
+				disabled={false}
+				packageValue='2592000000'
+				hasResetButton={false}
+				_id='timespanInput'
+				label='Timespan'
+				value='3600000' // 1 hour in milliseconds
+				placeholder='Enter timespan'
+				onChangeValue={onChangeValueMock}
+			/>,
+		);
+
+		const selectInput = screen.getByRole('button', { name: 'hours' });
+		userEvent.click(selectInput);
+		const minutesOption = screen.getByRole('option', { name: 'minutes' });
+		userEvent.click(minutesOption);
+
+		expect(onChangeValueMock).toHaveBeenCalledWith(60000); // 1 min in milliseconds
+
+		expect(screen.getByDisplayValue('1')).toBeTruthy();
+	});
+
+	it('should update value to hours when changing time unit to hours', () => {
+		render(
+			<TimespanSettingInput
+				disabled={false}
+				hasResetButton={false}
+				packageValue='2592000000'
+				_id='timespanInput'
+				label='Timespan'
+				value='86400000' // 1 day in milliseconds
+				placeholder='Enter timespan'
+				onChangeValue={onChangeValueMock}
+			/>,
+		);
+
+		const selectInput = screen.getByRole('button', { name: 'days' });
+		userEvent.click(selectInput);
+		const hoursOption = screen.getByRole('option', { name: 'hours' });
+		userEvent.click(hoursOption);
+
+		expect(onChangeValueMock).toHaveBeenCalledWith(3600000); // 1 hour in milliseconds
+
+		expect(screen.getByDisplayValue('1')).toBeTruthy();
+	});
+
+	it('should update value to days when changing time unit to days', () => {
+		render(
+			<TimespanSettingInput
+				disabled={false}
+				hasResetButton={false}
+				packageValue='2592000000'
+				_id='timespanInput'
+				label='Timespan'
+				value='43200000' // half a day
+				placeholder='Enter timespan'
+				onChangeValue={onChangeValueMock}
+			/>,
+		);
+
+		const selectInput = screen.getByRole('button', { name: 'hours' });
+		userEvent.click(selectInput);
+		const daysOption = screen.getByRole('option', { name: 'days' });
+		userEvent.click(daysOption);
+
+		expect(onChangeValueMock).toHaveBeenCalledWith(1036800000); // 12 days in milliseconds
+
+		expect(screen.getByDisplayValue('12')).toBeTruthy();
+	});
+
+	it('should call onResetButtonClick when reset button is clicked', () => {
+		render(
+			<TimespanSettingInput
+				disabled={false}
+				_id='timespanInput'
+				packageValue='2592000000'
+				label='Timespan'
+				value='3600000' // 1 hour in milliseconds
+				placeholder='Enter timespan'
+				onChangeValue={onChangeValueMock}
+				hasResetButton
+				onResetButtonClick={onResetButtonClickMock}
+			/>,
+		);
+
+		const resetButton = screen.getByTitle('Reset');
+		userEvent.click(resetButton);
+
+		expect(onResetButtonClickMock).toHaveBeenCalled();
+		expect(screen.getByDisplayValue('30')).toBeTruthy();
+	});
+});
diff --git a/apps/meteor/client/views/admin/settings/inputs/TimespanSettingInput.tsx b/apps/meteor/client/views/admin/settings/inputs/TimespanSettingInput.tsx
new file mode 100644
index 000000000000..14191d133c75
--- /dev/null
+++ b/apps/meteor/client/views/admin/settings/inputs/TimespanSettingInput.tsx
@@ -0,0 +1,112 @@
+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 { TIMEUNIT, timeUnitToMs, msToTimeUnit } from '../../../../lib/convertTimeUnit';
+import ResetSettingButton from '../ResetSettingButton';
+import type { SettingInputProps } from './types';
+
+type TimespanSettingInputProps = SettingInputProps<string, string | number> & {
+	value: string;
+};
+
+export const getHighestTimeUnit = (value: number): TIMEUNIT => {
+	const minutes = msToTimeUnit(TIMEUNIT.minutes, value);
+	if (minutes % 60 !== 0) {
+		return TIMEUNIT.minutes;
+	}
+
+	const hours = msToTimeUnit(TIMEUNIT.hours, value);
+	if (hours % 24 !== 0) {
+		return TIMEUNIT.hours;
+	}
+
+	return TIMEUNIT.days;
+};
+
+const sanitizeInputValue = (value: number) => {
+	if (!value) {
+		return 0;
+	}
+
+	const sanitizedValue = Math.max(0, value).toFixed(0);
+
+	return Number(sanitizedValue);
+};
+
+function TimespanSettingInput({
+	_id,
+	label,
+	value,
+	placeholder,
+	readonly,
+	autocomplete,
+	disabled,
+	required,
+	onChangeValue,
+	hasResetButton,
+	onResetButtonClick,
+	packageValue,
+}: TimespanSettingInputProps): ReactElement {
+	const t = useTranslation();
+
+	const [timeUnit, setTimeUnit] = useState<TIMEUNIT>(getHighestTimeUnit(Number(value)));
+	const [internalValue, setInternalValue] = useState<number>(msToTimeUnit(timeUnit, Number(value)));
+
+	const handleChange: FormEventHandler<HTMLInputElement> = (event) => {
+		const newValue = sanitizeInputValue(Number(event.currentTarget.value));
+
+		onChangeValue?.(timeUnitToMs(timeUnit, newValue));
+
+		setInternalValue(newValue);
+	};
+
+	const handleChangeTimeUnit = (nextTimeUnit: string | number) => {
+		if (typeof nextTimeUnit !== 'string') {
+			return;
+		}
+		onChangeValue?.(timeUnitToMs(nextTimeUnit as TIMEUNIT, internalValue));
+		setTimeUnit(nextTimeUnit as TIMEUNIT);
+	};
+
+	const timeUnitOptions = useMemo(() => {
+		return Object.entries(TIMEUNIT).map<readonly [TIMEUNIT, string]>(([label, value]) => [value, t.has(label) ? t(label) : label]); // todo translate
+	}, [t]);
+
+	const handleResetButtonClick = () => {
+		onResetButtonClick?.();
+		const newTimeUnit = getHighestTimeUnit(Number(packageValue));
+		setTimeUnit(newTimeUnit);
+		setInternalValue(msToTimeUnit(newTimeUnit, Number(packageValue)));
+	};
+
+	return (
+		<Field>
+			<FieldRow>
+				<FieldLabel htmlFor={_id} title={_id} required={required}>
+					{label}
+				</FieldLabel>
+				{hasResetButton && <ResetSettingButton data-qa-reset-setting-id={_id} onClick={handleResetButtonClick} />}
+			</FieldRow>
+			<FieldRow>
+				<InputBox
+					data-qa-setting-id={_id}
+					id={_id}
+					type='number'
+					value={internalValue}
+					placeholder={placeholder}
+					disabled={disabled}
+					readOnly={readonly}
+					autoComplete={autocomplete === false ? 'off' : undefined}
+					onChange={handleChange}
+				/>
+			</FieldRow>
+			<FieldRow>
+				<Select value={timeUnit} disabled={disabled} options={timeUnitOptions} onChange={handleChangeTimeUnit} />
+			</FieldRow>
+		</Field>
+	);
+}
+
+export default TimespanSettingInput;
diff --git a/apps/meteor/client/views/admin/settings/inputs/types.ts b/apps/meteor/client/views/admin/settings/inputs/types.ts
index d978a3ad6b4d..a99f118b7673 100644
--- a/apps/meteor/client/views/admin/settings/inputs/types.ts
+++ b/apps/meteor/client/views/admin/settings/inputs/types.ts
@@ -4,6 +4,7 @@ export type SettingInputProps<V = string, R = V> = {
 	_id: string;
 	label: ReactNode;
 	value?: V;
+	packageValue: V;
 	placeholder?: string;
 	readonly?: boolean;
 	autocomplete?: boolean;
diff --git a/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppSettings/AppSetting.tsx b/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppSettings/AppSetting.tsx
index d63c44d1668b..7269a07e9b3d 100644
--- a/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppSettings/AppSetting.tsx
+++ b/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppSettings/AppSetting.tsx
@@ -81,6 +81,7 @@ const AppSetting = ({ id, type, i18nLabel, i18nDescription, values, value, packa
 			control={control}
 			render={({ field: { onChange, value } }) => (
 				<MemoizedSetting
+					packageValue={packageValue}
 					type={type}
 					label={label}
 					hint={hint}
diff --git a/apps/meteor/client/views/room/body/RetentionPolicyWarning.tsx b/apps/meteor/client/views/room/body/RetentionPolicyWarning.tsx
index 87a061c682eb..193c8fa7bb6b 100644
--- a/apps/meteor/client/views/room/body/RetentionPolicyWarning.tsx
+++ b/apps/meteor/client/views/room/body/RetentionPolicyWarning.tsx
@@ -4,7 +4,6 @@ import type { ReactElement } from 'react';
 import React from 'react';
 
 import { useFormattedRelativeTime } from '../../../hooks/useFormattedRelativeTime';
-import { getMaxAgeInMS } from '../hooks/useRetentionPolicy';
 
 type RetentionPolicyWarningProps = {
 	filesOnly: boolean;
@@ -14,7 +13,7 @@ type RetentionPolicyWarningProps = {
 
 const RetentionPolicyWarning = ({ filesOnly, excludePinned, maxAge }: RetentionPolicyWarningProps): ReactElement => {
 	const t = useTranslation();
-	const time = useFormattedRelativeTime(getMaxAgeInMS(maxAge));
+	const time = useFormattedRelativeTime(maxAge);
 
 	if (filesOnly) {
 		return (
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 2bdf5ff395f6..2bf4ad333272 100644
--- a/apps/meteor/client/views/room/contextualBar/Info/EditRoomInfo/EditRoomInfo.tsx
+++ b/apps/meteor/client/views/room/contextualBar/Info/EditRoomInfo/EditRoomInfo.tsx
@@ -38,6 +38,7 @@ import {
 } from '../../../../../components/Contextualbar';
 import RawText from '../../../../../components/RawText';
 import RoomAvatarEditor from '../../../../../components/avatar/RoomAvatarEditor';
+import { msToTimeUnit, TIMEUNIT } from '../../../../../lib/convertTimeUnit';
 import { getDirtyFields } from '../../../../../lib/getDirtyFields';
 import { useArchiveRoom } from '../../../../hooks/roomActions/useArchiveRoom';
 import { useRetentionPolicy } from '../../../hooks/useRetentionPolicy';
@@ -59,12 +60,12 @@ const title = {
 const getRetentionSetting = (roomType: IRoomWithRetentionPolicy['t']): string => {
 	switch (roomType) {
 		case 'd':
-			return 'RetentionPolicy_MaxAge_DMs';
+			return 'RetentionPolicy_TTL_DMs';
 		case 'p':
-			return 'RetentionPolicy_MaxAge_Groups';
+			return 'RetentionPolicy_TTL_Groups';
 		case 'c':
 		default:
-			return 'RetentionPolicy_MaxAge_Channels';
+			return 'RetentionPolicy_TTL_Channels';
 	}
 };
 
@@ -76,7 +77,7 @@ const EditRoomInfo = ({ room, onClickClose, onClickBack }: EditRoomInfoProps) =>
 	const roomType = 'prid' in room ? 'discussion' : room.teamId ? 'team' : 'channel';
 
 	const retentionPolicy = useRetentionPolicy(room);
-	const retentionMaxAgeDefault = useSetting<number>(getRetentionSetting(room.t)) ?? 30;
+	const retentionMaxAgeDefault = msToTimeUnit(TIMEUNIT.days, Number(useSetting<number>(getRetentionSetting(room.t)))) ?? 30;
 	const defaultValues = useEditRoomInitialValues(room);
 	const namesValidation = useSetting('UTF8_Channel_Names_Validation');
 	const allowSpecialNames = useSetting('UI_Allow_room_names_with_special_chars');
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 fa25dab96f0d..1a002727358f 100644
--- a/apps/meteor/client/views/room/contextualBar/Info/EditRoomInfo/useEditRoomInitialValues.ts
+++ b/apps/meteor/client/views/room/contextualBar/Info/EditRoomInfo/useEditRoomInitialValues.ts
@@ -2,6 +2,7 @@ import type { IRoomWithRetentionPolicy } from '@rocket.chat/core-typings';
 import { usePermission } from '@rocket.chat/ui-contexts';
 import { useMemo } from 'react';
 
+import { msToTimeUnit, TIMEUNIT } from '../../../../../lib/convertTimeUnit';
 import { roomCoordinator } from '../../../../../lib/rooms/roomCoordinator';
 import { useRetentionPolicy } from '../../../hooks/useRetentionPolicy';
 
@@ -31,7 +32,7 @@ export const useEditRoomInitialValues = (room: IRoomWithRetentionPolicy) => {
 				retentionPolicy?.enabled && {
 					retentionEnabled: retention?.enabled ?? retentionPolicy.isActive,
 					retentionOverrideGlobal: !!retention?.overrideGlobal,
-					retentionMaxAge: retention?.maxAge ?? retentionPolicy.maxAge,
+					retentionMaxAge: retention?.maxAge ?? msToTimeUnit(TIMEUNIT.days, retentionPolicy.maxAge),
 					retentionExcludePinned: retention?.excludePinned ?? retentionPolicy.excludePinned,
 					retentionFilesOnly: retention?.filesOnly ?? retentionPolicy.filesOnly,
 					retentionIgnoreThreads: retention?.ignoreThreads ?? retentionPolicy.ignoreThreads,
diff --git a/apps/meteor/client/views/room/hooks/useRetentionPolicy.ts b/apps/meteor/client/views/room/hooks/useRetentionPolicy.ts
index 1b048630ce74..9c44b42b1568 100644
--- a/apps/meteor/client/views/room/hooks/useRetentionPolicy.ts
+++ b/apps/meteor/client/views/room/hooks/useRetentionPolicy.ts
@@ -1,6 +1,8 @@
 import type { IRoom, IRoomWithRetentionPolicy } from '@rocket.chat/core-typings';
 import { useSetting } from '@rocket.chat/ui-contexts';
 
+import { TIMEUNIT, timeUnitToMs } from '../../../lib/convertTimeUnit';
+
 const hasRetentionPolicy = (room: IRoom & { retention?: any }): room is IRoomWithRetentionPolicy =>
 	'retention' in room && room.retention !== undefined;
 
@@ -17,8 +19,6 @@ type RetentionPolicySettings = {
 	maxAgeDMs: number;
 };
 
-export const getMaxAgeInMS = (maxAge: number) => maxAge * 24 * 60 * 60 * 1000;
-
 const isActive = (room: IRoom, { enabled, appliesToChannels, appliesToGroups, appliesToDMs }: RetentionPolicySettings): boolean => {
 	if (!enabled) {
 		return false;
@@ -66,7 +66,7 @@ const extractIgnoreThreads = (room: IRoom, { ignoreThreads }: RetentionPolicySet
 
 const getMaxAge = (room: IRoom, { maxAgeChannels, maxAgeGroups, maxAgeDMs }: RetentionPolicySettings): number => {
 	if (hasRetentionPolicy(room) && room.retention.overrideGlobal) {
-		return room.retention.maxAge;
+		return timeUnitToMs(TIMEUNIT.days, room.retention.maxAge);
 	}
 
 	if (room.t === 'c') {
@@ -100,11 +100,11 @@ export const useRetentionPolicy = (
 		doNotPrunePinned: useSetting('RetentionPolicy_DoNotPrunePinned') as boolean,
 		ignoreThreads: useSetting('RetentionPolicy_DoNotPruneThreads') as boolean,
 		appliesToChannels: useSetting('RetentionPolicy_AppliesToChannels') as boolean,
-		maxAgeChannels: useSetting('RetentionPolicy_MaxAge_Channels') as number,
+		maxAgeChannels: useSetting('RetentionPolicy_TTL_Channels') as number,
 		appliesToGroups: useSetting('RetentionPolicy_AppliesToGroups') as boolean,
-		maxAgeGroups: useSetting('RetentionPolicy_MaxAge_Groups') as number,
+		maxAgeGroups: useSetting('RetentionPolicy_TTL_Groups') as number,
 		appliesToDMs: useSetting('RetentionPolicy_AppliesToDMs') as boolean,
-		maxAgeDMs: useSetting('RetentionPolicy_MaxAge_DMs') as number,
+		maxAgeDMs: useSetting('RetentionPolicy_TTL_DMs') as number,
 	} as const;
 
 	if (!room) {
diff --git a/apps/meteor/server/settings/retention-policy.ts b/apps/meteor/server/settings/retention-policy.ts
index 6e9a8203f198..5e620e9a8e49 100644
--- a/apps/meteor/server/settings/retention-policy.ts
+++ b/apps/meteor/server/settings/retention-policy.ts
@@ -1,5 +1,7 @@
 import { settingsRegistry } from '../../app/settings/server';
 
+const THIRTY_DAYS = 2592000000;
+
 export const createRetentionSettings = () =>
 	settingsRegistry.addGroup('RetentionPolicy', async function () {
 		const globalQuery = {
@@ -68,13 +70,27 @@ export const createRetentionSettings = () =>
 				type: 'boolean',
 				public: true,
 				i18nLabel: 'RetentionPolicy_AppliesToChannels',
+				i18nDescription: 'RetentionPolicy_AppliesToChannels_Description',
 				enableQuery: globalQuery,
 			});
 			await this.add('RetentionPolicy_MaxAge_Channels', 30, {
 				type: 'int',
 				public: true,
+				hidden: true,
 				i18nLabel: 'RetentionPolicy_MaxAge_Channels',
-				i18nDescription: 'RetentionPolicy_MaxAge_Description',
+				enableQuery: [
+					{
+						_id: 'RetentionPolicy_AppliesToChannels',
+						value: true,
+					},
+					globalQuery,
+				],
+			});
+
+			await this.add('RetentionPolicy_TTL_Channels', THIRTY_DAYS, {
+				type: 'timespan',
+				public: true,
+				i18nLabel: 'RetentionPolicy_TTL_Channels',
 				enableQuery: [
 					{
 						_id: 'RetentionPolicy_AppliesToChannels',
@@ -88,13 +104,27 @@ export const createRetentionSettings = () =>
 				type: 'boolean',
 				public: true,
 				i18nLabel: 'RetentionPolicy_AppliesToGroups',
+				i18nDescription: 'RetentionPolicy_AppliesToGroups_Description',
 				enableQuery: globalQuery,
 			});
 			await this.add('RetentionPolicy_MaxAge_Groups', 30, {
 				type: 'int',
 				public: true,
+				hidden: true,
 				i18nLabel: 'RetentionPolicy_MaxAge_Groups',
-				i18nDescription: 'RetentionPolicy_MaxAge_Description',
+				enableQuery: [
+					{
+						_id: 'RetentionPolicy_AppliesToGroups',
+						value: true,
+					},
+					globalQuery,
+				],
+			});
+
+			await this.add('RetentionPolicy_TTL_Groups', THIRTY_DAYS, {
+				type: 'timespan',
+				public: true,
+				i18nLabel: 'RetentionPolicy_TTL_Groups',
 				enableQuery: [
 					{
 						_id: 'RetentionPolicy_AppliesToGroups',
@@ -114,8 +144,21 @@ export const createRetentionSettings = () =>
 			await this.add('RetentionPolicy_MaxAge_DMs', 30, {
 				type: 'int',
 				public: true,
+				hidden: true,
 				i18nLabel: 'RetentionPolicy_MaxAge_DMs',
-				i18nDescription: 'RetentionPolicy_MaxAge_Description',
+				enableQuery: [
+					{
+						_id: 'RetentionPolicy_AppliesToDMs',
+						value: true,
+					},
+					globalQuery,
+				],
+			});
+
+			await this.add('RetentionPolicy_TTL_DMs', THIRTY_DAYS, {
+				type: 'timespan',
+				public: true,
+				i18nLabel: 'RetentionPolicy_TTL_DMs',
 				enableQuery: [
 					{
 						_id: 'RetentionPolicy_AppliesToDMs',
diff --git a/apps/meteor/server/startup/migrations/xrun.ts b/apps/meteor/server/startup/migrations/xrun.ts
index 61cfaff50231..7f6c8a68ad55 100644
--- a/apps/meteor/server/startup/migrations/xrun.ts
+++ b/apps/meteor/server/startup/migrations/xrun.ts
@@ -1,3 +1,6 @@
+import { Settings } from '@rocket.chat/models';
+import type { UpdateResult } from 'mongodb';
+
 import { upsertPermissions } from '../../../app/authorization/server/functions/upsertPermissions';
 import { migrateDatabase, onServerVersionChange } from '../../lib/migrations';
 import { ensureCloudWorkspaceRegistered } from '../cloudRegistration';
@@ -6,11 +9,48 @@ const { MIGRATION_VERSION = 'latest' } = process.env;
 
 const [version, ...subcommands] = MIGRATION_VERSION.split(',');
 
+const maxAgeSettingMap = new Map([
+	['RetentionPolicy_MaxAge_Channels', 'RetentionPolicy_TTL_Channels'],
+	['RetentionPolicy_MaxAge_Groups', 'RetentionPolicy_TTL_Groups'],
+	['RetentionPolicy_MaxAge_DMs', 'RetentionPolicy_TTL_DMs'],
+]);
+
+const moveRetentionSetting = async () => {
+	const convertDaysToMs = (days: number) => days * 24 * 60 * 60 * 1000;
+
+	const promises: Array<Promise<UpdateResult>> = [];
+	await Settings.find(
+		{ _id: { $in: Array.from(maxAgeSettingMap.keys()) }, value: { $ne: -1 } },
+		{ projection: { _id: 1, value: 1 } },
+	).forEach(({ _id, value }) => {
+		if (!maxAgeSettingMap.has(_id)) {
+			throw new Error(`moveRetentionSetting - Setting ${_id} equivalent does not exist`);
+		}
+
+		promises.push(
+			Settings.updateOne(
+				{
+					_id: maxAgeSettingMap.get(_id),
+				},
+				{
+					$set: {
+						value: convertDaysToMs(Number(value)),
+					},
+				},
+			),
+		);
+	});
+
+	await Promise.all(promises);
+	await Settings.updateMany({ _id: { $in: Array.from(maxAgeSettingMap.keys()) } }, { $set: { value: -1 } });
+};
+
 export const performMigrationProcedure = async (): Promise<void> => {
 	await migrateDatabase(version === 'latest' ? version : parseInt(version), subcommands);
 	// perform operations when the server is starting with a different version
 	await onServerVersionChange(async () => {
 		await upsertPermissions();
 		await ensureCloudWorkspaceRegistered();
+		await moveRetentionSetting();
 	});
 };
diff --git a/apps/meteor/tests/e2e/retention-policy.spec.ts b/apps/meteor/tests/e2e/retention-policy.spec.ts
index c5db60384d92..03f8dcb68eb6 100644
--- a/apps/meteor/tests/e2e/retention-policy.spec.ts
+++ b/apps/meteor/tests/e2e/retention-policy.spec.ts
@@ -1,5 +1,6 @@
 import { faker } from '@faker-js/faker';
 
+import { timeUnitToMs, TIMEUNIT } from '../../client/lib/convertTimeUnit';
 import { createAuxContext } from './fixtures/createAuxContext';
 import { Users } from './fixtures/userStates';
 import { HomeChannel } from './page-objects';
@@ -60,7 +61,7 @@ test.describe.serial('retention-policy', () => {
 			await setSettingValueById(api, 'RetentionPolicy_AppliesToChannels', false);
 			await setSettingValueById(api, 'RetentionPolicy_AppliesToGroups', false);
 			await setSettingValueById(api, 'RetentionPolicy_AppliesToDMs', false);
-			await setSettingValueById(api, 'RetentionPolicy_MaxAge_Channels', 30);
+			await setSettingValueById(api, 'RetentionPolicy_TTL_Channels', timeUnitToMs(TIMEUNIT.days, 30));
 		});
 
 		test('should not show prune banner even with retention policy setting enabled in any type of room', async () => {
@@ -159,7 +160,7 @@ test.describe.serial('retention-policy', () => {
 
 			test.beforeAll(async ({ api }) => {
 				ignoreThreadsSetting = (await getSettingValueById(api, 'RetentionPolicy_DoNotPruneThreads')) as boolean;
-				expect((await setSettingValueById(api, 'RetentionPolicy_MaxAge_Channels', 15)).status()).toBe(200);
+				expect((await setSettingValueById(api, 'RetentionPolicy_TTL_Channels', timeUnitToMs(TIMEUNIT.days, 15))).status()).toBe(200);
 			});
 
 			test('should display the default max age in edit channel', async () => {
diff --git a/packages/core-typings/src/ISetting.ts b/packages/core-typings/src/ISetting.ts
index 7b3aaa5cf2a4..aa30660d7180 100644
--- a/packages/core-typings/src/ISetting.ts
+++ b/packages/core-typings/src/ISetting.ts
@@ -53,7 +53,8 @@ export interface ISettingBase {
 		| 'roomPick'
 		| 'group'
 		| 'date'
-		| 'lookup';
+		| 'lookup'
+		| 'timespan';
 	public: boolean;
 	env: boolean;
 	group?: GroupId;
diff --git a/packages/i18n/src/locales/af.i18n.json b/packages/i18n/src/locales/af.i18n.json
index bf97cfad4fc0..17c3a8bd13cd 100644
--- a/packages/i18n/src/locales/af.i18n.json
+++ b/packages/i18n/src/locales/af.i18n.json
@@ -2060,19 +2060,12 @@
   "Retail": "Kleinhandel",
   "Retention_setting_changed_successfully": "Behoudingsbeleidinstelling is suksesvol verander",
   "RetentionPolicy": "Retensiebeleid",
-  "RetentionPolicy_AppliesToChannels": "Van toepassing op kanale",
-  "RetentionPolicy_AppliesToDMs": "Van toepassing op direkte boodskappe",
-  "RetentionPolicy_AppliesToGroups": "Van toepassing op privaat groepe",
   "RetentionPolicy_Description": "Snoei ou boodskappe outomaties oor jou Rocket.Chat-voorbeeld.",
   "RetentionPolicy_Enabled": "enabled",
   "RetentionPolicy_ExcludePinned": "Sluit uitgespelde boodskappe uit",
   "RetentionPolicy_FilesOnly": "Net verwyder lêers",
   "RetentionPolicy_FilesOnly_Description": "Slegs lêers sal uitgevee word, die boodskappe self sal in plek bly.",
   "RetentionPolicy_MaxAge": "Maksimum boodskap ouderdom",
-  "RetentionPolicy_MaxAge_Channels": "Maksimum boodskap ouderdom in kanale",
-  "RetentionPolicy_MaxAge_Description": "Snoei alle boodskappe ouer as hierdie waarde, in dae",
-  "RetentionPolicy_MaxAge_DMs": "Maksimum boodskap ouderdom in direkte boodskappe",
-  "RetentionPolicy_MaxAge_Groups": "Maksimum boodskap ouderdom in privaat groepe",
   "RetentionPolicy_Precision": "Timer Precision",
   "RetentionPolicy_Precision_Description": "Hoe gereeld moet die snoei-timer hardloop. Om dit tot 'n meer presiese waarde te stel, maak kanale met vinnige retentietydperke beter, maar kan ekstra verwerkingskrag op groot gemeenskappe kos.",
   "RetentionPolicy_RoomWarning": "Boodskappe ouer as {{time}} word hier outomaties gesnoei",
@@ -2769,4 +2762,4 @@
   "registration.component.form.sendConfirmationEmail": "Stuur bevestiging e-pos",
   "Enterprise": "onderneming",
   "UpgradeToGetMore_engagement-dashboard_Title": "Analytics"
-}
\ No newline at end of file
+}
diff --git a/packages/i18n/src/locales/ar.i18n.json b/packages/i18n/src/locales/ar.i18n.json
index 5b011c5663e2..6b2b8289cfef 100644
--- a/packages/i18n/src/locales/ar.i18n.json
+++ b/packages/i18n/src/locales/ar.i18n.json
@@ -3546,9 +3546,6 @@
   "RetentionPolicy_Advanced_Precision": "استخدام تكوين نهج الاستبقاء المتقدم",
   "RetentionPolicy_Advanced_Precision_Cron": "استخدام Cron لنهج الاستبقاء المتقدم",
   "RetentionPolicy_Advanced_Precision_Cron_Description": "عدد المرات التي يجب فيها تشغيل مؤقت التنقيح المحدد بواسطة تعبير وظيفة cron. يؤدي تعيين هذا إلى قيمة أكثر دقة إلى جعل القنوات ذات مؤقتات الاستبقاء السريعة تعمل بشكل أفضل، ولكنها قد تكلف قوة معالجة إضافية على المجتمعات الكبيرة.",
-  "RetentionPolicy_AppliesToChannels": "ينطبق على القنوات",
-  "RetentionPolicy_AppliesToDMs": "ينطبق على الرسائل المباشرة",
-  "RetentionPolicy_AppliesToGroups": "ينطبق على المجموعات الخاصة",
   "RetentionPolicy_Description": "يقوم تلقائيًا بتنقيح الرسائل القديمة عبر مثيل Rocket.Chat الخاص بك.",
   "RetentionPolicy_DoNotPruneDiscussion": "لا تقم بتنقيح رسائل المناقشة",
   "RetentionPolicy_DoNotPrunePinned": "لا تقم بتنقيح الرسائل المثبتة",
@@ -3558,10 +3555,6 @@
   "RetentionPolicy_FilesOnly": "حذف الملفات فقط",
   "RetentionPolicy_FilesOnly_Description": "سيتم حذف الملفات فقط، وستظل الرسائل نفسها في مكانها.",
   "RetentionPolicy_MaxAge": "الحد الأقصى لعمر الرسائل",
-  "RetentionPolicy_MaxAge_Channels": "الحد الأقصى لعمر الرسائل في القنوات",
-  "RetentionPolicy_MaxAge_Description": "تنقيح كل الرسائل الأقدم من هذه القيمة، بالأيام",
-  "RetentionPolicy_MaxAge_DMs": "الحد الأقصى لعمر الرسائل في الرسائل المباشرة",
-  "RetentionPolicy_MaxAge_Groups": "الحد الأقصى لعمر الرسائل في المجموعات الخاصة",
   "RetentionPolicy_Precision": "دقة المؤقت",
   "RetentionPolicy_Precision_Description": "عدد المرات التي يجب فيها تشغيل مؤقت التنقيح. يؤدي تعيين هذا إلى قيمة أكثر دقة إلى جعل القنوات ذات مؤقتات الاستبقاء السريعة تعمل بشكل أفضل، ولكنها قد تكلف قوة معالجة إضافية على المجتمعات الكبيرة.",
   "RetentionPolicy_RoomWarning": "يتم تنقيح الرسائل الأقدم من {{time}} تلقائيًا هنا",
diff --git a/packages/i18n/src/locales/az.i18n.json b/packages/i18n/src/locales/az.i18n.json
index 60c2b8ccc174..4d70431dfcde 100644
--- a/packages/i18n/src/locales/az.i18n.json
+++ b/packages/i18n/src/locales/az.i18n.json
@@ -2060,19 +2060,12 @@
   "Retail": "Pərakəndə",
   "Retention_setting_changed_successfully": "Saxlama siyasəti parametrləri uğurla dəyişdirildi",
   "RetentionPolicy": "Saklama siyasəti",
-  "RetentionPolicy_AppliesToChannels": "Kanallara tətbiq edilir",
-  "RetentionPolicy_AppliesToDMs": "Birbaşa mesajlar üçün tətbiq edilir",
-  "RetentionPolicy_AppliesToGroups": "Şəxsi qruplara tətbiq edilir",
   "RetentionPolicy_Description": "Sizin Rocket.Chat nizamında avtomatik olaraq köhnə mesajları kəsdirir.",
   "RetentionPolicy_Enabled": "Etkin",
   "RetentionPolicy_ExcludePinned": "Səslənən mesajları həddindən kənarlaşdırın",
   "RetentionPolicy_FilesOnly": "Yalnız faylları silin",
   "RetentionPolicy_FilesOnly_Description": "Yalnız fayllar silinəcək, mesajlar özləri yerində qalacaqlar.",
   "RetentionPolicy_MaxAge": "Maksimum mesaj yaşı",
-  "RetentionPolicy_MaxAge_Channels": "Kanallarda maksimum mesaj yaşı",
-  "RetentionPolicy_MaxAge_Description": "Bu dəyərdən daha eski olan bütün mesajları bir neçə gündə kəsin",
-  "RetentionPolicy_MaxAge_DMs": "Birbaşa mesajlarda maksimum mesaj yaşı",
-  "RetentionPolicy_MaxAge_Groups": "Şəxsi qruplarda maksimum mesaj yaşı",
   "RetentionPolicy_Precision": "Timer dəqiqliyi",
   "RetentionPolicy_Precision_Description": "Hədəf çəkicinin necə tez-tez istifadə etməsi lazımdır. Bunu daha dəqiq bir dəyərə təyin etmək, sürətli saxlama sayğacları olan kanalları daha yaxşı işlədir, lakin böyük icmalarda əlavə işləmə gücünə səbəb ola bilər.",
   "RetentionPolicy_RoomWarning": "{{time}}-dən çox olan mesajlar avtomatik olaraq burda kəsilir",
@@ -2769,4 +2762,4 @@
   "registration.component.form.sendConfirmationEmail": "Təsdiq e-poçt göndər",
   "Enterprise": "Müəssisə",
   "UpgradeToGetMore_engagement-dashboard_Title": "Analytics"
-}
\ No newline at end of file
+}
diff --git a/packages/i18n/src/locales/be-BY.i18n.json b/packages/i18n/src/locales/be-BY.i18n.json
index 58d7cc357bc0..8f44ae85d615 100644
--- a/packages/i18n/src/locales/be-BY.i18n.json
+++ b/packages/i18n/src/locales/be-BY.i18n.json
@@ -2077,19 +2077,12 @@
   "Retail": "рознічны",
   "Retention_setting_changed_successfully": "Настройка палітыкі ўтрымання паспяхова зменены",
   "RetentionPolicy": "палітыка ўтрымання",
-  "RetentionPolicy_AppliesToChannels": "Ставіцца да каналах",
-  "RetentionPolicy_AppliesToDMs": "Ўжываецца для накіравання паведамленняў",
-  "RetentionPolicy_AppliesToGroups": "Ставіцца да прыватных групам",
   "RetentionPolicy_Description": "Аўтаматычна ачышчае старыя паведамленні праз ваш Rocket.Chat асобнік.",
   "RetentionPolicy_Enabled": "Уключана",
   "RetentionPolicy_ExcludePinned": "Выключыць ўскладалі паведамлення",
   "RetentionPolicy_FilesOnly": "Толькі выдаляць файлы",
   "RetentionPolicy_FilesOnly_Description": "Толькі файлы будуць выдаленыя, паведамленні будуць самі застаюцца на месцы.",
   "RetentionPolicy_MaxAge": "Максімальны ўзрост паведамлення",
-  "RetentionPolicy_MaxAge_Channels": "Максімальны ўзрост паведамленні ў каналах",
-  "RetentionPolicy_MaxAge_Description": "Выдаляць ўсе паведамленні старэй, чым гэта значэнне, у днях",
-  "RetentionPolicy_MaxAge_DMs": "Максімальны ўзрост паведамленні ў прамых паведамленняў",
-  "RetentionPolicy_MaxAge_Groups": "Максімальны ўзрост паведамленні ў прыватных групах",
   "RetentionPolicy_Precision": "таймер Precision",
   "RetentionPolicy_Precision_Description": "Як часта таймер чарнасліў павінен працаваць. Ўстаноўка гэтага больш дакладнага значэнне робіць каналы з хуткімі таймерамі захоўвання лепш працаваць, але могуць каштаваць дадатковых вылічальных магутнасцяў на вялікіх супольнасцях.",
   "RetentionPolicy_RoomWarning": "Паведамлення старэй {{time}} аўтаматычна абразаюць тут",
@@ -2787,4 +2780,4 @@
   "registration.component.form.sendConfirmationEmail": "Адправіць па электроннай пошце пацвярджэнне",
   "Enterprise": "прадпрыемства",
   "UpgradeToGetMore_engagement-dashboard_Title": "аналітыка"
-}
\ No newline at end of file
+}
diff --git a/packages/i18n/src/locales/bg.i18n.json b/packages/i18n/src/locales/bg.i18n.json
index dbc6414d73c0..4cdac92ed503 100644
--- a/packages/i18n/src/locales/bg.i18n.json
+++ b/packages/i18n/src/locales/bg.i18n.json
@@ -2057,19 +2057,12 @@
   "Retail": "На дребно",
   "Retention_setting_changed_successfully": "Настройката на правилата за задържане бе променена успешно",
   "RetentionPolicy": "Правила за запазване",
-  "RetentionPolicy_AppliesToChannels": "Прилага се за канали",
-  "RetentionPolicy_AppliesToDMs": "Прилага се за директни съобщения",
-  "RetentionPolicy_AppliesToGroups": "Отнася се за частни групи",
   "RetentionPolicy_Description": "Автоматично подрязва старите съобщения в изгледа Ви Rocket.Chat.",
   "RetentionPolicy_Enabled": "Enabled",
   "RetentionPolicy_ExcludePinned": "Изключете закачените съобщения",
   "RetentionPolicy_FilesOnly": "Изтривайте само файлове",
   "RetentionPolicy_FilesOnly_Description": "Само файловете ще бъдат изтрити, самите съобщения ще останат на мястото си.",
   "RetentionPolicy_MaxAge": "Максимална възраст на съобщенията",
-  "RetentionPolicy_MaxAge_Channels": "Максимална възраст на съобщенията в каналите",
-  "RetentionPolicy_MaxAge_Description": "Премахване на всички съобщения, по-стари от тази стойност, в дни",
-  "RetentionPolicy_MaxAge_DMs": "Максимална възраст на съобщенията в директните съобщения",
-  "RetentionPolicy_MaxAge_Groups": "Максимална възраст на съобщенията в частни групи",
   "RetentionPolicy_Precision": "Точност на таймера",
   "RetentionPolicy_Precision_Description": "Колко често трябва да се изпълнява таймерът за подрязване. Задаването на това с по-точна стойност прави каналите с бързи таймери за задържане да работят по-добре, но може да струва допълнителна мощност за обработка на големи общности.",
   "RetentionPolicy_RoomWarning": "По-стари от {{time}} са автоматично подрязани тук",
@@ -2762,4 +2755,4 @@
   "registration.component.form.sendConfirmationEmail": "Изпратете имейл за потвърждение",
   "Enterprise": "начинание",
   "UpgradeToGetMore_engagement-dashboard_Title": "анализ"
-}
\ No newline at end of file
+}
diff --git a/packages/i18n/src/locales/bs.i18n.json b/packages/i18n/src/locales/bs.i18n.json
index 86fd7083b2ce..b762f784f92e 100644
--- a/packages/i18n/src/locales/bs.i18n.json
+++ b/packages/i18n/src/locales/bs.i18n.json
@@ -2054,19 +2054,12 @@
   "Retail": "Maloprodaja",
   "Retention_setting_changed_successfully": "Postavka pravila zadržavanja uspješno je promijenjena",
   "RetentionPolicy": "Pravila zadržavanja",
-  "RetentionPolicy_AppliesToChannels": "Odnosi se na kanale",
-  "RetentionPolicy_AppliesToDMs": "Odnosi se na izravne poruke",
-  "RetentionPolicy_AppliesToGroups": "Odnosi se na privatne grupe",
   "RetentionPolicy_Description": "Automatski prunes stare poruke preko vašeg Rocket.Chat instanca.",
   "RetentionPolicy_Enabled": "Omogućeno",
   "RetentionPolicy_ExcludePinned": "Izuzmite prikvačene poruke",
   "RetentionPolicy_FilesOnly": "Samo izbrišite datoteke",
   "RetentionPolicy_FilesOnly_Description": "Samo će se datoteke izbrisati, poruke će ostati na mjestu.",
   "RetentionPolicy_MaxAge": "Maksimalna dob poruka",
-  "RetentionPolicy_MaxAge_Channels": "Maksimalna dob poruka u kanalima",
-  "RetentionPolicy_MaxAge_Description": "Prune sve poruke starijima od ove vrijednosti, u danima",
-  "RetentionPolicy_MaxAge_DMs": "Maksimalna dob poruka u izravnim porukama",
-  "RetentionPolicy_MaxAge_Groups": "Maksimalna dob poruka u privatnim skupinama",
   "RetentionPolicy_Precision": "Preciznost mjerača",
   "RetentionPolicy_Precision_Description": "Koliko često bi trebao trajati mjerač vremena. Postavljanje na precizniju vrijednost čini kanale s brzim retencijskim vremenskim razmacima bolji, ali mogu koštati dodatnu snagu obrade u velikim zajednicama.",
   "RetentionPolicy_RoomWarning": "Poruke starije od {{time}} ovdje su automatski izrezane",
@@ -2759,4 +2752,4 @@
   "registration.component.form.sendConfirmationEmail": "Pošalji potvrdni email",
   "Enterprise": "Poduzeće",
   "UpgradeToGetMore_engagement-dashboard_Title": "Analitika"
-}
\ No newline at end of file
+}
diff --git a/packages/i18n/src/locales/ca.i18n.json b/packages/i18n/src/locales/ca.i18n.json
index 6c61025e16cf..8c4ac5013df4 100644
--- a/packages/i18n/src/locales/ca.i18n.json
+++ b/packages/i18n/src/locales/ca.i18n.json
@@ -3484,9 +3484,6 @@
   "RetentionPolicy_Advanced_Precision": "Utilitza la configuració avançada de la política de retenció",
   "RetentionPolicy_Advanced_Precision_Cron": "Utilitzeu Cron de política de retenció avançada",
   "RetentionPolicy_Advanced_Precision_Cron_Description": "Amb quina freqüència ha de executar-se el temporitzador de poda definit per l'expressió de la feina cron. Establir això en un valor més precís fa que els canals amb temporitzadors de retenció ràpids funcionin millor, però podria costar potència de processament addicional en comunitats grans.",
-  "RetentionPolicy_AppliesToChannels": "S'aplica als canals",
-  "RetentionPolicy_AppliesToDMs": "S'aplica als missatges directes",
-  "RetentionPolicy_AppliesToGroups": "S'aplica a grups privats",
   "RetentionPolicy_Description": "Elimina automàticament els missatges antics en la instància de Rocket.Chat.",
   "RetentionPolicy_DoNotPruneDiscussion": "No esborrar els missatges de discussió",
   "RetentionPolicy_DoNotPrunePinned": "No esborrar els missatges fixats",
@@ -3496,10 +3493,6 @@
   "RetentionPolicy_FilesOnly": "Només elimineu arxius",
   "RetentionPolicy_FilesOnly_Description": "Només s'eliminaran els arxius, els propis missatges romandran al seu lloc.",
   "RetentionPolicy_MaxAge": "Antiguitat màxima de l'missatge",
-  "RetentionPolicy_MaxAge_Channels": "Antiguitat màxima dels missatges en els canals",
-  "RetentionPolicy_MaxAge_Description": "Elimineu tots els missatges anteriors a aquest valor, en dies",
-  "RetentionPolicy_MaxAge_DMs": "Antiguitat màxima del missatge en missatges directes",
-  "RetentionPolicy_MaxAge_Groups": "Antiguitat màxima del missatge en grups privats",
   "RetentionPolicy_Precision": "Precisió del temporitzador",
   "RetentionPolicy_Precision_Description": "Amb quina freqüència ha de funcionar el comptador de poda. Establir això en un valor més precís fa que els canals amb temporitzadors de retenció ràpids funcionin millor, però podria costar potència de processament addicional en comunitats grans.",
   "RetentionPolicy_RoomWarning": "Els missatges anteriors a {{time}} s'eliminen automàticament aquí",
diff --git a/packages/i18n/src/locales/cs.i18n.json b/packages/i18n/src/locales/cs.i18n.json
index d122f1d89337..48e14e4ce412 100644
--- a/packages/i18n/src/locales/cs.i18n.json
+++ b/packages/i18n/src/locales/cs.i18n.json
@@ -2972,9 +2972,6 @@
   "Retail": "Obchod",
   "Retention_setting_changed_successfully": "Nastavení zásady uchování bylo úspěšně změněno",
   "RetentionPolicy": "Zásady uchovávání",
-  "RetentionPolicy_AppliesToChannels": "Platí pro místnosti",
-  "RetentionPolicy_AppliesToDMs": "Platí pro přímé zprávy",
-  "RetentionPolicy_AppliesToGroups": "Platí pro soukromé skupiny",
   "RetentionPolicy_Description": "Automaticky omezí staré zprávy napříč vaší Rocket.Chat instancí.",
   "RetentionPolicy_DoNotPruneDiscussion": "Nepročišťovat zprávy v diskuzi",
   "RetentionPolicy_DoNotPrunePinned": "Nepročišťovat připnuté zprávy",
@@ -2984,10 +2981,6 @@
   "RetentionPolicy_FilesOnly": "Smazat pouze soubory",
   "RetentionPolicy_FilesOnly_Description": "Pouze soubory budou smazány, samotné zprávy zůstanou na místě.",
   "RetentionPolicy_MaxAge": "Maximální stáří zprávy",
-  "RetentionPolicy_MaxAge_Channels": "Maximální stáří zprávy v místnostech",
-  "RetentionPolicy_MaxAge_Description": "Pročistit všechny zprávy starší, než X dní",
-  "RetentionPolicy_MaxAge_DMs": "Maximální stáří zprávy v přímých zprávách",
-  "RetentionPolicy_MaxAge_Groups": "Maximální stáří zpráv v soukromých skupinách",
   "RetentionPolicy_Precision": "Přesnost časovače",
   "RetentionPolicy_Precision_Description": "Jak často by měl časovač pročištění spustit. Nastavením této hodnoty na přesnější hodnotu pracují kanály s rychlejšími retenčními časovači lépe, ale v případě velkých komunit by to mohlo stát další procesní výkon.",
   "RetentionPolicy_RoomWarning": "Zprávy starší než {{time}} jsou zde automaticky pročištěny",
diff --git a/packages/i18n/src/locales/cy.i18n.json b/packages/i18n/src/locales/cy.i18n.json
index b1254b9896aa..4c251affef70 100644
--- a/packages/i18n/src/locales/cy.i18n.json
+++ b/packages/i18n/src/locales/cy.i18n.json
@@ -2055,19 +2055,12 @@
   "Retail": "Manwerthu",
   "Retention_setting_changed_successfully": "Mae lleoliad polisi cadwraeth wedi newid yn llwyddiannus",
   "RetentionPolicy": "Polisi Cadw",
-  "RetentionPolicy_AppliesToChannels": "Yn berthnasol i sianeli",
-  "RetentionPolicy_AppliesToDMs": "Mae'n berthnasol i negeseuon uniongyrchol",
-  "RetentionPolicy_AppliesToGroups": "Yn berthnasol i grwpiau preifat",
   "RetentionPolicy_Description": "Rhowch negeseuon o hen negeseuon yn awtomatig ar draws eich enghraifft Rocket.Chat.",
   "RetentionPolicy_Enabled": "Wedi'i alluogi",
   "RetentionPolicy_ExcludePinned": "Eithrio negeseuon wedi'u pinnio",
   "RetentionPolicy_FilesOnly": "Dileu ffeiliau yn unig",
   "RetentionPolicy_FilesOnly_Description": "Dim ond ffeiliau fydd yn cael eu dileu, bydd y negeseuon eu hunain yn aros yn eu lle.",
   "RetentionPolicy_MaxAge": "Uchafswm oedran neges",
-  "RetentionPolicy_MaxAge_Channels": "Uchafswm oedran neges mewn sianeli",
-  "RetentionPolicy_MaxAge_Description": "Torrwch bob neges yn hŷn na'r gwerth hwn, mewn dyddiau",
-  "RetentionPolicy_MaxAge_DMs": "Uchafswm oed neges mewn negeseuon uniongyrchol",
-  "RetentionPolicy_MaxAge_Groups": "Uchafswm oedran neges mewn grwpiau preifat",
   "RetentionPolicy_Precision": "Precision Timer",
   "RetentionPolicy_Precision_Description": "Pa mor aml y dylai'r amserydd prîn redeg. Mae gosod hyn i werth mwy manwl yn gwneud sianelau gydag amseryddion cadw cyflym yn gweithio'n well, ond gallant gostio pŵer prosesu ychwanegol ar gymunedau mawr.",
   "RetentionPolicy_RoomWarning": "Mae negeseuon hŷn na {{time}} yn cael eu prunedu'n awtomatig yma",
@@ -2761,4 +2754,4 @@
   "registration.component.form.sendConfirmationEmail": "Anfon ebost cadarnhad",
   "Enterprise": "Menter",
   "UpgradeToGetMore_engagement-dashboard_Title": "Dadansoddiadau"
-}
\ No newline at end of file
+}
diff --git a/packages/i18n/src/locales/da.i18n.json b/packages/i18n/src/locales/da.i18n.json
index 22183a5a0604..cc517986cfdc 100644
--- a/packages/i18n/src/locales/da.i18n.json
+++ b/packages/i18n/src/locales/da.i18n.json
@@ -3072,9 +3072,6 @@
   "RetentionPolicy_Advanced_Precision": "Brug konfigurationen til avanceret opbevaringspolitik",
   "RetentionPolicy_Advanced_Precision_Cron": "Brug avanceret opbevaringspolitik vha. Cron",
   "RetentionPolicy_Advanced_Precision_Cron_Description": "Hvor ofte sletnings-timeren skal køre. Indstilling af dette til en mere præcis værdi gør kanaler med hurtige opbevarings-timere bedre, men kan koste ekstra procestid på store communities.",
-  "RetentionPolicy_AppliesToChannels": "Gælder for kanaler",
-  "RetentionPolicy_AppliesToDMs": "Gælder for direkte meddelelser",
-  "RetentionPolicy_AppliesToGroups": "Gælder for private grupper",
   "RetentionPolicy_Description": "Beskytter automatisk gamle meddelelser over din Rocket.Chat-forekomst.",
   "RetentionPolicy_DoNotPruneDiscussion": "Slet ikke diskussionsmeddelelser",
   "RetentionPolicy_DoNotPrunePinned": "Slet ikke fastgjorte beskeder",
@@ -3084,10 +3081,6 @@
   "RetentionPolicy_FilesOnly": "Slet kun filer",
   "RetentionPolicy_FilesOnly_Description": "Kun filer slettes, meddelelserne selv forbliver på plads.",
   "RetentionPolicy_MaxAge": "Maksimal meddelelsesalder",
-  "RetentionPolicy_MaxAge_Channels": "Maksimal meddelelsesalder i kanaler",
-  "RetentionPolicy_MaxAge_Description": "Beskær alle meddelelser, der er ældre end denne værdi, om dage",
-  "RetentionPolicy_MaxAge_DMs": "Maksimal meddelelsesalder i direkte beskeder",
-  "RetentionPolicy_MaxAge_Groups": "Maksimal meddelelsesalder i private grupper",
   "RetentionPolicy_Precision": "Timer Precision",
   "RetentionPolicy_Precision_Description": "Hvor ofte sletnings-timeren skal køre. Indstilling af dette til en mere præcis værdi gør kanaler med hurtige opbevarings-timere bedre, men kan koste ekstra procestid på store communities.",
   "RetentionPolicy_RoomWarning": "Meddelelser ældre end {{time}} slettes automatisk her",
diff --git a/packages/i18n/src/locales/de-AT.i18n.json b/packages/i18n/src/locales/de-AT.i18n.json
index 8933c41ed496..81e4d6e814b4 100644
--- a/packages/i18n/src/locales/de-AT.i18n.json
+++ b/packages/i18n/src/locales/de-AT.i18n.json
@@ -2063,19 +2063,12 @@
   "Retail": "Verkauf",
   "Retention_setting_changed_successfully": "Die Einstellung für die Aufbewahrungsrichtlinie wurde erfolgreich geändert",
   "RetentionPolicy": "Aufbewahrungsrichtlinie",
-  "RetentionPolicy_AppliesToChannels": "Gilt für Kanäle",
-  "RetentionPolicy_AppliesToDMs": "Gilt für direkte Nachrichten",
-  "RetentionPolicy_AppliesToGroups": "Gilt für private Gruppen",
   "RetentionPolicy_Description": "Löscht automatisch alte Nachrichten in Ihrer Rocket.Chat-Instanz.",
   "RetentionPolicy_Enabled": "aktiviert",
   "RetentionPolicy_ExcludePinned": "Pinned-Nachrichten ausschließen",
   "RetentionPolicy_FilesOnly": "Löschen Sie nur Dateien",
   "RetentionPolicy_FilesOnly_Description": "Nur Dateien werden gelöscht, die Nachrichten selbst bleiben bestehen.",
   "RetentionPolicy_MaxAge": "Maximales Nachrichtenalter",
-  "RetentionPolicy_MaxAge_Channels": "Maximales Nachrichtenalter in Kanälen",
-  "RetentionPolicy_MaxAge_Description": "Bereinigen Sie alle Nachrichten, die älter als dieser Wert sind, in Tagen",
-  "RetentionPolicy_MaxAge_DMs": "Maximales Nachrichtenalter in direkten Nachrichten",
-  "RetentionPolicy_MaxAge_Groups": "Maximales Nachrichtenalter in privaten Gruppen",
   "RetentionPolicy_Precision": "Timer-Präzision",
   "RetentionPolicy_Precision_Description": "Wie oft sollte der Prune Timer laufen? Wenn Sie dies auf einen präziseren Wert setzen, werden Kanäle mit schnellen Retention-Timern zwar besser, in großen Communities jedoch möglicherweise zusätzliche Verarbeitungsleistung.",
   "RetentionPolicy_RoomWarning": "Nachrichten, die älter als {{time}} sind, werden hier automatisch gelöscht",
@@ -2769,4 +2762,4 @@
   "registration.component.form.sendConfirmationEmail": "Bestätigungsmail versenden",
   "Enterprise": "Unternehmen",
   "UpgradeToGetMore_engagement-dashboard_Title": "Analytics"
-}
\ No newline at end of file
+}
diff --git a/packages/i18n/src/locales/de-IN.i18n.json b/packages/i18n/src/locales/de-IN.i18n.json
index afb9dade56f5..a5573e38e29a 100644
--- a/packages/i18n/src/locales/de-IN.i18n.json
+++ b/packages/i18n/src/locales/de-IN.i18n.json
@@ -2344,19 +2344,12 @@
   "Retail": "Handel",
   "Retention_setting_changed_successfully": "Die Einstellung für die Aufbewahrungsrichtlinie wurde erfolgreich geändert",
   "RetentionPolicy": "Aufbewahrungsrichtlinie",
-  "RetentionPolicy_AppliesToChannels": "Gilt für Kanäle",
-  "RetentionPolicy_AppliesToDMs": "Gilt für direkte Nachrichten",
-  "RetentionPolicy_AppliesToGroups": "Gilt für private Gruppen",
   "RetentionPolicy_Description": "Löscht automatisch alte Nachrichten in Deiner Rocket.Chat-Instanz.",
   "RetentionPolicy_Enabled": "Aktiviert",
   "RetentionPolicy_ExcludePinned": "Pinned-Nachrichten ausschließen",
   "RetentionPolicy_FilesOnly": "Lösche nur Dateien",
   "RetentionPolicy_FilesOnly_Description": "Nur Dateien werden gelöscht, die Nachrichten selbst bleiben bestehen.",
   "RetentionPolicy_MaxAge": "Maximales Nachrichtenalter",
-  "RetentionPolicy_MaxAge_Channels": "Maximales Nachrichtenalter in Kanälen",
-  "RetentionPolicy_MaxAge_Description": "Bereinige alle Nachrichten, die älter als dieser Wert sind, in Tagen",
-  "RetentionPolicy_MaxAge_DMs": "Maximales Nachrichtenalter in direkten Nachrichten",
-  "RetentionPolicy_MaxAge_Groups": "Maximales Nachrichtenalter in privaten Gruppen",
   "RetentionPolicy_Precision": "Timer-Präzision",
   "RetentionPolicy_Precision_Description": "Wie oft sollte der Prune Timer laufen? Wenn Du dies auf einen genauen Wert setzt, werden Kanäle mit schnellen Retention-Timern zwar besser, in großen Communities jedoch möglicherweise zusätzliche Verarbeitungsleistung.",
   "RetentionPolicy_RoomWarning": "Nachrichten, die älter als {{time}} sind, werden hier automatisch gelöscht",
diff --git a/packages/i18n/src/locales/de.i18n.json b/packages/i18n/src/locales/de.i18n.json
index b67d318f1176..d986e9be0126 100644
--- a/packages/i18n/src/locales/de.i18n.json
+++ b/packages/i18n/src/locales/de.i18n.json
@@ -3981,9 +3981,6 @@
   "RetentionPolicy_Advanced_Precision": "Konfiguration der erweiterten Aufbewahrungsregelung verwenden",
   "RetentionPolicy_Advanced_Precision_Cron": "Erweiterte Aufbewahrungsregelung Cron verwenden",
   "RetentionPolicy_Advanced_Precision_Cron_Description": "Der Cron-Job-Ausdruck definiert, wie oft der Bereinigungs-Timer ausgeführt werden soll. Wenn dieser auf einen genaueren Wert gesetzt wird, funktionieren Kanäle mit schnellen Aufbewahrungs-Timern besser, verlieren allerdings möglicherweise in großen Communities zusätzliche Rechenleistung.",
-  "RetentionPolicy_AppliesToChannels": "Gilt für Channels",
-  "RetentionPolicy_AppliesToDMs": "Gilt für Direktnachrichten",
-  "RetentionPolicy_AppliesToGroups": "Gilt für private Gruppen",
   "RetentionPolicy_Description": "Löscht automatisch alte Nachrichten in Ihrer Rocket.Chat-Instanz.",
   "RetentionPolicy_DoNotPruneDiscussion": "Nachrichten in der Diskussion nicht bereinigen",
   "RetentionPolicy_DoNotPrunePinned": "Keine angehefteten Nachrichten bereinigen",
@@ -3993,10 +3990,6 @@
   "RetentionPolicy_FilesOnly": "Löschen Sie nur Dateien",
   "RetentionPolicy_FilesOnly_Description": "Nur Dateien werden gelöscht, die Nachrichten selbst bleiben bestehen.",
   "RetentionPolicy_MaxAge": "Maximales Nachrichtenalter",
-  "RetentionPolicy_MaxAge_Channels": "Maximales Nachrichtenalter in Kanälen",
-  "RetentionPolicy_MaxAge_Description": "Alle Nachrichten bereinigen, die älter als dieser Wert sind, in Tagen",
-  "RetentionPolicy_MaxAge_DMs": "Maximales Nachrichtenalter in direkten Nachrichten",
-  "RetentionPolicy_MaxAge_Groups": "Maximales Nachrichtenalter in privaten Gruppen",
   "RetentionPolicy_Precision": "Timer-Präzision",
   "RetentionPolicy_Precision_Description": "Wie oft sollte der Bereinigungs-Timer laufen? Wenn Sie dies auf einen präziseren Wert setzen, werden Kanäle mit schnellen Aufbewahrungs-Timern zwar besser, in großen Communitys jedoch möglicherweise zusätzliche Verarbeitungsleistung.",
   "RetentionPolicy_RoomWarning": "Nachrichten, die älter als {{time}} sind, werden hier automatisch gelöscht",
diff --git a/packages/i18n/src/locales/el.i18n.json b/packages/i18n/src/locales/el.i18n.json
index 4e4a0e8cb5d6..916c8fd1230a 100644
--- a/packages/i18n/src/locales/el.i18n.json
+++ b/packages/i18n/src/locales/el.i18n.json
@@ -2068,19 +2068,12 @@
   "Retail": "Λιανεμποριο",
   "Retention_setting_changed_successfully": "Η ρύθμιση πολιτικής διατήρησης άλλαξε με επιτυχία",
   "RetentionPolicy": "Πολιτική διατήρησης",
-  "RetentionPolicy_AppliesToChannels": "Ισχύει για κανάλια",
-  "RetentionPolicy_AppliesToDMs": "Ισχύει για απευθείας μηνύματα",
-  "RetentionPolicy_AppliesToGroups": "Ισχύει για ιδιωτικές ομάδες",
   "RetentionPolicy_Description": "Αυτόματα κλαδεύει τα παλιά μηνύματα σε όλες τις περιπτώσεις Rocket.Chat.",
   "RetentionPolicy_Enabled": "Ενεργοποιημένο",
   "RetentionPolicy_ExcludePinned": "Εξαιρούνται τα καρφιτσωμένα μηνύματα",
   "RetentionPolicy_FilesOnly": "Διαγράψτε μόνο τα αρχεία",
   "RetentionPolicy_FilesOnly_Description": "Μόνο τα αρχεία θα διαγραφούν, τα ίδια τα μηνύματα θα παραμείνουν στη θέση τους.",
   "RetentionPolicy_MaxAge": "Μέγιστη ηλικία μηνύματος",
-  "RetentionPolicy_MaxAge_Channels": "Μέγιστη ηλικία μηνύματος στα κανάλια",
-  "RetentionPolicy_MaxAge_Description": "Κλαδέψτε όλα τα μηνύματα που είναι παλαιότερα από αυτήν την τιμή, σε ημέρες",
-  "RetentionPolicy_MaxAge_DMs": "Μέγιστη ηλικία μηνύματος στα άμεσα μηνύματα",
-  "RetentionPolicy_MaxAge_Groups": "Μέγιστη ηλικία μηνύματος σε ιδιωτικές ομάδες",
   "RetentionPolicy_Precision": "Χρονόμετρο ακρίβειας",
   "RetentionPolicy_Precision_Description": "Πόσο συχνά πρέπει να τρέχει ο χρονομετρητής. Η ρύθμιση αυτή σε μια πιο ακριβή τιμή καθιστά τα κανάλια με χρονοδιακόπτες γρήγορης συγκράτησης να λειτουργούν καλύτερα, αλλά μπορεί να κοστίζουν επιπλέον ισχύ επεξεργασίας σε μεγάλες κοινότητες.",
   "RetentionPolicy_RoomWarning": "Τα μηνύματα μεγαλύτερα από {{time}} είναι αυτόματα κλαδεμένα εδώ",
@@ -2776,4 +2769,4 @@
   "registration.component.form.sendConfirmationEmail": "Αποστολή email επιβεβαίωσης",
   "Enterprise": "Επιχείρηση",
   "UpgradeToGetMore_engagement-dashboard_Title": "Αναλυτικά στοιχεία"
-}
\ No newline at end of file
+}
diff --git a/packages/i18n/src/locales/en.i18n.json b/packages/i18n/src/locales/en.i18n.json
index cfaecfe2c924..2d67fa8723b7 100644
--- a/packages/i18n/src/locales/en.i18n.json
+++ b/packages/i18n/src/locales/en.i18n.json
@@ -4490,9 +4490,11 @@
   "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": "Applies to channels",
-  "RetentionPolicy_AppliesToDMs": "Applies to direct messages",
-  "RetentionPolicy_AppliesToGroups": "Applies to private groups",
+  "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",
@@ -4502,6 +4504,9 @@
   "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",
diff --git a/packages/i18n/src/locales/eo.i18n.json b/packages/i18n/src/locales/eo.i18n.json
index 9f6a2f719444..d4c49a53443d 100644
--- a/packages/i18n/src/locales/eo.i18n.json
+++ b/packages/i18n/src/locales/eo.i18n.json
@@ -2060,19 +2060,12 @@
   "Retail": "Retail",
   "Retention_setting_changed_successfully": "Rezerva politika agordo ŝanĝiĝis sukcese",
   "RetentionPolicy": "Politika Retenado",
-  "RetentionPolicy_AppliesToChannels": "Aplikas al kanaloj",
-  "RetentionPolicy_AppliesToDMs": "Aplikas direkti mesaĝojn",
-  "RetentionPolicy_AppliesToGroups": "Aplikas al privataj grupoj",
   "RetentionPolicy_Description": "Aŭtomate prunas malnovajn mesaĝojn tra via raketo.",
   "RetentionPolicy_Enabled": "Enabled",
   "RetentionPolicy_ExcludePinned": "Ekskludi kovritajn mesaĝojn",
   "RetentionPolicy_FilesOnly": "Nur forigi dosierojn",
   "RetentionPolicy_FilesOnly_Description": "Nur dosieroj estos forigitaj, la mesaĝoj mem restos en loko.",
   "RetentionPolicy_MaxAge": "Maksimuma mesaĝo",
-  "RetentionPolicy_MaxAge_Channels": "Maksimuma mesaĝo en kanaloj",
-  "RetentionPolicy_MaxAge_Description": "Pritondu ĉiujn mesaĝojn pli malnovajn ol ĉi tiu valoro, en tagoj",
-  "RetentionPolicy_MaxAge_DMs": "Maksimuma mesaĝo en rektaj mesaĝoj",
-  "RetentionPolicy_MaxAge_Groups": "Maksimuma mesaĝo en privataj grupoj",
   "RetentionPolicy_Precision": "Timer Precizeco",
   "RetentionPolicy_Precision_Description": "Kiom ofte la pruntempa temporilo devus kuri. Fiksante ĉi tion al pli preciza valoro faras kanalojn kun rapidaj retencaj tempoj pli bone funkcii, sed povus kosti ekstra prilabor-potencon en grandaj komunumoj.",
   "RetentionPolicy_RoomWarning": "Mesaĝoj pli malnovaj ol {{time}} aŭtomate pritondas ĉi tie",
@@ -2770,4 +2763,4 @@
   "registration.component.form.sendConfirmationEmail": "Sendu konfirman retpoŝton",
   "Enterprise": "Entrepreno",
   "UpgradeToGetMore_engagement-dashboard_Title": "Analitiko"
-}
\ No newline at end of file
+}
diff --git a/packages/i18n/src/locales/es.i18n.json b/packages/i18n/src/locales/es.i18n.json
index bbaaff711afb..d11855fa2e0b 100644
--- a/packages/i18n/src/locales/es.i18n.json
+++ b/packages/i18n/src/locales/es.i18n.json
@@ -3534,9 +3534,6 @@
   "RetentionPolicy_Advanced_Precision": "Usar la configuración avanzada de la política de retención",
   "RetentionPolicy_Advanced_Precision_Cron": "Usar CRON de política de retención avanzada",
   "RetentionPolicy_Advanced_Precision_Cron_Description": "Frecuencia con la que debe ejecutarse el temporizador de retirada definido por la expresión del trabajo CRON. Establecer esto en un valor más preciso hace que los canales con temporizadores de retención rápidos funcionen mejor, pero podría exigir potencia de procesamiento adicional en comunidades grandes.",
-  "RetentionPolicy_AppliesToChannels": "Se aplica a canales",
-  "RetentionPolicy_AppliesToDMs": "Se aplica a mensajes directos",
-  "RetentionPolicy_AppliesToGroups": "Se aplica a grupos privados",
   "RetentionPolicy_Description": "Retira automáticamente los mensajes antiguos en tu instancia de Rocket.Chat.",
   "RetentionPolicy_DoNotPruneDiscussion": "No retirar mensajes de discusión",
   "RetentionPolicy_DoNotPrunePinned": "No retirar mensajes fijados",
@@ -3546,10 +3543,6 @@
   "RetentionPolicy_FilesOnly": "Eliminar solo archivos",
   "RetentionPolicy_FilesOnly_Description": "Solo se eliminarán los archivos, los mensajes en sí se conservarán.",
   "RetentionPolicy_MaxAge": "Antigüedad máxima de mensaje",
-  "RetentionPolicy_MaxAge_Channels": "Antigüedad máxima de mensajes en canales",
-  "RetentionPolicy_MaxAge_Description": "Retirar todos los mensajes anteriores a este valor (en días)",
-  "RetentionPolicy_MaxAge_DMs": "Antigüedad máxima de mensajes directos",
-  "RetentionPolicy_MaxAge_Groups": "Antigüedad máxima de mensaje en grupos privados",
   "RetentionPolicy_Precision": "Precisión del temporizador",
   "RetentionPolicy_Precision_Description": "Frecuencia con la que debe ejecutarse el temporizador de retirada. Establecer esto en un valor más preciso hace que los canales con temporizadores de retención rápidos funcionen mejor, pero podría exigir potencia de procesamiento adicional en comunidades grandes.",
   "RetentionPolicy_RoomWarning": "Los mensajes anteriores a {{time}} se retiran automáticamente aquí",
diff --git a/packages/i18n/src/locales/fa.i18n.json b/packages/i18n/src/locales/fa.i18n.json
index 27e013e254c4..64bd0a055090 100644
--- a/packages/i18n/src/locales/fa.i18n.json
+++ b/packages/i18n/src/locales/fa.i18n.json
@@ -2372,19 +2372,12 @@
   "Retail": "جزئی",
   "Retention_setting_changed_successfully": "تنظیم سیاست حفظ حفظ شده با موفقیت تغییر کرد",
   "RetentionPolicy": "سیاست نگهداری",
-  "RetentionPolicy_AppliesToChannels": "به کانال ها اعمال می شود",
-  "RetentionPolicy_AppliesToDMs": "به پیام های مستقیم اعمال می شود",
-  "RetentionPolicy_AppliesToGroups": "اعمال به گروه های خصوصی",
   "RetentionPolicy_Description": "به طور خودکار پیام های قدیمی را در سراسر نمونه Rocket.Chat خود قرار دهید.",
   "RetentionPolicy_Enabled": "فعال",
   "RetentionPolicy_ExcludePinned": "پیام های پین شده را حذف کنید",
   "RetentionPolicy_FilesOnly": "فقط فایلها را حذف کنید",
   "RetentionPolicy_FilesOnly_Description": "فقط فایل ها حذف خواهند شد، پیام های خود را در جای خود قرار می دهند.",
   "RetentionPolicy_MaxAge": "حداکثر سن پیام",
-  "RetentionPolicy_MaxAge_Channels": "حداکثر سن پیام در کانال ها",
-  "RetentionPolicy_MaxAge_Description": "تمام پیام های قدیمی تر از این مقدار را در روزها فرو کن",
-  "RetentionPolicy_MaxAge_DMs": "حداکثر سن پیام در پیام های مستقیم",
-  "RetentionPolicy_MaxAge_Groups": "حداکثر سن پیام در گروه های خصوصی",
   "RetentionPolicy_Precision": "تایمر دقیق",
   "RetentionPolicy_Precision_Description": "هر چند وقت یکبار تایمر بره باید اجرا شود تنظیم این به یک مقدار دقیق تر باعث می شود کانال های با تایمر نگهداری سریع کار بهتر، اما ممکن است پردازش قدرت اضافی در جوامع بزرگ هزینه.",
   "RetentionPolicy_RoomWarning": "پیام های قدیمی تر از%s به طور خودکار در اینجا بریده می شوند",
@@ -3116,4 +3109,4 @@
   "RegisterWorkspace_Features_Omnichannel_Title": "کانال همه‌کاره",
   "Enterprise": "شرکت، پروژه",
   "UpgradeToGetMore_engagement-dashboard_Title": "تجزیه و تحلیل ترافیک"
-}
\ No newline at end of file
+}
diff --git a/packages/i18n/src/locales/fi.i18n.json b/packages/i18n/src/locales/fi.i18n.json
index a55af647ff04..e994e45e87f6 100644
--- a/packages/i18n/src/locales/fi.i18n.json
+++ b/packages/i18n/src/locales/fi.i18n.json
@@ -4060,9 +4060,6 @@
   "RetentionPolicy_Advanced_Precision": "Käytä laajennettua säilytyskäytäntöä",
   "RetentionPolicy_Advanced_Precision_Cron": "Käytä laajennetun säilytyskäytännön Cron -käytäntöä",
   "RetentionPolicy_Advanced_Precision_Cron_Description": "Kuinka usein karsinta-ajastimen tulisi toimia, määritellään cron-työn lausekkeella. Jos tämä asetetaan tarkempaan arvoon, kanavat, joissa on nopeat säilytysajastimet, toimivat paremmin, mutta se saattaa vaatia ylimääräistä laskentatehoa suurissa yhteisöissä.",
-  "RetentionPolicy_AppliesToChannels": "Koskee kanavia",
-  "RetentionPolicy_AppliesToDMs": "Koskee suoria viestejä",
-  "RetentionPolicy_AppliesToGroups": "Koskee yksityisiä ryhmiä",
   "RetentionPolicy_Description": "Karsii vanhat viestit ja tiedostot automaattisesti koko työtilassa.",
   "RetentionPolicy_DoNotPruneDiscussion": "Älä karsi keskusteluviestejä",
   "RetentionPolicy_DoNotPrunePinned": "Älä karsi kiinnitettyjä viestejä",
@@ -4072,10 +4069,6 @@
   "RetentionPolicy_FilesOnly": "Poista vain tiedostot",
   "RetentionPolicy_FilesOnly_Description": "Vain tiedostot poistetaan, itse viestit säilyvät.",
   "RetentionPolicy_MaxAge": "Viestin maksimi-ikä",
-  "RetentionPolicy_MaxAge_Channels": "Viestin maksimi-ikä kanavilla",
-  "RetentionPolicy_MaxAge_Description": "Karsi kaikki viestit, jotka ovat vanhempia kuin tämä arvo (päiviä)",
-  "RetentionPolicy_MaxAge_DMs": "Viestin maksimi-ikä yksityisviesteissä",
-  "RetentionPolicy_MaxAge_Groups": "Viestin maksimi-ikä yksityisissä ryhmissä",
   "RetentionPolicy_Precision": "Ajastimen tarkkuus",
   "RetentionPolicy_Precision_Description": "Karsinta-ajastimen suoritustiheys. Tarkan arvon määritys toimii paremmin kanavilla, joilla on nopeat säilytysajastimet, mutta käsittelyteho saattaa kärsiä suurissa yhteisöissä.",
   "RetentionPolicy_RoomWarning": "Viestit, jotka ovat vanhempia kuin {{time}}, karsitaan automaattisesti tässä kohdassa",
diff --git a/packages/i18n/src/locales/fr.i18n.json b/packages/i18n/src/locales/fr.i18n.json
index d5f92179372f..0343ebcf082e 100644
--- a/packages/i18n/src/locales/fr.i18n.json
+++ b/packages/i18n/src/locales/fr.i18n.json
@@ -3535,9 +3535,6 @@
   "RetentionPolicy_Advanced_Precision": "Utiliser la configuration de la politique de rétention avancée",
   "RetentionPolicy_Advanced_Precision_Cron": "Utiliser cron pour la politique de rétention avancée",
   "RetentionPolicy_Advanced_Precision_Cron_Description": "Fréquence d'exécution du temporisateur d'élagage définie par l'expression de la tâche cron. Une valeur plus précise améliore le fonctionnement des canaux avec des temporisateurs de rétention rapides, mais le coût en termes de puissance de traitement peut être élevé pour les grandes communautés.",
-  "RetentionPolicy_AppliesToChannels": "S'applique aux canaux",
-  "RetentionPolicy_AppliesToDMs": "S'applique aux messages directs",
-  "RetentionPolicy_AppliesToGroups": "S'applique aux groupes privés",
   "RetentionPolicy_Description": "Élague automatiquement les anciens messages de votre instance Rocket.Chat.",
   "RetentionPolicy_DoNotPruneDiscussion": "Ne pas élaguer les messages de discussion",
   "RetentionPolicy_DoNotPrunePinned": "Ne pas élaguer les messages épinglés",
@@ -3547,10 +3544,6 @@
   "RetentionPolicy_FilesOnly": "Supprimer uniquement les fichiers",
   "RetentionPolicy_FilesOnly_Description": "Seuls les fichiers seront supprimés, les messages eux-mêmes seront conservés.",
   "RetentionPolicy_MaxAge": "Âge maximal des messages",
-  "RetentionPolicy_MaxAge_Channels": "Âge maximal des messages dans les canaux",
-  "RetentionPolicy_MaxAge_Description": "Élaguer tous les messages plus anciens que cette valeur, en jours",
-  "RetentionPolicy_MaxAge_DMs": "Âge maximal des messages dans les messages directs",
-  "RetentionPolicy_MaxAge_Groups": "Âge maximal des messages dans les groupes privés",
   "RetentionPolicy_Precision": "Précision du temporisateur",
   "RetentionPolicy_Precision_Description": "Fréquence d'exécution du temporisateur d'élagage. Une valeur plus précise améliore le fonctionnement des canaux avec des temporisateurs de rétention rapides, mais le coût en termes de puissance de traitement peut être élevé pour les grandes communautés.",
   "RetentionPolicy_RoomWarning": "Les messages plus anciens que {{time}} sont automatiquement élagués ici",
diff --git a/packages/i18n/src/locales/hr.i18n.json b/packages/i18n/src/locales/hr.i18n.json
index c1046fdac669..61c0c443bf9a 100644
--- a/packages/i18n/src/locales/hr.i18n.json
+++ b/packages/i18n/src/locales/hr.i18n.json
@@ -2192,19 +2192,12 @@
   "Retail": "Maloprodaja",
   "Retention_setting_changed_successfully": "Postavka pravila zadržavanja uspješno je promijenjena",
   "RetentionPolicy": "Pravila zadržavanja",
-  "RetentionPolicy_AppliesToChannels": "Odnosi se na kanale",
-  "RetentionPolicy_AppliesToDMs": "Odnosi se na izravne poruke",
-  "RetentionPolicy_AppliesToGroups": "Odnosi se na privatne grupe",
   "RetentionPolicy_Description": "Automatski prunes stare poruke preko vašeg Rocket.Chat instanca.",
   "RetentionPolicy_Enabled": "Omogućeno",
   "RetentionPolicy_ExcludePinned": "Izuzmite prikvačene poruke",
   "RetentionPolicy_FilesOnly": "Samo izbrišite datoteke",
   "RetentionPolicy_FilesOnly_Description": "Samo će se datoteke izbrisati, poruke će ostati na mjestu.",
   "RetentionPolicy_MaxAge": "Maksimalna dob poruka",
-  "RetentionPolicy_MaxAge_Channels": "Maksimalna dob poruka u kanalima",
-  "RetentionPolicy_MaxAge_Description": "Prune sve poruke starijima od ove vrijednosti, u danima",
-  "RetentionPolicy_MaxAge_DMs": "Maksimalna dob poruka u izravnim porukama",
-  "RetentionPolicy_MaxAge_Groups": "Maksimalna dob poruka u privatnim skupinama",
   "RetentionPolicy_Precision": "Preciznost mjerača",
   "RetentionPolicy_Precision_Description": "Koliko često bi trebao trajati mjerač vremena. Postavljanje na precizniju vrijednost čini kanale s brzim retencijskim vremenskim razmacima bolji, ali mogu koštati dodatnu snagu obrade u velikim zajednicama.",
   "RetentionPolicy_RoomWarning": "Poruke starije od {{time}} ovdje su automatski izrezane",
diff --git a/packages/i18n/src/locales/hu.i18n.json b/packages/i18n/src/locales/hu.i18n.json
index 74fa10105efd..b978c8991d69 100644
--- a/packages/i18n/src/locales/hu.i18n.json
+++ b/packages/i18n/src/locales/hu.i18n.json
@@ -3901,9 +3901,6 @@
   "RetentionPolicy_Advanced_Precision": "Speciális megőrzési házirend beállítás használata",
   "RetentionPolicy_Advanced_Precision_Cron": "Speciális megőrzési házirend cron-feladat használata",
   "RetentionPolicy_Advanced_Precision_Cron_Description": "Milyen gyakran kell futnia a cron-feladat kifejezéssel meghatározott törlési időzítőnek. Ennek egy pontosabb értékre állítása a gyors visszatartási időzítőkkel rendelkező csatornákat jobban működővé teszi, de további feldolgozási teljesítménybe kerülhet nagy közösségeknél.",
-  "RetentionPolicy_AppliesToChannels": "Alkalmazás a csatornákra",
-  "RetentionPolicy_AppliesToDMs": "Alkalmazás a közvetlen üzenetekre",
-  "RetentionPolicy_AppliesToGroups": "Alkalmazás a személyes csoportokra",
   "RetentionPolicy_Description": "A régi üzenetek és fájlok automatikus törlése az egész munkaterületen.",
   "RetentionPolicy_DoNotPruneDiscussion": "Ne törölje a megbeszélés üzeneteit",
   "RetentionPolicy_DoNotPrunePinned": "Ne törölje a kitűzött üzeneteket",
@@ -3913,10 +3910,6 @@
   "RetentionPolicy_FilesOnly": "Csak fájlok törlése",
   "RetentionPolicy_FilesOnly_Description": "Csak a fájlok lesznek törölve, maguk az üzenetek a helyükön maradnak.",
   "RetentionPolicy_MaxAge": "Legnagyobb üzenetéletkor",
-  "RetentionPolicy_MaxAge_Channels": "Legnagyobb üzenetéletkor a csatornákban",
-  "RetentionPolicy_MaxAge_Description": "A napokban megadott értéknél régebbi összes üzenet törlése",
-  "RetentionPolicy_MaxAge_DMs": "Legnagyobb üzenetéletkor a közvetlen üzenetekben",
-  "RetentionPolicy_MaxAge_Groups": "Legnagyobb üzenetéletkor a személyes csoportokban",
   "RetentionPolicy_Precision": "Időzítő pontossága",
   "RetentionPolicy_Precision_Description": "Milyen gyakran kell futnia a törlési időzítőnek. Ennek egy pontosabb értékre állítása a gyors visszatartási időzítőkkel rendelkező csatornákat jobban működővé teszi, de további feldolgozási teljesítménybe kerülhet nagy közösségeknél.",
   "RetentionPolicy_RoomWarning": "Itt automatikusan törölve lesznek azok az üzenetek, amelyek régebbiek mint {{time}}",
diff --git a/packages/i18n/src/locales/id.i18n.json b/packages/i18n/src/locales/id.i18n.json
index 9d7a37e35dc2..3f03ef34e316 100644
--- a/packages/i18n/src/locales/id.i18n.json
+++ b/packages/i18n/src/locales/id.i18n.json
@@ -2068,19 +2068,12 @@
   "Retail": "Eceran",
   "Retention_setting_changed_successfully": "Pengaturan kebijakan retensi berhasil diubah",
   "RetentionPolicy": "Kebijakan Penyimpanan",
-  "RetentionPolicy_AppliesToChannels": "Berlaku untuk saluran",
-  "RetentionPolicy_AppliesToDMs": "Berlaku untuk mengarahkan pesan",
-  "RetentionPolicy_AppliesToGroups": "Berlaku untuk grup pribadi",
   "RetentionPolicy_Description": "Secara otomatis memangkas pesan lama di seluruh Rocket Anda. Contohnya.",
   "RetentionPolicy_Enabled": "Diaktifkan",
   "RetentionPolicy_ExcludePinned": "Kecualikan pesan yang disematkan",
   "RetentionPolicy_FilesOnly": "Hanya hapus file",
   "RetentionPolicy_FilesOnly_Description": "Hanya file yang akan dihapus, pesan itu sendiri akan tetap di tempatnya.",
   "RetentionPolicy_MaxAge": "Umur pesan maksimum",
-  "RetentionPolicy_MaxAge_Channels": "Umur pesan maksimum di saluran",
-  "RetentionPolicy_MaxAge_Description": "Pangkas semua pesan yang lebih lama dari nilai ini, dalam hitungan hari",
-  "RetentionPolicy_MaxAge_DMs": "Umur pesan maksimum dalam pesan langsung",
-  "RetentionPolicy_MaxAge_Groups": "Umur pesan maksimum dalam grup pribadi",
   "RetentionPolicy_Precision": "Timer Presisi",
   "RetentionPolicy_Precision_Description": "Seberapa sering pewaktu pemangkas harus berjalan. Menyetel ini ke nilai yang lebih tepat membuat saluran dengan penghitung waktu cepat berfungsi lebih baik, tetapi mungkin memerlukan biaya daya pemrosesan tambahan pada komunitas besar.",
   "RetentionPolicy_RoomWarning": "Pesan yang lebih lama dari {{time}} secara otomatis dipangkas di sini",
@@ -2777,4 +2770,4 @@
   "registration.component.form.sendConfirmationEmail": "Kirim email konfirmasi",
   "Enterprise": "Perusahaan",
   "UpgradeToGetMore_engagement-dashboard_Title": "Analytics"
-}
\ No newline at end of file
+}
diff --git a/packages/i18n/src/locales/it.i18n.json b/packages/i18n/src/locales/it.i18n.json
index 39cce6358b2a..5f01a3d39a0b 100644
--- a/packages/i18n/src/locales/it.i18n.json
+++ b/packages/i18n/src/locales/it.i18n.json
@@ -2579,19 +2579,12 @@
   "Retail": "Al dettaglio",
   "Retention_setting_changed_successfully": "Impostazione dei criteri di conservazione modificata correttamente",
   "RetentionPolicy": "Politica di conservazione",
-  "RetentionPolicy_AppliesToChannels": "Si applica ai canali",
-  "RetentionPolicy_AppliesToDMs": "Si applica per dirigere i messaggi",
-  "RetentionPolicy_AppliesToGroups": "Si applica a gruppi privati",
   "RetentionPolicy_Description": "Elimina automaticamente vecchi messaggi attraverso l'istanza di Rocket.Chat.",
   "RetentionPolicy_Enabled": "Abilitato",
   "RetentionPolicy_ExcludePinned": "Escludere i messaggi aggiunti",
   "RetentionPolicy_FilesOnly": "Elimina solo i file",
   "RetentionPolicy_FilesOnly_Description": "Verranno eliminati solo i file, i messaggi rimarranno al loro posto.",
   "RetentionPolicy_MaxAge": "Età massima del messaggio",
-  "RetentionPolicy_MaxAge_Channels": "Massima età dei messaggi nei canali",
-  "RetentionPolicy_MaxAge_Description": "Elimina tutti i messaggi più vecchi di questo valore, in giorni",
-  "RetentionPolicy_MaxAge_DMs": "Età massima dei messaggi nei messaggi diretti",
-  "RetentionPolicy_MaxAge_Groups": "Età massima dei messaggi in gruppi privati",
   "RetentionPolicy_Precision": "Precisione del timer",
   "RetentionPolicy_Precision_Description": "Con quale frequenza deve essere eseguito il timer di sfoltimento. Impostando questo ad un valore più preciso, i canali con timer di ritenzione veloce funzionano meglio, ma potrebbero costare una maggiore potenza di elaborazione su comunità di grandi dimensioni.",
   "RetentionPolicy_RoomWarning": "I messaggi più vecchi di {{time}} vengono automaticamente eliminati qui",
@@ -3412,4 +3405,4 @@
   "UpgradeToGetMore_custom-roles_Title": "Ruoli personalizzati",
   "Video_call_manager": "Gestore di videochiamate",
   "Sync_license_update_Callout_Title": "Stiamo aggiornando la vostra licenza"
-}
\ No newline at end of file
+}
diff --git a/packages/i18n/src/locales/ja.i18n.json b/packages/i18n/src/locales/ja.i18n.json
index e976c9559a78..befa051e6430 100644
--- a/packages/i18n/src/locales/ja.i18n.json
+++ b/packages/i18n/src/locales/ja.i18n.json
@@ -3497,9 +3497,6 @@
   "RetentionPolicy_Advanced_Precision": "高度な保持ポリシー設定の使用",
   "RetentionPolicy_Advanced_Precision_Cron": "高度な保持ポリシークロンの使用",
   "RetentionPolicy_Advanced_Precision_Cron_Description": "整理タイマーの実行頻度はcronジョブ式で定義されます。これをより精密な値に設定すると、保持タイマーが高速なチャネルの動作が改善されますが、大規模コミュニティでは追加の処理能力が必要になる可能性があります。",
-  "RetentionPolicy_AppliesToChannels": "チャネルに適用",
-  "RetentionPolicy_AppliesToDMs": "ダイレクトメッセージに適用",
-  "RetentionPolicy_AppliesToGroups": "プライベートグループに適用",
   "RetentionPolicy_Description": "Rocket.Chatインスタンス全体で古いメッセージを自動的に整理します。",
   "RetentionPolicy_DoNotPruneDiscussion": "ディスカッションメッセージを整理しない",
   "RetentionPolicy_DoNotPrunePinned": "固定されたメッセージを整理しない",
@@ -3509,10 +3506,6 @@
   "RetentionPolicy_FilesOnly": "ファイルのみを削除",
   "RetentionPolicy_FilesOnly_Description": "ファイルのみが削除され、メッセージ自体はそのまま残ります。",
   "RetentionPolicy_MaxAge": "メッセージ保持日数",
-  "RetentionPolicy_MaxAge_Channels": "チャネルでのメッセージ保持期間",
-  "RetentionPolicy_MaxAge_Description": "この値（日数）を経過したすべてのメッセージを整理します。",
-  "RetentionPolicy_MaxAge_DMs": "ダイレクトメッセージのメッセージ保持日数",
-  "RetentionPolicy_MaxAge_Groups": "プライベートグループでのメッセージ保持期間",
   "RetentionPolicy_Precision": "タイマー精度",
   "RetentionPolicy_Precision_Description": "整理タイマーの実行頻度。これをより精密な値に設定すると、保持タイマーが高速なチャネルの動作が改善されますが、大規模コミュニティでは追加の処理能力が必要になる可能性があります。",
   "RetentionPolicy_RoomWarning": "ここでは、{{time}}経過したメッセージが自動的に整理されます。",
diff --git a/packages/i18n/src/locales/ka-GE.i18n.json b/packages/i18n/src/locales/ka-GE.i18n.json
index ea1cde6e162e..0fc46f0672b8 100644
--- a/packages/i18n/src/locales/ka-GE.i18n.json
+++ b/packages/i18n/src/locales/ka-GE.i18n.json
@@ -2776,17 +2776,11 @@
   "Retail": "საცალო",
   "Retention_setting_changed_successfully": "შენახვის წესები წარმატებით შეიცვალა",
   "RetentionPolicy": "შენახვის წესები",
-  "RetentionPolicy_AppliesToChannels": "ვრცელდება არხებზე",
-  "RetentionPolicy_AppliesToDMs": "ვრცელდება პირდაპირ შეტყობინებებზე",
-  "RetentionPolicy_AppliesToGroups": "ვრცელდება კერძო ჯგუფებზე",
   "RetentionPolicy_Enabled": "ჩართული",
   "RetentionPolicy_ExcludePinned": "მიმაგრებული შეტყობინებების გამორიცხვა",
   "RetentionPolicy_FilesOnly": "მხოლოდ ფაილების წაშლა",
   "RetentionPolicy_FilesOnly_Description": "წაიშლება მხოლოდ ფაილები,შეტყობინებები დარჩება ადგილზე",
   "RetentionPolicy_MaxAge": "შეტყობინების მაქსიმალური ასაკი",
-  "RetentionPolicy_MaxAge_Channels": "არხში შეტყობინების მაქსიმალური ასაკი",
-  "RetentionPolicy_MaxAge_DMs": "პირდაპირ შეტყობინებებში შეტყობინების მაქსიმალური ასაკი",
-  "RetentionPolicy_MaxAge_Groups": "პირად ჯგუფში შეტყობინების მაქსიმალური ასაკი",
   "RetentionPolicy_Precision": "ტაიმერის სიზუსტე",
   "RetentionPolicy_RoomWarning": "{{time}}– ზე ძველი შეტყობინებები ავტომატურად აქ-შეინახება",
   "RetentionPolicy_RoomWarning_FilesOnly": "{{time}}– ზე ძველი ფაილები ავტომატურად აქ ინახება(შეტყობინებები არ დაზიანდება)",
diff --git a/packages/i18n/src/locales/km.i18n.json b/packages/i18n/src/locales/km.i18n.json
index cc6d2f815193..0af204615eb6 100644
--- a/packages/i18n/src/locales/km.i18n.json
+++ b/packages/i18n/src/locales/km.i18n.json
@@ -2376,19 +2376,12 @@
   "Retail": "លក់​រាយ",
   "Retention_setting_changed_successfully": "ការកំណត់គោលនយោបាយរក្សាទុកបានផ្លាស់ប្ដូរដោយជោគជ័យ",
   "RetentionPolicy": "គោលនយោបាយរក្សាទុក",
-  "RetentionPolicy_AppliesToChannels": "អនុវត្តទៅឆានែល",
-  "RetentionPolicy_AppliesToDMs": "អនុវត្តទៅសារដោយផ្ទាល់",
-  "RetentionPolicy_AppliesToGroups": "អនុវត្តចំពោះក្រុមឯកជន",
   "RetentionPolicy_Description": "លុបសារចាស់ៗដោយស្វ័យប្រវត្តិនៅលើ Rocket.Chat របស់អ្នក។",
   "RetentionPolicy_Enabled": "បានបើក",
   "RetentionPolicy_ExcludePinned": "មិនរាប់បញ្ចូលសារដែលបានបញ្ចូល",
   "RetentionPolicy_FilesOnly": "លុបតែឯកសារ",
   "RetentionPolicy_FilesOnly_Description": "មានតែឯកសារប៉ុណ្ណោះដែលនឹងត្រូវលុបចោលសាររបស់ពួកគេនឹងនៅតែបន្ត។",
   "RetentionPolicy_MaxAge": "អាយុសារអតិបរមា",
-  "RetentionPolicy_MaxAge_Channels": "អាយុសារអតិបរមានៅក្នុងឆានែល",
-  "RetentionPolicy_MaxAge_Description": "កាត់បន្ថយសារទាំងអស់ដែលចាស់ជាងតម្លៃនេះជាថ្ងៃ",
-  "RetentionPolicy_MaxAge_DMs": "អាយុសារអតិបរមានៅក្នុងសារដោយផ្ទាល់",
-  "RetentionPolicy_MaxAge_Groups": "អាយុសារអតិបរមាក្នុងក្រុមឯកជន",
   "RetentionPolicy_Precision": "ការបញ្ជាក់ពេលវេលា",
   "RetentionPolicy_Precision_Description": "រយៈពេលប៉ុន្មានដែលអ្នកល្ពៅគួរតែដំណើរការ។ ការកំណត់នេះទៅជាតម្លៃច្បាស់លាស់បន្ថែមទៀតធ្វើឱ្យឆានែលដែលមានឧបករណ៍កំណត់ពេលរក្សាទុកយ៉ាងឆាប់រហ័សដំណើរការបានល្អប៉ុន្តែវាអាចធ្វើអោយចំណាយថាមពលដំណើរការបន្ថែមលើសហគមន៍ធំ ៗ ។",
   "RetentionPolicy_RoomWarning": "សារដែលចាស់ជាង {{time}} ត្រូវបានកាត់ចេញដោយស្វ័យប្រវត្តិនៅទីនេះ",
diff --git a/packages/i18n/src/locales/ko.i18n.json b/packages/i18n/src/locales/ko.i18n.json
index b4b4ed006b47..d8858baa3536 100644
--- a/packages/i18n/src/locales/ko.i18n.json
+++ b/packages/i18n/src/locales/ko.i18n.json
@@ -3025,9 +3025,6 @@
   "Retail": "소매",
   "Retention_setting_changed_successfully": "보존 정책 설정이 변경되었습니다.",
   "RetentionPolicy": "보존 정책",
-  "RetentionPolicy_AppliesToChannels": "채널에 적용",
-  "RetentionPolicy_AppliesToDMs": "개인 대화방에 적용",
-  "RetentionPolicy_AppliesToGroups": "비공개 그룹에 적용",
   "RetentionPolicy_Description": "Rocket.Chat 인스턴스에서 오래된 메시지를 자동으로 정리합니다.",
   "RetentionPolicy_DoNotPruneDiscussion": "토론 메시지를 정리하지 마십시오",
   "RetentionPolicy_DoNotPrunePinned": "고정 된 메시지를 정리하지 마십시오",
@@ -3037,10 +3034,6 @@
   "RetentionPolicy_FilesOnly": "파일만 삭제",
   "RetentionPolicy_FilesOnly_Description": "파일만 삭제되며 메시지 자체는 그대로 유지됩니다.",
   "RetentionPolicy_MaxAge": "최대 메시지 수명",
-  "RetentionPolicy_MaxAge_Channels": "채널의 최대 메시지 보존 기간",
-  "RetentionPolicy_MaxAge_Description": "이 값보다 오래된 메시지를 일 단위로 정리합니다.",
-  "RetentionPolicy_MaxAge_DMs": "1:1 대화방의 최대 메시지 수명",
-  "RetentionPolicy_MaxAge_Groups": "비공개 그룹의 최대 메시지 수명",
   "RetentionPolicy_Precision": "타이머 정밀도",
   "RetentionPolicy_Precision_Description": "정리 타이머가 실행되는 빈도. 이를 보다 정확한 값으로 설정하면 빠른 보존 타이머가 있는 채널이 더 잘 작동하지만, 대규모 커뮤니티에서는 처리 능력이 추가로 필요할 수 있습니다.",
   "RetentionPolicy_RoomWarning": "{{time}} 이전의 메시지는 자동으로 정리됩니다.",
diff --git a/packages/i18n/src/locales/ku.i18n.json b/packages/i18n/src/locales/ku.i18n.json
index c245c8e04178..62631e48995b 100644
--- a/packages/i18n/src/locales/ku.i18n.json
+++ b/packages/i18n/src/locales/ku.i18n.json
@@ -2055,19 +2055,12 @@
   "Retail": "Yektacirî",
   "Retention_setting_changed_successfully": "Sîstema polîtîkayên paşveçûn bi serkeftî guhertin",
   "RetentionPolicy": "Polîtîkaya Reparêziyê",
-  "RetentionPolicy_AppliesToChannels": "Li ser kanalên xwe ye",
-  "RetentionPolicy_AppliesToDMs": "Li peyamên yekser peyda dike",
-  "RetentionPolicy_AppliesToGroups": "Li komên taybetî",
   "RetentionPolicy_Description": "Xweseriya xwe li ser Rocket.",
   "RetentionPolicy_Enabled": "Vekirî",
   "RetentionPolicy_ExcludePinned": "Peyamên pinned",
   "RetentionPolicy_FilesOnly": "Tenê pelan jêbirin",
   "RetentionPolicy_FilesOnly_Description": "Tenê pelên wê jêbirin, peyamên xwe dê di cih de bimînin.",
   "RetentionPolicy_MaxAge": "Mesajê herî mezintir",
-  "RetentionPolicy_MaxAge_Channels": "Zewaca herî mezintir di kanalên",
-  "RetentionPolicy_MaxAge_Description": "Di rojan de, hemî mesajên kevntir ji vê nirxê mezintir bide",
-  "RetentionPolicy_MaxAge_DMs": "Mesajê herî mezintir di navnîşên peyamê de",
-  "RetentionPolicy_MaxAge_Groups": "Di nav komên taybet de herî mezintirîn mesajê",
   "RetentionPolicy_Precision": "Timer Precision",
   "RetentionPolicy_Precision_Description": "Heya caran timer prune divê diçin. Sazkirina vê nirxê bêtir rastîn dike ku kanalên bi timên bêdeng yên zûtir baş dixebite, lê dibe ku li ser civakên mezin.",
   "RetentionPolicy_RoomWarning": "Messages ji hêla {{time}} mezintir têne hilweşandin",
@@ -2758,4 +2751,4 @@
   "registration.component.form.sendConfirmationEmail": "ئیمەیڵی پشتڕاستکردنەوە بنێرە",
   "Enterprise": "Enterprise",
   "UpgradeToGetMore_engagement-dashboard_Title": "analytics"
-}
\ No newline at end of file
+}
diff --git a/packages/i18n/src/locales/lo.i18n.json b/packages/i18n/src/locales/lo.i18n.json
index 230eb6533118..d17edd53be57 100644
--- a/packages/i18n/src/locales/lo.i18n.json
+++ b/packages/i18n/src/locales/lo.i18n.json
@@ -2098,19 +2098,12 @@
   "Retail": "ຂາຍ​ຍ່ອຍ",
   "Retention_setting_changed_successfully": "ການຕັ້ງຄ່ານະໂຍບາຍຮັກສາຄວາມປອດໄພໄດ້ປ່ຽນແປງຢ່າງສໍາເລັດ",
   "RetentionPolicy": "ນະໂຍບາຍຮັກສາ",
-  "RetentionPolicy_AppliesToChannels": "ນໍາໃຊ້ກັບຊ່ອງທາງ",
-  "RetentionPolicy_AppliesToDMs": "ໃຊ້ກັບຂໍ້ຄວາມໂດຍກົງ",
-  "RetentionPolicy_AppliesToGroups": "ນໍາໃຊ້ກັບກຸ່ມເອກະຊົນ",
   "RetentionPolicy_Description": "ອັດຕະໂນມັດ prunes ຂໍ້ຄວາມເກົ່າໃນຕົວຢ່າງ RocketChat ຂອງທ່ານ.",
   "RetentionPolicy_Enabled": "Enabled",
   "RetentionPolicy_ExcludePinned": "ຍົກເວັ້ນຂໍ້ຄວາມທີ່ມີ PINned",
   "RetentionPolicy_FilesOnly": "ພຽງແຕ່ລຶບໄຟລ໌",
   "RetentionPolicy_FilesOnly_Description": "ໄຟລ໌ພຽງແຕ່ຈະຖືກລຶບ, ຂໍ້ຄວາມຂອງເຂົາເຈົ້າເອງຈະຢູ່ໃນສະຖານທີ່.",
   "RetentionPolicy_MaxAge": "Age message ສູງສຸດ",
-  "RetentionPolicy_MaxAge_Channels": "ອາຍຸສູງສຸດຂອງຂໍ້ຄວາມໃນຊ່ອງທາງ",
-  "RetentionPolicy_MaxAge_Description": "ການແກ້ໄຂຂໍ້ຄວາມເກົ່າກວ່າມູນຄ່ານີ້, ໃນມື້",
-  "RetentionPolicy_MaxAge_DMs": "ອາຍຸສູງສຸດຂອງຂໍ້ຄວາມໃນຂໍ້ຄວາມໂດຍກົງ",
-  "RetentionPolicy_MaxAge_Groups": "ອາຍຸສູງສຸດຂໍ້ຄວາມໃນກຸ່ມເອກະຊົນ",
   "RetentionPolicy_Precision": "Timer Precision",
   "RetentionPolicy_Precision_Description": "ເວລາທີ່ໃຊ້ເວລາມັນຄວນໃຊ້. ການຕັ້ງຄ່ານີ້ໃຫ້ມີມູນຄ່າທີ່ຊັດເຈນຫຼາຍເຮັດໃຫ້ຊ່ອງທີ່ມີເວລາເກັບຮັກສາໄວຂຶ້ນເຮັດວຽກດີຂຶ້ນແຕ່ອາດຈະມີຄ່າໃຊ້ຈ່າຍໃນການປະມວນຜົນພິເສດໃນຊຸມຊົນຂະຫນາດໃຫຍ່.",
   "RetentionPolicy_RoomWarning": "ຂໍ້ຄວາມສູງກວ່າ {{time}} ຖືກຕັດເອົາໄວ້ອັດຕະໂນມັດຢູ່ທີ່ນີ້",
@@ -2806,4 +2799,4 @@
   "registration.component.form.sendConfirmationEmail": "ສົ່ງອີເມວການຢືນຢັນ",
   "Enterprise": "Enterprise",
   "UpgradeToGetMore_engagement-dashboard_Title": "ການວິເຄາະ"
-}
\ No newline at end of file
+}
diff --git a/packages/i18n/src/locales/lt.i18n.json b/packages/i18n/src/locales/lt.i18n.json
index fc3b5fe5b8e2..31cf7b65f3e4 100644
--- a/packages/i18n/src/locales/lt.i18n.json
+++ b/packages/i18n/src/locales/lt.i18n.json
@@ -2115,19 +2115,12 @@
   "Retail": "Mažmeninė",
   "Retention_setting_changed_successfully": "Saugojimo politikos nustatymas sėkmingai pasikeitė",
   "RetentionPolicy": "Saugojimo politika",
-  "RetentionPolicy_AppliesToChannels": "Taikoma kanalams",
-  "RetentionPolicy_AppliesToDMs": "Taikoma tiesioginiams pranešimams",
-  "RetentionPolicy_AppliesToGroups": "Taikoma privačioms grupėms",
   "RetentionPolicy_Description": "Automatiškai sunaikina senus pranešimus per savo \"Rocket.Chat\" egzempliorių.",
   "RetentionPolicy_Enabled": "Įjungtas",
   "RetentionPolicy_ExcludePinned": "Išskirti prisegtus pranešimus",
   "RetentionPolicy_FilesOnly": "Ištrinti tik failus",
   "RetentionPolicy_FilesOnly_Description": "Tik failai bus ištrinti, o pačios žinutės išliks.",
   "RetentionPolicy_MaxAge": "Maksimalus pranešimo amžius",
-  "RetentionPolicy_MaxAge_Channels": "Didžiausias pranešimų amžius kanaluose",
-  "RetentionPolicy_MaxAge_Description": "Sulenkite visus pranešimus, senesnes už šią vertę, dienų",
-  "RetentionPolicy_MaxAge_DMs": "Maksimalus pranešimų amžius tiesioginiuose pranešimuose",
-  "RetentionPolicy_MaxAge_Groups": "Maksimalus pranešimų amžius privačiose grupėse",
   "RetentionPolicy_Precision": "Laikmatis tikslumas",
   "RetentionPolicy_Precision_Description": "Kaip dažnai turi būti paleidžiamas kopūstų laikrodis. Jei norite nustatyti tikslesnę reikšmę, kanalai su greitojo saugojimo laikmačiais dirba geriau, bet didelėms bendruomenėms gali būti brangesta papildoma apdorojimo galia.",
   "RetentionPolicy_RoomWarning": "Pranešimai, senesni nei {{time}}, automatiškai prisegami čia",
@@ -2824,4 +2817,4 @@
   "registration.component.form.sendConfirmationEmail": "Siųsti patvirtinimo el. Laišką",
   "Enterprise": "Įmonė",
   "UpgradeToGetMore_engagement-dashboard_Title": "\"Analytics\""
-}
\ No newline at end of file
+}
diff --git a/packages/i18n/src/locales/lv.i18n.json b/packages/i18n/src/locales/lv.i18n.json
index dde13757eb04..97857c9c7bfd 100644
--- a/packages/i18n/src/locales/lv.i18n.json
+++ b/packages/i18n/src/locales/lv.i18n.json
@@ -2073,19 +2073,12 @@
   "Retail": "Mazumtirdzniecība",
   "Retention_setting_changed_successfully": "Saglabāšanas politikas iestatījumi ir veiksmīgi mainīti",
   "RetentionPolicy": "Saglabāšanas politika",
-  "RetentionPolicy_AppliesToChannels": "Attiecas uz kanāliem",
-  "RetentionPolicy_AppliesToDMs": "Attiecas uz tiešajiem ziņojumiem",
-  "RetentionPolicy_AppliesToGroups": "Attiecas uz privātām grupām",
   "RetentionPolicy_Description": "Automātiski apgriež vecos ziņojumus visā jūsu Rocket.Chat eksemplārā.",
   "RetentionPolicy_Enabled": "Iespējots",
   "RetentionPolicy_ExcludePinned": "Izslēgt piespraustos ziņojumus",
   "RetentionPolicy_FilesOnly": "Dzēst tikai failus",
   "RetentionPolicy_FilesOnly_Description": "Tiks dzēsti tikai faili, paši ziņojumi paliks.",
   "RetentionPolicy_MaxAge": "Maksimālais ziņojumu vecums",
-  "RetentionPolicy_MaxAge_Channels": "Maksimālais ziņojumu vecums kanālos",
-  "RetentionPolicy_MaxAge_Description": "Apgriezt visus ziņojumus, kas vecāki par šo vērtību, dienās",
-  "RetentionPolicy_MaxAge_DMs": "Maksimālais ziņojumu vecums tiešajos ziņojumos",
-  "RetentionPolicy_MaxAge_Groups": "Maksimālais ziņojumu vecums privātās grupās",
   "RetentionPolicy_Precision": "Taimera precizitāte",
   "RetentionPolicy_Precision_Description": "Cik bieži ir apgriešanas taimerim būtu jādarbojas? Iestatot to precīzāku ar vērtību, kanāli ar ātru saglabāšanas taimeri darbojas labāk, taču lielām grupām tas var prasīt vairāk apstrādes jaudas.",
   "RetentionPolicy_RoomWarning": "Vēstules, kas ir vecākas par {{time}}, tiek automātiski apgrieztas šeit",
@@ -2765,4 +2758,4 @@
   "registration.component.form.sendConfirmationEmail": "Nosūtīt apstiprinājuma e-pastu",
   "Enterprise": "Uzņēmums",
   "UpgradeToGetMore_engagement-dashboard_Title": "Analītika"
-}
\ No newline at end of file
+}
diff --git a/packages/i18n/src/locales/mn.i18n.json b/packages/i18n/src/locales/mn.i18n.json
index 0935105b01e1..e37d0b090302 100644
--- a/packages/i18n/src/locales/mn.i18n.json
+++ b/packages/i18n/src/locales/mn.i18n.json
@@ -2055,19 +2055,12 @@
   "Retail": "Жижиглэн худалдаа",
   "Retention_setting_changed_successfully": "Хадгалалтын бодлогын тохиргоо амжилттай болсон",
   "RetentionPolicy": "Батлан ​​хамгаалах бодлого",
-  "RetentionPolicy_AppliesToChannels": "Суваг ашиглах",
-  "RetentionPolicy_AppliesToDMs": "Мессежийг ашиглахад ашигладаг",
-  "RetentionPolicy_AppliesToGroups": "Хувийн бүлгүүдэд хэрэглэнэ",
   "RetentionPolicy_Description": "Өөрийн Rocket дээр хуучин зурвасуудыг автоматаар дарж засна уу.",
   "RetentionPolicy_Enabled": "Идэвхжүүлсэн",
   "RetentionPolicy_ExcludePinned": "Тэмдэглэсэн зурвасуудыг хасна уу",
   "RetentionPolicy_FilesOnly": "Зөвхөн файлуудыг устгах",
   "RetentionPolicy_FilesOnly_Description": "Зөвхөн файлууд устах болно, мэдээнүүд нь өөрөө биелэгдэх болно.",
   "RetentionPolicy_MaxAge": "Мессежний хамгийн их нас",
-  "RetentionPolicy_MaxAge_Channels": "Сувгийн хамгийн их зурвасын нас",
-  "RetentionPolicy_MaxAge_Description": "Энэ утгыг өмнөх бүх зурвасууд өдрөөс өдөрт тайлах",
-  "RetentionPolicy_MaxAge_DMs": "Мессежний хамгийн их зурвасын нас",
-  "RetentionPolicy_MaxAge_Groups": "Хувийн бүлгүүдийн хамгийн их зурвасын нас",
   "RetentionPolicy_Precision": "Таймер Нарийвчлал",
   "RetentionPolicy_Precision_Description": "Пресс хийх хугацаа хэр их байх ёстой. Үүнийг илүү нарийвчлалтайгаар тогтоох нь түргэн хугацаанд хадгалах сувгууд нь илүү сайн ажиллана, гэхдээ томоохон бүлгүүдэд илүү их боловсруулах хүчин чадал шаарддаг.",
   "RetentionPolicy_RoomWarning": "{{time}}-с хуучин мессежүүд автоматаар таслагдсан байна",
@@ -2758,4 +2751,4 @@
   "registration.component.form.sendConfirmationEmail": "Баталгаажуулах имэйл илгээх",
   "Enterprise": "Аж ахуйн нэгж",
   "UpgradeToGetMore_engagement-dashboard_Title": "Аналитик"
-}
\ No newline at end of file
+}
diff --git a/packages/i18n/src/locales/ms-MY.i18n.json b/packages/i18n/src/locales/ms-MY.i18n.json
index 4c042b3f105b..399199b71140 100644
--- a/packages/i18n/src/locales/ms-MY.i18n.json
+++ b/packages/i18n/src/locales/ms-MY.i18n.json
@@ -2067,19 +2067,12 @@
   "Retail": "Runcit",
   "Retention_setting_changed_successfully": "Tetapan dasar retensi berjaya berubah",
   "RetentionPolicy": "Dasar Pengekalan",
-  "RetentionPolicy_AppliesToChannels": "Terpakai kepada saluran",
-  "RetentionPolicy_AppliesToDMs": "Terpakai untuk mengarahkan mesej",
-  "RetentionPolicy_AppliesToGroups": "Terpakai kepada kumpulan swasta",
   "RetentionPolicy_Description": "Prun secara automatik mesej lama di seberang contoh Rocket.Chat anda.",
   "RetentionPolicy_Enabled": "Dihidupkan",
   "RetentionPolicy_ExcludePinned": "Kecualikan mesej yang disematkan",
   "RetentionPolicy_FilesOnly": "Hanya padamkan fail",
   "RetentionPolicy_FilesOnly_Description": "Hanya fail yang akan dipadam, mesej itu sendiri akan kekal di tempat.",
   "RetentionPolicy_MaxAge": "Umur mesej maksimum",
-  "RetentionPolicy_MaxAge_Channels": "Umur mesej maksimum dalam saluran",
-  "RetentionPolicy_MaxAge_Description": "Potong semua mesej yang lebih tua daripada nilai ini, dalam beberapa hari",
-  "RetentionPolicy_MaxAge_DMs": "Umur mesej maksimum dalam mesej langsung",
-  "RetentionPolicy_MaxAge_Groups": "Umur mesej maksimum dalam kumpulan swasta",
   "RetentionPolicy_Precision": "Ketepatan pemasa",
   "RetentionPolicy_Precision_Description": "Berapa kerap pemasa prune perlu dijalankan. Menetapkan ini ke nilai yang lebih tepat menjadikan saluran dengan pemasa cepat pemasa berfungsi dengan lebih baik, tetapi mungkin memerlukan kuasa pemprosesan tambahan pada komuniti besar.",
   "RetentionPolicy_RoomWarning": "Mesej yang lebih lama daripada {{time}} secara automatik dipangkas di sini",
@@ -2773,4 +2766,4 @@
   "registration.component.form.sendConfirmationEmail": "Hantar e-mel pengesahan",
   "Enterprise": "Enterprise",
   "UpgradeToGetMore_engagement-dashboard_Title": "Analisis"
-}
\ No newline at end of file
+}
diff --git a/packages/i18n/src/locales/nl.i18n.json b/packages/i18n/src/locales/nl.i18n.json
index 41052e0fe06e..d728696db8ef 100644
--- a/packages/i18n/src/locales/nl.i18n.json
+++ b/packages/i18n/src/locales/nl.i18n.json
@@ -3525,9 +3525,6 @@
   "RetentionPolicy_Advanced_Precision": "Configuratie van geavanceerde retentiebeleid gebruiken",
   "RetentionPolicy_Advanced_Precision_Cron": "Gebruik cron geavanceerde retentiebeleid",
   "RetentionPolicy_Advanced_Precision_Cron_Description": "Hoe vaak de prune-timer moet worden uitgevoerd, gedefinieerd door cron job expressie. Als u dit instelt op een nauwkeurigere waarde, werken kanalen met snelle retentietimers beter, maar kan dit extra verwerkingskracht kosten voor grote gemeenschappen.",
-  "RetentionPolicy_AppliesToChannels": "Geldt voor kanalen",
-  "RetentionPolicy_AppliesToDMs": "Geldt voor directe berichten",
-  "RetentionPolicy_AppliesToGroups": "Geldt voor privégroepen",
   "RetentionPolicy_Description": "Verwijdert automatisch oude berichten uit uw Rocket.Chat-instantie.",
   "RetentionPolicy_DoNotPruneDiscussion": "Geen discussieberichten snoeien",
   "RetentionPolicy_DoNotPrunePinned": "Verwijder vastgezette berichten niet",
@@ -3537,10 +3534,6 @@
   "RetentionPolicy_FilesOnly": "Alleen bestanden verwijderen",
   "RetentionPolicy_FilesOnly_Description": "Alleen bestanden worden verwijderd, de berichten zelf blijven op hun plaats.",
   "RetentionPolicy_MaxAge": "Maximale berichtleeftijd",
-  "RetentionPolicy_MaxAge_Channels": "Maximale berichtleeftijd in kanalen",
-  "RetentionPolicy_MaxAge_Description": "Snoei alle berichten die ouder zijn dan deze waarde, in dagen",
-  "RetentionPolicy_MaxAge_DMs": "Maximale berichtleeftijd in privéberichten",
-  "RetentionPolicy_MaxAge_Groups": "Maximale berichtleeftijd in privégroepen",
   "RetentionPolicy_Precision": "Timer precisie",
   "RetentionPolicy_Precision_Description": "Hoe vaak de prune-timer moet worden uitgevoerd. Als u dit instelt op een nauwkeurigere waarde, werken kanalen met snelle retentietimers beter, maar kan dit extra verwerkingskracht kosten voor grote gemeenschappen.",
   "RetentionPolicy_RoomWarning": "Berichten ouder dan {{time}} worden hier automatisch gesnoeid",
diff --git a/packages/i18n/src/locales/no.i18n.json b/packages/i18n/src/locales/no.i18n.json
index aa749acc3e49..45e3965e998d 100644
--- a/packages/i18n/src/locales/no.i18n.json
+++ b/packages/i18n/src/locales/no.i18n.json
@@ -3459,19 +3459,12 @@
   "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.",
   "RetentionPolicy_RoomWarning": "Meldinger som er eldre enn {{time}} blir automatisk beskåret her",
@@ -4584,4 +4577,4 @@
   "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/pl.i18n.json b/packages/i18n/src/locales/pl.i18n.json
index 27e8e712d978..97240fbcb204 100644
--- a/packages/i18n/src/locales/pl.i18n.json
+++ b/packages/i18n/src/locales/pl.i18n.json
@@ -3847,9 +3847,6 @@
   "RetentionPolicy_Advanced_Precision": "Używaj zaawansowanej konfiguracji polityki retencji",
   "RetentionPolicy_Advanced_Precision_Cron": "Używaj zaawansowanej konfiguracji Cron dla polityki retencji",
   "RetentionPolicy_Advanced_Precision_Cron_Description": "Jak często powinien działać timer przycinania definowane przez ustawienie cron joba. Ustawienie tej wartości na bardziej precyzyjną powoduje, że kanały z szybkimi licznikami czasu przechowywania działają lepiej, ale mogą kosztować dodatkową moc obliczeniową w dużych społecznościach.",
-  "RetentionPolicy_AppliesToChannels": "Dotyczy kanałów",
-  "RetentionPolicy_AppliesToDMs": "Dotyczy bezpośrednich wiadomości",
-  "RetentionPolicy_AppliesToGroups": "Dotyczy grup prywatnych",
   "RetentionPolicy_Description": "Automatycznie przycina stare wiadomości w instancji Rocket.Chat.",
   "RetentionPolicy_DoNotPruneDiscussion": "Nie usuwaj wiadomości z dyskusji",
   "RetentionPolicy_DoNotPrunePinned": "Nie usuwaj przypiętych wiadomości",
@@ -3859,10 +3856,6 @@
   "RetentionPolicy_FilesOnly": "Usuwaj tylko pliki",
   "RetentionPolicy_FilesOnly_Description": "Tylko pliki zostaną usunięte, same wiadomości pozostaną na swoim miejscu.",
   "RetentionPolicy_MaxAge": "Maksymalny wiek wiadomości",
-  "RetentionPolicy_MaxAge_Channels": "Maksymalny wiek wiadomości w kanałach",
-  "RetentionPolicy_MaxAge_Description": "Przycinaj wszystkie wiadomości starsze niż ta wartość, w dniach",
-  "RetentionPolicy_MaxAge_DMs": "Maksymalny wiek wiadomości w wiadomościach bezpośrednich",
-  "RetentionPolicy_MaxAge_Groups": "Maksymalny wiek wiadomości w grupach prywatnych",
   "RetentionPolicy_Precision": "Precyzja zegara",
   "RetentionPolicy_Precision_Description": "Jak często powinien działać timer przycinania. Ustawienie tej wartości na bardziej precyzyjną powoduje, że kanały z szybkimi licznikami czasu przechowywania działają lepiej, ale mogą kosztować dodatkową moc obliczeniową w dużych społecznościach.",
   "RetentionPolicy_RoomWarning": "Wiadomości starsze niż {{time}} są tutaj automatycznie przycinane",
diff --git a/packages/i18n/src/locales/pt-BR.i18n.json b/packages/i18n/src/locales/pt-BR.i18n.json
index 2259e79d64d6..70c9496d44e4 100644
--- a/packages/i18n/src/locales/pt-BR.i18n.json
+++ b/packages/i18n/src/locales/pt-BR.i18n.json
@@ -3627,9 +3627,6 @@
   "RetentionPolicy_Advanced_Precision": "Usar configuração de política de retenção avançada",
   "RetentionPolicy_Advanced_Precision_Cron": "Usar cron de política de retenção avançada",
   "RetentionPolicy_Advanced_Precision_Cron_Description": "Com que frequência o timer de remoção deve ser executado definido pela expressão de jobs do cron. Definir para um valor mais preciso faz com que canais com timers de retenção rápida funcionem melhor, mas pode ter custo extra de processamento em comunidades grandes.",
-  "RetentionPolicy_AppliesToChannels": "Aplica-se a canais",
-  "RetentionPolicy_AppliesToDMs": "Aplica-se a mensagens diretas",
-  "RetentionPolicy_AppliesToGroups": "Aplica-se a grupos privados",
   "RetentionPolicy_Description": "Remove automaticamente as mensagens antigas da sua instância do Rocket.Chat.",
   "RetentionPolicy_DoNotPruneDiscussion": "Não remover mensagens de discussão",
   "RetentionPolicy_DoNotPrunePinned": "Não remover mensagens fixadas",
@@ -3639,10 +3636,6 @@
   "RetentionPolicy_FilesOnly": "Apenas excluir arquivos",
   "RetentionPolicy_FilesOnly_Description": "Apenas arquivos serão excluídos, as mensagens permanecerão.",
   "RetentionPolicy_MaxAge": "A idade máxima da mensagem",
-  "RetentionPolicy_MaxAge_Channels": "A idade máxima da mensagem nos canais",
-  "RetentionPolicy_MaxAge_Description": "Remover todas as mensagens mais antigas que esse valor, em dias",
-  "RetentionPolicy_MaxAge_DMs": "Duração máxima da mensagem em mensagens diretas",
-  "RetentionPolicy_MaxAge_Groups": "Duração máxima da mensagem em grupos privados",
   "RetentionPolicy_Precision": "Precisão do temporizador",
   "RetentionPolicy_Precision_Description": "Quantas vezes o temporizador de remoção deve ser executado. Configurar um valor mais preciso faz com que os canais com temporizadores de retenção rápidos funcionem melhor, mas podem usar mais potência de processamento em grandes comunidades.",
   "RetentionPolicy_RoomWarning": "Mensagens mais antigas que {{time}} serão automaticamente removidas daqui",
diff --git a/packages/i18n/src/locales/pt.i18n.json b/packages/i18n/src/locales/pt.i18n.json
index 3f9bfe543dcc..3d9a30a7e35a 100644
--- a/packages/i18n/src/locales/pt.i18n.json
+++ b/packages/i18n/src/locales/pt.i18n.json
@@ -2396,19 +2396,12 @@
   "Retail": "Retalho",
   "Retention_setting_changed_successfully": "A configuração da política de retenção foi alterada com sucesso",
   "RetentionPolicy": "Política de retenção",
-  "RetentionPolicy_AppliesToChannels": "Aplica-se a canais",
-  "RetentionPolicy_AppliesToDMs": "Aplica-se a direccionar mensagens",
-  "RetentionPolicy_AppliesToGroups": "Aplica-se a grupos privados",
   "RetentionPolicy_Description": "Remove automaticamente as mensagens antigas da sua instância do Rocket.Chat.",
   "RetentionPolicy_Enabled": "Habilitado",
   "RetentionPolicy_ExcludePinned": "Excluir mensagens fixas",
   "RetentionPolicy_FilesOnly": "Apenas apagar arquivos",
   "RetentionPolicy_FilesOnly_Description": "Apenas arquivos serão excluídos, as mensagens permanecerão no lugar.",
   "RetentionPolicy_MaxAge": "A idade máxima da mensagem",
-  "RetentionPolicy_MaxAge_Channels": "A idade máxima da mensagem nos canais",
-  "RetentionPolicy_MaxAge_Description": "Remover todas as mensagens mais antigas que esse valor, em dias",
-  "RetentionPolicy_MaxAge_DMs": "Duração máxima da mensagem em mensagens directas",
-  "RetentionPolicy_MaxAge_Groups": "Duração máxima da mensagem em grupos privados",
   "RetentionPolicy_Precision": "Precisão do temporizador",
   "RetentionPolicy_Precision_Description": "Quantas vezes o temporizador de remoção deve ser executado. Configurar isso para um valor mais preciso faz com que os canais com temporizadores de retenção rápidos funcionem melhor, mas podem custar um poder de processamento extra em grandes comunidades.",
   "RetentionPolicy_RoomWarning": "Mensagens mais antigas que {{time}} são automaticamente removidas aqui",
diff --git a/packages/i18n/src/locales/ro.i18n.json b/packages/i18n/src/locales/ro.i18n.json
index c7ab38172267..8c80df9b793f 100644
--- a/packages/i18n/src/locales/ro.i18n.json
+++ b/packages/i18n/src/locales/ro.i18n.json
@@ -2059,19 +2059,12 @@
   "Retail": "Cu amănuntul",
   "Retention_setting_changed_successfully": "Politica de păstrare a fost modificată cu succes",
   "RetentionPolicy": "Politica de păstrare",
-  "RetentionPolicy_AppliesToChannels": "Se aplică la canale",
-  "RetentionPolicy_AppliesToDMs": "Se aplică pentru mesaje directe",
-  "RetentionPolicy_AppliesToGroups": "Se aplică grupurilor private",
   "RetentionPolicy_Description": "Șterge automat vechile mesaje de-a lungul instanței Rocket.Chat.",
   "RetentionPolicy_Enabled": "Activat",
   "RetentionPolicy_ExcludePinned": "Excludeți mesajele fixate",
   "RetentionPolicy_FilesOnly": "Ștergeți numai fișierele",
   "RetentionPolicy_FilesOnly_Description": "Numai fișierele vor fi șterse, mesajele în sine rămân în vigoare.",
   "RetentionPolicy_MaxAge": "Vârsta maximă a mesajului",
-  "RetentionPolicy_MaxAge_Channels": "Vârsta maximă a mesajului în canale",
-  "RetentionPolicy_MaxAge_Description": "Prelucrați toate mesajele mai vechi decât această valoare, în zile",
-  "RetentionPolicy_MaxAge_DMs": "Vârsta maximă a mesajului în mesajele directe",
-  "RetentionPolicy_MaxAge_Groups": "Vârsta maximă a mesajului în grupuri private",
   "RetentionPolicy_Precision": "Timp de precizie",
   "RetentionPolicy_Precision_Description": "Cât de des ar trebui să ruleze cronometrul pentru prune. Setarea acestei valori la o valoare mai precisă face ca canalele cu cronometre rapide să funcționeze mai bine, dar ar putea costa putere suplimentară de procesare pentru comunitățile mari.",
   "RetentionPolicy_RoomWarning": "Mesajele mai vechi decât {{time}} sunt tăiate automat aici",
@@ -2763,4 +2756,4 @@
   "registration.component.form.sendConfirmationEmail": "Trimite email de confirmare",
   "Enterprise": "Afacere",
   "UpgradeToGetMore_engagement-dashboard_Title": "Analytics"
-}
\ No newline at end of file
+}
diff --git a/packages/i18n/src/locales/ru.i18n.json b/packages/i18n/src/locales/ru.i18n.json
index 3af2f4dfdf88..6a71f68572c3 100644
--- a/packages/i18n/src/locales/ru.i18n.json
+++ b/packages/i18n/src/locales/ru.i18n.json
@@ -3700,9 +3700,6 @@
   "RetentionPolicy_Advanced_Precision": "Использовать расширенную конфигурацию политики очистки сообщений",
   "RetentionPolicy_Advanced_Precision_Cron": "Использовать расширенный планировщик для политики очистки сообщений",
   "RetentionPolicy_Advanced_Precision_Cron_Description": "Как часто должен запускаться таймер очистки сообщений определяется правилом задачи планировщика. Установка этих значений позволяет каналам с более частыми таймерами очистки сообщений работать лучше, но может стоить дополнительных вычислительных мощностей на больших сообществах.",
-  "RetentionPolicy_AppliesToChannels": "Применяется к открытым каналам",
-  "RetentionPolicy_AppliesToDMs": "Применяется к личным сообщениям",
-  "RetentionPolicy_AppliesToGroups": "Применяется к закрытым каналам",
   "RetentionPolicy_Description": "Автоматически удаляет старые сообщения на вашем сервере Rocket.Chat.",
   "RetentionPolicy_DoNotPruneDiscussion": "Не удалять сообщения обсуждений",
   "RetentionPolicy_DoNotPrunePinned": "Не удалять прикрепленные сообщения",
@@ -3712,10 +3709,6 @@
   "RetentionPolicy_FilesOnly": "Удалить только файлы",
   "RetentionPolicy_FilesOnly_Description": "Удаляются только файлы, сами сообщения остаются на месте.",
   "RetentionPolicy_MaxAge": "Максимальное время жизни сообщений",
-  "RetentionPolicy_MaxAge_Channels": "Максимальное время жизни сообщений в открытых каналах",
-  "RetentionPolicy_MaxAge_Description": "Удалять все сообщения старше этого значения, в днях",
-  "RetentionPolicy_MaxAge_DMs": "Максимальное время жизни личных сообщений",
-  "RetentionPolicy_MaxAge_Groups": "Максимальное время жизни сообщений в закрытых каналах",
   "RetentionPolicy_Precision": "Точность таймера",
   "RetentionPolicy_Precision_Description": "Как часто должен запускаться таймер очистки. Установка этих значений позволяет каналам с более частыми таймерами очистки сообщений работать лучше, но может стоить дополнительных вычислительных мощностей на больших сообществах.",
   "RetentionPolicy_RoomWarning": "Сообщения в этой комнате удаляются через {{time}}.",
diff --git a/packages/i18n/src/locales/sk-SK.i18n.json b/packages/i18n/src/locales/sk-SK.i18n.json
index 708187fbcd93..ed4a68d97b24 100644
--- a/packages/i18n/src/locales/sk-SK.i18n.json
+++ b/packages/i18n/src/locales/sk-SK.i18n.json
@@ -2069,19 +2069,12 @@
   "Retail": "Maloobchod",
   "Retention_setting_changed_successfully": "Nastavenie politiky uchovávania sa úspešne zmenilo",
   "RetentionPolicy": "Politika uchovávania",
-  "RetentionPolicy_AppliesToChannels": "Platí pre kanály",
-  "RetentionPolicy_AppliesToDMs": "Platí pre priame správy",
-  "RetentionPolicy_AppliesToGroups": "Platí pre súkromné ​​skupiny",
   "RetentionPolicy_Description": "Automaticky prerezáva staré správy v rámci vašej inštancie Rocket.Chat.",
   "RetentionPolicy_Enabled": "Povolené",
   "RetentionPolicy_ExcludePinned": "Vylúčte pripnuté správy",
   "RetentionPolicy_FilesOnly": "Odstráňte iba súbory",
   "RetentionPolicy_FilesOnly_Description": "Iba súbory budú vymazané, samotné správy zostanú na mieste.",
   "RetentionPolicy_MaxAge": "Maximálny vek správy",
-  "RetentionPolicy_MaxAge_Channels": "Maximálny vek správ v kanáloch",
-  "RetentionPolicy_MaxAge_Description": "Nakrájajte všetky správy staršie ako táto hodnota v dňoch",
-  "RetentionPolicy_MaxAge_DMs": "Maximálny vek správ v priamych správach",
-  "RetentionPolicy_MaxAge_Groups": "Maximálny vek správ v súkromných skupinách",
   "RetentionPolicy_Precision": "Timer Precision",
   "RetentionPolicy_Precision_Description": "Ako často by mal spustiť časovač prerezávanie. Nastavenie tejto hodnoty na presnejšiu hodnotu umožňuje, aby kanály s rýchlymi retenčnými časovačmi fungovali lepšie, ale mohlo by to zapríčiniť mimoriadny výkon spracovania veľkých spoločenstiev.",
   "RetentionPolicy_RoomWarning": "Správy staršie ako {{time}} sú automaticky prerezané tu",
@@ -2775,4 +2768,4 @@
   "registration.component.form.sendConfirmationEmail": "Pošlite potvrdzovací e-mail",
   "Enterprise": "podnik",
   "UpgradeToGetMore_engagement-dashboard_Title": "Analytika"
-}
\ No newline at end of file
+}
diff --git a/packages/i18n/src/locales/sl-SI.i18n.json b/packages/i18n/src/locales/sl-SI.i18n.json
index 11289e62349b..407d5b384545 100644
--- a/packages/i18n/src/locales/sl-SI.i18n.json
+++ b/packages/i18n/src/locales/sl-SI.i18n.json
@@ -2049,19 +2049,12 @@
   "Retail": "Maloprodaja",
   "Retention_setting_changed_successfully": "Nastavitev pravilnika o zadržanju je bila uspešno spremenjena",
   "RetentionPolicy": "Politika zadrževanja",
-  "RetentionPolicy_AppliesToChannels": "Velja za kanale",
-  "RetentionPolicy_AppliesToDMs": "Velja za neposredna sporočila",
-  "RetentionPolicy_AppliesToGroups": "Velja za zasebne skupine",
   "RetentionPolicy_Description": "Samodejno osemenjevanje starih sporočil prek vašega Rocket.Chat primera.",
   "RetentionPolicy_Enabled": "Omogočeno",
   "RetentionPolicy_ExcludePinned": "Izključi prepovedana sporočila",
   "RetentionPolicy_FilesOnly": "Izbrišite le datoteke",
   "RetentionPolicy_FilesOnly_Description": "Samo datoteke bodo izbrisane, sporočila bodo ostala na mestu.",
   "RetentionPolicy_MaxAge": "Najvišja starost sporočila",
-  "RetentionPolicy_MaxAge_Channels": "Najvišja starost sporočil v kanalih",
-  "RetentionPolicy_MaxAge_Description": "Preglejte vsa sporočila, starejša od te vrednosti, v dnevih",
-  "RetentionPolicy_MaxAge_DMs": "Najvišja starost sporočil v neposrednih sporočilih",
-  "RetentionPolicy_MaxAge_Groups": "Največja starost sporočil v zasebnih skupinah",
   "RetentionPolicy_Precision": "Časovna natančnost",
   "RetentionPolicy_Precision_Description": "Kako pogosto naj se izvaja časovni rezalnik. Če nastavite to na natančnejšo vrednost, postanejo kanali z hitrimi časovnimi časi boljši, vendar pa lahko pri večjih skupnostih stanejo dodatna procesna moč.",
   "RetentionPolicy_RoomWarning": "Sporočila, starejša od {{time}}, so samodejno obrezana tukaj",
@@ -2755,4 +2748,4 @@
   "registration.component.form.sendConfirmationEmail": "Pošlji potrditveno e-poštno sporočilo",
   "Enterprise": "Podjetje",
   "UpgradeToGetMore_engagement-dashboard_Title": "Analiza"
-}
\ No newline at end of file
+}
diff --git a/packages/i18n/src/locales/sq.i18n.json b/packages/i18n/src/locales/sq.i18n.json
index 4e9c49ada34f..c74d6e414f52 100644
--- a/packages/i18n/src/locales/sq.i18n.json
+++ b/packages/i18n/src/locales/sq.i18n.json
@@ -2059,19 +2059,12 @@
   "Retail": "me pakicë",
   "Retention_setting_changed_successfully": "Rregullimi i politikës së ruajtjes ndryshoi me sukses",
   "RetentionPolicy": "Politika e Ruajtjes",
-  "RetentionPolicy_AppliesToChannels": "Zbatohet tek kanalet",
-  "RetentionPolicy_AppliesToDMs": "Zbatohet në mesazhet direkte",
-  "RetentionPolicy_AppliesToGroups": "Zbatohet për grupe private",
   "RetentionPolicy_Description": "Prunes automatikisht mesazhet e vjetra në të gjithë shkallën Rocket.Chat.",
   "RetentionPolicy_Enabled": "enabled",
   "RetentionPolicy_ExcludePinned": "Përjashto mesazhet e mbështetura",
   "RetentionPolicy_FilesOnly": "Vetëm fshini skedarët",
   "RetentionPolicy_FilesOnly_Description": "Vetëm skedarët do të fshihen, vetë mesazhet do të qëndrojnë në vend.",
   "RetentionPolicy_MaxAge": "Mosha maksimale e mesazhit",
-  "RetentionPolicy_MaxAge_Channels": "Mosha maksimale e mesazhit në kanale",
-  "RetentionPolicy_MaxAge_Description": "Prune të gjitha mesazhet më të vjetër se kjo vlerë, në ditë",
-  "RetentionPolicy_MaxAge_DMs": "Mosha Maksimale e mesazhit në mesazhet direkte",
-  "RetentionPolicy_MaxAge_Groups": "Mosha maksimale e mesazhit në grupe private",
   "RetentionPolicy_Precision": "Timer Precision",
   "RetentionPolicy_Precision_Description": "Sa shpesh koha duhet të funksionojë. Vendosja e kësaj me një vlerë më të saktë bën që kanalet me kohëmatësi të mbajtjes së shpejtë të funksionojnë më mirë, por mund të kushtojnë energji shtesë për përpunim në komunitetet e mëdha.",
   "RetentionPolicy_RoomWarning": "Mesazhet më të vjetra se {{time}} shkurtohen automatikisht këtu",
@@ -2764,4 +2757,4 @@
   "registration.component.form.sendConfirmationEmail": "Dërgo email konfirmimi",
   "Enterprise": "Ndërmarrje",
   "UpgradeToGetMore_engagement-dashboard_Title": "Analitikë"
-}
\ No newline at end of file
+}
diff --git a/packages/i18n/src/locales/sr.i18n.json b/packages/i18n/src/locales/sr.i18n.json
index 4269520a8ce3..ba5bcceff14b 100644
--- a/packages/i18n/src/locales/sr.i18n.json
+++ b/packages/i18n/src/locales/sr.i18n.json
@@ -1893,19 +1893,12 @@
   "Retail": "Малопродаја",
   "Retention_setting_changed_successfully": "Поставка полисе за задржавање успешно се променила",
   "RetentionPolicy": "Политика задржавања",
-  "RetentionPolicy_AppliesToChannels": "Примењује се на канале",
-  "RetentionPolicy_AppliesToDMs": "Примењује се на директне поруке",
-  "RetentionPolicy_AppliesToGroups": "Примјењује се на приватне групе",
   "RetentionPolicy_Description": "Аутоматски избрише старе поруке преко вашег Роцкет.Цхат инстанца.",
   "RetentionPolicy_Enabled": "Омогућено",
   "RetentionPolicy_ExcludePinned": "Искључите закачене поруке",
   "RetentionPolicy_FilesOnly": "Избришите само датотеке",
   "RetentionPolicy_FilesOnly_Description": "Само датотеке ће бити избрисане, саме поруке ће остати на месту.",
   "RetentionPolicy_MaxAge": "Максимална старост поруке",
-  "RetentionPolicy_MaxAge_Channels": "Максимална старост поруке у каналима",
-  "RetentionPolicy_MaxAge_Description": "Обришите све поруке старије од ове вредности, у данима",
-  "RetentionPolicy_MaxAge_DMs": "Максимална старост поруке у директним порукама",
-  "RetentionPolicy_MaxAge_Groups": "Максимална старост поруке у приватним групама",
   "RetentionPolicy_Precision": "Тимер Прецисион",
   "RetentionPolicy_Precision_Description": "Колико често би требало да се покрене тимер за резање. Постављањем ове на прецизну вриједност чини канале са брзим временским задржавањем боље функционирати, али би могла да коштају додатну моћ процесирања на великим заједницама.",
   "RetentionPolicy_RoomWarning": "Порука старија од {{time}} аутоматски се обрезује овде",
@@ -2577,4 +2570,4 @@
   "registration.component.form.sendConfirmationEmail": "Пошаљи потврдну поруку",
   "Enterprise": "Предузеће",
   "UpgradeToGetMore_engagement-dashboard_Title": "Аналитика"
-}
\ No newline at end of file
+}
diff --git a/packages/i18n/src/locales/sv.i18n.json b/packages/i18n/src/locales/sv.i18n.json
index 67f1912f25f0..49febc00c9b8 100644
--- a/packages/i18n/src/locales/sv.i18n.json
+++ b/packages/i18n/src/locales/sv.i18n.json
@@ -4071,9 +4071,6 @@
   "RetentionPolicy_Advanced_Precision": "Använd inställningar för avancerad lagringspolicy",
   "RetentionPolicy_Advanced_Precision_Cron": "Använd cron för avancerad lagringspolicy",
   "RetentionPolicy_Advanced_Precision_Cron_Description": "Hur ofta gallringstimern ska köras anges av uttrycket för cron-jobb. Om du anger ett mer exakt värde för den fungerar kanaler med korta lagringstider bättre, men det kan kräva extra bearbetningskraft för större communityn.",
-  "RetentionPolicy_AppliesToChannels": "Gäller kanaler",
-  "RetentionPolicy_AppliesToDMs": "Gäller direktmeddelanden",
-  "RetentionPolicy_AppliesToGroups": "Gäller privata grupper",
   "RetentionPolicy_Description": "Gallra automatiskt gamla meddelanden över din Rocket.Chat-instans.",
   "RetentionPolicy_DoNotPruneDiscussion": "Gallra inte diskussionsmeddelanden",
   "RetentionPolicy_DoNotPrunePinned": "Gallra inte pinnade meddelanden",
@@ -4083,10 +4080,6 @@
   "RetentionPolicy_FilesOnly": "Ta bara bort filer",
   "RetentionPolicy_FilesOnly_Description": "Endast filer kommer att raderas, meddelandena kommer att stanna kvar.",
   "RetentionPolicy_MaxAge": "Maximal meddelandeålder",
-  "RetentionPolicy_MaxAge_Channels": "Maximal meddelandeålder i kanaler",
-  "RetentionPolicy_MaxAge_Description": "Gallra alla meddelanden som är äldre än det här värdet, i dagar",
-  "RetentionPolicy_MaxAge_DMs": "Maximal meddelandeålder i direktmeddelanden",
-  "RetentionPolicy_MaxAge_Groups": "Maximal meddelandeålder i privata grupper",
   "RetentionPolicy_Precision": "Precision för timer",
   "RetentionPolicy_Precision_Description": "Hur ofta timern för gallring ska köras. Om du ställer in det här på ett mer exakt värde fungerar kanaler med snabba timers bättre, men det kan kosta extra processorkraft i stora communities.",
   "RetentionPolicy_RoomWarning": "Meddelanden som är äldre än {{time}} gallras automatiskt här",
diff --git a/packages/i18n/src/locales/ta-IN.i18n.json b/packages/i18n/src/locales/ta-IN.i18n.json
index 80568869dce5..0f4e8157d75b 100644
--- a/packages/i18n/src/locales/ta-IN.i18n.json
+++ b/packages/i18n/src/locales/ta-IN.i18n.json
@@ -2060,19 +2060,12 @@
   "Retail": "சில்லறை",
   "Retention_setting_changed_successfully": "தக்கவைப்பு கொள்கை அமைப்பு வெற்றிகரமாக மாற்றப்பட்டது",
   "RetentionPolicy": "Retention கொள்கை",
-  "RetentionPolicy_AppliesToChannels": "சேனல்களுக்கு பொருந்தும்",
-  "RetentionPolicy_AppliesToDMs": "நேரடி செய்திகளுக்கு பொருந்தும்",
-  "RetentionPolicy_AppliesToGroups": "தனியார் குழுக்களுக்கு பொருந்தும்",
   "RetentionPolicy_Description": "உங்கள் ராக்கெட் முழுவதும் பழைய செய்திகளை தானாகவே புரட்டுகிறது.",
   "RetentionPolicy_Enabled": "இயக்கப்பட்டது",
   "RetentionPolicy_ExcludePinned": "பின் செய்திகளை விலக்கவும்",
   "RetentionPolicy_FilesOnly": "கோப்புகளை மட்டும் நீக்கு",
   "RetentionPolicy_FilesOnly_Description": "கோப்புகள் மட்டுமே நீக்கப்படும், செய்திகளும் தங்குதலுடன் இருக்கும்.",
   "RetentionPolicy_MaxAge": "அதிகபட்ச செய்தி வயது",
-  "RetentionPolicy_MaxAge_Channels": "சேனல்களில் அதிகபட்ச செய்தி வயது",
-  "RetentionPolicy_MaxAge_Description": "நாட்களில் இந்த மதிப்பை விட பழைய எல்லா செய்திகளையும் புரையுங்கள்",
-  "RetentionPolicy_MaxAge_DMs": "நேரடியான செய்திகளில் அதிகபட்ச செய்தி வயது",
-  "RetentionPolicy_MaxAge_Groups": "தனிப்பட்ட குழுக்களில் அதிகபட்ச செய்தி வயது",
   "RetentionPolicy_Precision": "டைமர் துல்லியம்",
   "RetentionPolicy_Precision_Description": "எப்படி அடிக்கடி கிள்ளுதல் டைமர் இயக்க வேண்டும். இது மிகவும் துல்லியமான மதிப்பை அமைப்பதன் மூலம் வேகமாக தக்கவைத்துக்கொள்ளும் நேரத்தை கொண்ட சேனல்கள் சிறப்பாக செயல்படுகின்றன, ஆனால் பெரிய சமூகங்களில் கூடுதல் செயலாக்க சக்தி செலவாகும்.",
   "RetentionPolicy_RoomWarning": "{{time}} க்கும் மேற்பட்ட செய்திகள் தானாகவே சீரமைக்கப்படும்",
@@ -2767,4 +2760,4 @@
   "registration.component.form.sendConfirmationEmail": "உறுதிப்படுத்தும் மின்னஞ்சல் அனுப்பவும்",
   "Enterprise": "நிறுவன",
   "UpgradeToGetMore_engagement-dashboard_Title": "அனலிட்டிக்ஸ்"
-}
\ No newline at end of file
+}
diff --git a/packages/i18n/src/locales/th-TH.i18n.json b/packages/i18n/src/locales/th-TH.i18n.json
index c145de66d79b..3f2da8e71594 100644
--- a/packages/i18n/src/locales/th-TH.i18n.json
+++ b/packages/i18n/src/locales/th-TH.i18n.json
@@ -2053,19 +2053,12 @@
   "Retail": "ขายปลีก",
   "Retention_setting_changed_successfully": "เปลี่ยนการตั้งค่านโยบายการเก็บรักษาสำเร็จแล้ว",
   "RetentionPolicy": "นโยบายการเก็บรักษา",
-  "RetentionPolicy_AppliesToChannels": "ใช้กับช่อง",
-  "RetentionPolicy_AppliesToDMs": "ใช้กับข้อความโดยตรง",
-  "RetentionPolicy_AppliesToGroups": "ใช้กับกลุ่มส่วนตัว",
   "RetentionPolicy_Description": "ลบข้อความเก่า ๆ ในตัวอย่าง Rocket.Chat ของคุณโดยอัตโนมัติ",
   "RetentionPolicy_Enabled": "เปิดการใช้งาน",
   "RetentionPolicy_ExcludePinned": "ไม่รวมข้อความตรึง",
   "RetentionPolicy_FilesOnly": "ลบเฉพาะไฟล์เท่านั้น",
   "RetentionPolicy_FilesOnly_Description": "ระบบจะลบเฉพาะไฟล์เท่านั้นข้อความจะอยู่ในสถานที่",
   "RetentionPolicy_MaxAge": "อายุข้อความสูงสุด",
-  "RetentionPolicy_MaxAge_Channels": "อายุข้อความสูงสุดในช่อง",
-  "RetentionPolicy_MaxAge_Description": "ลบข้อความทั้งหมดที่เก่ากว่าค่านี้เป็นวัน",
-  "RetentionPolicy_MaxAge_DMs": "อายุข้อความสูงสุดในข้อความโดยตรง",
-  "RetentionPolicy_MaxAge_Groups": "อายุข้อความสูงสุดในกลุ่มส่วนตัว",
   "RetentionPolicy_Precision": "จับเวลาแม่นยำ",
   "RetentionPolicy_Precision_Description": "ควรจับเวลาลูกพรุนบ่อยแค่ไหน การตั้งค่านี้เป็นค่าที่แม่นยำยิ่งขึ้นทำให้ช่องที่มีตัวจับเวลาการเก็บรักษาอย่างรวดเร็วทำงานได้ดีขึ้น แต่อาจมีค่าใช้จ่ายเพิ่มขึ้นในชุมชนขนาดใหญ่",
   "RetentionPolicy_RoomWarning": "ข้อความที่เก่ากว่า {{time}} จะถูกตัดแต่งโดยอัตโนมัติที่นี่",
@@ -2753,4 +2746,4 @@
   "registration.component.form.sendConfirmationEmail": "ส่งอีเมลยืนยัน",
   "Enterprise": "องค์กร",
   "UpgradeToGetMore_engagement-dashboard_Title": "Analytics"
-}
\ No newline at end of file
+}
diff --git a/packages/i18n/src/locales/tr.i18n.json b/packages/i18n/src/locales/tr.i18n.json
index e8475e235715..a8f99e52e7a8 100644
--- a/packages/i18n/src/locales/tr.i18n.json
+++ b/packages/i18n/src/locales/tr.i18n.json
@@ -2458,19 +2458,12 @@
   "Retail": "Perakende",
   "Retention_setting_changed_successfully": "Saklama politikası ayarı başarıyla değiştirildi",
   "RetentionPolicy": "Alıkoyma politikası",
-  "RetentionPolicy_AppliesToChannels": "Kanallara uygulanır",
-  "RetentionPolicy_AppliesToDMs": "Doğrudan iletilere uygulanır",
-  "RetentionPolicy_AppliesToGroups": "Özel gruplara uygulanır",
   "RetentionPolicy_Description": "Eski iletileri otomatik olarak Rocket.Chat örneğinizde yayınlar.",
   "RetentionPolicy_Enabled": "Etkin",
   "RetentionPolicy_ExcludePinned": "Sabitlenmiş iletileri dışında tut",
   "RetentionPolicy_FilesOnly": "Sadece dosyaları sil",
   "RetentionPolicy_FilesOnly_Description": "Sadece dosyalar silinecek, mesajların kendisi yerinde kalacaktır.",
   "RetentionPolicy_MaxAge": "Maksimum ileti yaşı",
-  "RetentionPolicy_MaxAge_Channels": "Kanallarda maksimum ileti yaşı",
-  "RetentionPolicy_MaxAge_Description": "Bu değerde günden daha eski olan tüm iletileri buda ",
-  "RetentionPolicy_MaxAge_DMs": "Doğrudan iletilerde maksimum ileti yaşı",
-  "RetentionPolicy_MaxAge_Groups": "Özel gruplarda maksimum ileti yaşı",
   "RetentionPolicy_Precision": "Zamanlayıcı Hassasiyeti",
   "RetentionPolicy_Precision_Description": "Budama zamanlayıcı kaç kez çalıştırılmalıdır. Bunu daha hassas bir değere ayarlamak, hızlı saklama zamanlayıcılarına sahip kanalların daha iyi çalışmasını sağlar, ancak büyük topluluklarda ekstra işlem gücüne mal olabilir.",
   "RetentionPolicy_RoomWarning": "{{time}}'den eski mesajlar otomatik olarak budanır",
diff --git a/packages/i18n/src/locales/uk.i18n.json b/packages/i18n/src/locales/uk.i18n.json
index 70dca33be576..758a10b90555 100644
--- a/packages/i18n/src/locales/uk.i18n.json
+++ b/packages/i18n/src/locales/uk.i18n.json
@@ -2596,19 +2596,12 @@
   "Retail": "Роздрібна торгівля",
   "Retention_setting_changed_successfully": "Налаштування політики збереження успішно змінено",
   "RetentionPolicy": "Політика збереження",
-  "RetentionPolicy_AppliesToChannels": "Застосовується до каналів",
-  "RetentionPolicy_AppliesToDMs": "Застосовується до прямих повідомлень",
-  "RetentionPolicy_AppliesToGroups": "Застосовується до приватних груп",
   "RetentionPolicy_Description": "Автоматично скасовує старі повідомлення через екземпляр Rocket.Chat.",
   "RetentionPolicy_Enabled": "Увімкнено",
   "RetentionPolicy_ExcludePinned": "Виключити закріплені повідомлення",
   "RetentionPolicy_FilesOnly": "Видаляти лише файли",
   "RetentionPolicy_FilesOnly_Description": "Тільки файли будуть видалені, самі повідомлення залишиться на місці.",
   "RetentionPolicy_MaxAge": "Максимальний вік повідомлення",
-  "RetentionPolicy_MaxAge_Channels": "Максимальний вік повідомлення в каналах",
-  "RetentionPolicy_MaxAge_Description": "Обрізати всі повідомлення старше цього значення в днях",
-  "RetentionPolicy_MaxAge_DMs": "Максимальний вік повідомлення в прямому повідомленні",
-  "RetentionPolicy_MaxAge_Groups": "Максимальний вік повідомлення в приватних групах",
   "RetentionPolicy_Precision": "Таймер точності",
   "RetentionPolicy_Precision_Description": "Як часто слід запускати таймер шкури. Якщо встановити це значення на більш точне значення, канали з таймерами швидкого утримання працюватимуть краще, однак вони можуть призвести до додаткової потужності обробки великих спільнот.",
   "RetentionPolicy_RoomWarning": "Повідомлення, що перевищують {{time}}, автоматично скорочуються тут",
diff --git a/packages/i18n/src/locales/vi-VN.i18n.json b/packages/i18n/src/locales/vi-VN.i18n.json
index 2bda948a8692..2f11927a2baf 100644
--- a/packages/i18n/src/locales/vi-VN.i18n.json
+++ b/packages/i18n/src/locales/vi-VN.i18n.json
@@ -2160,19 +2160,12 @@
   "Retail": "Người bán lẻ",
   "Retention_setting_changed_successfully": "Đã thay đổi cài đặt chính sách lưu giữ thành công",
   "RetentionPolicy": "Duy trì chính sách",
-  "RetentionPolicy_AppliesToChannels": "Áp dụng cho kênh",
-  "RetentionPolicy_AppliesToDMs": "Áp dụng cho tin nhắn trực tiếp",
-  "RetentionPolicy_AppliesToGroups": "Áp dụng cho nhóm riêng tư",
   "RetentionPolicy_Description": "Tự động prunes tin nhắn cũ trên trường hợp Rocket.Chat của bạn.",
   "RetentionPolicy_Enabled": "Đã bật",
   "RetentionPolicy_ExcludePinned": "Loại trừ các thư đã ghim",
   "RetentionPolicy_FilesOnly": "Chỉ xóa tệp",
   "RetentionPolicy_FilesOnly_Description": "Chỉ các tệp sẽ bị xóa, bản thân thư sẽ vẫn được giữ nguyên.",
   "RetentionPolicy_MaxAge": "Độ tuổi tin nhắn tối đa",
-  "RetentionPolicy_MaxAge_Channels": "Độ tuổi tin nhắn tối đa trong các kênh",
-  "RetentionPolicy_MaxAge_Description": "Cắt bớt tất cả các thư cũ hơn giá trị này, trong ngày",
-  "RetentionPolicy_MaxAge_DMs": "Độ tuổi tin nhắn tối đa trong các tin nhắn trực tiếp",
-  "RetentionPolicy_MaxAge_Groups": "Độ tuổi tin nhắn tối đa trong các nhóm riêng tư",
   "RetentionPolicy_Precision": "Hẹn giờ chính xác",
   "RetentionPolicy_Precision_Description": "Tần suất bộ đếm thời gian prune sẽ chạy. Đặt giá trị này thành giá trị chính xác hơn giúp kênh có bộ hẹn giờ lưu trữ nhanh hoạt động tốt hơn, nhưng có thể tốn thêm sức mạnh xử lý trên các cộng đồng lớn.",
   "RetentionPolicy_RoomWarning": "Thư cũ hơn {{time}} được tự động cắt xén tại đây",
@@ -2864,4 +2857,4 @@
   "registration.component.form.sendConfirmationEmail": "Gửi email xác nhận",
   "Enterprise": "Doanh nghiệp",
   "UpgradeToGetMore_engagement-dashboard_Title": "phân tích"
-}
\ No newline at end of file
+}
diff --git a/packages/i18n/src/locales/zh-HK.i18n.json b/packages/i18n/src/locales/zh-HK.i18n.json
index 2cef151ef0bd..5d4087ead2b4 100644
--- a/packages/i18n/src/locales/zh-HK.i18n.json
+++ b/packages/i18n/src/locales/zh-HK.i18n.json
@@ -2084,19 +2084,12 @@
   "Retail": "零售",
   "Retention_setting_changed_successfully": "保留策略设置已成功更改",
   "RetentionPolicy": "保留政策",
-  "RetentionPolicy_AppliesToChannels": "适用于频道",
-  "RetentionPolicy_AppliesToDMs": "适用于直接消息",
-  "RetentionPolicy_AppliesToGroups": "适用于私人团体",
   "RetentionPolicy_Description": "自动修剪Rocket.Chat实例中的旧消息。",
   "RetentionPolicy_Enabled": "启用",
   "RetentionPolicy_ExcludePinned": "排除固定消息",
   "RetentionPolicy_FilesOnly": "只删除文件",
   "RetentionPolicy_FilesOnly_Description": "只删除文件，邮件本身将保留在原位。",
   "RetentionPolicy_MaxAge": "最大邮件年龄",
-  "RetentionPolicy_MaxAge_Channels": "频道中的最大消息时限",
-  "RetentionPolicy_MaxAge_Description": "修剪所有早于此值的邮件，以天为单位",
-  "RetentionPolicy_MaxAge_DMs": "直接消息中的最大消息时间",
-  "RetentionPolicy_MaxAge_Groups": "私人组中的最长邮件年龄",
   "RetentionPolicy_Precision": "定时精度",
   "RetentionPolicy_Precision_Description": "修剪计时器应该多久运行一次。将此设置为更精确的值会使具有快速保留计时器的通道更好地工作，但可能会对大型社区造成额外的处理能力。",
   "RetentionPolicy_RoomWarning": "超过 {{time}}  的邮件会在此处自动删除",
@@ -2785,4 +2778,4 @@
   "registration.component.form.sendConfirmationEmail": "已发送确认电子邮件",
   "Enterprise": "企业",
   "UpgradeToGetMore_engagement-dashboard_Title": "分析"
-}
\ No newline at end of file
+}
diff --git a/packages/i18n/src/locales/zh-TW.i18n.json b/packages/i18n/src/locales/zh-TW.i18n.json
index 93360b12c6b5..833c9f1e7561 100644
--- a/packages/i18n/src/locales/zh-TW.i18n.json
+++ b/packages/i18n/src/locales/zh-TW.i18n.json
@@ -3413,9 +3413,6 @@
   "RetentionPolicy_Advanced_Precision": "使用進階保留策略設置",
   "RetentionPolicy_Advanced_Precision_Cron": "使用進階保留政策計劃",
   "RetentionPolicy_Advanced_Precision_Cron_Description": "cron 工作表示法定義了修剪計時器應執行的頻率。將此值設置為更精確的值可使具有快速保留計時器的頻道做的更好，但可能會給大型社群帶來更重的處理能力。",
-  "RetentionPolicy_AppliesToChannels": "適用於頻道",
-  "RetentionPolicy_AppliesToDMs": "適用於直接消息",
-  "RetentionPolicy_AppliesToGroups": "適用於私人團體",
   "RetentionPolicy_Description": "自動修剪Rocket.Chat實例中的舊消息。",
   "RetentionPolicy_DoNotPruneDiscussion": "不修剪論壇訊息",
   "RetentionPolicy_DoNotPrunePinned": "不修剪釘選的訊息",
@@ -3425,10 +3422,6 @@
   "RetentionPolicy_FilesOnly": "只刪除檔案",
   "RetentionPolicy_FilesOnly_Description": "只刪除檔案，郵件本身將保留在原位。",
   "RetentionPolicy_MaxAge": "最大郵件年齡",
-  "RetentionPolicy_MaxAge_Channels": "頻道中的最大訊息時限",
-  "RetentionPolicy_MaxAge_Description": "修剪所有早於此值的郵件，以天為單位",
-  "RetentionPolicy_MaxAge_DMs": "直接訊息中的最大訊息時間",
-  "RetentionPolicy_MaxAge_Groups": "私人群組中的最長訊息年齡",
   "RetentionPolicy_Precision": "定時精度",
   "RetentionPolicy_Precision_Description": "修剪計時器應該多久運行一次。將此設置為更精確的值會使具有快速保留計時器的通道更好地工作，但可能會對大型社區造成額外的處理能力。",
   "RetentionPolicy_RoomWarning": "超過 {{time}}  的郵件會在此處自動刪除",
diff --git a/packages/i18n/src/locales/zh.i18n.json b/packages/i18n/src/locales/zh.i18n.json
index 2445fd2b3b08..a302dcf6ce14 100644
--- a/packages/i18n/src/locales/zh.i18n.json
+++ b/packages/i18n/src/locales/zh.i18n.json
@@ -3097,9 +3097,6 @@
   "RetentionPolicy_Advanced_Precision": "使用高级保留策略配置",
   "RetentionPolicy_Advanced_Precision_Cron": "使用高级保留策略任务计划",
   "RetentionPolicy_Advanced_Precision_Cron_Description": "使用 cron 任务表达式定义修剪定时器运行频度，将此设置为更精确的值会使具有快速保留计时器的频道更好地工作，但对大型社区可能会消耗额外的处理能力。",
-  "RetentionPolicy_AppliesToChannels": "适用于频道",
-  "RetentionPolicy_AppliesToDMs": "适用于私聊消息",
-  "RetentionPolicy_AppliesToGroups": "适用于私人组",
   "RetentionPolicy_Description": "自动修剪 Rocket.Chat 实例中的旧消息。",
   "RetentionPolicy_DoNotPruneDiscussion": "不修剪讨论消息",
   "RetentionPolicy_DoNotPrunePinned": "不修剪已固定的消息",
@@ -3109,10 +3106,6 @@
   "RetentionPolicy_FilesOnly": "只删除文件",
   "RetentionPolicy_FilesOnly_Description": "只有文件会被删除，消息本身将保留在原位。",
   "RetentionPolicy_MaxAge": "消息保持时限",
-  "RetentionPolicy_MaxAge_Channels": "频道中的消息保持时限",
-  "RetentionPolicy_MaxAge_Description": "修剪所有早于此值的消息，以天为单位",
-  "RetentionPolicy_MaxAge_DMs": "私聊消息最大年龄",
-  "RetentionPolicy_MaxAge_Groups": "私人组中的消息最大年龄",
   "RetentionPolicy_Precision": "定时精度",
   "RetentionPolicy_Precision_Description": "修剪计时器应该多久运行一次。将此设置为更精确的值会使具有快速保留计时器的频道更好地工作，但对大型社区可能会消耗额外的处理能力。",
   "RetentionPolicy_RoomWarning": "此会话中超过 {{time}} 的消息将会自动删除",

From e3b312326f2b3ec985b1b93a0187ca4f3c5bb589 Mon Sep 17 00:00:00 2001
From: Martin Schoeler <martin.schoeler@rocket.chat>
Date: Thu, 20 Jun 2024 23:38:16 -0300
Subject: [PATCH 57/94] fix: saveSettings endpoint allowing NaN to be stored on
 Int settings (#32428)

Co-authored-by: Kevin Aleman <kaleman960@gmail.com>
Co-authored-by: Matheus Barbosa Silva <36537004+matheusbsilva137@users.noreply.github.com>
Co-authored-by: Guilherme Gazzo <guilhermegazzo@gmail.com>
---
 .changeset/happy-windows-drum.md              |  5 ++
 .../app/lib/server/methods/saveSettings.ts    |  6 ++
 apps/meteor/tests/e2e/page-objects/admin.ts   |  4 ++
 apps/meteor/tests/e2e/settings-int.spec.ts    | 25 +++++++
 .../meteor/tests/end-to-end/api/24-methods.js | 65 +++++++++++++++++++
 5 files changed, 105 insertions(+)
 create mode 100644 .changeset/happy-windows-drum.md
 create mode 100644 apps/meteor/tests/e2e/settings-int.spec.ts

diff --git a/.changeset/happy-windows-drum.md b/.changeset/happy-windows-drum.md
new file mode 100644
index 000000000000..3fc0c7ec8c3a
--- /dev/null
+++ b/.changeset/happy-windows-drum.md
@@ -0,0 +1,5 @@
+---
+"@rocket.chat/meteor": patch
+---
+
+Fixed an issue that allowed saveSettings method to save NaN values on numeric settings.
diff --git a/apps/meteor/app/lib/server/methods/saveSettings.ts b/apps/meteor/app/lib/server/methods/saveSettings.ts
index 7c6a2a801361..8c4f92cfb88f 100644
--- a/apps/meteor/app/lib/server/methods/saveSettings.ts
+++ b/apps/meteor/app/lib/server/methods/saveSettings.ts
@@ -85,6 +85,12 @@ Meteor.methods<ServerMethods>({
 						case 'timespan':
 						case 'int':
 							check(value, Number);
+							if (!Number.isInteger(value)) {
+								throw new Meteor.Error(`Invalid setting value ${value}`, 'Invalid setting value', {
+									method: 'saveSettings',
+								});
+							}
+
 							break;
 						case 'multiSelect':
 							check(value, Array);
diff --git a/apps/meteor/tests/e2e/page-objects/admin.ts b/apps/meteor/tests/e2e/page-objects/admin.ts
index 43f33d3a3359..af0aa7a430ed 100644
--- a/apps/meteor/tests/e2e/page-objects/admin.ts
+++ b/apps/meteor/tests/e2e/page-objects/admin.ts
@@ -28,6 +28,10 @@ export class Admin {
 		return this.page.locator('button >> text="Save"');
 	}
 
+	get btnSaveSettings(): Locator {
+		return this.page.getByRole('button', { name: 'Save changes' });
+	}
+
 	get btnEdit(): Locator {
 		return this.page.locator('button >> text="Edit"');
 	}
diff --git a/apps/meteor/tests/e2e/settings-int.spec.ts b/apps/meteor/tests/e2e/settings-int.spec.ts
new file mode 100644
index 000000000000..2403c61853fc
--- /dev/null
+++ b/apps/meteor/tests/e2e/settings-int.spec.ts
@@ -0,0 +1,25 @@
+import { Users } from './fixtures/userStates';
+import { Admin } from './page-objects';
+import { test, expect } from './utils/test';
+
+test.use({ storageState: Users.admin.state });
+
+test.describe.serial('settings-int', () => {
+	let poAdmin: Admin;
+
+	test.beforeEach(async ({ page }) => {
+		poAdmin = new Admin(page);
+		await page.goto('/admin/settings/Message');
+
+		await expect(page.locator('[data-qa-type="PageHeader-title"]')).toHaveText('Message');
+	});
+
+	test('expect not being able to set int value as empty string', async ({ page }) => {
+		await page.locator('#Message_AllowEditing_BlockEditInMinutes').fill('');
+		await page.locator('#Message_AllowEditing_BlockEditInMinutes').blur();
+
+		await poAdmin.btnSaveSettings.click();
+
+		await expect(page.locator('.rcx-toastbar.rcx-toastbar--error')).toBeVisible();
+	});
+});
diff --git a/apps/meteor/tests/end-to-end/api/24-methods.js b/apps/meteor/tests/end-to-end/api/24-methods.js
index b9705aa599e1..dc1d506f1317 100644
--- a/apps/meteor/tests/end-to-end/api/24-methods.js
+++ b/apps/meteor/tests/end-to-end/api/24-methods.js
@@ -3108,4 +3108,69 @@ describe('Meteor.methods', function () {
 			});
 		});
 	});
+
+	describe('[@saveSettings]', () => {
+		it('should return an error when trying to save a "NaN" value', () => {
+			request
+				.post(api('method.call/saveSettings'))
+				.set(credentials)
+				.send({
+					message: JSON.stringify({
+						msg: 'method',
+						id: '13',
+						method: 'saveSettings',
+						params: [[{ _id: 'Message_AllowEditing_BlockEditInMinutes', value: { $InfNaN: 0 } }]],
+					}),
+				})
+				.expect(200)
+				.expect((res) => {
+					expect(res.body).to.have.property('success', true);
+					const parsedBody = JSON.parse(res.body.message);
+					expect(parsedBody).to.have.property('error');
+					expect(parsedBody.error).to.have.property('error', 'Invalid setting value NaN');
+				});
+		});
+
+		it('should return an error when trying to save a "Infinity" value', () => {
+			request
+				.post(api('method.call/saveSettings'))
+				.set(credentials)
+				.send({
+					message: JSON.stringify({
+						msg: 'method',
+						id: '13',
+						method: 'saveSettings',
+						params: [[{ _id: 'Message_AllowEditing_BlockEditInMinutes', value: { $InfNaN: 1 } }]],
+					}),
+				})
+				.expect(200)
+				.expect((res) => {
+					expect(res.body).to.have.property('success', true);
+					const parsedBody = JSON.parse(res.body.message);
+					expect(parsedBody).to.have.property('error');
+					expect(parsedBody.error).to.have.property('error', 'Invalid setting value Infinity');
+				});
+		});
+
+		it('should return an error when trying to save a "-Infinity" value', () => {
+			request
+				.post(api('method.call/saveSettings'))
+				.set(credentials)
+				.send({
+					message: JSON.stringify({
+						msg: 'method',
+						id: '13',
+						method: 'saveSettings',
+						params: [[{ _id: 'Message_AllowEditing_BlockEditInMinutes', value: { $InfNaN: -1 } }]],
+					}),
+				})
+				.expect(200)
+				.expect((res) => {
+					expect(res.body).to.have.property('success', true);
+					const parsedBody = JSON.parse(res.body.message);
+					expect(parsedBody).to.have.property('error');
+					expect(parsedBody.error).to.have.property('error', 'Invalid setting value -Infinity');
+				});
+		});
+	});
 });

From 363a0114875e3b06d6e368b5e3e5837c1d105801 Mon Sep 17 00:00:00 2001
From: Matheus Barbosa Silva
 <36537004+matheusbsilva137@users.noreply.github.com>
Date: Thu, 20 Jun 2024 23:38:48 -0300
Subject: [PATCH 58/94] feat: Add LDAP group validation strategy setting to
 channels and roles sync (#32436)

Co-authored-by: Pierre Lehnen <55164754+pierre-lehnen-rc@users.noreply.github.com>
---
 .changeset/mighty-oranges-wait.md         |   6 +
 apps/meteor/ee/server/lib/ldap/Manager.ts | 186 ++++++++++++----------
 apps/meteor/ee/server/settings/ldap.ts    |  28 +++-
 packages/i18n/src/locales/en.i18n.json    |   6 +
 4 files changed, 137 insertions(+), 89 deletions(-)
 create mode 100644 .changeset/mighty-oranges-wait.md

diff --git a/.changeset/mighty-oranges-wait.md b/.changeset/mighty-oranges-wait.md
new file mode 100644
index 000000000000..888a013d54ae
--- /dev/null
+++ b/.changeset/mighty-oranges-wait.md
@@ -0,0 +1,6 @@
+---
+"@rocket.chat/meteor": minor
+"@rocket.chat/i18n": minor
+---
+
+Added a "LDAP group validation strategy" setting to LDAP channels and roles sync in order to enable faster syncs
diff --git a/apps/meteor/ee/server/lib/ldap/Manager.ts b/apps/meteor/ee/server/lib/ldap/Manager.ts
index b99b6b08cbed..eb96784c264f 100644
--- a/apps/meteor/ee/server/lib/ldap/Manager.ts
+++ b/apps/meteor/ee/server/lib/ldap/Manager.ts
@@ -219,6 +219,7 @@ export class LDAPEEManager extends LDAPManager {
 		const syncUserRolesFieldMap = (settings.get<string>('LDAP_Sync_User_Data_RolesMap') ?? '').trim();
 		const syncUserRolesFilter = (settings.get<string>('LDAP_Sync_User_Data_Roles_Filter') ?? '').trim();
 		const syncUserRolesBaseDN = (settings.get<string>('LDAP_Sync_User_Data_Roles_BaseDN') ?? '').trim();
+		const searchStrategy = settings.get<'once' | 'each_group'>('LDAP_Sync_User_Data_Roles_GroupMembershipValidationStrategy');
 
 		if (!shouldSyncUserRoles || !syncUserRolesFieldMap) {
 			logger.debug('not syncing user roles');
@@ -239,42 +240,46 @@ export class LDAPEEManager extends LDAPManager {
 			return;
 		}
 
-		const fieldMap = this.parseJson(syncUserRolesFieldMap);
-		if (!fieldMap) {
+		const groupsToRolesMap = this.parseJson(syncUserRolesFieldMap);
+		if (!groupsToRolesMap) {
 			logger.debug('missing group role mapping');
 			return;
 		}
 
-		const ldapFields = Object.keys(fieldMap);
+		const ldapGroups = Object.keys(groupsToRolesMap);
 		const roleList: Array<IRole['_id']> = [];
-		const allowedRoles: Array<IRole['_id']> = [];
-
-		for await (const ldapField of ldapFields) {
-			if (!fieldMap[ldapField]) {
-				continue;
-			}
-
-			const userFields = ensureArray<string>(fieldMap[ldapField]);
-
-			for await (const userField of userFields) {
-				const [roleIdOrName] = userField.split(/\.(.+)/);
-
+		const roleIdsList: Array<IRole['_id']> = [];
+		const allowedRoles: Array<IRole['_id']> = this.getDataMappedByLdapGroups(groupsToRolesMap, ldapGroups)
+			.map((role) => role.split(/\.(.+)/)[0])
+			.reduce((allowedRolesIds: string[], roleIdOrName: string) => {
 				const role = roles.find((role) => role._id === roleIdOrName) ?? roles.find((role) => role.name === roleIdOrName);
-
 				if (role) {
-					allowedRoles.push(role._id);
+					allowedRolesIds.push(role._id);
 				}
-
-				if (await this.isUserInGroup(ldap, syncUserRolesBaseDN, syncUserRolesFilter, { dn, username }, ldapField)) {
-					if (role) {
-						roleList.push(role._id);
-					}
-					continue;
+				return allowedRolesIds;
+			}, []);
+
+		if (searchStrategy === 'once') {
+			const ldapUserGroups = await this.getLdapGroupsByUsername(ldap, username, dn, syncUserRolesBaseDN, syncUserRolesFilter);
+			roleList.push(...this.getDataMappedByLdapGroups(groupsToRolesMap, ldapUserGroups));
+		} else if (searchStrategy === 'each_group') {
+			for await (const ldapGroup of ldapGroups) {
+				if (await this.isUserInGroup(ldap, syncUserRolesBaseDN, syncUserRolesFilter, { dn, username }, ldapGroup)) {
+					roleList.push(...ensureArray<string>(groupsToRolesMap[ldapGroup]));
 				}
 			}
 		}
 
-		await syncUserRoles(user._id, roleList, {
+		for await (const nonValidatedRole of roleList) {
+			const [roleIdOrName] = nonValidatedRole.split(/\.(.+)/);
+
+			const role = roles.find((role) => role._id === roleIdOrName) ?? roles.find((role) => role.name === roleIdOrName);
+			if (role) {
+				roleIdsList.push(role._id);
+			}
+		}
+
+		await syncUserRoles(user._id, roleIdsList, {
 			allowedRoles,
 			skipRemovingRoles: !syncUserRolesAutoRemove,
 		});
@@ -305,14 +310,15 @@ export class LDAPEEManager extends LDAPManager {
 		const syncUserChannelsFieldMap = (settings.get<string>('LDAP_Sync_User_Data_ChannelsMap') ?? '').trim();
 		const syncUserChannelsFilter = (settings.get<string>('LDAP_Sync_User_Data_Channels_Filter') ?? '').trim();
 		const syncUserChannelsBaseDN = (settings.get<string>('LDAP_Sync_User_Data_Channels_BaseDN') ?? '').trim();
+		const searchStrategy = settings.get<'once' | 'each_group'>('LDAP_Sync_User_Data_Channels_GroupMembershipValidationStrategy');
 
 		if (!syncUserChannels || !syncUserChannelsFieldMap) {
 			logger.debug('not syncing groups to channels');
 			return;
 		}
 
-		const fieldMap = this.parseJson(syncUserChannelsFieldMap);
-		if (!fieldMap) {
+		const groupsToRoomsMap = this.parseJson(syncUserChannelsFieldMap);
+		if (!groupsToRoomsMap) {
 			logger.debug('missing group channel mapping');
 			return;
 		}
@@ -323,56 +329,61 @@ export class LDAPEEManager extends LDAPManager {
 		}
 
 		logger.debug('syncing user channels');
-		const ldapFields = Object.keys(fieldMap);
+		const ldapGroups = Object.keys(groupsToRoomsMap);
+		const ldapUserGroups: string[] = [];
 		const channelsToAdd = new Set<string>();
-		const channelsToRemove = new Set<string>();
-
-		for await (const ldapField of ldapFields) {
-			if (!fieldMap[ldapField]) {
-				continue;
+		const userChannelsNames: string[] = [];
+
+		if (searchStrategy === 'once') {
+			ldapUserGroups.push(...(await this.getLdapGroupsByUsername(ldap, username, dn, syncUserChannelsBaseDN, syncUserChannelsFilter)));
+			userChannelsNames.push(...this.getDataMappedByLdapGroups(groupsToRoomsMap, ldapUserGroups));
+		} else if (searchStrategy === 'each_group') {
+			for await (const ldapGroup of ldapGroups) {
+				if (await this.isUserInGroup(ldap, syncUserChannelsBaseDN, syncUserChannelsFilter, { dn, username }, ldapGroup)) {
+					userChannelsNames.push(...ensureArray<string>(groupsToRoomsMap[ldapGroup]));
+					ldapUserGroups.push(ldapGroup);
+				}
 			}
+		}
 
-			const isUserInGroup = await this.isUserInGroup(ldap, syncUserChannelsBaseDN, syncUserChannelsFilter, { dn, username }, ldapField);
-
-			const channels: Array<string> = [].concat(fieldMap[ldapField]);
-			for await (const channel of channels) {
-				try {
-					const name = await getValidRoomName(channel.trim(), undefined, { allowDuplicates: true });
-					const room = (await Rooms.findOneByNonValidatedName(name)) || (await this.createRoomForSync(channel));
-					if (!room) {
-						return;
-					}
+		for await (const userChannelName of userChannelsNames) {
+			try {
+				const name = await getValidRoomName(userChannelName.trim(), undefined, { allowDuplicates: true });
+				const room = (await Rooms.findOneByNonValidatedName(name)) || (await this.createRoomForSync(userChannelName));
+				if (!room) {
+					return;
+				}
 
-					if (isUserInGroup) {
-						if (room.teamMain) {
-							logger.error(`Can't add user to channel ${channel} because it is a team.`);
-						} else {
-							channelsToAdd.add(room._id);
-						}
-					} else if (syncUserChannelsRemove && !room.teamMain) {
-						channelsToRemove.add(room._id);
-					}
-				} catch (e) {
-					logger.debug(`Failed to sync user room, user = ${username}, channel = ${channel}`);
-					logger.error(e);
+				if (room.teamMain) {
+					logger.error(`Can't add user to channel ${userChannelName} because it is a team.`);
+				} else {
+					channelsToAdd.add(room._id);
+					await addUserToRoom(room._id, user);
+					logger.debug(`Synced user channel ${room._id} from LDAP for ${username}`);
 				}
+			} catch (e) {
+				logger.debug(`Failed to sync user room, user = ${username}, channel = ${userChannelName}`);
+				logger.error(e);
 			}
 		}
 
-		for await (const rid of channelsToAdd) {
-			await addUserToRoom(rid, user);
-			logger.debug(`Synced user channel ${rid} from LDAP for ${username}`);
-		}
+		if (syncUserChannelsRemove) {
+			const notInUserGroups = ldapGroups.filter((ldapGroup) => !ldapUserGroups.includes(ldapGroup));
+			const notMappedRooms = this.getDataMappedByLdapGroups(groupsToRoomsMap, notInUserGroups);
 
-		for await (const rid of channelsToRemove) {
-			if (channelsToAdd.has(rid)) {
-				return;
-			}
+			const roomsToRemove = new Set<string>(notMappedRooms);
+			for await (const roomName of roomsToRemove) {
+				const name = await getValidRoomName(roomName.trim(), undefined, { allowDuplicates: true });
+				const room = await Rooms.findOneByNonValidatedName(name);
+				if (!room || room.teamMain || channelsToAdd.has(room._id)) {
+					return;
+				}
 
-			const subscription = await SubscriptionsRaw.findOneByRoomIdAndUserId(rid, user._id);
-			if (subscription) {
-				await removeUserFromRoom(rid, user);
-				logger.debug(`Removed user ${username} from channel ${rid}`);
+				const subscription = await SubscriptionsRaw.findOneByRoomIdAndUserId(room._id, user._id);
+				if (subscription) {
+					await removeUserFromRoom(room._id, user);
+					logger.debug(`Removed user ${username} from channel ${room._id}`);
+				}
 			}
 		}
 	}
@@ -389,7 +400,10 @@ export class LDAPEEManager extends LDAPManager {
 			return;
 		}
 
-		const ldapUserTeams = await this.getLdapTeamsByUsername(ldap, user.username, dn);
+		const baseDN = (settings.get<string>('LDAP_Teams_BaseDN') ?? '').trim() || ldap.options.baseDN;
+		const filter = settings.get<string>('LDAP_Query_To_Get_User_Teams');
+		const groupAttributeName = settings.get<string>('LDAP_Teams_Name_Field');
+		const ldapUserTeams = await this.getLdapGroupsByUsername(ldap, user.username, dn, baseDN, filter, groupAttributeName);
 		const mapJson = settings.get<string>('LDAP_Groups_To_Rocket_Chat_Teams');
 		if (!mapJson) {
 			return;
@@ -399,7 +413,7 @@ export class LDAPEEManager extends LDAPManager {
 			return;
 		}
 
-		const teamNames = this.getRocketChatTeamsByLdapTeams(map, ldapUserTeams);
+		const teamNames = this.getDataMappedByLdapGroups(map, ldapUserTeams);
 
 		const allTeamNames = [...new Set(Object.values(map).flat())];
 		const allTeams = await Team.listByNames(allTeamNames, { projection: { _id: 1, name: 1 } });
@@ -420,39 +434,41 @@ export class LDAPEEManager extends LDAPManager {
 		}
 	}
 
-	private static getRocketChatTeamsByLdapTeams(mappedTeams: Record<string, string>, ldapUserTeams: Array<string>): Array<string> {
-		const mappedLdapTeams = Object.keys(mappedTeams);
-		const filteredTeams = ldapUserTeams.filter((ldapTeam) => mappedLdapTeams.includes(ldapTeam));
+	private static getDataMappedByLdapGroups(map: Record<string, string>, ldapGroups: Array<string>): Array<string> {
+		const mappedLdapGroups = Object.keys(map);
+		const filteredMappedLdapGroups = ldapGroups.filter((ldapGroup) => mappedLdapGroups.includes(ldapGroup));
 
-		if (filteredTeams.length < ldapUserTeams.length) {
-			const unmappedLdapTeams = ldapUserTeams.filter((ldapTeam) => !mappedLdapTeams.includes(ldapTeam));
-			logger.error(`The following LDAP teams are not mapped in Rocket.Chat: "${unmappedLdapTeams.join(', ')}".`);
+		if (filteredMappedLdapGroups.length < ldapGroups.length) {
+			const unmappedLdapGroups = ldapGroups.filter((ldapGroup) => !mappedLdapGroups.includes(ldapGroup));
+			logger.error(`The following LDAP groups are not mapped in Rocket.Chat: "${unmappedLdapGroups.join(', ')}".`);
 		}
 
-		if (!filteredTeams.length) {
+		if (!filteredMappedLdapGroups.length) {
 			return [];
 		}
 
-		return [...new Set(filteredTeams.map((ldapTeam) => mappedTeams[ldapTeam]).flat())];
+		return [...new Set(filteredMappedLdapGroups.map((ldapGroup) => map[ldapGroup]).flat())];
 	}
 
-	private static async getLdapTeamsByUsername(ldap: LDAPConnection, username: string, dn: string): Promise<Array<string>> {
-		const baseDN = (settings.get<string>('LDAP_Teams_BaseDN') ?? '').trim() || ldap.options.baseDN;
-		const query = settings.get<string>('LDAP_Query_To_Get_User_Teams');
-		if (!query) {
+	private static async getLdapGroupsByUsername(
+		ldap: LDAPConnection,
+		username: string,
+		userDN: string,
+		baseDN: string,
+		filter: string,
+		groupAttributeName?: string,
+	): Promise<Array<string>> {
+		if (!filter) {
 			return [];
 		}
 
 		const searchOptions = {
-			filter: query.replace(/#{username}/g, username).replace(/#{userdn}/g, dn.replace(/\\/g, '\\5c')),
+			filter: filter.replace(/#{username}/g, username).replace(/#{userdn}/g, userDN.replace(/\\/g, '\\5c')),
 			scope: ldap.options.userSearchScope || 'sub',
 			sizeLimit: ldap.options.searchSizeLimit,
 		};
 
-		const attributeNames = (settings.get<string>('LDAP_Teams_Name_Field') ?? '').split(',').map((attributeName) => attributeName.trim());
-		if (!attributeNames.length) {
-			attributeNames.push('ou');
-		}
+		const attributeNames = groupAttributeName ? groupAttributeName.split(',').map((attributeName) => attributeName.trim()) : ['ou', 'cn'];
 
 		const ldapUserGroups = await ldap.searchRaw(baseDN, searchOptions);
 		if (!Array.isArray(ldapUserGroups)) {
diff --git a/apps/meteor/ee/server/settings/ldap.ts b/apps/meteor/ee/server/settings/ldap.ts
index f85f67a40641..d026d913be9d 100644
--- a/apps/meteor/ee/server/settings/ldap.ts
+++ b/apps/meteor/ee/server/settings/ldap.ts
@@ -157,13 +157,23 @@ export function addSettings(): Promise<void> {
 						invalidValue: false,
 					});
 
-					await this.add('LDAP_Sync_User_Data_Roles_Filter', '(&(cn=#{groupName})(memberUid=#{username}))', {
+					await this.add('LDAP_Sync_User_Data_Roles_BaseDN', '', {
 						type: 'string',
 						enableQuery: syncRolesQuery,
 						invalidValue: '',
 					});
 
-					await this.add('LDAP_Sync_User_Data_Roles_BaseDN', '', {
+					await this.add('LDAP_Sync_User_Data_Roles_GroupMembershipValidationStrategy', 'each_group', {
+						type: 'select',
+						values: [
+							{ key: 'each_group', i18nLabel: 'LDAP_Sync_User_Data_GroupMembershipValidationStrategy_EachGroup' },
+							{ key: 'once', i18nLabel: 'LDAP_Sync_User_Data_GroupMembershipValidationStrategy_Once' },
+						],
+						enableQuery: syncRolesQuery,
+						invalidValue: 'each_group',
+					});
+
+					await this.add('LDAP_Sync_User_Data_Roles_Filter', '(&(cn=#{groupName})(memberUid=#{username}))', {
 						type: 'string',
 						enableQuery: syncRolesQuery,
 						invalidValue: '',
@@ -194,13 +204,23 @@ export function addSettings(): Promise<void> {
 						invalidValue: 'rocket.cat',
 					});
 
-					await this.add('LDAP_Sync_User_Data_Channels_Filter', '(&(cn=#{groupName})(memberUid=#{username}))', {
+					await this.add('LDAP_Sync_User_Data_Channels_BaseDN', '', {
 						type: 'string',
 						enableQuery: syncChannelsQuery,
 						invalidValue: '',
 					});
 
-					await this.add('LDAP_Sync_User_Data_Channels_BaseDN', '', {
+					await this.add('LDAP_Sync_User_Data_Channels_GroupMembershipValidationStrategy', 'each_group', {
+						type: 'select',
+						values: [
+							{ key: 'each_group', i18nLabel: 'LDAP_Sync_User_Data_GroupMembershipValidationStrategy_EachGroup' },
+							{ key: 'once', i18nLabel: 'LDAP_Sync_User_Data_GroupMembershipValidationStrategy_Once' },
+						],
+						enableQuery: syncChannelsQuery,
+						invalidValue: 'each_group',
+					});
+
+					await this.add('LDAP_Sync_User_Data_Channels_Filter', '(&(cn=#{groupName})(memberUid=#{username}))', {
 						type: 'string',
 						enableQuery: syncChannelsQuery,
 						invalidValue: '',
diff --git a/packages/i18n/src/locales/en.i18n.json b/packages/i18n/src/locales/en.i18n.json
index 2d67fa8723b7..61b407d516fe 100644
--- a/packages/i18n/src/locales/en.i18n.json
+++ b/packages/i18n/src/locales/en.i18n.json
@@ -3097,15 +3097,21 @@
   "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",

From 5f95c4ec6b5e6417ea46db3ef33db89930fe0a78 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrique=20Guimar=C3=A3es=20Ribeiro?=
 <henrique.jobs1@gmail.com>
Date: Thu, 20 Jun 2024 23:54:29 -0300
Subject: [PATCH 59/94] feat: New users page pending tab (#31987)

Co-authored-by: Tasso <tasso.evangelista@rocket.chat>
---
 .changeset/metal-candles-float.md             |  13 ++
 apps/meteor/app/api/server/lib/users.ts       |   1 +
 .../client/components/Page/PageHeader.tsx     |  12 +-
 .../client/components/UserInfo/UserInfo.tsx   |  49 +++---
 .../hooks/useLicenseLimitsByBehavior.ts       |  63 ++++++++
 .../SubscriptionCalloutLimits.tsx             |  68 ++------
 .../admin/users/AdminUserInfoWithData.tsx     |   5 +-
 .../views/admin/users/AdminUsersPage.tsx      |  58 ++++++-
 .../UserPageHeaderContentWithSeatsCap.tsx     |  16 +-
 .../admin/users/UsersTable/UsersTable.tsx     |  57 +++----
 .../admin/users/UsersTable/UsersTableRow.tsx  | 146 ++++++++++++++----
 .../admin/users/hooks/usePendingUsersCount.ts |  25 +++
 .../hooks/useSendWelcomeEmailMutation.ts      |  29 ++++
 packages/core-typings/src/IUser.ts            |   3 +-
 packages/i18n/src/locales/en.i18n.json        |   7 +
 packages/rest-typings/src/v1/Ajv.ts           |   7 +
 packages/rest-typings/src/v1/users.ts         |   2 +-
 .../users/UsersSendWelcomeEmailParamsPOST.ts  |   2 +-
 18 files changed, 408 insertions(+), 155 deletions(-)
 create mode 100644 .changeset/metal-candles-float.md
 create mode 100644 apps/meteor/client/hooks/useLicenseLimitsByBehavior.ts
 create mode 100644 apps/meteor/client/views/admin/users/hooks/usePendingUsersCount.ts
 create mode 100644 apps/meteor/client/views/admin/users/hooks/useSendWelcomeEmailMutation.ts

diff --git a/.changeset/metal-candles-float.md b/.changeset/metal-candles-float.md
new file mode 100644
index 000000000000..256e6c3ac7d2
--- /dev/null
+++ b/.changeset/metal-candles-float.md
@@ -0,0 +1,13 @@
+---
+"@rocket.chat/meteor": minor
+"@rocket.chat/core-typings": patch
+"@rocket.chat/i18n": patch
+---
+
+Implemented a new "Pending Users" tab on the users page to list users who have not yet been activated and/or have not logged in for the first time. 
+Additionally, added a "Pending Action" column to aid administrators in identifying necessary actions for each user. Incorporated a "Reason for Joining" field 
+into the user info contextual bar, along with a callout for exceeding the seats cap in the users page header. Finally, introduced a new logic to disable user creation buttons upon surpassing the seats cap.
+
+
+
+
diff --git a/apps/meteor/app/api/server/lib/users.ts b/apps/meteor/app/api/server/lib/users.ts
index f80d662771df..a912043fc656 100644
--- a/apps/meteor/app/api/server/lib/users.ts
+++ b/apps/meteor/app/api/server/lib/users.ts
@@ -154,6 +154,7 @@ export async function findPaginatedUsersByStatus({
 		lastLogin: 1,
 		type: 1,
 		reason: 1,
+		federated: 1,
 	};
 
 	const actualSort: Record<string, 1 | -1> = sort || { username: 1 };
diff --git a/apps/meteor/client/components/Page/PageHeader.tsx b/apps/meteor/client/components/Page/PageHeader.tsx
index 197592d3e98c..4549c69dccec 100644
--- a/apps/meteor/client/components/Page/PageHeader.tsx
+++ b/apps/meteor/client/components/Page/PageHeader.tsx
@@ -24,12 +24,20 @@ const PageHeader: FC<PageHeaderProps> = ({ children = undefined, title, onClickB
 		<Box
 			is='header'
 			borderBlockEndWidth='default'
-			minHeight='x64'
 			pb={8}
 			borderBlockEndColor={borderBlockEndColor ?? border ? 'extra-light' : 'transparent'}
 			{...props}
 		>
-			<Box height='100%' marginInline={24} display='flex' flexDirection='row' flexWrap='wrap' alignItems='center' color='default'>
+			<Box
+				height='100%'
+				marginInline={24}
+				minHeight='x64'
+				display='flex'
+				flexDirection='row'
+				flexWrap='wrap'
+				alignItems='center'
+				color='default'
+			>
 				{isMobile && (
 					<HeaderToolbar>
 						<SidebarToggler />
diff --git a/apps/meteor/client/components/UserInfo/UserInfo.tsx b/apps/meteor/client/components/UserInfo/UserInfo.tsx
index 025889edc7cd..a4656373b488 100644
--- a/apps/meteor/client/components/UserInfo/UserInfo.tsx
+++ b/apps/meteor/client/components/UserInfo/UserInfo.tsx
@@ -39,6 +39,7 @@ type UserInfoProps = UserInfoDataProps & {
 	verified?: boolean;
 	actions: ReactElement;
 	roles: ReactElement[];
+	reason?: string;
 };
 
 const UserInfo = ({
@@ -59,6 +60,7 @@ const UserInfo = ({
 	customFields,
 	canViewAllInfo,
 	actions,
+	reason,
 	...props
 }: UserInfoProps): ReactElement => {
 	const t = useTranslation();
@@ -79,53 +81,47 @@ const UserInfo = ({
 
 				<InfoPanel.Section>
 					{userDisplayName && <InfoPanel.Title icon={status} title={userDisplayName} />}
+
 					{statusText && (
 						<InfoPanel.Text>
-							<MarkdownText content={statusText} parseEmoji={true} />
+							<MarkdownText content={statusText} parseEmoji={true} variant='inline' />
 						</InfoPanel.Text>
 					)}
 				</InfoPanel.Section>
 
 				<InfoPanel.Section>
-					{roles.length !== 0 && (
+					{reason && (
 						<InfoPanel.Field>
-							<InfoPanel.Label>{t('Roles')}</InfoPanel.Label>
-							<UserCardRoles>{roles}</UserCardRoles>
+							<InfoPanel.Label>{t('Reason_for_joining')}</InfoPanel.Label>
+							<InfoPanel.Text>{reason}</InfoPanel.Text>
 						</InfoPanel.Field>
 					)}
 
-					{Number.isInteger(utcOffset) && (
-						<InfoPanel.Field>
-							<InfoPanel.Label>{t('Local_Time')}</InfoPanel.Label>
-							<InfoPanel.Text>{utcOffset && <UTCClock utcOffset={utcOffset} />}</InfoPanel.Text>
-						</InfoPanel.Field>
-					)}
-
-					{username && username !== name && (
+					{nickname && (
 						<InfoPanel.Field>
-							<InfoPanel.Label>{t('Username')}</InfoPanel.Label>
-							<InfoPanel.Text data-qa='UserInfoUserName'>{username}</InfoPanel.Text>
+							<InfoPanel.Label>{t('Nickname')}</InfoPanel.Label>
+							<InfoPanel.Text>{nickname}</InfoPanel.Text>
 						</InfoPanel.Field>
 					)}
 
-					{canViewAllInfo && (
+					{roles.length !== 0 && (
 						<InfoPanel.Field>
-							<InfoPanel.Label>{t('Last_login')}</InfoPanel.Label>
-							<InfoPanel.Text>{lastLogin ? timeAgo(lastLogin) : t('Never')}</InfoPanel.Text>
+							<InfoPanel.Label>{t('Roles')}</InfoPanel.Label>
+							<UserCardRoles>{roles}</UserCardRoles>
 						</InfoPanel.Field>
 					)}
 
-					{name && (
+					{username && username !== name && (
 						<InfoPanel.Field>
-							<InfoPanel.Label>{t('Full_Name')}</InfoPanel.Label>
-							<InfoPanel.Text>{name}</InfoPanel.Text>
+							<InfoPanel.Label>{t('Username')}</InfoPanel.Label>
+							<InfoPanel.Text data-qa='UserInfoUserName'>{username}</InfoPanel.Text>
 						</InfoPanel.Field>
 					)}
 
-					{nickname && (
+					{Number.isInteger(utcOffset) && (
 						<InfoPanel.Field>
-							<InfoPanel.Label>{t('Nickname')}</InfoPanel.Label>
-							<InfoPanel.Text>{nickname}</InfoPanel.Text>
+							<InfoPanel.Label>{t('Local_Time')}</InfoPanel.Label>
+							<InfoPanel.Text>{utcOffset && <UTCClock utcOffset={utcOffset} />}</InfoPanel.Text>
 						</InfoPanel.Field>
 					)}
 
@@ -138,6 +134,13 @@ const UserInfo = ({
 						</InfoPanel.Field>
 					)}
 
+					{Number.isInteger(utcOffset) && canViewAllInfo && (
+						<InfoPanel.Field>
+							<InfoPanel.Label>{t('Last_login')}</InfoPanel.Label>
+							<InfoPanel.Text>{lastLogin ? timeAgo(lastLogin) : t('Never')}</InfoPanel.Text>
+						</InfoPanel.Field>
+					)}
+
 					{phone && (
 						<InfoPanel.Field>
 							<InfoPanel.Label>{t('Phone')}</InfoPanel.Label>
diff --git a/apps/meteor/client/hooks/useLicenseLimitsByBehavior.ts b/apps/meteor/client/hooks/useLicenseLimitsByBehavior.ts
new file mode 100644
index 000000000000..7ccea2dd4bd4
--- /dev/null
+++ b/apps/meteor/client/hooks/useLicenseLimitsByBehavior.ts
@@ -0,0 +1,63 @@
+import type { LicenseBehavior, LicenseLimitKind } from '@rocket.chat/core-typings';
+import { validateWarnLimit } from '@rocket.chat/license/src/validation/validateLimit';
+
+import { useLicense } from './useLicense';
+
+type LicenseLimitsByBehavior = Record<LicenseBehavior, LicenseLimitKind[]>;
+
+export const useLicenseLimitsByBehavior = () => {
+	const result = useLicense({ loadValues: true });
+
+	if (result.isLoading || result.isError) {
+		return null;
+	}
+
+	const { license, limits } = result.data;
+
+	if (!license || !limits) {
+		return null;
+	}
+
+	const keyLimits = Object.keys(limits) as Array<keyof typeof limits>;
+
+	// Get the rule with the highest limit that applies to this key
+	const rules = keyLimits
+		.map((key) => {
+			const rule = license.limits[key]
+				?.filter((limit) => validateWarnLimit(limit.max, limits[key].value ?? 0, limit.behavior))
+				.reduce<{ max: number; behavior: LicenseBehavior } | null>(
+					(maxLimit, currentLimit) => (!maxLimit || currentLimit.max > maxLimit.max ? currentLimit : maxLimit),
+					null,
+				);
+
+			if (!rule) {
+				return undefined;
+			}
+
+			if (rule.max === 0) {
+				return undefined;
+			}
+
+			if (rule.max === -1) {
+				return undefined;
+			}
+
+			return [key, rule.behavior];
+		})
+		.filter(Boolean) as Array<[keyof typeof limits, LicenseBehavior]>;
+
+	if (!rules.length) {
+		return null;
+	}
+
+	// Group by behavior
+	return rules.reduce((acc, [key, behavior]) => {
+		if (!acc[behavior]) {
+			acc[behavior] = [];
+		}
+
+		acc[behavior].push(key);
+
+		return acc;
+	}, {} as LicenseLimitsByBehavior);
+};
diff --git a/apps/meteor/client/views/admin/subscription/SubscriptionCalloutLimits.tsx b/apps/meteor/client/views/admin/subscription/SubscriptionCalloutLimits.tsx
index 2adc3d306034..c5de629e5582 100644
--- a/apps/meteor/client/views/admin/subscription/SubscriptionCalloutLimits.tsx
+++ b/apps/meteor/client/views/admin/subscription/SubscriptionCalloutLimits.tsx
@@ -1,80 +1,33 @@
-import type { LicenseBehavior } from '@rocket.chat/core-typings';
+import type { LicenseInfo } from '@rocket.chat/core-typings';
 import { Callout } from '@rocket.chat/fuselage';
-import { validateWarnLimit } from '@rocket.chat/license/src/validation/validateLimit';
 import { ExternalLink } from '@rocket.chat/ui-client';
 import React from 'react';
 import { Trans, useTranslation } from 'react-i18next';
 
-import { useLicense } from '../../../hooks/useLicense';
+import { useLicenseLimitsByBehavior } from '../../../hooks/useLicenseLimitsByBehavior';
 import { useCheckoutUrl } from './hooks/useCheckoutUrl';
 
 export const SubscriptionCalloutLimits = () => {
 	const manageSubscriptionUrl = useCheckoutUrl();
 
 	const { t } = useTranslation();
-	const result = useLicense({ loadValues: true });
 
-	if (result.isLoading || result.isError) {
-		return null;
-	}
-
-	const { license, limits } = result.data;
+	const licenseLimits = useLicenseLimitsByBehavior();
 
-	if (!license || !limits) {
+	if (!licenseLimits) {
 		return null;
 	}
 
-	const keyLimits = Object.keys(limits) as Array<keyof typeof limits>;
-
-	// Get the rule with the highest limit that applies to this key
-
-	const rules = keyLimits
-		.map((key) => {
-			const rule = license.limits[key]
-				?.filter((limit) => validateWarnLimit(limit.max, limits[key].value ?? 0, limit.behavior))
-				.sort((a, b) => b.max - a.max)[0];
+	const { prevent_action, disable_modules, invalidate_license, start_fair_policy } = licenseLimits;
 
-			if (!rule) {
-				return undefined;
-			}
-
-			if (rule.max === 0) {
-				return undefined;
-			}
-
-			if (rule.max === -1) {
-				return undefined;
-			}
-
-			return [key, rule.behavior];
-		})
-		.filter(Boolean) as Array<[keyof typeof limits, LicenseBehavior]>;
-
-	if (!rules.length) {
-		return null;
-	}
-
-	// Group by behavior
-	const groupedRules = rules.reduce((acc, [key, behavior]) => {
-		if (!acc[behavior]) {
-			acc[behavior] = [];
-		}
-
-		acc[behavior].push(key);
-
-		return acc;
-	}, {} as Record<LicenseBehavior, (keyof typeof limits)[]>);
-
-	const { prevent_action, disable_modules, invalidate_license, start_fair_policy } = groupedRules;
-
-	const map = (key: keyof typeof limits) => t(`subscription.callout.${key}`);
+	const toTranslationKey = (key: keyof LicenseInfo['limits']) => t(`subscription.callout.${key}`);
 
 	return (
 		<>
 			{start_fair_policy && (
 				<Callout type='warning' title={t('subscription.callout.servicesDisruptionsMayOccur')} m={8}>
 					<Trans i18nKey='subscription.callout.description.limitsReached' count={start_fair_policy.length}>
-						Your workspace reached the <>{{ val: start_fair_policy.map(map) }}</> limit.
+						Your workspace reached the <>{{ val: start_fair_policy.map(toTranslationKey) }}</> limit.
 						<ExternalLink
 							to={manageSubscriptionUrl({
 								target: 'callout',
@@ -88,10 +41,11 @@ export const SubscriptionCalloutLimits = () => {
 					</Trans>
 				</Callout>
 			)}
+
 			{prevent_action && (
 				<Callout type='danger' title={t('subscription.callout.servicesDisruptionsOccurring')} m={8}>
 					<Trans i18nKey='subscription.callout.description.limitsExceeded' count={prevent_action.length}>
-						Your workspace exceeded the <>{{ val: prevent_action.map(map) }}</> license limit.
+						Your workspace exceeded the <>{{ val: prevent_action.map(toTranslationKey) }}</> license limit.
 						<ExternalLink
 							to={manageSubscriptionUrl({
 								target: 'callout',
@@ -109,7 +63,7 @@ export const SubscriptionCalloutLimits = () => {
 			{disable_modules && (
 				<Callout type='danger' title={t('subscription.callout.capabilitiesDisabled')} m={8}>
 					<Trans i18nKey='subscription.callout.description.limitsExceeded' count={disable_modules.length}>
-						Your workspace exceeded the <>{{ val: disable_modules.map(map) }}</> license limit.
+						Your workspace exceeded the <>{{ val: disable_modules.map(toTranslationKey) }}</> license limit.
 						<ExternalLink
 							to={manageSubscriptionUrl({
 								target: 'callout',
@@ -127,7 +81,7 @@ export const SubscriptionCalloutLimits = () => {
 			{invalidate_license && (
 				<Callout type='danger' title={t('subscription.callout.allPremiumCapabilitiesDisabled')} m={8}>
 					<Trans i18nKey='subscription.callout.description.limitsExceeded' count={disable_modules.length}>
-						Your workspace exceeded the <>{{ val: invalidate_license.map(map) }}</> license limit.
+						Your workspace exceeded the <>{{ val: invalidate_license.map(toTranslationKey) }}</> license limit.
 						<ExternalLink
 							to={manageSubscriptionUrl({
 								target: 'callout',
diff --git a/apps/meteor/client/views/admin/users/AdminUserInfoWithData.tsx b/apps/meteor/client/views/admin/users/AdminUserInfoWithData.tsx
index f9b8bb01e129..68dc5f864d11 100644
--- a/apps/meteor/client/views/admin/users/AdminUserInfoWithData.tsx
+++ b/apps/meteor/client/views/admin/users/AdminUserInfoWithData.tsx
@@ -1,4 +1,3 @@
-import { isUserFederated } from '@rocket.chat/core-typings';
 import type { IUser } from '@rocket.chat/core-typings';
 import { Callout } from '@rocket.chat/fuselage';
 import { useMutableCallback } from '@rocket.chat/fuselage-hooks';
@@ -69,6 +68,7 @@ const AdminUserInfoWithData = ({ uid, onReload }: AdminUserInfoWithDataProps): R
 			lastLogin,
 			nickname,
 			canViewAllInfo,
+			reason,
 		} = data.user;
 
 		return {
@@ -91,6 +91,7 @@ const AdminUserInfoWithData = ({ uid, onReload }: AdminUserInfoWithDataProps): R
 			status: <UserStatus status={status} />,
 			statusText,
 			nickname,
+			reason,
 		};
 	}, [approveManuallyUsers, data, getRoles]);
 
@@ -119,7 +120,7 @@ const AdminUserInfoWithData = ({ uid, onReload }: AdminUserInfoWithDataProps): R
 					isAdmin={data?.user.roles?.includes('admin')}
 					userId={data?.user._id}
 					username={user.username}
-					isFederatedUser={isUserFederated(data?.user as unknown as IUser)}
+					isFederatedUser={!!data.user.federated}
 					onChange={onChange}
 					onReload={onReload}
 				/>
diff --git a/apps/meteor/client/views/admin/users/AdminUsersPage.tsx b/apps/meteor/client/views/admin/users/AdminUsersPage.tsx
index 1ec27c28a3bb..d49f3bdafa7f 100644
--- a/apps/meteor/client/views/admin/users/AdminUsersPage.tsx
+++ b/apps/meteor/client/views/admin/users/AdminUsersPage.tsx
@@ -1,9 +1,11 @@
-import type { IAdminUserTabs } from '@rocket.chat/core-typings';
-import { Button, ButtonGroup, ContextualbarIcon, Tabs, TabsItem } from '@rocket.chat/fuselage';
+import type { IAdminUserTabs, LicenseInfo } from '@rocket.chat/core-typings';
+import { Button, ButtonGroup, Callout, ContextualbarIcon, Skeleton, Tabs, TabsItem } from '@rocket.chat/fuselage';
 import { useDebouncedValue } from '@rocket.chat/fuselage-hooks';
+import { ExternalLink } from '@rocket.chat/ui-client';
 import { usePermission, useRouteParameter, useTranslation, useRouter } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React, { useEffect, useMemo, useRef, useState } from 'react';
+import { Trans } from 'react-i18next';
 
 import {
 	Contextualbar,
@@ -15,7 +17,9 @@ import {
 import { usePagination } from '../../../components/GenericTable/hooks/usePagination';
 import { useSort } from '../../../components/GenericTable/hooks/useSort';
 import { Page, PageHeader, PageContent } from '../../../components/Page';
+import { useLicenseLimitsByBehavior } from '../../../hooks/useLicenseLimitsByBehavior';
 import { useShouldPreventAction } from '../../../hooks/useShouldPreventAction';
+import { useCheckoutUrl } from '../subscription/hooks/useCheckoutUrl';
 import AdminInviteUsers from './AdminInviteUsers';
 import AdminUserForm from './AdminUserForm';
 import AdminUserFormWithData from './AdminUserFormWithData';
@@ -24,19 +28,24 @@ import AdminUserUpgrade from './AdminUserUpgrade';
 import UserPageHeaderContentWithSeatsCap from './UserPageHeaderContentWithSeatsCap';
 import UsersTable from './UsersTable';
 import useFilteredUsers from './hooks/useFilteredUsers';
+import usePendingUsersCount from './hooks/usePendingUsersCount';
 import { useSeatsCap } from './useSeatsCap';
 
 export type UsersFilters = {
 	text: string;
 };
 
-export type UsersTableSortingOptions = 'name' | 'username' | 'emails.address' | 'status';
+export type UsersTableSortingOptions = 'name' | 'username' | 'emails.address' | 'status' | 'active';
 
 const AdminUsersPage = (): ReactElement => {
 	const t = useTranslation();
 
 	const seatsCap = useSeatsCap();
 
+	const isSeatsCapExceeded = useShouldPreventAction('activeUsers');
+	const { prevent_action: preventAction } = useLicenseLimitsByBehavior() ?? {};
+	const manageSubscriptionUrl = useCheckoutUrl();
+
 	const router = useRouter();
 	const context = useRouteParameter('context');
 	const id = useRouteParameter('id');
@@ -47,7 +56,7 @@ const AdminUsersPage = (): ReactElement => {
 	const isCreateUserDisabled = useShouldPreventAction('activeUsers');
 
 	const paginationData = usePagination();
-	const sortData = useSort<'name' | 'username' | 'emails.address' | 'status'>('name');
+	const sortData = useSort<UsersTableSortingOptions>('name');
 
 	const [tab, setTab] = useState<IAdminUserTabs>('all');
 	const [userFilters, setUserFilters] = useState<UsersFilters>({ text: '' });
@@ -63,11 +72,19 @@ const AdminUsersPage = (): ReactElement => {
 		tab,
 	});
 
+	const pendingUsersCount = usePendingUsersCount(filteredUsersQueryResult.data?.users);
+
 	const handleReload = (): void => {
 		seatsCap?.reload();
 		filteredUsersQueryResult?.refetch();
 	};
 
+	const handleTabChangeAndSort = (tab: IAdminUserTabs) => {
+		setTab(tab);
+
+		sortData.setSort(tab === 'pending' ? 'active' : 'name', 'asc');
+	};
+
 	useEffect(() => {
 		prevSearchTerm.current = searchTerm;
 	}, [searchTerm]);
@@ -77,31 +94,55 @@ const AdminUsersPage = (): ReactElement => {
 		[context, isCreateUserDisabled],
 	);
 
+	const toTranslationKey = (key: keyof LicenseInfo['limits']) => t(`subscription.callout.${key}`);
+
 	return (
 		<Page flexDirection='row'>
 			<Page>
 				<PageHeader title={t('Users')}>
 					{seatsCap && seatsCap.maxActiveUsers < Number.POSITIVE_INFINITY ? (
-						<UserPageHeaderContentWithSeatsCap {...seatsCap} />
+						<UserPageHeaderContentWithSeatsCap isSeatsCapExceeded={isSeatsCapExceeded} {...seatsCap} />
 					) : (
 						<ButtonGroup>
 							{canBulkCreateUser && (
-								<Button icon='mail' onClick={() => router.navigate('/admin/users/invite')}>
+								<Button icon='mail' onClick={() => router.navigate('/admin/users/invite')} disabled={isSeatsCapExceeded}>
 									{t('Invite')}
 								</Button>
 							)}
 							{canCreateUser && (
-								<Button icon='user-plus' onClick={() => router.navigate('/admin/users/new')}>
+								<Button icon='user-plus' onClick={() => router.navigate('/admin/users/new')} disabled={isSeatsCapExceeded}>
 									{t('New_user')}
 								</Button>
 							)}
 						</ButtonGroup>
 					)}
 				</PageHeader>
+				{preventAction?.includes('activeUsers') && (
+					<Callout type='danger' title={t('subscription.callout.servicesDisruptionsOccurring')} mbe={19} mi={24}>
+						<Trans i18nKey='subscription.callout.description.limitsExceeded' count={preventAction.length}>
+							Your workspace exceeded the <>{{ val: preventAction.map(toTranslationKey) }}</> license limit.
+							<ExternalLink
+								to={manageSubscriptionUrl({
+									target: 'callout',
+									action: 'prevent_action',
+									limits: preventAction.join(','),
+								})}
+							>
+								Manage your subscription
+							</ExternalLink>
+							to increase limits.
+						</Trans>
+					</Callout>
+				)}
 				<Tabs>
-					<TabsItem selected={!tab || tab === 'all'} onClick={() => setTab('all')}>
+					<TabsItem selected={!tab || tab === 'all'} onClick={() => handleTabChangeAndSort('all')}>
 						{t('All')}
 					</TabsItem>
+					<TabsItem selected={tab === 'pending'} onClick={() => handleTabChangeAndSort('pending')} display='flex' flexDirection='row'>
+						{`${t('Pending')} `}
+						{pendingUsersCount.isLoading && <Skeleton variant='circle' height='x16' width='x16' mis={8} />}
+						{pendingUsersCount.isSuccess && `(${pendingUsersCount.data})`}
+					</TabsItem>
 				</Tabs>
 				<PageContent>
 					<UsersTable
@@ -111,6 +152,7 @@ const AdminUsersPage = (): ReactElement => {
 						paginationData={paginationData}
 						sortData={sortData}
 						tab={tab}
+						isSeatsCapExceeded={isSeatsCapExceeded}
 					/>
 				</PageContent>
 			</Page>
diff --git a/apps/meteor/client/views/admin/users/UserPageHeaderContentWithSeatsCap.tsx b/apps/meteor/client/views/admin/users/UserPageHeaderContentWithSeatsCap.tsx
index c4642d8baefb..3000b4f51a5a 100644
--- a/apps/meteor/client/views/admin/users/UserPageHeaderContentWithSeatsCap.tsx
+++ b/apps/meteor/client/views/admin/users/UserPageHeaderContentWithSeatsCap.tsx
@@ -4,18 +4,20 @@ import type { ReactElement } from 'react';
 import React from 'react';
 
 import { useExternalLink } from '../../../hooks/useExternalLink';
-import { useShouldPreventAction } from '../../../hooks/useShouldPreventAction';
 import { useCheckoutUrl } from '../subscription/hooks/useCheckoutUrl';
 import SeatsCapUsage from './SeatsCapUsage';
 
 type UserPageHeaderContentWithSeatsCapProps = {
 	activeUsers: number;
 	maxActiveUsers: number;
+	isSeatsCapExceeded: boolean;
 };
 
-const UserPageHeaderContentWithSeatsCap = ({ activeUsers, maxActiveUsers }: UserPageHeaderContentWithSeatsCapProps): ReactElement => {
-	const isCreateUserDisabled = useShouldPreventAction('activeUsers');
-
+const UserPageHeaderContentWithSeatsCap = ({
+	isSeatsCapExceeded,
+	activeUsers,
+	maxActiveUsers,
+}: UserPageHeaderContentWithSeatsCapProps): ReactElement => {
 	const t = useTranslation();
 	const router = useRouter();
 
@@ -36,13 +38,13 @@ const UserPageHeaderContentWithSeatsCap = ({ activeUsers, maxActiveUsers }: User
 				<SeatsCapUsage members={activeUsers} limit={maxActiveUsers} />
 			</Margins>
 			<ButtonGroup>
-				<Button icon='mail' onClick={handleInviteButtonClick}>
+				<Button icon='mail' onClick={handleInviteButtonClick} disabled={isSeatsCapExceeded}>
 					{t('Invite')}
 				</Button>
-				<Button icon='user-plus' onClick={handleNewButtonClick}>
+				<Button icon='user-plus' onClick={handleNewButtonClick} disabled={isSeatsCapExceeded}>
 					{t('New_user')}
 				</Button>
-				{isCreateUserDisabled && (
+				{isSeatsCapExceeded && (
 					<Button primary role='link' onClick={() => openExternalLink(manageSubscriptionUrl)}>
 						{t('Buy_more_seats')}
 					</Button>
diff --git a/apps/meteor/client/views/admin/users/UsersTable/UsersTable.tsx b/apps/meteor/client/views/admin/users/UsersTable/UsersTable.tsx
index 93762f973c62..fa35df715fc5 100644
--- a/apps/meteor/client/views/admin/users/UsersTable/UsersTable.tsx
+++ b/apps/meteor/client/views/admin/users/UsersTable/UsersTable.tsx
@@ -1,6 +1,6 @@
 import type { IAdminUserTabs, Serialized } from '@rocket.chat/core-typings';
 import { Pagination, States, StatesAction, StatesActions, StatesIcon, StatesTitle } from '@rocket.chat/fuselage';
-import { useMediaQuery, useEffectEvent } from '@rocket.chat/fuselage-hooks';
+import { useEffectEvent, useBreakpoints } from '@rocket.chat/fuselage-hooks';
 import type { PaginatedResult, DefaultUserInfo } from '@rocket.chat/rest-typings';
 import { useRouter, useTranslation } from '@rocket.chat/ui-contexts';
 import type { UseQueryResult } from '@tanstack/react-query';
@@ -28,9 +28,9 @@ type UsersTableProps = {
 	filteredUsersQueryResult: UseQueryResult<PaginatedResult<{ users: Serialized<DefaultUserInfo>[] }>>;
 	paginationData: ReturnType<typeof usePagination>;
 	sortData: ReturnType<typeof useSort<UsersTableSortingOptions>>;
+	isSeatsCapExceeded: boolean;
 };
 
-// TODO: Missing error state
 const UsersTable = ({
 	filteredUsersQueryResult,
 	setUserFilters,
@@ -38,10 +38,14 @@ const UsersTable = ({
 	onReload,
 	paginationData,
 	sortData,
+	isSeatsCapExceeded,
 }: UsersTableProps): ReactElement | null => {
 	const t = useTranslation();
 	const router = useRouter();
-	const mediaQuery = useMediaQuery('(min-width: 1024px)');
+	const breakpoints = useBreakpoints();
+
+	const isMobile = !breakpoints.includes('xl');
+	const isLaptop = !breakpoints.includes('xxl');
 
 	const { data, isLoading, isError, isSuccess } = filteredUsersQueryResult;
 
@@ -76,24 +80,14 @@ const UsersTable = ({
 
 	const headers = useMemo(
 		() => [
-			<GenericTableHeaderCell w='x240' key='name' direction={sortDirection} active={sortBy === 'name'} onClick={setSort} sort='name'>
+			<GenericTableHeaderCell key='name' direction={sortDirection} active={sortBy === 'name'} onClick={setSort} sort='name'>
 				{t('Name')}
 			</GenericTableHeaderCell>,
-			mediaQuery && (
-				<GenericTableHeaderCell
-					w='x140'
-					key='username'
-					direction={sortDirection}
-					active={sortBy === 'username'}
-					onClick={setSort}
-					sort='username'
-				>
-					{t('Username')}
-				</GenericTableHeaderCell>
-			),
-			mediaQuery && (
+			<GenericTableHeaderCell key='username' direction={sortDirection} active={sortBy === 'username'} onClick={setSort} sort='username'>
+				{t('Username')}
+			</GenericTableHeaderCell>,
+			!isLaptop && (
 				<GenericTableHeaderCell
-					w='x120'
 					key='email'
 					direction={sortDirection}
 					active={sortBy === 'emails.address'}
@@ -103,18 +97,20 @@ const UsersTable = ({
 					{t('Email')}
 				</GenericTableHeaderCell>
 			),
-			mediaQuery && (
-				<GenericTableHeaderCell w='x120' key='roles'>
-					{t('Roles')}
+			!isLaptop && <GenericTableHeaderCell key='roles'>{t('Roles')}</GenericTableHeaderCell>,
+			tab === 'all' && !isMobile && (
+				<GenericTableHeaderCell key='status' direction={sortDirection} active={sortBy === 'status'} onClick={setSort} sort='status'>
+					{t('Registration_status')}
 				</GenericTableHeaderCell>
 			),
-			tab === 'all' && (
-				<GenericTableHeaderCell w='x100' key='status'>
-					{t('Registration_status')}
+			tab === 'pending' && !isMobile && (
+				<GenericTableHeaderCell key='action' direction={sortDirection} active={sortBy === 'active'} onClick={setSort} sort='active'>
+					{t('Pending_action')}
 				</GenericTableHeaderCell>
 			),
+			<GenericTableHeaderCell key='actions' w={tab === 'pending' ? 'x204' : ''} />,
 		],
-		[mediaQuery, setSort, sortBy, sortDirection, t, tab],
+		[isLaptop, isMobile, setSort, sortBy, sortDirection, t, tab],
 	);
 
 	const handleSearchTextChange = useCallback(
@@ -153,7 +149,16 @@ const UsersTable = ({
 						<GenericTableHeader>{headers}</GenericTableHeader>
 						<GenericTableBody>
 							{data.users.map((user) => (
-								<UsersTableRow key={user._id} onClick={handleClickOrKeyDown} mediaQuery={mediaQuery} user={user} tab={tab} />
+								<UsersTableRow
+									key={user._id}
+									onClick={handleClickOrKeyDown}
+									isMobile={isMobile}
+									isLaptop={isLaptop}
+									user={user}
+									onReload={onReload}
+									tab={tab}
+									isSeatsCapExceeded={isSeatsCapExceeded}
+								/>
 							))}
 						</GenericTableBody>
 					</GenericTable>
diff --git a/apps/meteor/client/views/admin/users/UsersTable/UsersTableRow.tsx b/apps/meteor/client/views/admin/users/UsersTable/UsersTableRow.tsx
index 86a69dda1dbb..727edbc7a188 100644
--- a/apps/meteor/client/views/admin/users/UsersTable/UsersTableRow.tsx
+++ b/apps/meteor/client/views/admin/users/UsersTable/UsersTableRow.tsx
@@ -1,6 +1,6 @@
 import { UserStatus as Status } from '@rocket.chat/core-typings';
 import type { IAdminUserTabs, IRole, IUser, Serialized } from '@rocket.chat/core-typings';
-import { Box } from '@rocket.chat/fuselage';
+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';
@@ -10,16 +10,26 @@ import React, { useMemo } from 'react';
 import { Roles } from '../../../../../app/models/client';
 import { GenericTableRow, GenericTableCell } from '../../../../components/GenericTable';
 import { UserStatus } from '../../../../components/UserStatus';
+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';
 
 type UsersTableRowProps = {
 	user: Serialized<DefaultUserInfo>;
 	onClick: (id: IUser['_id'], e: React.MouseEvent<HTMLElement, MouseEvent> | React.KeyboardEvent<HTMLElement>) => void;
-	mediaQuery: boolean;
+	isMobile: boolean;
+	isLaptop: boolean;
+	onReload: () => void;
 	tab: IAdminUserTabs;
+	isSeatsCapExceeded: boolean;
 };
 
-const UsersTableRow = ({ user, onClick, mediaQuery, tab }: UsersTableRowProps): ReactElement => {
+const UsersTableRow = ({ user, onClick, onReload, isMobile, isLaptop, tab, isSeatsCapExceeded }: UsersTableRowProps): ReactElement => {
 	const t = useTranslation();
+
 	const { _id, emails, username, name, roles, status, active, avatarETag, lastLogin, type } = user;
 	const registrationStatusText = useMemo(() => {
 		const usersExcludedFromPending = ['bot', 'app'];
@@ -42,6 +52,49 @@ const UsersTableRow = ({ user, onClick, mediaQuery, tab }: UsersTableRowProps):
 		.filter((roleName): roleName is string => !!roleName)
 		.join(', ');
 
+	const userId = user._id;
+	const isAdmin = user.roles?.includes('admin');
+	const isActive = user.active;
+	const isFederatedUser = !!user.federated;
+
+	const changeAdminStatusAction = useChangeAdminStatusAction(userId, isAdmin, onReload);
+	const changeUserStatusAction = useChangeUserStatusAction(userId, isActive, onReload);
+	const deleteUserAction = useDeleteUserAction(userId, onReload, onReload);
+	const resetTOTPAction = useResetTOTPAction(userId);
+	const resetE2EKeyAction = useResetE2EEKeyAction(userId);
+	const resendWelcomeEmail = useSendWelcomeEmailMutation();
+
+	const isNotPendingDeactivatedNorFederated = tab !== 'pending' && tab !== 'deactivated' && !isFederatedUser;
+	const menuOptions = {
+		...(isNotPendingDeactivatedNorFederated &&
+			changeAdminStatusAction && {
+				makeAdmin: {
+					label: { label: changeAdminStatusAction.label, icon: changeAdminStatusAction.icon },
+					action: changeAdminStatusAction.action,
+				},
+			}),
+		...(isNotPendingDeactivatedNorFederated &&
+			resetE2EKeyAction && {
+				resetE2EKey: { label: { label: resetE2EKeyAction.label, icon: resetE2EKeyAction.icon }, action: resetE2EKeyAction.action },
+			}),
+		...(isNotPendingDeactivatedNorFederated &&
+			resetTOTPAction && {
+				resetTOTP: { label: { label: resetTOTPAction.label, icon: resetTOTPAction.icon }, action: resetTOTPAction.action },
+			}),
+		...(changeUserStatusAction &&
+			!isFederatedUser && {
+				changeActiveStatus: {
+					label: { label: changeUserStatusAction.label, icon: changeUserStatusAction.icon },
+					action: changeUserStatusAction.action,
+				},
+			}),
+		...(deleteUserAction && {
+			delete: { label: { label: deleteUserAction.label, icon: deleteUserAction.icon }, action: deleteUserAction.action },
+		}),
+	};
+
+	const handleResendWelcomeEmail = () => resendWelcomeEmail.mutateAsync({ email: emails?.[0].address });
+
 	return (
 		<GenericTableRow
 			onKeyDown={(e): void => onClick(_id, e)}
@@ -53,39 +106,78 @@ const UsersTableRow = ({ user, onClick, mediaQuery, tab }: UsersTableRowProps):
 		>
 			<GenericTableCell withTruncatedText>
 				<Box display='flex' alignItems='center'>
-					{username && <UserAvatar size={mediaQuery ? 'x28' : 'x40'} username={username} etag={avatarETag} />}
-					<Box display='flex' mi={8} withTruncatedText>
-						<Box display='flex' flexDirection='column' alignSelf='center' withTruncatedText>
-							<Box fontScale='p2m' color='default' withTruncatedText>
-								<Box display='inline' mie='x8'>
-									<UserStatus status={status || Status.OFFLINE} />
-								</Box>
-								{name || username}
-							</Box>
-							{!mediaQuery && name && (
-								<Box fontScale='p2' color='hint' withTruncatedText>
-									{`@${username}`}
-								</Box>
-							)}
+					{username && <UserAvatar size={isMobile || isLaptop ? 'x28' : 'x40'} username={username} etag={avatarETag} />}
+					<Box display='flex' flexGrow={1} flexShrink={1} flexBasis='0%' alignSelf='center' alignItems='center' withTruncatedText>
+						<Box mi={8}>
+							<UserStatus status={status || Status.OFFLINE} />
+						</Box>
+						<Box fontScale='p2' withTruncatedText>
+							{name || username}
 						</Box>
 					</Box>
 				</Box>
 			</GenericTableCell>
-			{mediaQuery && (
-				<GenericTableCell>
-					<Box fontScale='p2m' color='hint' withTruncatedText>
-						{username}
-					</Box>
-					<Box mi={4} />
+
+			<GenericTableCell>
+				<Box fontScale='p2m' color='hint' withTruncatedText>
+					{username}
+				</Box>
+			</GenericTableCell>
+
+			{!isLaptop && <GenericTableCell withTruncatedText>{emails?.length && emails[0].address}</GenericTableCell>}
+
+			{!isLaptop && <GenericTableCell withTruncatedText>{roleNames}</GenericTableCell>}
+
+			{tab === 'all' && !isMobile && (
+				<GenericTableCell fontScale='p2' color='hint' withTruncatedText>
+					{registrationStatusText}
 				</GenericTableCell>
 			)}
-			{mediaQuery && <GenericTableCell withTruncatedText>{emails?.length && emails[0].address}</GenericTableCell>}
-			{mediaQuery && <GenericTableCell withTruncatedText>{roleNames}</GenericTableCell>}
-			{tab === 'all' && (
+
+			{tab === 'pending' && !isMobile && (
 				<GenericTableCell fontScale='p2' color='hint' withTruncatedText>
-					{registrationStatusText}
+					<Box display='flex' flexDirection='row' alignContent='flex-end'>
+						{active ? t('User_first_log_in') : t('Activation')}
+					</Box>
 				</GenericTableCell>
 			)}
+
+			<GenericTableCell
+				display='flex'
+				justifyContent='flex-end'
+				onClick={(e): void => {
+					e.stopPropagation();
+				}}
+			>
+				{tab === 'pending' && (
+					<>
+						{active ? (
+							<Button small secondary onClick={handleResendWelcomeEmail}>
+								{t('Resend_welcome_email')}
+							</Button>
+						) : (
+							<Button small primary onClick={changeUserStatusAction?.action} disabled={isSeatsCapExceeded}>
+								{t('Activate')}
+							</Button>
+						)}
+					</>
+				)}
+
+				<Menu
+					mi={4}
+					placement='bottom-start'
+					flexShrink={0}
+					key='menu'
+					renderItem={({ label: { label, icon }, ...props }): ReactElement =>
+						label === 'Delete' ? (
+							<Option label={label} title={label} icon={icon} variant='danger' {...props} />
+						) : (
+							<Option label={label} title={label} icon={icon} {...props} />
+						)
+					}
+					options={menuOptions}
+				/>
+			</GenericTableCell>
 		</GenericTableRow>
 	);
 };
diff --git a/apps/meteor/client/views/admin/users/hooks/usePendingUsersCount.ts b/apps/meteor/client/views/admin/users/hooks/usePendingUsersCount.ts
new file mode 100644
index 000000000000..6729489d8b50
--- /dev/null
+++ b/apps/meteor/client/views/admin/users/hooks/usePendingUsersCount.ts
@@ -0,0 +1,25 @@
+import type { Serialized } from '@rocket.chat/core-typings';
+import type { DefaultUserInfo, UsersListStatusParamsGET } from '@rocket.chat/rest-typings';
+import { useEndpoint } from '@rocket.chat/ui-contexts';
+import { useQuery } from '@tanstack/react-query';
+
+const usePendingUsersCount = (users: Serialized<DefaultUserInfo[]> | undefined) => {
+	const getUsers = useEndpoint('GET', '/v1/users.listByStatus');
+
+	return useQuery(
+		['pendingUsersCount', users],
+		async () => {
+			const payload: UsersListStatusParamsGET = {
+				hasLoggedIn: false,
+				status: 'deactivated',
+				type: 'user',
+				count: 1,
+			};
+
+			return getUsers(payload);
+		},
+		{ enabled: !!users, select: (data) => data?.total },
+	);
+};
+
+export default usePendingUsersCount;
diff --git a/apps/meteor/client/views/admin/users/hooks/useSendWelcomeEmailMutation.ts b/apps/meteor/client/views/admin/users/hooks/useSendWelcomeEmailMutation.ts
new file mode 100644
index 000000000000..99077cbd0eb1
--- /dev/null
+++ b/apps/meteor/client/views/admin/users/hooks/useSendWelcomeEmailMutation.ts
@@ -0,0 +1,29 @@
+import { useEndpoint, useToastMessageDispatch, useTranslation } from '@rocket.chat/ui-contexts';
+import type { UseMutationResult } from '@tanstack/react-query';
+import { useMutation } from '@tanstack/react-query';
+
+type useSendWelcomeEmailMutationProps = {
+	email: string | undefined;
+};
+
+export const useSendWelcomeEmailMutation = (): UseMutationResult<null, Error, useSendWelcomeEmailMutationProps> => {
+	const t = useTranslation();
+	const dispatchToastMessage = useToastMessageDispatch();
+
+	const sendWelcomeEmail = useEndpoint('POST', '/v1/users.sendWelcomeEmail');
+
+	return useMutation(
+		async ({ email }) => {
+			if (!email) {
+				dispatchToastMessage({ type: 'error', message: t('Welcome_email_failed') });
+				return null;
+			}
+
+			return sendWelcomeEmail({ email });
+		},
+		{
+			onSuccess: () => dispatchToastMessage({ type: 'success', message: t('Welcome_email_resent') }),
+			onError: (error) => dispatchToastMessage({ type: 'error', message: error }),
+		},
+	);
+};
diff --git a/packages/core-typings/src/IUser.ts b/packages/core-typings/src/IUser.ts
index 453259ef0b3a..d7de094b90c1 100644
--- a/packages/core-typings/src/IUser.ts
+++ b/packages/core-typings/src/IUser.ts
@@ -1,5 +1,6 @@
 import type { IRocketChatRecord } from './IRocketChatRecord';
 import type { IRole } from './IRole';
+import type { Serialized } from './Serialized';
 import type { UserStatus } from './UserStatus';
 
 export interface ILoginToken {
@@ -191,7 +192,7 @@ export interface IRegisterUser extends IUser {
 }
 
 export const isRegisterUser = (user: IUser): user is IRegisterUser => user.username !== undefined && user.name !== undefined;
-export const isUserFederated = (user: Partial<IUser>) => 'federated' in user && user.federated === true;
+export const isUserFederated = (user: Partial<IUser> | Partial<Serialized<IUser>>) => 'federated' in user && user.federated === true;
 
 export type IUserDataEvent = {
 	id: unknown;
diff --git a/packages/i18n/src/locales/en.i18n.json b/packages/i18n/src/locales/en.i18n.json
index 61b407d516fe..1ea8919bf550 100644
--- a/packages/i18n/src/locales/en.i18n.json
+++ b/packages/i18n/src/locales/en.i18n.json
@@ -306,6 +306,7 @@
   "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_users": "Active users",
   "Activity": "Activity",
@@ -4145,6 +4146,7 @@
   "pdf_error_message": "Error generating PDF Transcript",
   "Peer_Password": "Peer Password",
   "Pending": "Pending",
+  "Pending_action": "Pending action",
   "Pending Avatars": "Pending Avatars",
   "Pending Files": "Pending Files",
   "People": "People",
@@ -4350,6 +4352,7 @@
   "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_To_Join": "Reason to Join",
   "Receive_alerts": "Receive alerts",
   "Receive_Group_Mentions": "Receive @all and @here mentions",
@@ -4473,6 +4476,7 @@
   "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",
@@ -5588,6 +5592,7 @@
   "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",
@@ -5950,6 +5955,8 @@
   "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",
diff --git a/packages/rest-typings/src/v1/Ajv.ts b/packages/rest-typings/src/v1/Ajv.ts
index f59b246d17e7..7eb62ac2cc1d 100644
--- a/packages/rest-typings/src/v1/Ajv.ts
+++ b/packages/rest-typings/src/v1/Ajv.ts
@@ -4,6 +4,13 @@ import addFormats from 'ajv-formats';
 const ajv = new Ajv({
 	coerceTypes: true,
 });
+
 addFormats(ajv);
 
+ajv.addFormat('basic_email', /^[^@]+@[^@]+$/);
+ajv.addFormat(
+	'rfc_email',
+	/^[a-zA-Z0-9.!#$%&'*+\/=?^_`{|}~-]+@[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(?:\.[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)*$/,
+);
+
 export { ajv };
diff --git a/packages/rest-typings/src/v1/users.ts b/packages/rest-typings/src/v1/users.ts
index bcf99f951664..28c7ad52337b 100644
--- a/packages/rest-typings/src/v1/users.ts
+++ b/packages/rest-typings/src/v1/users.ts
@@ -114,7 +114,7 @@ export type UserPersonalTokens = Pick<IPersonalAccessToken, 'name' | 'lastTokenP
 
 export type DefaultUserInfo = Pick<
 	IUser,
-	'_id' | 'username' | 'name' | 'status' | 'roles' | 'emails' | 'active' | 'avatarETag' | 'lastLogin' | 'type'
+	'_id' | 'username' | 'name' | 'status' | 'roles' | 'emails' | 'active' | 'avatarETag' | 'lastLogin' | 'type' | 'federated'
 >;
 
 export type UsersEndpoints = {
diff --git a/packages/rest-typings/src/v1/users/UsersSendWelcomeEmailParamsPOST.ts b/packages/rest-typings/src/v1/users/UsersSendWelcomeEmailParamsPOST.ts
index 59e85db8a5cb..f0040c9784cd 100644
--- a/packages/rest-typings/src/v1/users/UsersSendWelcomeEmailParamsPOST.ts
+++ b/packages/rest-typings/src/v1/users/UsersSendWelcomeEmailParamsPOST.ts
@@ -7,7 +7,7 @@ const UsersSendWelcomeEmailParamsPostSchema = {
 	properties: {
 		email: {
 			type: 'string',
-			format: 'email',
+			format: 'basic_email',
 		},
 	},
 	required: ['email'],

From 9c925a39a65dabeabdff17e4d4e03efe2b8e2e19 Mon Sep 17 00:00:00 2001
From: Douglas Fabris <devfabris@gmail.com>
Date: Fri, 21 Jun 2024 00:05:58 -0300
Subject: [PATCH 60/94] fix: Modal backdrop overlapping `Select` options
 (#32640)

---
 .changeset/heavy-dolphins-lie.md                    |  5 +++++
 .../client/components/GenericMenu/GenericMenu.tsx   |  5 +++--
 .../GenericMenu/hooks/useHandleMenuAction.tsx       |  8 ++++----
 apps/meteor/client/components/ModalBackdrop.tsx     |  2 +-
 .../client/views/room/UserCard/UserCardWithData.tsx | 13 +++++++++++--
 5 files changed, 24 insertions(+), 9 deletions(-)
 create mode 100644 .changeset/heavy-dolphins-lie.md

diff --git a/.changeset/heavy-dolphins-lie.md b/.changeset/heavy-dolphins-lie.md
new file mode 100644
index 000000000000..aac6d0bc8e82
--- /dev/null
+++ b/.changeset/heavy-dolphins-lie.md
@@ -0,0 +1,5 @@
+---
+'@rocket.chat/meteor': patch
+---
+
+Fixes the issue where the modal backdrop is overlapping the options of the `Select` component
diff --git a/apps/meteor/client/components/GenericMenu/GenericMenu.tsx b/apps/meteor/client/components/GenericMenu/GenericMenu.tsx
index ddde6122b99d..294a98770523 100644
--- a/apps/meteor/client/components/GenericMenu/GenericMenu.tsx
+++ b/apps/meteor/client/components/GenericMenu/GenericMenu.tsx
@@ -11,6 +11,7 @@ type GenericMenuCommonProps = {
 	title: string;
 	icon?: ComponentProps<typeof IconButton>['icon'];
 	disabled?: boolean;
+	callbackAction?: () => void;
 };
 type GenericMenuConditionalProps =
 	| {
@@ -28,7 +29,7 @@ type GenericMenuConditionalProps =
 
 type GenericMenuProps = GenericMenuCommonProps & GenericMenuConditionalProps & Omit<ComponentProps<typeof MenuV2>, 'children'>;
 
-const GenericMenu = ({ title, icon = 'menu', disabled, onAction, ...props }: GenericMenuProps) => {
+const GenericMenu = ({ title, icon = 'menu', disabled, onAction, callbackAction, ...props }: GenericMenuProps) => {
 	const t = useTranslation();
 
 	const sections = 'sections' in props && props.sections;
@@ -37,7 +38,7 @@ const GenericMenu = ({ title, icon = 'menu', disabled, onAction, ...props }: Gen
 	const itemsList = sections ? sections.reduce((acc, { items }) => [...acc, ...items], [] as GenericMenuItemProps[]) : items || [];
 
 	const disabledKeys = itemsList.filter(({ disabled }) => disabled).map(({ id }) => id);
-	const handleAction = useHandleMenuAction(itemsList || []);
+	const handleAction = useHandleMenuAction(itemsList || [], callbackAction);
 
 	const hasIcon = itemsList.some(({ icon }) => icon);
 	const handleItems = (items: GenericMenuItemProps[]) =>
diff --git a/apps/meteor/client/components/GenericMenu/hooks/useHandleMenuAction.tsx b/apps/meteor/client/components/GenericMenu/hooks/useHandleMenuAction.tsx
index c67c8acd3c5e..dd1115765194 100644
--- a/apps/meteor/client/components/GenericMenu/hooks/useHandleMenuAction.tsx
+++ b/apps/meteor/client/components/GenericMenu/hooks/useHandleMenuAction.tsx
@@ -1,13 +1,13 @@
-import { useMutableCallback } from '@rocket.chat/fuselage-hooks';
+import { useEffectEvent } from '@rocket.chat/fuselage-hooks';
 
 import type { GenericMenuItemProps } from '../GenericMenuItem';
 
-export const useHandleMenuAction = (items: GenericMenuItemProps[], close?: () => void) => {
-	return useMutableCallback((id) => {
+export const useHandleMenuAction = (items: GenericMenuItemProps[], callbackAction?: () => void) => {
+	return useEffectEvent((id) => {
 		const item = items.find((item) => item.id === id && !!item.onClick);
 		if (item) {
 			item.onClick?.();
-			close?.();
+			callbackAction?.();
 		}
 	});
 };
diff --git a/apps/meteor/client/components/ModalBackdrop.tsx b/apps/meteor/client/components/ModalBackdrop.tsx
index 18d930f9b1cc..e1e696496183 100644
--- a/apps/meteor/client/components/ModalBackdrop.tsx
+++ b/apps/meteor/client/components/ModalBackdrop.tsx
@@ -90,7 +90,7 @@ const ModalBackdrop = ({ children, onDismiss }: ModalBackdropProps): ReactElemen
 			children={children}
 			className='rcx-modal__backdrop'
 			position='fixed'
-			zIndex={999999}
+			zIndex={9999}
 			inset={0}
 			display='flex'
 			flexDirection='column'
diff --git a/apps/meteor/client/views/room/UserCard/UserCardWithData.tsx b/apps/meteor/client/views/room/UserCard/UserCardWithData.tsx
index 40244b04beba..da9f9bb19035 100644
--- a/apps/meteor/client/views/room/UserCard/UserCardWithData.tsx
+++ b/apps/meteor/client/views/room/UserCard/UserCardWithData.tsx
@@ -69,8 +69,17 @@ const UserCardWithData = ({ username, rid, onOpenUserInfo, onClose }: UserCardWi
 			return null;
 		}
 
-		return <GenericMenu title={t('More')} key='menu' data-qa-id='menu' sections={menuOptions} placement='bottom-start' />;
-	}, [menuOptions, t]);
+		return (
+			<GenericMenu
+				title={t('More')}
+				key='menu'
+				data-qa-id='menu'
+				sections={menuOptions}
+				placement='bottom-start'
+				callbackAction={onClose}
+			/>
+		);
+	}, [menuOptions, onClose, t]);
 
 	const actions = useMemo(() => {
 		const mapAction = ([key, { content, icon, onClick }]: any): ReactElement => (

From e47ae764b8a3453aaf7c8ede4a6185ea8aa97d3f Mon Sep 17 00:00:00 2001
From: Allan RIbeiro <35040806+AllanPazRibeiro@users.noreply.github.com>
Date: Fri, 21 Jun 2024 00:07:45 -0300
Subject: [PATCH 61/94] fix: cleaning the room filter between navigation on the
 admin section (#32152)

Co-authored-by: dougfabris <devfabris@gmail.com>
Co-authored-by: gabriellsh <gabriel.henriques@rocket.chat>
---
 .changeset/brown-lobsters-join.md             |  5 +
 .../views/admin/rooms/RoomsTableFilters.tsx   | 13 ++-
 apps/meteor/tests/e2e/admin-room.spec.ts      | 97 +++++++++++++++++++
 apps/meteor/tests/e2e/page-objects/admin.ts   | 30 ++++++
 .../MultiSelectCustom/MultiSelectCustom.tsx   |  3 +-
 .../MultiSelectCustomAnchor.tsx               | 46 +++------
 .../MultiSelectCustomListWrapper.tsx          |  2 +-
 7 files changed, 157 insertions(+), 39 deletions(-)
 create mode 100644 .changeset/brown-lobsters-join.md
 create mode 100644 apps/meteor/tests/e2e/admin-room.spec.ts

diff --git a/.changeset/brown-lobsters-join.md b/.changeset/brown-lobsters-join.md
new file mode 100644
index 000000000000..ac0e52c8f829
--- /dev/null
+++ b/.changeset/brown-lobsters-join.md
@@ -0,0 +1,5 @@
+---
+'@rocket.chat/meteor': patch
+---
+
+Resolved an issue with the room type filter not being reset after navigating between admin sections.
diff --git a/apps/meteor/client/views/admin/rooms/RoomsTableFilters.tsx b/apps/meteor/client/views/admin/rooms/RoomsTableFilters.tsx
index fcdaa29c9dff..1ed21c1234a9 100644
--- a/apps/meteor/client/views/admin/rooms/RoomsTableFilters.tsx
+++ b/apps/meteor/client/views/admin/rooms/RoomsTableFilters.tsx
@@ -2,10 +2,10 @@ 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, useState } from 'react';
+import React, { useCallback, useMemo, useState } from 'react';
 import type { Dispatch, ReactElement, SetStateAction } from 'react';
 
-const roomTypeFilterStructure = [
+const initialRoomTypeFilterStructure = [
 	{
 		id: 'filter_by_room',
 		text: 'Filter_by_room',
@@ -49,6 +49,13 @@ const RoomsTableFilters = ({ setFilters }: { setFilters: Dispatch<SetStateAction
 
 	const [roomTypeSelectedOptions, setRoomTypeSelectedOptions] = useState<OptionProp[]>([]);
 
+	const roomTypeFilterStructure = useMemo(() => {
+		return initialRoomTypeFilterStructure.map((option) => ({
+			...option,
+			checked: roomTypeSelectedOptions.some((selectedOption) => selectedOption.id === option.id),
+		}));
+	}, [roomTypeSelectedOptions]);
+
 	const handleSearchTextChange = useCallback(
 		(event) => {
 			const text = event.currentTarget.value;
@@ -88,7 +95,7 @@ const RoomsTableFilters = ({ setFilters }: { setFilters: Dispatch<SetStateAction
 			</Box>
 			<Box minWidth='x224' m='x4'>
 				<MultiSelectCustom
-					dropdownOptions={roomTypeFilterStructure}
+					dropdownOptions={roomTypeFilterStructure as OptionProp[]}
 					defaultTitle={'All_rooms' as any}
 					selectedOptionsTitle='Rooms'
 					setSelectedOptions={handleRoomTypeChange}
diff --git a/apps/meteor/tests/e2e/admin-room.spec.ts b/apps/meteor/tests/e2e/admin-room.spec.ts
new file mode 100644
index 000000000000..2e79a0e745ea
--- /dev/null
+++ b/apps/meteor/tests/e2e/admin-room.spec.ts
@@ -0,0 +1,97 @@
+import { faker } from '@faker-js/faker';
+
+import { Users } from './fixtures/userStates';
+import { Admin, AdminSectionsHref } from './page-objects';
+import { createTargetChannel, createTargetPrivateChannel } from './utils';
+import { expect, test } from './utils/test';
+
+test.use({ storageState: Users.admin.state });
+
+test.describe.serial('admin-rooms', () => {
+	let channel: string;
+	let privateRoom: string;
+	let admin: Admin;
+
+	test.beforeEach(async ({ page }) => {
+		admin = new Admin(page);
+		await page.goto('/admin/rooms');
+	});
+
+	test.beforeAll(async ({ browser, api }) => {
+		[channel, privateRoom] = await Promise.all([
+			createTargetChannel(api),
+			createTargetPrivateChannel(api),
+			browser.newPage({ storageState: Users.admin.state }).then(async (page) => {
+				await page.goto('/home');
+				await page.waitForSelector('[data-qa-id="home-header"]');
+				return page;
+			}),
+		]);
+	});
+
+	test('should display the Rooms Table', async ({ page }) => {
+		await expect(page.locator('[data-qa-type="PageHeader-title"]')).toContainText('Rooms');
+	});
+
+	test('should filter room by name', async ({ page }) => {
+		await admin.inputSearchRooms.fill(channel);
+
+		await expect(page.locator(`[qa-room-name="${channel}"]`)).toBeVisible();
+	});
+
+	test('should filter rooms by type', async ({ page }) => {
+		const dropdown = await admin.dropdownFilterRoomType();
+		await dropdown.click();
+
+		const privateOption = page.locator('text=Private channels');
+
+		await privateOption.waitFor();
+		await privateOption.click();
+
+		const selectedDropdown = await admin.dropdownFilterRoomType('Rooms (1)');
+		await expect(selectedDropdown).toBeVisible();
+
+		await expect(page.locator('text=Private Channel').first()).toBeVisible();
+	});
+
+	test('should filter rooms by type and name', async ({ page }) => {
+		await admin.inputSearchRooms.fill(privateRoom);
+
+		const dropdown = await admin.dropdownFilterRoomType();
+		await dropdown.click();
+
+		await page.locator('text=Private channels').click();
+
+		await expect(page.locator(`[qa-room-name="${privateRoom}"]`)).toBeVisible();
+	});
+
+	test('should be empty in case of the search does not find any room', async ({ page }) => {
+		const nonExistingChannel = faker.string.alpha(10);
+
+		await admin.inputSearchRooms.fill(nonExistingChannel);
+
+		const dropdown = await admin.dropdownFilterRoomType();
+		await dropdown.click();
+
+		await page.locator('text=Private channels').click();
+
+		await expect(page.locator('text=No results found')).toBeVisible();
+	});
+
+	test('should filter rooms by type and name and clean the filter after changing section', async ({ page }) => {
+		await admin.inputSearchRooms.fill(privateRoom);
+		const dropdown = await admin.dropdownFilterRoomType();
+		await dropdown.click();
+
+		await page.locator('text=Private channels').click();
+
+		const workspaceButton = await admin.adminSectionButton(AdminSectionsHref.Workspace);
+		await workspaceButton.click();
+
+		const roomsButton = await admin.adminSectionButton(AdminSectionsHref.Rooms);
+		await roomsButton.click();
+
+		const selectDropdown = await admin.dropdownFilterRoomType('All rooms');
+		await expect(selectDropdown).toBeVisible();
+	});
+});
diff --git a/apps/meteor/tests/e2e/page-objects/admin.ts b/apps/meteor/tests/e2e/page-objects/admin.ts
index af0aa7a430ed..75df8a1d81d8 100644
--- a/apps/meteor/tests/e2e/page-objects/admin.ts
+++ b/apps/meteor/tests/e2e/page-objects/admin.ts
@@ -2,6 +2,28 @@ import type { Locator, Page } from '@playwright/test';
 
 import { AdminFlextab } from './fragments/admin-flextab';
 
+export enum AdminSectionsHref {
+	Workspace = '/admin/info',
+	Subscription = '/admin/subscription',
+	Engagement = '/admin/engagement/users',
+	Moderation = '/admin/moderation',
+	Federation = '/admin/federation',
+	Rooms = '/admin/rooms',
+	Users = '/admin/users',
+	Invites = '/admin/invites',
+	User_Status = '/admin/user-status',
+	Permissions = '/admin/permissions',
+	Device_Management = '/admin/device-management',
+	Email_Inboxes = '/admin/email-inboxes',
+	Mailer = '/admin/mailer',
+	Third_party_login = '/admin/third-party-login',
+	Integrations = '/admin/integrations',
+	Import = '/admin/import',
+	Reports = '/admin/reports',
+	Sounds = '/admin/sounds',
+	Emoji = '/admin/emoji',
+	Settings = '/admin/settings',
+}
 export class Admin {
 	public readonly page: Page;
 
@@ -268,4 +290,12 @@ export class Admin {
 	get btnFullScreen(): Locator {
 		return this.page.getByRole('button', { name: 'Full Screen' });
 	}
+
+	async dropdownFilterRoomType(text = 'All rooms'): Promise<Locator> {
+		return this.page.locator(`div[role="button"]:has-text("${text}")`);
+	}
+
+	async adminSectionButton(href: AdminSectionsHref): Promise<Locator> {
+		return this.page.locator(`a[href="${href}"]`);
+	}
 }
diff --git a/packages/ui-client/src/components/MultiSelectCustom/MultiSelectCustom.tsx b/packages/ui-client/src/components/MultiSelectCustom/MultiSelectCustom.tsx
index 6c5e12be8622..affe467cd965 100644
--- a/packages/ui-client/src/components/MultiSelectCustom/MultiSelectCustom.tsx
+++ b/packages/ui-client/src/components/MultiSelectCustom/MultiSelectCustom.tsx
@@ -105,8 +105,9 @@ export const MultiSelectCustom = ({
 		<Box display='flex' flexGrow={1} position='relative'>
 			<MultiSelectCustomAnchor
 				ref={reference}
-				onClick={toggleCollapsed as any}
 				collapsed={collapsed}
+				onClick={() => toggleCollapsed(!collapsed)}
+				onKeyDown={(e) => (e.code === 'Enter' || e.code === 'Space') && toggleCollapsed(!collapsed)}
 				defaultTitle={defaultTitle}
 				selectedOptionsTitle={selectedOptionsTitle}
 				selectedOptionsCount={count}
diff --git a/packages/ui-client/src/components/MultiSelectCustom/MultiSelectCustomAnchor.tsx b/packages/ui-client/src/components/MultiSelectCustom/MultiSelectCustomAnchor.tsx
index 9f6a15d38ba1..0a8aee69344b 100644
--- a/packages/ui-client/src/components/MultiSelectCustom/MultiSelectCustomAnchor.tsx
+++ b/packages/ui-client/src/components/MultiSelectCustom/MultiSelectCustomAnchor.tsx
@@ -1,66 +1,44 @@
 import { css } from '@rocket.chat/css-in-js';
-import { Box, Button, Icon, Palette } from '@rocket.chat/fuselage';
+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';
 
 type MultiSelectCustomAnchorProps = {
-	onClick?: (value: boolean) => void;
 	collapsed: boolean;
 	defaultTitle: TranslationKey;
 	selectedOptionsTitle: TranslationKey;
 	selectedOptionsCount: number;
 	maxCount: number;
-} & ComponentProps<typeof Button>;
+} & ComponentProps<typeof Box>;
 
 const MultiSelectCustomAnchor = forwardRef<HTMLElement, MultiSelectCustomAnchorProps>(function MultiSelectCustomAnchor(
-	{ onClick, collapsed, selectedOptionsCount, selectedOptionsTitle, defaultTitle, maxCount, ...props },
+	{ collapsed, selectedOptionsCount, selectedOptionsTitle, defaultTitle, maxCount, ...props },
 	ref,
 ) {
 	const t = useTranslation();
-
-	const inputStyle = collapsed
-		? css`
-				&,
-				&:hover,
-				&:active,
-				&:focus {
-					cursor: pointer;
-					border-color: ${Palette.stroke['stroke-highlight'].toString()}!important;
-					box-shadow: 0 0 0 2px ${Palette.shadow['shadow-highlight'].toString()};
-				}
-		  `
-		: css`
-				& {
-					cursor: pointer;
-				}
-		  `;
-
+	const customStyle = css`
+		&:hover {
+			cursor: pointer;
+		}
+	`;
 	const isDirty = selectedOptionsCount > 0 && selectedOptionsCount !== maxCount - 1;
 
 	return (
 		<Box
 			ref={ref}
-			onClick={onClick}
+			role='button'
+			tabIndex={0}
 			display='flex'
 			justifyContent='space-between'
 			alignItems='center'
-			flexDirection='row'
-			borderColor={Palette.stroke['stroke-light'].toString()}
-			borderWidth='x1'
-			borderRadius={4}
-			bg={Palette.surface['surface-light'].toString()}
 			h='x40'
-			w='full'
-			pb={10}
-			pi={16}
-			color={isDirty ? Palette.text['font-default'].toString() : Palette.text['font-annotation'].toString()}
-			className={inputStyle}
+			className={['rcx-input-box__wrapper', customStyle].filter(Boolean)}
 			{...props}
 		>
 			{isDirty ? `${t(selectedOptionsTitle)} (${selectedOptionsCount})` : t(defaultTitle)}
-			<Icon name='chevron-down' fontSize='x20' color='hint' />
+			<Icon name={collapsed ? 'chevron-up' : 'chevron-down'} fontSize='x20' color='hint' />
 		</Box>
 	);
 });
diff --git a/packages/ui-client/src/components/MultiSelectCustom/MultiSelectCustomListWrapper.tsx b/packages/ui-client/src/components/MultiSelectCustom/MultiSelectCustomListWrapper.tsx
index c579480a3c66..d8e2379772cc 100644
--- a/packages/ui-client/src/components/MultiSelectCustom/MultiSelectCustomListWrapper.tsx
+++ b/packages/ui-client/src/components/MultiSelectCustom/MultiSelectCustomListWrapper.tsx
@@ -6,7 +6,7 @@ const MultiSelectCustomListWrapper = forwardRef<Element, ComponentProps<typeof B
 	ref,
 ) {
 	return (
-		<Box ref={ref} zIndex='2' w='full' position='absolute' mbs={40} pbs={4}>
+		<Box ref={ref} zIndex={99} w='full' position='absolute' mbs={40} pbs={4}>
 			{children}
 		</Box>
 	);

From 9e8370d59ef997d58fd652fe68a6aea466c421bf Mon Sep 17 00:00:00 2001
From: Diego Sampaio <chinello@gmail.com>
Date: Fri, 21 Jun 2024 02:14:48 -0300
Subject: [PATCH 62/94] refactor: users out of db watcher (#32567)

---
 .../app/2fa/server/functions/resetTOTP.ts     |  9 +++
 .../2fa/server/methods/validateTempToken.ts   | 21 ++++++-
 apps/meteor/app/api/server/api.ts             | 15 +++++
 apps/meteor/app/api/server/v1/users.ts        | 41 ++++++++++--
 .../app/api/server/v1/voip/omnichannel.ts     | 19 ++++++
 apps/meteor/app/apps/server/bridges/users.ts  |  5 ++
 apps/meteor/app/crowd/server/crowd.ts         | 27 ++++++++
 .../server/custom_oauth_server.js             |  3 +
 .../server/classes/ImportDataConverter.ts     | 10 ++-
 .../irc-bridge/peerHandlers/disconnected.js   |  4 ++
 .../irc-bridge/peerHandlers/nickChanged.js    |  4 ++
 .../irc-bridge/peerHandlers/userRegistered.js |  6 ++
 .../app/lib/server/functions/deleteUser.ts    |  9 ++-
 .../app/lib/server/functions/saveUser.js      | 17 ++++-
 .../server/functions/setUserActiveStatus.ts   |  7 ++-
 .../app/lib/server/functions/setUsername.ts   |  3 +
 .../app/lib/server/lib/notifyListener.ts      | 62 ++++++++++++++++++-
 .../business-hour/AbstractBusinessHour.ts     | 13 +++-
 .../business-hour/BusinessHourManager.ts      |  8 ++-
 .../livechat/server/business-hour/Helper.ts   | 60 +++++++++++++++++-
 .../livechat/server/business-hour/Single.ts   | 20 +++++-
 .../server/business-hour/closeBusinessHour.ts |  4 +-
 .../server/hooks/afterAgentRemoved.ts         | 18 +++++-
 .../app/livechat/server/lib/LivechatTyped.ts  | 26 +++++++-
 apps/meteor/app/livechat/server/startup.ts    | 33 ++++++----
 .../server/methods/banner_dismiss.ts          | 10 +++
 .../server/business-hour/Custom.ts            | 11 +++-
 .../server/business-hour/Helper.ts            | 10 ++-
 .../server/business-hour/Multiple.ts          | 17 +++--
 .../server/lib/ldap/copyCustomFieldsLDAP.ts   |  2 +-
 .../server/database/watchCollections.ts       |  3 +-
 .../ldap => server/lib}/getNestedProp.spec.ts |  0
 .../lib/ldap => server/lib}/getNestedProp.ts  |  0
 .../meteor/server/lib/sendMessagesToAdmins.ts | 28 ++++++++-
 .../server/methods/saveUserPreferences.ts     | 18 +++++-
 apps/meteor/server/models/raw/Users.js        | 56 +++++++++--------
 .../modules/listeners/listeners.module.ts     | 10 +++
 .../model-typings/src/models/IUsersModel.ts   |  9 ++-
 38 files changed, 532 insertions(+), 86 deletions(-)
 rename apps/meteor/{ee/server/lib/ldap => server/lib}/getNestedProp.spec.ts (100%)
 rename apps/meteor/{ee/server/lib/ldap => server/lib}/getNestedProp.ts (100%)

diff --git a/apps/meteor/app/2fa/server/functions/resetTOTP.ts b/apps/meteor/app/2fa/server/functions/resetTOTP.ts
index 85fe696babe1..3be8ec7c8060 100644
--- a/apps/meteor/app/2fa/server/functions/resetTOTP.ts
+++ b/apps/meteor/app/2fa/server/functions/resetTOTP.ts
@@ -4,6 +4,7 @@ import { Meteor } from 'meteor/meteor';
 
 import { i18n } from '../../../../server/lib/i18n';
 import { isUserIdFederated } from '../../../../server/lib/isUserIdFederated';
+import { notifyOnUserChange } from '../../../lib/server/lib/notifyListener';
 import * as Mailer from '../../../mailer/server/api';
 import { settings } from '../../../settings/server';
 
@@ -68,6 +69,14 @@ export async function resetTOTP(userId: string, notifyUser = false): Promise<boo
 
 	if (result?.modifiedCount === 1) {
 		await Users.unsetLoginTokens(userId);
+
+		void notifyOnUserChange({
+			clientAction: 'updated',
+			id: userId,
+			diff: {
+				'services.resume.loginTokens': [],
+			},
+		});
 		return true;
 	}
 
diff --git a/apps/meteor/app/2fa/server/methods/validateTempToken.ts b/apps/meteor/app/2fa/server/methods/validateTempToken.ts
index e1804930a48c..cc2b44372a04 100644
--- a/apps/meteor/app/2fa/server/methods/validateTempToken.ts
+++ b/apps/meteor/app/2fa/server/methods/validateTempToken.ts
@@ -2,6 +2,7 @@ import { Users } from '@rocket.chat/models';
 import type { ServerMethods } from '@rocket.chat/ui-contexts';
 import { Meteor } from 'meteor/meteor';
 
+import { notifyOnUserChangeAsync } from '../../../lib/server/lib/notifyListener';
 import { TOTP } from '../lib/totp';
 
 declare module '@rocket.chat/ui-contexts' {
@@ -43,11 +44,25 @@ Meteor.methods<ServerMethods>({
 
 		// Once the TOTP is validated we logout all other clients
 		const { 'x-auth-token': xAuthToken } = this.connection?.httpHeaders ?? {};
-		if (xAuthToken) {
+		if (xAuthToken && this.userId) {
 			const hashedToken = Accounts._hashLoginToken(xAuthToken);
 
-			if (!(await Users.removeNonPATLoginTokensExcept(this.userId, hashedToken))) {
-				throw new Meteor.Error('error-logging-out-other-clients', 'Error logging out other clients');
+			const { modifiedCount } = await Users.removeNonPATLoginTokensExcept(this.userId, hashedToken);
+
+			if (modifiedCount > 0) {
+				// TODO this can be optmized so places that care about loginTokens being removed are invoked directly
+				// instead of having to listen to every watch.users event
+				void notifyOnUserChangeAsync(async () => {
+					if (!this.userId) {
+						return;
+					}
+					const userTokens = await Users.findOneById(this.userId, { projection: { 'services.resume.loginTokens': 1 } });
+					return {
+						clientAction: 'updated',
+						id: this.userId,
+						diff: { 'services.resume.loginTokens': userTokens?.services?.resume?.loginTokens },
+					};
+				});
 			}
 		}
 
diff --git a/apps/meteor/app/api/server/api.ts b/apps/meteor/app/api/server/api.ts
index 87153440cd28..5a87843f4795 100644
--- a/apps/meteor/app/api/server/api.ts
+++ b/apps/meteor/app/api/server/api.ts
@@ -14,9 +14,11 @@ import { Restivus } from 'meteor/rocketchat:restivus';
 import _ from 'underscore';
 
 import { isObject } from '../../../lib/utils/isObject';
+import { getNestedProp } from '../../../server/lib/getNestedProp';
 import { getRestPayload } from '../../../server/lib/logger/logPayloads';
 import { checkCodeForUser } from '../../2fa/server/code';
 import { hasPermissionAsync } from '../../authorization/server/functions/hasPermission';
+import { notifyOnUserChangeAsync } from '../../lib/server/lib/notifyListener';
 import { metrics } from '../../metrics/server';
 import { settings } from '../../settings/server';
 import { getDefaultUserFields } from '../../utils/server/functions/getDefaultUserFields';
@@ -848,6 +850,19 @@ export class APIClass<TBasePath extends string = ''> extends Restivus {
 				},
 			);
 
+			// TODO this can be optmized so places that care about loginTokens being removed are invoked directly
+			// instead of having to listen to every watch.users event
+			void notifyOnUserChangeAsync(async () => {
+				const userTokens = await Users.findOneById(this.user._id, { projection: { [tokenPath]: 1 } });
+				if (!userTokens) {
+					return;
+				}
+
+				const diff = { [tokenPath]: getNestedProp(userTokens, tokenPath) };
+
+				return { clientAction: 'updated', id: this.user._id, diff };
+			});
+
 			const response = {
 				status: 'success',
 				data: {
diff --git a/apps/meteor/app/api/server/v1/users.ts b/apps/meteor/app/api/server/v1/users.ts
index ccca23f8ea82..c26957fa1991 100644
--- a/apps/meteor/app/api/server/v1/users.ts
+++ b/apps/meteor/app/api/server/v1/users.ts
@@ -43,6 +43,7 @@ import { setStatusText } from '../../../lib/server/functions/setStatusText';
 import { setUserAvatar } from '../../../lib/server/functions/setUserAvatar';
 import { setUsernameWithValidation } from '../../../lib/server/functions/setUsername';
 import { validateCustomFields } from '../../../lib/server/functions/validateCustomFields';
+import { notifyOnUserChange, notifyOnUserChangeAsync } from '../../../lib/server/lib/notifyListener';
 import { generateAccessToken } from '../../../lib/server/methods/createToken';
 import { settings } from '../../../settings/server';
 import { getURL } from '../../../utils/server/getURL';
@@ -387,7 +388,8 @@ API.v1.addRoute(
 			const lastLoggedIn = new Date();
 			lastLoggedIn.setDate(lastLoggedIn.getDate() - daysIdle);
 
-			const count = (await Users.setActiveNotLoggedInAfterWithRole(lastLoggedIn, role, false)).modifiedCount;
+			// since we're deactiving users that are not logged in, there is no need to send data through WS
+			const { modifiedCount: count } = await Users.setActiveNotLoggedInAfterWithRole(lastLoggedIn, role, false);
 
 			return API.v1.success({
 				count,
@@ -861,14 +863,31 @@ API.v1.addRoute(
 
 			// When 2FA is enable we logout all other clients
 			const xAuthToken = this.request.headers['x-auth-token'] as string;
-			if (xAuthToken) {
-				const hashedToken = Accounts._hashLoginToken(xAuthToken);
+			if (!xAuthToken) {
+				return API.v1.success();
+			}
 
-				if (!(await Users.removeNonPATLoginTokensExcept(this.userId, hashedToken))) {
-					throw new MeteorError('error-logging-out-other-clients', 'Error logging out other clients');
-				}
+			const hashedToken = Accounts._hashLoginToken(xAuthToken);
+
+			if (!(await Users.removeNonPATLoginTokensExcept(this.userId, hashedToken))) {
+				throw new MeteorError('error-logging-out-other-clients', 'Error logging out other clients');
 			}
 
+			// TODO this can be optmized so places that care about loginTokens being removed are invoked directly
+			// instead of having to listen to every watch.users event
+			void notifyOnUserChangeAsync(async () => {
+				const userTokens = await Users.findOneById(this.userId, { projection: { 'services.resume.loginTokens': 1 } });
+				if (!userTokens) {
+					return;
+				}
+
+				return {
+					clientAction: 'updated',
+					id: this.user._id,
+					diff: { 'services.resume.loginTokens': userTokens.services?.resume?.loginTokens },
+				};
+			});
+
 			return API.v1.success();
 		},
 	},
@@ -1021,6 +1040,12 @@ API.v1.addRoute(
 
 			const me = (await Users.findOneById(this.userId, { projection: { 'services.resume.loginTokens': 1 } })) as Pick<IUser, 'services'>;
 
+			void notifyOnUserChange({
+				clientAction: 'updated',
+				id: this.userId,
+				diff: { 'services.resume.loginTokens': me.services?.resume?.loginTokens },
+			});
+
 			const token = me.services?.resume?.loginTokens?.find((token) => token.hashedToken === hashedToken);
 
 			const tokenExpires =
@@ -1172,6 +1197,8 @@ API.v1.addRoute(
 				throw new Meteor.Error('error-invalid-user-id', 'Invalid user id');
 			}
 
+			void notifyOnUserChange({ clientAction: 'updated', id: this.userId, diff: { 'services.resume.loginTokens': [] } });
+
 			return API.v1.success({
 				message: `User ${userId} has been logged out!`,
 			});
@@ -1242,6 +1269,8 @@ API.v1.addRoute(
 				return API.v1.unauthorized();
 			}
 
+			// TODO refactor to not update the user twice (one inside of `setStatusText` and then later just the status + statusDefault)
+
 			if (this.bodyParams.message || this.bodyParams.message === '') {
 				await setStatusText(user._id, this.bodyParams.message);
 			}
diff --git a/apps/meteor/app/api/server/v1/voip/omnichannel.ts b/apps/meteor/app/api/server/v1/voip/omnichannel.ts
index e1ee82d72478..e2128375ea42 100644
--- a/apps/meteor/app/api/server/v1/voip/omnichannel.ts
+++ b/apps/meteor/app/api/server/v1/voip/omnichannel.ts
@@ -3,6 +3,7 @@ import type { IUser, IVoipExtensionWithAgentInfo } from '@rocket.chat/core-typin
 import { Users } from '@rocket.chat/models';
 import { Match, check } from 'meteor/check';
 
+import { notifyOnUserChange } from '../../../../lib/server/lib/notifyListener';
 import { API } from '../../api';
 import { getPaginationItems } from '../../helpers/getPaginationItems';
 import { logger } from './logger';
@@ -79,6 +80,15 @@ API.v1.addRoute(
 
 			try {
 				await Users.setExtension(user._id, extension);
+
+				void notifyOnUserChange({
+					clientAction: 'updated',
+					id: user._id,
+					diff: {
+						extension,
+					},
+				});
+
 				return API.v1.success();
 			} catch (e) {
 				logger.error({ msg: 'Extension already in use' });
@@ -150,6 +160,15 @@ API.v1.addRoute(
 
 			logger.debug(`Removing extension association for user ${user._id} (extension was ${user.extension})`);
 			await Users.unsetExtension(user._id);
+
+			void notifyOnUserChange({
+				clientAction: 'updated',
+				id: user._id,
+				diff: {
+					extension: null,
+				},
+			});
+
 			return API.v1.success();
 		},
 	},
diff --git a/apps/meteor/app/apps/server/bridges/users.ts b/apps/meteor/app/apps/server/bridges/users.ts
index b0dfedd6273b..13d2436c768c 100644
--- a/apps/meteor/app/apps/server/bridges/users.ts
+++ b/apps/meteor/app/apps/server/bridges/users.ts
@@ -11,6 +11,7 @@ import { deleteUser } from '../../../lib/server/functions/deleteUser';
 import { getUserCreatedByApp } from '../../../lib/server/functions/getUserCreatedByApp';
 import { setUserActiveStatus } from '../../../lib/server/functions/setUserActiveStatus';
 import { setUserAvatar } from '../../../lib/server/functions/setUserAvatar';
+import { notifyOnUserChange, notifyOnUserChangeById } from '../../../lib/server/lib/notifyListener';
 
 export class AppUserBridge extends UserBridge {
 	constructor(private readonly orch: IAppServerOrchestrator) {
@@ -97,6 +98,8 @@ export class AppUserBridge extends UserBridge {
 				throw new Error('Creating normal users is currently not supported');
 		}
 
+		void notifyOnUserChangeById({ clientAction: 'inserted', id: user._id });
+
 		return user._id;
 	}
 
@@ -137,6 +140,8 @@ export class AppUserBridge extends UserBridge {
 
 		await Users.updateOne({ _id: user.id }, { $set: fields as any });
 
+		void notifyOnUserChange({ clientAction: 'updated', id: user.id, diff: fields });
+
 		return true;
 	}
 
diff --git a/apps/meteor/app/crowd/server/crowd.ts b/apps/meteor/app/crowd/server/crowd.ts
index e43c65c70f91..70f54dd7b726 100644
--- a/apps/meteor/app/crowd/server/crowd.ts
+++ b/apps/meteor/app/crowd/server/crowd.ts
@@ -10,6 +10,7 @@ import { crowdIntervalValuesToCronMap } from '../../../server/settings/crowd';
 import { deleteUser } from '../../lib/server/functions/deleteUser';
 import { _setRealName } from '../../lib/server/functions/setRealName';
 import { setUserActiveStatus } from '../../lib/server/functions/setUserActiveStatus';
+import { notifyOnUserChange, notifyOnUserChangeById, notifyOnUserChangeAsync } from '../../lib/server/lib/notifyListener';
 import { settings } from '../../settings/server';
 import { logger } from './logger';
 
@@ -215,6 +216,15 @@ export class CROWD {
 			},
 		);
 
+		void notifyOnUserChange({
+			clientAction: 'updated',
+			id,
+			diff: {
+				...user,
+				...(crowdUser.displayname && { name: crowdUser.displayname }),
+			},
+		});
+
 		await setUserActiveStatus(id, crowdUser.active);
 	}
 
@@ -312,6 +322,21 @@ export class CROWD {
 				},
 			);
 
+			// TODO this can be optmized so places that care about loginTokens being removed are invoked directly
+			// instead of having to listen to every watch.users event
+			void notifyOnUserChangeAsync(async () => {
+				const userTokens = await Users.findOneById(crowdUser._id, { projection: { 'services.resume.loginTokens': 1 } });
+				if (!userTokens) {
+					return;
+				}
+
+				return {
+					clientAction: 'updated',
+					id: crowdUser._id,
+					diff: { 'services.resume.loginTokens': userTokens.services?.resume?.loginTokens },
+				};
+			});
+
 			await this.syncDataToUser(crowdUser, user._id);
 
 			return {
@@ -324,6 +349,8 @@ export class CROWD {
 		try {
 			crowdUser._id = await Accounts.createUserAsync(crowdUser);
 
+			void notifyOnUserChangeById({ clientAction: 'inserted', id: crowdUser._id });
+
 			// sync the user data
 			await this.syncDataToUser(crowdUser, crowdUser._id);
 
diff --git a/apps/meteor/app/custom-oauth/server/custom_oauth_server.js b/apps/meteor/app/custom-oauth/server/custom_oauth_server.js
index 6b225069734d..16407bf134de 100644
--- a/apps/meteor/app/custom-oauth/server/custom_oauth_server.js
+++ b/apps/meteor/app/custom-oauth/server/custom_oauth_server.js
@@ -11,6 +11,7 @@ import _ from 'underscore';
 
 import { callbacks } from '../../../lib/callbacks';
 import { isURL } from '../../../lib/utils/isURL';
+import { notifyOnUserChange } from '../../lib/server/lib/notifyListener';
 import { registerAccessTokenService } from '../../lib/server/oauth/oauth';
 import { settings } from '../../settings/server';
 import { normalizers, fromTemplate, renameInvalidProperties } from './transform_helpers';
@@ -374,6 +375,8 @@ export class CustomOAuth {
 				};
 
 				await Users.update({ _id: user._id }, update);
+
+				void notifyOnUserChange({ clientAction: 'updated', id: user._id, diff: update });
 			}
 		});
 
diff --git a/apps/meteor/app/importer/server/classes/ImportDataConverter.ts b/apps/meteor/app/importer/server/classes/ImportDataConverter.ts
index 493d14061bf2..7b1e71eaa0f0 100644
--- a/apps/meteor/app/importer/server/classes/ImportDataConverter.ts
+++ b/apps/meteor/app/importer/server/classes/ImportDataConverter.ts
@@ -28,6 +28,7 @@ import { generateUsernameSuggestion } from '../../../lib/server/functions/getUse
 import { insertMessage } from '../../../lib/server/functions/insertMessage';
 import { saveUserIdentity } from '../../../lib/server/functions/saveUserIdentity';
 import { setUserActiveStatus } from '../../../lib/server/functions/setUserActiveStatus';
+import { notifyOnUserChange } from '../../../lib/server/lib/notifyListener';
 import { createChannelMethod } from '../../../lib/server/methods/createChannel';
 import { createPrivateGroupMethod } from '../../../lib/server/methods/createPrivateGroup';
 import { getValidRoomName } from '../../../utils/server/lib/getValidRoomName';
@@ -250,6 +251,9 @@ export class ImportDataConverter {
 
 	async updateUser(existingUser: IUser, userData: IImportUser): Promise<void> {
 		const { _id } = existingUser;
+		if (!_id) {
+			return;
+		}
 
 		userData._id = _id;
 
@@ -297,10 +301,12 @@ export class ImportDataConverter {
 
 		// Deleted users are 'inactive' users in Rocket.Chat
 		if (userData.deleted && existingUser?.active) {
-			userData._id && (await setUserActiveStatus(userData._id, false, true));
+			await setUserActiveStatus(_id, false, true);
 		} else if (userData.deleted === false && existingUser?.active === false) {
-			userData._id && (await setUserActiveStatus(userData._id, true));
+			await setUserActiveStatus(_id, true);
 		}
+
+		void notifyOnUserChange({ clientAction: 'updated', id: _id, diff: updateData.$set });
 	}
 
 	private async hashPassword(password: string): Promise<string> {
diff --git a/apps/meteor/app/irc/server/irc-bridge/peerHandlers/disconnected.js b/apps/meteor/app/irc/server/irc-bridge/peerHandlers/disconnected.js
index ed6d635a5721..3429a977fd1a 100644
--- a/apps/meteor/app/irc/server/irc-bridge/peerHandlers/disconnected.js
+++ b/apps/meteor/app/irc/server/irc-bridge/peerHandlers/disconnected.js
@@ -1,5 +1,7 @@
 import { Users } from '@rocket.chat/models';
 
+import { notifyOnUserChange } from '../../../../lib/server/lib/notifyListener';
+
 export default async function handleQUIT(args) {
 	const user = await Users.findOne({
 		'profile.irc.nick': args.nick,
@@ -13,4 +15,6 @@ export default async function handleQUIT(args) {
 			},
 		},
 	);
+
+	void notifyOnUserChange({ id: user._id, clientAction: 'updated', diff: { status: 'offline' } });
 }
diff --git a/apps/meteor/app/irc/server/irc-bridge/peerHandlers/nickChanged.js b/apps/meteor/app/irc/server/irc-bridge/peerHandlers/nickChanged.js
index fe5df0c9540e..96a8ebcb3dc9 100644
--- a/apps/meteor/app/irc/server/irc-bridge/peerHandlers/nickChanged.js
+++ b/apps/meteor/app/irc/server/irc-bridge/peerHandlers/nickChanged.js
@@ -1,5 +1,7 @@
 import { Users } from '@rocket.chat/models';
 
+import { notifyOnUserChange } from '../../../../lib/server/lib/notifyListener';
+
 export default async function handleNickChanged(args) {
 	const user = await Users.findOne({
 		'profile.irc.nick': args.nick,
@@ -21,4 +23,6 @@ export default async function handleNickChanged(args) {
 			},
 		},
 	);
+
+	void notifyOnUserChange({ clientAction: 'updated', id: user._id, diff: { name: args.newNick } });
 }
diff --git a/apps/meteor/app/irc/server/irc-bridge/peerHandlers/userRegistered.js b/apps/meteor/app/irc/server/irc-bridge/peerHandlers/userRegistered.js
index b4279ae008b4..5e04d7b79407 100644
--- a/apps/meteor/app/irc/server/irc-bridge/peerHandlers/userRegistered.js
+++ b/apps/meteor/app/irc/server/irc-bridge/peerHandlers/userRegistered.js
@@ -1,5 +1,7 @@
 import { Users } from '@rocket.chat/models';
 
+import { notifyOnUserChange } from '../../../../lib/server/lib/notifyListener';
+
 export default async function handleUserRegistered(args) {
 	// Check if there is an user with the given username
 	let user = await Users.findOne({
@@ -28,6 +30,8 @@ export default async function handleUserRegistered(args) {
 		};
 
 		user = await Users.create(userToInsert);
+
+		void notifyOnUserChange({ id: user._id, clientAction: 'inserted', data: user });
 	} else {
 		// ...otherwise, log the user in and update the information
 		this.log(`Logging in ${args.username} with nick: ${args.nick}`);
@@ -43,5 +47,7 @@ export default async function handleUserRegistered(args) {
 				},
 			},
 		);
+
+		void notifyOnUserChange({ id: user._id, clientAction: 'updated', diff: { status: 'online' } });
 	}
 }
diff --git a/apps/meteor/app/lib/server/functions/deleteUser.ts b/apps/meteor/app/lib/server/functions/deleteUser.ts
index f2ca72a1d57d..d6457664671a 100644
--- a/apps/meteor/app/lib/server/functions/deleteUser.ts
+++ b/apps/meteor/app/lib/server/functions/deleteUser.ts
@@ -19,7 +19,12 @@ import { callbacks } from '../../../../lib/callbacks';
 import { i18n } from '../../../../server/lib/i18n';
 import { FileUpload } from '../../../file-upload/server';
 import { settings } from '../../../settings/server';
-import { notifyOnRoomChangedById, notifyOnIntegrationChangedByUserId, notifyOnLivechatDepartmentAgentChanged } from '../lib/notifyListener';
+import {
+	notifyOnRoomChangedById,
+	notifyOnIntegrationChangedByUserId,
+	notifyOnLivechatDepartmentAgentChanged,
+	notifyOnUserChange,
+} from '../lib/notifyListener';
 import { getSubscribedRoomsForUserWithDetails, shouldRemoveOrChangeOwner } from './getRoomsWithSingleOwner';
 import { getUserSingleOwnedRooms } from './getUserSingleOwnedRooms';
 import { relinquishRoomOwnerships } from './relinquishRoomOwnerships';
@@ -156,5 +161,7 @@ export async function deleteUser(userId: string, confirmRelinquish = false, dele
 	// Refresh the servers list
 	await FederationServers.refreshServers();
 
+	void notifyOnUserChange({ clientAction: 'removed', id: user._id });
+
 	await callbacks.run('afterDeleteUser', user);
 }
diff --git a/apps/meteor/app/lib/server/functions/saveUser.js b/apps/meteor/app/lib/server/functions/saveUser.js
index e11e68f99ab0..1931333038b6 100644
--- a/apps/meteor/app/lib/server/functions/saveUser.js
+++ b/apps/meteor/app/lib/server/functions/saveUser.js
@@ -16,6 +16,7 @@ import { settings } from '../../../settings/server';
 import { safeGetMeteorUser } from '../../../utils/server/functions/safeGetMeteorUser';
 import { validateEmailDomain } from '../lib';
 import { generatePassword } from '../lib/generatePassword';
+import { notifyOnUserChangeById, notifyOnUserChange } from '../lib/notifyListener';
 import { passwordPolicy } from '../lib/passwordPolicy';
 import { checkEmailAvailability } from './checkEmailAvailability';
 import { checkUsernameAvailability } from './checkUsernameAvailability';
@@ -329,6 +330,8 @@ const saveNewUser = async function (userData, sendPassword) {
 		}
 	}
 
+	void notifyOnUserChangeById({ clientAction: 'inserted', id: _id });
+
 	return _id;
 };
 
@@ -432,7 +435,7 @@ export const saveUser = async function (userId, userData) {
 	await Users.updateOne({ _id: userData._id }, updateUser);
 
 	// App IPostUserUpdated event hook
-	const userUpdated = await Users.findOneById(userId);
+	const userUpdated = await Users.findOneById(userData._id);
 
 	await callbacks.run('afterSaveUser', {
 		user: userUpdated,
@@ -449,5 +452,17 @@ export const saveUser = async function (userId, userData) {
 		await _sendUserEmail(settings.get('Password_Changed_Email_Subject'), passwordChangedHtml, userData);
 	}
 
+	if (typeof userData.verified === 'boolean') {
+		delete userData.verified;
+	}
+	void notifyOnUserChange({
+		clientAction: 'updated',
+		id: userData._id,
+		diff: {
+			...userData,
+			emails: userUpdated.emails,
+		},
+	});
+
 	return true;
 };
diff --git a/apps/meteor/app/lib/server/functions/setUserActiveStatus.ts b/apps/meteor/app/lib/server/functions/setUserActiveStatus.ts
index fabf59669450..e3104db280dd 100644
--- a/apps/meteor/app/lib/server/functions/setUserActiveStatus.ts
+++ b/apps/meteor/app/lib/server/functions/setUserActiveStatus.ts
@@ -8,7 +8,7 @@ import { Meteor } from 'meteor/meteor';
 import { callbacks } from '../../../../lib/callbacks';
 import * as Mailer from '../../../mailer/server/api';
 import { settings } from '../../../settings/server';
-import { notifyOnRoomChangedById, notifyOnRoomChangedByUserDM } from '../lib/notifyListener';
+import { notifyOnRoomChangedById, notifyOnRoomChangedByUserDM, notifyOnUserChange } from '../lib/notifyListener';
 import { closeOmnichannelConversations } from './closeOmnichannelConversations';
 import { shouldRemoveOrChangeOwner, getSubscribedRoomsForUserWithDetails } from './getRoomsWithSingleOwner';
 import { getUserSingleOwnedRooms } from './getUserSingleOwnedRooms';
@@ -107,11 +107,16 @@ export async function setUserActiveStatus(userId: string, active: boolean, confi
 	if (active === false) {
 		await Users.unsetLoginTokens(userId);
 		await Rooms.setDmReadOnlyByUserId(userId, undefined, true, false);
+
+		void notifyOnUserChange({ clientAction: 'updated', id: userId, diff: { 'services.resume.loginTokens': [], active } });
 		void notifyOnRoomChangedByUserDM(userId);
 	} else {
 		await Users.unsetReason(userId);
+
+		void notifyOnUserChange({ clientAction: 'updated', id: userId, diff: { active } });
 		await reactivateDirectConversations(userId);
 	}
+
 	if (active && !settings.get('Accounts_Send_Email_When_Activating')) {
 		return true;
 	}
diff --git a/apps/meteor/app/lib/server/functions/setUsername.ts b/apps/meteor/app/lib/server/functions/setUsername.ts
index 319202cefea4..e19ef874db0f 100644
--- a/apps/meteor/app/lib/server/functions/setUsername.ts
+++ b/apps/meteor/app/lib/server/functions/setUsername.ts
@@ -10,6 +10,7 @@ import { SystemLogger } from '../../../../server/lib/logger/system';
 import { hasPermissionAsync } from '../../../authorization/server/functions/hasPermission';
 import { settings } from '../../../settings/server';
 import { RateLimiter } from '../lib';
+import { notifyOnUserChange } from '../lib/notifyListener';
 import { addUserToRoom } from './addUserToRoom';
 import { checkUsernameAvailability } from './checkUsernameAvailability';
 import { getAvatarSuggestionForUser } from './getAvatarSuggestionForUser';
@@ -67,6 +68,8 @@ export const setUsernameWithValidation = async (userId: string, username: string
 		await joinDefaultChannels(user._id, joinDefaultChannelsSilenced);
 		setImmediate(async () => callbacks.run('afterCreateUser', user));
 	}
+
+	void notifyOnUserChange({ clientAction: 'updated', id: user._id, diff: { username } });
 };
 
 export const _setUsername = async function (userId: string, u: string, fullUser: IUser): Promise<unknown> {
diff --git a/apps/meteor/app/lib/server/lib/notifyListener.ts b/apps/meteor/app/lib/server/lib/notifyListener.ts
index 3bc2f6c27526..f4e948390c99 100644
--- a/apps/meteor/app/lib/server/lib/notifyListener.ts
+++ b/apps/meteor/app/lib/server/lib/notifyListener.ts
@@ -16,6 +16,7 @@ import type {
 	IIntegrationHistory,
 	AtLeast,
 	ISettingColor,
+	IUser,
 } from '@rocket.chat/core-typings';
 import {
 	Rooms,
@@ -28,6 +29,7 @@ import {
 	IntegrationHistory,
 	LivechatInquiry,
 	LivechatDepartmentAgents,
+	Users,
 } from '@rocket.chat/models';
 
 type ClientAction = 'inserted' | 'updated' | 'removed';
@@ -426,7 +428,6 @@ export async function notifyOnSettingChanged(
 	if (!dbWatchersDisabled) {
 		return;
 	}
-
 	void api.broadcast('watch.settings', { clientAction, setting });
 }
 
@@ -434,7 +435,6 @@ export async function notifyOnSettingChangedById(id: ISetting['_id'], clientActi
 	if (!dbWatchersDisabled) {
 		return;
 	}
-
 	const item = clientAction === 'removed' ? await Settings.trashFindOneById(id) : await Settings.findOneById(id);
 
 	if (!item) {
@@ -443,3 +443,61 @@ export async function notifyOnSettingChangedById(id: ISetting['_id'], clientActi
 
 	void api.broadcast('watch.settings', { clientAction, setting: item });
 }
+
+type NotifyUserChange = {
+	id: IUser['_id'];
+	clientAction: 'inserted' | 'removed' | 'updated';
+	data?: IUser;
+	diff?: Record<string, any>;
+	unset?: Record<string, number>;
+};
+
+export async function notifyOnUserChange({ clientAction, id, data, diff, unset }: NotifyUserChange) {
+	if (!dbWatchersDisabled) {
+		return;
+	}
+	if (clientAction === 'removed') {
+		void api.broadcast('watch.users', { clientAction, id });
+		return;
+	}
+	if (clientAction === 'inserted') {
+		void api.broadcast('watch.users', { clientAction, id, data: data! });
+		return;
+	}
+
+	void api.broadcast('watch.users', { clientAction, diff: diff!, unset: unset || {}, id });
+}
+
+/**
+ * Calls the callback only if DB Watchers are disabled
+ */
+export async function notifyOnUserChangeAsync(cb: () => Promise<NotifyUserChange | NotifyUserChange[] | void>) {
+	if (!dbWatchersDisabled) {
+		return;
+	}
+
+	const result = await cb();
+	if (!result) {
+		return;
+	}
+
+	if (Array.isArray(result)) {
+		result.forEach((n) => notifyOnUserChange(n));
+		return;
+	}
+
+	return notifyOnUserChange(result);
+}
+
+// TODO this may be only useful on 'inserted'
+export async function notifyOnUserChangeById({ clientAction, id }: { id: IUser['_id']; clientAction: 'inserted' | 'removed' | 'updated' }) {
+	if (!dbWatchersDisabled) {
+		return;
+	}
+	const user = await Users.findOneById(id);
+	if (!user) {
+		return;
+	}
+
+	void notifyOnUserChange({ id, clientAction, data: user });
+}
diff --git a/apps/meteor/app/livechat/server/business-hour/AbstractBusinessHour.ts b/apps/meteor/app/livechat/server/business-hour/AbstractBusinessHour.ts
index a5f11caaab63..9ddd273600d5 100644
--- a/apps/meteor/app/livechat/server/business-hour/AbstractBusinessHour.ts
+++ b/apps/meteor/app/livechat/server/business-hour/AbstractBusinessHour.ts
@@ -5,6 +5,7 @@ import moment from 'moment-timezone';
 import type { UpdateFilter } from 'mongodb';
 
 import type { IWorkHoursCronJobsWrapper } from '../../../../server/models/raw/LivechatBusinessHours';
+import { notifyOnUserChange } from '../../../lib/server/lib/notifyListener';
 
 export interface IBusinessHourBehavior {
 	findHoursToCreateJobs(): Promise<IWorkHoursCronJobsWrapper[]>;
@@ -49,7 +50,7 @@ export abstract class AbstractBusinessHourBehavior {
 	}
 
 	async changeAgentActiveStatus(agentId: string, status: ILivechatAgentStatus): Promise<any> {
-		return this.UsersRepository.setLivechatStatusIf(
+		const result = await this.UsersRepository.setLivechatStatusIf(
 			agentId,
 			status,
 			// Why this works: statusDefault is the property set when a user manually changes their status
@@ -57,6 +58,16 @@ export abstract class AbstractBusinessHourBehavior {
 			{ livechatStatusSystemModified: true, statusDefault: { $ne: 'offline' } },
 			{ livechatStatusSystemModified: true },
 		);
+
+		if (result.modifiedCount > 0) {
+			void notifyOnUserChange({
+				clientAction: 'updated',
+				id: agentId,
+				diff: { statusLivechat: 'available', livechatStatusSystemModified: true },
+			});
+		}
+
+		return result;
 	}
 }
 
diff --git a/apps/meteor/app/livechat/server/business-hour/BusinessHourManager.ts b/apps/meteor/app/livechat/server/business-hour/BusinessHourManager.ts
index c893cb68ddf7..ec21ff2de067 100644
--- a/apps/meteor/app/livechat/server/business-hour/BusinessHourManager.ts
+++ b/apps/meteor/app/livechat/server/business-hour/BusinessHourManager.ts
@@ -5,6 +5,7 @@ import { LivechatBusinessHours, LivechatDepartment, Users } from '@rocket.chat/m
 import moment from 'moment';
 
 import { callbacks } from '../../../../lib/callbacks';
+import { notifyOnUserChange } from '../../../lib/server/lib/notifyListener';
 import { settings } from '../../../settings/server';
 import { businessHourLogger } from '../lib/logger';
 import type { IBusinessHourBehavior, IBusinessHourType } from './AbstractBusinessHour';
@@ -126,7 +127,12 @@ export class BusinessHourManager {
 			return this.behavior.changeAgentActiveStatus(agentId, 'available');
 		}
 
-		return Users.setLivechatStatusActiveBasedOnBusinessHours(agentId);
+		const result = await Users.setLivechatStatusActiveBasedOnBusinessHours(agentId);
+		if (result.updatedCount > 0) {
+			void notifyOnUserChange({ clientAction: 'updated', id: agentId, diff: { statusLivechat: 'available ' } });
+		}
+
+		return result;
 	}
 
 	async restartCronJobsIfNecessary(): Promise<void> {
diff --git a/apps/meteor/app/livechat/server/business-hour/Helper.ts b/apps/meteor/app/livechat/server/business-hour/Helper.ts
index e50d866aa6b9..e19300691660 100644
--- a/apps/meteor/app/livechat/server/business-hour/Helper.ts
+++ b/apps/meteor/app/livechat/server/business-hour/Helper.ts
@@ -1,8 +1,9 @@
 import type { ILivechatBusinessHour } from '@rocket.chat/core-typings';
-import { LivechatBusinessHourTypes } from '@rocket.chat/core-typings';
+import { ILivechatAgentStatus, LivechatBusinessHourTypes } from '@rocket.chat/core-typings';
 import { LivechatBusinessHours, Users } from '@rocket.chat/models';
 import moment from 'moment';
 
+import { notifyOnUserChangeAsync } from '../../../lib/server/lib/notifyListener';
 import { businessHourLogger } from '../lib/logger';
 import { createDefaultBusinessHourRow } from './LivechatBusinessHours';
 import { filterBusinessHoursThatMustBeOpened } from './filterBusinessHoursThatMustBeOpened';
@@ -32,13 +33,14 @@ export const openBusinessHourDefault = async (): Promise<void> => {
 			active: 1,
 		},
 	});
+
 	const businessHoursToOpenIds = (await filterBusinessHoursThatMustBeOpened(activeBusinessHours)).map((businessHour) => businessHour._id);
 	businessHourLogger.debug({ msg: 'Opening default business hours', businessHoursToOpenIds });
 	await Users.openAgentsBusinessHoursByBusinessHourId(businessHoursToOpenIds);
 	if (businessHoursToOpenIds.length) {
-		await Users.makeAgentsWithinBusinessHourAvailable();
+		await makeOnlineAgentsAvailable();
 	}
-	await Users.updateLivechatStatusBasedOnBusinessHours();
+	await makeAgentsUnavailableBasedOnBusinessHour();
 };
 
 export const createDefaultBusinessHourIfNotExists = async (): Promise<void> => {
@@ -46,3 +48,55 @@ export const createDefaultBusinessHourIfNotExists = async (): Promise<void> => {
 		await LivechatBusinessHours.insertOne(createDefaultBusinessHourRow());
 	}
 };
+
+export async function makeAgentsUnavailableBasedOnBusinessHour(agentIds: string[] | null = null) {
+	const results = await Users.findAgentsAvailableWithoutBusinessHours(agentIds).toArray();
+
+	const update = await Users.updateLivechatStatusByAgentIds(
+		results.map(({ _id }) => _id),
+		ILivechatAgentStatus.NOT_AVAILABLE,
+	);
+
+	if (update.modifiedCount === 0) {
+		return;
+	}
+
+	void notifyOnUserChangeAsync(async () =>
+		results.map(({ _id, openBusinessHours }) => {
+			return {
+				id: _id,
+				clientAction: 'updated',
+				diff: {
+					statusLivechat: 'not-available',
+					openBusinessHours,
+				},
+			};
+		}),
+	);
+}
+
+export async function makeOnlineAgentsAvailable(agentIds: string[] | null = null) {
+	const results = await Users.findOnlineButNotAvailableAgents(agentIds).toArray();
+
+	const update = await Users.updateLivechatStatusByAgentIds(
+		results.map(({ _id }) => _id),
+		ILivechatAgentStatus.AVAILABLE,
+	);
+
+	if (update.modifiedCount === 0) {
+		return;
+	}
+
+	void notifyOnUserChangeAsync(async () =>
+		results.map(({ _id, openBusinessHours }) => {
+			return {
+				id: _id,
+				clientAction: 'updated',
+				diff: {
+					statusLivechat: 'available',
+					openBusinessHours,
+				},
+			};
+		}),
+	);
+}
diff --git a/apps/meteor/app/livechat/server/business-hour/Single.ts b/apps/meteor/app/livechat/server/business-hour/Single.ts
index 5d2730dba9a1..ea8166c75fa9 100644
--- a/apps/meteor/app/livechat/server/business-hour/Single.ts
+++ b/apps/meteor/app/livechat/server/business-hour/Single.ts
@@ -1,10 +1,11 @@
 import { ILivechatAgentStatus, LivechatBusinessHourTypes } from '@rocket.chat/core-typings';
 import { LivechatBusinessHours, Users } from '@rocket.chat/models';
 
+import { notifyOnUserChange } from '../../../lib/server/lib/notifyListener';
 import { businessHourLogger } from '../lib/logger';
 import type { IBusinessHourBehavior } from './AbstractBusinessHour';
 import { AbstractBusinessHourBehavior } from './AbstractBusinessHour';
-import { filterBusinessHoursThatMustBeOpened, openBusinessHourDefault } from './Helper';
+import { filterBusinessHoursThatMustBeOpened, makeAgentsUnavailableBasedOnBusinessHour, openBusinessHourDefault } from './Helper';
 
 export class SingleBusinessHourBehavior extends AbstractBusinessHourBehavior implements IBusinessHourBehavior {
 	async openBusinessHoursByDayAndHour(): Promise<void> {
@@ -18,7 +19,8 @@ export class SingleBusinessHourBehavior extends AbstractBusinessHourBehavior imp
 			})
 		).map((businessHour) => businessHour._id);
 		await this.UsersRepository.closeAgentsBusinessHoursByBusinessHourIds(businessHoursIds);
-		await this.UsersRepository.updateLivechatStatusBasedOnBusinessHours();
+
+		await makeAgentsUnavailableBasedOnBusinessHour();
 	}
 
 	async onStartBusinessHours(): Promise<void> {
@@ -41,7 +43,19 @@ export class SingleBusinessHourBehavior extends AbstractBusinessHourBehavior imp
 				agentId,
 				newStatus: ILivechatAgentStatus.NOT_AVAILABLE,
 			});
-			await Users.setLivechatStatus(agentId, ILivechatAgentStatus.NOT_AVAILABLE);
+
+			const { modifiedCount } = await Users.setLivechatStatus(agentId, ILivechatAgentStatus.NOT_AVAILABLE);
+			if (modifiedCount > 0) {
+				void notifyOnUserChange({
+					id: agentId,
+					clientAction: 'updated',
+					diff: {
+						statusLivechat: ILivechatAgentStatus.NOT_AVAILABLE,
+						livechatStatusSystemModified: false,
+					},
+				});
+			}
+
 			return;
 		}
 
diff --git a/apps/meteor/app/livechat/server/business-hour/closeBusinessHour.ts b/apps/meteor/app/livechat/server/business-hour/closeBusinessHour.ts
index a2295b529272..976d8ec1705e 100644
--- a/apps/meteor/app/livechat/server/business-hour/closeBusinessHour.ts
+++ b/apps/meteor/app/livechat/server/business-hour/closeBusinessHour.ts
@@ -3,6 +3,7 @@ import { Users } from '@rocket.chat/models';
 import { makeFunction } from '@rocket.chat/patch-injection';
 
 import { businessHourLogger } from '../lib/logger';
+import { makeAgentsUnavailableBasedOnBusinessHour } from './Helper';
 import { getAgentIdsForBusinessHour } from './getAgentIdsForBusinessHour';
 
 export const closeBusinessHourByAgentIds = async (
@@ -16,7 +17,8 @@ export const closeBusinessHourByAgentIds = async (
 		top10AgentIds: agentIds.slice(0, 10),
 	});
 	await Users.removeBusinessHourByAgentIds(agentIds, businessHourId);
-	await Users.updateLivechatStatusBasedOnBusinessHours();
+
+	await makeAgentsUnavailableBasedOnBusinessHour();
 };
 
 export const closeBusinessHour = makeFunction(async (businessHour: Pick<ILivechatBusinessHour, '_id' | 'type'>): Promise<void> => {
diff --git a/apps/meteor/app/livechat/server/hooks/afterAgentRemoved.ts b/apps/meteor/app/livechat/server/hooks/afterAgentRemoved.ts
index 01b7fd3c186b..5dcb9513ec2f 100644
--- a/apps/meteor/app/livechat/server/hooks/afterAgentRemoved.ts
+++ b/apps/meteor/app/livechat/server/hooks/afterAgentRemoved.ts
@@ -1,18 +1,32 @@
 import { LivechatDepartment, Users, LivechatDepartmentAgents, LivechatVisitors } from '@rocket.chat/models';
 
 import { callbacks } from '../../../../lib/callbacks';
-import { notifyOnLivechatDepartmentAgentChanged } from '../../../lib/server/lib/notifyListener';
+import { notifyOnLivechatDepartmentAgentChanged, notifyOnUserChange } from '../../../lib/server/lib/notifyListener';
 
 callbacks.add('livechat.afterAgentRemoved', async ({ agent }) => {
 	const departments = await LivechatDepartmentAgents.findByAgentId(agent._id).toArray();
 
-	const [, { deletedCount }] = await Promise.all([
+	const [{ modifiedCount }, { deletedCount }] = await Promise.all([
 		Users.removeAgent(agent._id),
 		LivechatDepartmentAgents.removeByAgentId(agent._id),
 		agent.username && LivechatVisitors.removeContactManagerByUsername(agent.username),
 		departments.length && LivechatDepartment.decreaseNumberOfAgentsByIds(departments.map(({ departmentId }) => departmentId)),
 	]);
 
+	if (modifiedCount > 0) {
+		void notifyOnUserChange({
+			id: agent._id,
+			clientAction: 'updated',
+			diff: {
+				operator: false,
+				livechat: null,
+				statusLivechat: null,
+				extension: null,
+				openBusinessHours: null,
+			},
+		});
+	}
+
 	if (deletedCount > 0) {
 		departments.forEach((depAgent) => {
 			void notifyOnLivechatDepartmentAgentChanged(
diff --git a/apps/meteor/app/livechat/server/lib/LivechatTyped.ts b/apps/meteor/app/livechat/server/lib/LivechatTyped.ts
index 13fc8ff37b49..bf5014b984f1 100644
--- a/apps/meteor/app/livechat/server/lib/LivechatTyped.ts
+++ b/apps/meteor/app/livechat/server/lib/LivechatTyped.ts
@@ -63,6 +63,7 @@ import {
 	notifyOnRoomChangedById,
 	notifyOnLivechatInquiryChangedByToken,
 	notifyOnLivechatDepartmentAgentChangedByDepartmentId,
+	notifyOnUserChange,
 } from '../../../lib/server/lib/notifyListener';
 import * as Mailer from '../../../mailer/server/api';
 import { metrics } from '../../../metrics/server';
@@ -1308,9 +1309,18 @@ class LivechatClass {
 	}
 
 	async setUserStatusLivechatIf(userId: string, status: ILivechatAgentStatus, condition?: Filter<IUser>, fields?: AKeyOf<ILivechatAgent>) {
-		const user = await Users.setLivechatStatusIf(userId, status, condition, fields);
+		const result = await Users.setLivechatStatusIf(userId, status, condition, fields);
+
+		if (result.modifiedCount > 0) {
+			void notifyOnUserChange({
+				id: userId,
+				clientAction: 'updated',
+				diff: { ...fields, statusLivechat: status },
+			});
+		}
+
 		callbacks.runAsync('livechat.setUserStatusLivechat', { userId, status });
-		return user;
+		return result;
 	}
 
 	async returnRoomAsInquiry(room: IOmnichannelRoom, departmentId?: string, overrideTransferData: any = {}) {
@@ -1692,6 +1702,18 @@ class LivechatClass {
 	async setUserStatusLivechat(userId: string, status: ILivechatAgentStatus) {
 		const user = await Users.setLivechatStatus(userId, status);
 		callbacks.runAsync('livechat.setUserStatusLivechat', { userId, status });
+
+		if (user.modifiedCount > 0) {
+			void notifyOnUserChange({
+				id: userId,
+				clientAction: 'updated',
+				diff: {
+					statusLivechat: status,
+					livechatStatusSystemModified: false,
+				},
+			});
+		}
+
 		return user;
 	}
 
diff --git a/apps/meteor/app/livechat/server/startup.ts b/apps/meteor/app/livechat/server/startup.ts
index 098fa803711c..b61c85c4001e 100644
--- a/apps/meteor/app/livechat/server/startup.ts
+++ b/apps/meteor/app/livechat/server/startup.ts
@@ -10,6 +10,7 @@ import { beforeLeaveRoomCallback } from '../../../lib/callbacks/beforeLeaveRoomC
 import { i18n } from '../../../server/lib/i18n';
 import { roomCoordinator } from '../../../server/lib/rooms/roomCoordinator';
 import { hasPermissionAsync } from '../../authorization/server/functions/hasPermission';
+import { notifyOnUserChange } from '../../lib/server/lib/notifyListener';
 import { settings } from '../../settings/server';
 import { businessHourManager } from './business-hour';
 import { createDefaultBusinessHourIfNotExists } from './business-hour/Helper';
@@ -86,15 +87,25 @@ Meteor.startup(async () => {
 	});
 
 	// Remove when accounts.onLogout is async
-	Accounts.onLogout(
-		({ user }: { user: IUser }) =>
-			user?.roles?.includes('livechat-agent') &&
-			!user?.roles?.includes('bot') &&
-			void LivechatTyped.setUserStatusLivechatIf(
-				user._id,
-				ILivechatAgentStatus.NOT_AVAILABLE,
-				{},
-				{ livechatStatusSystemModified: true },
-			).catch(),
-	);
+	Accounts.onLogout(({ user }: { user: IUser }) => {
+		if (!user?.roles?.includes('livechat-agent') || user?.roles?.includes('bot')) {
+			return;
+		}
+
+		void LivechatTyped.setUserStatusLivechatIf(
+			user._id,
+			ILivechatAgentStatus.NOT_AVAILABLE,
+			{},
+			{ livechatStatusSystemModified: true },
+		).catch();
+
+		void notifyOnUserChange({
+			id: user._id,
+			clientAction: 'updated',
+			diff: {
+				statusLivechat: ILivechatAgentStatus.NOT_AVAILABLE,
+				livechatStatusSystemModified: true,
+			},
+		});
+	});
 });
diff --git a/apps/meteor/app/version-check/server/methods/banner_dismiss.ts b/apps/meteor/app/version-check/server/methods/banner_dismiss.ts
index 960379d1a99b..5ffebcfbbd5a 100644
--- a/apps/meteor/app/version-check/server/methods/banner_dismiss.ts
+++ b/apps/meteor/app/version-check/server/methods/banner_dismiss.ts
@@ -2,6 +2,8 @@ import { Users } from '@rocket.chat/models';
 import type { ServerMethods } from '@rocket.chat/ui-contexts';
 import { Meteor } from 'meteor/meteor';
 
+import { notifyOnUserChange } from '../../../lib/server/lib/notifyListener';
+
 declare module '@rocket.chat/ui-contexts' {
 	// eslint-disable-next-line @typescript-eslint/naming-convention
 	interface ServerMethods {
@@ -17,5 +19,13 @@ Meteor.methods<ServerMethods>({
 		}
 
 		await Users.setBannerReadById(userId, id);
+
+		void notifyOnUserChange({
+			id: userId,
+			clientAction: 'updated',
+			diff: {
+				[`banners.${id}.read`]: true,
+			},
+		});
 	},
 });
diff --git a/apps/meteor/ee/app/livechat-enterprise/server/business-hour/Custom.ts b/apps/meteor/ee/app/livechat-enterprise/server/business-hour/Custom.ts
index 6086f3d4de74..e2803dea418e 100644
--- a/apps/meteor/ee/app/livechat-enterprise/server/business-hour/Custom.ts
+++ b/apps/meteor/ee/app/livechat-enterprise/server/business-hour/Custom.ts
@@ -5,7 +5,10 @@ import { LivechatDepartment, LivechatDepartmentAgents, Users } from '@rocket.cha
 import { businessHourManager } from '../../../../../app/livechat/server/business-hour';
 import type { IBusinessHourType } from '../../../../../app/livechat/server/business-hour/AbstractBusinessHour';
 import { AbstractBusinessHourType } from '../../../../../app/livechat/server/business-hour/AbstractBusinessHour';
-import { filterBusinessHoursThatMustBeOpened } from '../../../../../app/livechat/server/business-hour/Helper';
+import {
+	filterBusinessHoursThatMustBeOpened,
+	makeAgentsUnavailableBasedOnBusinessHour,
+} from '../../../../../app/livechat/server/business-hour/Helper';
 import { bhLogger } from '../lib/logger';
 
 type IBusinessHoursExtraProperties = {
@@ -79,7 +82,8 @@ class CustomBusinessHour extends AbstractBusinessHourType implements IBusinessHo
 		await this.BusinessHourRepository.removeById(businessHourId);
 		await this.removeBusinessHourFromAgents(businessHourId);
 		await LivechatDepartment.removeBusinessHourFromDepartmentsByBusinessHourId(businessHourId);
-		this.UsersRepository.updateLivechatStatusBasedOnBusinessHours();
+
+		await makeAgentsUnavailableBasedOnBusinessHour();
 	}
 
 	private async removeBusinessHourFromAgents(businessHourId: string): Promise<void> {
@@ -147,7 +151,8 @@ class CustomBusinessHour extends AbstractBusinessHourType implements IBusinessHo
 		).map((dept) => dept.agentId);
 
 		await Users.removeBusinessHourByAgentIds(agentsConnectedToDefaultBH, defaultBusinessHour._id);
-		await Users.updateLivechatStatusBasedOnBusinessHours();
+
+		await makeAgentsUnavailableBasedOnBusinessHour();
 	}
 
 	private async addBusinessHourToDepartmentsIfNeeded(businessHourId: string, departmentsToAdd: string[]): Promise<void> {
diff --git a/apps/meteor/ee/app/livechat-enterprise/server/business-hour/Helper.ts b/apps/meteor/ee/app/livechat-enterprise/server/business-hour/Helper.ts
index cd4af235270c..71cd69b448bb 100644
--- a/apps/meteor/ee/app/livechat-enterprise/server/business-hour/Helper.ts
+++ b/apps/meteor/ee/app/livechat-enterprise/server/business-hour/Helper.ts
@@ -2,6 +2,10 @@ import type { ILivechatBusinessHour } from '@rocket.chat/core-typings';
 import { LivechatBusinessHourTypes } from '@rocket.chat/core-typings';
 import { LivechatDepartment, LivechatDepartmentAgents, Users } from '@rocket.chat/models';
 
+import {
+	makeAgentsUnavailableBasedOnBusinessHour,
+	makeOnlineAgentsAvailable,
+} from '../../../../../app/livechat/server/business-hour/Helper';
 import { getAgentIdsForBusinessHour } from '../../../../../app/livechat/server/business-hour/getAgentIdsForBusinessHour';
 import { businessHourLogger } from '../../../../../app/livechat/server/lib/logger';
 
@@ -33,10 +37,10 @@ export const openBusinessHour = async (
 		top10AgentIds: agentIds.slice(0, 10),
 	});
 	await Users.addBusinessHourByAgentIds(agentIds, businessHour._id);
-	await Users.makeAgentsWithinBusinessHourAvailable(agentIds);
+	await makeOnlineAgentsAvailable(agentIds);
 
 	if (updateLivechatStatus) {
-		await Users.updateLivechatStatusBasedOnBusinessHours();
+		await makeAgentsUnavailableBasedOnBusinessHour();
 	}
 };
 
@@ -45,5 +49,5 @@ export const removeBusinessHourByAgentIds = async (agentIds: string[], businessH
 		return;
 	}
 	await Users.removeBusinessHourByAgentIds(agentIds, businessHourId);
-	await Users.updateLivechatStatusBasedOnBusinessHours();
+	await makeAgentsUnavailableBasedOnBusinessHour();
 };
diff --git a/apps/meteor/ee/app/livechat-enterprise/server/business-hour/Multiple.ts b/apps/meteor/ee/app/livechat-enterprise/server/business-hour/Multiple.ts
index d2cd3fb17240..f0a11d4de7f0 100644
--- a/apps/meteor/ee/app/livechat-enterprise/server/business-hour/Multiple.ts
+++ b/apps/meteor/ee/app/livechat-enterprise/server/business-hour/Multiple.ts
@@ -9,6 +9,8 @@ import { AbstractBusinessHourBehavior } from '../../../../../app/livechat/server
 import {
 	filterBusinessHoursThatMustBeOpened,
 	filterBusinessHoursThatMustBeOpenedByDay,
+	makeOnlineAgentsAvailable,
+	makeAgentsUnavailableBasedOnBusinessHour,
 } from '../../../../../app/livechat/server/business-hour/Helper';
 import { closeBusinessHour } from '../../../../../app/livechat/server/business-hour/closeBusinessHour';
 import { settings } from '../../../../../app/settings/server';
@@ -34,7 +36,10 @@ export class MultipleBusinessHoursBehavior extends AbstractBusinessHourBehavior
 
 	async onStartBusinessHours(): Promise<void> {
 		await this.UsersRepository.removeBusinessHoursFromAllUsers();
-		await this.UsersRepository.updateLivechatStatusBasedOnBusinessHours();
+
+		// TODO is this required? since we're calling `this.openBusinessHour(businessHour)` later on, which will call this again (kinda)
+		await makeAgentsUnavailableBasedOnBusinessHour();
+
 		const currentTime = moment.utc(moment().utc().format('dddd:HH:mm'), 'dddd:HH:mm');
 		const day = currentTime.format('dddd');
 		const activeBusinessHours = await this.BusinessHourRepository.findActiveAndOpenBusinessHoursByDay(day, {
@@ -118,7 +123,7 @@ export class MultipleBusinessHoursBehavior extends AbstractBusinessHourBehavior
 			}
 
 			await this.UsersRepository.addBusinessHourByAgentIds(agentsId, defaultBusinessHour._id);
-			await this.UsersRepository.makeAgentsWithinBusinessHourAvailable(agentsId);
+			await makeOnlineAgentsAvailable(agentsId);
 
 			return options;
 		}
@@ -139,7 +144,7 @@ export class MultipleBusinessHoursBehavior extends AbstractBusinessHourBehavior
 		}
 
 		await this.UsersRepository.addBusinessHourByAgentIds(agentsId, businessHour._id);
-		await this.UsersRepository.makeAgentsWithinBusinessHourAvailable(agentsId);
+		await makeOnlineAgentsAvailable(agentsId);
 
 		return options;
 	}
@@ -208,11 +213,13 @@ export class MultipleBusinessHoursBehavior extends AbstractBusinessHourBehavior
 		if (!settings.get('Livechat_enable_business_hours')) {
 			return;
 		}
+
 		const businessHourToOpen = await filterBusinessHoursThatMustBeOpened([businessHour, defaultBH]);
 		for await (const bh of businessHourToOpen) {
 			await openBusinessHour(bh, false);
 		}
-		await Users.updateLivechatStatusBasedOnBusinessHours();
+
+		await makeAgentsUnavailableBasedOnBusinessHour();
 		await businessHourManager.restartCronJobsIfNecessary();
 	}
 
@@ -228,7 +235,7 @@ export class MultipleBusinessHoursBehavior extends AbstractBusinessHourBehavior
 	async onNewAgentCreated(agentId: string): Promise<void> {
 		await this.applyAnyOpenBusinessHourToAgent(agentId);
 
-		await Users.updateLivechatStatusBasedOnBusinessHours([agentId]);
+		await makeAgentsUnavailableBasedOnBusinessHour([agentId]);
 	}
 
 	private async applyAnyOpenBusinessHourToAgent(agentId: string): Promise<void> {
diff --git a/apps/meteor/ee/server/lib/ldap/copyCustomFieldsLDAP.ts b/apps/meteor/ee/server/lib/ldap/copyCustomFieldsLDAP.ts
index c5a7c56b63e1..5d8bf044bc28 100644
--- a/apps/meteor/ee/server/lib/ldap/copyCustomFieldsLDAP.ts
+++ b/apps/meteor/ee/server/lib/ldap/copyCustomFieldsLDAP.ts
@@ -2,7 +2,7 @@ import type { IImportUser, ILDAPEntry } from '@rocket.chat/core-typings';
 import type { Logger } from '@rocket.chat/logger';
 
 import { templateVarHandler } from '../../../../app/utils/lib/templateVarHandler';
-import { getNestedProp } from './getNestedProp';
+import { getNestedProp } from '../../../../server/lib/getNestedProp';
 import { replacesNestedValues } from './replacesNestedValues';
 
 export const copyCustomFieldsLDAP = (
diff --git a/apps/meteor/server/database/watchCollections.ts b/apps/meteor/server/database/watchCollections.ts
index 0207b425a350..5cd56af62fd6 100644
--- a/apps/meteor/server/database/watchCollections.ts
+++ b/apps/meteor/server/database/watchCollections.ts
@@ -29,10 +29,11 @@ const onlyCollections = DBWATCHER_ONLY_COLLECTIONS.split(',')
 	.filter(Boolean);
 
 export function getWatchCollections(): string[] {
-	const collections = [Users.getCollectionName(), InstanceStatus.getCollectionName(), Subscriptions.getCollectionName()];
+	const collections = [InstanceStatus.getCollectionName(), Subscriptions.getCollectionName()];
 
 	// add back to the list of collections in case db watchers are enabled
 	if (!dbWatchersDisabled) {
+		collections.push(Users.getCollectionName());
 		collections.push(Messages.getCollectionName());
 		collections.push(LivechatInquiry.getCollectionName());
 		collections.push(Roles.getCollectionName());
diff --git a/apps/meteor/ee/server/lib/ldap/getNestedProp.spec.ts b/apps/meteor/server/lib/getNestedProp.spec.ts
similarity index 100%
rename from apps/meteor/ee/server/lib/ldap/getNestedProp.spec.ts
rename to apps/meteor/server/lib/getNestedProp.spec.ts
diff --git a/apps/meteor/ee/server/lib/ldap/getNestedProp.ts b/apps/meteor/server/lib/getNestedProp.ts
similarity index 100%
rename from apps/meteor/ee/server/lib/ldap/getNestedProp.ts
rename to apps/meteor/server/lib/getNestedProp.ts
diff --git a/apps/meteor/server/lib/sendMessagesToAdmins.ts b/apps/meteor/server/lib/sendMessagesToAdmins.ts
index afd254233263..386b8fece3f6 100644
--- a/apps/meteor/server/lib/sendMessagesToAdmins.ts
+++ b/apps/meteor/server/lib/sendMessagesToAdmins.ts
@@ -1,6 +1,7 @@
 import type { IUser, IMessage } from '@rocket.chat/core-typings';
 import { Roles, Users } from '@rocket.chat/models';
 
+import { notifyOnUserChangeAsync } from '../../app/lib/server/lib/notifyListener';
 import { executeSendMessage } from '../../app/lib/server/methods/sendMessage';
 import { createDirectMessage } from '../methods/createDirectMessage';
 import { SystemLogger } from './logger/system';
@@ -40,6 +41,8 @@ export async function sendMessagesToAdmins({
 
 	const users = await (await Roles.findUsersInRole('admin')).toArray();
 
+	const notifyAdmins: string[] = [];
+
 	for await (const adminUser of users) {
 		if (fromUser) {
 			try {
@@ -53,6 +56,29 @@ export async function sendMessagesToAdmins({
 			}
 		}
 
-		await Promise.all((await getData<Banner>(banners, adminUser)).map((banner) => Users.addBannerById(adminUser._id, banner)));
+		const updates = await Promise.all(
+			(await getData<Banner>(banners, adminUser)).map((banner) => Users.addBannerById(adminUser._id, banner)),
+		);
+
+		const hasUpdated = updates.some(({ modifiedCount }) => modifiedCount > 0);
+		if (hasUpdated) {
+			notifyAdmins.push(adminUser._id);
+		}
 	}
+
+	if (notifyAdmins.length === 0) {
+		return;
+	}
+
+	void notifyOnUserChangeAsync(async () => {
+		const results = await Users.findByIds<Pick<IUser, '_id' | 'banners'>>(notifyAdmins, { projection: { banners: 1 } }).toArray();
+
+		return results.map(({ _id, banners }) => ({
+			id: _id,
+			clientAction: 'updated',
+			diff: {
+				banners,
+			},
+		}));
+	});
 }
diff --git a/apps/meteor/server/methods/saveUserPreferences.ts b/apps/meteor/server/methods/saveUserPreferences.ts
index c23f466cf8a5..dbc6bf835640 100644
--- a/apps/meteor/server/methods/saveUserPreferences.ts
+++ b/apps/meteor/server/methods/saveUserPreferences.ts
@@ -5,6 +5,7 @@ import type { ThemePreference } from '@rocket.chat/ui-theming/src/types/themes';
 import { Match, check } from 'meteor/check';
 import { Meteor } from 'meteor/meteor';
 
+import { notifyOnUserChange } from '../../app/lib/server/lib/notifyListener';
 import { settings as rcSettings } from '../../app/settings/server';
 
 type UserPreferences = {
@@ -94,8 +95,8 @@ export const saveUserPreferences = async (settings: Partial<UserPreferences>, us
 		mentionsWithSymbol: Match.Optional(Boolean),
 	};
 	check(settings, Match.ObjectIncluding(keys));
-	const user = await Users.findOneById(userId);
 
+	const user = await Users.findOneById(userId);
 	if (!user) {
 		return;
 	}
@@ -128,6 +129,21 @@ export const saveUserPreferences = async (settings: Partial<UserPreferences>, us
 
 	await Users.setPreferences(user._id, settings);
 
+	const diff = (Object.keys(settings) as (keyof UserPreferences)[]).reduce<Record<string, any>>((data, key) => {
+		data[`settings.preferences.${key}`] = settings[key];
+
+		return data;
+	}, {});
+
+	void notifyOnUserChange({
+		id: user._id,
+		clientAction: 'updated',
+		diff: {
+			...diff,
+			...(settings.language != null && { language: settings.language }),
+		},
+	});
+
 	// propagate changed notification preferences
 	setImmediate(async () => {
 		if (settings.desktopNotifications && oldDesktopNotifications !== settings.desktopNotifications) {
diff --git a/apps/meteor/server/models/raw/Users.js b/apps/meteor/server/models/raw/Users.js
index c6b545caedb8..f5897c635727 100644
--- a/apps/meteor/server/models/raw/Users.js
+++ b/apps/meteor/server/models/raw/Users.js
@@ -968,9 +968,9 @@ export class UsersRaw extends BaseRaw {
 		return this.updateMany(query, update);
 	}
 
-	makeAgentsWithinBusinessHourAvailable(agentIds) {
+	findOnlineButNotAvailableAgents(userIds) {
 		const query = {
-			...(agentIds && { _id: { $in: agentIds } }),
+			...(userIds && { _id: { $in: userIds } }),
 			roles: 'livechat-agent',
 			// Exclude away users
 			status: 'online',
@@ -978,13 +978,7 @@ export class UsersRaw extends BaseRaw {
 			statusLivechat: 'not-available',
 		};
 
-		const update = {
-			$set: {
-				statusLivechat: 'available',
-			},
-		};
-
-		return this.updateMany(query, update);
+		return this.find(query);
 	}
 
 	removeBusinessHourByAgentIds(agentIds = [], businessHourId) {
@@ -1044,24 +1038,21 @@ export class UsersRaw extends BaseRaw {
 		return this.updateMany(query, update);
 	}
 
-	updateLivechatStatusBasedOnBusinessHours(userIds = []) {
-		const query = {
-			$or: [{ openBusinessHours: { $exists: false } }, { openBusinessHours: { $size: 0 } }],
-			$and: [{ roles: 'livechat-agent' }, { roles: { $ne: 'bot' } }],
-			// exclude deactivated users
-			active: true,
-			// Avoid unnecessary updates
-			statusLivechat: 'available',
-			...(Array.isArray(userIds) && userIds.length > 0 && { _id: { $in: userIds } }),
-		};
-
-		const update = {
-			$set: {
-				statusLivechat: 'not-available',
+	findAgentsAvailableWithoutBusinessHours(userIds = []) {
+		return this.find(
+			{
+				$or: [{ openBusinessHours: { $exists: false } }, { openBusinessHours: { $size: 0 } }],
+				$and: [{ roles: 'livechat-agent' }, { roles: { $ne: 'bot' } }],
+				// exclude deactivated users
+				active: true,
+				// Avoid unnecessary updates
+				statusLivechat: 'available',
+				...(Array.isArray(userIds) && userIds.length > 0 && { _id: { $in: userIds } }),
 			},
-		};
-
-		return this.updateMany(query, update);
+			{
+				projection: { openBusinessHours: 1 },
+			},
+		);
 	}
 
 	setLivechatStatusActiveBasedOnBusinessHours(userId) {
@@ -3074,4 +3065,17 @@ export class UsersRaw extends BaseRaw {
 	countByRole(role) {
 		return this.col.countDocuments({ roles: role });
 	}
+
+	updateLivechatStatusByAgentIds(userIds, status) {
+		return this.updateMany(
+			{
+				_id: { $in: userIds },
+			},
+			{
+				$set: {
+					statusLivechat: status,
+				},
+			},
+		);
+	}
 }
diff --git a/apps/meteor/server/modules/listeners/listeners.module.ts b/apps/meteor/server/modules/listeners/listeners.module.ts
index af85d4a29a5f..f0ca92ce82ea 100644
--- a/apps/meteor/server/modules/listeners/listeners.module.ts
+++ b/apps/meteor/server/modules/listeners/listeners.module.ts
@@ -157,6 +157,16 @@ export class ListenersModule {
 				return;
 			}
 
+			notifications.notifyUserInThisInstance(_id, 'userData', {
+				type: 'updated',
+				id: _id,
+				diff: {
+					status,
+					...(statusText && { statusText }),
+				},
+				unset: {},
+			});
+
 			notifications.notifyLoggedInThisInstance('user-status', [_id, username, STATUS_MAP[status], statusText, name, roles]);
 
 			if (_id) {
diff --git a/packages/model-typings/src/models/IUsersModel.ts b/packages/model-typings/src/models/IUsersModel.ts
index 65b7d4f53660..ae6a8f4b125f 100644
--- a/packages/model-typings/src/models/IUsersModel.ts
+++ b/packages/model-typings/src/models/IUsersModel.ts
@@ -134,8 +134,6 @@ export interface IUsersModel extends IBaseModel<IUser> {
 
 	addBusinessHourByAgentIds(agentIds: string[], businessHourId: string): any;
 
-	makeAgentsWithinBusinessHourAvailable(agentIds?: string[]): Promise<UpdateResult | Document>;
-
 	removeBusinessHourByAgentIds(agentIds: any, businessHourId: any): any;
 
 	openBusinessHourToAgentsWithoutDepartment(agentIdsWithDepartment: any, businessHourId: any): any;
@@ -144,8 +142,6 @@ export interface IUsersModel extends IBaseModel<IUser> {
 
 	closeAgentsBusinessHoursByBusinessHourIds(businessHourIds: any): any;
 
-	updateLivechatStatusBasedOnBusinessHours(userIds?: any): any;
-
 	setLivechatStatusActiveBasedOnBusinessHours(userId: any): any;
 
 	isAgentWithinBusinessHours(agentId: string): Promise<boolean>;
@@ -166,7 +162,7 @@ export interface IUsersModel extends IBaseModel<IUser> {
 
 	isUserInRoleScope(uid: IUser['_id']): Promise<boolean>;
 
-	addBannerById(_id: any, banner: any): any;
+	addBannerById(_id: IUser['_id'], banner: any): Promise<UpdateResult>;
 
 	findOneByAgentUsername(username: any, options: any): any;
 
@@ -393,4 +389,7 @@ export interface IUsersModel extends IBaseModel<IUser> {
 	countByRole(roleName: string): Promise<number>;
 	removeEmailCodeOfUserId(userId: string): Promise<UpdateResult>;
 	incrementInvalidEmailCodeAttempt(userId: string): Promise<ModifyResult<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>;
 }

From 768cad6de527ce721ed9b6e093a26a202c29917a Mon Sep 17 00:00:00 2001
From: Yash Rajpal <58601732+yash-rajpal@users.noreply.github.com>
Date: Fri, 21 Jun 2024 10:47:41 +0530
Subject: [PATCH 63/94] feat: E2EE warnings on search and audit panel (#32551)

Co-authored-by: Tasso Evangelista <tasso.evangelista@rocket.chat>
Co-authored-by: Guilherme Gazzo <guilhermegazzo@gmail.com>
---
 .changeset/friendly-months-attack.md          |  6 +++
 apps/meteor/app/api/server/lib/rooms.ts       |  1 +
 .../server/functions/notifications/email.js   |  2 +-
 .../RoomAutoComplete/RoomAutoComplete.tsx     | 25 +++++++++---
 .../client/lib/getRoomTypeTranslation.ts      | 39 +++++++++++++++++++
 apps/meteor/client/views/audit/AuditPage.tsx  | 14 +++++--
 .../views/audit/components/AuditForm.tsx      |  7 ++--
 .../views/audit/components/tabs/RoomsTab.tsx  | 10 ++++-
 .../components/MessageSearchForm.tsx          | 13 ++++++-
 packages/core-typings/src/IRoom.ts            |  1 +
 packages/i18n/src/locales/en.i18n.json        |  7 ++++
 11 files changed, 109 insertions(+), 16 deletions(-)
 create mode 100644 .changeset/friendly-months-attack.md
 create mode 100644 apps/meteor/client/lib/getRoomTypeTranslation.ts

diff --git a/.changeset/friendly-months-attack.md b/.changeset/friendly-months-attack.md
new file mode 100644
index 000000000000..90f0e58a9b32
--- /dev/null
+++ b/.changeset/friendly-months-attack.md
@@ -0,0 +1,6 @@
+---
+'@rocket.chat/i18n': minor
+'@rocket.chat/meteor': minor
+---
+
+Implement E2EE warning callouts letting users know that encrypted messages can't be searched and auditted on search contextual bar and audit panel.
diff --git a/apps/meteor/app/api/server/lib/rooms.ts b/apps/meteor/app/api/server/lib/rooms.ts
index 14d3e20502fd..3f1353be8a6c 100644
--- a/apps/meteor/app/api/server/lib/rooms.ts
+++ b/apps/meteor/app/api/server/lib/rooms.ts
@@ -98,6 +98,7 @@ export async function findAdminRoomsAutocomplete({ uid, selector }: { uid: strin
 			name: 1,
 			t: 1,
 			avatarETag: 1,
+			encrypted: 1,
 		},
 		limit: 10,
 		sort: {
diff --git a/apps/meteor/app/lib/server/functions/notifications/email.js b/apps/meteor/app/lib/server/functions/notifications/email.js
index dfc6a1716703..3757c81ee2d7 100644
--- a/apps/meteor/app/lib/server/functions/notifications/email.js
+++ b/apps/meteor/app/lib/server/functions/notifications/email.js
@@ -43,7 +43,7 @@ async function getEmailContent({ message, user, room }) {
 		let messageContent = escapeHTML(message.msg);
 
 		if (message.t === 'e2e') {
-			messageContent = i18n.t('Encrypted_message', { lng });
+			messageContent = i18n.t('Encrypted_message_preview_unavailable', { lng });
 		}
 
 		message = await callbacks.run('renderMessage', message);
diff --git a/apps/meteor/client/components/RoomAutoComplete/RoomAutoComplete.tsx b/apps/meteor/client/components/RoomAutoComplete/RoomAutoComplete.tsx
index 10bea7cc0b60..0da0e942b2e2 100644
--- a/apps/meteor/client/components/RoomAutoComplete/RoomAutoComplete.tsx
+++ b/apps/meteor/client/components/RoomAutoComplete/RoomAutoComplete.tsx
@@ -1,9 +1,10 @@
+import type { IRoom } from '@rocket.chat/core-typings';
 import { AutoComplete, Option, Box } from '@rocket.chat/fuselage';
 import { useDebouncedValue } from '@rocket.chat/fuselage-hooks';
 import { RoomAvatar } from '@rocket.chat/ui-avatar';
 import { useEndpoint } from '@rocket.chat/ui-contexts';
 import { useQuery } from '@tanstack/react-query';
-import type { ComponentProps } from 'react';
+import type { ComponentProps, ReactElement } from 'react';
 import React, { memo, useMemo, useState } from 'react';
 
 const generateQuery = (
@@ -12,7 +13,11 @@ const generateQuery = (
 	selector: string;
 } => ({ selector: JSON.stringify({ name: term }) });
 
-type RoomAutoCompleteProps = Omit<ComponentProps<typeof AutoComplete>, 'filter'> & { scope?: 'admin' | 'regular' };
+type RoomAutoCompleteProps = Omit<ComponentProps<typeof AutoComplete>, 'filter'> & {
+	scope?: 'admin' | 'regular';
+	renderRoomIcon?: (props: { encrypted: IRoom['encrypted']; type: IRoom['t'] }) => ReactElement | null;
+	setSelectedRoom?: React.Dispatch<React.SetStateAction<IRoom | undefined>>;
+};
 
 const AVATAR_SIZE = 'x20';
 
@@ -27,7 +32,7 @@ const ROOM_AUTOCOMPLETE_PARAMS = {
 	},
 } as const;
 
-const RoomAutoComplete = ({ value, onChange, scope = 'regular', ...props }: RoomAutoCompleteProps) => {
+const RoomAutoComplete = ({ value, onChange, scope = 'regular', renderRoomIcon, setSelectedRoom, ...props }: RoomAutoCompleteProps) => {
 	const [filter, setFilter] = useState('');
 	const filterDebounced = useDebouncedValue(filter, 300);
 	const roomsAutoCompleteEndpoint = useEndpoint('GET', ROOM_AUTOCOMPLETE_PARAMS[scope].endpoint);
@@ -43,9 +48,9 @@ const RoomAutoComplete = ({ value, onChange, scope = 'regular', ...props }: Room
 	const options = useMemo(
 		() =>
 			result.isSuccess
-				? result.data.items.map(({ name, fname, _id, avatarETag, t }) => ({
+				? result.data.items.map(({ name, fname, _id, avatarETag, t, encrypted }) => ({
 						value: _id,
-						label: { name: fname || name, avatarETag, type: t },
+						label: { name: fname || name, avatarETag, type: t, encrypted },
 				  }))
 				: [],
 		[result.data?.items, result.isSuccess],
@@ -55,7 +60,14 @@ const RoomAutoComplete = ({ value, onChange, scope = 'regular', ...props }: Room
 		<AutoComplete
 			{...props}
 			value={value}
-			onChange={onChange}
+			onChange={(val) => {
+				onChange(val);
+
+				if (setSelectedRoom && typeof setSelectedRoom === 'function') {
+					const selectedRoom = result?.data?.items.find(({ _id }) => _id === val) as unknown as IRoom;
+					setSelectedRoom(selectedRoom);
+				}
+			}}
 			filter={filter}
 			setFilter={setFilter}
 			renderSelected={({ selected: { value, label } }) => (
@@ -66,6 +78,7 @@ const RoomAutoComplete = ({ value, onChange, scope = 'regular', ...props }: Room
 					<Box margin='none' mi={2}>
 						{label?.name}
 					</Box>
+					{renderRoomIcon?.({ ...label })}
 				</>
 			)}
 			renderItem={({ value, label, ...props }) => (
diff --git a/apps/meteor/client/lib/getRoomTypeTranslation.ts b/apps/meteor/client/lib/getRoomTypeTranslation.ts
new file mode 100644
index 000000000000..e0c8556bac36
--- /dev/null
+++ b/apps/meteor/client/lib/getRoomTypeTranslation.ts
@@ -0,0 +1,39 @@
+import {
+	isPublicRoom,
+	type IRoom,
+	isDirectMessageRoom,
+	isPrivateTeamRoom,
+	isPublicTeamRoom,
+	isPrivateDiscussion,
+	isPrivateRoom,
+} from '@rocket.chat/core-typings';
+
+import { t } from '../../app/utils/lib/i18n';
+
+export const getRoomTypeTranslation = (room: IRoom) => {
+	if (isPublicRoom(room)) {
+		return t('Channel');
+	}
+
+	if (isPrivateDiscussion(room)) {
+		return t('Private_Discussion');
+	}
+
+	if (isPrivateRoom(room)) {
+		return t('Private_Group');
+	}
+
+	if (isDirectMessageRoom(room)) {
+		return t('Direct_Message');
+	}
+
+	if (isPrivateTeamRoom(room)) {
+		return t('Teams_Private_Team');
+	}
+
+	if (isPublicTeamRoom(room)) {
+		return t('Teams_Public_Team');
+	}
+
+	return t('Room');
+};
diff --git a/apps/meteor/client/views/audit/AuditPage.tsx b/apps/meteor/client/views/audit/AuditPage.tsx
index bfe7a067f672..ca379883224e 100644
--- a/apps/meteor/client/views/audit/AuditPage.tsx
+++ b/apps/meteor/client/views/audit/AuditPage.tsx
@@ -1,6 +1,7 @@
-import { Margins, States, StatesIcon, StatesSubtitle, StatesTitle, Tabs } from '@rocket.chat/fuselage';
+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 from 'react';
+import React, { useState } from 'react';
 
 import { Page, PageHeader, PageScrollableContentWithShadow } from '../../components/Page';
 import MessageListSkeleton from '../../components/message/list/MessageListSkeleton';
@@ -12,6 +13,7 @@ import { useAuditTab } from './hooks/useAuditTab';
 
 const AuditPage = () => {
 	const [type, setType] = useAuditTab();
+	const [selectedRoom, setSelectedRoom] = useState<IRoom | undefined>();
 	const auditMutation = useAuditMutation(type);
 	const t = useTranslation();
 
@@ -34,7 +36,13 @@ const AuditPage = () => {
 			</Tabs>
 			<PageScrollableContentWithShadow mb={-4}>
 				<Margins block={4}>
-					<AuditForm key={type} type={type} onSubmit={auditMutation.mutate} />
+					<AuditForm key={type} type={type} setSelectedRoom={setSelectedRoom} onSubmit={auditMutation.mutate} />
+					{selectedRoom?.encrypted && type === '' ? (
+						<Callout type='warning' icon='circle-exclamation' marginBlock='x16'>
+							<Box fontScale='p2b'>{t('Encrypted_content_cannot_be_searched_and_audited')}</Box>
+							{t('Encrypted_content_cannot_be_searched_and_audited_subtitle')}
+						</Callout>
+					) : null}
 					{auditMutation.isLoading && <MessageListSkeleton messageCount={5} />}
 					{auditMutation.isError && (
 						<States>
diff --git a/apps/meteor/client/views/audit/components/AuditForm.tsx b/apps/meteor/client/views/audit/components/AuditForm.tsx
index 4341ae46b02b..343fbeff0138 100644
--- a/apps/meteor/client/views/audit/components/AuditForm.tsx
+++ b/apps/meteor/client/views/audit/components/AuditForm.tsx
@@ -1,4 +1,4 @@
-import type { IAuditLog } from '@rocket.chat/core-typings';
+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';
@@ -16,9 +16,10 @@ import UsersTab from './tabs/UsersTab';
 type AuditFormProps = {
 	type: IAuditLog['fields']['type'];
 	onSubmit?: (payload: { type: IAuditLog['fields']['type'] } & AuditFields) => void;
+	setSelectedRoom: React.Dispatch<React.SetStateAction<IRoom | undefined>>;
 };
 
-const AuditForm = ({ type, onSubmit }: AuditFormProps) => {
+const AuditForm = ({ type, onSubmit, setSelectedRoom }: AuditFormProps) => {
 	const t = useTranslation();
 
 	const form = useAuditForm();
@@ -55,7 +56,7 @@ const AuditForm = ({ type, onSubmit }: AuditFormProps) => {
 				</Field>
 			</Box>
 			<Box display='flex' flexDirection='row' alignItems='flex-start'>
-				{type === '' && <RoomsTab form={form} />}
+				{type === '' && <RoomsTab form={form} setSelectedRoom={setSelectedRoom} />}
 				{type === 'u' && <UsersTab form={form} />}
 				{type === 'd' && <DirectTab form={form} />}
 				{type === 'l' && <OmnichannelTab form={form} />}
diff --git a/apps/meteor/client/views/audit/components/tabs/RoomsTab.tsx b/apps/meteor/client/views/audit/components/tabs/RoomsTab.tsx
index d95d82d0e8ce..3a3c0ab2c3d5 100644
--- a/apps/meteor/client/views/audit/components/tabs/RoomsTab.tsx
+++ b/apps/meteor/client/views/audit/components/tabs/RoomsTab.tsx
@@ -1,4 +1,5 @@
-import { Field, FieldLabel, FieldRow, FieldError } from '@rocket.chat/fuselage';
+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';
@@ -9,9 +10,10 @@ import type { AuditFields } from '../../hooks/useAuditForm';
 
 type RoomsTabProps = {
 	form: UseFormReturn<AuditFields>;
+	setSelectedRoom: React.Dispatch<React.SetStateAction<IRoom | undefined>>;
 };
 
-const RoomsTab = ({ form: { control } }: RoomsTabProps) => {
+const RoomsTab = ({ form: { control }, setSelectedRoom }: RoomsTabProps) => {
 	const t = useTranslation();
 
 	const { field: ridField, fieldState: ridFieldState } = useController({ name: 'rid', control, rules: { required: true } });
@@ -22,10 +24,14 @@ const RoomsTab = ({ form: { control } }: RoomsTabProps) => {
 			<FieldRow>
 				<RoomAutoComplete
 					scope='admin'
+					setSelectedRoom={setSelectedRoom}
 					value={ridField.value}
 					error={!!ridFieldState.error}
 					placeholder={t('Channel_Name_Placeholder')}
 					onChange={ridField.onChange}
+					renderRoomIcon={({ encrypted }) =>
+						encrypted ? <Icon name='key' color='danger' title={t('Encrypted_content_will_not_appear_search')} /> : null
+					}
 				/>
 			</FieldRow>
 			{ridFieldState.error?.type === 'required' && <FieldError>{t('The_field_is_required', t('Channel_name'))}</FieldError>}
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 58e51a410235..9067c4c55ebf 100644
--- a/apps/meteor/client/views/room/contextualBar/MessageSearchTab/components/MessageSearchForm.tsx
+++ b/apps/meteor/client/views/room/contextualBar/MessageSearchTab/components/MessageSearchForm.tsx
@@ -1,11 +1,14 @@
 import type { IMessageSearchProvider } from '@rocket.chat/core-typings';
-import { Box, Field, FieldLabel, FieldRow, FieldHint, Icon, TextInput, ToggleSwitch } from '@rocket.chat/fuselage';
+import { Box, Field, FieldLabel, FieldRow, 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 { getRoomTypeTranslation } from '../../../../../lib/getRoomTypeTranslation';
+import { useRoom } from '../../../contexts/RoomContext';
+
 type MessageSearchFormProps = {
 	provider: IMessageSearchProvider;
 	onSearch: (params: { searchText: string; globalSearch: boolean }) => void;
@@ -19,6 +22,8 @@ const MessageSearchForm = ({ provider, onSearch }: MessageSearchFormProps) => {
 		},
 	});
 
+	const room = useRoom();
+
 	useEffect(() => {
 		setFocus('searchText');
 	}, [setFocus]);
@@ -75,6 +80,12 @@ const MessageSearchForm = ({ provider, onSearch }: MessageSearchFormProps) => {
 					</Field>
 				)}
 			</Box>
+			{room.encrypted && (
+				<Callout type='warning' mbs={12} icon='circle-exclamation'>
+					<Box fontScale='p2b'>{t('Encrypted_RoomType', { roomType: getRoomTypeTranslation(room).toLowerCase() })}</Box>
+					{t('Encrypted_content_cannot_be_searched')}
+				</Callout>
+			)}
 		</Box>
 	);
 };
diff --git a/packages/core-typings/src/IRoom.ts b/packages/core-typings/src/IRoom.ts
index 38fe23bd3453..32bf438cd70d 100644
--- a/packages/core-typings/src/IRoom.ts
+++ b/packages/core-typings/src/IRoom.ts
@@ -129,6 +129,7 @@ export const isPrivateDiscussion = (room: Partial<IRoom>): room is IRoom => isDi
 export const isPublicDiscussion = (room: Partial<IRoom>): room is IRoom => isDiscussion(room) && room.t === 'c';
 
 export const isPublicRoom = (room: Partial<IRoom>): room is IRoom => room.t === 'c';
+export const isPrivateRoom = (room: Partial<IRoom>): room is IRoom => room.t === 'p';
 
 export interface IDirectMessageRoom extends Omit<IRoom, 'default' | 'featured' | 'u' | 'name'> {
 	t: 'd';
diff --git a/packages/i18n/src/locales/en.i18n.json b/packages/i18n/src/locales/en.i18n.json
index 1ea8919bf550..f6f85e2ca008 100644
--- a/packages/i18n/src/locales/en.i18n.json
+++ b/packages/i18n/src/locales/en.i18n.json
@@ -1941,8 +1941,11 @@
   "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.",
@@ -4255,6 +4258,7 @@
   "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",
@@ -6452,6 +6456,9 @@
   "unread_messages_other": "{{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",

From 6274c439ca32e363ec2bae0d5ea25671d8f12f12 Mon Sep 17 00:00:00 2001
From: Guilherme Gazzo <guilhermegazzo@gmail.com>
Date: Fri, 21 Jun 2024 09:48:39 -0300
Subject: [PATCH 64/94] regression: fix retention flaky test (#32649)

---
 apps/meteor/client/lib/convertTimeUnit.ts                 | 6 +++---
 apps/meteor/client/views/room/hooks/useRetentionPolicy.ts | 4 ++--
 apps/meteor/tests/e2e/retention-policy.spec.ts            | 4 ++++
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/apps/meteor/client/lib/convertTimeUnit.ts b/apps/meteor/client/lib/convertTimeUnit.ts
index f87f595b6902..b19af29ee122 100644
--- a/apps/meteor/client/lib/convertTimeUnit.ts
+++ b/apps/meteor/client/lib/convertTimeUnit.ts
@@ -4,7 +4,7 @@ export enum TIMEUNIT {
 	minutes = 'minutes',
 }
 
-const isValidTimespan = (timespan: number): boolean => {
+export const isValidTimespan = (timespan: number): boolean => {
 	if (Number.isNaN(timespan)) {
 		return false;
 	}
@@ -22,7 +22,7 @@ const isValidTimespan = (timespan: number): boolean => {
 
 export const timeUnitToMs = (unit: TIMEUNIT, timespan: number) => {
 	if (!isValidTimespan(timespan)) {
-		throw new Error('timeUnitToMs - invalid timespan');
+		throw new Error(`timeUnitToMs - invalid timespan:${timespan}`);
 	}
 
 	switch (unit) {
@@ -42,7 +42,7 @@ export const timeUnitToMs = (unit: TIMEUNIT, timespan: number) => {
 
 export const msToTimeUnit = (unit: TIMEUNIT, timespan: number) => {
 	if (!isValidTimespan(timespan)) {
-		throw new Error('msToTimeUnit - invalid timespan');
+		throw new Error(`msToTimeUnit - invalid timespan:${timespan}`);
 	}
 
 	switch (unit) {
diff --git a/apps/meteor/client/views/room/hooks/useRetentionPolicy.ts b/apps/meteor/client/views/room/hooks/useRetentionPolicy.ts
index 9c44b42b1568..96efedef692e 100644
--- a/apps/meteor/client/views/room/hooks/useRetentionPolicy.ts
+++ b/apps/meteor/client/views/room/hooks/useRetentionPolicy.ts
@@ -1,10 +1,10 @@
 import type { IRoom, IRoomWithRetentionPolicy } from '@rocket.chat/core-typings';
 import { useSetting } from '@rocket.chat/ui-contexts';
 
-import { TIMEUNIT, timeUnitToMs } from '../../../lib/convertTimeUnit';
+import { TIMEUNIT, isValidTimespan, timeUnitToMs } from '../../../lib/convertTimeUnit';
 
 const hasRetentionPolicy = (room: IRoom & { retention?: any }): room is IRoomWithRetentionPolicy =>
-	'retention' in room && room.retention !== undefined;
+	'retention' in room && room.retention !== undefined && 'overrideGlobal' in room.retention && isValidTimespan(room.retention.maxAge);
 
 type RetentionPolicySettings = {
 	enabled: boolean;
diff --git a/apps/meteor/tests/e2e/retention-policy.spec.ts b/apps/meteor/tests/e2e/retention-policy.spec.ts
index 03f8dcb68eb6..7464fd736a97 100644
--- a/apps/meteor/tests/e2e/retention-policy.spec.ts
+++ b/apps/meteor/tests/e2e/retention-policy.spec.ts
@@ -31,6 +31,10 @@ test.describe.serial('retention-policy', () => {
 	});
 
 	test.describe('retention policy disabled', () => {
+		test.beforeAll(async ({ api }) => {
+			await setSettingValueById(api, 'RetentionPolicy_Enabled', false);
+		});
+
 		test('should not show prune banner in channel', async () => {
 			await poHomeChannel.sidenav.openChat(targetChannel);
 

From d3c493b6daa94e5a23cee1d83c83b10ba93ff81d Mon Sep 17 00:00:00 2001
From: gabriellsh <40830821+gabriellsh@users.noreply.github.com>
Date: Fri, 21 Jun 2024 17:58:26 -0300
Subject: [PATCH 65/94] feat: Improve Retention Policy Warning and Callout
 messages (#32579)

---
 .changeset/angry-garlics-visit.md             |   6 +
 .../server/cronPruneMessages.ts               |  16 +-
 .../InfoPanel/InfoPanel.stories.tsx           |   5 +-
 .../InfoPanel/RetentionPolicyCallout.tsx      |  19 +-
 apps/meteor/client/definitions/cron.d.ts      |   3 +
 .../hooks/usePruneWarningMessage.spec.ts      | 237 ++++++++++++++++++
 .../client/hooks/usePruneWarningMessage.ts    | 105 ++++++++
 .../room/body/RetentionPolicyWarning.tsx      |  31 +--
 .../client/views/room/body/RoomBody.tsx       |   2 +-
 .../contextualBar/Info/RoomInfo/RoomInfo.tsx  |   8 +-
 .../teams/contextualBar/info/TeamsInfo.tsx    |   8 +-
 ...etCronAdvancedTimerFromPrecisionSetting.ts |  12 +
 packages/i18n/src/locales/af.i18n.json        |   4 -
 packages/i18n/src/locales/ar.i18n.json        |   4 -
 packages/i18n/src/locales/az.i18n.json        |   4 -
 packages/i18n/src/locales/be-BY.i18n.json     |   4 -
 packages/i18n/src/locales/bg.i18n.json        |   4 -
 packages/i18n/src/locales/bs.i18n.json        |   4 -
 packages/i18n/src/locales/ca.i18n.json        |   4 -
 packages/i18n/src/locales/cs.i18n.json        |   4 -
 packages/i18n/src/locales/cy.i18n.json        |   4 -
 packages/i18n/src/locales/da.i18n.json        |   4 -
 packages/i18n/src/locales/de-AT.i18n.json     |   4 -
 packages/i18n/src/locales/de-IN.i18n.json     |   4 -
 packages/i18n/src/locales/de.i18n.json        |   4 -
 packages/i18n/src/locales/el.i18n.json        |   4 -
 packages/i18n/src/locales/en.i18n.json        |   8 +-
 packages/i18n/src/locales/eo.i18n.json        |   4 -
 packages/i18n/src/locales/es.i18n.json        |   4 -
 packages/i18n/src/locales/fa.i18n.json        |   4 +-
 packages/i18n/src/locales/fi.i18n.json        |   4 -
 packages/i18n/src/locales/fr.i18n.json        |   4 -
 packages/i18n/src/locales/hr.i18n.json        |   4 -
 packages/i18n/src/locales/hu.i18n.json        |   4 -
 packages/i18n/src/locales/id.i18n.json        |   4 -
 packages/i18n/src/locales/it.i18n.json        |   4 -
 packages/i18n/src/locales/ja.i18n.json        |   4 -
 packages/i18n/src/locales/ka-GE.i18n.json     |   4 -
 packages/i18n/src/locales/km.i18n.json        |   4 -
 packages/i18n/src/locales/ko.i18n.json        |   4 -
 packages/i18n/src/locales/ku.i18n.json        |   3 -
 packages/i18n/src/locales/lo.i18n.json        |   4 -
 packages/i18n/src/locales/lt.i18n.json        |   4 -
 packages/i18n/src/locales/lv.i18n.json        |   4 -
 packages/i18n/src/locales/mn.i18n.json        |   4 -
 packages/i18n/src/locales/ms-MY.i18n.json     |   4 -
 packages/i18n/src/locales/nl.i18n.json        |   4 -
 packages/i18n/src/locales/no.i18n.json        |   4 -
 packages/i18n/src/locales/pl.i18n.json        |   4 -
 packages/i18n/src/locales/pt-BR.i18n.json     |   4 -
 packages/i18n/src/locales/pt.i18n.json        |   4 -
 packages/i18n/src/locales/ro.i18n.json        |   4 -
 packages/i18n/src/locales/ru.i18n.json        |   4 -
 packages/i18n/src/locales/sk-SK.i18n.json     |   4 -
 packages/i18n/src/locales/sl-SI.i18n.json     |   4 -
 packages/i18n/src/locales/sq.i18n.json        |   4 -
 packages/i18n/src/locales/sr.i18n.json        |   4 -
 packages/i18n/src/locales/sv.i18n.json        |   4 -
 packages/i18n/src/locales/ta-IN.i18n.json     |   4 -
 packages/i18n/src/locales/th-TH.i18n.json     |   4 -
 packages/i18n/src/locales/tr.i18n.json        |   4 -
 packages/i18n/src/locales/uk.i18n.json        |   4 -
 packages/i18n/src/locales/vi-VN.i18n.json     |   4 -
 packages/i18n/src/locales/zh-HK.i18n.json     |   2 +-
 packages/i18n/src/locales/zh-TW.i18n.json     |   4 -
 packages/i18n/src/locales/zh.i18n.json        |   4 -
 66 files changed, 389 insertions(+), 280 deletions(-)
 create mode 100644 .changeset/angry-garlics-visit.md
 create mode 100644 apps/meteor/client/definitions/cron.d.ts
 create mode 100644 apps/meteor/client/hooks/usePruneWarningMessage.spec.ts
 create mode 100644 apps/meteor/client/hooks/usePruneWarningMessage.ts
 create mode 100644 apps/meteor/lib/getCronAdvancedTimerFromPrecisionSetting.ts

diff --git a/.changeset/angry-garlics-visit.md b/.changeset/angry-garlics-visit.md
new file mode 100644
index 000000000000..3a6464698e41
--- /dev/null
+++ b/.changeset/angry-garlics-visit.md
@@ -0,0 +1,6 @@
+---
+"@rocket.chat/meteor": patch
+"@rocket.chat/i18n": patch
+---
+
+Improved Retention Policy Warning messages
diff --git a/apps/meteor/app/retention-policy/server/cronPruneMessages.ts b/apps/meteor/app/retention-policy/server/cronPruneMessages.ts
index d12b734c8906..337691bfbe57 100644
--- a/apps/meteor/app/retention-policy/server/cronPruneMessages.ts
+++ b/apps/meteor/app/retention-policy/server/cronPruneMessages.ts
@@ -2,6 +2,7 @@ import type { IRoomWithRetentionPolicy } from '@rocket.chat/core-typings';
 import { cronJobs } from '@rocket.chat/cron';
 import { Rooms } from '@rocket.chat/models';
 
+import { getCronAdvancedTimerFromPrecisionSetting } from '../../../lib/getCronAdvancedTimerFromPrecisionSetting';
 import { cleanRoomHistory } from '../../lib/server/functions/cleanRoomHistory';
 import { settings } from '../../settings/server';
 
@@ -79,19 +80,6 @@ async function job(): Promise<void> {
 	}
 }
 
-function getSchedule(precision: '0' | '1' | '2' | '3'): string {
-	switch (precision) {
-		case '0':
-			return '*/30 * * * *'; // 30 minutes
-		case '1':
-			return '0 * * * *'; // hour
-		case '2':
-			return '0 */6 * * *'; // 6 hours
-		case '3':
-			return '0 0 * * *'; // day
-	}
-}
-
 const pruneCronName = 'Prune old messages by retention policy';
 
 async function deployCron(precision: string): Promise<void> {
@@ -138,7 +126,7 @@ settings.watchMultiple(
 
 		const precision =
 			(settings.get<boolean>('RetentionPolicy_Advanced_Precision') && settings.get<string>('RetentionPolicy_Advanced_Precision_Cron')) ||
-			getSchedule(settings.get('RetentionPolicy_Precision'));
+			getCronAdvancedTimerFromPrecisionSetting(settings.get('RetentionPolicy_Precision'));
 
 		return deployCron(precision);
 	},
diff --git a/apps/meteor/client/components/InfoPanel/InfoPanel.stories.tsx b/apps/meteor/client/components/InfoPanel/InfoPanel.stories.tsx
index 39242161ed46..1d8987995e8c 100644
--- a/apps/meteor/client/components/InfoPanel/InfoPanel.stories.tsx
+++ b/apps/meteor/client/components/InfoPanel/InfoPanel.stories.tsx
@@ -2,6 +2,7 @@ import type { ComponentMeta, ComponentStory } from '@storybook/react';
 import React from 'react';
 
 import InfoPanel from '.';
+import { createFakeRoom } from '../../../tests/mocks/data';
 import RetentionPolicyCallout from './RetentionPolicyCallout';
 
 export default {
@@ -20,6 +21,8 @@ export default {
 	},
 } as ComponentMeta<typeof InfoPanel>;
 
+const fakeRoom = createFakeRoom();
+
 export const Default: ComponentStory<typeof InfoPanel> = () => (
 	<InfoPanel>
 		<InfoPanel.Avatar />
@@ -52,7 +55,7 @@ export const Default: ComponentStory<typeof InfoPanel> = () => (
 		</InfoPanel.Section>
 
 		<InfoPanel.Section>
-			<RetentionPolicyCallout maxAge={30} filesOnly={false} excludePinned={true} />
+			<RetentionPolicyCallout room={fakeRoom} />
 		</InfoPanel.Section>
 	</InfoPanel>
 );
diff --git a/apps/meteor/client/components/InfoPanel/RetentionPolicyCallout.tsx b/apps/meteor/client/components/InfoPanel/RetentionPolicyCallout.tsx
index be513e477cd9..c27234f6d0db 100644
--- a/apps/meteor/client/components/InfoPanel/RetentionPolicyCallout.tsx
+++ b/apps/meteor/client/components/InfoPanel/RetentionPolicyCallout.tsx
@@ -1,27 +1,18 @@
+import type { IRoom } from '@rocket.chat/core-typings';
 import { Callout } from '@rocket.chat/fuselage';
 import { useTranslation } from '@rocket.chat/ui-contexts';
-import type { FC } from 'react';
 import React from 'react';
 
-import { useFormattedRelativeTime } from '../../hooks/useFormattedRelativeTime';
+import { usePruneWarningMessage } from '../../hooks/usePruneWarningMessage';
 
-type RetentionPolicyCalloutProps = {
-	filesOnly: boolean;
-	excludePinned: boolean;
-	maxAge: number;
-};
-
-const RetentionPolicyCallout: FC<RetentionPolicyCalloutProps> = ({ filesOnly, excludePinned, maxAge }) => {
+const RetentionPolicyCallout = ({ room }: { room: IRoom }) => {
+	const message = usePruneWarningMessage(room);
 	const t = useTranslation();
-	const time = useFormattedRelativeTime(maxAge);
 
 	return (
 		<Callout arial-label={t('Retention_policy_warning_callout')} role='alert' aria-live='polite' type='warning'>
 			<div>
-				{filesOnly && excludePinned && <p>{t('RetentionPolicy_RoomWarning_FilesOnly', { time })}</p>}
-				{filesOnly && !excludePinned && <p>{t('RetentionPolicy_RoomWarning_UnpinnedFilesOnly', { time })}</p>}
-				{!filesOnly && excludePinned && <p>{t('RetentionPolicy_RoomWarning', { time })}</p>}
-				{!filesOnly && !excludePinned && <p>{t('RetentionPolicy_RoomWarning_Unpinned', { time })}</p>}
+				<p>{message}</p>
 			</div>
 		</Callout>
 	);
diff --git a/apps/meteor/client/definitions/cron.d.ts b/apps/meteor/client/definitions/cron.d.ts
new file mode 100644
index 000000000000..25c4be4f97a7
--- /dev/null
+++ b/apps/meteor/client/definitions/cron.d.ts
@@ -0,0 +1,3 @@
+declare module 'cron' {
+	export declare function sendAt(precision: string): Moment;
+}
diff --git a/apps/meteor/client/hooks/usePruneWarningMessage.spec.ts b/apps/meteor/client/hooks/usePruneWarningMessage.spec.ts
new file mode 100644
index 000000000000..fcd080bfb1f4
--- /dev/null
+++ b/apps/meteor/client/hooks/usePruneWarningMessage.spec.ts
@@ -0,0 +1,237 @@
+import type { IRoomWithRetentionPolicy } from '@rocket.chat/core-typings';
+import { mockAppRoot } from '@rocket.chat/mock-providers';
+import { renderHook } from '@testing-library/react-hooks';
+
+import { createFakeRoom } from '../../tests/mocks/data';
+import { usePruneWarningMessage } from './usePruneWarningMessage';
+
+const createMock = ({
+	enabled = true,
+	filesOnly = false,
+	doNotPrunePinned = false,
+	appliesToChannels = false,
+	TTLChannels = 60000,
+	appliesToGroups = false,
+	TTLGroups = 60000,
+	appliesToDMs = false,
+	TTLDMs = 60000,
+	precision = '0',
+	advancedPrecision = false,
+	advancedPrecisionCron = '*/30 * * * *',
+} = {}) => {
+	return mockAppRoot()
+		.withTranslations('en', 'core', {
+			RetentionPolicy_RoomWarning_NextRunDate: '{{maxAge}} {{nextRunDate}}',
+			RetentionPolicy_RoomWarning_Unpinned_NextRunDate: 'Unpinned {{maxAge}} {{nextRunDate}}',
+			RetentionPolicy_RoomWarning_FilesOnly_NextRunDate: 'FilesOnly {{maxAge}} {{nextRunDate}}',
+			RetentionPolicy_RoomWarning_UnpinnedFilesOnly_NextRunDate: 'UnpinnedFilesOnly {{maxAge}} {{nextRunDate}}',
+		})
+		.withSetting('RetentionPolicy_Enabled', enabled)
+		.withSetting('RetentionPolicy_FilesOnly', filesOnly)
+		.withSetting('RetentionPolicy_DoNotPrunePinned', doNotPrunePinned)
+		.withSetting('RetentionPolicy_AppliesToChannels', appliesToChannels)
+		.withSetting('RetentionPolicy_TTL_Channels', TTLChannels)
+		.withSetting('RetentionPolicy_AppliesToGroups', appliesToGroups)
+		.withSetting('RetentionPolicy_TTL_Groups', TTLGroups)
+		.withSetting('RetentionPolicy_AppliesToDMs', appliesToDMs)
+		.withSetting('RetentionPolicy_TTL_DMs', TTLDMs)
+		.withSetting('RetentionPolicy_Precision', precision)
+		.withSetting('RetentionPolicy_Advanced_Precision', advancedPrecision)
+		.withSetting('RetentionPolicy_Advanced_Precision_Cron', advancedPrecisionCron)
+		.build();
+};
+
+jest.useFakeTimers();
+
+const getRetentionRoomProps = (props: Partial<IRoomWithRetentionPolicy['retention']> = {}) => {
+	return {
+		retention: {
+			enabled: true,
+			overrideGlobal: true,
+			maxAge: 30,
+			filesOnly: false,
+			excludePinned: false,
+			ignoreThreads: false,
+			...props,
+		},
+	};
+};
+
+const setDate = (minutes = 1, hours = 0, date = 1) => {
+	// June 12, 2024, 12:00 AM
+	const fakeDate = new Date();
+	fakeDate.setFullYear(2024);
+	fakeDate.setMonth(5);
+	fakeDate.setDate(date);
+	fakeDate.setHours(hours);
+	fakeDate.setMinutes(minutes);
+	fakeDate.setSeconds(0);
+	jest.setSystemTime(fakeDate);
+};
+
+describe('usePruneWarningMessage hook', () => {
+	describe('Cron timer and precision', () => {
+		it('Should update the message after the nextRunDate has passaed', async () => {
+			setDate();
+			const fakeRoom = createFakeRoom({ t: 'c' });
+			const { result } = renderHook(() => usePruneWarningMessage(fakeRoom), {
+				wrapper: createMock({
+					appliesToChannels: true,
+					TTLChannels: 60000,
+				}),
+			});
+			expect(result.current).toEqual('a minute June 1, 2024, 12:30 AM');
+			jest.advanceTimersByTime(31 * 60 * 1000);
+			expect(result.current).toEqual('a minute June 1, 2024, 1:00 AM');
+		});
+
+		it('Should return the default warning with precision set to every_hour', () => {
+			const fakeRoom = createFakeRoom({ t: 'c' });
+			setDate();
+			const { result } = renderHook(() => usePruneWarningMessage(fakeRoom), {
+				wrapper: createMock({
+					appliesToChannels: true,
+					TTLChannels: 60000,
+					precision: '1',
+				}),
+			});
+			expect(result.current).toEqual('a minute June 1, 2024, 1:00 AM');
+		});
+
+		it('Should return the default warning with precision set to every_six_hours', () => {
+			const fakeRoom = createFakeRoom({ t: 'c' });
+			setDate();
+			const { result } = renderHook(() => usePruneWarningMessage(fakeRoom), {
+				wrapper: createMock({
+					appliesToChannels: true,
+					TTLChannels: 60000,
+					precision: '2',
+				}),
+			});
+			expect(result.current).toEqual('a minute June 1, 2024, 6:00 AM');
+		});
+
+		it('Should return the default warning with precision set to every_day', () => {
+			const fakeRoom = createFakeRoom({ t: 'c' });
+			setDate();
+			const { result } = renderHook(() => usePruneWarningMessage(fakeRoom), {
+				wrapper: createMock({
+					appliesToChannels: true,
+					TTLChannels: 60000,
+					precision: '3',
+				}),
+			});
+			expect(result.current).toEqual('a minute June 2, 2024, 12:00 AM');
+		});
+
+		it('Should return the default warning with advanced precision', () => {
+			const fakeRoom = createFakeRoom({ t: 'c' });
+			setDate();
+			const { result } = renderHook(() => usePruneWarningMessage(fakeRoom), {
+				wrapper: createMock({
+					appliesToChannels: true,
+					TTLChannels: 60000,
+					advancedPrecision: true,
+					advancedPrecisionCron: '0 0 1 */1 *',
+				}),
+			});
+			expect(result.current).toEqual('a minute July 1, 2024, 12:00 AM');
+		});
+	});
+
+	describe('No override', () => {
+		it('Should return the default warning', () => {
+			const fakeRoom = createFakeRoom({ t: 'c' });
+			setDate();
+			const { result } = renderHook(() => usePruneWarningMessage(fakeRoom), {
+				wrapper: createMock({
+					appliesToChannels: true,
+					TTLChannels: 60000,
+				}),
+			});
+			expect(result.current).toEqual('a minute June 1, 2024, 12:30 AM');
+		});
+
+		it('Should return the unpinned messages warning', () => {
+			const fakeRoom = createFakeRoom({ t: 'c' });
+			setDate();
+			const { result } = renderHook(() => usePruneWarningMessage(fakeRoom), {
+				wrapper: createMock({
+					appliesToChannels: true,
+					TTLChannels: 60000,
+					doNotPrunePinned: true,
+				}),
+			});
+			expect(result.current).toEqual('Unpinned a minute June 1, 2024, 12:30 AM');
+		});
+
+		it('Should return the files only warning', () => {
+			const fakeRoom = createFakeRoom({ t: 'c' });
+			setDate();
+
+			const { result } = renderHook(() => usePruneWarningMessage(fakeRoom), {
+				wrapper: createMock({
+					appliesToChannels: true,
+					TTLChannels: 60000,
+					filesOnly: true,
+				}),
+			});
+			expect(result.current).toEqual('FilesOnly a minute June 1, 2024, 12:30 AM');
+		});
+
+		it('Should return the unpinned files only warning', () => {
+			const fakeRoom = createFakeRoom({ t: 'c' });
+			setDate();
+
+			const { result } = renderHook(() => usePruneWarningMessage(fakeRoom), {
+				wrapper: createMock({
+					appliesToChannels: true,
+					TTLChannels: 60000,
+					filesOnly: true,
+					doNotPrunePinned: true,
+				}),
+			});
+			expect(result.current).toEqual('UnpinnedFilesOnly a minute June 1, 2024, 12:30 AM');
+		});
+	});
+
+	describe('Overriden', () => {
+		it('Should return the default warning', () => {
+			const fakeRoom = createFakeRoom({ t: 'p', ...getRetentionRoomProps() });
+			setDate();
+			const { result } = renderHook(() => usePruneWarningMessage(fakeRoom), {
+				wrapper: createMock(),
+			});
+			expect(result.current).toEqual('30 days June 1, 2024, 12:30 AM');
+		});
+
+		it('Should return the unpinned messages warning', () => {
+			const fakeRoom = createFakeRoom({ t: 'p', ...getRetentionRoomProps({ excludePinned: true }) });
+			setDate();
+			const { result } = renderHook(() => usePruneWarningMessage(fakeRoom), {
+				wrapper: createMock(),
+			});
+			expect(result.current).toEqual('Unpinned 30 days June 1, 2024, 12:30 AM');
+		});
+
+		it('Should return the files only warning', () => {
+			const fakeRoom = createFakeRoom({ t: 'p', ...getRetentionRoomProps({ filesOnly: true }) });
+			setDate();
+
+			const { result } = renderHook(() => usePruneWarningMessage(fakeRoom), {
+				wrapper: createMock(),
+			});
+			expect(result.current).toEqual('FilesOnly 30 days June 1, 2024, 12:30 AM');
+		});
+
+		it('Should return the unpinned files only warning', () => {
+			const fakeRoom = createFakeRoom({ t: 'p', ...getRetentionRoomProps({ excludePinned: true, filesOnly: true }) });
+			setDate();
+
+			const { result } = renderHook(() => usePruneWarningMessage(fakeRoom), {
+				wrapper: createMock(),
+			});
+			expect(result.current).toEqual('UnpinnedFilesOnly 30 days June 1, 2024, 12:30 AM');
+		});
+	});
+});
diff --git a/apps/meteor/client/hooks/usePruneWarningMessage.ts b/apps/meteor/client/hooks/usePruneWarningMessage.ts
new file mode 100644
index 000000000000..bb1eec5a5989
--- /dev/null
+++ b/apps/meteor/client/hooks/usePruneWarningMessage.ts
@@ -0,0 +1,105 @@
+import type { IRoom } from '@rocket.chat/core-typings';
+import { useSafely } from '@rocket.chat/fuselage-hooks';
+import type { TranslationKey } from '@rocket.chat/ui-contexts';
+import { useSetting, useTranslation, useLanguage } from '@rocket.chat/ui-contexts';
+import { sendAt } from 'cron';
+import intlFormat from 'date-fns/intlFormat';
+import { useEffect, useState } from 'react';
+
+import { getCronAdvancedTimerFromPrecisionSetting } from '../../lib/getCronAdvancedTimerFromPrecisionSetting';
+import { useRetentionPolicy } from '../views/room/hooks/useRetentionPolicy';
+import { useFormattedRelativeTime } from './useFormattedRelativeTime';
+
+const getMessage = ({ filesOnly, excludePinned }: { filesOnly: boolean; excludePinned: boolean }): TranslationKey => {
+	if (filesOnly) {
+		return excludePinned
+			? 'RetentionPolicy_RoomWarning_UnpinnedFilesOnly_NextRunDate'
+			: 'RetentionPolicy_RoomWarning_FilesOnly_NextRunDate';
+	}
+
+	return excludePinned ? 'RetentionPolicy_RoomWarning_Unpinned_NextRunDate' : 'RetentionPolicy_RoomWarning_NextRunDate';
+};
+
+type CronPrecisionSetting = '0' | '1' | '2' | '3';
+const getNextRunDate = ({
+	enableAdvancedCronTimer,
+	cronPrecision,
+	advancedCronTimer,
+}: {
+	enableAdvancedCronTimer: boolean;
+	cronPrecision: CronPrecisionSetting;
+	advancedCronTimer: string;
+}) => {
+	if (enableAdvancedCronTimer) {
+		return sendAt(advancedCronTimer);
+	}
+
+	return sendAt(getCronAdvancedTimerFromPrecisionSetting(cronPrecision));
+};
+
+const useNextRunDate = ({
+	enableAdvancedCronTimer,
+	advancedCronTimer,
+	cronPrecision,
+}: {
+	enableAdvancedCronTimer: boolean;
+	cronPrecision: CronPrecisionSetting;
+	advancedCronTimer: string;
+}) => {
+	const [nextRunDate, setNextRunDate] = useSafely(useState(getNextRunDate({ enableAdvancedCronTimer, advancedCronTimer, cronPrecision })));
+	const lang = useLanguage();
+
+	useEffect(() => {
+		const timeoutBetweenRunAndNow = nextRunDate.valueOf() - Date.now();
+
+		const timeout = setTimeout(
+			() => setNextRunDate(getNextRunDate({ enableAdvancedCronTimer, advancedCronTimer, cronPrecision })),
+			timeoutBetweenRunAndNow,
+		);
+
+		return () => clearTimeout(timeout);
+	}, [advancedCronTimer, cronPrecision, enableAdvancedCronTimer, nextRunDate, setNextRunDate]);
+
+	return intlFormat(
+		new Date(nextRunDate.valueOf()),
+		{
+			localeMatcher: 'best fit',
+			year: 'numeric',
+			month: 'long',
+			day: 'numeric',
+			hour: 'numeric',
+			minute: 'numeric',
+		},
+		{
+			locale: lang,
+		},
+	);
+};
+
+export const usePruneWarningMessage = (room: IRoom) => {
+	const retention = useRetentionPolicy(room);
+	if (!retention) {
+		throw new Error('usePruneWarningMessage - No room provided');
+	}
+
+	const { maxAge, filesOnly, excludePinned } = retention;
+
+	const cronPrecision = String(useSetting('RetentionPolicy_Precision')) as CronPrecisionSetting;
+
+	const t = useTranslation();
+
+	const enableAdvancedCronTimer = Boolean(useSetting('RetentionPolicy_Advanced_Precision'));
+	const advancedCronTimer = String(useSetting('RetentionPolicy_Advanced_Precision_Cron'));
+
+	const message = getMessage({ filesOnly, excludePinned });
+
+	const nextRunDate = useNextRunDate({
+		enableAdvancedCronTimer,
+		advancedCronTimer,
+		cronPrecision,
+	});
+
+	const maxAgeFormatted = useFormattedRelativeTime(maxAge);
+
+	return t(message, { maxAge: maxAgeFormatted, nextRunDate });
+};
diff --git a/apps/meteor/client/views/room/body/RetentionPolicyWarning.tsx b/apps/meteor/client/views/room/body/RetentionPolicyWarning.tsx
index 193c8fa7bb6b..33d84a35b939 100644
--- a/apps/meteor/client/views/room/body/RetentionPolicyWarning.tsx
+++ b/apps/meteor/client/views/room/body/RetentionPolicyWarning.tsx
@@ -1,35 +1,15 @@
+import type { IRoom } 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 { useFormattedRelativeTime } from '../../../hooks/useFormattedRelativeTime';
+import { usePruneWarningMessage } from '../../../hooks/usePruneWarningMessage';
 
-type RetentionPolicyWarningProps = {
-	filesOnly: boolean;
-	excludePinned: boolean;
-	maxAge: number;
-};
-
-const RetentionPolicyWarning = ({ filesOnly, excludePinned, maxAge }: RetentionPolicyWarningProps): ReactElement => {
+const RetentionPolicyWarning = ({ room }: { room: IRoom }): ReactElement => {
 	const t = useTranslation();
-	const time = useFormattedRelativeTime(maxAge);
 
-	if (filesOnly) {
-		return (
-			<div
-				aria-label={t('Retention_policy_warning_banner')}
-				role='alert'
-				aria-live='polite'
-				className='start__purge-warning error-background error-border error-color'
-			>
-				<Icon name='warning' size='x20' />{' '}
-				{excludePinned
-					? t('RetentionPolicy_RoomWarning_UnpinnedFilesOnly', { time })
-					: t('RetentionPolicy_RoomWarning_FilesOnly', { time })}
-			</div>
-		);
-	}
+	const message = usePruneWarningMessage(room);
 
 	return (
 		<div
@@ -38,8 +18,7 @@ const RetentionPolicyWarning = ({ filesOnly, excludePinned, maxAge }: RetentionP
 			aria-live='polite'
 			className='start__purge-warning error-background error-border error-color'
 		>
-			<Icon name='warning' size='x20' />{' '}
-			{excludePinned ? t('RetentionPolicy_RoomWarning_Unpinned', { time }) : t('RetentionPolicy_RoomWarning', { time })}
+			<Icon name='warning' size='x20' /> {message}
 		</div>
 	);
 };
diff --git a/apps/meteor/client/views/room/body/RoomBody.tsx b/apps/meteor/client/views/room/body/RoomBody.tsx
index 0535b65c6cf1..31f8440643b7 100644
--- a/apps/meteor/client/views/room/body/RoomBody.tsx
+++ b/apps/meteor/client/views/room/body/RoomBody.tsx
@@ -291,7 +291,7 @@ const RoomBody = (): ReactElement => {
 															<li className='load-more'>{isLoadingMoreMessages ? <LoadingMessagesIndicator /> : null}</li>
 														) : (
 															<li className='start color-info-font-color'>
-																{retentionPolicy?.isActive ? <RetentionPolicyWarning {...retentionPolicy} /> : null}
+																{retentionPolicy?.isActive ? <RetentionPolicyWarning room={room} /> : null}
 																<RoomForeword user={user} room={room} />
 															</li>
 														)}
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 5c45e8d095f9..99edb04e8c31 100644
--- a/apps/meteor/client/views/room/contextualBar/Info/RoomInfo/RoomInfo.tsx
+++ b/apps/meteor/client/views/room/contextualBar/Info/RoomInfo/RoomInfo.tsx
@@ -135,13 +135,7 @@ const RoomInfo = ({ room, icon, onClickBack, onClickClose, onClickEnterRoom, onC
 							</InfoPanel.Field>
 						)}
 
-						{retentionPolicy?.isActive && (
-							<RetentionPolicyCallout
-								filesOnly={retentionPolicy.filesOnly}
-								excludePinned={retentionPolicy.excludePinned}
-								maxAge={retentionPolicy.maxAge}
-							/>
-						)}
+						{retentionPolicy?.isActive && <RetentionPolicyCallout room={room} />}
 					</InfoPanel.Section>
 				</InfoPanel>
 			</ContextualbarScrollableContent>
diff --git a/apps/meteor/client/views/teams/contextualBar/info/TeamsInfo.tsx b/apps/meteor/client/views/teams/contextualBar/info/TeamsInfo.tsx
index 5a38722cfc42..e5202f070320 100644
--- a/apps/meteor/client/views/teams/contextualBar/info/TeamsInfo.tsx
+++ b/apps/meteor/client/views/teams/contextualBar/info/TeamsInfo.tsx
@@ -190,13 +190,7 @@ const TeamsInfo = ({
 							</InfoPanel.Field>
 						)}
 
-						{retentionPolicy?.isActive && (
-							<RetentionPolicyCallout
-								filesOnly={retentionPolicy.filesOnly}
-								excludePinned={retentionPolicy.excludePinned}
-								maxAge={retentionPolicy.maxAge}
-							/>
-						)}
+						{retentionPolicy?.isActive && <RetentionPolicyCallout room={room} />}
 					</InfoPanel.Section>
 				</InfoPanel>
 			</ContextualbarScrollableContent>
diff --git a/apps/meteor/lib/getCronAdvancedTimerFromPrecisionSetting.ts b/apps/meteor/lib/getCronAdvancedTimerFromPrecisionSetting.ts
new file mode 100644
index 000000000000..e83db4838e4e
--- /dev/null
+++ b/apps/meteor/lib/getCronAdvancedTimerFromPrecisionSetting.ts
@@ -0,0 +1,12 @@
+export function getCronAdvancedTimerFromPrecisionSetting(precision: '0' | '1' | '2' | '3'): string {
+	switch (precision) {
+		case '0':
+			return '*/30 * * * *'; // 30 minutes
+		case '1':
+			return '0 * * * *'; // hour
+		case '2':
+			return '0 */6 * * *'; // 6 hours
+		case '3':
+			return '0 0 * * *'; // day
+	}
+}
diff --git a/packages/i18n/src/locales/af.i18n.json b/packages/i18n/src/locales/af.i18n.json
index 17c3a8bd13cd..fe3a0b4cfc83 100644
--- a/packages/i18n/src/locales/af.i18n.json
+++ b/packages/i18n/src/locales/af.i18n.json
@@ -2068,10 +2068,6 @@
   "RetentionPolicy_MaxAge": "Maksimum boodskap ouderdom",
   "RetentionPolicy_Precision": "Timer Precision",
   "RetentionPolicy_Precision_Description": "Hoe gereeld moet die snoei-timer hardloop. Om dit tot 'n meer presiese waarde te stel, maak kanale met vinnige retentietydperke beter, maar kan ekstra verwerkingskrag op groot gemeenskappe kos.",
-  "RetentionPolicy_RoomWarning": "Boodskappe ouer as {{time}} word hier outomaties gesnoei",
-  "RetentionPolicy_RoomWarning_FilesOnly": "Lêers ouer as {{time}} word outomaties snoei hier (boodskappe bly ongeskonde)",
-  "RetentionPolicy_RoomWarning_Unpinned": "Ongepakte boodskappe ouer as {{time}} word hier outomaties gesnoei",
-  "RetentionPolicy_RoomWarning_UnpinnedFilesOnly": "Ongepakte lêers ouer as {{time}} word hier outomaties gesnoei (boodskappe bly ongeskonde)",
   "RetentionPolicyRoom_Enabled": "Snoei ou boodskappe outomaties",
   "RetentionPolicyRoom_ExcludePinned": "Sluit uitgespelde boodskappe uit",
   "RetentionPolicyRoom_FilesOnly": "Snoei slegs lêers, hou boodskappe",
diff --git a/packages/i18n/src/locales/ar.i18n.json b/packages/i18n/src/locales/ar.i18n.json
index 6b2b8289cfef..a043c30c2856 100644
--- a/packages/i18n/src/locales/ar.i18n.json
+++ b/packages/i18n/src/locales/ar.i18n.json
@@ -3557,10 +3557,6 @@
   "RetentionPolicy_MaxAge": "الحد الأقصى لعمر الرسائل",
   "RetentionPolicy_Precision": "دقة المؤقت",
   "RetentionPolicy_Precision_Description": "عدد المرات التي يجب فيها تشغيل مؤقت التنقيح. يؤدي تعيين هذا إلى قيمة أكثر دقة إلى جعل القنوات ذات مؤقتات الاستبقاء السريعة تعمل بشكل أفضل، ولكنها قد تكلف قوة معالجة إضافية على المجتمعات الكبيرة.",
-  "RetentionPolicy_RoomWarning": "يتم تنقيح الرسائل الأقدم من {{time}} تلقائيًا هنا",
-  "RetentionPolicy_RoomWarning_FilesOnly": "يتم تنقيح الملفات الأقدم من {{time}} تلقائيًا هنا (تظل الرسائل سليمة)",
-  "RetentionPolicy_RoomWarning_Unpinned": "يتم تنقيح الرسائل غير المثبتة الأقدم من {{time}} تلقائيًا هنا",
-  "RetentionPolicy_RoomWarning_UnpinnedFilesOnly": "يتم تنقيح الملفات غير المثبتة الأقدم من {{time}} تلقائيًا هنا (تظل الرسائل سليمة)",
   "RetentionPolicyRoom_Enabled": "تنقيح الرسائل القديمة تلقائيًا",
   "RetentionPolicyRoom_ExcludePinned": "استبعاد الرسائل المثبتة",
   "RetentionPolicyRoom_FilesOnly": "تنقيح الملفات فقط، والاحتفاظ بالرسائل",
diff --git a/packages/i18n/src/locales/az.i18n.json b/packages/i18n/src/locales/az.i18n.json
index 4d70431dfcde..75d6b68ecff1 100644
--- a/packages/i18n/src/locales/az.i18n.json
+++ b/packages/i18n/src/locales/az.i18n.json
@@ -2068,10 +2068,6 @@
   "RetentionPolicy_MaxAge": "Maksimum mesaj yaşı",
   "RetentionPolicy_Precision": "Timer dəqiqliyi",
   "RetentionPolicy_Precision_Description": "Hədəf çəkicinin necə tez-tez istifadə etməsi lazımdır. Bunu daha dəqiq bir dəyərə təyin etmək, sürətli saxlama sayğacları olan kanalları daha yaxşı işlədir, lakin böyük icmalarda əlavə işləmə gücünə səbəb ola bilər.",
-  "RetentionPolicy_RoomWarning": "{{time}}-dən çox olan mesajlar avtomatik olaraq burda kəsilir",
-  "RetentionPolicy_RoomWarning_FilesOnly": "{{time}}-dən çox olan fayllar avtomatik olaraq burulmuşdur (mesajlar dəyişməz qalır)",
-  "RetentionPolicy_RoomWarning_Unpinned": "{{time}}-dən daha köhnəlməmiş mesajlar avtomatik olaraq buradan kəsilir",
-  "RetentionPolicy_RoomWarning_UnpinnedFilesOnly": "{{time}}-dən daha eski olan açılmamış fayllar avtomatik olaraq burulmuş (mesajlar dəyişməz qalır)",
   "RetentionPolicyRoom_Enabled": "Avtomatik olaraq köhnə mesajlar budayın",
   "RetentionPolicyRoom_ExcludePinned": "Səslənən mesajları həddindən kənarlaşdırın",
   "RetentionPolicyRoom_FilesOnly": "Yalnız faylları daraltın, mesajları saxlayın",
diff --git a/packages/i18n/src/locales/be-BY.i18n.json b/packages/i18n/src/locales/be-BY.i18n.json
index 8f44ae85d615..11a1d1c60b52 100644
--- a/packages/i18n/src/locales/be-BY.i18n.json
+++ b/packages/i18n/src/locales/be-BY.i18n.json
@@ -2085,10 +2085,6 @@
   "RetentionPolicy_MaxAge": "Максімальны ўзрост паведамлення",
   "RetentionPolicy_Precision": "таймер Precision",
   "RetentionPolicy_Precision_Description": "Як часта таймер чарнасліў павінен працаваць. Ўстаноўка гэтага больш дакладнага значэнне робіць каналы з хуткімі таймерамі захоўвання лепш працаваць, але могуць каштаваць дадатковых вылічальных магутнасцяў на вялікіх супольнасцях.",
-  "RetentionPolicy_RoomWarning": "Паведамлення старэй {{time}} аўтаматычна абразаюць тут",
-  "RetentionPolicy_RoomWarning_FilesOnly": "Файлы старэй {{time}} аўтаматычна абразаннем тут (паведамленні застаюцца некранутымі)",
-  "RetentionPolicy_RoomWarning_Unpinned": "Незамацаваныя паведамлення старэй {{time}} аўтаматычна абразаюць тут",
-  "RetentionPolicy_RoomWarning_UnpinnedFilesOnly": "Незамацаваныя файлы старэй {{time}} аўтаматычна абразаннем тут (паведамленні застаюцца некранутымі)",
   "RetentionPolicyRoom_Enabled": "Аўтаматычна абрэзаць старыя паведамленні",
   "RetentionPolicyRoom_ExcludePinned": "Выключыць ўскладалі паведамлення",
   "RetentionPolicyRoom_FilesOnly": "толькі Выдаляць файлы, захоўваць паведамленні",
diff --git a/packages/i18n/src/locales/bg.i18n.json b/packages/i18n/src/locales/bg.i18n.json
index 4cdac92ed503..c148b5c14b17 100644
--- a/packages/i18n/src/locales/bg.i18n.json
+++ b/packages/i18n/src/locales/bg.i18n.json
@@ -2065,10 +2065,6 @@
   "RetentionPolicy_MaxAge": "Максимална възраст на съобщенията",
   "RetentionPolicy_Precision": "Точност на таймера",
   "RetentionPolicy_Precision_Description": "Колко често трябва да се изпълнява таймерът за подрязване. Задаването на това с по-точна стойност прави каналите с бързи таймери за задържане да работят по-добре, но може да струва допълнителна мощност за обработка на големи общности.",
-  "RetentionPolicy_RoomWarning": "По-стари от {{time}} са автоматично подрязани тук",
-  "RetentionPolicy_RoomWarning_FilesOnly": "Файловете, по-стари от {{time}}, са автоматично подрязани тук (съобщенията остават непокътнати)",
-  "RetentionPolicy_RoomWarning_Unpinned": "Незаключените съобщения, по-стари от {{time}}, са автоматично подрязани тук",
-  "RetentionPolicy_RoomWarning_UnpinnedFilesOnly": "Незапалените файлове, по-стари от {{time}}, са автоматично подрязани тук (съобщенията остават непокътнати)",
   "RetentionPolicyRoom_Enabled": "Автоматично прерязване на старите съобщения",
   "RetentionPolicyRoom_ExcludePinned": "Изключете закачените съобщения",
   "RetentionPolicyRoom_FilesOnly": "Премахвайте само файлове, запазете съобщенията",
diff --git a/packages/i18n/src/locales/bs.i18n.json b/packages/i18n/src/locales/bs.i18n.json
index b762f784f92e..c0a14e86d2b2 100644
--- a/packages/i18n/src/locales/bs.i18n.json
+++ b/packages/i18n/src/locales/bs.i18n.json
@@ -2062,10 +2062,6 @@
   "RetentionPolicy_MaxAge": "Maksimalna dob poruka",
   "RetentionPolicy_Precision": "Preciznost mjerača",
   "RetentionPolicy_Precision_Description": "Koliko često bi trebao trajati mjerač vremena. Postavljanje na precizniju vrijednost čini kanale s brzim retencijskim vremenskim razmacima bolji, ali mogu koštati dodatnu snagu obrade u velikim zajednicama.",
-  "RetentionPolicy_RoomWarning": "Poruke starije od {{time}} ovdje su automatski izrezane",
-  "RetentionPolicy_RoomWarning_FilesOnly": "Datoteke starije od {{time}} ovdje su automatski izrezane (poruke ostaju netaknute)",
-  "RetentionPolicy_RoomWarning_Unpinned": "Ovdje su automatski obrezane poruke nepovezane poruke koje su starije od {{time}}",
-  "RetentionPolicy_RoomWarning_UnpinnedFilesOnly": "Neotkrivene datoteke starijih od {{time}} ovdje su automatski izrezane (poruke ostaju netaknute)",
   "RetentionPolicyRoom_Enabled": "Automatski obrišite stare poruke",
   "RetentionPolicyRoom_ExcludePinned": "Izuzmite prikvačene poruke",
   "RetentionPolicyRoom_FilesOnly": "Spusti samo datoteke, zadržite poruke",
diff --git a/packages/i18n/src/locales/ca.i18n.json b/packages/i18n/src/locales/ca.i18n.json
index 8c4ac5013df4..5caecf77c620 100644
--- a/packages/i18n/src/locales/ca.i18n.json
+++ b/packages/i18n/src/locales/ca.i18n.json
@@ -3495,10 +3495,6 @@
   "RetentionPolicy_MaxAge": "Antiguitat màxima de l'missatge",
   "RetentionPolicy_Precision": "Precisió del temporitzador",
   "RetentionPolicy_Precision_Description": "Amb quina freqüència ha de funcionar el comptador de poda. Establir això en un valor més precís fa que els canals amb temporitzadors de retenció ràpids funcionin millor, però podria costar potència de processament addicional en comunitats grans.",
-  "RetentionPolicy_RoomWarning": "Els missatges anteriors a {{time}} s'eliminen automàticament aquí",
-  "RetentionPolicy_RoomWarning_FilesOnly": "Els fitxers anteriors a {{time}} s'eliminen automàticament aquí (els missatges romanen intactes)",
-  "RetentionPolicy_RoomWarning_Unpinned": "Els missatges no fixats anteriors a {{time}} s'eliminaran automàticament aquí",
-  "RetentionPolicy_RoomWarning_UnpinnedFilesOnly": "Els fitxers no fixats anteriors a {{time}} s'eliminen automàticament aquí (els missatges romanen intactes)",
   "RetentionPolicyRoom_Enabled": "Esborrar missatges antics automàticament",
   "RetentionPolicyRoom_ExcludePinned": "Exclou els missatges fixats",
   "RetentionPolicyRoom_FilesOnly": "Esborri només arxius, mantingui missatges",
diff --git a/packages/i18n/src/locales/cs.i18n.json b/packages/i18n/src/locales/cs.i18n.json
index 48e14e4ce412..040fd18936df 100644
--- a/packages/i18n/src/locales/cs.i18n.json
+++ b/packages/i18n/src/locales/cs.i18n.json
@@ -2983,10 +2983,6 @@
   "RetentionPolicy_MaxAge": "Maximální stáří zprávy",
   "RetentionPolicy_Precision": "Přesnost časovače",
   "RetentionPolicy_Precision_Description": "Jak často by měl časovač pročištění spustit. Nastavením této hodnoty na přesnější hodnotu pracují kanály s rychlejšími retenčními časovači lépe, ale v případě velkých komunit by to mohlo stát další procesní výkon.",
-  "RetentionPolicy_RoomWarning": "Zprávy starší než {{time}} jsou zde automaticky pročištěny",
-  "RetentionPolicy_RoomWarning_FilesOnly": "Soubory starší než {{time}} jsou zde automaticky pročištěny (zpráv se netýká)",
-  "RetentionPolicy_RoomWarning_Unpinned": "Nepřipnuté zprávy starší než {{time}} jsou zde automaticky pročištěny",
-  "RetentionPolicy_RoomWarning_UnpinnedFilesOnly": "Nepřipnuté soubory starší než {{time}} jsou zde automaticky pročištěny (zpráv se netýká)",
   "RetentionPolicyRoom_Enabled": "Automaticky pročišťovat staré zprávy",
   "RetentionPolicyRoom_ExcludePinned": "Vyloučit připnuté zprávy",
   "RetentionPolicyRoom_FilesOnly": "Pročistit pouze soubory, zprávy ponechat",
diff --git a/packages/i18n/src/locales/cy.i18n.json b/packages/i18n/src/locales/cy.i18n.json
index 4c251affef70..862bc0c9face 100644
--- a/packages/i18n/src/locales/cy.i18n.json
+++ b/packages/i18n/src/locales/cy.i18n.json
@@ -2063,10 +2063,6 @@
   "RetentionPolicy_MaxAge": "Uchafswm oedran neges",
   "RetentionPolicy_Precision": "Precision Timer",
   "RetentionPolicy_Precision_Description": "Pa mor aml y dylai'r amserydd prîn redeg. Mae gosod hyn i werth mwy manwl yn gwneud sianelau gydag amseryddion cadw cyflym yn gweithio'n well, ond gallant gostio pŵer prosesu ychwanegol ar gymunedau mawr.",
-  "RetentionPolicy_RoomWarning": "Mae negeseuon hŷn na {{time}} yn cael eu prunedu'n awtomatig yma",
-  "RetentionPolicy_RoomWarning_FilesOnly": "Mae ffeiliau hŷn na {{time}} yn cael eu prunedu'n awtomatig yma (mae negeseuon yn aros yn gyfan)",
-  "RetentionPolicy_RoomWarning_Unpinned": "Mae negeseuon heb eu penodi yn hŷn na {{time}} yn cael eu prunedu'n awtomatig yma",
-  "RetentionPolicy_RoomWarning_UnpinnedFilesOnly": "Mae ffeiliau heb eu pennu yn hŷn na {{time}} yn cael eu prunedu'n awtomatig yma (mae negeseuon yn aros yn gyfan)",
   "RetentionPolicyRoom_Enabled": "Gwthio hen negeseuon yn awtomatig",
   "RetentionPolicyRoom_ExcludePinned": "Eithrio negeseuon wedi'u pinnio",
   "RetentionPolicyRoom_FilesOnly": "Gwahardd ffeiliau yn unig, cadwch negeseuon",
diff --git a/packages/i18n/src/locales/da.i18n.json b/packages/i18n/src/locales/da.i18n.json
index cc517986cfdc..55fe42056e52 100644
--- a/packages/i18n/src/locales/da.i18n.json
+++ b/packages/i18n/src/locales/da.i18n.json
@@ -3083,10 +3083,6 @@
   "RetentionPolicy_MaxAge": "Maksimal meddelelsesalder",
   "RetentionPolicy_Precision": "Timer Precision",
   "RetentionPolicy_Precision_Description": "Hvor ofte sletnings-timeren skal køre. Indstilling af dette til en mere præcis værdi gør kanaler med hurtige opbevarings-timere bedre, men kan koste ekstra procestid på store communities.",
-  "RetentionPolicy_RoomWarning": "Meddelelser ældre end {{time}} slettes automatisk her",
-  "RetentionPolicy_RoomWarning_FilesOnly": "Filer ældre end {{time}} beskæres automatisk her (meddelelserne forbliver intakte)",
-  "RetentionPolicy_RoomWarning_Unpinned": "Upinnede meddelelser ældre end {{time}} slettes automatisk her",
-  "RetentionPolicy_RoomWarning_UnpinnedFilesOnly": "Unpinned filer ældre end {{time}} beskæres automatisk her (meddelelserne forbliver intakte)",
   "RetentionPolicyRoom_Enabled": "Beskær automatisk gamle beskeder",
   "RetentionPolicyRoom_ExcludePinned": "Ekskluder pinnede meddelelser",
   "RetentionPolicyRoom_FilesOnly": "Beskær kun filer, hold meddelelser",
diff --git a/packages/i18n/src/locales/de-AT.i18n.json b/packages/i18n/src/locales/de-AT.i18n.json
index 81e4d6e814b4..6d629b557af1 100644
--- a/packages/i18n/src/locales/de-AT.i18n.json
+++ b/packages/i18n/src/locales/de-AT.i18n.json
@@ -2071,10 +2071,6 @@
   "RetentionPolicy_MaxAge": "Maximales Nachrichtenalter",
   "RetentionPolicy_Precision": "Timer-Präzision",
   "RetentionPolicy_Precision_Description": "Wie oft sollte der Prune Timer laufen? Wenn Sie dies auf einen präziseren Wert setzen, werden Kanäle mit schnellen Retention-Timern zwar besser, in großen Communities jedoch möglicherweise zusätzliche Verarbeitungsleistung.",
-  "RetentionPolicy_RoomWarning": "Nachrichten, die älter als {{time}} sind, werden hier automatisch gelöscht",
-  "RetentionPolicy_RoomWarning_FilesOnly": "Dateien älter als {{time}} werden hier automatisch bereinigt (Nachrichten bleiben erhalten)",
-  "RetentionPolicy_RoomWarning_Unpinned": "Nicht gepinnte Nachrichten, die älter als {{time}} sind, werden hier automatisch bereinigt",
-  "RetentionPolicy_RoomWarning_UnpinnedFilesOnly": "Nicht gepinnte Dateien älter als {{time}} werden hier automatisch beschnitten (Nachrichten bleiben erhalten)",
   "RetentionPolicyRoom_Enabled": "Alte Nachrichten automatisch löschen",
   "RetentionPolicyRoom_ExcludePinned": "Pinned-Nachrichten ausschließen",
   "RetentionPolicyRoom_FilesOnly": "Bereinigen Sie nur Dateien, behalten Sie Nachrichten",
diff --git a/packages/i18n/src/locales/de-IN.i18n.json b/packages/i18n/src/locales/de-IN.i18n.json
index a5573e38e29a..32fee348394e 100644
--- a/packages/i18n/src/locales/de-IN.i18n.json
+++ b/packages/i18n/src/locales/de-IN.i18n.json
@@ -2352,10 +2352,6 @@
   "RetentionPolicy_MaxAge": "Maximales Nachrichtenalter",
   "RetentionPolicy_Precision": "Timer-Präzision",
   "RetentionPolicy_Precision_Description": "Wie oft sollte der Prune Timer laufen? Wenn Du dies auf einen genauen Wert setzt, werden Kanäle mit schnellen Retention-Timern zwar besser, in großen Communities jedoch möglicherweise zusätzliche Verarbeitungsleistung.",
-  "RetentionPolicy_RoomWarning": "Nachrichten, die älter als {{time}} sind, werden hier automatisch gelöscht",
-  "RetentionPolicy_RoomWarning_FilesOnly": "Dateien älter als {{time}} werden hier automatisch bereinigt (Nachrichten bleiben erhalten)",
-  "RetentionPolicy_RoomWarning_Unpinned": "Nicht gepinnte Nachrichten, die älter als {{time}} sind, werden hier automatisch bereinigt",
-  "RetentionPolicy_RoomWarning_UnpinnedFilesOnly": "Nicht gepinnte Dateien älter als {{time}} werden hier automatisch bereinigt. (Nachrichten bleiben erhalten)",
   "RetentionPolicyRoom_Enabled": "Alte Nachrichten automatisch löschen",
   "RetentionPolicyRoom_ExcludePinned": "Pinned-Nachrichten ausschließen",
   "RetentionPolicyRoom_FilesOnly": "Bereinige nur Dateien, behalte Nachrichten",
diff --git a/packages/i18n/src/locales/de.i18n.json b/packages/i18n/src/locales/de.i18n.json
index d986e9be0126..776ec6961bd9 100644
--- a/packages/i18n/src/locales/de.i18n.json
+++ b/packages/i18n/src/locales/de.i18n.json
@@ -3992,10 +3992,6 @@
   "RetentionPolicy_MaxAge": "Maximales Nachrichtenalter",
   "RetentionPolicy_Precision": "Timer-Präzision",
   "RetentionPolicy_Precision_Description": "Wie oft sollte der Bereinigungs-Timer laufen? Wenn Sie dies auf einen präziseren Wert setzen, werden Kanäle mit schnellen Aufbewahrungs-Timern zwar besser, in großen Communitys jedoch möglicherweise zusätzliche Verarbeitungsleistung.",
-  "RetentionPolicy_RoomWarning": "Nachrichten, die älter als {{time}} sind, werden hier automatisch gelöscht",
-  "RetentionPolicy_RoomWarning_FilesOnly": "Dateien älter als {{time}} werden hier automatisch bereinigt (Nachrichten bleiben erhalten)",
-  "RetentionPolicy_RoomWarning_Unpinned": "Nicht angeheftete Nachrichten, die älter als {{time}} sind, werden hier automatisch bereinigt",
-  "RetentionPolicy_RoomWarning_UnpinnedFilesOnly": "Nicht angeheftete Dateien älter als {{time}} werden hier automatisch bereinigt. (Nachrichten bleiben erhalten)",
   "RetentionPolicyRoom_Enabled": "Alte Nachrichten automatisch löschen",
   "RetentionPolicyRoom_ExcludePinned": "Angeheftete Nachrichten ausschließen",
   "RetentionPolicyRoom_FilesOnly": "Nur Dateien bereinigen, Nachrichten behalten",
diff --git a/packages/i18n/src/locales/el.i18n.json b/packages/i18n/src/locales/el.i18n.json
index 916c8fd1230a..935ce3be7e0f 100644
--- a/packages/i18n/src/locales/el.i18n.json
+++ b/packages/i18n/src/locales/el.i18n.json
@@ -2076,10 +2076,6 @@
   "RetentionPolicy_MaxAge": "Μέγιστη ηλικία μηνύματος",
   "RetentionPolicy_Precision": "Χρονόμετρο ακρίβειας",
   "RetentionPolicy_Precision_Description": "Πόσο συχνά πρέπει να τρέχει ο χρονομετρητής. Η ρύθμιση αυτή σε μια πιο ακριβή τιμή καθιστά τα κανάλια με χρονοδιακόπτες γρήγορης συγκράτησης να λειτουργούν καλύτερα, αλλά μπορεί να κοστίζουν επιπλέον ισχύ επεξεργασίας σε μεγάλες κοινότητες.",
-  "RetentionPolicy_RoomWarning": "Τα μηνύματα μεγαλύτερα από {{time}} είναι αυτόματα κλαδεμένα εδώ",
-  "RetentionPolicy_RoomWarning_FilesOnly": "Αρχεία μεγαλύτερα από {{time}} είναι αυτόματα κλαδεμένα εδώ (τα μηνύματα παραμένουν άθικτα)",
-  "RetentionPolicy_RoomWarning_Unpinned": "Τα unpinned μηνύματα μεγαλύτερα από το {{time}} είναι αυτόματα κλαδεμένα εδώ",
-  "RetentionPolicy_RoomWarning_UnpinnedFilesOnly": "Τα unpinned αρχεία μεγαλύτερα από {{time}} είναι αυτόματα κλαδεμένα εδώ (τα μηνύματα παραμένουν άθικτα)",
   "RetentionPolicyRoom_Enabled": "Αυτόματη περικοπή παλιών μηνυμάτων",
   "RetentionPolicyRoom_ExcludePinned": "Εξαιρούνται τα καρφιτσωμένα μηνύματα",
   "RetentionPolicyRoom_FilesOnly": "Κλαδέψτε αρχεία μόνο, κρατήστε τα μηνύματα",
diff --git a/packages/i18n/src/locales/en.i18n.json b/packages/i18n/src/locales/en.i18n.json
index f6f85e2ca008..9f11703f2746 100644
--- a/packages/i18n/src/locales/en.i18n.json
+++ b/packages/i18n/src/locales/en.i18n.json
@@ -4527,10 +4527,10 @@
   "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": "Messages older than {{time}} are automatically pruned here",
-  "RetentionPolicy_RoomWarning_FilesOnly": "Files older than {{time}} are automatically pruned here (messages stay intact)",
-  "RetentionPolicy_RoomWarning_Unpinned": "Unpinned messages older than {{time}} are automatically pruned here",
-  "RetentionPolicy_RoomWarning_UnpinnedFilesOnly": "Unpinned files older than {{time}} are automatically pruned here (messages stay intact)",
+  "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",
diff --git a/packages/i18n/src/locales/eo.i18n.json b/packages/i18n/src/locales/eo.i18n.json
index d4c49a53443d..f41c951ddf48 100644
--- a/packages/i18n/src/locales/eo.i18n.json
+++ b/packages/i18n/src/locales/eo.i18n.json
@@ -2068,10 +2068,6 @@
   "RetentionPolicy_MaxAge": "Maksimuma mesaĝo",
   "RetentionPolicy_Precision": "Timer Precizeco",
   "RetentionPolicy_Precision_Description": "Kiom ofte la pruntempa temporilo devus kuri. Fiksante ĉi tion al pli preciza valoro faras kanalojn kun rapidaj retencaj tempoj pli bone funkcii, sed povus kosti ekstra prilabor-potencon en grandaj komunumoj.",
-  "RetentionPolicy_RoomWarning": "Mesaĝoj pli malnovaj ol {{time}} aŭtomate pritondas ĉi tie",
-  "RetentionPolicy_RoomWarning_FilesOnly": "Dosieroj pli malnovaj ol {{time}} aŭtomate pruntiĝas ĉi tie (mesaĝoj restas nerompitaj)",
-  "RetentionPolicy_RoomWarning_Unpinned": "Senpagaj mesaĝoj pli malnovaj ol {{time}} estas aŭtomate pruntitaj ĉi tie",
-  "RetentionPolicy_RoomWarning_UnpinnedFilesOnly": "Unpinned dosieroj pli malnovaj ol {{time}} estas aŭtomate pruntitaj ĉi tie (mesaĝoj restas nerompitaj)",
   "RetentionPolicyRoom_Enabled": "Aŭtomate prunti malnovajn mesaĝojn",
   "RetentionPolicyRoom_ExcludePinned": "Ekskludi kovritajn mesaĝojn",
   "RetentionPolicyRoom_FilesOnly": "Senpaga dosieroj nur, konservu mesaĝojn",
diff --git a/packages/i18n/src/locales/es.i18n.json b/packages/i18n/src/locales/es.i18n.json
index d11855fa2e0b..313ee11766bf 100644
--- a/packages/i18n/src/locales/es.i18n.json
+++ b/packages/i18n/src/locales/es.i18n.json
@@ -3545,10 +3545,6 @@
   "RetentionPolicy_MaxAge": "Antigüedad máxima de mensaje",
   "RetentionPolicy_Precision": "Precisión del temporizador",
   "RetentionPolicy_Precision_Description": "Frecuencia con la que debe ejecutarse el temporizador de retirada. Establecer esto en un valor más preciso hace que los canales con temporizadores de retención rápidos funcionen mejor, pero podría exigir potencia de procesamiento adicional en comunidades grandes.",
-  "RetentionPolicy_RoomWarning": "Los mensajes anteriores a {{time}} se retiran automáticamente aquí",
-  "RetentionPolicy_RoomWarning_FilesOnly": "Los archivos anteriores a {{time}} se retiran automáticamente aquí (los mensajes permanecen intactos)",
-  "RetentionPolicy_RoomWarning_Unpinned": "Los mensajes no fijados anteriores a {{time}} se retiran automáticamente aquí",
-  "RetentionPolicy_RoomWarning_UnpinnedFilesOnly": "Los archivos no fijados anteriores a {{time}} se retiran automáticamente aquí (los mensajes permanecen intactos)",
   "RetentionPolicyRoom_Enabled": "Retirar mensajes antiguos automáticamente",
   "RetentionPolicyRoom_ExcludePinned": "Excluir mensajes fijados",
   "RetentionPolicyRoom_FilesOnly": "Retirar solo archivos, mantener mensajes",
diff --git a/packages/i18n/src/locales/fa.i18n.json b/packages/i18n/src/locales/fa.i18n.json
index 64bd0a055090..206fec1f5461 100644
--- a/packages/i18n/src/locales/fa.i18n.json
+++ b/packages/i18n/src/locales/fa.i18n.json
@@ -2380,8 +2380,8 @@
   "RetentionPolicy_MaxAge": "حداکثر سن پیام",
   "RetentionPolicy_Precision": "تایمر دقیق",
   "RetentionPolicy_Precision_Description": "هر چند وقت یکبار تایمر بره باید اجرا شود تنظیم این به یک مقدار دقیق تر باعث می شود کانال های با تایمر نگهداری سریع کار بهتر، اما ممکن است پردازش قدرت اضافی در جوامع بزرگ هزینه.",
-  "RetentionPolicy_RoomWarning": "پیام های قدیمی تر از%s به طور خودکار در اینجا بریده می شوند",
-  "RetentionPolicy_RoomWarning_Unpinned": "پیغامهای غیر مسدود شده قدیمیتر از%s به صورت خودکار در اینجا برچیده میشوند",
+
+
   "RetentionPolicyRoom_Enabled": "پیام های قدیمی را به طور خودکار خرد کنید",
   "RetentionPolicyRoom_ExcludePinned": "پیام های پین شده را حذف کنید",
   "RetentionPolicyRoom_FilesOnly": "فقط پرونده ها را ببندید، پیام ها را نگه دارید",
diff --git a/packages/i18n/src/locales/fi.i18n.json b/packages/i18n/src/locales/fi.i18n.json
index e994e45e87f6..0026c5199402 100644
--- a/packages/i18n/src/locales/fi.i18n.json
+++ b/packages/i18n/src/locales/fi.i18n.json
@@ -4071,10 +4071,6 @@
   "RetentionPolicy_MaxAge": "Viestin maksimi-ikä",
   "RetentionPolicy_Precision": "Ajastimen tarkkuus",
   "RetentionPolicy_Precision_Description": "Karsinta-ajastimen suoritustiheys. Tarkan arvon määritys toimii paremmin kanavilla, joilla on nopeat säilytysajastimet, mutta käsittelyteho saattaa kärsiä suurissa yhteisöissä.",
-  "RetentionPolicy_RoomWarning": "Viestit, jotka ovat vanhempia kuin {{time}}, karsitaan automaattisesti tässä kohdassa",
-  "RetentionPolicy_RoomWarning_FilesOnly": "Tiedostot, jotka ovat vanhempia kuin {{time}}, karsitaan täällä automaattisesti (viestit säilyvät ennallaan)",
-  "RetentionPolicy_RoomWarning_Unpinned": "Kiinnittämättömät viestit, jotka ovat vanhempia kuin {{time}}, karsitaan automaattisesti tässä kohdassa",
-  "RetentionPolicy_RoomWarning_UnpinnedFilesOnly": "Kiinnittämättömät viestit, jotka ovat vanhempia kuin {{time}}, karsitaan automaattisesti tässä (viestit säilyvät ennallaan)",
   "RetentionPolicyRoom_Enabled": "Karsi vanhat viestit automaattisesti",
   "RetentionPolicyRoom_ExcludePinned": "Älä sisällytä kiinnitettyjä viestejä",
   "RetentionPolicyRoom_FilesOnly": "Karsi vain tiedostot, pidä viestit",
diff --git a/packages/i18n/src/locales/fr.i18n.json b/packages/i18n/src/locales/fr.i18n.json
index 0343ebcf082e..b79660384677 100644
--- a/packages/i18n/src/locales/fr.i18n.json
+++ b/packages/i18n/src/locales/fr.i18n.json
@@ -3546,10 +3546,6 @@
   "RetentionPolicy_MaxAge": "Âge maximal des messages",
   "RetentionPolicy_Precision": "Précision du temporisateur",
   "RetentionPolicy_Precision_Description": "Fréquence d'exécution du temporisateur d'élagage. Une valeur plus précise améliore le fonctionnement des canaux avec des temporisateurs de rétention rapides, mais le coût en termes de puissance de traitement peut être élevé pour les grandes communautés.",
-  "RetentionPolicy_RoomWarning": "Les messages plus anciens que {{time}} sont automatiquement élagués ici",
-  "RetentionPolicy_RoomWarning_FilesOnly": "Les fichiers plus anciens que {{time}} sont automatiquement élagués ici (les messages restent intacts)",
-  "RetentionPolicy_RoomWarning_Unpinned": "Les messages non épinglés plus anciens que {{time}} sont automatiquement élagués ici",
-  "RetentionPolicy_RoomWarning_UnpinnedFilesOnly": "Les fichiers non épinglés plus anciens que {{time}} sont automatiquement élagués ici (les messages restent intacts)",
   "RetentionPolicyRoom_Enabled": "Élaguer automatiquement les anciens messages",
   "RetentionPolicyRoom_ExcludePinned": "Exclure les messages épinglés",
   "RetentionPolicyRoom_FilesOnly": "Élaguer uniquement les fichiers, conserver les messages",
diff --git a/packages/i18n/src/locales/hr.i18n.json b/packages/i18n/src/locales/hr.i18n.json
index 61c0c443bf9a..4d77095ef86c 100644
--- a/packages/i18n/src/locales/hr.i18n.json
+++ b/packages/i18n/src/locales/hr.i18n.json
@@ -2200,10 +2200,6 @@
   "RetentionPolicy_MaxAge": "Maksimalna dob poruka",
   "RetentionPolicy_Precision": "Preciznost mjerača",
   "RetentionPolicy_Precision_Description": "Koliko često bi trebao trajati mjerač vremena. Postavljanje na precizniju vrijednost čini kanale s brzim retencijskim vremenskim razmacima bolji, ali mogu koštati dodatnu snagu obrade u velikim zajednicama.",
-  "RetentionPolicy_RoomWarning": "Poruke starije od {{time}} ovdje su automatski izrezane",
-  "RetentionPolicy_RoomWarning_FilesOnly": "Datoteke starije od {{time}} ovdje su automatski izrezane (poruke ostaju netaknute)",
-  "RetentionPolicy_RoomWarning_Unpinned": "Ovdje su automatski obrezane poruke nepovezane poruke koje su starije od {{time}}",
-  "RetentionPolicy_RoomWarning_UnpinnedFilesOnly": "Neotkrivene datoteke starijih od {{time}} ovdje su automatski izrezane (poruke ostaju netaknute)",
   "RetentionPolicyRoom_Enabled": "Automatski obrišite stare poruke",
   "RetentionPolicyRoom_ExcludePinned": "Izuzmite prikvačene poruke",
   "RetentionPolicyRoom_FilesOnly": "Spusti samo datoteke, zadržite poruke",
diff --git a/packages/i18n/src/locales/hu.i18n.json b/packages/i18n/src/locales/hu.i18n.json
index b978c8991d69..141ab17ec3dc 100644
--- a/packages/i18n/src/locales/hu.i18n.json
+++ b/packages/i18n/src/locales/hu.i18n.json
@@ -3912,10 +3912,6 @@
   "RetentionPolicy_MaxAge": "Legnagyobb üzenetéletkor",
   "RetentionPolicy_Precision": "Időzítő pontossága",
   "RetentionPolicy_Precision_Description": "Milyen gyakran kell futnia a törlési időzítőnek. Ennek egy pontosabb értékre állítása a gyors visszatartási időzítőkkel rendelkező csatornákat jobban működővé teszi, de további feldolgozási teljesítménybe kerülhet nagy közösségeknél.",
-  "RetentionPolicy_RoomWarning": "Itt automatikusan törölve lesznek azok az üzenetek, amelyek régebbiek mint {{time}}",
-  "RetentionPolicy_RoomWarning_FilesOnly": "Itt automatikusan törölve lesznek azok a fájlok, amelyek régebbiek mint {{time}} (az üzenetek érintetlenek maradnak)",
-  "RetentionPolicy_RoomWarning_Unpinned": "Itt automatikusan törölve lesznek azok a nem kitűzött üzenetek, amelyek régebbiek mint {{time}}",
-  "RetentionPolicy_RoomWarning_UnpinnedFilesOnly": "Itt automatikusan törölve lesznek azok a nem kitűzött fájlok, amelyek régebbiek mint {{time}} (az üzenetek érintetlenek maradnak)",
   "RetentionPolicyRoom_Enabled": "Régi üzenetek automatikus törlése",
   "RetentionPolicyRoom_ExcludePinned": "Rögzített üzenetek kizárása",
   "RetentionPolicyRoom_FilesOnly": "Csak fájlok törlése, üzenetek megtartása",
diff --git a/packages/i18n/src/locales/id.i18n.json b/packages/i18n/src/locales/id.i18n.json
index 3f03ef34e316..c0a9ed50b5c1 100644
--- a/packages/i18n/src/locales/id.i18n.json
+++ b/packages/i18n/src/locales/id.i18n.json
@@ -2076,10 +2076,6 @@
   "RetentionPolicy_MaxAge": "Umur pesan maksimum",
   "RetentionPolicy_Precision": "Timer Presisi",
   "RetentionPolicy_Precision_Description": "Seberapa sering pewaktu pemangkas harus berjalan. Menyetel ini ke nilai yang lebih tepat membuat saluran dengan penghitung waktu cepat berfungsi lebih baik, tetapi mungkin memerlukan biaya daya pemrosesan tambahan pada komunitas besar.",
-  "RetentionPolicy_RoomWarning": "Pesan yang lebih lama dari {{time}} secara otomatis dipangkas di sini",
-  "RetentionPolicy_RoomWarning_FilesOnly": "File yang lebih lama dari {{time}} secara otomatis dipangkas di sini (pesan tetap utuh)",
-  "RetentionPolicy_RoomWarning_Unpinned": "Pesan tidak berlabel yang lebih lama dari {{time}} secara otomatis dipangkas di sini",
-  "RetentionPolicy_RoomWarning_UnpinnedFilesOnly": "File yang tidak ditumpuk lebih lama dari {{time}} secara otomatis dipangkas di sini (pesan tetap utuh)",
   "RetentionPolicyRoom_Enabled": "Secara otomatis memangkas pesan lama",
   "RetentionPolicyRoom_ExcludePinned": "Kecualikan pesan yang disematkan",
   "RetentionPolicyRoom_FilesOnly": "Pangkas file saja, simpan pesan",
diff --git a/packages/i18n/src/locales/it.i18n.json b/packages/i18n/src/locales/it.i18n.json
index 5f01a3d39a0b..27231d8758de 100644
--- a/packages/i18n/src/locales/it.i18n.json
+++ b/packages/i18n/src/locales/it.i18n.json
@@ -2587,10 +2587,6 @@
   "RetentionPolicy_MaxAge": "Età massima del messaggio",
   "RetentionPolicy_Precision": "Precisione del timer",
   "RetentionPolicy_Precision_Description": "Con quale frequenza deve essere eseguito il timer di sfoltimento. Impostando questo ad un valore più preciso, i canali con timer di ritenzione veloce funzionano meglio, ma potrebbero costare una maggiore potenza di elaborazione su comunità di grandi dimensioni.",
-  "RetentionPolicy_RoomWarning": "I messaggi più vecchi di {{time}} vengono automaticamente eliminati qui",
-  "RetentionPolicy_RoomWarning_FilesOnly": "I file più vecchi di {{time}} vengono automaticamente eliminati qui (i messaggi rimangono intatti)",
-  "RetentionPolicy_RoomWarning_Unpinned": "I messaggi non pinati più vecchi di {{time}} vengono automaticamente eliminati qui",
-  "RetentionPolicy_RoomWarning_UnpinnedFilesOnly": "I file non pinati più vecchi di {{time}} vengono automaticamente eliminati qui (i messaggi rimangono intatti)",
   "RetentionPolicyRoom_Enabled": "Elimina automaticamente vecchi messaggi",
   "RetentionPolicyRoom_ExcludePinned": "Escludere i messaggi aggiunti",
   "RetentionPolicyRoom_FilesOnly": "Elimina solo i file, mantieni i messaggi",
diff --git a/packages/i18n/src/locales/ja.i18n.json b/packages/i18n/src/locales/ja.i18n.json
index befa051e6430..6e4f98e559d7 100644
--- a/packages/i18n/src/locales/ja.i18n.json
+++ b/packages/i18n/src/locales/ja.i18n.json
@@ -3508,10 +3508,6 @@
   "RetentionPolicy_MaxAge": "メッセージ保持日数",
   "RetentionPolicy_Precision": "タイマー精度",
   "RetentionPolicy_Precision_Description": "整理タイマーの実行頻度。これをより精密な値に設定すると、保持タイマーが高速なチャネルの動作が改善されますが、大規模コミュニティでは追加の処理能力が必要になる可能性があります。",
-  "RetentionPolicy_RoomWarning": "ここでは、{{time}}経過したメッセージが自動的に整理されます。",
-  "RetentionPolicy_RoomWarning_FilesOnly": "ここでは、{{time}}経過したファイルが自動的に整理されます（メッセージはそのまま残ります）",
-  "RetentionPolicy_RoomWarning_Unpinned": "ここでは、{{time}}経過した固定されていないメッセージが自動的に整理されます",
-  "RetentionPolicy_RoomWarning_UnpinnedFilesOnly": "ここでは、{{time}}経過した固定されていないファイルが自動的に整理されます（メッセージはそのまま残ります）",
   "RetentionPolicyRoom_Enabled": "古いメッセージを自動的に整理",
   "RetentionPolicyRoom_ExcludePinned": "固定されたメッセージを除外",
   "RetentionPolicyRoom_FilesOnly": "ファイルのみを整理し、メッセージは残す",
diff --git a/packages/i18n/src/locales/ka-GE.i18n.json b/packages/i18n/src/locales/ka-GE.i18n.json
index 0fc46f0672b8..bb4737d8da80 100644
--- a/packages/i18n/src/locales/ka-GE.i18n.json
+++ b/packages/i18n/src/locales/ka-GE.i18n.json
@@ -2782,10 +2782,6 @@
   "RetentionPolicy_FilesOnly_Description": "წაიშლება მხოლოდ ფაილები,შეტყობინებები დარჩება ადგილზე",
   "RetentionPolicy_MaxAge": "შეტყობინების მაქსიმალური ასაკი",
   "RetentionPolicy_Precision": "ტაიმერის სიზუსტე",
-  "RetentionPolicy_RoomWarning": "{{time}}– ზე ძველი შეტყობინებები ავტომატურად აქ-შეინახება",
-  "RetentionPolicy_RoomWarning_FilesOnly": "{{time}}– ზე ძველი ფაილები ავტომატურად აქ ინახება(შეტყობინებები არ დაზიანდება)",
-  "RetentionPolicy_RoomWarning_Unpinned": "{{time}}– ზე ძველი განპინული შეტყობინებები ავტომატურად შეინახება აქ",
-  "RetentionPolicy_RoomWarning_UnpinnedFilesOnly": "{{time}}– ზე ძველი განპინული ფაილები ავტომატურად აქ ინახება(შეტყობინებები არ დაზიანდება)",
   "RetentionPolicyRoom_ExcludePinned": "მიმაგრებული შეტყობინებების გამორიცხვა",
   "RetentionPolicyRoom_MaxAge": "შეტყობინების მაქსიმალური ასაკი დღეებში(დეფაულტი:{{_max}})",
   "RetentionPolicyRoom_OverrideGlobal": "გადახედეთ გლობალური შენახვის წესებს",
diff --git a/packages/i18n/src/locales/km.i18n.json b/packages/i18n/src/locales/km.i18n.json
index 0af204615eb6..c5e92acbf2cb 100644
--- a/packages/i18n/src/locales/km.i18n.json
+++ b/packages/i18n/src/locales/km.i18n.json
@@ -2384,10 +2384,6 @@
   "RetentionPolicy_MaxAge": "អាយុសារអតិបរមា",
   "RetentionPolicy_Precision": "ការបញ្ជាក់ពេលវេលា",
   "RetentionPolicy_Precision_Description": "រយៈពេលប៉ុន្មានដែលអ្នកល្ពៅគួរតែដំណើរការ។ ការកំណត់នេះទៅជាតម្លៃច្បាស់លាស់បន្ថែមទៀតធ្វើឱ្យឆានែលដែលមានឧបករណ៍កំណត់ពេលរក្សាទុកយ៉ាងឆាប់រហ័សដំណើរការបានល្អប៉ុន្តែវាអាចធ្វើអោយចំណាយថាមពលដំណើរការបន្ថែមលើសហគមន៍ធំ ៗ ។",
-  "RetentionPolicy_RoomWarning": "សារដែលចាស់ជាង {{time}} ត្រូវបានកាត់ចេញដោយស្វ័យប្រវត្តិនៅទីនេះ",
-  "RetentionPolicy_RoomWarning_FilesOnly": "ឯកសារចាស់ជាង {{time}} ត្រូវបានកាត់ចេញដោយស្វ័យប្រវត្តិនៅទីនេះ (សារនៅដដែល។",
-  "RetentionPolicy_RoomWarning_Unpinned": "សារដែលមិនបានភ្ជាប់ដែលចាស់ជាង {{time}} ត្រូវបានកាត់ចេញដោយស្វ័យប្រវត្តិនៅទីនេះ",
-  "RetentionPolicy_RoomWarning_UnpinnedFilesOnly": "ឯកសារដែលមិនបានភ្ជាប់ចាស់ជាង {{time}} ត្រូវបានកាត់ចេញដោយស្វ័យប្រវត្តិនៅទីនេះ (សារនៅដដែល។",
   "RetentionPolicyRoom_Enabled": "លុបសារចាស់ដោយស្វ័យប្រវត្តិ",
   "RetentionPolicyRoom_ExcludePinned": "មិនរាប់បញ្ចូលសារដែលបានបញ្ចូល",
   "RetentionPolicyRoom_FilesOnly": "លុបឯកសារតែរក្សាសារ",
diff --git a/packages/i18n/src/locales/ko.i18n.json b/packages/i18n/src/locales/ko.i18n.json
index d8858baa3536..1b06b8917745 100644
--- a/packages/i18n/src/locales/ko.i18n.json
+++ b/packages/i18n/src/locales/ko.i18n.json
@@ -3036,10 +3036,6 @@
   "RetentionPolicy_MaxAge": "최대 메시지 수명",
   "RetentionPolicy_Precision": "타이머 정밀도",
   "RetentionPolicy_Precision_Description": "정리 타이머가 실행되는 빈도. 이를 보다 정확한 값으로 설정하면 빠른 보존 타이머가 있는 채널이 더 잘 작동하지만, 대규모 커뮤니티에서는 처리 능력이 추가로 필요할 수 있습니다.",
-  "RetentionPolicy_RoomWarning": "{{time}} 이전의 메시지는 자동으로 정리됩니다.",
-  "RetentionPolicy_RoomWarning_FilesOnly": "{{time}} 이전의 파일은 자동으로 정리됩니다 (메시지는 그대로 유지됩니다).",
-  "RetentionPolicy_RoomWarning_Unpinned": "{{time}} 이전의 고정되지 않은 메시지는 자동으로 정리됩니다.",
-  "RetentionPolicy_RoomWarning_UnpinnedFilesOnly": "{{time}} 이전의 고정되지 않은 파일은 자동으로 정리됩니다 (메시지는 그대로 유지됩니다).",
   "RetentionPolicyRoom_Enabled": "오래된 메시지를 자동으로 정리합니다.",
   "RetentionPolicyRoom_ExcludePinned": "고정된 메시지 제외",
   "RetentionPolicyRoom_FilesOnly": "파일만 정리하고 메시지는 보존합니다.",
diff --git a/packages/i18n/src/locales/ku.i18n.json b/packages/i18n/src/locales/ku.i18n.json
index 62631e48995b..ee6422a47746 100644
--- a/packages/i18n/src/locales/ku.i18n.json
+++ b/packages/i18n/src/locales/ku.i18n.json
@@ -2063,9 +2063,6 @@
   "RetentionPolicy_MaxAge": "Mesajê herî mezintir",
   "RetentionPolicy_Precision": "Timer Precision",
   "RetentionPolicy_Precision_Description": "Heya caran timer prune divê diçin. Sazkirina vê nirxê bêtir rastîn dike ku kanalên bi timên bêdeng yên zûtir baş dixebite, lê dibe ku li ser civakên mezin.",
-  "RetentionPolicy_RoomWarning": "Messages ji hêla {{time}} mezintir têne hilweşandin",
-  "RetentionPolicy_RoomWarning_FilesOnly": "Pelên {{time}} ji mezintir {{time}} bixweber bixweber têne kirin",
-  "RetentionPolicy_RoomWarning_Unpinned": "Mesajên {{time}} ji hêla bêpinned ve tê veşartin",
   "RetentionPolicyRoom_Enabled": "Peyamên kevnên xwe yên otomatîk dihêle",
   "RetentionPolicyRoom_ExcludePinned": "Peyamên pinned",
   "RetentionPolicyRoom_FilesOnly": "Pelên tenê Prune, peyamên xwe biparêzin",
diff --git a/packages/i18n/src/locales/lo.i18n.json b/packages/i18n/src/locales/lo.i18n.json
index d17edd53be57..4bc2481ca583 100644
--- a/packages/i18n/src/locales/lo.i18n.json
+++ b/packages/i18n/src/locales/lo.i18n.json
@@ -2106,10 +2106,6 @@
   "RetentionPolicy_MaxAge": "Age message ສູງສຸດ",
   "RetentionPolicy_Precision": "Timer Precision",
   "RetentionPolicy_Precision_Description": "ເວລາທີ່ໃຊ້ເວລາມັນຄວນໃຊ້. ການຕັ້ງຄ່ານີ້ໃຫ້ມີມູນຄ່າທີ່ຊັດເຈນຫຼາຍເຮັດໃຫ້ຊ່ອງທີ່ມີເວລາເກັບຮັກສາໄວຂຶ້ນເຮັດວຽກດີຂຶ້ນແຕ່ອາດຈະມີຄ່າໃຊ້ຈ່າຍໃນການປະມວນຜົນພິເສດໃນຊຸມຊົນຂະຫນາດໃຫຍ່.",
-  "RetentionPolicy_RoomWarning": "ຂໍ້ຄວາມສູງກວ່າ {{time}} ຖືກຕັດເອົາໄວ້ອັດຕະໂນມັດຢູ່ທີ່ນີ້",
-  "RetentionPolicy_RoomWarning_FilesOnly": "ເອກະສານທີ່ເກົ່າກວ່າ {{time}} ຖືກຕັດອອກໂດຍອັດຕະໂນມັດຢູ່ນີ້ (ຂໍ້ຄວາມທີ່ຍັງຄົງຢູ່)",
-  "RetentionPolicy_RoomWarning_Unpinned": "ຂໍ້ຄວາມທີ່ unpinned ຫຼາຍກວ່າ {{time}} ຖືກຕັດໂດຍອັດຕະໂນມັດຢູ່ທີ່ນີ້",
-  "RetentionPolicy_RoomWarning_UnpinnedFilesOnly": "ໄຟລ໌ Unpinned ທີ່ເກົ່າກວ່າ {{time}} ຖືກຕັດໂດຍອັດຕະໂນມັດຢູ່ບ່ອນນີ້ (ຂໍ້ຄວາມທີ່ຍັງຄົງຢູ່)",
   "RetentionPolicyRoom_Enabled": "ລຶບຂໍ້ຄວາມເກົ່າອັດຕະໂນມັດ",
   "RetentionPolicyRoom_ExcludePinned": "ຍົກເວັ້ນຂໍ້ຄວາມທີ່ມີ PINned",
   "RetentionPolicyRoom_FilesOnly": "ໄຟລ໌ Prune ພຽງແຕ່ເກັບຂໍ້ຄວາມ",
diff --git a/packages/i18n/src/locales/lt.i18n.json b/packages/i18n/src/locales/lt.i18n.json
index 31cf7b65f3e4..65c075aa66be 100644
--- a/packages/i18n/src/locales/lt.i18n.json
+++ b/packages/i18n/src/locales/lt.i18n.json
@@ -2123,10 +2123,6 @@
   "RetentionPolicy_MaxAge": "Maksimalus pranešimo amžius",
   "RetentionPolicy_Precision": "Laikmatis tikslumas",
   "RetentionPolicy_Precision_Description": "Kaip dažnai turi būti paleidžiamas kopūstų laikrodis. Jei norite nustatyti tikslesnę reikšmę, kanalai su greitojo saugojimo laikmačiais dirba geriau, bet didelėms bendruomenėms gali būti brangesta papildoma apdorojimo galia.",
-  "RetentionPolicy_RoomWarning": "Pranešimai, senesni nei {{time}}, automatiškai prisegami čia",
-  "RetentionPolicy_RoomWarning_FilesOnly": "Failai, senesni nei {{time}}, automatiškai prisegami čia (pranešimai lieka nepakitę)",
-  "RetentionPolicy_RoomWarning_Unpinned": "Nepakeisti pranešimai, senesni už {{time}}, automatiškai prisegami čia",
-  "RetentionPolicy_RoomWarning_UnpinnedFilesOnly": "Atskirti failai, senesni už {{time}}, automatiškai prisegami čia (pranešimai lieka nepakitę).",
   "RetentionPolicyRoom_Enabled": "Automatiškai sunaikinti senus pranešimus",
   "RetentionPolicyRoom_ExcludePinned": "Išskirti prisegtus pranešimus",
   "RetentionPolicyRoom_FilesOnly": "Prune tik failus, saugo pranešimus",
diff --git a/packages/i18n/src/locales/lv.i18n.json b/packages/i18n/src/locales/lv.i18n.json
index 97857c9c7bfd..b06459434ffa 100644
--- a/packages/i18n/src/locales/lv.i18n.json
+++ b/packages/i18n/src/locales/lv.i18n.json
@@ -2081,10 +2081,6 @@
   "RetentionPolicy_MaxAge": "Maksimālais ziņojumu vecums",
   "RetentionPolicy_Precision": "Taimera precizitāte",
   "RetentionPolicy_Precision_Description": "Cik bieži ir apgriešanas taimerim būtu jādarbojas? Iestatot to precīzāku ar vērtību, kanāli ar ātru saglabāšanas taimeri darbojas labāk, taču lielām grupām tas var prasīt vairāk apstrādes jaudas.",
-  "RetentionPolicy_RoomWarning": "Vēstules, kas ir vecākas par {{time}}, tiek automātiski apgrieztas šeit",
-  "RetentionPolicy_RoomWarning_FilesOnly": "Faili, kas vecāki par {{time}}, tiek automātiski apgriezti šeit (ziņojumi paliek neskarti)",
-  "RetentionPolicy_RoomWarning_Unpinned": "Nepiespraustie ziņojumi, kas vecāki par {{time}}, tiek automātiski apgriezti šeit",
-  "RetentionPolicy_RoomWarning_UnpinnedFilesOnly": "Nepiespraustie faili, kas ir vecāki par {{time}}, tiek automātiski apgriezti šeit (ziņojumi paliek neskarti)",
   "RetentionPolicyRoom_Enabled": "Automātiski apgriež vecās ziņas",
   "RetentionPolicyRoom_ExcludePinned": "Izslēgt piespraustos ziņojumus",
   "RetentionPolicyRoom_FilesOnly": "Apgriezt tikai failus, saglabāt ziņojumus",
diff --git a/packages/i18n/src/locales/mn.i18n.json b/packages/i18n/src/locales/mn.i18n.json
index e37d0b090302..757fe0d9c356 100644
--- a/packages/i18n/src/locales/mn.i18n.json
+++ b/packages/i18n/src/locales/mn.i18n.json
@@ -2063,10 +2063,6 @@
   "RetentionPolicy_MaxAge": "Мессежний хамгийн их нас",
   "RetentionPolicy_Precision": "Таймер Нарийвчлал",
   "RetentionPolicy_Precision_Description": "Пресс хийх хугацаа хэр их байх ёстой. Үүнийг илүү нарийвчлалтайгаар тогтоох нь түргэн хугацаанд хадгалах сувгууд нь илүү сайн ажиллана, гэхдээ томоохон бүлгүүдэд илүү их боловсруулах хүчин чадал шаарддаг.",
-  "RetentionPolicy_RoomWarning": "{{time}}-с хуучин мессежүүд автоматаар таслагдсан байна",
-  "RetentionPolicy_RoomWarning_FilesOnly": "{{time}}-с хуучин файлууд нь автоматаар уншсан (зурвасууд бүрэн бүтэн байна)",
-  "RetentionPolicy_RoomWarning_Unpinned": "{{time}}-ээс хуучин зурвасууд автоматаар таслагдсан байна",
-  "RetentionPolicy_RoomWarning_UnpinnedFilesOnly": "{{time}}-ээс хуучин файлууд нь автоматаар уншсан (зурвасууд бүрэн бүтэн байна)",
   "RetentionPolicyRoom_Enabled": "Хуучин зурвасуудыг автоматаар болгоно",
   "RetentionPolicyRoom_ExcludePinned": "Тэмдэглэсэн зурвасуудыг хасна уу",
   "RetentionPolicyRoom_FilesOnly": "Зөвхөн файлын файлууд, мессежүүдийг хадгал",
diff --git a/packages/i18n/src/locales/ms-MY.i18n.json b/packages/i18n/src/locales/ms-MY.i18n.json
index 399199b71140..aa8142905ec8 100644
--- a/packages/i18n/src/locales/ms-MY.i18n.json
+++ b/packages/i18n/src/locales/ms-MY.i18n.json
@@ -2075,10 +2075,6 @@
   "RetentionPolicy_MaxAge": "Umur mesej maksimum",
   "RetentionPolicy_Precision": "Ketepatan pemasa",
   "RetentionPolicy_Precision_Description": "Berapa kerap pemasa prune perlu dijalankan. Menetapkan ini ke nilai yang lebih tepat menjadikan saluran dengan pemasa cepat pemasa berfungsi dengan lebih baik, tetapi mungkin memerlukan kuasa pemprosesan tambahan pada komuniti besar.",
-  "RetentionPolicy_RoomWarning": "Mesej yang lebih lama daripada {{time}} secara automatik dipangkas di sini",
-  "RetentionPolicy_RoomWarning_FilesOnly": "Fail lebih tua daripada {{time}} secara automatik dipangkas di sini (mesej tetap utuh)",
-  "RetentionPolicy_RoomWarning_Unpinned": "Mesej yang disipan lebih lama daripada {{time}} secara automatik dipangkas di sini",
-  "RetentionPolicy_RoomWarning_UnpinnedFilesOnly": "Fail yang disandarkan lebih lama daripada {{time}} secara automatik dipangkas di sini (mesej tetap utuh)",
   "RetentionPolicyRoom_Enabled": "Buang mesej lama secara automatik",
   "RetentionPolicyRoom_ExcludePinned": "Kecualikan mesej yang disematkan",
   "RetentionPolicyRoom_FilesOnly": "Fail prune sahaja, simpan mesej",
diff --git a/packages/i18n/src/locales/nl.i18n.json b/packages/i18n/src/locales/nl.i18n.json
index d728696db8ef..5f14ee05179f 100644
--- a/packages/i18n/src/locales/nl.i18n.json
+++ b/packages/i18n/src/locales/nl.i18n.json
@@ -3536,10 +3536,6 @@
   "RetentionPolicy_MaxAge": "Maximale berichtleeftijd",
   "RetentionPolicy_Precision": "Timer precisie",
   "RetentionPolicy_Precision_Description": "Hoe vaak de prune-timer moet worden uitgevoerd. Als u dit instelt op een nauwkeurigere waarde, werken kanalen met snelle retentietimers beter, maar kan dit extra verwerkingskracht kosten voor grote gemeenschappen.",
-  "RetentionPolicy_RoomWarning": "Berichten ouder dan {{time}} worden hier automatisch gesnoeid",
-  "RetentionPolicy_RoomWarning_FilesOnly": "Bestanden ouder dan {{time}} worden hier automatisch gesnoeid (berichten blijven intact)",
-  "RetentionPolicy_RoomWarning_Unpinned": "Niet-vastgezette berichten ouder dan {{time}} worden hier automatisch gesnoeid",
-  "RetentionPolicy_RoomWarning_UnpinnedFilesOnly": "Niet-vastgezette bestanden ouder dan {{time}} worden hier automatisch gesnoeid (berichten blijven intact)",
   "RetentionPolicyRoom_Enabled": "Oude berichten automatisch snoeien",
   "RetentionPolicyRoom_ExcludePinned": "Sluit vastgezette berichten uit",
   "RetentionPolicyRoom_FilesOnly": "Alleen bestanden snoeien, berichten bewaren",
diff --git a/packages/i18n/src/locales/no.i18n.json b/packages/i18n/src/locales/no.i18n.json
index 45e3965e998d..442a4bc68284 100644
--- a/packages/i18n/src/locales/no.i18n.json
+++ b/packages/i18n/src/locales/no.i18n.json
@@ -3467,10 +3467,6 @@
   "RetentionPolicy_MaxAge": "Maksimal meldingsalder",
   "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.",
-  "RetentionPolicy_RoomWarning": "Meldinger som er eldre enn {{time}} blir automatisk beskåret her",
-  "RetentionPolicy_RoomWarning_FilesOnly": "Filer eldre enn {{time}} blir automatisk beskjært her (meldingene forblir intakte)",
-  "RetentionPolicy_RoomWarning_Unpinned": "Unpinned meldinger eldre enn {{time}} blir automatisk beskåret her",
-  "RetentionPolicy_RoomWarning_UnpinnedFilesOnly": "Unpinned filer eldre enn {{time}} blir automatisk beskåret her (meldingene forblir intakte)",
   "RetentionPolicyRoom_Enabled": "Beskjær automatisk gamle meldinger",
   "RetentionPolicyRoom_ExcludePinned": "Ekskluder pinnede meldinger",
   "RetentionPolicyRoom_FilesOnly": "Bare beskjyll filer, hold beskjeder",
diff --git a/packages/i18n/src/locales/pl.i18n.json b/packages/i18n/src/locales/pl.i18n.json
index 97240fbcb204..6f504619f8ce 100644
--- a/packages/i18n/src/locales/pl.i18n.json
+++ b/packages/i18n/src/locales/pl.i18n.json
@@ -3858,10 +3858,6 @@
   "RetentionPolicy_MaxAge": "Maksymalny wiek wiadomości",
   "RetentionPolicy_Precision": "Precyzja zegara",
   "RetentionPolicy_Precision_Description": "Jak często powinien działać timer przycinania. Ustawienie tej wartości na bardziej precyzyjną powoduje, że kanały z szybkimi licznikami czasu przechowywania działają lepiej, ale mogą kosztować dodatkową moc obliczeniową w dużych społecznościach.",
-  "RetentionPolicy_RoomWarning": "Wiadomości starsze niż {{time}} są tutaj automatycznie przycinane",
-  "RetentionPolicy_RoomWarning_FilesOnly": "Pliki starsze niż {{time}} są automatycznie przycinane tutaj (wiadomości pozostają nienaruszone)",
-  "RetentionPolicy_RoomWarning_Unpinned": "Odpinane wiadomości starsze niż {{time}} są tutaj automatycznie przycinane",
-  "RetentionPolicy_RoomWarning_UnpinnedFilesOnly": "Odpinane pliki starsze niż {{time}} są automatycznie przycinane tutaj (wiadomości pozostają nienaruszone)",
   "RetentionPolicyRoom_Enabled": "Automatycznie usuwaj stare wiadomości",
   "RetentionPolicyRoom_ExcludePinned": "Wyklucz podpięte wiadomości",
   "RetentionPolicyRoom_FilesOnly": "Przycinaj tylko pliki, zachowaj wiadomości",
diff --git a/packages/i18n/src/locales/pt-BR.i18n.json b/packages/i18n/src/locales/pt-BR.i18n.json
index 70c9496d44e4..ce98362e9d40 100644
--- a/packages/i18n/src/locales/pt-BR.i18n.json
+++ b/packages/i18n/src/locales/pt-BR.i18n.json
@@ -3638,10 +3638,6 @@
   "RetentionPolicy_MaxAge": "A idade máxima da mensagem",
   "RetentionPolicy_Precision": "Precisão do temporizador",
   "RetentionPolicy_Precision_Description": "Quantas vezes o temporizador de remoção deve ser executado. Configurar um valor mais preciso faz com que os canais com temporizadores de retenção rápidos funcionem melhor, mas podem usar mais potência de processamento em grandes comunidades.",
-  "RetentionPolicy_RoomWarning": "Mensagens mais antigas que {{time}} serão automaticamente removidas daqui",
-  "RetentionPolicy_RoomWarning_FilesOnly": "Arquivos anteriores a {{time}} serão removidos automaticamente daqui (as mensagens permanecerão intactas)",
-  "RetentionPolicy_RoomWarning_Unpinned": "Mensagens não fixadas anteriores a {{time}} serão automaticamente removidas daqui",
-  "RetentionPolicy_RoomWarning_UnpinnedFilesOnly": "Arquivos não fixados anteriores a {{time}} serão removidos automaticamente daqui (as mensagens permanecerão intactas)",
   "RetentionPolicyRoom_Enabled": "Remover automaticamente mensagens antigas",
   "RetentionPolicyRoom_ExcludePinned": "Excluir mensagens fixas",
   "RetentionPolicyRoom_FilesOnly": "Remover apenas arquivos, manter as mensagens",
diff --git a/packages/i18n/src/locales/pt.i18n.json b/packages/i18n/src/locales/pt.i18n.json
index 3d9a30a7e35a..2bc58d7fc19c 100644
--- a/packages/i18n/src/locales/pt.i18n.json
+++ b/packages/i18n/src/locales/pt.i18n.json
@@ -2404,10 +2404,6 @@
   "RetentionPolicy_MaxAge": "A idade máxima da mensagem",
   "RetentionPolicy_Precision": "Precisão do temporizador",
   "RetentionPolicy_Precision_Description": "Quantas vezes o temporizador de remoção deve ser executado. Configurar isso para um valor mais preciso faz com que os canais com temporizadores de retenção rápidos funcionem melhor, mas podem custar um poder de processamento extra em grandes comunidades.",
-  "RetentionPolicy_RoomWarning": "Mensagens mais antigas que {{time}} são automaticamente removidas aqui",
-  "RetentionPolicy_RoomWarning_FilesOnly": "Arquivos mais antigos que {{time}} são removidos automaticamente aqui (as mensagens permanecem intactas)",
-  "RetentionPolicy_RoomWarning_Unpinned": "Mensagens soltas mais antigas que {{time}} são automaticamente removidas aqui",
-  "RetentionPolicy_RoomWarning_UnpinnedFilesOnly": "Arquivos desafinados mais antigos que {{time}} são removidos automaticamente aqui (as mensagens permanecem intactas)",
   "RetentionPolicyRoom_Enabled": "Remover automaticamente mensagens antigas",
   "RetentionPolicyRoom_ExcludePinned": "Excluir mensagens fixas",
   "RetentionPolicyRoom_FilesOnly": "Remover apenas arquivos, mantenha mensagens",
diff --git a/packages/i18n/src/locales/ro.i18n.json b/packages/i18n/src/locales/ro.i18n.json
index 8c80df9b793f..2b5dcac528b0 100644
--- a/packages/i18n/src/locales/ro.i18n.json
+++ b/packages/i18n/src/locales/ro.i18n.json
@@ -2067,10 +2067,6 @@
   "RetentionPolicy_MaxAge": "Vârsta maximă a mesajului",
   "RetentionPolicy_Precision": "Timp de precizie",
   "RetentionPolicy_Precision_Description": "Cât de des ar trebui să ruleze cronometrul pentru prune. Setarea acestei valori la o valoare mai precisă face ca canalele cu cronometre rapide să funcționeze mai bine, dar ar putea costa putere suplimentară de procesare pentru comunitățile mari.",
-  "RetentionPolicy_RoomWarning": "Mesajele mai vechi decât {{time}} sunt tăiate automat aici",
-  "RetentionPolicy_RoomWarning_FilesOnly": "Fișiere mai vechi de {{time}} sunt în mod automat tăiate aici (mesajele rămân intacte)",
-  "RetentionPolicy_RoomWarning_Unpinned": "Mesajele neacoperite mai vechi de {{time}} sunt tăiate automat aici",
-  "RetentionPolicy_RoomWarning_UnpinnedFilesOnly": "Fișierele fixate mai sus decât {{time}} sunt tăiate automat aici (mesajele rămân intacte)",
   "RetentionPolicyRoom_Enabled": "Trasați automat mesajele vechi",
   "RetentionPolicyRoom_ExcludePinned": "Excludeți mesajele fixate",
   "RetentionPolicyRoom_FilesOnly": "Prune numai fișierele, păstrează mesajele",
diff --git a/packages/i18n/src/locales/ru.i18n.json b/packages/i18n/src/locales/ru.i18n.json
index 6a71f68572c3..56d72c4aa524 100644
--- a/packages/i18n/src/locales/ru.i18n.json
+++ b/packages/i18n/src/locales/ru.i18n.json
@@ -3711,10 +3711,6 @@
   "RetentionPolicy_MaxAge": "Максимальное время жизни сообщений",
   "RetentionPolicy_Precision": "Точность таймера",
   "RetentionPolicy_Precision_Description": "Как часто должен запускаться таймер очистки. Установка этих значений позволяет каналам с более частыми таймерами очистки сообщений работать лучше, но может стоить дополнительных вычислительных мощностей на больших сообществах.",
-  "RetentionPolicy_RoomWarning": "Сообщения в этой комнате удаляются через {{time}}.",
-  "RetentionPolicy_RoomWarning_FilesOnly": "Файлы старше {{time}} в этой комнате автоматически удаляются. (сообщения остаются незатронутыми)",
-  "RetentionPolicy_RoomWarning_Unpinned": "Незакрепленные сообщения в этой комнате удаляются через  {{time}}.",
-  "RetentionPolicy_RoomWarning_UnpinnedFilesOnly": "Незакрепленные файлы старше {{time}} в этой комнате автоматически удаляются. (сообщения остаются незатронутыми)",
   "RetentionPolicyRoom_Enabled": "Автоматически удалять старые сообщения",
   "RetentionPolicyRoom_ExcludePinned": "Исключить закрепленные сообщения",
   "RetentionPolicyRoom_FilesOnly": "Удалять только файлы, сохранять сообщения",
diff --git a/packages/i18n/src/locales/sk-SK.i18n.json b/packages/i18n/src/locales/sk-SK.i18n.json
index ed4a68d97b24..13a823eb8bbc 100644
--- a/packages/i18n/src/locales/sk-SK.i18n.json
+++ b/packages/i18n/src/locales/sk-SK.i18n.json
@@ -2077,10 +2077,6 @@
   "RetentionPolicy_MaxAge": "Maximálny vek správy",
   "RetentionPolicy_Precision": "Timer Precision",
   "RetentionPolicy_Precision_Description": "Ako často by mal spustiť časovač prerezávanie. Nastavenie tejto hodnoty na presnejšiu hodnotu umožňuje, aby kanály s rýchlymi retenčnými časovačmi fungovali lepšie, ale mohlo by to zapríčiniť mimoriadny výkon spracovania veľkých spoločenstiev.",
-  "RetentionPolicy_RoomWarning": "Správy staršie ako {{time}} sú automaticky prerezané tu",
-  "RetentionPolicy_RoomWarning_FilesOnly": "Súbory staršie ako {{time}} sú automaticky prerezané tu (správy zostanú neporušené)",
-  "RetentionPolicy_RoomWarning_Unpinned": "Zrušené správy staršie ako {{time}} sú automaticky prerezané tu",
-  "RetentionPolicy_RoomWarning_UnpinnedFilesOnly": "Neopravené súbory staršie ako {{time}} sú automaticky prerezané tu (správy zostanú neporušené)",
   "RetentionPolicyRoom_Enabled": "Automaticky prerezávať staré správy",
   "RetentionPolicyRoom_ExcludePinned": "Vylúčte pripnuté správy",
   "RetentionPolicyRoom_FilesOnly": "Zrušte iba súbory, uložte správy",
diff --git a/packages/i18n/src/locales/sl-SI.i18n.json b/packages/i18n/src/locales/sl-SI.i18n.json
index 407d5b384545..bb17e5cbee1e 100644
--- a/packages/i18n/src/locales/sl-SI.i18n.json
+++ b/packages/i18n/src/locales/sl-SI.i18n.json
@@ -2057,10 +2057,6 @@
   "RetentionPolicy_MaxAge": "Najvišja starost sporočila",
   "RetentionPolicy_Precision": "Časovna natančnost",
   "RetentionPolicy_Precision_Description": "Kako pogosto naj se izvaja časovni rezalnik. Če nastavite to na natančnejšo vrednost, postanejo kanali z hitrimi časovnimi časi boljši, vendar pa lahko pri večjih skupnostih stanejo dodatna procesna moč.",
-  "RetentionPolicy_RoomWarning": "Sporočila, starejša od {{time}}, so samodejno obrezana tukaj",
-  "RetentionPolicy_RoomWarning_FilesOnly": "Datoteke, starejše od {{time}}, so samodejno obrezane tukaj (sporočila ostanejo nedotaknjena)",
-  "RetentionPolicy_RoomWarning_Unpinned": "Neodgovorjena sporočila, starejša od {{time}}, so samodejno obrezana tukaj",
-  "RetentionPolicy_RoomWarning_UnpinnedFilesOnly": "Neodločene datoteke, starejše od {{time}}, so samodejno obrezane tukaj (sporočila ostanejo nedotaknjena)",
   "RetentionPolicyRoom_Enabled": "Samodejno obrezovanje starih sporočil",
   "RetentionPolicyRoom_ExcludePinned": "Izključi prepovedana sporočila",
   "RetentionPolicyRoom_FilesOnly": "Samo poševne datoteke, obdržite sporočila",
diff --git a/packages/i18n/src/locales/sq.i18n.json b/packages/i18n/src/locales/sq.i18n.json
index c74d6e414f52..00a6b35d8a83 100644
--- a/packages/i18n/src/locales/sq.i18n.json
+++ b/packages/i18n/src/locales/sq.i18n.json
@@ -2067,10 +2067,6 @@
   "RetentionPolicy_MaxAge": "Mosha maksimale e mesazhit",
   "RetentionPolicy_Precision": "Timer Precision",
   "RetentionPolicy_Precision_Description": "Sa shpesh koha duhet të funksionojë. Vendosja e kësaj me një vlerë më të saktë bën që kanalet me kohëmatësi të mbajtjes së shpejtë të funksionojnë më mirë, por mund të kushtojnë energji shtesë për përpunim në komunitetet e mëdha.",
-  "RetentionPolicy_RoomWarning": "Mesazhet më të vjetra se {{time}} shkurtohen automatikisht këtu",
-  "RetentionPolicy_RoomWarning_FilesOnly": "Dosjet më të vjetra se {{time}} janë shkurtuar automatikisht këtu (mesazhet mbeten të paprekura)",
-  "RetentionPolicy_RoomWarning_Unpinned": "Mesazhet e pambuluara më të vjetra se {{time}} shkurtohen automatikisht këtu",
-  "RetentionPolicy_RoomWarning_UnpinnedFilesOnly": "Skedarët e çaktivizuar më të vjetër se {{time}} janë shkurtuar automatikisht këtu (mesazhet mbeten të paprekura)",
   "RetentionPolicyRoom_Enabled": "Automatikisht prishi mesazhet e vjetra",
   "RetentionPolicyRoom_ExcludePinned": "Përjashto mesazhet e mbështetura",
   "RetentionPolicyRoom_FilesOnly": "Prune vetëm fotografi, mbani mesazhe",
diff --git a/packages/i18n/src/locales/sr.i18n.json b/packages/i18n/src/locales/sr.i18n.json
index ba5bcceff14b..f02efa3acd54 100644
--- a/packages/i18n/src/locales/sr.i18n.json
+++ b/packages/i18n/src/locales/sr.i18n.json
@@ -1901,10 +1901,6 @@
   "RetentionPolicy_MaxAge": "Максимална старост поруке",
   "RetentionPolicy_Precision": "Тимер Прецисион",
   "RetentionPolicy_Precision_Description": "Колико често би требало да се покрене тимер за резање. Постављањем ове на прецизну вриједност чини канале са брзим временским задржавањем боље функционирати, али би могла да коштају додатну моћ процесирања на великим заједницама.",
-  "RetentionPolicy_RoomWarning": "Порука старија од {{time}} аутоматски се обрезује овде",
-  "RetentionPolicy_RoomWarning_FilesOnly": "Датотеке старије од {{time}} су аутоматски обрезане овде (поруке остају нетакнуте)",
-  "RetentionPolicy_RoomWarning_Unpinned": "Неупозорене поруке старије од {{time}} аутоматски се обрезују овдје",
-  "RetentionPolicy_RoomWarning_UnpinnedFilesOnly": "Неупуцене датотеке старије од {{time}} аутоматски су обрезане овде (поруке остају нетакнуте)",
   "RetentionPolicyRoom_Enabled": "Аутоматски пребрисати старе поруке",
   "RetentionPolicyRoom_ExcludePinned": "Искључите закачене поруке",
   "RetentionPolicyRoom_FilesOnly": "Обриши само датотеке, остави поруке",
diff --git a/packages/i18n/src/locales/sv.i18n.json b/packages/i18n/src/locales/sv.i18n.json
index 49febc00c9b8..1c673b1af2c5 100644
--- a/packages/i18n/src/locales/sv.i18n.json
+++ b/packages/i18n/src/locales/sv.i18n.json
@@ -4082,10 +4082,6 @@
   "RetentionPolicy_MaxAge": "Maximal meddelandeålder",
   "RetentionPolicy_Precision": "Precision för timer",
   "RetentionPolicy_Precision_Description": "Hur ofta timern för gallring ska köras. Om du ställer in det här på ett mer exakt värde fungerar kanaler med snabba timers bättre, men det kan kosta extra processorkraft i stora communities.",
-  "RetentionPolicy_RoomWarning": "Meddelanden som är äldre än {{time}} gallras automatiskt här",
-  "RetentionPolicy_RoomWarning_FilesOnly": "Filer som är äldre än {{time}} gallras automatiskt här (meddelandena är intakta)",
-  "RetentionPolicy_RoomWarning_Unpinned": "Ej pinnade meddelanden äldre än {{time}} gallras automatiskt här",
-  "RetentionPolicy_RoomWarning_UnpinnedFilesOnly": "Ej pinnade filer äldre än {{time}} gallras automatiskt här (meddelandena är intakta)",
   "RetentionPolicyRoom_Enabled": "Gallra automatiskt gamla meddelanden",
   "RetentionPolicyRoom_ExcludePinned": "Exkludera pinnade meddelanden",
   "RetentionPolicyRoom_FilesOnly": "Gallra bara filer, behåll meddelanden",
diff --git a/packages/i18n/src/locales/ta-IN.i18n.json b/packages/i18n/src/locales/ta-IN.i18n.json
index 0f4e8157d75b..9107ee1e26c3 100644
--- a/packages/i18n/src/locales/ta-IN.i18n.json
+++ b/packages/i18n/src/locales/ta-IN.i18n.json
@@ -2068,10 +2068,6 @@
   "RetentionPolicy_MaxAge": "அதிகபட்ச செய்தி வயது",
   "RetentionPolicy_Precision": "டைமர் துல்லியம்",
   "RetentionPolicy_Precision_Description": "எப்படி அடிக்கடி கிள்ளுதல் டைமர் இயக்க வேண்டும். இது மிகவும் துல்லியமான மதிப்பை அமைப்பதன் மூலம் வேகமாக தக்கவைத்துக்கொள்ளும் நேரத்தை கொண்ட சேனல்கள் சிறப்பாக செயல்படுகின்றன, ஆனால் பெரிய சமூகங்களில் கூடுதல் செயலாக்க சக்தி செலவாகும்.",
-  "RetentionPolicy_RoomWarning": "{{time}} க்கும் மேற்பட்ட செய்திகள் தானாகவே சீரமைக்கப்படும்",
-  "RetentionPolicy_RoomWarning_FilesOnly": "{{time}} க்கும் பழைய கோப்புகள் தானாகவே சீரமைக்கப்படுகின்றன (செய்திகளை அப்படியே இருக்கவும்)",
-  "RetentionPolicy_RoomWarning_Unpinned": "{{time}} க்கும் பழையது மறுபெயரிடப்பட்ட செய்திகள் தானாகவே இங்கே சீரமைக்கப்படுகின்றன",
-  "RetentionPolicy_RoomWarning_UnpinnedFilesOnly": "{{time}} க்கும் பழையது பொருத்தப்படாத கோப்புகள் தானாகவே இங்கே சீரமைக்கப்படுகின்றன (செய்திகளை அப்படியே இருக்கவும்)",
   "RetentionPolicyRoom_Enabled": "பழைய செய்திகளை தானாக கிள்ளுகிறேன்",
   "RetentionPolicyRoom_ExcludePinned": "பின் செய்திகளை விலக்கவும்",
   "RetentionPolicyRoom_FilesOnly": "கோப்புகளை மட்டும் ப்ரூனே செய்யுங்கள், செய்திகளை வைத்திருக்கவும்",
diff --git a/packages/i18n/src/locales/th-TH.i18n.json b/packages/i18n/src/locales/th-TH.i18n.json
index 3f2da8e71594..d22a87659fa9 100644
--- a/packages/i18n/src/locales/th-TH.i18n.json
+++ b/packages/i18n/src/locales/th-TH.i18n.json
@@ -2061,10 +2061,6 @@
   "RetentionPolicy_MaxAge": "อายุข้อความสูงสุด",
   "RetentionPolicy_Precision": "จับเวลาแม่นยำ",
   "RetentionPolicy_Precision_Description": "ควรจับเวลาลูกพรุนบ่อยแค่ไหน การตั้งค่านี้เป็นค่าที่แม่นยำยิ่งขึ้นทำให้ช่องที่มีตัวจับเวลาการเก็บรักษาอย่างรวดเร็วทำงานได้ดีขึ้น แต่อาจมีค่าใช้จ่ายเพิ่มขึ้นในชุมชนขนาดใหญ่",
-  "RetentionPolicy_RoomWarning": "ข้อความที่เก่ากว่า {{time}} จะถูกตัดแต่งโดยอัตโนมัติที่นี่",
-  "RetentionPolicy_RoomWarning_FilesOnly": "ไฟล์เก่ากว่า {{time}} จะถูกตัดแต่งโดยอัตโนมัติที่นี่ (ข้อความยังคงอยู่)",
-  "RetentionPolicy_RoomWarning_Unpinned": "ข้อความที่ไม่ได้รับการพักที่เก่ากว่า {{time}} จะถูกตัดแต่งโดยอัตโนมัติที่นี่",
-  "RetentionPolicy_RoomWarning_UnpinnedFilesOnly": "ไฟล์ที่ยกเลิกการปักหมุดที่เก่ากว่า {{time}} จะถูกตัดแต่งโดยอัตโนมัติที่นี่ (ข้อความยังคงอยู่)",
   "RetentionPolicyRoom_Enabled": "ตัดค่าข้อความเก่าโดยอัตโนมัติ",
   "RetentionPolicyRoom_ExcludePinned": "ไม่รวมข้อความตรึง",
   "RetentionPolicyRoom_FilesOnly": "Prune ไฟล์เท่านั้นเก็บข้อความ",
diff --git a/packages/i18n/src/locales/tr.i18n.json b/packages/i18n/src/locales/tr.i18n.json
index a8f99e52e7a8..7b6c78d1cbda 100644
--- a/packages/i18n/src/locales/tr.i18n.json
+++ b/packages/i18n/src/locales/tr.i18n.json
@@ -2466,10 +2466,6 @@
   "RetentionPolicy_MaxAge": "Maksimum ileti yaşı",
   "RetentionPolicy_Precision": "Zamanlayıcı Hassasiyeti",
   "RetentionPolicy_Precision_Description": "Budama zamanlayıcı kaç kez çalıştırılmalıdır. Bunu daha hassas bir değere ayarlamak, hızlı saklama zamanlayıcılarına sahip kanalların daha iyi çalışmasını sağlar, ancak büyük topluluklarda ekstra işlem gücüne mal olabilir.",
-  "RetentionPolicy_RoomWarning": "{{time}}'den eski mesajlar otomatik olarak budanır",
-  "RetentionPolicy_RoomWarning_FilesOnly": "{{time}}'den eski dosyalar otomatik olarak budanır (mesajlar bozulmadan kalır)",
-  "RetentionPolicy_RoomWarning_Unpinned": "{{time}}'den eski sabit olmayan iletiler burada otomatik olarak budanır",
-  "RetentionPolicy_RoomWarning_UnpinnedFilesOnly": "{{time}}'den büyük olan sabitlenmemiş dosyalar otomatik olarak budanır (iletiler bozulmadan kalır)",
   "RetentionPolicyRoom_Enabled": "Eski iletileri otomatik olarak buda",
   "RetentionPolicyRoom_ExcludePinned": "Sabitlenmiş iletileri dışında tut",
   "RetentionPolicyRoom_FilesOnly": "Yalnızca dosyaları buda, iletileri koru",
diff --git a/packages/i18n/src/locales/uk.i18n.json b/packages/i18n/src/locales/uk.i18n.json
index 758a10b90555..572401cc2bf7 100644
--- a/packages/i18n/src/locales/uk.i18n.json
+++ b/packages/i18n/src/locales/uk.i18n.json
@@ -2604,10 +2604,6 @@
   "RetentionPolicy_MaxAge": "Максимальний вік повідомлення",
   "RetentionPolicy_Precision": "Таймер точності",
   "RetentionPolicy_Precision_Description": "Як часто слід запускати таймер шкури. Якщо встановити це значення на більш точне значення, канали з таймерами швидкого утримання працюватимуть краще, однак вони можуть призвести до додаткової потужності обробки великих спільнот.",
-  "RetentionPolicy_RoomWarning": "Повідомлення, що перевищують {{time}}, автоматично скорочуються тут",
-  "RetentionPolicy_RoomWarning_FilesOnly": "Файли старіші ніж {{time}} автоматично обрізаються тут (повідомлення залишаються недоторканими)",
-  "RetentionPolicy_RoomWarning_Unpinned": "Відкріплені повідомлення старші за {{time}} автоматично обрізаються тут",
-  "RetentionPolicy_RoomWarning_UnpinnedFilesOnly": "Розпаковані файли старіші ніж {{time}} автоматично обрізаються тут (повідомлення залишаються недоступними)",
   "RetentionPolicyRoom_Enabled": "Автоматично обрізати старі повідомлення",
   "RetentionPolicyRoom_ExcludePinned": "Виключити закріплені повідомлення",
   "RetentionPolicyRoom_FilesOnly": "Збригайте лише файли, зберігайте повідомлення",
diff --git a/packages/i18n/src/locales/vi-VN.i18n.json b/packages/i18n/src/locales/vi-VN.i18n.json
index 2f11927a2baf..1bfee9a0e7d7 100644
--- a/packages/i18n/src/locales/vi-VN.i18n.json
+++ b/packages/i18n/src/locales/vi-VN.i18n.json
@@ -2168,10 +2168,6 @@
   "RetentionPolicy_MaxAge": "Độ tuổi tin nhắn tối đa",
   "RetentionPolicy_Precision": "Hẹn giờ chính xác",
   "RetentionPolicy_Precision_Description": "Tần suất bộ đếm thời gian prune sẽ chạy. Đặt giá trị này thành giá trị chính xác hơn giúp kênh có bộ hẹn giờ lưu trữ nhanh hoạt động tốt hơn, nhưng có thể tốn thêm sức mạnh xử lý trên các cộng đồng lớn.",
-  "RetentionPolicy_RoomWarning": "Thư cũ hơn {{time}} được tự động cắt xén tại đây",
-  "RetentionPolicy_RoomWarning_FilesOnly": "Các tệp cũ hơn {{time}} được tự động cắt bớt ở đây (thư vẫn nguyên vẹn)",
-  "RetentionPolicy_RoomWarning_Unpinned": "Các thư được bỏ ghim cũ hơn {{time}} được tự động cắt xén ở đây",
-  "RetentionPolicy_RoomWarning_UnpinnedFilesOnly": "Các tệp được bỏ ghim cũ hơn {{time}} được tự động cắt bớt ở đây (thư vẫn nguyên vẹn)",
   "RetentionPolicyRoom_Enabled": "Tự động cắt bớt các tin nhắn cũ",
   "RetentionPolicyRoom_ExcludePinned": "Loại trừ các thư đã ghim",
   "RetentionPolicyRoom_FilesOnly": "Chỉ tập tin Prune, giữ tin nhắn",
diff --git a/packages/i18n/src/locales/zh-HK.i18n.json b/packages/i18n/src/locales/zh-HK.i18n.json
index 5d4087ead2b4..ef00dac8c9ac 100644
--- a/packages/i18n/src/locales/zh-HK.i18n.json
+++ b/packages/i18n/src/locales/zh-HK.i18n.json
@@ -2092,7 +2092,7 @@
   "RetentionPolicy_MaxAge": "最大邮件年龄",
   "RetentionPolicy_Precision": "定时精度",
   "RetentionPolicy_Precision_Description": "修剪计时器应该多久运行一次。将此设置为更精确的值会使具有快速保留计时器的通道更好地工作，但可能会对大型社区造成额外的处理能力。",
-  "RetentionPolicy_RoomWarning": "超过 {{time}}  的邮件会在此处自动删除",
+
   "RetentionPolicyRoom_Enabled": "自动修剪旧邮件",
   "RetentionPolicyRoom_ExcludePinned": "排除固定消息",
   "RetentionPolicyRoom_FilesOnly": "仅修剪文件，保留消息",
diff --git a/packages/i18n/src/locales/zh-TW.i18n.json b/packages/i18n/src/locales/zh-TW.i18n.json
index 833c9f1e7561..1c0c9f4caa2e 100644
--- a/packages/i18n/src/locales/zh-TW.i18n.json
+++ b/packages/i18n/src/locales/zh-TW.i18n.json
@@ -3424,10 +3424,6 @@
   "RetentionPolicy_MaxAge": "最大郵件年齡",
   "RetentionPolicy_Precision": "定時精度",
   "RetentionPolicy_Precision_Description": "修剪計時器應該多久運行一次。將此設置為更精確的值會使具有快速保留計時器的通道更好地工作，但可能會對大型社區造成額外的處理能力。",
-  "RetentionPolicy_RoomWarning": "超過 {{time}}  的郵件會在此處自動刪除",
-  "RetentionPolicy_RoomWarning_FilesOnly": "早於{{time}}的檔案會在這裡自動刪除（訊息保持不變）",
-  "RetentionPolicy_RoomWarning_Unpinned": "早於{{time}}的未固定消息會在此處自動刪除",
-  "RetentionPolicy_RoomWarning_UnpinnedFilesOnly": "早於{{time}}的未固定檔案會在此處自動刪除（郵件保持不變）",
   "RetentionPolicyRoom_Enabled": "自動修剪舊郵件",
   "RetentionPolicyRoom_ExcludePinned": "排除固定消息",
   "RetentionPolicyRoom_FilesOnly": "僅修剪檔案，保留訊息",
diff --git a/packages/i18n/src/locales/zh.i18n.json b/packages/i18n/src/locales/zh.i18n.json
index a302dcf6ce14..7c67c32cb221 100644
--- a/packages/i18n/src/locales/zh.i18n.json
+++ b/packages/i18n/src/locales/zh.i18n.json
@@ -3108,10 +3108,6 @@
   "RetentionPolicy_MaxAge": "消息保持时限",
   "RetentionPolicy_Precision": "定时精度",
   "RetentionPolicy_Precision_Description": "修剪计时器应该多久运行一次。将此设置为更精确的值会使具有快速保留计时器的频道更好地工作，但对大型社区可能会消耗额外的处理能力。",
-  "RetentionPolicy_RoomWarning": "此会话中超过 {{time}} 的消息将会自动删除",
-  "RetentionPolicy_RoomWarning_FilesOnly": "此会话中超过 {{time}} 的文件将自动删除（消息保持不变）",
-  "RetentionPolicy_RoomWarning_Unpinned": "此会话中超过 {{time}} 的未固定消息将会自动删除",
-  "RetentionPolicy_RoomWarning_UnpinnedFilesOnly": "此会话中超过 {{time}} 的未固定文件将自动删除（消息保持不变）",
   "RetentionPolicyRoom_Enabled": "自动修剪旧消息",
   "RetentionPolicyRoom_ExcludePinned": "排除固定消息",
   "RetentionPolicyRoom_FilesOnly": "仅修剪文件，保留消息",

From 865a5aac903a6cb3794275d37c992fff124cd9ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BAlia=20Jaeger=20Foresti?=
 <60678893+juliajforesti@users.noreply.github.com>
Date: Fri, 21 Jun 2024 21:54:25 -0300
Subject: [PATCH 66/94] tests: rewrite `getByRole` buttons to match exact
 string (#32652)

---
 apps/meteor/tests/e2e/channel-management.spec.ts |  2 +-
 apps/meteor/tests/e2e/page-objects/admin.ts      | 16 ++++++++--------
 .../e2e/page-objects/fragments/home-content.ts   |  6 +++---
 .../page-objects/fragments/home-flextab-room.ts  |  2 +-
 .../e2e/page-objects/fragments/home-sidenav.ts   |  4 ++--
 5 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/apps/meteor/tests/e2e/channel-management.spec.ts b/apps/meteor/tests/e2e/channel-management.spec.ts
index f9c779b728b9..8d682efe095a 100644
--- a/apps/meteor/tests/e2e/channel-management.spec.ts
+++ b/apps/meteor/tests/e2e/channel-management.spec.ts
@@ -32,7 +32,7 @@ test.describe.serial('channel-management', () => {
 		await page.keyboard.press('ArrowRight');
 		await page.keyboard.press('ArrowRight');
 
-		await expect(poHomeChannel.roomHeaderToolbar.getByRole('button', { name: 'Threads' })).toBeFocused();
+		await expect(poHomeChannel.roomHeaderToolbar.getByRole('button', { name: 'Threads', exact: true })).toBeFocused();
 	});
 
 	test('should move the focus away from toolbar using tab key', async ({ page }) => {
diff --git a/apps/meteor/tests/e2e/page-objects/admin.ts b/apps/meteor/tests/e2e/page-objects/admin.ts
index 75df8a1d81d8..2086704ee4ed 100644
--- a/apps/meteor/tests/e2e/page-objects/admin.ts
+++ b/apps/meteor/tests/e2e/page-objects/admin.ts
@@ -224,7 +224,7 @@ export class Admin {
 	}
 
 	get btnUsersInRole(): Locator {
-		return this.page.getByRole('dialog').getByRole('button', { name: 'Users in role' });
+		return this.page.getByRole('dialog').getByRole('button', { name: 'Users in role', exact: true });
 	}
 
 	get inputRoom(): Locator {
@@ -236,7 +236,7 @@ export class Admin {
 	}
 
 	get btnAdd(): Locator {
-		return this.page.getByRole('button', { name: 'Add' });
+		return this.page.getByRole('button', { name: 'Add', exact: true });
 	}
 
 	getUserRowByUsername(username: string): Locator {
@@ -244,19 +244,19 @@ export class Admin {
 	}
 
 	get btnBack(): Locator {
-		return this.page.getByRole('button', { name: 'Back' });
+		return this.page.getByRole('button', { name: 'Back', exact: true });
 	}
 
 	get btnNew(): Locator {
-		return this.page.getByRole('button', { name: 'New' });
+		return this.page.getByRole('button', { name: 'New', exact: true });
 	}
 
 	get btnDelete(): Locator {
-		return this.page.getByRole('button', { name: 'Delete' });
+		return this.page.getByRole('button', { name: 'Delete', exact: true });
 	}
 
 	get btnInstructions(): Locator {
-		return this.page.getByRole('button', { name: 'Instructions' });
+		return this.page.getByRole('button', { name: 'Instructions', exact: true });
 	}
 
 	get inputName(): Locator {
@@ -284,11 +284,11 @@ export class Admin {
 	}
 
 	getAccordionBtnByName(name: string): Locator {
-		return this.page.getByRole('button', { name });
+		return this.page.getByRole('button', { name, exact: true });
 	}
 
 	get btnFullScreen(): Locator {
-		return this.page.getByRole('button', { name: 'Full Screen' });
+		return this.page.getByRole('button', { name: 'Full Screen', exact: true });
 	}
 
 	async dropdownFilterRoomType(text = 'All rooms'): Promise<Locator> {
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 786c5217dadf..12c400611d2d 100644
--- a/apps/meteor/tests/e2e/page-objects/fragments/home-content.ts
+++ b/apps/meteor/tests/e2e/page-objects/fragments/home-content.ts
@@ -98,7 +98,7 @@ export class HomeContent {
 		await this.page.locator('[data-qa-type="message"]').last().hover();
 		await this.page.locator('role=button[name="Forward message"]').click();
 
-		await this.page.getByRole('textbox', { name: 'Person or Channel' }).click();
+		await this.page.getByRole('textbox', { name: 'Person or Channel', exact: true }).click();
 		await this.page.keyboard.type(chatName);
 		await this.page.locator('#position-container').getByText(chatName).waitFor();
 		await this.page.locator('#position-container').getByText(chatName).click();
@@ -192,7 +192,7 @@ export class HomeContent {
 	}
 
 	get btnMenuMoreActions() {
-		return this.page.getByRole('button', { name: 'More actions' });
+		return this.page.getByRole('button', { name: 'More actions', exact: true });
 	}
 
 	get userCard(): Locator {
@@ -236,7 +236,7 @@ export class HomeContent {
 	}
 
 	get imageGallery(): Locator {
-		return this.page.getByRole('dialog', { name: 'Image gallery' });
+		return this.page.getByRole('dialog', { name: 'Image gallery', exact: true });
 	}
 
 	get imageGalleryImage(): Locator {
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 038409eceec9..f11280772f65 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
@@ -44,7 +44,7 @@ export class HomeFlextabRoom {
 	}
 
 	get pruneAccordion(): Locator {
-		return this.page.getByRole('dialog').getByRole('button', { name: 'Prune' });
+		return this.page.getByRole('dialog').getByRole('button', { name: 'Prune', exact: true });
 	}
 
 	getMaxAgeLabel(maxAge = '30') {
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 dfae6c668bb9..c0cb13a3b5b4 100644
--- a/apps/meteor/tests/e2e/page-objects/fragments/home-sidenav.ts
+++ b/apps/meteor/tests/e2e/page-objects/fragments/home-sidenav.ts
@@ -38,7 +38,7 @@ export class HomeSidenav {
 	}
 
 	get userProfileMenu(): Locator {
-		return this.page.getByRole('button', { name: 'User menu' });
+		return this.page.getByRole('button', { name: 'User menu', exact: true });
 	}
 
 	get sidebarChannelsList(): Locator {
@@ -50,7 +50,7 @@ export class HomeSidenav {
 	}
 
 	async setDisplayMode(mode: 'Extended' | 'Medium' | 'Condensed'): Promise<void> {
-		await this.sidebarToolbar.getByRole('button', { name: 'Display' }).click();
+		await this.sidebarToolbar.getByRole('button', { name: 'Display', exact: true }).click();
 		await this.sidebarToolbar.getByRole('menuitemcheckbox', { name: mode }).click();
 		await this.sidebarToolbar.click();
 	}

From 495628bce0c15aaf466b5b7f261fc036d3ed1c25 Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Sat, 22 Jun 2024 00:00:37 -0300
Subject: [PATCH 67/94] fix: Prevent E2EE key reset on startup (#32653)

---
 .changeset/nice-zebras-admire.md                   |  6 ++++++
 apps/meteor/app/api/server/v1/e2e.ts               |  5 ++++-
 apps/meteor/app/e2e/client/rocketchat.e2e.ts       | 14 +++++++++++---
 .../server/methods/setUserPublicAndPrivateKeys.ts  | 12 +++++++++++-
 .../file-upload/client/lib/fileUploadHandler.ts    |  4 +++-
 packages/rest-typings/src/v1/e2e.ts                |  1 +
 .../e2eSetUserPublicAndPrivateKeysParamsPOST.ts    |  4 ++++
 7 files changed, 40 insertions(+), 6 deletions(-)
 create mode 100644 .changeset/nice-zebras-admire.md

diff --git a/.changeset/nice-zebras-admire.md b/.changeset/nice-zebras-admire.md
new file mode 100644
index 000000000000..74917c0a08cc
--- /dev/null
+++ b/.changeset/nice-zebras-admire.md
@@ -0,0 +1,6 @@
+---
+"@rocket.chat/meteor": patch
+"@rocket.chat/rest-typings": patch
+---
+
+Prevent E2EE key reset on startup due to possible race conditions
diff --git a/apps/meteor/app/api/server/v1/e2e.ts b/apps/meteor/app/api/server/v1/e2e.ts
index 8cb3e8ab4236..4c67e5f4f8b6 100644
--- a/apps/meteor/app/api/server/v1/e2e.ts
+++ b/apps/meteor/app/api/server/v1/e2e.ts
@@ -113,6 +113,8 @@ API.v1.addRoute(
  *                  type: string
  *                private_key:
  *                  type: string
+ *                force:
+ *                  type: boolean
  *      responses:
  *        200:
  *          content:
@@ -135,11 +137,12 @@ API.v1.addRoute(
 	{
 		async post() {
 			// eslint-disable-next-line @typescript-eslint/naming-convention
-			const { public_key, private_key } = this.bodyParams;
+			const { public_key, private_key, force } = this.bodyParams;
 
 			await Meteor.callAsync('e2e.setUserPublicAndPrivateKeys', {
 				public_key,
 				private_key,
+				force,
 			});
 
 			return API.v1.success();
diff --git a/apps/meteor/app/e2e/client/rocketchat.e2e.ts b/apps/meteor/app/e2e/client/rocketchat.e2e.ts
index aeb51c292715..20ec543b5080 100644
--- a/apps/meteor/app/e2e/client/rocketchat.e2e.ts
+++ b/apps/meteor/app/e2e/client/rocketchat.e2e.ts
@@ -156,7 +156,11 @@ class E2E extends Emitter {
 		delete this.instancesByRoomId[rid];
 	}
 
-	async persistKeys({ public_key, private_key }: KeyPair, password: string): Promise<void> {
+	async persistKeys(
+		{ public_key, private_key }: KeyPair,
+		password: string,
+		{ force }: { force: boolean } = { force: false },
+	): Promise<void> {
 		if (typeof public_key !== 'string' || typeof private_key !== 'string') {
 			throw new Error('Failed to persist keys as they are not strings.');
 		}
@@ -170,6 +174,7 @@ class E2E extends Emitter {
 		await sdk.rest.post('/v1/e2e.setUserPublicAndPrivateKeys', {
 			public_key,
 			private_key: encodedPrivateKey,
+			force,
 		});
 	}
 
@@ -300,7 +305,7 @@ class E2E extends Emitter {
 	}
 
 	async changePassword(newPassword: string): Promise<void> {
-		await this.persistKeys(this.getKeysFromLocalStorage(), newPassword);
+		await this.persistKeys(this.getKeysFromLocalStorage(), newPassword, { force: true });
 
 		if (Meteor._localStorage.getItem('e2e.randomPassword')) {
 			Meteor._localStorage.setItem('e2e.randomPassword', newPassword);
@@ -316,7 +321,10 @@ class E2E extends Emitter {
 			this.db_private_key = private_key;
 		} catch (error) {
 			this.setState(E2EEState.ERROR);
-			return this.error('Error fetching RSA keys: ', error);
+			this.error('Error fetching RSA keys: ', error);
+			// Stop any process since we can't communicate with the server
+			// to get the keys. This prevents new key generation
+			throw error;
 		}
 	}
 
diff --git a/apps/meteor/app/e2e/server/methods/setUserPublicAndPrivateKeys.ts b/apps/meteor/app/e2e/server/methods/setUserPublicAndPrivateKeys.ts
index c00b9b872466..cd96f77a239f 100644
--- a/apps/meteor/app/e2e/server/methods/setUserPublicAndPrivateKeys.ts
+++ b/apps/meteor/app/e2e/server/methods/setUserPublicAndPrivateKeys.ts
@@ -5,7 +5,7 @@ import { Meteor } from 'meteor/meteor';
 declare module '@rocket.chat/ui-contexts' {
 	// eslint-disable-next-line @typescript-eslint/naming-convention
 	interface ServerMethods {
-		'e2e.setUserPublicAndPrivateKeys'({ public_key, private_key }: { public_key: string; private_key: string }): void;
+		'e2e.setUserPublicAndPrivateKeys'({ public_key, private_key }: { public_key: string; private_key: string; force?: boolean }): void;
 	}
 }
 
@@ -19,6 +19,16 @@ Meteor.methods<ServerMethods>({
 			});
 		}
 
+		if (!keyPair.force) {
+			const keys = await Users.fetchKeysByUserId(userId);
+
+			if (keys.private_key && keys.public_key) {
+				throw new Meteor.Error('error-keys-already-set', 'Keys already set', {
+					method: 'e2e.setUserPublicAndPrivateKeys',
+				});
+			}
+		}
+
 		await Users.setE2EPublicAndPrivateKeysByUserId(userId, {
 			private_key: keyPair.private_key,
 			public_key: keyPair.public_key,
diff --git a/apps/meteor/app/file-upload/client/lib/fileUploadHandler.ts b/apps/meteor/app/file-upload/client/lib/fileUploadHandler.ts
index e0887888c478..c8e6f90966fd 100644
--- a/apps/meteor/app/file-upload/client/lib/fileUploadHandler.ts
+++ b/apps/meteor/app/file-upload/client/lib/fileUploadHandler.ts
@@ -5,7 +5,9 @@ import { Tracker } from 'meteor/tracker';
 Tracker.autorun(() => {
 	const userId = Meteor.userId();
 
-	if (userId) {
+	// Check for Meteor.loggingIn to be reactive and ensure it will process only after login finishes
+	// preventing race condition setting the rc_token as null forever
+	if (userId && Meteor.loggingIn() === false) {
 		const secure = location.protocol === 'https:' ? '; secure' : '';
 
 		document.cookie = `rc_uid=${escape(userId)}; path=/${secure}`;
diff --git a/packages/rest-typings/src/v1/e2e.ts b/packages/rest-typings/src/v1/e2e.ts
index d14cc642fc88..07e9d0379d6a 100644
--- a/packages/rest-typings/src/v1/e2e.ts
+++ b/packages/rest-typings/src/v1/e2e.ts
@@ -8,6 +8,7 @@ const ajv = new Ajv({
 type E2eSetUserPublicAndPrivateKeysProps = {
 	public_key: string;
 	private_key: string;
+	force?: boolean;
 };
 
 const E2eSetUserPublicAndPrivateKeysSchema = {
diff --git a/packages/rest-typings/src/v1/e2e/e2eSetUserPublicAndPrivateKeysParamsPOST.ts b/packages/rest-typings/src/v1/e2e/e2eSetUserPublicAndPrivateKeysParamsPOST.ts
index 81ff8ce3c79d..06383408ffd9 100644
--- a/packages/rest-typings/src/v1/e2e/e2eSetUserPublicAndPrivateKeysParamsPOST.ts
+++ b/packages/rest-typings/src/v1/e2e/e2eSetUserPublicAndPrivateKeysParamsPOST.ts
@@ -7,6 +7,7 @@ const ajv = new Ajv({
 export type e2eSetUserPublicAndPrivateKeysParamsPOST = {
 	public_key: string;
 	private_key: string;
+	force?: boolean;
 };
 
 const e2eSetUserPublicAndPrivateKeysParamsPOSTSchema = {
@@ -18,6 +19,9 @@ const e2eSetUserPublicAndPrivateKeysParamsPOSTSchema = {
 		private_key: {
 			type: 'string',
 		},
+		force: {
+			type: 'boolean',
+		},
 	},
 	additionalProperties: false,
 	required: ['public_key', 'private_key'],

From 9fe05d3a86d5ea5c5e5883437add4672b0ded99a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BAlia=20Jaeger=20Foresti?=
 <60678893+juliajforesti@users.noreply.github.com>
Date: Sat, 22 Jun 2024 00:03:55 -0300
Subject: [PATCH 68/94] fix: `EditRoomInfo` encrypted field placement (#32458)

Co-authored-by: dougfabris <devfabris@gmail.com>
---
 .changeset/shy-eyes-march.md                  |  5 ++
 .../Info/EditRoomInfo/EditRoomInfo.tsx        | 46 +++++++++----------
 .../EditRoomInfo/useEditRoomPermissions.ts    |  2 +
 apps/meteor/tests/e2e/e2e-encryption.spec.ts  | 19 ++++++++
 .../fragments/home-flextab-room.ts            |  4 ++
 5 files changed, 53 insertions(+), 23 deletions(-)
 create mode 100644 .changeset/shy-eyes-march.md

diff --git a/.changeset/shy-eyes-march.md b/.changeset/shy-eyes-march.md
new file mode 100644
index 000000000000..398ab6eb1195
--- /dev/null
+++ b/.changeset/shy-eyes-march.md
@@ -0,0 +1,5 @@
+---
+'@rocket.chat/meteor': patch
+---
+
+Fixed `EditRoomInfo` encrypted field placement
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 2bf4ad333272..ce2a7862bb0b 100644
--- a/apps/meteor/client/views/room/contextualBar/Info/EditRoomInfo/EditRoomInfo.tsx
+++ b/apps/meteor/client/views/room/contextualBar/Info/EditRoomInfo/EditRoomInfo.tsx
@@ -344,6 +344,29 @@ const EditRoomInfo = ({ room, onClickClose, onClickBack }: EditRoomInfoProps) =>
 								</FieldRow>
 							</Field>
 						)}
+						{canViewEncrypted && (
+							<Field>
+								<FieldRow>
+									<FieldLabel htmlFor={encryptedField}>{t('Encrypted')}</FieldLabel>
+									<Controller
+										control={control}
+										name='encrypted'
+										render={({ field: { value, ...field } }) => (
+											<ToggleSwitch
+												id={encryptedField}
+												aria-describedby={`${encryptedField}-hint`}
+												{...field}
+												disabled={!canToggleEncryption || isFederated}
+												checked={value}
+											/>
+										)}
+									/>
+								</FieldRow>
+								<FieldRow>
+									<FieldHint id={`${encryptedField}-hint`}>{t('Encrypted_field_hint')}</FieldHint>
+								</FieldRow>
+							</Field>
+						)}
 						{canViewReadOnly && (
 							<Field>
 								<FieldRow>
@@ -554,29 +577,6 @@ const EditRoomInfo = ({ room, onClickClose, onClickBack }: EditRoomInfoProps) =>
 													/>
 												</FieldRow>
 											</Field>
-											{canViewEncrypted && (
-												<Field>
-													<FieldRow>
-														<FieldLabel htmlFor={encryptedField}>{t('Encrypted')}</FieldLabel>
-														<Controller
-															control={control}
-															name='encrypted'
-															render={({ field: { value, ...field } }) => (
-																<ToggleSwitch
-																	id={encryptedField}
-																	aria-describedby={`${encryptedField}-hint`}
-																	{...field}
-																	disabled={!canToggleEncryption || isFederated}
-																	checked={value}
-																/>
-															)}
-														/>
-													</FieldRow>
-													<FieldRow>
-														<FieldHint id={`${encryptedField}-hint`}>{t('Encrypted_field_hint')}</FieldHint>
-													</FieldRow>
-												</Field>
-											)}
 										</>
 									)}
 								</FieldGroup>
diff --git a/apps/meteor/client/views/room/contextualBar/Info/EditRoomInfo/useEditRoomPermissions.ts b/apps/meteor/client/views/room/contextualBar/Info/EditRoomInfo/useEditRoomPermissions.ts
index 579a649f7090..87640d1689c1 100644
--- a/apps/meteor/client/views/room/contextualBar/Info/EditRoomInfo/useEditRoomPermissions.ts
+++ b/apps/meteor/client/views/room/contextualBar/Info/EditRoomInfo/useEditRoomPermissions.ts
@@ -36,6 +36,7 @@ export const useEditRoomPermissions = (room: IRoom | IRoomWithRetentionPolicy) =
 		canViewReadOnly,
 		canViewHideSysMes,
 		canViewJoinCode,
+		canViewReactWhenReadOnly,
 		canViewEncrypted,
 	] = useMemo(() => {
 		const isAllowed =
@@ -74,6 +75,7 @@ export const useEditRoomPermissions = (room: IRoom | IRoomWithRetentionPolicy) =
 		canViewReadOnly,
 		canViewHideSysMes,
 		canViewJoinCode,
+		canViewReactWhenReadOnly,
 		canViewEncrypted,
 	};
 };
diff --git a/apps/meteor/tests/e2e/e2e-encryption.spec.ts b/apps/meteor/tests/e2e/e2e-encryption.spec.ts
index 6d1d2a2fc770..a3ecf4aa3343 100644
--- a/apps/meteor/tests/e2e/e2e-encryption.spec.ts
+++ b/apps/meteor/tests/e2e/e2e-encryption.spec.ts
@@ -264,6 +264,25 @@ test.describe.serial('e2e-encryption', () => {
 		await expect(poHomeChannel.content.lastUserMessage.locator('.rcx-icon--name-key')).toBeVisible();
 	});
 
+	test('should encrypted field be available on edit room', async ({ page }) => {
+		const channelName = faker.string.uuid();
+
+		await poHomeChannel.sidenav.openNewByLabel('Channel');
+		await poHomeChannel.sidenav.inputChannelName.fill(channelName);
+		await poHomeChannel.sidenav.btnCreate.click();
+
+		await expect(page).toHaveURL(`/group/${channelName}`);
+
+		await expect(poHomeChannel.toastSuccess).toBeVisible();
+
+		await poHomeChannel.dismissToast();
+
+		await poHomeChannel.tabs.btnRoomInfo.click();
+		await poHomeChannel.tabs.room.btnEdit.click();
+
+		await expect(poHomeChannel.tabs.room.checkboxEncrypted).toBeVisible();
+	});
+
 	test('expect create a Direct message, encrypt it and attempt to enable OTR', async ({ page }) => {
 		await poHomeChannel.sidenav.openNewByLabel('Direct message');
 		await poHomeChannel.sidenav.inputDirectUsername.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 f11280772f65..0a612aa12785 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
@@ -35,6 +35,10 @@ export class HomeFlextabRoom {
 		return this.page.locator('label', { has: this.page.getByRole('checkbox', { name: 'Read-only' }) });
 	}
 
+	get checkboxEncrypted(): Locator {
+		return this.page.locator('label', { has: this.page.getByRole('checkbox', { name: 'Encrypted' }) });
+	}
+
 	get btnSave(): Locator {
 		return this.page.locator('role=button[name="Save"]');
 	}

From 161813c8f0f40679fbf0f7c3b6af9698d05d71e3 Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Sat, 22 Jun 2024 00:06:26 -0300
Subject: [PATCH 69/94] feat(E2EEncryption): File encryption support (#32316)

Co-authored-by: Guilherme Gazzo <guilhermegazzo@gmail.com>
Co-authored-by: Marcos Defendi <marcos.defendi@rocket.chat>
---
 .changeset/metal-cats-suffer.md               |   5 +
 .vscode/settings.json                         |   1 +
 apps/meteor/app/api/server/v1/rooms.ts        | 115 +++++-
 apps/meteor/app/e2e/client/helper.js          |   8 +
 .../app/e2e/client/rocketchat.e2e.room.js     | 127 ++++---
 apps/meteor/app/e2e/client/rocketchat.e2e.ts  |  28 +-
 .../server/methods/sendFileMessage.ts         |  32 +-
 .../app/lib/server/methods/sendMessage.ts     |   2 +-
 .../components/ImageGallery/ImageGallery.tsx  |   4 +-
 .../structure/AttachmentDownload.tsx          |  25 +-
 .../structure/AttachmentDownloadBase.tsx      |  26 ++
 .../structure/AttachmentEncryptedDownload.tsx |  15 +
 .../attachments/structure/AttachmentImage.tsx |   1 +
 .../message/hooks/useNormalizedMessage.ts     |  36 +-
 .../variants/room/RoomMessageContent.tsx      |   6 +-
 .../variants/thread/ThreadMessageContent.tsx  |   6 +-
 .../hooks/useDownloadFromServiceWorker.ts     |  49 +++
 apps/meteor/client/lib/chats/ChatAPI.ts       |   9 +-
 apps/meteor/client/lib/chats/data.ts          |   5 +-
 .../client/lib/chats/flows/sendMessage.ts     |   3 +
 .../client/lib/chats/flows/uploadFiles.ts     | 166 ++++++++-
 apps/meteor/client/lib/chats/uploads.ts       |  42 ++-
 apps/meteor/client/startup/e2e.ts             |  10 +-
 .../room/ImageGallery/hooks/useImagesList.ts  |  32 +-
 .../RoomFiles/components/FileItem.tsx         |  10 +-
 .../RoomFiles/components/FileItemMenu.tsx     |  41 ++-
 .../RoomFiles/hooks/useFilesList.ts           |  32 +-
 apps/meteor/package.json                      |   2 +-
 apps/meteor/public/enc.js                     | 123 +++++++
 .../server/cron/temporaryUploadsCleanup.ts    |  16 +
 .../server/models/raw/BaseUploadModel.ts      |  43 ++-
 apps/meteor/server/routes/fileDecrypt.ts      |   7 +
 apps/meteor/server/routes/index.ts            |   1 +
 apps/meteor/server/startup/cron.ts            |   2 +
 apps/meteor/tests/e2e/e2e-encryption.spec.ts  | 105 ++++++
 .../tests/e2e/fixtures/collections/users.ts   |   3 +-
 .../tests/e2e/fixtures/inject-initial-data.ts |   7 +-
 apps/meteor/tests/e2e/fixtures/userStates.ts  |  33 ++
 apps/meteor/tests/end-to-end/api/01-users.js  |  16 +
 apps/meteor/tests/end-to-end/api/09-rooms.js  | 344 ++++++++++++++++++
 .../core-typings/src/IMessage/IMessage.ts     |   5 +
 .../MessageAttachmentBase.ts                  |   4 +
 packages/core-typings/src/IUpload.ts          |   8 +
 .../src/models/IBaseUploadsModel.ts           |   6 +-
 packages/rest-typings/src/v1/rooms.ts         |  21 +-
 45 files changed, 1444 insertions(+), 138 deletions(-)
 create mode 100644 .changeset/metal-cats-suffer.md
 create mode 100644 apps/meteor/client/components/message/content/attachments/structure/AttachmentDownloadBase.tsx
 create mode 100644 apps/meteor/client/components/message/content/attachments/structure/AttachmentEncryptedDownload.tsx
 create mode 100644 apps/meteor/client/hooks/useDownloadFromServiceWorker.ts
 create mode 100644 apps/meteor/public/enc.js
 create mode 100644 apps/meteor/server/cron/temporaryUploadsCleanup.ts
 create mode 100644 apps/meteor/server/routes/fileDecrypt.ts

diff --git a/.changeset/metal-cats-suffer.md b/.changeset/metal-cats-suffer.md
new file mode 100644
index 000000000000..73acebdca85d
--- /dev/null
+++ b/.changeset/metal-cats-suffer.md
@@ -0,0 +1,5 @@
+---
+"@rocket.chat/meteor": minor
+---
+
+Support encrypted files on end-to-end encrypted rooms.
diff --git a/.vscode/settings.json b/.vscode/settings.json
index 4eaf1836d1fd..2dcd055310d1 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -20,6 +20,7 @@
 	"typescript.tsdk": "./node_modules/typescript/lib",
 	"cSpell.words": [
 		"autotranslate",
+		"ciphertext",
 		"Contextualbar",
 		"fname",
 		"Gazzodown",
diff --git a/apps/meteor/app/api/server/v1/rooms.ts b/apps/meteor/app/api/server/v1/rooms.ts
index 40998201b03b..e3296b98ef17 100644
--- a/apps/meteor/app/api/server/v1/rooms.ts
+++ b/apps/meteor/app/api/server/v1/rooms.ts
@@ -6,6 +6,7 @@ import { isGETRoomsNameExists, isRoomsImagesProps, isRoomsMuteUnmuteUserProps, i
 import { Meteor } from 'meteor/meteor';
 
 import { isTruthy } from '../../../../lib/isTruthy';
+import { omit } from '../../../../lib/utils/omit';
 import * as dataExport from '../../../../server/lib/dataExport';
 import { eraseRoom } from '../../../../server/methods/eraseRoom';
 import { muteUserInRoom } from '../../../../server/methods/muteUserInRoom';
@@ -141,7 +142,13 @@ API.v1.addRoute(
 
 API.v1.addRoute(
 	'rooms.upload/:rid',
-	{ authRequired: true },
+	{
+		authRequired: true,
+		deprecation: {
+			version: '8.0.0',
+			alternatives: ['rooms.media'],
+		},
+	},
 	{
 		async post() {
 			if (!(await canAccessRoomIdAsync(this.urlParams.rid, this.userId))) {
@@ -194,6 +201,112 @@ API.v1.addRoute(
 	},
 );
 
+API.v1.addRoute(
+	'rooms.media/:rid',
+	{ authRequired: true },
+	{
+		async post() {
+			if (!(await canAccessRoomIdAsync(this.urlParams.rid, this.userId))) {
+				return API.v1.unauthorized();
+			}
+
+			const file = await getUploadFormData(
+				{
+					request: this.request,
+				},
+				{ field: 'file', sizeLimit: settings.get<number>('FileUpload_MaxFileSize') },
+			);
+
+			if (!file) {
+				throw new Meteor.Error('invalid-field');
+			}
+
+			let { fileBuffer } = file;
+
+			const expiresAt = new Date();
+			expiresAt.setHours(expiresAt.getHours() + 24);
+
+			const { fields } = file;
+
+			let content;
+
+			if (fields.content) {
+				try {
+					content = JSON.parse(fields.content);
+				} catch (e) {
+					console.error(e);
+					throw new Meteor.Error('invalid-field-content');
+				}
+			}
+
+			const details = {
+				name: file.filename,
+				size: fileBuffer.length,
+				type: file.mimetype,
+				rid: this.urlParams.rid,
+				userId: this.userId,
+				content,
+				expiresAt,
+			};
+
+			const stripExif = settings.get('Message_Attachments_Strip_Exif');
+			if (stripExif) {
+				// No need to check mime. Library will ignore any files without exif/xmp tags (like BMP, ico, PDF, etc)
+				fileBuffer = await Media.stripExifFromBuffer(fileBuffer);
+			}
+
+			const fileStore = FileUpload.getStore('Uploads');
+			const uploadedFile = await fileStore.insert(details, fileBuffer);
+
+			uploadedFile.path = FileUpload.getPath(`${uploadedFile._id}/${encodeURI(uploadedFile.name || '')}`);
+
+			await Uploads.updateFileComplete(uploadedFile._id, this.userId, omit(uploadedFile, '_id'));
+
+			return API.v1.success({
+				file: {
+					_id: uploadedFile._id,
+					url: uploadedFile.path,
+				},
+			});
+		},
+	},
+);
+
+API.v1.addRoute(
+	'rooms.mediaConfirm/:rid/:fileId',
+	{ authRequired: true },
+	{
+		async post() {
+			if (!(await canAccessRoomIdAsync(this.urlParams.rid, this.userId))) {
+				return API.v1.unauthorized();
+			}
+
+			const file = await Uploads.findOneById(this.urlParams.fileId);
+
+			if (!file) {
+				throw new Meteor.Error('invalid-file');
+			}
+
+			file.description = this.bodyParams.description;
+			delete this.bodyParams.description;
+
+			await sendFileMessage(
+				this.userId,
+				{ roomId: this.urlParams.rid, file, msgData: this.bodyParams },
+				{ parseAttachmentsForE2EE: false },
+			);
+
+			await Uploads.confirmTemporaryFile(this.urlParams.fileId, this.userId);
+
+			const message = await Messages.getMessageByFileIdAndUsername(file._id, this.userId);
+
+			return API.v1.success({
+				message,
+			});
+		},
+	},
+);
+
 API.v1.addRoute(
 	'rooms.saveNotification',
 	{ authRequired: true },
diff --git a/apps/meteor/app/e2e/client/helper.js b/apps/meteor/app/e2e/client/helper.js
index 2e0843ee3380..49b157c5ccf4 100644
--- a/apps/meteor/app/e2e/client/helper.js
+++ b/apps/meteor/app/e2e/client/helper.js
@@ -53,6 +53,10 @@ export async function encryptAES(vector, key, data) {
 	return crypto.subtle.encrypt({ name: 'AES-CBC', iv: vector }, key, data);
 }
 
+export async function encryptAESCTR(vector, key, data) {
+	return crypto.subtle.encrypt({ name: 'AES-CTR', counter: vector, length: 64 }, key, data);
+}
+
 export async function decryptRSA(key, data) {
 	return crypto.subtle.decrypt({ name: 'RSA-OAEP' }, key, data);
 }
@@ -65,6 +69,10 @@ export async function generateAESKey() {
 	return crypto.subtle.generateKey({ name: 'AES-CBC', length: 128 }, true, ['encrypt', 'decrypt']);
 }
 
+export async function generateAESCTRKey() {
+	return crypto.subtle.generateKey({ name: 'AES-CTR', length: 256 }, true, ['encrypt', 'decrypt']);
+}
+
 export async function generateRSAKey() {
 	return crypto.subtle.generateKey(
 		{
diff --git a/apps/meteor/app/e2e/client/rocketchat.e2e.room.js b/apps/meteor/app/e2e/client/rocketchat.e2e.room.js
index 554cd6a327a8..4903dc012668 100644
--- a/apps/meteor/app/e2e/client/rocketchat.e2e.room.js
+++ b/apps/meteor/app/e2e/client/rocketchat.e2e.room.js
@@ -1,6 +1,5 @@
 import { Base64 } from '@rocket.chat/base64';
 import { Emitter } from '@rocket.chat/emitter';
-import { Random } from '@rocket.chat/random';
 import EJSON from 'ejson';
 
 import { RoomManager } from '../../../client/lib/RoomManager';
@@ -23,6 +22,8 @@ import {
 	importAESKey,
 	importRSAKey,
 	readFileAsArrayBuffer,
+	encryptAESCTR,
+	generateAESCTRKey,
 } from './helper';
 import { log, logError } from './logger';
 import { e2e } from './rocketchat.e2e';
@@ -185,20 +186,20 @@ export class E2ERoom extends Emitter {
 	async decryptSubscription() {
 		const subscription = Subscriptions.findOne({ rid: this.roomId });
 
-		const data = await (subscription.lastMessage?.msg && this.decrypt(subscription.lastMessage.msg));
-		if (!data?.text) {
+		if (subscription.lastMessage?.t !== 'e2e') {
 			this.log('decryptSubscriptions nothing to do');
 			return;
 		}
 
+		const message = await this.decryptMessage(subscription.lastMessage);
+
 		Subscriptions.update(
 			{
 				_id: subscription._id,
 			},
 			{
 				$set: {
-					'lastMessage.msg': data.text,
-					'lastMessage.e2e': 'done',
+					lastMessage: message,
 				},
 			},
 		);
@@ -342,69 +343,96 @@ export class E2ERoom extends Emitter {
 		}
 	}
 
+	async sha256Hash(text) {
+		const encoder = new TextEncoder();
+		const data = encoder.encode(text);
+		const hashArray = Array.from(new Uint8Array(await crypto.subtle.digest('SHA-256', data)));
+		return hashArray.map((b) => b.toString(16).padStart(2, '0')).join('');
+	}
+
 	// Encrypts files before upload. I/O is in arraybuffers.
 	async encryptFile(file) {
-		if (!this.isSupportedRoomType(this.typeOfRoom)) {
-			return;
-		}
+		// if (!this.isSupportedRoomType(this.typeOfRoom)) {
+		// 	return;
+		// }
 
 		const fileArrayBuffer = await readFileAsArrayBuffer(file);
 
 		const vector = crypto.getRandomValues(new Uint8Array(16));
+		const key = await generateAESCTRKey();
 		let result;
 		try {
-			result = await encryptAES(vector, this.groupSessionKey, fileArrayBuffer);
+			result = await encryptAESCTR(vector, key, fileArrayBuffer);
 		} catch (error) {
+			console.log(error);
 			return this.error('Error encrypting group key: ', error);
 		}
 
-		const output = joinVectorAndEcryptedData(vector, result);
+		const exportedKey = await window.crypto.subtle.exportKey('jwk', key);
+
+		const fileName = await this.sha256Hash(file.name);
 
-		const encryptedFile = new File([toArrayBuffer(EJSON.stringify(output))], file.name);
+		const encryptedFile = new File([toArrayBuffer(result)], fileName);
 
-		return encryptedFile;
+		return {
+			file: encryptedFile,
+			key: exportedKey,
+			iv: Base64.encode(vector),
+			type: file.type,
+		};
 	}
 
 	// Decrypt uploaded encrypted files. I/O is in arraybuffers.
-	async decryptFile(message) {
-		if (message[0] !== '{') {
-			return;
-		}
-
-		const [vector, cipherText] = splitVectorAndEcryptedData(EJSON.parse(message));
-
-		try {
-			return await decryptAES(vector, this.groupSessionKey, cipherText);
-		} catch (error) {
-			this.error('Error decrypting file: ', error);
+	async decryptFile(file, key, iv) {
+		const ivArray = Base64.decode(iv);
+		const cryptoKey = await window.crypto.subtle.importKey('jwk', key, { name: 'AES-CTR' }, true, ['encrypt', 'decrypt']);
 
-			return false;
-		}
+		return window.crypto.subtle.decrypt({ name: 'AES-CTR', counter: ivArray, length: 64 }, cryptoKey, file);
 	}
 
 	// Encrypts messages
 	async encryptText(data) {
-		if (!(typeof data === 'function' || (typeof data === 'object' && !!data))) {
-			data = new TextEncoder('UTF-8').encode(EJSON.stringify({ text: data, ack: Random.id((Random.fraction() + 1) * 20) }));
-		}
-
-		if (!this.isSupportedRoomType(this.typeOfRoom)) {
-			return data;
-		}
-
 		const vector = crypto.getRandomValues(new Uint8Array(16));
-		let result;
+
 		try {
-			result = await encryptAES(vector, this.groupSessionKey, data);
+			const result = await encryptAES(vector, this.groupSessionKey, data);
+			return this.keyID + Base64.encode(joinVectorAndEcryptedData(vector, result));
 		} catch (error) {
-			return this.error('Error encrypting message: ', error);
+			this.error('Error encrypting message: ', error);
+			throw error;
 		}
+	}
 
-		return this.keyID + Base64.encode(joinVectorAndEcryptedData(vector, result));
+	// Helper function for encryption of content
+	async encryptMessageContent(contentToBeEncrypted) {
+		const data = new TextEncoder().encode(EJSON.stringify(contentToBeEncrypted));
+
+		return {
+			algorithm: 'rc.v1.aes-sha2',
+			ciphertext: await this.encryptText(data),
+		};
+	}
+
+	// Helper function for encryption of content
+	async encryptMessage(message) {
+		const { msg, attachments, ...rest } = message;
+
+		const content = await this.encryptMessageContent({ msg, attachments });
+
+		return {
+			...rest,
+			content,
+			t: 'e2e',
+			e2e: 'pending',
+		};
 	}
 
 	// Helper function for encryption of messages
 	encrypt(message) {
+		if (!this.isSupportedRoomType(this.typeOfRoom)) {
+			return;
+		}
+
 		const ts = new Date();
 
 		const data = new TextEncoder('UTF-8').encode(
@@ -419,31 +447,38 @@ export class E2ERoom extends Emitter {
 		return this.encryptText(data);
 	}
 
-	// Decrypt messages
+	async decryptContent(data) {
+		if (data.content && data.content.algorithm === 'rc.v1.aes-sha2') {
+			const content = await this.decrypt(data.content.ciphertext);
+			Object.assign(data, content);
+		}
+
+		return data;
+	}
 
+	// Decrypt messages
 	async decryptMessage(message) {
 		if (message.t !== 'e2e' || message.e2e === 'done') {
 			return message;
 		}
 
-		const data = await this.decrypt(message.msg);
+		if (message.msg) {
+			const data = await this.decrypt(message.msg);
 
-		if (!data?.text) {
-			return message;
+			if (data?.text) {
+				message.msg = data.text;
+			}
 		}
 
+		message = await this.decryptContent(message);
+
 		return {
 			...message,
-			msg: data.text,
 			e2e: 'done',
 		};
 	}
 
 	async decrypt(message) {
-		if (!this.isSupportedRoomType(this.typeOfRoom)) {
-			return message;
-		}
-
 		const keyID = message.slice(0, 12);
 
 		if (keyID !== this.keyID) {
diff --git a/apps/meteor/app/e2e/client/rocketchat.e2e.ts b/apps/meteor/app/e2e/client/rocketchat.e2e.ts
index 20ec543b5080..d14f4e07caa1 100644
--- a/apps/meteor/app/e2e/client/rocketchat.e2e.ts
+++ b/apps/meteor/app/e2e/client/rocketchat.e2e.ts
@@ -1,7 +1,7 @@
 import QueryString from 'querystring';
 import URL from 'url';
 
-import type { IE2EEMessage, IMessage, IRoom, ISubscription } from '@rocket.chat/core-typings';
+import type { IE2EEMessage, IMessage, IRoom, ISubscription, IUploadWithUser } from '@rocket.chat/core-typings';
 import { isE2EEMessage } from '@rocket.chat/core-typings';
 import { Emitter } from '@rocket.chat/emitter';
 import EJSON from 'ejson';
@@ -518,28 +518,32 @@ class E2E extends Emitter {
 		}
 	}
 
-	async decryptMessage(message: IMessage | IE2EEMessage): Promise<IMessage> {
-		if (!isE2EEMessage(message) || message.e2e === 'done') {
-			return message;
+	async decryptFileContent(file: IUploadWithUser): Promise<IUploadWithUser> {
+		if (!file.rid) {
+			return file;
 		}
 
-		const e2eRoom = await this.getInstanceByRoomId(message.rid);
+		const e2eRoom = await this.getInstanceByRoomId(file.rid);
 
 		if (!e2eRoom) {
+			return file;
+		}
+
+		return e2eRoom.decryptContent(file);
+	}
+
+	async decryptMessage(message: IMessage | IE2EEMessage): Promise<IMessage> {
+		if (!isE2EEMessage(message) || message.e2e === 'done') {
 			return message;
 		}
 
-		const data = await e2eRoom.decrypt(message.msg);
+		const e2eRoom = await this.getInstanceByRoomId(message.rid);
 
-		if (!data) {
+		if (!e2eRoom) {
 			return message;
 		}
 
-		const decryptedMessage: IE2EEMessage = {
-			...message,
-			msg: data.text,
-			e2e: 'done',
-		};
+		const decryptedMessage: IE2EEMessage = await e2eRoom.decryptMessage(message);
 
 		const decryptedMessageWithQuote = await this.parseQuoteAttachment(decryptedMessage);
 
diff --git a/apps/meteor/app/file-upload/server/methods/sendFileMessage.ts b/apps/meteor/app/file-upload/server/methods/sendFileMessage.ts
index e4ca2ab729d8..485528a5e62f 100644
--- a/apps/meteor/app/file-upload/server/methods/sendFileMessage.ts
+++ b/apps/meteor/app/file-upload/server/methods/sendFileMessage.ts
@@ -159,6 +159,13 @@ export const sendFileMessage = async (
 		file: Partial<IUpload>;
 		msgData?: Record<string, any>;
 	},
+	{
+		parseAttachmentsForE2EE,
+	}: {
+		parseAttachmentsForE2EE: boolean;
+	} = {
+		parseAttachmentsForE2EE: true,
+	},
 ): Promise<boolean> => {
 	const user = await Users.findOneById(userId);
 	if (!user) {
@@ -186,22 +193,33 @@ export const sendFileMessage = async (
 			msg: Match.Optional(String),
 			tmid: Match.Optional(String),
 			customFields: Match.Optional(String),
+			t: Match.Optional(String),
+			content: Match.Optional(
+				Match.ObjectIncluding({
+					algorithm: String,
+					ciphertext: String,
+				}),
+			),
 		}),
 	);
 
-	const { files, attachments } = await parseFileIntoMessageAttachments(file, roomId, user);
-
-	const msg = await executeSendMessage(userId, {
+	const data = {
 		rid: roomId,
 		ts: new Date(),
-		file: files[0],
-		files,
-		attachments,
 		...(msgData as Partial<IMessage>),
 		...(msgData?.customFields && { customFields: JSON.parse(msgData.customFields) }),
 		msg: msgData?.msg ?? '',
 		groupable: msgData?.groupable ?? false,
-	});
+	};
+
+	if (parseAttachmentsForE2EE || msgData?.t !== 'e2e') {
+		const { files, attachments } = await parseFileIntoMessageAttachments(file, roomId, user);
+		data.file = files[0];
+		data.files = files;
+		data.attachments = attachments;
+	}
+
+	const msg = await executeSendMessage(userId, data);
 
 	callbacks.runAsync('afterFileUpload', { user, room, message: msg });
 
diff --git a/apps/meteor/app/lib/server/methods/sendMessage.ts b/apps/meteor/app/lib/server/methods/sendMessage.ts
index c78407782059..a490b5c4c67f 100644
--- a/apps/meteor/app/lib/server/methods/sendMessage.ts
+++ b/apps/meteor/app/lib/server/methods/sendMessage.ts
@@ -82,7 +82,7 @@ export async function executeSendMessage(uid: IUser['_id'], message: AtLeast<IMe
 		const room = await canSendMessageAsync(rid, { uid, username: user.username, type: user.type });
 
 		if (room.encrypted && settings.get<boolean>('E2E_Enable') && !settings.get<boolean>('E2E_Allow_Unencrypted_Messages')) {
-			if (message.t !== 'e2e' || message.e2e !== 'pending') {
+			if (message.t !== 'e2e') {
 				throw new Meteor.Error('error-not-allowed', 'Not allowed to send un-encrypted messages in an encrypted room', {
 					method: 'sendMessage',
 				});
diff --git a/apps/meteor/client/components/ImageGallery/ImageGallery.tsx b/apps/meteor/client/components/ImageGallery/ImageGallery.tsx
index 8dd69ab8fc25..2cabfed460bd 100644
--- a/apps/meteor/client/components/ImageGallery/ImageGallery.tsx
+++ b/apps/meteor/client/components/ImageGallery/ImageGallery.tsx
@@ -182,14 +182,14 @@ export const ImageGallery = ({ images, onClose, loadMore }: { images: IUpload[];
 						onReachBeginning={loadMore}
 						initialSlide={images.length - 1}
 					>
-						{[...images].reverse().map(({ _id, url }) => (
+						{[...images].reverse().map(({ _id, path, url }) => (
 							<SwiperSlide key={_id}>
 								<div className='swiper-zoom-container'>
 									{/* eslint-disable-next-line
 										jsx-a11y/no-noninteractive-element-interactions,
 										jsx-a11y/click-events-have-key-events
 									*/}
-									<img src={url} loading='lazy' alt='' data-qa-zoom-scale={zoomScale} onClick={preventPropagation} />
+									<img src={path || url} loading='lazy' alt='' data-qa-zoom-scale={zoomScale} onClick={preventPropagation} />
 									<div className='rcx-lazy-preloader'>
 										<Throbber inheritColor />
 									</div>
diff --git a/apps/meteor/client/components/message/content/attachments/structure/AttachmentDownload.tsx b/apps/meteor/client/components/message/content/attachments/structure/AttachmentDownload.tsx
index de790f9e3936..b76cb268bb2f 100644
--- a/apps/meteor/client/components/message/content/attachments/structure/AttachmentDownload.tsx
+++ b/apps/meteor/client/components/message/content/attachments/structure/AttachmentDownload.tsx
@@ -1,25 +1,20 @@
-import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ComponentProps, FC } from 'react';
 import React from 'react';
 
-import Action from '../../Action';
+import type Action from '../../Action';
+import AttachmentDownloadBase from './AttachmentDownloadBase';
+import AttachmentEncryptedDownload from './AttachmentEncryptedDownload';
 
 type AttachmentDownloadProps = Omit<ComponentProps<typeof Action>, 'icon'> & { title?: string | undefined; href: string };
 
 const AttachmentDownload: FC<AttachmentDownloadProps> = ({ title, href, ...props }) => {
-	const t = useTranslation();
-	return (
-		<Action
-			icon='cloud-arrow-down'
-			href={`${href}?download`}
-			title={t('Download')}
-			is='a'
-			target='_blank'
-			rel='noopener noreferrer'
-			download={title}
-			{...props}
-		/>
-	);
+	const isEncrypted = href.includes('/file-decrypt/');
+
+	if (isEncrypted) {
+		return <AttachmentEncryptedDownload title={title} href={href} {...props} />;
+	}
+
+	return <AttachmentDownloadBase title={title} href={href} {...props} />;
 };
 
 export default AttachmentDownload;
diff --git a/apps/meteor/client/components/message/content/attachments/structure/AttachmentDownloadBase.tsx b/apps/meteor/client/components/message/content/attachments/structure/AttachmentDownloadBase.tsx
new file mode 100644
index 000000000000..48c078b9146c
--- /dev/null
+++ b/apps/meteor/client/components/message/content/attachments/structure/AttachmentDownloadBase.tsx
@@ -0,0 +1,26 @@
+import { useTranslation } from '@rocket.chat/ui-contexts';
+import type { ComponentProps, FC } from 'react';
+import React from 'react';
+
+import Action from '../../Action';
+
+type AttachmentDownloadBaseProps = Omit<ComponentProps<typeof Action>, 'icon'> & { title?: string | undefined; href: string };
+
+const AttachmentDownloadBase: FC<AttachmentDownloadBaseProps> = ({ title, href, ...props }) => {
+	const t = useTranslation();
+
+	return (
+		<Action
+			icon='cloud-arrow-down'
+			href={`${href}?download`}
+			title={t('Download')}
+			is='a'
+			target='_blank'
+			rel='noopener noreferrer'
+			download={title}
+			{...props}
+		/>
+	);
+};
+
+export default AttachmentDownloadBase;
diff --git a/apps/meteor/client/components/message/content/attachments/structure/AttachmentEncryptedDownload.tsx b/apps/meteor/client/components/message/content/attachments/structure/AttachmentEncryptedDownload.tsx
new file mode 100644
index 000000000000..1dc6752abdd0
--- /dev/null
+++ b/apps/meteor/client/components/message/content/attachments/structure/AttachmentEncryptedDownload.tsx
@@ -0,0 +1,15 @@
+import type { ComponentProps, FC } from 'react';
+import React from 'react';
+
+import { useDownloadFromServiceWorker } from '../../../../../hooks/useDownloadFromServiceWorker';
+import AttachmentDownloadBase from './AttachmentDownloadBase';
+
+type AttachmentDownloadProps = ComponentProps<typeof AttachmentDownloadBase>;
+
+const AttachmentEncryptedDownload: FC<AttachmentDownloadProps> = ({ title, href, ...props }) => {
+	const encryptedAnchorProps = useDownloadFromServiceWorker(href, title);
+
+	return <AttachmentDownloadBase {...props} {...encryptedAnchorProps} title={title} href={href} />;
+};
+
+export default AttachmentEncryptedDownload;
diff --git a/apps/meteor/client/components/message/content/attachments/structure/AttachmentImage.tsx b/apps/meteor/client/components/message/content/attachments/structure/AttachmentImage.tsx
index 5b251ad6143f..8195fdee5973 100644
--- a/apps/meteor/client/components/message/content/attachments/structure/AttachmentImage.tsx
+++ b/apps/meteor/client/components/message/content/attachments/structure/AttachmentImage.tsx
@@ -86,6 +86,7 @@ const AttachmentImage: FC<AttachmentImageProps> = ({ id, previewUrl, dataSrc, lo
 						alt=''
 						width={dimensions.width}
 						height={dimensions.height}
+						loading='lazy'
 					/>
 				</ImageBox>
 			</Box>
diff --git a/apps/meteor/client/components/message/hooks/useNormalizedMessage.ts b/apps/meteor/client/components/message/hooks/useNormalizedMessage.ts
index 2ade3deb4926..2b188b92f978 100644
--- a/apps/meteor/client/components/message/hooks/useNormalizedMessage.ts
+++ b/apps/meteor/client/components/message/hooks/useNormalizedMessage.ts
@@ -1,3 +1,5 @@
+import { Base64 } from '@rocket.chat/base64';
+import { isFileImageAttachment, isFileAttachment, isFileAudioAttachment, isFileVideoAttachment } from '@rocket.chat/core-typings';
 import type { IMessage } from '@rocket.chat/core-typings';
 import type { Options } from '@rocket.chat/message-parser';
 import { useSetting } from '@rocket.chat/ui-contexts';
@@ -30,6 +32,38 @@ export const useNormalizedMessage = <TMessage extends IMessage>(message: TMessag
 			}),
 		};
 
-		return parseMessageTextToAstMarkdown(message, parseOptions, autoTranslateOptions);
+		const normalizedMessage = parseMessageTextToAstMarkdown(message, parseOptions, autoTranslateOptions);
+
+		normalizedMessage.attachments = normalizedMessage.attachments?.map((attachment) => {
+			if (!attachment.encryption) {
+				return attachment;
+			}
+
+			const key = Base64.encode(
+				JSON.stringify({
+					...attachment.encryption,
+					name: String.fromCharCode(...new TextEncoder().encode(normalizedMessage.file?.name)),
+					type: normalizedMessage.file?.type,
+				}),
+			);
+
+			if (isFileAttachment(attachment)) {
+				if (attachment.title_link && !attachment.title_link.startsWith('/file-decrypt/')) {
+					attachment.title_link = `/file-decrypt${attachment.title_link}?key=${key}`;
+				}
+				if (isFileImageAttachment(attachment) && !attachment.image_url.startsWith('/file-decrypt/')) {
+					attachment.image_url = `/file-decrypt${attachment.image_url}?key=${key}`;
+				}
+				if (isFileAudioAttachment(attachment) && !attachment.audio_url.startsWith('/file-decrypt/')) {
+					attachment.audio_url = `/file-decrypt${attachment.audio_url}?key=${key}`;
+				}
+				if (isFileVideoAttachment(attachment) && !attachment.video_url.startsWith('/file-decrypt/')) {
+					attachment.video_url = `/file-decrypt${attachment.video_url}?key=${key}`;
+				}
+			}
+			return attachment;
+		});
+
+		return normalizedMessage;
 	}, [showColors, customDomains, katexEnabled, katexDollarSyntaxEnabled, katexParenthesisSyntaxEnabled, message, autoTranslateOptions]);
 };
diff --git a/apps/meteor/client/components/message/variants/room/RoomMessageContent.tsx b/apps/meteor/client/components/message/variants/room/RoomMessageContent.tsx
index 247f51173530..89da3724cfbc 100644
--- a/apps/meteor/client/components/message/variants/room/RoomMessageContent.tsx
+++ b/apps/meteor/client/components/message/variants/room/RoomMessageContent.tsx
@@ -1,5 +1,6 @@
 import type { IMessage } from '@rocket.chat/core-typings';
 import { isDiscussionMessage, isThreadMainMessage, isE2EEMessage, isQuoteAttachment } from '@rocket.chat/core-typings';
+import { MessageBody } from '@rocket.chat/fuselage';
 import type { TranslationKey } from '@rocket.chat/ui-contexts';
 import { useSetting, useTranslation, useUserId } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
@@ -43,6 +44,7 @@ const RoomMessageContent = ({ message, unread, all, mention, searchText }: RoomM
 	const t = useTranslation();
 
 	const normalizedMessage = useNormalizedMessage(message);
+	const isMessageEncrypted = encrypted && normalizedMessage?.e2e === 'pending';
 
 	const quotes = normalizedMessage?.attachments?.filter(isQuoteAttachment) || [];
 
@@ -50,7 +52,10 @@ const RoomMessageContent = ({ message, unread, all, mention, searchText }: RoomM
 
 	return (
 		<>
+			{isMessageEncrypted && <MessageBody>{t('E2E_message_encrypted_placeholder')}</MessageBody>}
+
 			{!!quotes?.length && <Attachments attachments={quotes} />}
+
 			{!normalizedMessage.blocks?.length && !!normalizedMessage.md?.length && (
 				<>
 					{(!encrypted || normalizedMessage.e2e === 'done') && (
@@ -62,7 +67,6 @@ const RoomMessageContent = ({ message, unread, all, mention, searchText }: RoomM
 							searchText={searchText}
 						/>
 					)}
-					{encrypted && normalizedMessage.e2e === 'pending' && t('E2E_message_encrypted_placeholder')}
 				</>
 			)}
 
diff --git a/apps/meteor/client/components/message/variants/thread/ThreadMessageContent.tsx b/apps/meteor/client/components/message/variants/thread/ThreadMessageContent.tsx
index bec9b8a15c90..b2f9f1d019e2 100644
--- a/apps/meteor/client/components/message/variants/thread/ThreadMessageContent.tsx
+++ b/apps/meteor/client/components/message/variants/thread/ThreadMessageContent.tsx
@@ -1,5 +1,6 @@
 import type { IThreadMainMessage, IThreadMessage } from '@rocket.chat/core-typings';
 import { isE2EEMessage, isQuoteAttachment } from '@rocket.chat/core-typings';
+import { MessageBody } from '@rocket.chat/fuselage';
 import type { TranslationKey } from '@rocket.chat/ui-contexts';
 import { useSetting, useUserId, useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
@@ -37,12 +38,16 @@ const ThreadMessageContent = ({ message }: ThreadMessageContentProps): ReactElem
 
 	const normalizedMessage = useNormalizedMessage(message);
 
+	const isMessageEncrypted = encrypted && normalizedMessage?.e2e === 'pending';
+
 	const quotes = normalizedMessage?.attachments?.filter(isQuoteAttachment) || [];
 
 	const attachments = normalizedMessage?.attachments?.filter((attachment) => !isQuoteAttachment(attachment)) || [];
 
 	return (
 		<>
+			{isMessageEncrypted && <MessageBody>{t('E2E_message_encrypted_placeholder')}</MessageBody>}
+
 			{!!quotes?.length && <Attachments attachments={quotes} />}
 
 			{!normalizedMessage.blocks?.length && !!normalizedMessage.md?.length && (
@@ -50,7 +55,6 @@ const ThreadMessageContent = ({ message }: ThreadMessageContentProps): ReactElem
 					{(!encrypted || normalizedMessage.e2e === 'done') && (
 						<MessageContentBody md={normalizedMessage.md} mentions={normalizedMessage.mentions} channels={normalizedMessage.channels} />
 					)}
-					{encrypted && normalizedMessage.e2e === 'pending' && t('E2E_message_encrypted_placeholder')}
 				</>
 			)}
 
diff --git a/apps/meteor/client/hooks/useDownloadFromServiceWorker.ts b/apps/meteor/client/hooks/useDownloadFromServiceWorker.ts
new file mode 100644
index 000000000000..9a44d8d5fd23
--- /dev/null
+++ b/apps/meteor/client/hooks/useDownloadFromServiceWorker.ts
@@ -0,0 +1,49 @@
+import { Emitter } from '@rocket.chat/emitter';
+import { useUniqueId } from '@rocket.chat/fuselage-hooks';
+import { useCallback, useEffect } from 'react';
+import { useTranslation } from 'react-i18next';
+
+import { downloadAs } from '../lib/download';
+
+const ee = new Emitter<Record<string, { result: ArrayBuffer; id: string }>>();
+
+navigator.serviceWorker.addEventListener('message', (event) => {
+	if (event.data.type === 'attachment-download-result') {
+		const { result } = event.data as { result: ArrayBuffer; id: string };
+
+		ee.emit(event.data.id, { result, id: event.data.id });
+	}
+});
+
+export const useDownloadFromServiceWorker = (href: string, title?: string) => {
+	const { controller } = navigator.serviceWorker;
+
+	const uid = useUniqueId();
+
+	const { t } = useTranslation();
+
+	useEffect(
+		() =>
+			ee.once(uid, ({ result }) => {
+				downloadAs({ data: [new Blob([result])] }, title ?? t('Download'));
+			}),
+		[title, t, uid],
+	);
+
+	return {
+		disabled: !controller,
+		onContextMenu: useCallback((e) => e.preventDefault(), []),
+		onClick: useCallback(
+			(e: React.MouseEvent<HTMLElement, MouseEvent>) => {
+				e.preventDefault();
+
+				controller?.postMessage({
+					type: 'attachment-download',
+					url: href,
+					id: uid,
+				});
+			},
+			[href, uid, controller],
+		),
+	};
+};
diff --git a/apps/meteor/client/lib/chats/ChatAPI.ts b/apps/meteor/client/lib/chats/ChatAPI.ts
index 10589b8b7c97..30dd5909ee03 100644
--- a/apps/meteor/client/lib/chats/ChatAPI.ts
+++ b/apps/meteor/client/lib/chats/ChatAPI.ts
@@ -1,4 +1,4 @@
-import type { IMessage, IRoom, ISubscription } from '@rocket.chat/core-typings';
+import type { IMessage, IRoom, ISubscription, IE2EEMessage, IUpload } from '@rocket.chat/core-typings';
 import type { IActionManager } from '@rocket.chat/ui-contexts';
 
 import type { FormattingButton } from '../../../app/ui-message/client/messageBox/messageBoxFormatting';
@@ -100,7 +100,12 @@ export type UploadsAPI = {
 	subscribe(callback: () => void): () => void;
 	wipeFailedOnes(): void;
 	cancel(id: Upload['id']): void;
-	send(file: File, { description, msg }: { description?: string; msg?: string }): Promise<void>;
+	send(
+		file: File,
+		{ description, msg, t, e2e }: { description?: string; msg?: string; t?: IMessage['t']; e2e?: IMessage['e2e'] },
+		getContent?: (fileId: string, fileUrl: string) => Promise<IE2EEMessage['content']>,
+		fileContent?: { raw: Partial<IUpload>; encrypted: IE2EEMessage['content'] },
+	): Promise<void>;
 };
 
 export type ChatAPI = {
diff --git a/apps/meteor/client/lib/chats/data.ts b/apps/meteor/client/lib/chats/data.ts
index 12fb4097dce5..445f61f27226 100644
--- a/apps/meteor/client/lib/chats/data.ts
+++ b/apps/meteor/client/lib/chats/data.ts
@@ -7,7 +7,6 @@ import { Messages, ChatRoom, ChatSubscription } from '../../../app/models/client
 import { settings } from '../../../app/settings/client';
 import { MessageTypes } from '../../../app/ui-utils/client';
 import { sdk } from '../../../app/utils/client/lib/SDKClient';
-import { onClientBeforeSendMessage } from '../onClientBeforeSendMessage';
 import { prependReplies } from '../utils/prependReplies';
 import type { DataAPI } from './ChatAPI';
 
@@ -21,7 +20,7 @@ export const createDataAPI = ({ rid, tmid }: { rid: IRoom['_id']; tmid: IMessage
 		const effectiveRID = originalMessage?.rid ?? rid;
 		const effectiveTMID = originalMessage ? originalMessage.tmid : tmid;
 
-		return (await onClientBeforeSendMessage({
+		return {
 			_id: originalMessage?._id ?? Random.id(),
 			rid: effectiveRID,
 			...(effectiveTMID && {
@@ -29,7 +28,7 @@ export const createDataAPI = ({ rid, tmid }: { rid: IRoom['_id']; tmid: IMessage
 				...(sendToChannel && { tshow: sendToChannel }),
 			}),
 			msg,
-		})) as IMessage;
+		} as IMessage;
 	};
 
 	const findMessageByID = async (mid: IMessage['_id']): Promise<IMessage | null> =>
diff --git a/apps/meteor/client/lib/chats/flows/sendMessage.ts b/apps/meteor/client/lib/chats/flows/sendMessage.ts
index c691c40b3faf..e56acf06402c 100644
--- a/apps/meteor/client/lib/chats/flows/sendMessage.ts
+++ b/apps/meteor/client/lib/chats/flows/sendMessage.ts
@@ -3,6 +3,7 @@ import type { IMessage } from '@rocket.chat/core-typings';
 import { KonchatNotification } from '../../../../app/ui/client/lib/KonchatNotification';
 import { sdk } from '../../../../app/utils/client/lib/SDKClient';
 import { t } from '../../../../app/utils/lib/i18n';
+import { onClientBeforeSendMessage } from '../../onClientBeforeSendMessage';
 import { dispatchToastMessage } from '../../toast';
 import type { ChatAPI } from '../ChatAPI';
 import { processMessageEditing } from './processMessageEditing';
@@ -29,6 +30,8 @@ const process = async (chat: ChatAPI, message: IMessage, previewUrls?: string[],
 		return;
 	}
 
+	message = (await onClientBeforeSendMessage(message)) as IMessage;
+
 	await sdk.call('sendMessage', message, previewUrls);
 };
 
diff --git a/apps/meteor/client/lib/chats/flows/uploadFiles.ts b/apps/meteor/client/lib/chats/flows/uploadFiles.ts
index 62458d53fd60..4db8a933b18b 100644
--- a/apps/meteor/client/lib/chats/flows/uploadFiles.ts
+++ b/apps/meteor/client/lib/chats/flows/uploadFiles.ts
@@ -1,11 +1,39 @@
+import type { IMessage, FileAttachmentProps, IE2EEMessage, IUpload } from '@rocket.chat/core-typings';
 import { isRoomFederated } from '@rocket.chat/core-typings';
 
+import { e2e } from '../../../../app/e2e/client';
 import { fileUploadIsValidContentType } from '../../../../app/utils/client';
 import FileUploadModal from '../../../views/room/modals/FileUploadModal';
 import { imperativeModal } from '../../imperativeModal';
 import { prependReplies } from '../../utils/prependReplies';
 import type { ChatAPI } from '../ChatAPI';
 
+if ('serviceWorker' in navigator) {
+	navigator.serviceWorker
+		.register('/enc.js', {
+			scope: '/',
+		})
+		.then((reg) => {
+			if (reg.active) console.log('service worker installed');
+		})
+		.catch((err) => {
+			console.log(`registration failed: ${err}`);
+		});
+}
+
+const getHeightAndWidthFromDataUrl = (dataURL: string): Promise<{ height: number; width: number }> => {
+	return new Promise((resolve) => {
+		const img = new Image();
+		img.onload = () => {
+			resolve({
+				height: img.height,
+				width: img.width,
+			});
+		};
+		img.src = dataURL;
+	});
+};
+
 export const uploadFiles = async (chat: ChatAPI, files: readonly File[], resetFileInput?: () => void): Promise<void> => {
 	const replies = chat.composer?.quotedMessages.get() ?? [];
 
@@ -15,6 +43,26 @@ export const uploadFiles = async (chat: ChatAPI, files: readonly File[], resetFi
 
 	const queue = [...files];
 
+	const uploadFile = (
+		file: File,
+		extraData?: Pick<IMessage, 't' | 'e2e'> & { description?: string },
+		getContent?: (fileId: string, fileUrl: string) => Promise<IE2EEMessage['content']>,
+		fileContent?: { raw: Partial<IUpload>; encrypted: IE2EEMessage['content'] },
+	) => {
+		chat.uploads.send(
+			file,
+			{
+				msg,
+				...extraData,
+			},
+			getContent,
+			fileContent,
+		);
+		chat.composer?.clear();
+		imperativeModal.close();
+		uploadNextFile();
+	};
+
 	const uploadNextFile = (): void => {
 		const file = queue.pop();
 		if (!file) {
@@ -33,18 +81,120 @@ export const uploadFiles = async (chat: ChatAPI, files: readonly File[], resetFi
 					imperativeModal.close();
 					uploadNextFile();
 				},
-				onSubmit: (fileName: string, description?: string): void => {
+				onSubmit: async (fileName: string, description?: string): Promise<void> => {
 					Object.defineProperty(file, 'name', {
 						writable: true,
 						value: fileName,
 					});
-					chat.uploads.send(file, {
-						description,
-						msg,
-					});
-					chat.composer?.clear();
-					imperativeModal.close();
-					uploadNextFile();
+
+					// encrypt attachment description
+					const e2eRoom = await e2e.getInstanceByRoomId(room._id);
+
+					if (!e2eRoom) {
+						uploadFile(file, { description });
+						return;
+					}
+
+					const shouldConvertSentMessages = e2eRoom.shouldConvertSentMessages({ msg });
+
+					if (!shouldConvertSentMessages) {
+						uploadFile(file, { description });
+						return;
+					}
+
+					const encryptedFile = await e2eRoom.encryptFile(file);
+
+					if (encryptedFile) {
+						const getContent = async (_id: string, fileUrl: string): Promise<IE2EEMessage['content']> => {
+							const attachments = [];
+
+							const attachment: FileAttachmentProps = {
+								title: file.name,
+								type: 'file',
+								description,
+								title_link: fileUrl,
+								title_link_download: true,
+								encryption: {
+									key: encryptedFile.key,
+									iv: encryptedFile.iv,
+								},
+							};
+
+							if (/^image\/.+/.test(file.type)) {
+								const dimensions = await getHeightAndWidthFromDataUrl(window.URL.createObjectURL(file));
+
+								attachments.push({
+									...attachment,
+									image_url: fileUrl,
+									image_type: file.type,
+									image_size: file.size,
+									...(dimensions && {
+										image_dimensions: dimensions,
+									}),
+								});
+							} else if (/^audio\/.+/.test(file.type)) {
+								attachments.push({
+									...attachment,
+									audio_url: fileUrl,
+									audio_type: file.type,
+									audio_size: file.size,
+								});
+							} else if (/^video\/.+/.test(file.type)) {
+								attachments.push({
+									...attachment,
+									video_url: fileUrl,
+									video_type: file.type,
+									video_size: file.size,
+								});
+							} else {
+								attachments.push({
+									...attachment,
+									size: file.size,
+									// format: getFileExtension(file.name),
+								});
+							}
+
+							const files = [
+								{
+									_id,
+									name: file.name,
+									type: file.type,
+									size: file.size,
+									// "format": "png"
+								},
+							];
+
+							return e2eRoom.encryptMessageContent({
+								attachments,
+								files,
+								file: files[0],
+							});
+						};
+
+						const fileContentData = {
+							type: file.type,
+							typeGroup: file.type.split('/')[0],
+							name: fileName,
+							encryption: {
+								key: encryptedFile.key,
+								iv: encryptedFile.iv,
+							},
+						};
+
+						const fileContent = {
+							raw: fileContentData,
+							encrypted: await e2eRoom.encryptMessageContent(fileContentData),
+						};
+
+						uploadFile(
+							encryptedFile.file,
+							{
+								t: 'e2e',
+							},
+							getContent,
+							fileContent,
+						);
+					}
 				},
 				invalidContentType: !fileUploadIsValidContentType(file?.type),
 			},
diff --git a/apps/meteor/client/lib/chats/uploads.ts b/apps/meteor/client/lib/chats/uploads.ts
index 2a06877807ed..8411a840c1d9 100644
--- a/apps/meteor/client/lib/chats/uploads.ts
+++ b/apps/meteor/client/lib/chats/uploads.ts
@@ -1,4 +1,4 @@
-import type { IMessage, IRoom } from '@rocket.chat/core-typings';
+import type { IMessage, IRoom, IE2EEMessage, IUpload } from '@rocket.chat/core-typings';
 import { Emitter } from '@rocket.chat/emitter';
 import { Random } from '@rocket.chat/random';
 
@@ -36,12 +36,16 @@ const send = async (
 		msg,
 		rid,
 		tmid,
+		t,
 	}: {
 		description?: string;
 		msg?: string;
 		rid: string;
 		tmid?: string;
+		t?: IMessage['t'];
 	},
+	getContent?: (fileId: string, fileUrl: string) => Promise<IE2EEMessage['content']>,
+	fileContent?: { raw: Partial<IUpload>; encrypted: IE2EEMessage['content'] },
 ): Promise<void> => {
 	const id = Random.id();
 
@@ -49,7 +53,7 @@ const send = async (
 		...uploads,
 		{
 			id,
-			name: file.name,
+			name: fileContent?.raw.name || file.name,
 			percentage: 0,
 		},
 	]);
@@ -57,12 +61,12 @@ const send = async (
 	try {
 		await new Promise((resolve, reject) => {
 			const xhr = sdk.rest.upload(
-				`/v1/rooms.upload/${rid}`,
+				`/v1/rooms.media/${rid}`,
 				{
-					msg,
-					tmid,
 					file,
-					description,
+					...(fileContent && {
+						content: JSON.stringify(fileContent.encrypted),
+					}),
 				},
 				{
 					load: (event) => {
@@ -109,6 +113,24 @@ const send = async (
 				},
 			);
 
+			xhr.onload = async () => {
+				if (xhr.readyState === xhr.DONE && xhr.status === 200) {
+					const result = JSON.parse(xhr.responseText);
+					let content;
+					if (getContent) {
+						content = await getContent(result.file._id, result.file.url);
+					}
+
+					await sdk.rest.post(`/v1/rooms.mediaConfirm/${rid}/${result.file._id}`, {
+						msg,
+						tmid,
+						description,
+						t,
+						content,
+					});
+				}
+			};
+
 			if (uploads.length) {
 				UserAction.performContinuously(rid, USER_ACTIVITIES.USER_UPLOADING, { tmid });
 			}
@@ -146,6 +168,10 @@ export const createUploadsAPI = ({ rid, tmid }: { rid: IRoom['_id']; tmid?: IMes
 	subscribe,
 	wipeFailedOnes,
 	cancel,
-	send: (file: File, { description, msg }: { description?: string; msg?: string }): Promise<void> =>
-		send(file, { description, msg, rid, tmid }),
+	send: (
+		file: File,
+		{ description, msg, t }: { description?: string; msg?: string; t?: IMessage['t'] },
+		getContent?: (fileId: string, fileUrl: string) => Promise<IE2EEMessage['content']>,
+		fileContent?: { raw: Partial<IUpload>; encrypted: IE2EEMessage['content'] },
+	): Promise<void> => send(file, { description, msg, rid, tmid, t }, getContent, fileContent),
 });
diff --git a/apps/meteor/client/startup/e2e.ts b/apps/meteor/client/startup/e2e.ts
index 0cf5dca41ca4..21473e1585b0 100644
--- a/apps/meteor/client/startup/e2e.ts
+++ b/apps/meteor/client/startup/e2e.ts
@@ -1,4 +1,4 @@
-import type { AtLeast, IMessage, ISubscription } from '@rocket.chat/core-typings';
+import type { IMessage, ISubscription } from '@rocket.chat/core-typings';
 import { Meteor } from 'meteor/meteor';
 import { Tracker } from 'meteor/tracker';
 
@@ -129,7 +129,7 @@ Meteor.startup(() => {
 		});
 
 		// Encrypt messages before sending
-		offClientBeforeSendMessage = onClientBeforeSendMessage.use(async (message: AtLeast<IMessage, '_id' | 'rid' | 'msg'>) => {
+		offClientBeforeSendMessage = onClientBeforeSendMessage.use(async (message) => {
 			const e2eRoom = await e2e.getInstanceByRoomId(message.rid);
 
 			if (!e2eRoom) {
@@ -147,11 +147,7 @@ Meteor.startup(() => {
 			}
 
 			// Should encrypt this message.
-			const msg = await e2eRoom.encrypt(message);
-			message.msg = msg;
-			message.t = 'e2e';
-			message.e2e = 'pending';
-			return message;
+			return e2eRoom.encryptMessage(message);
 		});
 
 		listenersAttached = true;
diff --git a/apps/meteor/client/views/room/ImageGallery/hooks/useImagesList.ts b/apps/meteor/client/views/room/ImageGallery/hooks/useImagesList.ts
index c4f7d0770815..886393dd0494 100644
--- a/apps/meteor/client/views/room/ImageGallery/hooks/useImagesList.ts
+++ b/apps/meteor/client/views/room/ImageGallery/hooks/useImagesList.ts
@@ -1,7 +1,9 @@
+import { Base64 } from '@rocket.chat/base64';
 import type { RoomsImagesProps } from '@rocket.chat/rest-typings';
 import { useEndpoint } from '@rocket.chat/ui-contexts';
 import { useCallback, useEffect, useState } from 'react';
 
+import { e2e } from '../../../../../app/e2e/client/rocketchat.e2e';
 import { useScrollableRecordList } from '../../../../hooks/lists/useScrollableRecordList';
 import { useComponentDidUpdate } from '../../../../hooks/useComponentDidUpdate';
 import { ImagesList } from '../../../../lib/lists/ImagesList';
@@ -40,12 +42,32 @@ export const useImagesList = (
 				count: end,
 			});
 
+			const items = files.map((file) => ({
+				...file,
+				uploadedAt: file.uploadedAt ? new Date(file.uploadedAt) : undefined,
+				modifiedAt: file.modifiedAt ? new Date(file.modifiedAt) : undefined,
+			}));
+
+			for await (const file of items) {
+				if (file.rid && file.content) {
+					const e2eRoom = await e2e.getInstanceByRoomId(file.rid);
+					if (e2eRoom?.shouldConvertReceivedMessages()) {
+						const decrypted = await e2e.decryptFileContent(file);
+						const key = Base64.encode(
+							JSON.stringify({
+								...decrypted.encryption,
+								name: String.fromCharCode(...new TextEncoder().encode(decrypted.name)),
+								type: decrypted.type,
+							}),
+						);
+						decrypted.path = `/file-decrypt${decrypted.path}?key=${key}`;
+						Object.assign(file, decrypted);
+					}
+				}
+			}
+
 			return {
-				items: files.map((file) => ({
-					...file,
-					uploadedAt: file.uploadedAt ? new Date(file.uploadedAt) : undefined,
-					modifiedAt: file.modifiedAt ? new Date(file.modifiedAt) : undefined,
-				})),
+				items,
 				itemCount: total,
 			};
 		},
diff --git a/apps/meteor/client/views/room/contextualBar/RoomFiles/components/FileItem.tsx b/apps/meteor/client/views/room/contextualBar/RoomFiles/components/FileItem.tsx
index 3170fe4b2488..a13014fb7834 100644
--- a/apps/meteor/client/views/room/contextualBar/RoomFiles/components/FileItem.tsx
+++ b/apps/meteor/client/views/room/contextualBar/RoomFiles/components/FileItem.tsx
@@ -3,6 +3,7 @@ import { css } from '@rocket.chat/css-in-js';
 import { Box, Palette } from '@rocket.chat/fuselage';
 import React from 'react';
 
+import { useDownloadFromServiceWorker } from '../../../../../hooks/useDownloadFromServiceWorker';
 import { useFormatDateAndTime } from '../../../../../hooks/useFormatDateAndTime';
 import FileItemIcon from './FileItemIcon';
 import FileItemMenu from './FileItemMenu';
@@ -22,12 +23,14 @@ type FileItemProps = {
 
 const FileItem = ({ fileData, onClickDelete }: FileItemProps) => {
 	const format = useFormatDateAndTime();
-	const { _id, name, url, uploadedAt, type, typeGroup, user } = fileData;
+	const { _id, path, name, uploadedAt, type, typeGroup, user } = fileData;
+
+	const encryptedAnchorProps = useDownloadFromServiceWorker(path || '', name);
 
 	return (
 		<Box display='flex' pb={12} pi={24} borderRadius={4} className={hoverClass}>
 			{typeGroup === 'image' ? (
-				<ImageItem id={_id} url={url} name={name} username={user?.username} timestamp={format(uploadedAt)} />
+				<ImageItem id={_id} url={path} name={name} username={user?.username} timestamp={format(uploadedAt)} />
 			) : (
 				<Box
 					is='a'
@@ -39,8 +42,9 @@ const FileItem = ({ fileData, onClickDelete }: FileItemProps) => {
 					display='flex'
 					flexGrow={1}
 					flexShrink={1}
-					href={url}
+					href={path}
 					textDecorationLine='none'
+					{...(path?.includes('/file-decrypt/') ? encryptedAnchorProps : {})}
 				>
 					<FileItemIcon type={type} />
 					<Box mis={8} flexShrink={1} overflow='hidden'>
diff --git a/apps/meteor/client/views/room/contextualBar/RoomFiles/components/FileItemMenu.tsx b/apps/meteor/client/views/room/contextualBar/RoomFiles/components/FileItemMenu.tsx
index 459002dd8358..157df8d78027 100644
--- a/apps/meteor/client/views/room/contextualBar/RoomFiles/components/FileItemMenu.tsx
+++ b/apps/meteor/client/views/room/contextualBar/RoomFiles/components/FileItemMenu.tsx
@@ -1,10 +1,12 @@
 import type { IUpload } from '@rocket.chat/core-typings';
+import { Emitter } from '@rocket.chat/emitter';
 import { Box, Menu, Icon } from '@rocket.chat/fuselage';
+import { useUniqueId } from '@rocket.chat/fuselage-hooks';
 import { useTranslation, useUserId } from '@rocket.chat/ui-contexts';
-import React, { memo } from 'react';
+import React, { memo, useEffect } from 'react';
 
 import { getURL } from '../../../../../../app/utils/client';
-import { download } from '../../../../../lib/download';
+import { download, downloadAs } from '../../../../../lib/download';
 import { useRoom } from '../../../contexts/RoomContext';
 import { useMessageDeletionIsAllowed } from '../hooks/useMessageDeletionIsAllowed';
 
@@ -13,11 +15,33 @@ type FileItemMenuProps = {
 	onClickDelete: (id: IUpload['_id']) => void;
 };
 
+const ee = new Emitter<Record<string, { result: ArrayBuffer; id: string }>>();
+
+navigator.serviceWorker.addEventListener('message', (event) => {
+	if (event.data.type === 'attachment-download-result') {
+		const { result } = event.data as { result: ArrayBuffer; id: string };
+
+		ee.emit(event.data.id, { result, id: event.data.id });
+	}
+});
+
 const FileItemMenu = ({ fileData, onClickDelete }: FileItemMenuProps) => {
 	const t = useTranslation();
 	const room = useRoom();
-	const uid = useUserId();
-	const isDeletionAllowed = useMessageDeletionIsAllowed(room._id, fileData, uid);
+	const userId = useUserId();
+	const isDeletionAllowed = useMessageDeletionIsAllowed(room._id, fileData, userId);
+
+	const { controller } = navigator.serviceWorker;
+
+	const uid = useUniqueId();
+
+	useEffect(
+		() =>
+			ee.once(uid, ({ result }) => {
+				downloadAs({ data: [new Blob([result])] }, fileData.name ?? t('Download'));
+			}),
+		[fileData, t, uid],
+	);
 
 	const menuOptions = {
 		downLoad: {
@@ -28,6 +52,15 @@ const FileItemMenu = ({ fileData, onClickDelete }: FileItemMenuProps) => {
 				</Box>
 			),
 			action: () => {
+				if (fileData.path?.includes('/file-decrypt/')) {
+					controller?.postMessage({
+						type: 'attachment-download',
+						url: fileData.path,
+						id: uid,
+					});
+					return;
+				}
+
 				if (fileData.url && fileData.name) {
 					const URL = window.webkitURL ?? window.URL;
 					const href = getURL(fileData.url);
diff --git a/apps/meteor/client/views/room/contextualBar/RoomFiles/hooks/useFilesList.ts b/apps/meteor/client/views/room/contextualBar/RoomFiles/hooks/useFilesList.ts
index 7875b97576f5..f7b69e21f582 100644
--- a/apps/meteor/client/views/room/contextualBar/RoomFiles/hooks/useFilesList.ts
+++ b/apps/meteor/client/views/room/contextualBar/RoomFiles/hooks/useFilesList.ts
@@ -1,6 +1,8 @@
+import { Base64 } from '@rocket.chat/base64';
 import { useUserRoom, useUserId, useEndpoint } from '@rocket.chat/ui-contexts';
 import { useCallback, useEffect, useMemo, useState } from 'react';
 
+import { e2e } from '../../../../../../app/e2e/client/rocketchat.e2e';
 import { useScrollableRecordList } from '../../../../../hooks/lists/useScrollableRecordList';
 import { useStreamUpdatesForMessageList } from '../../../../../hooks/lists/useStreamUpdatesForMessageList';
 import { useComponentDidUpdate } from '../../../../../hooks/useComponentDidUpdate';
@@ -59,12 +61,32 @@ export const useFilesList = (
 				}),
 			});
 
+			const items = files.map((file) => ({
+				...file,
+				uploadedAt: file.uploadedAt ? new Date(file.uploadedAt) : undefined,
+				modifiedAt: file.modifiedAt ? new Date(file.modifiedAt) : undefined,
+			}));
+
+			for await (const file of items) {
+				if (file.rid && file.content) {
+					const e2eRoom = await e2e.getInstanceByRoomId(file.rid);
+					if (e2eRoom?.shouldConvertReceivedMessages()) {
+						const decrypted = await e2e.decryptFileContent(file);
+						const key = Base64.encode(
+							JSON.stringify({
+								...decrypted.encryption,
+								name: String.fromCharCode(...new TextEncoder().encode(decrypted.name)),
+								type: decrypted.type,
+							}),
+						);
+						decrypted.path = `/file-decrypt${decrypted.path}?key=${key}`;
+						Object.assign(file, decrypted);
+					}
+				}
+			}
+
 			return {
-				items: files.map((file) => ({
-					...file,
-					uploadedAt: file.uploadedAt ? new Date(file.uploadedAt) : undefined,
-					modifiedAt: file.modifiedAt ? new Date(file.modifiedAt) : undefined,
-				})),
+				items,
 				itemCount: total,
 			};
 		},
diff --git a/apps/meteor/package.json b/apps/meteor/package.json
index ff44a6053a68..8f44665c204b 100644
--- a/apps/meteor/package.json
+++ b/apps/meteor/package.json
@@ -25,7 +25,7 @@
 		"debug": "meteor run --inspect",
 		"debug-brk": "meteor run --inspect-brk",
 		"lint": "yarn stylelint && yarn eslint",
-		"eslint": "NODE_OPTIONS=\"--max-old-space-size=4098\" eslint --ext .js,.jsx,.ts,.tsx .  --cache",
+		"eslint": "NODE_OPTIONS=\"--max-old-space-size=6144\" eslint --ext .js,.jsx,.ts,.tsx .  --cache",
 		"eslint:fix": "eslint --ext .js,.jsx,.ts,.tsx . --fix --cache",
 		"obj:dev": "TEST_MODE=true yarn dev",
 		"stylelint": "stylelint \"app/**/*.css\" \"client/**/*.css\" \"app/**/*.less\" \"client/**/*.less\" \"ee/**/*.less\"",
diff --git a/apps/meteor/public/enc.js b/apps/meteor/public/enc.js
new file mode 100644
index 000000000000..2a0bcb9db83d
--- /dev/null
+++ b/apps/meteor/public/enc.js
@@ -0,0 +1,123 @@
+function base64Decode(string) {
+	string = atob(string);
+	const length = string.length,
+		buf = new ArrayBuffer(length),
+		bufView = new Uint8Array(buf);
+	for (var i = 0; i < string.length; i++) {
+		bufView[i] = string.charCodeAt(i);
+	}
+	return buf;
+}
+
+function base64DecodeString(string) {
+	return atob(string);
+}
+
+const decrypt = async (key, iv, file) => {
+	const ivArray = base64Decode(iv);
+	const cryptoKey = await crypto.subtle.importKey('jwk', key, { name: 'AES-CTR' }, true, ['encrypt', 'decrypt']);
+	const result = await crypto.subtle.decrypt({ name: 'AES-CTR', counter: ivArray, length: 64 }, cryptoKey, file);
+
+	return result;
+};
+
+const getUrlParams = (url) => {
+	const urlObj = new URL(url, location.origin);
+
+	const k = base64DecodeString(urlObj.searchParams.get('key'));
+
+	urlObj.searchParams.delete('key');
+
+	const { key, iv, name, type } = JSON.parse(k);
+
+	const newUrl = urlObj.href.replace('/file-decrypt/', '/');
+
+	return { key, iv, url: newUrl, name, type };
+};
+
+self.addEventListener('fetch', (event) => {
+	if (!event.request.url.includes('/file-decrypt/')) {
+		return;
+	}
+
+	try {
+		const { url, key, iv, name, type } = getUrlParams(event.request.url);
+
+		const requestToFetch = new Request(url, {
+			...event.request,
+			mode: 'cors',
+		});
+
+		event.respondWith(
+			caches.match(requestToFetch).then((response) => {
+				if (response) {
+					return response;
+				}
+
+				return fetch(requestToFetch)
+					.then(async (res) => {
+						const file = await res.arrayBuffer();
+
+						if (res.status !== 200 || file.byteLength === 0) {
+							console.error('Failed to fetch file', { req: requestToFetch, res });
+							return res;
+						}
+
+						const result = await decrypt(key, iv, file);
+
+						const newHeaders = new Headers(res.headers);
+						newHeaders.set('Content-Disposition', 'inline; filename="'+name+'"');
+						newHeaders.set('Content-Type', type);
+
+						const response = new Response(result, {
+							status: res.status,
+							statusText: res.statusText,
+							headers: newHeaders,
+						});
+
+						await caches.open('v1').then((cache) => {
+							cache.put(requestToFetch, response.clone());
+						});
+
+						return response;
+					})
+					.catch((error) => {
+						console.error('Fetching failed:', error);
+
+						throw error;
+					});
+			}),
+		);
+	} catch (error) {
+		console.error(error);
+		throw error;
+	}
+});
+
+self.addEventListener('message', async (event) => {
+	if (event.data.type !== 'attachment-download') {
+		return;
+	}
+
+	const requestToFetch = new Request(event.data.url);
+
+	const { url, key, iv } = getUrlParams(event.data.url);
+	const res = (await caches.match(requestToFetch)) ?? (await fetch(url));
+
+	const file = await res.arrayBuffer();
+	const result = await decrypt(key, iv, file);
+	event.source
+		.postMessage({
+			id: event.data.id,
+			type: 'attachment-download-result',
+			result,
+		});
+		// .catch((error) => {
+		// 	console.error('Posting message failed:', error);
+		// 	event.source.postMessage({
+		// 		id: event.data.id,
+		// 		type: 'attachment-download-result',
+		// 		error,
+		// 	});
+		// });
+});
diff --git a/apps/meteor/server/cron/temporaryUploadsCleanup.ts b/apps/meteor/server/cron/temporaryUploadsCleanup.ts
new file mode 100644
index 000000000000..b227dd31947f
--- /dev/null
+++ b/apps/meteor/server/cron/temporaryUploadsCleanup.ts
@@ -0,0 +1,16 @@
+import { cronJobs } from '@rocket.chat/cron';
+import { Uploads } from '@rocket.chat/models';
+
+import { FileUpload } from '../../app/file-upload/server';
+
+async function temporaryUploadCleanup(): Promise<void> {
+	const files = await Uploads.findExpiredTemporaryFiles({ projection: { _id: 1 } }).toArray();
+
+	for await (const file of files) {
+		await FileUpload.getStore('Uploads').deleteById(file._id);
+	}
+}
+
+export async function temporaryUploadCleanupCron(): Promise<void> {
+	await cronJobs.add('temporaryUploadCleanup', '31 * * * *', async () => temporaryUploadCleanup());
+}
diff --git a/apps/meteor/server/models/raw/BaseUploadModel.ts b/apps/meteor/server/models/raw/BaseUploadModel.ts
index 98c12965b9ff..4037566272b9 100644
--- a/apps/meteor/server/models/raw/BaseUploadModel.ts
+++ b/apps/meteor/server/models/raw/BaseUploadModel.ts
@@ -1,6 +1,16 @@
 import type { IUpload } from '@rocket.chat/core-typings';
 import type { IBaseUploadsModel } from '@rocket.chat/model-typings';
-import type { DeleteResult, IndexDescription, UpdateResult, Document, InsertOneResult, WithId, Filter } from 'mongodb';
+import type {
+	DeleteResult,
+	IndexDescription,
+	UpdateResult,
+	Document,
+	InsertOneResult,
+	WithId,
+	Filter,
+	FindOptions,
+	FindCursor,
+} from 'mongodb';
 
 import { BaseRaw } from './BaseRaw';
 
@@ -11,6 +21,7 @@ export abstract class BaseUploadModelRaw extends BaseRaw<T> implements IBaseUplo
 		return [
 			{ key: { name: 1 }, sparse: true },
 			{ key: { rid: 1 }, sparse: true },
+			{ key: { expiresAt: 1 }, sparse: true },
 		];
 	}
 
@@ -61,6 +72,25 @@ export abstract class BaseUploadModelRaw extends BaseRaw<T> implements IBaseUplo
 		return this.updateOne(filter, update);
 	}
 
+	confirmTemporaryFile(fileId: string, userId: string): Promise<Document | UpdateResult> | undefined {
+		if (!fileId) {
+			return;
+		}
+
+		const filter = {
+			_id: fileId,
+			userId,
+		};
+
+		const update: Filter<T> = {
+			$unset: {
+				expiresAt: 1,
+			},
+		};
+
+		return this.updateOne(filter, update);
+	}
+
 	async findOneByName(name: string): Promise<T | null> {
 		return this.findOne({ name });
 	}
@@ -69,6 +99,17 @@ export abstract class BaseUploadModelRaw extends BaseRaw<T> implements IBaseUplo
 		return this.findOne({ rid });
 	}
 
+	findExpiredTemporaryFiles(options?: FindOptions<T>): FindCursor<T> {
+		return this.find(
+			{
+				expiresAt: {
+					$lte: new Date(),
+				},
+			},
+			options,
+		);
+	}
+
 	async updateFileNameById(fileId: string, name: string): Promise<Document | UpdateResult> {
 		const filter = { _id: fileId };
 		const update = {
diff --git a/apps/meteor/server/routes/fileDecrypt.ts b/apps/meteor/server/routes/fileDecrypt.ts
new file mode 100644
index 000000000000..005c0202658f
--- /dev/null
+++ b/apps/meteor/server/routes/fileDecrypt.ts
@@ -0,0 +1,7 @@
+import { WebApp } from 'meteor/webapp';
+
+WebApp.connectHandlers.use('/file-decrypt/', (_, res) => {
+	// returns 404
+	res.writeHead(404);
+	res.end('Not found');
+});
diff --git a/apps/meteor/server/routes/index.ts b/apps/meteor/server/routes/index.ts
index e60f0ceb3f24..4abc6c6f044a 100644
--- a/apps/meteor/server/routes/index.ts
+++ b/apps/meteor/server/routes/index.ts
@@ -2,4 +2,5 @@ import './avatar';
 import './health';
 import './i18n';
 import './timesync';
+import './fileDecrypt';
 import './userDataDownload';
diff --git a/apps/meteor/server/startup/cron.ts b/apps/meteor/server/startup/cron.ts
index 3c0482069e79..6057186a1e4e 100644
--- a/apps/meteor/server/startup/cron.ts
+++ b/apps/meteor/server/startup/cron.ts
@@ -6,6 +6,7 @@ import { npsCron } from '../cron/nps';
 import { oembedCron } from '../cron/oembed';
 import { startCron } from '../cron/start';
 import { statsCron } from '../cron/statistics';
+import { temporaryUploadCleanupCron } from '../cron/temporaryUploadsCleanup';
 import { userDataDownloadsCron } from '../cron/userDataDownloads';
 import { videoConferencesCron } from '../cron/videoConferences';
 
@@ -17,6 +18,7 @@ Meteor.defer(async () => {
 	await oembedCron();
 	await statsCron(logger);
 	await npsCron();
+	await temporaryUploadCleanupCron();
 	await federationCron();
 	await videoConferencesCron();
 	await userDataDownloadsCron();
diff --git a/apps/meteor/tests/e2e/e2e-encryption.spec.ts b/apps/meteor/tests/e2e/e2e-encryption.spec.ts
index a3ecf4aa3343..69564b193e91 100644
--- a/apps/meteor/tests/e2e/e2e-encryption.spec.ts
+++ b/apps/meteor/tests/e2e/e2e-encryption.spec.ts
@@ -1,6 +1,7 @@
 import { faker } from '@faker-js/faker';
 import type { Page } from '@playwright/test';
 
+import { BASE_API_URL } from './config/constants';
 import { createAuxContext } from './fixtures/createAuxContext';
 import injectInitialData from './fixtures/inject-initial-data';
 import { Users, storeState, restoreState } from './fixtures/userStates';
@@ -343,6 +344,48 @@ test.describe.serial('e2e-encryption', () => {
 		await expect(poHomeChannel.content.lastUserMessage.locator('.rcx-icon--name-key')).toBeVisible();
 	});
 
+	test('expect placeholder text in place of encrypted file description, when E2EE is not setup', async ({ page }) => {
+		const channelName = faker.string.uuid();
+
+		await poHomeChannel.sidenav.openNewByLabel('Channel');
+		await poHomeChannel.sidenav.inputChannelName.fill(channelName);
+		await poHomeChannel.sidenav.checkboxEncryption.click();
+		await poHomeChannel.sidenav.btnCreate.click();
+
+		await expect(page).toHaveURL(`/group/${channelName}`);
+
+		await poHomeChannel.dismissToast();
+
+		await expect(poHomeChannel.content.encryptedRoomHeaderIcon).toBeVisible();
+
+		await poHomeChannel.content.dragAndDropTxtFile();
+		await poHomeChannel.content.descriptionInput.fill('any_description');
+		await poHomeChannel.content.fileNameInput.fill('any_file1.txt');
+		await poHomeChannel.content.btnModalConfirm.click();
+
+		await expect(poHomeChannel.content.lastUserMessage.locator('.rcx-icon--name-key')).toBeVisible();
+
+		await expect(poHomeChannel.content.getFileDescription).toHaveText('any_description');
+		await expect(poHomeChannel.content.lastMessageFileName).toContainText('any_file1.txt');
+
+		// Logout to remove e2ee keys
+		await poHomeChannel.sidenav.logout();
+
+		// Login again
+		await page.locator('role=button[name="Login"]').waitFor();
+		await injectInitialData();
+		await restoreState(page, Users.admin, { except: ['private_key', 'public_key'] });
+
+		await poHomeChannel.sidenav.openChat(channelName);
+
+		await expect(poHomeChannel.content.encryptedRoomHeaderIcon).toBeVisible();
+
+		await expect(poHomeChannel.content.lastUserMessage).toContainText(
+			'This message is end-to-end encrypted. To view it, you must enter your encryption key in your account settings.',
+		);
+		await expect(poHomeChannel.content.lastUserMessage.locator('.rcx-icon--name-key')).toBeVisible();
+	});
+
 	test('expect slash commands to be enabled in an e2ee room', async ({ page }) => {
 		const channelName = faker.string.uuid();
 
@@ -677,3 +720,65 @@ test.describe.serial('e2ee room setup', () => {
 		await expect(poHomeChannel.tabs.btnRoomInfo).toBeVisible();
 	});
 });
+
+test.describe.serial('e2ee support legacy formats', () => {
+	test.use({ storageState: Users.userE2EE.state });
+
+	let poHomeChannel: HomeChannel;
+
+	test.beforeEach(async ({ page }) => {
+		poHomeChannel = new HomeChannel(page);
+	});
+
+	test.beforeAll(async ({ api }) => {
+		expect((await api.post('/settings/E2E_Enable', { value: true })).status()).toBe(200);
+		expect((await api.post('/settings/E2E_Allow_Unencrypted_Messages', { value: false })).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);
+	});
+
+	// Not testing upload since it was not implemented in the legacy format
+	test('expect create a private channel encrypted and send an encrypted message', async ({ page, request }) => {
+		await page.goto('/home');
+
+		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();
+
+		const rid = await page.locator('[data-qa-rc-room]').getAttribute('data-qa-rc-room');
+
+		// send old format encrypted message via API
+		const msg = await page.evaluate(async (rid) => {
+			// eslint-disable-next-line import/no-unresolved, @typescript-eslint/no-var-requires, import/no-absolute-path
+			const { e2e } = require('/app/e2e/client/rocketchat.e2e.ts');
+			const e2eRoom = await e2e.getInstanceByRoomId(rid);
+			return e2eRoom.encrypt({ _id: 'id', msg: 'Old format message' });
+		}, rid);
+
+		await request.post(`${BASE_API_URL}/chat.sendMessage`, {
+			headers: {
+				'X-Auth-Token': Users.userE2EE.data.loginToken,
+				'X-User-Id': Users.userE2EE.data._id,
+			},
+			data: {
+				message: {
+					rid,
+					msg,
+					t: 'e2e',
+				},
+			},
+		});
+
+		await expect(poHomeChannel.content.lastUserMessageBody).toHaveText('Old format message');
+		await expect(poHomeChannel.content.lastUserMessage.locator('.rcx-icon--name-key')).toBeVisible();
+	});
+});
diff --git a/apps/meteor/tests/e2e/fixtures/collections/users.ts b/apps/meteor/tests/e2e/fixtures/collections/users.ts
index 5b85974fb57c..5baaccc10134 100644
--- a/apps/meteor/tests/e2e/fixtures/collections/users.ts
+++ b/apps/meteor/tests/e2e/fixtures/collections/users.ts
@@ -10,7 +10,7 @@ type UserFixture = IUser & {
 };
 
 export function createUserFixture(user: IUserState): UserFixture {
-	const { username, hashedToken, loginExpire } = user.data;
+	const { username, hashedToken, loginExpire, e2e } = user.data;
 
 	return {
 		_id: `${username}`,
@@ -48,5 +48,6 @@ export function createUserFixture(user: IUserState): UserFixture {
 		createdAt: new Date(),
 		_updatedAt: new Date(),
 		__rooms: ['GENERAL'],
+		e2e,
 	};
 }
diff --git a/apps/meteor/tests/e2e/fixtures/inject-initial-data.ts b/apps/meteor/tests/e2e/fixtures/inject-initial-data.ts
index 38835db4aaa6..192b0ea66937 100644
--- a/apps/meteor/tests/e2e/fixtures/inject-initial-data.ts
+++ b/apps/meteor/tests/e2e/fixtures/inject-initial-data.ts
@@ -7,7 +7,12 @@ import { Users } from './userStates';
 export default async function injectInitialData() {
 	const connection = await MongoClient.connect(constants.URL_MONGODB);
 
-	const usersFixtures = [createUserFixture(Users.user1), createUserFixture(Users.user2), createUserFixture(Users.user3)];
+	const usersFixtures = [
+		createUserFixture(Users.user1),
+		createUserFixture(Users.user2),
+		createUserFixture(Users.user3),
+		createUserFixture(Users.userE2EE),
+	];
 
 	await Promise.all(
 		usersFixtures.map((user) =>
diff --git a/apps/meteor/tests/e2e/fixtures/userStates.ts b/apps/meteor/tests/e2e/fixtures/userStates.ts
index e948d6acf5a7..252023eae73c 100644
--- a/apps/meteor/tests/e2e/fixtures/userStates.ts
+++ b/apps/meteor/tests/e2e/fixtures/userStates.ts
@@ -11,10 +11,30 @@ export type IUserState = {
 		loginToken: string;
 		loginExpire: Date;
 		hashedToken: string;
+		e2e?: {
+			private_key: string;
+			public_key: string;
+		};
+		e2ePassword?: string;
 	};
 	state: Exclude<BrowserContextOptions['storageState'], string | undefined>;
 };
 
+const e2eeData: Record<string, { server: IUserState['data']['e2e']; client: { private_key: string } }> = {
+	userE2EE: {
+		server: {
+			private_key:
+				'{"$binary":"F4AdhH8Nq2MkGy0+IpfSH5OfN6FnTh1blyhxNucQLUxskZiccAKyXyszquv7h3Jz5nFFPj5LxH18ZUTmqcMVz7LHIlOtF74Pq+g79LqWylXO2ANfxBbNUg6xhD7FFWn9eHI9k0gZy7dPmtuSiwlJzYPYZK/ouKcnwgkhze2Nz455JAf7gREvMEUc5UUCMsaQ2ka26gMU0/zUnkRuIqL0evIU6V2Y09+GmsUo4BUQvnvA657re+mP7XosK0LU6R+nO9m/cGSezCMLrzJ8TXxpCWIwgfzedR6XxE6Xb7qDpf2dNoUXEQsgUmp0Ft0/3BiohKB0Blr9mfWt2zyfjjxOIsiTX6Du8TQqGZQ1Nr0+EhEZeXu86E3umlQkPnAmXOBQ1Bp/us2Bjd5kSRc53jqgaBHMto6HApfZvUNAcpQeZoYWe1e5et5zyZD0Uzbc+g+zLfxbhtH2RW2Q66Yq2szodx7mvcBom3X6P+iaheRRA7qgj3cyZoI1q9byyAZRUFsdKVW69+fZT07Qt3n4WRbrO4+JTHy62v2mtEZxMzHMSFXhspkzH3cd5jMARMRP8jw4q8zq9jmPxQlUrmow/PA9FnmIghsIH46wLbX35Kk+FsZx88gawuFCcixgMxHE7IFbulokl5fIZnoXxqeEPrNNfW9HWgBmY6M6kJLK5shgZeZgbBz5aeXuzYRIVnI9iRvLNKDZPz51yLEzMB85Lv0Rbys8eg+odn/82FnJjoXk2IQgwW0EQahSfD18pcniLdrT/8zPiKEnMpvvwxTXeGW0I+C0R2CPqAlECvpuQB3ApmnZobAJ5cPz8qDK+Kl+JDAeDRbnqmbVjB9gq2FbQVvm5AMosA5qOTZ53UTCr9jZYj8SzmyE4NYQAEhvsgS3btaHg/rb72Creoe4TXiaPnSC4IZB9VnYyR61Xer3OiJ4cdn9/GlVSXW0SjlEsJx470PCnMK48V/EWr+Hx1bF0l3WBY9++LR7KXMC5PWxF1prcUAOMEnOMrwYTDwwXceG9N9r8VVQHFkleF+9Durk7RpdiyoLqagGxKSjBmb80ulhBddB8tyR+LW/tJeSGSUgDYVZ3OB+YP1jYKjuTDiezmRvjiKekwa6TsMuWI1VwXl3Rqz3H1AAkXIOn+A+Kufamk4K24PbGcbsDGvzKV4FCUv2gIugMgvw4bfaSZ05fUSOxJGK8ebHaOfkG1eOMfHzoO0Rl/0ep6YwLzNNR2ULXNZ81X2a5fU6dJ5ahA0ko3BB10oeKVC7koGpNNZZgaGHBspaarvm6ex3G+7WeUPpNFcP8anyLsWneqArZl/y5axTHFY4IeXLwyyq9CBYdKcUamlXKZ3Hec8VS2+C9a33cMlTvk/6yLLhnmhXyYHN7lraOJRY8j93rOu8IHVN0QYZhOhL6gDpwioI1kIqkYOoEiczPO1IzxgISN+5RliiT5DqLBCHCqZ/PNfZ5Rd4hJdxzL1rTujG4nItQ+CInVcQ/QI5pJePknJAE8nWzTZboka55nNmH0qOgOEWPEAMbbdp/tKwutynM5v1Rdxqw1r+hHxbCl+QO9Um7XV+ArsD2LvcL83fgWTBZkbp7wt/gQW2bWLmG3TfyPxas58vkby+JFn93jWR2z1fMEgFEkcbXy2NoIcNd02PzzRwEhTJxKP695Ne7OINgShLmaCMyvADpBzf5I5O7OVwS1qCX1ypoDCwXqXxHwMGfIkpGz0Ta7N/GB6TLP0ZzExNv5FMznUo+t0ar2re95ZPqvfbdiO66CjbcS/SRaH//9AeyUnHZvQtQ1JGsJcyZs4YRiouWYkhCkVr5o3iVY1u3/beDScuSauuOxQ8VdS88HDPuYLwAIgjPkXLgmr5q3IcyJjZoZEMUi0zyFhPhfxJXFbkzggUSvXak4LNADOwj/D6YxlSbJ3m96EN/R8Yzq9qo1hAkf/FO/Two8DTk5QrzIoE1tVfZFCvGqd/LjwbLBy1k+84emDfI93LyUtEg35mParjNwmpltO3FLpWQ7Pn+KPhkyAX5xw0AaVpjQ0geE+K/ZHTWjTzUN0UrVQ7rfBg1zHUIpzLcki4lGYvOOQAP1ZUoNSR8Q6P3C2YjNLCwa+D39uA/djv2S6IfxONs9Fc4WnQ7JbOsZCTcAXkyfJi24kvXeX8KNwZFI9reGgYfF3qOpMXET9CgU/MUoJrAngjXPC9kHYdjLRCNDmi5r1pJhUJ+YtDIxS33vZ30CZAUCRy4yPo/kQb4nQZxUSQEybWEZfg96uPajPrTA=="}',
+			public_key:
+				'{"alg":"RSA-OAEP-256","e":"AQAB","ext":true,"key_ops":["encrypt"],"kty":"RSA","n":"qVLMv2Iwm_Hyhlnh4etNlHEiCXBzJWbqMwOZ6pz_JuZY2HiqbLmSfBtpvwBKZvcmP92BqLl-qZuLV_bJD_11UBS3gR6ykgU-RsTz1L-V8vA2QZEyULP4DqkMcRCV_7WE_sn_ScePgKszx1284gnngct_1Tv37zB6Ifz7gb1THRwAqOGcE2htea4yQEhyX8ZAl_-95DTWLbXqEAuofqDpXMcQo487VezBWIaDdfw2VX0qi6kM-pt03Gx8uMniyAjhK1G8Dro3wgAtz4PNIwOsdXEvWTSyoXLVMsIuZeO9OGdJKXnZFtVEMzXLyQTD1LjXlsM_TF09fbkN41Tz12ojmQ"}',
+		},
+		client: {
+			private_key:
+				'{"alg":"RSA-OAEP-256","d":"IpABtkEzPenNwQng105CKD5NndKj1msi_CXMibzhQk37rbg3xXi9w3KPC8th5JGnb5rl6AxxI-rZrytzUD3C8AVCjes3tSG33BdA1FkFITFSSeD6_ck2pbtxDDVAARHK431VDHjdPHz11Ui3kQZHiNGCtwKGMf9Zts1eg1WjfQnQw2ta4-38mwHpq-4Cm_F1brNTTAu5XlHMws4-TDlYhY3nFU2XvoiR2RPDbMddtvXpDZIVo9s7h3jcS4JxHeJd7mWfwcR_Wf0ArRJIhckgPQtTAAjADNpw_HAdERfJyOAJUnxtHkv4uTu_k23qDpPGEi8euFpQ_1UD8B_Z1Rxylw","dp":"OS3zu_VYJZmOXl1dRXxYGP69MR4YQ3TFJ58HFIxvebD060byGHL-mwf0R6-a1hBkHfSeUI9iPipEcjQeevasPqm5CG8eYMvGU2vhsoq1gfY79rsoKjnThCO3XiUbNeM-G9MRKMRa3ooQ8fUVHyEWKFo1ajoFbVHxZuqTAOgrYT8","dq":"yXtWRU1vM5imQJhIZBt5BO1Rfn-koHTvTM3c5QDdPLyNoGTKTyeoT3P9clN6qevJKTyJJTWiwuz8ZECSksh_m9STCY1ry2HqlF2EKdCZnTQzhoJvb6d7547Witc9eh2rBjsILSxVBadLzOFe8opkkQkdkM_gN_Rr3TtXEAo1vn8","e":"AQAB","ext":true,"key_ops":["decrypt"],"kty":"RSA","n":"qVLMv2Iwm_Hyhlnh4etNlHEiCXBzJWbqMwOZ6pz_JuZY2HiqbLmSfBtpvwBKZvcmP92BqLl-qZuLV_bJD_11UBS3gR6ykgU-RsTz1L-V8vA2QZEyULP4DqkMcRCV_7WE_sn_ScePgKszx1284gnngct_1Tv37zB6Ifz7gb1THRwAqOGcE2htea4yQEhyX8ZAl_-95DTWLbXqEAuofqDpXMcQo487VezBWIaDdfw2VX0qi6kM-pt03Gx8uMniyAjhK1G8Dro3wgAtz4PNIwOsdXEvWTSyoXLVMsIuZeO9OGdJKXnZFtVEMzXLyQTD1LjXlsM_TF09fbkN41Tz12ojmQ","p":"0GJaXeKlxgcz6pX0DdwtWG38x9vN2wfLrN3F8N_0stzyPMjMpLGXOdGq1k1V6FROYvLHZsqdCpziwJ3a1PQaGUg2lO-KeBghlbDk4xfYbzSSPhVdwvUT27dysd3-_TsBvNpVCqCLb9Wgl8f0jrrRmRTSztYSLw3ckL939OJoe0M","q":"0AOMQqdGlz0Tm81uqpzCuQcQLMj-IhmPIMuuTnIU55KCmEwmlf0mkgesj-EEBsC1h6ScC5fvznGNvSGqVQAP5ANNZxGiB73q-2YgH3FpuEeHekufl260E_9tgIuqjtCv-eT_cLUhnRNyuP2ZiqRZsBWLuaQYkTubyGRi6izoofM","qi":"FXbIXivKdh0VBgMtLe5f1OjzyrSW_IfIvz8ZM66F4tUTxnNKk5vSb_q2NPyIOVYbdonuVguX-0VO54Ct16k8VdpQSMmUxGbyQAtIck2IzEzpfbRJgn06wiAI3j8q1nRFhrzhfrpJWVyuTiXBgaeOLWBz8fBpjDU7rptmcoU3tZ4"}',
+		},
+	},
+};
+
 function generateContext(username: string): IUserState {
 	const date = new Date();
 	date.setFullYear(date.getFullYear() + 1);
@@ -33,6 +53,10 @@ function generateContext(username: string): IUserState {
 			loginToken: token.token,
 			loginExpire: token.when,
 			hashedToken,
+			...(e2eeData[username] && {
+				e2e: e2eeData[username]?.server,
+				e2ePassword: 'minus mobile dexter forest elvis',
+			}),
 		},
 		state: {
 			cookies: [
@@ -77,6 +101,14 @@ function generateContext(username: string): IUserState {
 							name: 'Meteor.userId',
 							value: username,
 						},
+						...(e2eeData[username]
+							? [
+									{
+										name: 'private_key',
+										value: e2eeData[username]?.client.private_key,
+									},
+							  ]
+							: []),
 					],
 				},
 			],
@@ -88,6 +120,7 @@ export const Users = {
 	user1: generateContext('user1'),
 	user2: generateContext('user2'),
 	user3: generateContext('user3'),
+	userE2EE: generateContext('userE2EE'),
 	samluser1: generateContext('samluser1'),
 	samluser2: generateContext('samluser2'),
 	samluser4: generateContext('samluser4'),
diff --git a/apps/meteor/tests/end-to-end/api/01-users.js b/apps/meteor/tests/end-to-end/api/01-users.js
index b1d9a594996b..ee53820daa2a 100644
--- a/apps/meteor/tests/end-to-end/api/01-users.js
+++ b/apps/meteor/tests/end-to-end/api/01-users.js
@@ -73,6 +73,22 @@ describe('[Users]', function () {
 			});
 	});
 
+	it('should fail when trying to set keys for a user with keys already set', async () => {
+		await request
+			.post(api('e2e.setUserPublicAndPrivateKeys'))
+			.set(userCredentials)
+			.send({
+				private_key: 'test',
+				public_key: 'test',
+			})
+			.expect('Content-Type', 'application/json')
+			.expect(400)
+			.expect((res) => {
+				expect(res.body).to.have.property('success', false);
+				expect(res.body).to.have.property('error', 'Keys already set [error-keys-already-set]');
+			});
+	});
+
 	describe('[/users.create]', () => {
 		before(async () => clearCustomFields());
 		after(async () => clearCustomFields());
diff --git a/apps/meteor/tests/end-to-end/api/09-rooms.js b/apps/meteor/tests/end-to-end/api/09-rooms.js
index 0809d06b324d..de4668e86f48 100644
--- a/apps/meteor/tests/end-to-end/api/09-rooms.js
+++ b/apps/meteor/tests/end-to-end/api/09-rooms.js
@@ -368,6 +368,350 @@ describe('[Rooms]', function () {
 
 			await request.get(thumbUrl).set(credentials).expect('Content-Type', 'image/jpeg');
 		});
+
+		// Support legacy behavior (not encrypting file)
+		it('should correctly save file description and properties with type e2e', async () => {
+			await request
+				.post(api(`rooms.upload/${testChannel._id}`))
+				.set(credentials)
+				.field('description', 'some_file_description')
+				.attach('file', imgURL)
+				.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('attachments');
+					expect(res.body.message.attachments).to.be.an('array').of.length(1);
+					expect(res.body.message.attachments[0]).to.have.property('image_type', 'image/png');
+					expect(res.body.message.attachments[0]).to.have.property('title', '1024x1024.png');
+					expect(res.body.message).to.have.property('files');
+					expect(res.body.message.files).to.be.an('array').of.length(2);
+					expect(res.body.message.files[0]).to.have.property('type', 'image/png');
+					expect(res.body.message.files[0]).to.have.property('name', '1024x1024.png');
+					expect(res.body.message.attachments[0]).to.have.property('description', 'some_file_description');
+				});
+		});
+	});
+
+	describe('/rooms.media', () => {
+		let testChannel;
+		let user;
+		let userCredentials;
+		const testChannelName = `channel.test.upload.${Date.now()}-${Math.random()}`;
+		let blockedMediaTypes;
+
+		before(async () => {
+			user = await createUser({ joinDefaultChannels: false });
+			userCredentials = await login(user.username, password);
+			testChannel = (await createRoom({ type: 'c', name: testChannelName })).body.channel;
+			blockedMediaTypes = await getSettingValueById('FileUpload_MediaTypeBlackList');
+			const newBlockedMediaTypes = blockedMediaTypes
+				.split(',')
+				.filter((type) => type !== 'image/svg+xml')
+				.join(',');
+			await updateSetting('FileUpload_MediaTypeBlackList', newBlockedMediaTypes);
+		});
+
+		after(() =>
+			Promise.all([
+				deleteRoom({ type: 'c', roomId: testChannel._id }),
+				deleteUser(user),
+				updateSetting('FileUpload_Restrict_to_room_members', true),
+				updateSetting('FileUpload_ProtectFiles', true),
+				updateSetting('FileUpload_MediaTypeBlackList', blockedMediaTypes),
+			]),
+		);
+
+		it("don't upload a file to room with file field other than file", (done) => {
+			request
+				.post(api(`rooms.media/${testChannel._id}`))
+				.set(credentials)
+				.attach('test', imgURL)
+				.expect('Content-Type', 'application/json')
+				.expect(400)
+				.expect((res) => {
+					expect(res.body).to.have.property('success', false);
+					expect(res.body).to.have.property('error', '[invalid-field]');
+					expect(res.body).to.have.property('errorType', 'invalid-field');
+				})
+				.end(done);
+		});
+		it("don't upload a file to room with empty file", (done) => {
+			request
+				.post(api(`rooms.media/${testChannel._id}`))
+				.set(credentials)
+				.attach('file', '')
+				.expect('Content-Type', 'application/json')
+				.expect(400)
+				.expect((res) => {
+					expect(res.body).to.have.property('success', false);
+					expect(res.body).to.have.property('error', res.body.error);
+				})
+				.end(done);
+		});
+		it("don't upload a file to room with more than 1 file", (done) => {
+			request
+				.post(api(`rooms.media/${testChannel._id}`))
+				.set(credentials)
+				.attach('file', imgURL)
+				.attach('file', imgURL)
+				.expect('Content-Type', 'application/json')
+				.expect(400)
+				.expect((res) => {
+					expect(res.body).to.have.property('success', false);
+					expect(res.body).to.have.property('error', 'Just 1 file is allowed');
+				})
+				.end(done);
+		});
+
+		let fileNewUrl;
+		let fileOldUrl;
+		let fileId;
+		it('should upload a PNG file to room', async () => {
+			await request
+				.post(api(`rooms.media/${testChannel._id}`))
+				.set(credentials)
+				.attach('file', imgURL)
+				.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');
+					// expect(res.body.message.files[0]).to.have.property('type', 'image/png');
+					// expect(res.body.message.files[0]).to.have.property('name', '1024x1024.png');
+
+					fileNewUrl = res.body.file.url;
+					fileOldUrl = res.body.file.url.replace('/file-upload/', '/ufs/GridFS:Uploads/');
+					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('attachments');
+					expect(res.body.message.attachments).to.be.an('array').of.length(1);
+					expect(res.body.message.attachments[0]).to.have.property('image_type', 'image/png');
+					expect(res.body.message.attachments[0]).to.have.property('title', '1024x1024.png');
+					expect(res.body.message).to.have.property('files');
+					expect(res.body.message.files).to.be.an('array').of.length(2);
+					expect(res.body.message.files[0]).to.have.property('type', 'image/png');
+					expect(res.body.message.files[0]).to.have.property('name', '1024x1024.png');
+				});
+		});
+
+		it('should upload a LST file to room', async () => {
+			let fileId;
+			await request
+				.post(api(`rooms.media/${testChannel._id}`))
+				.set(credentials)
+				.attach('file', lstURL)
+				.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('attachments');
+					expect(res.body.message.attachments).to.be.an('array').of.length(1);
+					expect(res.body.message.attachments[0]).to.have.property('format', 'LST');
+					expect(res.body.message.attachments[0]).to.have.property('title', 'lst-test.lst');
+					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('name', 'lst-test.lst');
+				});
+		});
+
+		it('should not allow uploading a blocked media type to a room', async () => {
+			await updateSetting('FileUpload_MediaTypeBlackList', 'text/plain');
+			await request
+				.post(api(`rooms.media/${testChannel._id}`))
+				.set(credentials)
+				.attach('file', lstURL)
+				.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-invalid-file-type');
+				});
+		});
+
+		it('should be able to get the file', async () => {
+			await request.get(fileNewUrl).set(credentials).expect('Content-Type', 'image/png').expect(200);
+			await request.get(fileOldUrl).set(credentials).expect('Content-Type', 'image/png').expect(200);
+		});
+
+		it('should be able to get the file when no access to the room if setting allows it', async () => {
+			await updateSetting('FileUpload_Restrict_to_room_members', false);
+			await request.get(fileNewUrl).set(userCredentials).expect('Content-Type', 'image/png').expect(200);
+			await request.get(fileOldUrl).set(userCredentials).expect('Content-Type', 'image/png').expect(200);
+		});
+
+		it('should not be able to get the file when no access to the room if setting blocks', async () => {
+			await updateSetting('FileUpload_Restrict_to_room_members', true);
+			await request.get(fileNewUrl).set(userCredentials).expect(403);
+			await request.get(fileOldUrl).set(userCredentials).expect(403);
+		});
+
+		it('should be able to get the file if member and setting blocks outside access', async () => {
+			await updateSetting('FileUpload_Restrict_to_room_members', true);
+			await request.get(fileNewUrl).set(credentials).expect('Content-Type', 'image/png').expect(200);
+			await request.get(fileOldUrl).set(credentials).expect('Content-Type', 'image/png').expect(200);
+		});
+
+		it('should not be able to get the file without credentials', async () => {
+			await request.get(fileNewUrl).attach('file', imgURL).expect(403);
+			await request.get(fileOldUrl).attach('file', imgURL).expect(403);
+		});
+
+		it('should be able to get the file without credentials if setting allows', async () => {
+			await updateSetting('FileUpload_ProtectFiles', false);
+			await request.get(fileNewUrl).expect('Content-Type', 'image/png').expect(200);
+			await request.get(fileOldUrl).expect('Content-Type', 'image/png').expect(200);
+		});
+
+		it('should generate thumbnail for SVG files correctly', async () => {
+			const expectedFileName = `thumb-${svgLogoFileName}`;
+			let thumbUrl;
+			let fileId;
+			await request
+				.post(api(`rooms.media/${testChannel._id}`))
+				.set(credentials)
+				.attach('file', svgLogoURL)
+				.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) => {
+					const { message } = res.body;
+					const { files, attachments } = message;
+
+					expect(files).to.be.an('array');
+					const hasThumbFile = files.some((file) => file.type === 'image/png' && file.name === expectedFileName);
+					expect(hasThumbFile).to.be.true;
+
+					expect(attachments).to.be.an('array');
+					const thumbAttachment = attachments.find((attachment) => attachment.title === svgLogoFileName);
+					expect(thumbAttachment).to.be.an('object');
+					thumbUrl = thumbAttachment.image_url;
+				});
+
+			await request.get(thumbUrl).set(credentials).expect('Content-Type', 'image/png');
+		});
+
+		it('should generate thumbnail for JPEG files correctly', async () => {
+			const expectedFileName = `thumb-sample-jpeg.jpg`;
+			let thumbUrl;
+			let fileId;
+			await request
+				.post(api(`rooms.media/${testChannel._id}`))
+				.set(credentials)
+				.attach('file', fs.createReadStream(path.join(__dirname, '../../mocks/files/sample-jpeg.jpg')))
+				.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) => {
+					const { message } = res.body;
+					const { files, attachments } = message;
+
+					expect(files).to.be.an('array');
+					const hasThumbFile = files.some((file) => file.type === 'image/jpeg' && file.name === expectedFileName);
+					expect(hasThumbFile).to.be.true;
+
+					expect(attachments).to.be.an('array');
+					const thumbAttachment = attachments.find((attachment) => attachment.title === `sample-jpeg.jpg`);
+					expect(thumbAttachment).to.be.an('object');
+					thumbUrl = thumbAttachment.image_url;
+				});
+
+			await request.get(thumbUrl).set(credentials).expect('Content-Type', 'image/jpeg');
+		});
+
+		// Support legacy behavior (not encrypting file)
+		it('should correctly save file description and properties with type e2e', async () => {
+			let fileId;
+			await request
+				.post(api(`rooms.media/${testChannel._id}`))
+				.set(credentials)
+				.attach('file', imgURL)
+				.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)
+				.send({
+					description: 'some_file_description',
+				})
+				.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('attachments');
+					expect(res.body.message.attachments).to.be.an('array').of.length(1);
+					expect(res.body.message.attachments[0]).to.have.property('image_type', 'image/png');
+					expect(res.body.message.attachments[0]).to.have.property('title', '1024x1024.png');
+					expect(res.body.message).to.have.property('files');
+					expect(res.body.message.files).to.be.an('array').of.length(2);
+					expect(res.body.message.files[0]).to.have.property('type', 'image/png');
+					expect(res.body.message.files[0]).to.have.property('name', '1024x1024.png');
+					expect(res.body.message.attachments[0]).to.have.property('description', 'some_file_description');
+				});
+		});
 	});
 
 	describe('/rooms.favorite', () => {
diff --git a/packages/core-typings/src/IMessage/IMessage.ts b/packages/core-typings/src/IMessage/IMessage.ts
index fc73ede6ece4..8730a6a0cea7 100644
--- a/packages/core-typings/src/IMessage/IMessage.ts
+++ b/packages/core-typings/src/IMessage/IMessage.ts
@@ -223,6 +223,11 @@ export interface IMessage extends IRocketChatRecord {
 	};
 
 	customFields?: IMessageCustomFields;
+
+	content?: {
+		algorithm: string; // 'rc.v1.aes-sha2'
+		ciphertext: string; // Encrypted subset JSON of IMessage
+	};
 }
 
 export type MessageSystem = {
diff --git a/packages/core-typings/src/IMessage/MessageAttachment/MessageAttachmentBase.ts b/packages/core-typings/src/IMessage/MessageAttachment/MessageAttachmentBase.ts
index 167975ae014f..23a999844145 100644
--- a/packages/core-typings/src/IMessage/MessageAttachment/MessageAttachmentBase.ts
+++ b/packages/core-typings/src/IMessage/MessageAttachment/MessageAttachmentBase.ts
@@ -13,4 +13,8 @@ export type MessageAttachmentBase = {
 	format?: string;
 	title_link?: string;
 	title_link_download?: boolean;
+	encryption?: {
+		iv: string;
+		key: JsonWebKey;
+	};
 };
diff --git a/packages/core-typings/src/IUpload.ts b/packages/core-typings/src/IUpload.ts
index c40e9d949407..b9b367a648f2 100644
--- a/packages/core-typings/src/IUpload.ts
+++ b/packages/core-typings/src/IUpload.ts
@@ -48,6 +48,14 @@ export interface IUpload {
 	Webdav?: {
 		path: string;
 	};
+	content?: {
+		algorithm: string; // 'rc.v1.aes-sha2'
+		ciphertext: string; // Encrypted subset JSON of IUpload
+	};
+	encryption?: {
+		iv: string;
+		key: JsonWebKey;
+	};
 }
 
 export type IUploadWithUser = IUpload & { user?: Pick<IUser, '_id' | 'name' | 'username'> };
diff --git a/packages/model-typings/src/models/IBaseUploadsModel.ts b/packages/model-typings/src/models/IBaseUploadsModel.ts
index 8995b78eda08..12db0ee25d6b 100644
--- a/packages/model-typings/src/models/IBaseUploadsModel.ts
+++ b/packages/model-typings/src/models/IBaseUploadsModel.ts
@@ -1,5 +1,5 @@
 import type { IUpload } from '@rocket.chat/core-typings';
-import type { DeleteResult, UpdateResult, Document, InsertOneResult, WithId } from 'mongodb';
+import type { DeleteResult, UpdateResult, Document, InsertOneResult, WithId, FindCursor, FindOptions } from 'mongodb';
 
 import type { IBaseModel } from './IBaseModel';
 
@@ -8,10 +8,14 @@ export interface IBaseUploadsModel<T extends IUpload> extends IBaseModel<T> {
 
 	updateFileComplete(fileId: string, userId: string, file: object): Promise<Document | UpdateResult> | undefined;
 
+	confirmTemporaryFile(fileId: string, userId: string): Promise<Document | UpdateResult> | undefined;
+
 	findOneByName(name: string): Promise<T | null>;
 
 	findOneByRoomId(rid: string): Promise<T | null>;
 
+	findExpiredTemporaryFiles(options?: FindOptions<T>): FindCursor<T>;
+
 	updateFileNameById(fileId: string, name: string): Promise<Document | UpdateResult>;
 
 	deleteFile(fileId: string): Promise<DeleteResult>;
diff --git a/packages/rest-typings/src/v1/rooms.ts b/packages/rest-typings/src/v1/rooms.ts
index da68daf25050..ee05f10f2c14 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 } from '@rocket.chat/core-typings';
+import type { IMessage, IRoom, IUser, RoomAdminFieldsType, IUpload, IE2EEMessage } from '@rocket.chat/core-typings';
 
 import type { PaginatedRequest } from '../helpers/PaginatedRequest';
 import type { PaginatedResult } from '../helpers/PaginatedResult';
@@ -621,6 +621,25 @@ export type RoomsEndpoints = {
 		}) => { message: IMessage | null };
 	};
 
+	'/v1/rooms.media/:rid': {
+		POST: (params: { file: File }) => { file: { url: string } };
+	};
+
+	'/v1/rooms.mediaConfirm/:rid/:fileId': {
+		POST: (params: {
+			description?: string;
+			avatar?: string;
+			emoji?: string;
+			alias?: string;
+			groupable?: boolean;
+			msg?: string;
+			tmid?: string;
+			customFields?: string;
+			t?: IMessage['t'];
+			content?: IE2EEMessage['content'];
+		}) => { message: IMessage | null };
+	};
+
 	'/v1/rooms.saveNotification': {
 		POST: (params: { roomId: string; notifications: Notifications }) => void;
 	};

From 1240c874a5c5bf8897bce9d10e26932170ac39a5 Mon Sep 17 00:00:00 2001
From: Yash Rajpal <58601732+yash-rajpal@users.noreply.github.com>
Date: Sat, 22 Jun 2024 19:37:54 +0530
Subject: [PATCH 70/94] fix: Handle encrypted pinned messages (#32380)

Co-authored-by: Hugo Costa <hugocarreiracosta@gmail.com>
Co-authored-by: Guilherme Gazzo <guilhermegazzo@gmail.com>
---
 .changeset/forty-bikes-check.md               |  6 +++
 apps/meteor/app/e2e/client/rocketchat.e2e.ts  | 27 ++++++++++-
 .../app/message-pin/server/pinMessage.ts      |  4 +-
 .../components/message/StatusIndicators.tsx   |  4 +-
 apps/meteor/client/startup/e2e.ts             |  6 +++
 apps/meteor/client/startup/messageTypes.ts    |  6 +++
 .../room/contextualBar/PinnedMessagesTab.tsx  |  3 +-
 .../room/contextualBar/StarredMessagesTab.tsx |  3 +-
 apps/meteor/tests/e2e/e2e-encryption.spec.ts  | 45 +++++++++++++++++++
 .../page-objects/fragments/home-flextab.ts    |  8 ++++
 .../core-typings/src/IMessage/IMessage.ts     |  6 +++
 11 files changed, 112 insertions(+), 6 deletions(-)
 create mode 100644 .changeset/forty-bikes-check.md

diff --git a/.changeset/forty-bikes-check.md b/.changeset/forty-bikes-check.md
new file mode 100644
index 000000000000..fdc42a68b0e4
--- /dev/null
+++ b/.changeset/forty-bikes-check.md
@@ -0,0 +1,6 @@
+---
+'@rocket.chat/core-typings': patch
+'@rocket.chat/meteor': patch
+---
+
+Decrypt pinned encrypted messages in the chat and pinned messages contextual bar.
diff --git a/apps/meteor/app/e2e/client/rocketchat.e2e.ts b/apps/meteor/app/e2e/client/rocketchat.e2e.ts
index d14f4e07caa1..ba905e945f2e 100644
--- a/apps/meteor/app/e2e/client/rocketchat.e2e.ts
+++ b/apps/meteor/app/e2e/client/rocketchat.e2e.ts
@@ -1,7 +1,7 @@
 import QueryString from 'querystring';
 import URL from 'url';
 
-import type { IE2EEMessage, IMessage, IRoom, ISubscription, IUploadWithUser } from '@rocket.chat/core-typings';
+import type { IE2EEMessage, IMessage, IRoom, ISubscription, IUploadWithUser, MessageAttachment } from '@rocket.chat/core-typings';
 import { isE2EEMessage } from '@rocket.chat/core-typings';
 import { Emitter } from '@rocket.chat/emitter';
 import EJSON from 'ejson';
@@ -550,6 +550,31 @@ class E2E extends Emitter {
 		return decryptedMessageWithQuote;
 	}
 
+	async decryptPinnedMessage(message: IMessage) {
+		const pinnedMessage = message?.attachments?.[0]?.text;
+
+		if (!pinnedMessage) {
+			return message;
+		}
+
+		const e2eRoom = await this.getInstanceByRoomId(message.rid);
+
+		if (!e2eRoom) {
+			return message;
+		}
+
+		const data = await e2eRoom.decrypt(pinnedMessage);
+
+		if (!data) {
+			return message;
+		}
+
+		const decryptedPinnedMessage = { ...message } as IMessage & { attachments: MessageAttachment[] };
+		decryptedPinnedMessage.attachments[0].text = data.text;
+
+		return decryptedPinnedMessage;
+	}
+
 	async decryptPendingMessages(): Promise<void> {
 		return Messages.find({ t: 'e2e', e2e: 'pending' }).forEach(async ({ _id, ...msg }: IMessage) => {
 			Messages.update({ _id }, await this.decryptMessage(msg as IE2EEMessage));
diff --git a/apps/meteor/app/message-pin/server/pinMessage.ts b/apps/meteor/app/message-pin/server/pinMessage.ts
index ffc3c9836f0c..b0eab3f929d6 100644
--- a/apps/meteor/app/message-pin/server/pinMessage.ts
+++ b/apps/meteor/app/message-pin/server/pinMessage.ts
@@ -133,7 +133,9 @@ Meteor.methods<ServerMethods>({
 		// App IPostMessagePinned event hook
 		await Apps.self?.triggerEvent(AppEvents.IPostMessagePinned, originalMessage, await Meteor.userAsync(), originalMessage.pinned);
 
-		const msgId = await Message.saveSystemMessage('message_pinned', originalMessage.rid, '', me, {
+		const pinMessageType = originalMessage.t === 'e2e' ? 'message_pinned_e2e' : 'message_pinned';
+
+		const msgId = await Message.saveSystemMessage(pinMessageType, originalMessage.rid, '', me, {
 			attachments: [
 				{
 					text: originalMessage.msg,
diff --git a/apps/meteor/client/components/message/StatusIndicators.tsx b/apps/meteor/client/components/message/StatusIndicators.tsx
index f47d25e7c7b2..eb47fb040b21 100644
--- a/apps/meteor/client/components/message/StatusIndicators.tsx
+++ b/apps/meteor/client/components/message/StatusIndicators.tsx
@@ -1,5 +1,5 @@
 import type { IMessage, ITranslatedMessage } from '@rocket.chat/core-typings';
-import { isEditedMessage, isE2EEMessage, isOTRMessage, isOTRAckMessage } from '@rocket.chat/core-typings';
+import { isEditedMessage, isE2EEMessage, isOTRMessage, isOTRAckMessage, isE2EEPinnedMessage } from '@rocket.chat/core-typings';
 import { MessageStatusIndicator, MessageStatusIndicatorItem } from '@rocket.chat/fuselage';
 import { useUserId, useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
@@ -17,7 +17,7 @@ const StatusIndicators = ({ message }: StatusIndicatorsProps): ReactElement => {
 	const starred = useShowStarred({ message });
 	const following = useShowFollowing({ message });
 
-	const isEncryptedMessage = isE2EEMessage(message);
+	const isEncryptedMessage = isE2EEMessage(message) || isE2EEPinnedMessage(message);
 	const isOtrMessage = isOTRMessage(message) || isOTRAckMessage(message);
 
 	const uid = useUserId();
diff --git a/apps/meteor/client/startup/e2e.ts b/apps/meteor/client/startup/e2e.ts
index 21473e1585b0..22ebc345c519 100644
--- a/apps/meteor/client/startup/e2e.ts
+++ b/apps/meteor/client/startup/e2e.ts
@@ -1,4 +1,5 @@
 import type { IMessage, ISubscription } from '@rocket.chat/core-typings';
+import { isE2EEPinnedMessage } from '@rocket.chat/core-typings';
 import { Meteor } from 'meteor/meteor';
 import { Tracker } from 'meteor/tracker';
 
@@ -125,6 +126,11 @@ Meteor.startup(() => {
 			if (!e2eRoom?.shouldConvertReceivedMessages()) {
 				return msg;
 			}
+
+			if (isE2EEPinnedMessage(msg)) {
+				return e2e.decryptPinnedMessage(msg);
+			}
+
 			return e2e.decryptMessage(msg);
 		});
 
diff --git a/apps/meteor/client/startup/messageTypes.ts b/apps/meteor/client/startup/messageTypes.ts
index 65ad6dabae23..481ab49568a2 100644
--- a/apps/meteor/client/startup/messageTypes.ts
+++ b/apps/meteor/client/startup/messageTypes.ts
@@ -61,4 +61,10 @@ Meteor.startup(() => {
 		system: true,
 		message: 'Pinned_a_message',
 	});
+
+	MessageTypes.registerType({
+		id: 'message_pinned_e2e',
+		system: true,
+		message: 'Pinned_a_message',
+	});
 });
diff --git a/apps/meteor/client/views/room/contextualBar/PinnedMessagesTab.tsx b/apps/meteor/client/views/room/contextualBar/PinnedMessagesTab.tsx
index 01f373a3cca5..dcdab0612db9 100644
--- a/apps/meteor/client/views/room/contextualBar/PinnedMessagesTab.tsx
+++ b/apps/meteor/client/views/room/contextualBar/PinnedMessagesTab.tsx
@@ -4,6 +4,7 @@ import { useQuery } from '@tanstack/react-query';
 import type { ReactElement } from 'react';
 import React from 'react';
 
+import { onClientMessageReceived } from '../../../lib/onClientMessageReceived';
 import { mapMessageFromApi } from '../../../lib/utils/mapMessageFromApi';
 import { useRoom } from '../contexts/RoomContext';
 import MessageListTab from './MessageListTab';
@@ -25,7 +26,7 @@ const PinnedMessagesTab = (): ReactElement => {
 			messages.push(...result.messages.map(mapMessageFromApi));
 		}
 
-		return messages;
+		return Promise.all(messages.map(onClientMessageReceived));
 	});
 
 	const t = useTranslation();
diff --git a/apps/meteor/client/views/room/contextualBar/StarredMessagesTab.tsx b/apps/meteor/client/views/room/contextualBar/StarredMessagesTab.tsx
index 0680a961331a..4159f570f5c9 100644
--- a/apps/meteor/client/views/room/contextualBar/StarredMessagesTab.tsx
+++ b/apps/meteor/client/views/room/contextualBar/StarredMessagesTab.tsx
@@ -3,6 +3,7 @@ import { useEndpoint, useTranslation } from '@rocket.chat/ui-contexts';
 import { useQuery } from '@tanstack/react-query';
 import React from 'react';
 
+import { onClientMessageReceived } from '../../../lib/onClientMessageReceived';
 import { mapMessageFromApi } from '../../../lib/utils/mapMessageFromApi';
 import { useRoom } from '../contexts/RoomContext';
 import MessageListTab from './MessageListTab';
@@ -24,7 +25,7 @@ const StarredMessagesTab = () => {
 			messages.push(...result.messages.map(mapMessageFromApi));
 		}
 
-		return messages;
+		return Promise.all(messages.map(onClientMessageReceived));
 	});
 
 	const t = useTranslation();
diff --git a/apps/meteor/tests/e2e/e2e-encryption.spec.ts b/apps/meteor/tests/e2e/e2e-encryption.spec.ts
index 69564b193e91..55aefe88571c 100644
--- a/apps/meteor/tests/e2e/e2e-encryption.spec.ts
+++ b/apps/meteor/tests/e2e/e2e-encryption.spec.ts
@@ -494,6 +494,51 @@ test.describe.serial('e2e-encryption', () => {
 		await expect(sidebarChannel.locator('span')).toContainText(encriptedMessage1);
 	});
 
+	test('expect create a private encrypted channel and pin/star an encrypted message', 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('This message should be pinned and stared.');
+
+		await expect(poHomeChannel.content.lastUserMessageBody).toHaveText('This message should be pinned and stared.');
+		await expect(poHomeChannel.content.lastUserMessage.locator('.rcx-icon--name-key')).toBeVisible();
+
+		await poHomeChannel.content.openLastMessageMenu();
+		await page.locator('role=menuitem[name="Star"]').click();
+
+		await expect(poHomeChannel.toastSuccess).toBeVisible();
+		await poHomeChannel.dismissToast();
+
+		await poHomeChannel.content.openLastMessageMenu();
+		await page.locator('role=menuitem[name="Pin"]').click();
+		await page.locator('#modal-root >> button:has-text("Yes, pin message")').click();
+
+		await poHomeChannel.tabs.kebab.click();
+		await poHomeChannel.tabs.btnPinnedMessagesList.click();
+
+		await expect(page.getByRole('dialog', { name: 'Pinned Messages' })).toBeVisible();
+		await expect(page.getByRole('dialog', { name: 'Pinned Messages' }).locator('[data-qa-type="message"]').last()).toContainText(
+			'This message should be pinned and stared.',
+		);
+
+		await poHomeChannel.btnContextualbarClose.click();
+
+		await poHomeChannel.tabs.kebab.click();
+		await poHomeChannel.tabs.btnStarredMessageList.click();
+
+		await expect(page.getByRole('dialog', { name: 'Starred Messages' })).toBeVisible();
+		await expect(page.getByRole('dialog', { name: 'Starred Messages' }).locator('[data-qa-type="message"]').last()).toContainText(
+			'This message should be pinned and stared.',
+		);
+	});
+
 	test.describe('reset keys', () => {
 		let anotherClientPage: Page;
 
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 a6d91bc6fc34..2ae5acf5fb9d 100644
--- a/apps/meteor/tests/e2e/page-objects/fragments/home-flextab.ts
+++ b/apps/meteor/tests/e2e/page-objects/fragments/home-flextab.ts
@@ -67,4 +67,12 @@ export class HomeFlextab {
 	get userInfoUsername(): Locator {
 		return this.page.locator('[data-qa="UserInfoUserName"]');
 	}
+
+	get btnPinnedMessagesList(): Locator {
+		return this.page.locator('[data-key="pinned-messages"]');
+	}
+
+	get btnStarredMessageList(): Locator {
+		return this.page.locator('[data-key="starred-messages"]');
+	}
 }
diff --git a/packages/core-typings/src/IMessage/IMessage.ts b/packages/core-typings/src/IMessage/IMessage.ts
index 8730a6a0cea7..1812dfb6dad3 100644
--- a/packages/core-typings/src/IMessage/IMessage.ts
+++ b/packages/core-typings/src/IMessage/IMessage.ts
@@ -92,6 +92,7 @@ export type MessageTypesValues =
 	| 'command'
 	| 'videoconf'
 	| 'message_pinned'
+	| 'message_pinned_e2e'
 	| 'new-moderator'
 	| 'moderator-removed'
 	| 'new-owner'
@@ -364,6 +365,10 @@ export type IE2EEMessage = IMessage & {
 	e2e: 'pending' | 'done';
 };
 
+export type IE2EEPinnedMessage = IMessage & {
+	t: 'message_pinned_e2e';
+};
+
 export interface IOTRMessage extends IMessage {
 	t: 'otr';
 	otrAck?: string;
@@ -378,6 +383,7 @@ export type IVideoConfMessage = IMessage & {
 };
 
 export const isE2EEMessage = (message: IMessage): message is IE2EEMessage => message.t === 'e2e';
+export const isE2EEPinnedMessage = (message: IMessage): message is IE2EEPinnedMessage => message.t === 'message_pinned_e2e';
 export const isOTRMessage = (message: IMessage): message is IOTRMessage => message.t === 'otr';
 export const isOTRAckMessage = (message: IMessage): message is IOTRAckMessage => message.t === 'otr-ack';
 export const isVideoConfMessage = (message: IMessage): message is IVideoConfMessage => message.t === 'videoconf';

From f75a2cb4bbea0f94358d0d84056d2309d2a996f2 Mon Sep 17 00:00:00 2001
From: Yash Rajpal <58601732+yash-rajpal@users.noreply.github.com>
Date: Sat, 22 Jun 2024 23:38:44 +0530
Subject: [PATCH 71/94] feat(E2EE): Async E2EE keys exchange (#32197)

---
 .changeset/orange-clocks-raise.md             |   8 +
 apps/meteor/app/api/server/v1/e2e.ts          |  51 ++++
 .../app/e2e/client/rocketchat.e2e.room.js     |  44 +++-
 apps/meteor/app/e2e/client/rocketchat.e2e.ts  | 218 +++++++++++++++++-
 .../functions/handleSuggestedGroupKey.ts      |   7 +-
 .../provideUsersSuggestedGroupKeys.ts         |  33 +++
 .../methods/setUserPublicAndPrivateKeys.ts    |   5 +-
 .../app/e2e/server/methods/updateGroupKey.ts  |   8 +-
 .../app/lib/server/functions/addUserToRoom.ts |   5 +
 .../server/functions/removeUserFromRoom.ts    |   5 +
 apps/meteor/client/startup/e2e.ts             |  81 +------
 .../channels/hooks/useTeamsChannelList.ts     |   3 +-
 apps/meteor/lib/publishFields.ts              |   1 +
 apps/meteor/server/lib/resetUserE2EKey.ts     |   3 +-
 .../server/methods/removeUserFromRoom.ts      |   7 +-
 apps/meteor/server/models/raw/Rooms.ts        | 112 +++++++++
 .../meteor/server/models/raw/Subscriptions.ts |  61 ++++-
 packages/core-typings/src/IRoom.ts            |   2 +
 packages/i18n/src/locales/en.i18n.json        |   6 +-
 .../model-typings/src/models/IRoomsModel.ts   |   4 +
 .../src/models/ISubscriptionsModel.ts         |   8 +-
 packages/rest-typings/src/index.ts            |   1 +
 packages/rest-typings/src/v1/e2e.ts           |  59 ++++-
 23 files changed, 636 insertions(+), 96 deletions(-)
 create mode 100644 .changeset/orange-clocks-raise.md
 create mode 100644 apps/meteor/app/e2e/server/functions/provideUsersSuggestedGroupKeys.ts

diff --git a/.changeset/orange-clocks-raise.md b/.changeset/orange-clocks-raise.md
new file mode 100644
index 000000000000..81eac16e2a99
--- /dev/null
+++ b/.changeset/orange-clocks-raise.md
@@ -0,0 +1,8 @@
+---
+'@rocket.chat/model-typings': minor
+'@rocket.chat/core-typings': minor
+'@rocket.chat/rest-typings': minor
+'@rocket.chat/meteor': minor
+---
+
+Async End-to-End Encrypted rooms key distribution process. Users now don't need to be online to get the keys of their subscribed encrypted rooms, the key distribution process is now async and users can recieve keys even when they are not online.
diff --git a/apps/meteor/app/api/server/v1/e2e.ts b/apps/meteor/app/api/server/v1/e2e.ts
index 4c67e5f4f8b6..74bd85dded6a 100644
--- a/apps/meteor/app/api/server/v1/e2e.ts
+++ b/apps/meteor/app/api/server/v1/e2e.ts
@@ -1,13 +1,18 @@
 import type { IUser } from '@rocket.chat/core-typings';
+import { Subscriptions } from '@rocket.chat/models';
 import {
 	ise2eGetUsersOfRoomWithoutKeyParamsGET,
 	ise2eSetRoomKeyIDParamsPOST,
 	ise2eSetUserPublicAndPrivateKeysParamsPOST,
 	ise2eUpdateGroupKeyParamsPOST,
+	isE2EProvideUsersGroupKeyProps,
+	isE2EFetchUsersWaitingForGroupKeyProps,
 } from '@rocket.chat/rest-typings';
 import { Meteor } from 'meteor/meteor';
 
 import { handleSuggestedGroupKey } from '../../../e2e/server/functions/handleSuggestedGroupKey';
+import { provideUsersSuggestedGroupKeys } from '../../../e2e/server/functions/provideUsersSuggestedGroupKeys';
+import { settings } from '../../../settings/server';
 import { API } from '../api';
 
 API.v1.addRoute(
@@ -188,6 +193,9 @@ API.v1.addRoute(
 	{
 		authRequired: true,
 		validateParams: ise2eUpdateGroupKeyParamsPOST,
+		deprecation: {
+			version: '8.0.0',
+		},
 	},
 	{
 		async post() {
@@ -233,3 +241,46 @@ API.v1.addRoute(
 		},
 	},
 );
+
+API.v1.addRoute(
+	'e2e.fetchUsersWaitingForGroupKey',
+	{
+		authRequired: true,
+		validateParams: isE2EFetchUsersWaitingForGroupKeyProps,
+	},
+	{
+		async get() {
+			if (!settings.get('E2E_Enable')) {
+				return API.v1.success({ usersWaitingForE2EKeys: {} });
+			}
+
+			const { roomIds = [] } = this.queryParams;
+			const usersWaitingForE2EKeys = (await Subscriptions.findUsersWithPublicE2EKeyByRids(roomIds, this.userId).toArray()).reduce<
+				Record<string, { _id: string; public_key: string }[]>
+			>((acc, { rid, users }) => ({ [rid]: users, ...acc }), {});
+
+			return API.v1.success({
+				usersWaitingForE2EKeys,
+			});
+		},
+	},
+);
+
+API.v1.addRoute(
+	'e2e.provideUsersSuggestedGroupKeys',
+	{
+		authRequired: true,
+		validateParams: isE2EProvideUsersGroupKeyProps,
+	},
+	{
+		async post() {
+			if (!settings.get('E2E_Enable')) {
+				return API.v1.success();
+			}
+
+			await provideUsersSuggestedGroupKeys(this.userId, this.bodyParams.usersSuggestedGroupKeys);
+
+			return API.v1.success();
+		},
+	},
+);
diff --git a/apps/meteor/app/e2e/client/rocketchat.e2e.room.js b/apps/meteor/app/e2e/client/rocketchat.e2e.room.js
index 4903dc012668..ac7cedb3fd9d 100644
--- a/apps/meteor/app/e2e/client/rocketchat.e2e.room.js
+++ b/apps/meteor/app/e2e/client/rocketchat.e2e.room.js
@@ -94,6 +94,10 @@ export class E2ERoom extends Emitter {
 		logError(`E2E ROOM { state: ${this.state}, rid: ${this.roomId} }`, ...msg);
 	}
 
+	hasSessionKey() {
+		return !!this.groupSessionKey;
+	}
+
 	getState() {
 		return this.state;
 	}
@@ -317,17 +321,29 @@ export class E2ERoom extends Emitter {
 	async encryptKeyForOtherParticipants() {
 		// Encrypt generated session key for every user in room and publish to subscription model.
 		try {
-			const { users } = await sdk.call('e2e.getUsersOfRoomWithoutKey', this.roomId);
-			users.forEach((user) => this.encryptForParticipant(user));
+			const users = (await sdk.call('e2e.getUsersOfRoomWithoutKey', this.roomId)).users.filter((user) => user?.e2e?.public_key);
+
+			if (!users.length) {
+				return;
+			}
+
+			const usersSuggestedGroupKeys = { [this.roomId]: [] };
+			for await (const user of users) {
+				const encryptedGroupKey = await this.encryptGroupKeyForParticipant(user.e2e.public_key);
+
+				usersSuggestedGroupKeys[this.roomId].push({ _id: user._id, key: encryptedGroupKey });
+			}
+
+			await sdk.rest.post('/v1/e2e.provideUsersSuggestedGroupKeys', { usersSuggestedGroupKeys });
 		} catch (error) {
 			return this.error('Error getting room users: ', error);
 		}
 	}
 
-	async encryptForParticipant(user) {
+	async encryptGroupKeyForParticipant(public_key) {
 		let userKey;
 		try {
-			userKey = await importRSAKey(JSON.parse(user.e2e.public_key), ['encrypt']);
+			userKey = await importRSAKey(JSON.parse(public_key), ['encrypt']);
 		} catch (error) {
 			return this.error('Error importing user key: ', error);
 		}
@@ -336,8 +352,8 @@ export class E2ERoom extends Emitter {
 		// Encrypt session key for this user with his/her public key
 		try {
 			const encryptedUserKey = await encryptRSA(userKey, toArrayBuffer(this.sessionKeyExportedString));
-			// Key has been encrypted. Publish to that user's subscription model for this room.
-			await sdk.call('e2e.updateGroupKey', this.roomId, user._id, this.keyID + Base64.encode(new Uint8Array(encryptedUserKey)));
+			const encryptedUserKeyToString = this.keyID + Base64.encode(new Uint8Array(encryptedUserKey));
+			return encryptedUserKeyToString;
 		} catch (error) {
 			return this.error('Error encrypting user key: ', error);
 		}
@@ -510,4 +526,20 @@ export class E2ERoom extends Emitter {
 		this.on('STATE_CHANGED', cb);
 		return () => this.off('STATE_CHANGED', cb);
 	}
+
+	async encryptGroupKeyForParticipantsWaitingForTheKeys(users) {
+		if (!this.isReady()) {
+			return;
+		}
+
+		const usersWithKeys = await Promise.all(
+			users.map(async (user) => {
+				const { _id, public_key } = user;
+				const key = await this.encryptGroupKeyForParticipant(public_key);
+				return { _id, key };
+			}),
+		);
+
+		return usersWithKeys;
+	}
 }
diff --git a/apps/meteor/app/e2e/client/rocketchat.e2e.ts b/apps/meteor/app/e2e/client/rocketchat.e2e.ts
index ba905e945f2e..0cc344ff5152 100644
--- a/apps/meteor/app/e2e/client/rocketchat.e2e.ts
+++ b/apps/meteor/app/e2e/client/rocketchat.e2e.ts
@@ -1,10 +1,11 @@
 import QueryString from 'querystring';
 import URL from 'url';
 
-import type { IE2EEMessage, IMessage, IRoom, ISubscription, IUploadWithUser, MessageAttachment } from '@rocket.chat/core-typings';
+import type { IE2EEMessage, IMessage, IRoom, ISubscription, IUser, IUploadWithUser, MessageAttachment } from '@rocket.chat/core-typings';
 import { isE2EEMessage } from '@rocket.chat/core-typings';
 import { Emitter } from '@rocket.chat/emitter';
 import EJSON from 'ejson';
+import _ from 'lodash';
 import { Meteor } from 'meteor/meteor';
 import { Tracker } from 'meteor/tracker';
 
@@ -18,6 +19,7 @@ import EnterE2EPasswordModal from '../../../client/views/e2e/EnterE2EPasswordMod
 import SaveE2EPasswordModal from '../../../client/views/e2e/SaveE2EPasswordModal';
 import { createQuoteAttachment } from '../../../lib/createQuoteAttachment';
 import { getMessageUrlRegex } from '../../../lib/getMessageUrlRegex';
+import { isTruthy } from '../../../lib/isTruthy';
 import { ChatRoom, Subscriptions, Messages } from '../../models/client';
 import { settings } from '../../settings/client';
 import { getUserAvatarURL } from '../../utils/client';
@@ -40,6 +42,7 @@ import {
 } from './helper';
 import { log, logError } from './logger';
 import { E2ERoom } from './rocketchat.e2e.room';
+
 import './events.js';
 
 let failedToDecodeKey = false;
@@ -49,6 +52,7 @@ type KeyPair = {
 	private_key: string | null;
 };
 
+const ROOM_KEY_EXCHANGE_SIZE = 10;
 const E2EEStateDependency = new Tracker.Dependency();
 
 class E2E extends Emitter {
@@ -62,12 +66,18 @@ class E2E extends Emitter {
 
 	public privateKey: CryptoKey | undefined;
 
+	private keyDistributionInterval: ReturnType<typeof setInterval> | null;
+
 	private state: E2EEState;
 
+	private observable: Meteor.LiveQueryHandle | undefined;
+
 	constructor() {
 		super();
 		this.started = false;
 		this.instancesByRoomId = {};
+		this.keyDistributionInterval = null;
+		this.observable = undefined;
 
 		this.on('E2E_STATE_CHANGED', ({ prevState, nextState }) => {
 			this.log(`${prevState} -> ${nextState}`);
@@ -81,6 +91,18 @@ class E2E extends Emitter {
 			await this.onE2EEReady();
 		});
 
+		this.on(E2EEState.DISABLED, () => {
+			this.observable?.stop();
+		});
+
+		this.on(E2EEState.NOT_STARTED, () => {
+			this.observable?.stop();
+		});
+
+		this.on(E2EEState.ERROR, () => {
+			this.observable?.stop();
+		});
+
 		this.setState(E2EEState.NOT_STARTED);
 	}
 
@@ -109,12 +131,80 @@ class E2E extends Emitter {
 
 	async onE2EEReady() {
 		this.log('startClient -> Done');
-		this.log('decryptSubscriptions');
 		this.initiateHandshake();
+		await this.handleAsyncE2EESuggestedKey();
+		this.log('decryptSubscriptions');
 		await this.decryptSubscriptions();
 		this.log('decryptSubscriptions -> Done');
 		await this.initiateDecryptingPendingMessages();
 		this.log('DecryptingPendingMessages -> Done');
+		await this.initiateKeyDistribution();
+		this.log('initiateKeyDistribution -> Done');
+		this.observeSubscriptions();
+		this.log('observing subscriptions');
+	}
+
+	observeSubscriptions() {
+		this.observable?.stop();
+
+		this.observable = Subscriptions.find().observe({
+			changed: (sub: ISubscription) => {
+				setTimeout(async () => {
+					this.log('Subscription changed', sub);
+					if (!sub.encrypted && !sub.E2EKey) {
+						this.removeInstanceByRoomId(sub.rid);
+						return;
+					}
+
+					const e2eRoom = await this.getInstanceByRoomId(sub.rid);
+					if (!e2eRoom) {
+						return;
+					}
+
+					if (sub.E2ESuggestedKey) {
+						if (await e2eRoom.importGroupKey(sub.E2ESuggestedKey)) {
+							await this.acceptSuggestedKey(sub.rid);
+							e2eRoom.keyReceived();
+						} else {
+							console.warn('Invalid E2ESuggestedKey, rejecting', sub.E2ESuggestedKey);
+							await this.rejectSuggestedKey(sub.rid);
+						}
+					}
+
+					sub.encrypted ? e2eRoom.resume() : e2eRoom.pause();
+
+					// Cover private groups and direct messages
+					if (!e2eRoom.isSupportedRoomType(sub.t)) {
+						e2eRoom.disable();
+						return;
+					}
+
+					if (sub.E2EKey && e2eRoom.isWaitingKeys()) {
+						e2eRoom.keyReceived();
+						return;
+					}
+
+					if (!e2eRoom.isReady()) {
+						return;
+					}
+
+					await e2eRoom.decryptSubscription();
+				}, 0);
+			},
+			added: (sub: ISubscription) => {
+				setTimeout(async () => {
+					this.log('Subscription added', sub);
+					if (!sub.encrypted && !sub.E2EKey) {
+						return;
+					}
+					return this.getInstanceByRoomId(sub.rid);
+				}, 0);
+			},
+			removed: (sub: ISubscription) => {
+				this.log('Subscription removed', sub);
+				this.removeInstanceByRoomId(sub.rid);
+			},
+		});
 	}
 
 	shouldAskForE2EEPassword() {
@@ -134,6 +224,32 @@ class E2E extends Emitter {
 		this.emit(nextState);
 	}
 
+	async handleAsyncE2EESuggestedKey() {
+		const subs = Subscriptions.find({ E2ESuggestedKey: { $exists: true } }).fetch();
+		await Promise.all(
+			subs
+				.filter((sub) => sub.E2ESuggestedKey && !sub.E2EKey)
+				.map(async (sub) => {
+					const e2eRoom = await e2e.getInstanceByRoomId(sub.rid);
+
+					if (!e2eRoom) {
+						return;
+					}
+
+					if (await e2eRoom.importGroupKey(sub.E2ESuggestedKey)) {
+						this.log('Imported valid E2E suggested key');
+						await e2e.acceptSuggestedKey(sub.rid);
+						e2eRoom.keyReceived();
+					} else {
+						this.error('Invalid E2ESuggestedKey, rejecting', sub.E2ESuggestedKey);
+						await e2e.rejectSuggestedKey(sub.rid);
+					}
+
+					sub.encrypted ? e2eRoom.resume() : e2eRoom.pause();
+				}),
+		);
+	}
+
 	async getInstanceByRoomId(rid: IRoom['_id']): Promise<E2ERoom | null> {
 		const room = await waitUntilFind(() => ChatRoom.findOne({ _id: rid }));
 
@@ -301,6 +417,8 @@ class E2E extends Emitter {
 		this.instancesByRoomId = {};
 		this.privateKey = undefined;
 		this.started = false;
+		this.keyDistributionInterval && clearInterval(this.keyDistributionInterval);
+		this.keyDistributionInterval = null;
 		this.setState(E2EEState.DISABLED);
 	}
 
@@ -602,6 +720,9 @@ class E2E extends Emitter {
 	}
 
 	async parseQuoteAttachment(message: IE2EEMessage): Promise<IE2EEMessage> {
+		if (!message?.msg) {
+			return message;
+		}
 		const urls = message.msg.match(getMessageUrlRegex()) || [];
 
 		await Promise.all(
@@ -647,6 +768,99 @@ class E2E extends Emitter {
 
 		return message;
 	}
+
+	async getSuggestedE2EEKeys(usersWaitingForE2EKeys: Record<IRoom['_id'], { _id: IUser['_id']; public_key: string }[]>) {
+		const roomIds = Object.keys(usersWaitingForE2EKeys);
+		return Object.fromEntries(
+			(
+				await Promise.all(
+					roomIds.map(async (room) => {
+						const e2eRoom = await this.getInstanceByRoomId(room);
+
+						if (!e2eRoom) {
+							return;
+						}
+						const usersWithKeys = await e2eRoom.encryptGroupKeyForParticipantsWaitingForTheKeys(usersWaitingForE2EKeys[room]);
+
+						if (!usersWithKeys) {
+							return;
+						}
+
+						return [room, usersWithKeys];
+					}),
+				)
+			).filter(isTruthy),
+		);
+	}
+
+	async getSample(roomIds: string[], limit = 3): Promise<string[]> {
+		if (limit === 0) {
+			return [];
+		}
+
+		const randomRoomIds = _.sampleSize(roomIds, ROOM_KEY_EXCHANGE_SIZE);
+
+		const sampleIds: string[] = [];
+		for await (const roomId of randomRoomIds) {
+			const e2eroom = await this.getInstanceByRoomId(roomId);
+			if (!e2eroom?.hasSessionKey()) {
+				continue;
+			}
+
+			sampleIds.push(roomId);
+		}
+
+		if (!sampleIds.length) {
+			return this.getSample(roomIds, limit - 1);
+		}
+
+		return sampleIds;
+	}
+
+	async initiateKeyDistribution() {
+		if (this.keyDistributionInterval) {
+			return;
+		}
+
+		const keyDistribution = async () => {
+			const roomIds = ChatRoom.find({
+				'usersWaitingForE2EKeys': { $exists: true },
+				'usersWaitingForE2EKeys.userId': { $ne: Meteor.userId() },
+			}).map((room) => room._id);
+			if (!roomIds.length) {
+				return;
+			}
+
+			// Prevent function from running and doing nothing when theres something to do
+			const sampleIds = await this.getSample(roomIds);
+
+			if (!sampleIds.length) {
+				return;
+			}
+
+			const { usersWaitingForE2EKeys = {} } = await sdk.rest.get('/v1/e2e.fetchUsersWaitingForGroupKey', { roomIds: sampleIds });
+
+			if (!Object.keys(usersWaitingForE2EKeys).length) {
+				return;
+			}
+
+			const userKeysWithRooms = await this.getSuggestedE2EEKeys(usersWaitingForE2EKeys);
+
+			if (!Object.keys(userKeysWithRooms).length) {
+				return;
+			}
+
+			try {
+				await sdk.rest.post('/v1/e2e.provideUsersSuggestedGroupKeys', { usersSuggestedGroupKeys: userKeysWithRooms });
+			} catch (error) {
+				return this.error('Error providing group key to users: ', error);
+			}
+		};
+
+		// Run first call right away, then schedule for 10s in the future
+		await keyDistribution();
+		this.keyDistributionInterval = setInterval(keyDistribution, 10000);
+	}
 }
 
 export const e2e = new E2E();
diff --git a/apps/meteor/app/e2e/server/functions/handleSuggestedGroupKey.ts b/apps/meteor/app/e2e/server/functions/handleSuggestedGroupKey.ts
index dcd1f82edbc8..860051c04d4d 100644
--- a/apps/meteor/app/e2e/server/functions/handleSuggestedGroupKey.ts
+++ b/apps/meteor/app/e2e/server/functions/handleSuggestedGroupKey.ts
@@ -1,4 +1,4 @@
-import { Subscriptions } from '@rocket.chat/models';
+import { Rooms, Subscriptions } from '@rocket.chat/models';
 import { Meteor } from 'meteor/meteor';
 
 export async function handleSuggestedGroupKey(
@@ -23,6 +23,11 @@ export async function handleSuggestedGroupKey(
 
 	if (handle === 'accept') {
 		await Subscriptions.setGroupE2EKey(sub._id, suggestedKey);
+		await Rooms.removeUsersFromE2EEQueueByRoomId(sub.rid, [userId]);
+	}
+
+	if (handle === 'reject') {
+		await Rooms.addUserIdToE2EEQueueByRoomIds([sub.rid], userId);
 	}
 
 	await Subscriptions.unsetGroupE2ESuggestedKey(sub._id);
diff --git a/apps/meteor/app/e2e/server/functions/provideUsersSuggestedGroupKeys.ts b/apps/meteor/app/e2e/server/functions/provideUsersSuggestedGroupKeys.ts
new file mode 100644
index 000000000000..42408f398ecb
--- /dev/null
+++ b/apps/meteor/app/e2e/server/functions/provideUsersSuggestedGroupKeys.ts
@@ -0,0 +1,33 @@
+import type { IRoom, IUser } from '@rocket.chat/core-typings';
+import { Rooms, Subscriptions } from '@rocket.chat/models';
+
+import { canAccessRoomIdAsync } from '../../../authorization/server/functions/canAccessRoom';
+
+export const provideUsersSuggestedGroupKeys = async (
+	userId: IUser['_id'],
+	usersSuggestedGroupKeys: Record<IRoom['_id'], { _id: IUser['_id']; key: string }[]>,
+) => {
+	const roomIds = Object.keys(usersSuggestedGroupKeys);
+
+	if (!roomIds.length) {
+		return;
+	}
+
+	// Process should try to process all rooms i have access instead of dying if one is not
+	for await (const roomId of roomIds) {
+		if (!(await canAccessRoomIdAsync(roomId, userId))) {
+			continue;
+		}
+
+		const usersWithSuggestedKeys = [];
+		for await (const user of usersSuggestedGroupKeys[roomId]) {
+			const { modifiedCount } = await Subscriptions.setGroupE2ESuggestedKey(user._id, roomId, user.key);
+			if (!modifiedCount) {
+				continue;
+			}
+			usersWithSuggestedKeys.push(user._id);
+		}
+
+		await Rooms.removeUsersFromE2EEQueueByRoomId(roomId, usersWithSuggestedKeys);
+	}
+};
diff --git a/apps/meteor/app/e2e/server/methods/setUserPublicAndPrivateKeys.ts b/apps/meteor/app/e2e/server/methods/setUserPublicAndPrivateKeys.ts
index cd96f77a239f..94d252601bc4 100644
--- a/apps/meteor/app/e2e/server/methods/setUserPublicAndPrivateKeys.ts
+++ b/apps/meteor/app/e2e/server/methods/setUserPublicAndPrivateKeys.ts
@@ -1,4 +1,4 @@
-import { Users } from '@rocket.chat/models';
+import { Rooms, Users } from '@rocket.chat/models';
 import type { ServerMethods } from '@rocket.chat/ui-contexts';
 import { Meteor } from 'meteor/meteor';
 
@@ -33,5 +33,8 @@ Meteor.methods<ServerMethods>({
 			private_key: keyPair.private_key,
 			public_key: keyPair.public_key,
 		});
+
+		const subscribedRoomIds = await Rooms.getSubscribedRoomIdsWithoutE2EKeys(userId);
+		await Rooms.addUserIdToE2EEQueueByRoomIds(subscribedRoomIds, userId);
 	},
 });
diff --git a/apps/meteor/app/e2e/server/methods/updateGroupKey.ts b/apps/meteor/app/e2e/server/methods/updateGroupKey.ts
index 30053cc7164a..c856f8cf708a 100644
--- a/apps/meteor/app/e2e/server/methods/updateGroupKey.ts
+++ b/apps/meteor/app/e2e/server/methods/updateGroupKey.ts
@@ -2,6 +2,8 @@ import { Subscriptions } from '@rocket.chat/models';
 import type { ServerMethods } from '@rocket.chat/ui-contexts';
 import { Meteor } from 'meteor/meteor';
 
+import { methodDeprecationLogger } from '../../../lib/server/lib/deprecationWarningLogger';
+
 declare module '@rocket.chat/ui-contexts' {
 	// eslint-disable-next-line @typescript-eslint/naming-convention
 	interface ServerMethods {
@@ -11,6 +13,7 @@ declare module '@rocket.chat/ui-contexts' {
 
 Meteor.methods<ServerMethods>({
 	async 'e2e.updateGroupKey'(rid, uid, key) {
+		methodDeprecationLogger.method('e2e.updateGroupKey', '8.0.0');
 		const userId = Meteor.userId();
 		if (!userId) {
 			throw new Meteor.Error('error-invalid-user', 'Invalid user', { method: 'e2e.acceptSuggestedGroupKey' });
@@ -27,10 +30,7 @@ Meteor.methods<ServerMethods>({
 			}
 
 			// uid also has subscription to this room
-			const userSub = await Subscriptions.findOneByRoomIdAndUserId(rid, uid);
-			if (userSub) {
-				await Subscriptions.setGroupE2ESuggestedKey(userSub._id, key);
-			}
+			await Subscriptions.setGroupE2ESuggestedKey(uid, rid, key);
 		}
 	},
 });
diff --git a/apps/meteor/app/lib/server/functions/addUserToRoom.ts b/apps/meteor/app/lib/server/functions/addUserToRoom.ts
index e377ba3c4600..57ea20f00cb1 100644
--- a/apps/meteor/app/lib/server/functions/addUserToRoom.ts
+++ b/apps/meteor/app/lib/server/functions/addUserToRoom.ts
@@ -9,6 +9,7 @@ import { RoomMemberActions } from '../../../../definition/IRoomTypeConfig';
 import { callbacks } from '../../../../lib/callbacks';
 import { getSubscriptionAutotranslateDefaultConfig } from '../../../../server/lib/getSubscriptionAutotranslateDefaultConfig';
 import { roomCoordinator } from '../../../../server/lib/rooms/roomCoordinator';
+import { settings } from '../../../settings/server';
 import { getDefaultSubscriptionPref } from '../../../utils/lib/getDefaultSubscriptionPref';
 import { notifyOnRoomChangedById } from '../lib/notifyListener';
 
@@ -132,5 +133,9 @@ export const addUserToRoom = async function (
 		await Team.addMember(inviter || userToBeAdded, userToBeAdded._id, room.teamId);
 	}
 
+	if (room.encrypted && settings.get('E2E_Enable') && userToBeAdded.e2e?.public_key) {
+		await Rooms.addUserIdToE2EEQueueByRoomIds([room._id], userToBeAdded._id);
+	}
+
 	return true;
 };
diff --git a/apps/meteor/app/lib/server/functions/removeUserFromRoom.ts b/apps/meteor/app/lib/server/functions/removeUserFromRoom.ts
index e593b3508054..3b065c68f15c 100644
--- a/apps/meteor/app/lib/server/functions/removeUserFromRoom.ts
+++ b/apps/meteor/app/lib/server/functions/removeUserFromRoom.ts
@@ -7,6 +7,7 @@ import { Meteor } from 'meteor/meteor';
 
 import { afterLeaveRoomCallback } from '../../../../lib/callbacks/afterLeaveRoomCallback';
 import { beforeLeaveRoomCallback } from '../../../../lib/callbacks/beforeLeaveRoomCallback';
+import { settings } from '../../../settings/server';
 import { notifyOnRoomChangedById } from '../lib/notifyListener';
 
 export const removeUserFromRoom = async function (
@@ -65,6 +66,10 @@ export const removeUserFromRoom = async function (
 		await Team.removeMember(room.teamId, user._id);
 	}
 
+	if (room.encrypted && settings.get('E2E_Enable')) {
+		await Rooms.removeUsersFromE2EEQueueByRoomId(room._id, [user._id]);
+	}
+
 	// TODO: CACHE: maybe a queue?
 	await afterLeaveRoomCallback.run(user, room);
 
diff --git a/apps/meteor/client/startup/e2e.ts b/apps/meteor/client/startup/e2e.ts
index 22ebc345c519..de615e8f45de 100644
--- a/apps/meteor/client/startup/e2e.ts
+++ b/apps/meteor/client/startup/e2e.ts
@@ -1,13 +1,12 @@
-import type { IMessage, ISubscription } from '@rocket.chat/core-typings';
+import type { IMessage } from '@rocket.chat/core-typings';
 import { isE2EEPinnedMessage } from '@rocket.chat/core-typings';
 import { Meteor } from 'meteor/meteor';
 import { Tracker } from 'meteor/tracker';
 
 import { E2EEState } from '../../app/e2e/client/E2EEState';
 import { e2e } from '../../app/e2e/client/rocketchat.e2e';
-import { Subscriptions, ChatRoom } from '../../app/models/client';
+import { ChatRoom } from '../../app/models/client';
 import { settings } from '../../app/settings/client';
-import { sdk } from '../../app/utils/client/lib/SDKClient';
 import { onClientBeforeSendMessage } from '../lib/onClientBeforeSendMessage';
 import { onClientMessageReceived } from '../lib/onClientMessageReceived';
 import { isLayoutEmbedded } from '../lib/utils/isLayoutEmbedded';
@@ -17,10 +16,12 @@ import { router } from '../providers/RouterProvider';
 Meteor.startup(() => {
 	Tracker.autorun(() => {
 		if (!Meteor.userId()) {
+			e2e.log('Not logged in');
 			return;
 		}
 
 		if (!window.crypto) {
+			e2e.error('No crypto support');
 			return;
 		}
 
@@ -29,98 +30,33 @@ Meteor.startup(() => {
 		const adminEmbedded = isLayoutEmbedded() && router.getLocationPathname().startsWith('/admin');
 
 		if (enabled && !adminEmbedded) {
+			e2e.log('E2E enabled starting client');
 			e2e.startClient();
 		} else {
+			e2e.log('E2E disabled');
 			e2e.setState(E2EEState.DISABLED);
 			e2e.closeAlert();
 		}
 	});
 
-	let observable: Meteor.LiveQueryHandle | null = null;
 	let offClientMessageReceived: undefined | (() => void);
 	let offClientBeforeSendMessage: undefined | (() => void);
-	let unsubNotifyUser: undefined | (() => void);
 	let listenersAttached = false;
 
 	Tracker.autorun(() => {
 		if (!e2e.isReady()) {
+			e2e.log('Not ready');
 			offClientMessageReceived?.();
-			unsubNotifyUser?.();
-			unsubNotifyUser = undefined;
-			observable?.stop();
 			offClientBeforeSendMessage?.();
 			listenersAttached = false;
 			return;
 		}
 
 		if (listenersAttached) {
+			e2e.log('Listeners already attached');
 			return;
 		}
 
-		unsubNotifyUser = sdk.stream('notify-user', [`${Meteor.userId()}/e2ekeyRequest`], async (roomId, keyId): Promise<void> => {
-			const e2eRoom = await e2e.getInstanceByRoomId(roomId);
-			if (!e2eRoom) {
-				return;
-			}
-
-			e2eRoom.provideKeyToUser(keyId);
-		}).stop;
-
-		observable = Subscriptions.find().observe({
-			changed: async (sub: ISubscription) => {
-				setTimeout(async () => {
-					if (!sub.encrypted && !sub.E2EKey) {
-						e2e.removeInstanceByRoomId(sub.rid);
-						return;
-					}
-
-					const e2eRoom = await e2e.getInstanceByRoomId(sub.rid);
-					if (!e2eRoom) {
-						return;
-					}
-
-					if (sub.E2ESuggestedKey) {
-						if (await e2eRoom.importGroupKey(sub.E2ESuggestedKey)) {
-							e2e.acceptSuggestedKey(sub.rid);
-						} else {
-							console.warn('Invalid E2ESuggestedKey, rejecting', sub.E2ESuggestedKey);
-							e2e.rejectSuggestedKey(sub.rid);
-						}
-					}
-
-					sub.encrypted ? e2eRoom.resume() : e2eRoom.pause();
-
-					// Cover private groups and direct messages
-					if (!e2eRoom.isSupportedRoomType(sub.t)) {
-						e2eRoom.disable();
-						return;
-					}
-
-					if (sub.E2EKey && e2eRoom.isWaitingKeys()) {
-						e2eRoom.keyReceived();
-						return;
-					}
-
-					if (!e2eRoom.isReady()) {
-						return;
-					}
-
-					e2eRoom.decryptSubscription();
-				}, 0);
-			},
-			added: async (sub: ISubscription) => {
-				setTimeout(async () => {
-					if (!sub.encrypted && !sub.E2EKey) {
-						return;
-					}
-					return e2e.getInstanceByRoomId(sub.rid);
-				}, 0);
-			},
-			removed: (sub: ISubscription) => {
-				e2e.removeInstanceByRoomId(sub.rid);
-			},
-		});
-
 		offClientMessageReceived = onClientMessageReceived.use(async (msg: IMessage) => {
 			const e2eRoom = await e2e.getInstanceByRoomId(msg.rid);
 			if (!e2eRoom?.shouldConvertReceivedMessages()) {
@@ -157,5 +93,6 @@ Meteor.startup(() => {
 		});
 
 		listenersAttached = true;
+		e2e.log('Listeners attached', listenersAttached);
 	});
 });
diff --git a/apps/meteor/client/views/teams/contextualBar/channels/hooks/useTeamsChannelList.ts b/apps/meteor/client/views/teams/contextualBar/channels/hooks/useTeamsChannelList.ts
index 80dd2998c94c..43fc7c2db1a6 100644
--- a/apps/meteor/client/views/teams/contextualBar/channels/hooks/useTeamsChannelList.ts
+++ b/apps/meteor/client/views/teams/contextualBar/channels/hooks/useTeamsChannelList.ts
@@ -41,12 +41,13 @@ export const useTeamsChannelList = (
 			});
 
 			return {
-				items: rooms.map(({ _updatedAt, lastMessage, lm, ts, webRtcCallStartTime, ...room }) => ({
+				items: rooms.map(({ _updatedAt, lastMessage, lm, ts, webRtcCallStartTime, usersWaitingForE2EKeys, ...room }) => ({
 					...(lm && { lm: new Date(lm) }),
 					...(ts && { ts: new Date(ts) }),
 					_updatedAt: new Date(_updatedAt),
 					...(lastMessage && { lastMessage: mapMessageFromApi(lastMessage) }),
 					...(webRtcCallStartTime && { webRtcCallStartTime: new Date(webRtcCallStartTime) }),
+					...(usersWaitingForE2EKeys && usersWaitingForE2EKeys.map(({ userId, ts }) => ({ userId, ts: new Date(ts) }))),
 					...room,
 				})),
 				itemCount: total,
diff --git a/apps/meteor/lib/publishFields.ts b/apps/meteor/lib/publishFields.ts
index b23c8901aca6..1e9274526ef5 100644
--- a/apps/meteor/lib/publishFields.ts
+++ b/apps/meteor/lib/publishFields.ts
@@ -120,4 +120,5 @@ export const roomFields = {
 	callDuration: 1,
 	callTotalHoldTime: 1,
 	callWaitingTime: 1,
+	usersWaitingForE2EKeys: 1,
 } as const;
diff --git a/apps/meteor/server/lib/resetUserE2EKey.ts b/apps/meteor/server/lib/resetUserE2EKey.ts
index b6c2d2c886e3..3f30251dbb11 100644
--- a/apps/meteor/server/lib/resetUserE2EKey.ts
+++ b/apps/meteor/server/lib/resetUserE2EKey.ts
@@ -1,5 +1,5 @@
 import { api } from '@rocket.chat/core-services';
-import { Subscriptions, Users } from '@rocket.chat/models';
+import { Subscriptions, Users, Rooms } from '@rocket.chat/models';
 import { Meteor } from 'meteor/meteor';
 
 import * as Mailer from '../../app/mailer/server/api';
@@ -71,6 +71,7 @@ export async function resetUserE2EEncriptionKey(uid: string, notifyUser: boolean
 
 	await Users.resetE2EKey(uid);
 	await Subscriptions.resetUserE2EKey(uid);
+	await Rooms.removeUserFromE2EEQueue(uid);
 
 	// Force the user to logout, so that the keys can be generated again
 	await Users.unsetLoginTokens(uid);
diff --git a/apps/meteor/server/methods/removeUserFromRoom.ts b/apps/meteor/server/methods/removeUserFromRoom.ts
index ee1ba25e76f4..08cd6c5b25e0 100644
--- a/apps/meteor/server/methods/removeUserFromRoom.ts
+++ b/apps/meteor/server/methods/removeUserFromRoom.ts
@@ -8,6 +8,7 @@ import { canAccessRoomAsync, getUsersInRole } from '../../app/authorization/serv
 import { hasPermissionAsync } from '../../app/authorization/server/functions/hasPermission';
 import { hasRoleAsync } from '../../app/authorization/server/functions/hasRole';
 import { notifyOnRoomChanged } from '../../app/lib/server/lib/notifyListener';
+import { settings } from '../../app/settings/server';
 import { RoomMemberActions } from '../../definition/IRoomTypeConfig';
 import { callbacks } from '../../lib/callbacks';
 import { afterRemoveFromRoomCallback } from '../../lib/callbacks/afterRemoveFromRoomCallback';
@@ -89,7 +90,11 @@ export const removeUserFromRoomMethod = async (fromId: string, data: { rid: stri
 		await Team.removeMember(room.teamId, removedUser._id);
 	}
 
-	setImmediate(async () => {
+	if (room.encrypted && settings.get('E2E_Enable')) {
+		await Rooms.removeUsersFromE2EEQueueByRoomId(room._id, [removedUser._id]);
+	}
+
+	setImmediate(() => {
 		void afterRemoveFromRoomCallback.run({ removedUser, userWhoRemoved: fromUser }, room);
 		void notifyOnRoomChanged(room);
 	});
diff --git a/apps/meteor/server/models/raw/Rooms.ts b/apps/meteor/server/models/raw/Rooms.ts
index 78efa845ba34..1859f6c18b35 100644
--- a/apps/meteor/server/models/raw/Rooms.ts
+++ b/apps/meteor/server/models/raw/Rooms.ts
@@ -93,6 +93,16 @@ export class RoomsRaw extends BaseRaw<IRoom> implements IRoomsModel {
 				sparse: true,
 			},
 			{ key: { t: 1, ts: 1 } },
+			{
+				key: {
+					'usersWaitingForE2EKeys.userId': 1,
+				},
+				partialFilterExpression: {
+					'usersWaitingForE2EKeys.userId': {
+						$exists: true,
+					},
+				},
+			},
 		];
 	}
 
@@ -1977,4 +1987,106 @@ export class RoomsRaw extends BaseRaw<IRoom> implements IRoomsModel {
 
 		return this.updateOne(query, update);
 	}
+
+	async getSubscribedRoomIdsWithoutE2EKeys(uid: IUser['_id']): Promise<IRoom['_id'][]> {
+		return (
+			await this.col
+				.aggregate([
+					{ $match: { encrypted: true } },
+					{
+						$lookup: {
+							from: 'rocketchat_subscription',
+							localField: '_id',
+							foreignField: 'rid',
+							as: 'subs',
+						},
+					},
+					{
+						$unwind: '$subs',
+					},
+					{
+						$match: {
+							'subs.u._id': uid,
+							'subs.E2EKey': {
+								$exists: false,
+							},
+						},
+					},
+					{
+						$project: {
+							_id: 1,
+						},
+					},
+				])
+				.toArray()
+		).map(({ _id }) => _id);
+	}
+
+	addUserIdToE2EEQueueByRoomIds(roomIds: IRoom['_id'][], uid: IUser['_id']): Promise<Document | UpdateResult> {
+		const query: Filter<IRoom> = {
+			'_id': {
+				$in: roomIds,
+			},
+			'usersWaitingForE2EKeys.userId': { $ne: uid },
+			'encrypted': true,
+		};
+
+		const update: UpdateFilter<IRoom> = {
+			$push: {
+				usersWaitingForE2EKeys: {
+					$each: [
+						{
+							userId: uid,
+							ts: new Date(),
+						},
+					],
+					$slice: -50,
+				},
+			},
+		};
+
+		return this.updateMany(query, update);
+	}
+
+	async removeUsersFromE2EEQueueByRoomId(roomId: IRoom['_id'], uids: IUser['_id'][]): Promise<Document | UpdateResult> {
+		const query: Filter<IRoom> = {
+			'_id': roomId,
+			'usersWaitingForE2EKeys.userId': {
+				$in: uids,
+			},
+			'encrypted': true,
+		};
+
+		const update: UpdateFilter<IRoom> = {
+			$pull: {
+				usersWaitingForE2EKeys: { userId: { $in: uids } },
+			},
+		};
+
+		await this.updateMany(query, update);
+
+		return this.updateMany(
+			{
+				'_id': roomId,
+				'usersWaitingForE2EKeys.0': { $exists: false },
+				'encrypted': true,
+			},
+			{ $unset: { usersWaitingForE2EKeys: 1 } },
+		);
+	}
+
+	async removeUserFromE2EEQueue(uid: IUser['_id']): Promise<Document | UpdateResult> {
+		const query: Filter<IRoom> = {
+			'usersWaitingForE2EKeys.userId': uid,
+			'encrypted': true,
+		};
+
+		const update: UpdateFilter<IRoom> = {
+			$pull: {
+				usersWaitingForE2EKeys: { userId: uid },
+			},
+		};
+
+		return this.updateMany(query, update);
+	}
 }
diff --git a/apps/meteor/server/models/raw/Subscriptions.ts b/apps/meteor/server/models/raw/Subscriptions.ts
index e2570f60e4a4..01440a179c7f 100644
--- a/apps/meteor/server/models/raw/Subscriptions.ts
+++ b/apps/meteor/server/models/raw/Subscriptions.ts
@@ -27,6 +27,7 @@ import type {
 	UpdateFilter,
 	InsertOneResult,
 	InsertManyResult,
+	AggregationCursor,
 } from 'mongodb';
 
 import { getDefaultSubscriptionPref } from '../../../app/utils/lib/getDefaultSubscriptionPref';
@@ -538,8 +539,8 @@ export class SubscriptionsRaw extends BaseRaw<ISubscription> implements ISubscri
 		return this.findOneById(_id);
 	}
 
-	setGroupE2ESuggestedKey(_id: string, key: string): Promise<UpdateResult | Document> {
-		const query = { _id };
+	setGroupE2ESuggestedKey(uid: string, rid: string, key: string): Promise<UpdateResult> {
+		const query = { rid, 'u._id': uid };
 		const update = { $set: { E2ESuggestedKey: key } };
 		return this.updateOne(query, update);
 	}
@@ -674,6 +675,61 @@ export class SubscriptionsRaw extends BaseRaw<ISubscription> implements ISubscri
 		return this.find(query, options);
 	}
 
+	findUsersWithPublicE2EKeyByRids(
+		rids: IRoom['_id'][],
+		excludeUserId: IUser['_id'],
+		usersLimit = 50,
+	): AggregationCursor<{ rid: IRoom['_id']; users: { _id: IUser['_id']; public_key: string }[] }> {
+		return this.col.aggregate([
+			{
+				$match: {
+					'rid': {
+						$in: rids,
+					},
+					'E2EKey': {
+						$exists: false,
+					},
+					'u._id': {
+						$ne: excludeUserId,
+					},
+				},
+			},
+			{
+				$lookup: {
+					from: 'users',
+					localField: 'u._id',
+					foreignField: '_id',
+					as: 'user',
+				},
+			},
+			{
+				$unwind: '$user',
+			},
+			{
+				$match: {
+					'user.e2e.public_key': {
+						$exists: 1,
+					},
+				},
+			},
+			{
+				$group: {
+					_id: {
+						rid: '$rid',
+					},
+					users: { $push: { _id: '$user._id', public_key: '$user.e2e.public_key' } },
+				},
+			},
+			{
+				$project: {
+					rid: '$_id.rid',
+					users: { $slice: ['$users', usersLimit] },
+					_id: 0,
+				},
+			},
+		]);
+	}
+
 	updateAudioNotificationValueById(_id: string, audioNotificationValue: string): Promise<UpdateResult> {
 		const query = {
 			_id,
@@ -871,6 +927,7 @@ export class SubscriptionsRaw extends BaseRaw<ISubscription> implements ISubscri
 			{
 				$unset: {
 					E2EKey: '',
+					E2ESuggestedKey: 1,
 				},
 			},
 		);
diff --git a/packages/core-typings/src/IRoom.ts b/packages/core-typings/src/IRoom.ts
index 32bf438cd70d..74d4ca2ef487 100644
--- a/packages/core-typings/src/IRoom.ts
+++ b/packages/core-typings/src/IRoom.ts
@@ -95,6 +95,8 @@ export interface IRoom extends IRocketChatRecord {
 	customFields?: Record<string, any>;
 
 	channel?: { _id: string };
+
+	usersWaitingForE2EKeys?: { userId: IUser['_id']; ts: Date }[];
 }
 
 export const isRoomWithJoinCode = (room: Partial<IRoom>): room is IRoomWithJoinCode =>
diff --git a/packages/i18n/src/locales/en.i18n.json b/packages/i18n/src/locales/en.i18n.json
index 9f11703f2746..46b91babb6fd 100644
--- a/packages/i18n/src/locales/en.i18n.json
+++ b/packages/i18n/src/locales/en.i18n.json
@@ -1803,9 +1803,9 @@
   "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 login again, Rocket.Chat will generate a new key and restore your access to any encrypted room that has one or more members online. Due to the nature of the E2E encryption, Rocket.Chat will not be able to restore access to any encrypted room that has no member online.",
-  "E2E_Reset_Key_Explanation": "This option will remove your current E2E key and log you out. <BR/>When you login again, Rocket.Chat will generate you a new key and restore your access to any encrypted room that has one or more members online.<BR/>Due to the nature of the E2E encryption, Rocket.Chat will not be able to restore access to any encrypted room that has no member online.",
-  "E2E_Reset_Other_Key_Warning": "Reset the current E2E key will log out the user. When the user login again, Rocket.Chat will generate a new key and restore the user access to any encrypted room that has one or more members online. Due to the nature of the E2E encryption, Rocket.Chat will not be able to restore access to any encrypted room that has no member online.",
+  "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",
diff --git a/packages/model-typings/src/models/IRoomsModel.ts b/packages/model-typings/src/models/IRoomsModel.ts
index 9bc4fc35a9dc..887f51987ae6 100644
--- a/packages/model-typings/src/models/IRoomsModel.ts
+++ b/packages/model-typings/src/models/IRoomsModel.ts
@@ -278,4 +278,8 @@ export interface IRoomsModel extends IBaseModel<IRoom> {
 	removeDirectRoomContainingUsername(username: string): Promise<DeleteResult>;
 	countDiscussions(): Promise<number>;
 	setOTRForDMByRoomID(rid: string): Promise<UpdateResult>;
+	addUserIdToE2EEQueueByRoomIds(roomIds: IRoom['_id'][], uid: IUser['_id']): Promise<Document | UpdateResult>;
+	getSubscribedRoomIdsWithoutE2EKeys(uid: IUser['_id']): Promise<IRoom['_id'][]>;
+	removeUsersFromE2EEQueueByRoomId(roomId: IRoom['_id'], uids: IUser['_id'][]): Promise<Document | UpdateResult>;
+	removeUserFromE2EEQueue(uid: IUser['_id']): Promise<Document | UpdateResult>;
 }
diff --git a/packages/model-typings/src/models/ISubscriptionsModel.ts b/packages/model-typings/src/models/ISubscriptionsModel.ts
index aa972a846182..91398e77ebe4 100644
--- a/packages/model-typings/src/models/ISubscriptionsModel.ts
+++ b/packages/model-typings/src/models/ISubscriptionsModel.ts
@@ -9,6 +9,7 @@ import type {
 	Filter,
 	InsertOneResult,
 	InsertManyResult,
+	AggregationCursor,
 } from 'mongodb';
 
 import type { IBaseModel } from './IBaseModel';
@@ -96,7 +97,7 @@ export interface ISubscriptionsModel extends IBaseModel<ISubscription> {
 
 	setGroupE2EKey(_id: string, key: string): Promise<ISubscription | null>;
 
-	setGroupE2ESuggestedKey(_id: string, key: string): Promise<UpdateResult | Document>;
+	setGroupE2ESuggestedKey(uid: string, rid: string, key: string): Promise<UpdateResult>;
 
 	unsetGroupE2ESuggestedKey(_id: string): Promise<UpdateResult | Document>;
 
@@ -128,6 +129,11 @@ export interface ISubscriptionsModel extends IBaseModel<ISubscription> {
 	getAutoTranslateLanguagesByRoomAndNotUser(rid: string, userId: string): Promise<(string | undefined)[]>;
 
 	findByRidWithoutE2EKey(rid: string, options: FindOptions<ISubscription>): FindCursor<ISubscription>;
+	findUsersWithPublicE2EKeyByRids(
+		rids: IRoom['_id'][],
+		excludeUserId: IUser['_id'],
+		usersLimit?: number,
+	): AggregationCursor<{ rid: IRoom['_id']; users: { _id: IUser['_id']; public_key: string }[] }>;
 	findByUserId(userId: string, options?: FindOptions<ISubscription>): FindCursor<ISubscription>;
 	cachedFindByUserId(userId: string, options?: FindOptions<ISubscription>): FindCursor<ISubscription>;
 	updateAutoTranslateById(_id: string, autoTranslate: boolean): Promise<UpdateResult>;
diff --git a/packages/rest-typings/src/index.ts b/packages/rest-typings/src/index.ts
index 044282784cdf..1850fc5e2b58 100644
--- a/packages/rest-typings/src/index.ts
+++ b/packages/rest-typings/src/index.ts
@@ -258,6 +258,7 @@ export * from './v1/e2e/e2eGetUsersOfRoomWithoutKeyParamsGET';
 export * from './v1/e2e/e2eSetRoomKeyIDParamsPOST';
 export * from './v1/e2e/e2eSetUserPublicAndPrivateKeysParamsPOST';
 export * from './v1/e2e/e2eUpdateGroupKeyParamsPOST';
+export * from './v1/e2e';
 export * from './v1/import';
 export * from './v1/voip';
 export * from './v1/email-inbox';
diff --git a/packages/rest-typings/src/v1/e2e.ts b/packages/rest-typings/src/v1/e2e.ts
index 07e9d0379d6a..1974445eb348 100644
--- a/packages/rest-typings/src/v1/e2e.ts
+++ b/packages/rest-typings/src/v1/e2e.ts
@@ -1,4 +1,4 @@
-import type { IUser } from '@rocket.chat/core-typings';
+import type { IRoom, IUser } from '@rocket.chat/core-typings';
 import Ajv from 'ajv';
 
 const ajv = new Ajv({
@@ -88,6 +88,55 @@ const E2eSetRoomKeyIdSchema = {
 
 export const isE2eSetRoomKeyIdProps = ajv.compile<E2eSetRoomKeyIdProps>(E2eSetRoomKeyIdSchema);
 
+type E2EProvideUsersGroupKeyProps = {
+	usersSuggestedGroupKeys: Record<IRoom['_id'], { _id: IUser['_id']; key: string }[]>;
+};
+
+const E2EProvideUsersGroupKeySchema = {
+	type: 'object',
+	properties: {
+		usersSuggestedGroupKeys: {
+			type: 'object',
+			additionalProperties: {
+				type: 'array',
+				items: {
+					type: 'object',
+					properties: {
+						_id: { type: 'string' },
+						key: { type: 'string' },
+					},
+					required: ['_id', 'key'],
+					additionalProperties: false,
+				},
+			},
+		},
+	},
+	required: ['usersSuggestedGroupKeys'],
+	additionalProperties: false,
+};
+
+export const isE2EProvideUsersGroupKeyProps = ajv.compile<E2EProvideUsersGroupKeyProps>(E2EProvideUsersGroupKeySchema);
+
+type E2EFetchUsersWaitingForGroupKeyProps = { roomIds: string[] };
+
+const E2EFetchUsersWaitingForGroupKeySchema = {
+	type: 'object',
+	properties: {
+		roomIds: {
+			type: 'array',
+			items: {
+				type: 'string',
+			},
+		},
+	},
+	required: ['roomIds'],
+	additionalProperties: false,
+};
+
+export const isE2EFetchUsersWaitingForGroupKeyProps = ajv.compile<E2EFetchUsersWaitingForGroupKeyProps>(
+	E2EFetchUsersWaitingForGroupKeySchema,
+);
+
 export type E2eEndpoints = {
 	'/v1/e2e.setUserPublicAndPrivateKeys': {
 		POST: (params: E2eSetUserPublicAndPrivateKeysProps) => void;
@@ -112,4 +161,12 @@ export type E2eEndpoints = {
 	'/v1/e2e.fetchMyKeys': {
 		GET: () => { public_key: string; private_key: string };
 	};
+	'/v1/e2e.fetchUsersWaitingForGroupKey': {
+		GET: (params: E2EFetchUsersWaitingForGroupKeyProps) => {
+			usersWaitingForE2EKeys: Record<IRoom['_id'], { _id: IUser['_id']; public_key: string }[]>;
+		};
+	};
+	'/v1/e2e.provideUsersSuggestedGroupKeys': {
+		POST: (params: E2EProvideUsersGroupKeyProps) => void;
+	};
 };

From 1827e950fb5e50539f1b7a04f937016828db3188 Mon Sep 17 00:00:00 2001
From: Guilherme Gazzo <guilhermegazzo@gmail.com>
Date: Sat, 22 Jun 2024 17:56:07 -0300
Subject: [PATCH 72/94] chore: report flaky tests to jira (#32593)

---
 .github/workflows/ci-test-e2e.yml |   7 ++
 .github/workflows/ci.yml          |   3 +
 apps/meteor/playwright.config.ts  |  15 +++
 apps/meteor/reporters/jira.ts     | 186 ++++++++++++++++++++++++++++++
 4 files changed, 211 insertions(+)
 create mode 100644 apps/meteor/reporters/jira.ts

diff --git a/.github/workflows/ci-test-e2e.yml b/.github/workflows/ci-test-e2e.yml
index b46c124d149b..920aea0aa308 100644
--- a/.github/workflows/ci-test-e2e.yml
+++ b/.github/workflows/ci-test-e2e.yml
@@ -67,6 +67,8 @@ on:
         required: false
       CODECOV_TOKEN:
         required: false
+      REPORTER_JIRA_ROCKETCHAT_API_KEY:
+        required: false
 
 env:
   MONGO_URL: mongodb://localhost:27017/rocketchat?replicaSet=rs0&directConnection=true
@@ -250,10 +252,15 @@ jobs:
           IS_EE: ${{ inputs.release == 'ee' && 'true' || '' }}
           REPORTER_ROCKETCHAT_API_KEY: ${{ secrets.REPORTER_ROCKETCHAT_API_KEY }}
           REPORTER_ROCKETCHAT_URL: ${{ secrets.REPORTER_ROCKETCHAT_URL }}
+          REPORTER_JIRA_ROCKETCHAT_API_KEY: ${{ secrets.REPORTER_JIRA_ROCKETCHAT_API_KEY }}
           REPORTER_ROCKETCHAT_REPORT: ${{ github.event.pull_request.draft != 'true' && 'true' || '' }}
           REPORTER_ROCKETCHAT_RUN: ${{ github.run_number }}
           REPORTER_ROCKETCHAT_BRANCH: ${{ github.ref }}
           REPORTER_ROCKETCHAT_DRAFT: ${{ github.event.pull_request.draft }}
+          REPORTER_ROCKETCHAT_HEAD_SHA: ${{ github.event.pull_request.head.sha }}
+          REPORTER_ROCKETCHAT_AUTHOR: ${{ github.event.pull_request.user.login }}
+          REPORTER_ROCKETCHAT_RUN_URL: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}
+          REPORTER_ROCKETCHAT_PR: ${{ github.event.pull_request.number }}
           QASE_API_TOKEN: ${{ secrets.QASE_API_TOKEN }}
           QASE_REPORT: ${{ github.ref == 'refs/heads/develop' && 'true' || '' }}
           CI: true
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index b9aa8f616857..ce18d17b8b80 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -349,6 +349,7 @@ jobs:
       QASE_API_TOKEN: ${{ secrets.QASE_API_TOKEN }}
       REPORTER_ROCKETCHAT_API_KEY: ${{ secrets.REPORTER_ROCKETCHAT_API_KEY }}
       REPORTER_ROCKETCHAT_URL: ${{ secrets.REPORTER_ROCKETCHAT_URL }}
+      REPORTER_JIRA_ROCKETCHAT_API_KEY: ${{ secrets.REPORTER_JIRA_ROCKETCHAT_API_KEY }}
 
   test-api-ee:
     name: 🔨 Test API (EE)
@@ -400,6 +401,7 @@ jobs:
       REPORTER_ROCKETCHAT_API_KEY: ${{ secrets.REPORTER_ROCKETCHAT_API_KEY }}
       REPORTER_ROCKETCHAT_URL: ${{ secrets.REPORTER_ROCKETCHAT_URL }}
       CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
+      REPORTER_JIRA_ROCKETCHAT_API_KEY: ${{ secrets.REPORTER_JIRA_ROCKETCHAT_API_KEY }}
 
   test-ui-ee-no-watcher:
     name: 🔨 Test UI (EE)
@@ -430,6 +432,7 @@ jobs:
       REPORTER_ROCKETCHAT_API_KEY: ${{ secrets.REPORTER_ROCKETCHAT_API_KEY }}
       REPORTER_ROCKETCHAT_URL: ${{ secrets.REPORTER_ROCKETCHAT_URL }}
       CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
+      REPORTER_JIRA_ROCKETCHAT_API_KEY: ${{ secrets.REPORTER_JIRA_ROCKETCHAT_API_KEY }}
 
   tests-done:
     name: ✅ Tests Done
diff --git a/apps/meteor/playwright.config.ts b/apps/meteor/playwright.config.ts
index d40592b8f71f..822f78e28741 100644
--- a/apps/meteor/playwright.config.ts
+++ b/apps/meteor/playwright.config.ts
@@ -30,6 +30,21 @@ export default {
 				branch: process.env.REPORTER_ROCKETCHAT_BRANCH,
 				run: Number(process.env.REPORTER_ROCKETCHAT_RUN),
 				draft: process.env.REPORTER_ROCKETCHAT_DRAFT === 'true',
+				headSha: process.env.REPORTER_ROCKETCHAT_HEAD_SHA,
+			},
+		],
+		process.env.REPORTER_ROCKETCHAT_REPORT === 'true' && [
+			'./reporters/jira.ts',
+			{
+				url: `https://rocketchat.atlassian.net`,
+				apiKey: process.env.REPORTER_JIRA_ROCKETCHAT_API_KEY ?? process.env.JIRA_TOKEN,
+				branch: process.env.REPORTER_ROCKETCHAT_BRANCH,
+				run: Number(process.env.REPORTER_ROCKETCHAT_RUN),
+				headSha: process.env.REPORTER_ROCKETCHAT_HEAD_SHA,
+				author: process.env.REPORTER_ROCKETCHAT_AUTHOR,
+				run_url: process.env.REPORTER_ROCKETCHAT_RUN_URL,
+				pr: Number(process.env.REPORTER_ROCKETCHAT_PR),
+				draft: process.env.REPORTER_ROCKETCHAT_DRAFT === 'true',
 			},
 		],
 		[
diff --git a/apps/meteor/reporters/jira.ts b/apps/meteor/reporters/jira.ts
new file mode 100644
index 000000000000..706856389003
--- /dev/null
+++ b/apps/meteor/reporters/jira.ts
@@ -0,0 +1,186 @@
+import type { Reporter, TestCase, TestResult } from '@playwright/test/reporter';
+import fetch from 'node-fetch';
+
+class JIRAReporter implements Reporter {
+	private url: string;
+
+	private apiKey: string;
+
+	private branch: string;
+
+	private draft: boolean;
+
+	private run: number;
+
+	private headSha: string;
+
+	private author: string;
+
+	private run_url: string;
+
+	private pr: number;
+
+	constructor(options: {
+		url: string;
+		apiKey: string;
+		branch: string;
+		draft: boolean;
+		run: number;
+		headSha: string;
+		author: string;
+		run_url: string;
+		pr: number;
+	}) {
+		this.url = options.url;
+		this.apiKey = options.apiKey;
+		this.branch = options.branch;
+		this.draft = options.draft;
+		this.run = options.run;
+		this.headSha = options.headSha;
+		this.author = options.author;
+		this.run_url = options.run_url;
+		this.pr = options.pr;
+	}
+
+	async onTestEnd(test: TestCase, result: TestResult) {
+		if (process.env.REPORTER_ROCKETCHAT_REPORT !== 'true') {
+			return;
+		}
+
+		if (this.draft === true) {
+			return;
+		}
+
+		if (result.status === 'passed' || result.status === 'skipped') {
+			return;
+		}
+
+		const payload = {
+			name: test.title,
+			status: result.status,
+			duration: result.duration,
+			branch: this.branch,
+			draft: this.draft,
+			run: this.run,
+			headSha: this.headSha,
+		};
+
+		console.log(`Sending test result to JIRA: ${JSON.stringify(payload)}`);
+
+		// first search and check if there is an existing issue
+
+		const search = await fetch(
+			`${this.url}/rest/api/2/search?${new URLSearchParams({
+				jql: `project = FLAKY AND summary ~ '${payload.name}'`,
+			})}`,
+			{
+				method: 'GET',
+				headers: {
+					'Content-Type': 'application/json',
+					'Authorization': `Basic ${this.apiKey}`,
+				},
+			},
+		);
+
+		if (!search.ok) {
+			throw new Error(
+				`JIRA: Failed to search for existing issue: ${search.statusText}.` +
+					`${this.url}/rest/api/2/search${new URLSearchParams({
+						jql: `project = FLAKY AND summary ~ '${payload.name}'`,
+					})}`,
+			);
+		}
+
+		const { issues } = await search.json();
+
+		const existing = issues.find(
+			(issue: {
+				fields: {
+					summary: string;
+				};
+			}) => issue.fields.summary === payload.name,
+		);
+
+		if (existing) {
+			const { location } = test;
+
+			await fetch(`${this.url}/rest/api/2/issue/${existing.key}/comment`, {
+				method: 'POST',
+				body: JSON.stringify({
+					body: `Test run ${payload.run} failed
+author: ${this.author}
+PR: ${this.pr}
+https://github.com/RocketChat/Rocket.Chat/blob/${payload.headSha}/${location.file.replace(
+						'/home/runner/work/Rocket.Chat/Rocket.Chat',
+						'',
+					)}#L${location.line}:${location.column}
+${this.run_url}
+`,
+				}),
+				headers: {
+					'Content-Type': 'application/json',
+					'Authorization': `Basic ${this.apiKey}`,
+				},
+			});
+			return;
+		}
+
+		const data: {
+			fields: {
+				summary: string;
+				description: string;
+				issuetype: {
+					name: string;
+				};
+				project: {
+					key: string;
+				};
+			};
+		} = {
+			fields: {
+				summary: payload.name,
+				description: '',
+				issuetype: {
+					name: 'Tech Debt',
+				},
+				project: {
+					key: 'FLAKY',
+				},
+			},
+		};
+
+		const responseIssue = await fetch(`${this.url}/rest/api/2/issue`, {
+			method: 'POST',
+			body: JSON.stringify(data),
+			headers: {
+				'Content-Type': 'application/json',
+				'Authorization': `Basic ${this.apiKey}`,
+			},
+		});
+
+		const issue = (await responseIssue.json()).key;
+
+		const { location } = test;
+
+		await fetch(`${this.url}/rest/api/2/issue/${issue}/comment`, {
+			method: 'POST',
+			body: JSON.stringify({
+				body: `Test run ${payload.run} failed
+author: ${this.author}
+PR: ${this.pr}
+https://github.com/RocketChat/Rocket.Chat/blob/${payload.headSha}/${location.file.replace(
+					'/home/runner/work/Rocket.Chat/Rocket.Chat',
+					'',
+				)}#L${location.line}:${location.column},
+${this.run_url}
+`,
+			}),
+			headers: {
+				'Content-Type': 'application/json',
+				'Authorization': `Basic ${this.apiKey}`,
+			},
+		});
+	}
+}
+
+export default JIRAReporter;

From 1aa025d5fc757c14213bdf22c3b509b7c3c87d1c Mon Sep 17 00:00:00 2001
From: Guilherme Gazzo <guilhermegazzo@gmail.com>
Date: Mon, 8 Apr 2024 19:27:10 -0300
Subject: [PATCH 73/94] chore: bump 7.0.0

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

diff --git a/apps/meteor/app/utils/rocketchat.info b/apps/meteor/app/utils/rocketchat.info
index b10a632463e7..34642c087e2e 100644
--- a/apps/meteor/app/utils/rocketchat.info
+++ b/apps/meteor/app/utils/rocketchat.info
@@ -1,3 +1,3 @@
 {
-	"version": "6.10.0-develop"
+	"version": "7.0.0-develop"
 }
diff --git a/apps/meteor/package.json b/apps/meteor/package.json
index 8f44665c204b..fff0c403114c 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.10.0-develop",
+	"version": "7.0.0-develop",
 	"private": true,
 	"author": {
 		"name": "Rocket.Chat",
diff --git a/package.json b/package.json
index c77da78c94be..5625e622ceb2 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "rocket.chat",
-	"version": "6.10.0-develop",
+	"version": "7.0.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 b9b259a1b78e..23eedabc08b3 100644
--- a/packages/core-typings/package.json
+++ b/packages/core-typings/package.json
@@ -1,7 +1,8 @@
 {
 	"$schema": "https://json.schemastore.org/package",
 	"name": "@rocket.chat/core-typings",
-	"version": "6.10.0-develop",
+	"private": true,
+	"version": "7.0.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 91ec61eb40e7..413fffbbd2c4 100644
--- a/packages/rest-typings/package.json
+++ b/packages/rest-typings/package.json
@@ -1,6 +1,7 @@
 {
 	"name": "@rocket.chat/rest-typings",
-	"version": "6.10.0-develop",
+	"private": true,
+	"version": "7.0.0-develop",
 	"devDependencies": {
 		"@rocket.chat/eslint-config": "workspace:^",
 		"@types/jest": "~29.5.7",

From 29b15edcbe9995a00d47a8ae06ae8023c70d0a18 Mon Sep 17 00:00:00 2001
From: Guilherme Gazzo <guilhermegazzo@gmail.com>
Date: Tue, 9 Apr 2024 13:47:21 -0300
Subject: [PATCH 74/94] fix!: api login should not suggest which credential is
 wrong (#32159)

---
 .changeset/fuzzy-cherries-buy.md                 |  7 +++++++
 .../lib/server/lib/loginErrorMessageOverride.js  | 14 --------------
 .../lib/server/lib/loginErrorMessageOverride.ts  | 16 ++++++++++++++++
 .../client/meteorOverrides/login/google.ts       | 10 ----------
 .../externals/meteor/accounts-base.d.ts          | 10 +++++++++-
 .../end-to-end/api/31-failed-login-attempts.ts   |  2 +-
 6 files changed, 33 insertions(+), 26 deletions(-)
 create mode 100644 .changeset/fuzzy-cherries-buy.md
 delete mode 100644 apps/meteor/app/lib/server/lib/loginErrorMessageOverride.js
 create mode 100644 apps/meteor/app/lib/server/lib/loginErrorMessageOverride.ts

diff --git a/.changeset/fuzzy-cherries-buy.md b/.changeset/fuzzy-cherries-buy.md
new file mode 100644
index 000000000000..e185a148c917
--- /dev/null
+++ b/.changeset/fuzzy-cherries-buy.md
@@ -0,0 +1,7 @@
+---
+"@rocket.chat/meteor": major
+---
+
+Api login should not suggest which credential is wrong (password/username)
+
+Failed login attemps will always return `Unauthorized` instead of the internal fail reason
diff --git a/apps/meteor/app/lib/server/lib/loginErrorMessageOverride.js b/apps/meteor/app/lib/server/lib/loginErrorMessageOverride.js
deleted file mode 100644
index 4e054b81b2cf..000000000000
--- a/apps/meteor/app/lib/server/lib/loginErrorMessageOverride.js
+++ /dev/null
@@ -1,14 +0,0 @@
-// Do not disclose if user exists when password is invalid
-import { Accounts } from 'meteor/accounts-base';
-import { Meteor } from 'meteor/meteor';
-
-const { _runLoginHandlers } = Accounts;
-Accounts._runLoginHandlers = function (methodInvocation, options) {
-	const result = _runLoginHandlers.call(Accounts, methodInvocation, options);
-
-	if (result.error && result.error.reason === 'Incorrect password') {
-		result.error = new Meteor.Error(403, 'User not found');
-	}
-
-	return result;
-};
diff --git a/apps/meteor/app/lib/server/lib/loginErrorMessageOverride.ts b/apps/meteor/app/lib/server/lib/loginErrorMessageOverride.ts
new file mode 100644
index 000000000000..e2a6e0d10581
--- /dev/null
+++ b/apps/meteor/app/lib/server/lib/loginErrorMessageOverride.ts
@@ -0,0 +1,16 @@
+// Do not disclose if user exists when password is invalid
+import { Accounts } from 'meteor/accounts-base';
+import { Meteor } from 'meteor/meteor';
+
+const { _runLoginHandlers } = Accounts;
+
+Accounts._options.ambiguousErrorMessages = true;
+Accounts._runLoginHandlers = async function (methodInvocation, options) {
+	const result = await _runLoginHandlers.call(Accounts, methodInvocation, options);
+
+	if (result.error instanceof Meteor.Error) {
+		result.error = new Meteor.Error(401, 'User not found');
+	}
+
+	return result;
+};
diff --git a/apps/meteor/client/meteorOverrides/login/google.ts b/apps/meteor/client/meteorOverrides/login/google.ts
index 2742cade15d2..4e99ac3a281b 100644
--- a/apps/meteor/client/meteorOverrides/login/google.ts
+++ b/apps/meteor/client/meteorOverrides/login/google.ts
@@ -8,16 +8,6 @@ import { overrideLoginMethod, type LoginCallback } from '../../lib/2fa/overrideL
 import { wrapRequestCredentialFn } from '../../lib/wrapRequestCredentialFn';
 import { createOAuthTotpLoginMethod } from './oauth';
 
-declare module 'meteor/accounts-base' {
-	// eslint-disable-next-line @typescript-eslint/no-namespace
-	namespace Accounts {
-		export const _options: {
-			restrictCreationByEmailDomain?: string | (() => string);
-			forbidClientAccountCreation?: boolean | undefined;
-		};
-	}
-}
-
 declare module 'meteor/meteor' {
 	// eslint-disable-next-line @typescript-eslint/no-namespace
 	namespace Meteor {
diff --git a/apps/meteor/definition/externals/meteor/accounts-base.d.ts b/apps/meteor/definition/externals/meteor/accounts-base.d.ts
index 3f0b148120e7..f51c2f383987 100644
--- a/apps/meteor/definition/externals/meteor/accounts-base.d.ts
+++ b/apps/meteor/definition/externals/meteor/accounts-base.d.ts
@@ -22,7 +22,7 @@ declare module 'meteor/accounts-base' {
 
 		function _insertLoginToken(userId: string, token: { token: string; when: Date }): void;
 
-		function _runLoginHandlers<T>(methodInvocation: T, loginRequest: Record<string, any>): LoginMethodResult | undefined;
+		function _runLoginHandlers<T>(methodInvocation: T, loginRequest: Record<string, any>): Promise<LoginMethodResult>;
 
 		function registerLoginHandler(name: string, handler: (options: any) => undefined | object): void;
 
@@ -54,6 +54,14 @@ declare module 'meteor/accounts-base' {
 
 		const _accountData: Record<string, any>;
 
+		interface AccountsServerOptions {
+			ambiguousErrorMessages?: boolean;
+			restrictCreationByEmailDomain?: string | (() => string);
+			forbidClientAccountCreation?: boolean | undefined;
+		}
+
+		export const _options: AccountsServerOptions;
+
 		// eslint-disable-next-line @typescript-eslint/no-namespace
 		namespace oauth {
 			function credentialRequestCompleteHandler(
diff --git a/apps/meteor/tests/end-to-end/api/31-failed-login-attempts.ts b/apps/meteor/tests/end-to-end/api/31-failed-login-attempts.ts
index 7e1019b60ecb..906b19d0a931 100644
--- a/apps/meteor/tests/end-to-end/api/31-failed-login-attempts.ts
+++ b/apps/meteor/tests/end-to-end/api/31-failed-login-attempts.ts
@@ -54,7 +54,7 @@ describe('[Failed Login Attempts]', function () {
 			.expect(401)
 			.expect((res) => {
 				expect(res.body).to.have.property('status', 'error');
-				expect(res.body).to.have.property('message', 'Incorrect password');
+				expect(res.body).to.have.property('message', 'Unauthorized');
 			});
 	}
 

From b2b2286ee88082c1ea085996916542bd85cd2e14 Mon Sep 17 00:00:00 2001
From: Pierre Lehnen <55164754+pierre-lehnen-rc@users.noreply.github.com>
Date: Thu, 11 Apr 2024 12:00:50 -0300
Subject: [PATCH 75/94] chore!: remove hipchat importer (#32154)

---
 .changeset/quiet-kings-rhyme.md               |   5 +
 FEATURES.md                                   |   1 -
 .../server/HipChatEnterpriseImporter.js       | 348 ------------------
 .../server/index.ts                           |   8 -
 .../server/classes/ImportDataConverter.ts     |   7 -
 .../server/classes/VirtualDataConverter.ts    |  10 -
 apps/meteor/package.json                      |   1 -
 apps/meteor/server/importPackages.ts          |   1 -
 apps/meteor/server/models/raw/ImportData.ts   |  13 +-
 packages/i18n/src/locales/af.i18n.json        |   2 -
 packages/i18n/src/locales/ar.i18n.json        |   2 -
 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        |   2 -
 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-IN.i18n.json     |   2 -
 packages/i18n/src/locales/de.i18n.json        |   2 -
 packages/i18n/src/locales/el.i18n.json        |   2 -
 packages/i18n/src/locales/en.i18n.json        |   3 -
 packages/i18n/src/locales/eo.i18n.json        |   2 -
 packages/i18n/src/locales/es.i18n.json        |   2 -
 packages/i18n/src/locales/fa.i18n.json        |   2 -
 packages/i18n/src/locales/fi.i18n.json        |   2 -
 packages/i18n/src/locales/fr.i18n.json        |   2 -
 packages/i18n/src/locales/hr.i18n.json        |   2 -
 packages/i18n/src/locales/hu.i18n.json        |   2 -
 packages/i18n/src/locales/id.i18n.json        |   2 -
 packages/i18n/src/locales/it.i18n.json        |   2 -
 packages/i18n/src/locales/ja.i18n.json        |   2 -
 packages/i18n/src/locales/ka-GE.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/no.i18n.json        |   2 -
 packages/i18n/src/locales/pl.i18n.json        |   2 -
 packages/i18n/src/locales/pt-BR.i18n.json     |   2 -
 packages/i18n/src/locales/pt.i18n.json        |   2 -
 packages/i18n/src/locales/ro.i18n.json        |   2 -
 packages/i18n/src/locales/ru.i18n.json        |   2 -
 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        |   2 -
 packages/i18n/src/locales/ta-IN.i18n.json     |   2 -
 packages/i18n/src/locales/th-TH.i18n.json     |   2 -
 packages/i18n/src/locales/tr.i18n.json        |   2 -
 packages/i18n/src/locales/uk.i18n.json        |   2 -
 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 -
 .../src/models/IImportDataModel.ts            |   1 -
 yarn.lock                                     |   3 +-
 65 files changed, 7 insertions(+), 500 deletions(-)
 create mode 100644 .changeset/quiet-kings-rhyme.md
 delete mode 100644 apps/meteor/app/importer-hipchat-enterprise/server/HipChatEnterpriseImporter.js
 delete mode 100644 apps/meteor/app/importer-hipchat-enterprise/server/index.ts

diff --git a/.changeset/quiet-kings-rhyme.md b/.changeset/quiet-kings-rhyme.md
new file mode 100644
index 000000000000..0fd7fda7ea66
--- /dev/null
+++ b/.changeset/quiet-kings-rhyme.md
@@ -0,0 +1,5 @@
+---
+'@rocket.chat/meteor': major
+---
+
+Removed the ability to import data in the HipChat Enterprise format, as it was discontinued over five years ago.
diff --git a/FEATURES.md b/FEATURES.md
index 5601cc0c7ccc..67848389b593 100644
--- a/FEATURES.md
+++ b/FEATURES.md
@@ -33,7 +33,6 @@
   - Incoming / Outgoing Webhooks
   - Data Importer
     - Import from Slack
-    - Import from Hipchat
   - Slack Bridge
 - Profiles
   - Custom avatars
diff --git a/apps/meteor/app/importer-hipchat-enterprise/server/HipChatEnterpriseImporter.js b/apps/meteor/app/importer-hipchat-enterprise/server/HipChatEnterpriseImporter.js
deleted file mode 100644
index 663300e44154..000000000000
--- a/apps/meteor/app/importer-hipchat-enterprise/server/HipChatEnterpriseImporter.js
+++ /dev/null
@@ -1,348 +0,0 @@
-import fs from 'fs';
-import path from 'path';
-import { Readable } from 'stream';
-
-import { Settings } from '@rocket.chat/models';
-import { Meteor } from 'meteor/meteor';
-
-import { Importer, ProgressStep } from '../../importer/server';
-import { notifyOnSettingChanged } from '../../lib/server/lib/notifyListener';
-
-/** @deprecated HipChat was discontinued at 2019-02-15 */
-export class HipChatEnterpriseImporter extends Importer {
-	constructor(info, importRecord, converterOptions = {}) {
-		super(info, importRecord, converterOptions);
-
-		this.Readable = Readable;
-		this.zlib = require('zlib');
-		this.tarStream = require('tar-stream');
-		this.extract = this.tarStream.extract();
-		this.path = path;
-	}
-
-	parseData(data) {
-		const dataString = data.toString();
-		try {
-			this.logger.debug('parsing file contents');
-			return JSON.parse(dataString);
-		} catch (e) {
-			this.logger.error(e);
-			return false;
-		}
-	}
-
-	async prepareUsersFile(file) {
-		await super.updateProgress(ProgressStep.PREPARING_USERS);
-		let count = 0;
-
-		for (const u of file) {
-			const newUser = {
-				emails: [],
-				importIds: [String(u.User.id)],
-				username: u.User.mention_name,
-				name: u.User.name,
-				avatarUrl: u.User.avatar && `data:image/png;base64,${u.User.avatar.replace(/\n/g, '')}`,
-				bio: u.User.title || undefined,
-				deleted: u.User.is_deleted,
-				type: 'user',
-			};
-			count++;
-
-			if (u.User.email) {
-				newUser.emails.push(u.User.email);
-			}
-
-			this.converter.addUser(newUser);
-		}
-
-		const { value } = await Settings.incrementValueById('Hipchat_Enterprise_Importer_Count', count, { returnDocument: 'after' });
-		if (value) {
-			void notifyOnSettingChanged(value);
-		}
-
-		await super.updateRecord({ 'count.users': count });
-		await super.addCountToTotal(count);
-	}
-
-	async prepareRoomsFile(file) {
-		await super.updateProgress(ProgressStep.PREPARING_CHANNELS);
-		let count = 0;
-
-		for await (const r of file) {
-			await this.converter.addChannel({
-				u: {
-					_id: r.Room.owner,
-				},
-				importIds: [String(r.Room.id)],
-				name: r.Room.name,
-				users: r.Room.members,
-				t: r.Room.privacy === 'private' ? 'p' : 'c',
-				topic: r.Room.topic,
-				ts: new Date(r.Room.created),
-				archived: r.Room.is_archived,
-			});
-
-			count++;
-		}
-
-		await super.updateRecord({ 'count.channels': count });
-		await super.addCountToTotal(count);
-	}
-
-	async prepareUserMessagesFile(file) {
-		this.logger.debug(`preparing room with ${file.length} messages `);
-		let count = 0;
-		const dmRooms = [];
-
-		for await (const m of file) {
-			if (!m.PrivateUserMessage) {
-				continue;
-			}
-
-			// If the message id is already on the list, skip it
-			if (this.preparedMessages[m.PrivateUserMessage.id] !== undefined) {
-				continue;
-			}
-			this.preparedMessages[m.PrivateUserMessage.id] = true;
-
-			const senderId = String(m.PrivateUserMessage.sender.id);
-			const receiverId = String(m.PrivateUserMessage.receiver.id);
-			const users = [senderId, receiverId].sort();
-
-			if (!dmRooms[receiverId]) {
-				dmRooms[receiverId] = await this.converter.findDMForImportedUsers(senderId, receiverId);
-
-				if (!dmRooms[receiverId]) {
-					const room = {
-						importIds: [users.join('')],
-						users,
-						t: 'd',
-						ts: new Date(m.PrivateUserMessage.timestamp.split(' ')[0]),
-					};
-					await this.converter.addChannel(room);
-					dmRooms[receiverId] = room;
-				}
-			}
-
-			const rid = dmRooms[receiverId].importIds[0];
-			const newMessage = this.convertImportedMessage(m.PrivateUserMessage, rid, 'private');
-			count++;
-			await this.converter.addMessage(newMessage);
-		}
-
-		return count;
-	}
-
-	async loadTurndownService() {
-		const TurndownService = (await import('turndown')).default;
-
-		const turndownService = new TurndownService({
-			strongDelimiter: '*',
-			hr: '',
-			br: '\n',
-		});
-
-		turndownService.addRule('strikethrough', {
-			filter: 'img',
-
-			replacement(content, node) {
-				const src = node.getAttribute('src') || '';
-				const alt = node.alt || node.title || src;
-				return src ? `[${alt}](${src})` : '';
-			},
-		});
-
-		this.turndownService = turndownService;
-
-		return turndownService;
-	}
-
-	convertImportedMessage(importedMessage, rid, type) {
-		const idType = type === 'private' ? type : `${rid}-${type}`;
-		const newId = `hipchatenterprise-${idType}-${importedMessage.id}`;
-
-		const newMessage = {
-			_id: newId,
-			rid,
-			ts: new Date(importedMessage.timestamp.split(' ')[0]),
-			u: {
-				_id: String(importedMessage.sender.id),
-			},
-		};
-
-		const text = importedMessage.message;
-
-		if (importedMessage.message_format === 'html') {
-			newMessage.msg = this.turndownService.turndown(text);
-		} else if (text.startsWith('/me ')) {
-			newMessage.msg = `${text.replace(/\/me /, '_')}_`;
-		} else {
-			newMessage.msg = text;
-		}
-
-		if (importedMessage.attachment?.url) {
-			const fileId = `${importedMessage.id}-${importedMessage.attachment.name || 'attachment'}`;
-
-			newMessage._importFile = {
-				downloadUrl: importedMessage.attachment.url,
-				id: `${fileId}`,
-				size: importedMessage.attachment.size || 0,
-				name: importedMessage.attachment.name,
-				external: false,
-				source: 'hipchat-enterprise',
-				original: {
-					...importedMessage.attachment,
-				},
-			};
-		}
-
-		return newMessage;
-	}
-
-	async prepareRoomMessagesFile(file, rid) {
-		this.logger.debug(`preparing room with ${file.length} messages `);
-		let count = 0;
-
-		await this.loadTurndownService();
-
-		for await (const m of file) {
-			if (m.UserMessage) {
-				const newMessage = this.convertImportedMessage(m.UserMessage, rid, 'user');
-				await this.converter.addMessage(newMessage);
-				count++;
-			} else if (m.NotificationMessage) {
-				const newMessage = this.convertImportedMessage(m.NotificationMessage, rid, 'notif');
-				newMessage.u._id = 'rocket.cat';
-				newMessage.alias = m.NotificationMessage.sender;
-
-				await this.converter.addMessage(newMessage);
-				count++;
-			} else if (m.TopicRoomMessage) {
-				const newMessage = this.convertImportedMessage(m.TopicRoomMessage, rid, 'topic');
-				newMessage.t = 'room_changed_topic';
-
-				await this.converter.addMessage(newMessage);
-				count++;
-			} else if (m.ArchiveRoomMessage) {
-				this.logger.warn('Archived Room Notification was ignored.');
-			} else if (m.GuestAccessMessage) {
-				this.logger.warn('Guess Access Notification was ignored.');
-			} else {
-				this.logger.error({ msg: "HipChat Enterprise importer isn't configured to handle this message:", file: m });
-			}
-		}
-
-		return count;
-	}
-
-	async prepareMessagesFile(file, info) {
-		await super.updateProgress(ProgressStep.PREPARING_MESSAGES);
-
-		const [type, id] = info.dir.split('/');
-		const roomIdentifier = `${type}/${id}`;
-
-		await super.updateRecord({ messagesstatus: roomIdentifier });
-
-		switch (type) {
-			case 'users':
-				return this.prepareUserMessagesFile(file);
-			case 'rooms':
-				return this.prepareRoomMessagesFile(file, id);
-			default:
-				this.logger.error(`HipChat Enterprise importer isn't configured to handle "${type}" files (${info.dir}).`);
-				return 0;
-		}
-	}
-
-	async prepareFile(info, data, fileName) {
-		const file = this.parseData(data);
-		if (file === false) {
-			this.logger.error('failed to parse data');
-			return false;
-		}
-
-		switch (info.base) {
-			case 'users.json':
-				await this.prepareUsersFile(file);
-				break;
-			case 'rooms.json':
-				await this.prepareRoomsFile(file);
-				break;
-			case 'history.json':
-				return this.prepareMessagesFile(file, info);
-			case 'emoticons.json':
-			case 'metadata.json':
-				break;
-			default:
-				this.logger.error(`HipChat Enterprise importer doesn't know what to do with the file "${fileName}"`);
-				break;
-		}
-
-		return 0;
-	}
-
-	async prepareUsingLocalFile(fullFilePath) {
-		this.logger.debug('start preparing import operation');
-		await this.converter.clearImportData();
-
-		// HipChat duplicates direct messages (one for each user)
-		// This object will keep track of messages that have already been prepared so it doesn't try to do it twice
-		this.preparedMessages = {};
-		let messageCount = 0;
-
-		const promise = new Promise((resolve, reject) => {
-			this.extract.on('entry', (header, stream, next) => {
-				this.logger.debug(`new entry from import file: ${header.name}`);
-				if (!header.name.endsWith('.json')) {
-					stream.resume();
-					return next();
-				}
-
-				const info = this.path.parse(header.name);
-				let pos = 0;
-				let data = Buffer.allocUnsafe(header.size);
-
-				stream.on('data', (chunk) => {
-					data.fill(chunk, pos, pos + chunk.length);
-					pos += chunk.length;
-				});
-
-				stream.on('end', async () => {
-					this.logger.info(`Processing the file: ${header.name}`);
-					const newMessageCount = await this.prepareFile(info, data, header.name);
-
-					messageCount += newMessageCount;
-					await super.updateRecord({ 'count.messages': messageCount });
-					await super.addCountToTotal(newMessageCount);
-
-					data = undefined;
-
-					this.logger.debug('next import entry');
-					next();
-				});
-
-				stream.on('error', () => next());
-				stream.resume();
-			});
-
-			this.extract.on('error', (err) => {
-				this.logger.error({ msg: 'extract error:', err });
-				reject(new Meteor.Error('error-import-file-extract-error'));
-			});
-
-			this.extract.on('finish', resolve);
-
-			const rs = fs.createReadStream(fullFilePath);
-			const gunzip = this.zlib.createGunzip();
-
-			gunzip.on('error', (err) => {
-				this.logger.error({ msg: 'extract error:', err });
-				reject(new Meteor.Error('error-import-file-extract-error'));
-			});
-			this.logger.debug('start extracting import file');
-			rs.pipe(gunzip).pipe(this.extract);
-		});
-
-		return promise;
-	}
-}
diff --git a/apps/meteor/app/importer-hipchat-enterprise/server/index.ts b/apps/meteor/app/importer-hipchat-enterprise/server/index.ts
deleted file mode 100644
index e50a9b9c4bd3..000000000000
--- a/apps/meteor/app/importer-hipchat-enterprise/server/index.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import { Importers } from '../../importer/server';
-import { HipChatEnterpriseImporter } from './HipChatEnterpriseImporter';
-
-Importers.add({
-	key: 'hipchatenterprise',
-	name: 'HipChat (tar.gz)',
-	importer: HipChatEnterpriseImporter,
-});
diff --git a/apps/meteor/app/importer/server/classes/ImportDataConverter.ts b/apps/meteor/app/importer/server/classes/ImportDataConverter.ts
index 7b1e71eaa0f0..fa254a1af2c3 100644
--- a/apps/meteor/app/importer/server/classes/ImportDataConverter.ts
+++ b/apps/meteor/app/importer/server/classes/ImportDataConverter.ts
@@ -839,13 +839,6 @@ export class ImportDataConverter {
 		await this.updateRoomId(room._id, roomData);
 	}
 
-	public async findDMForImportedUsers(...users: Array<string>): Promise<IImportChannel | undefined> {
-		const record = await ImportData.findDMForImportedUsers(...users);
-		if (record) {
-			return record.data;
-		}
-	}
-
 	async findImportedRoomId(importId: string): Promise<string | null> {
 		if (this._roomCache.has(importId)) {
 			return this._roomCache.get(importId) as string;
diff --git a/apps/meteor/app/importer/server/classes/VirtualDataConverter.ts b/apps/meteor/app/importer/server/classes/VirtualDataConverter.ts
index ef850226be5c..8ca9f3b5894c 100644
--- a/apps/meteor/app/importer/server/classes/VirtualDataConverter.ts
+++ b/apps/meteor/app/importer/server/classes/VirtualDataConverter.ts
@@ -6,7 +6,6 @@ import type {
 	IImportRecord,
 	IImportRecordType,
 	IImportData,
-	IImportChannel,
 } from '@rocket.chat/core-typings';
 import { Random } from '@rocket.chat/random';
 
@@ -47,15 +46,6 @@ export class VirtualDataConverter extends ImportDataConverter {
 		this.clearVirtualData();
 	}
 
-	public async findDMForImportedUsers(...users: Array<string>): Promise<IImportChannel | undefined> {
-		if (!this.useVirtual) {
-			return super.findDMForImportedUsers(...users);
-		}
-
-		// The original method is only used by the hipchat importer so we probably don't need to implement this on the virtual converter.
-		return undefined;
-	}
-
 	public addUserSync(data: IImportUser, options?: Record<string, any>): void {
 		return this.addObjectSync('user', data, options);
 	}
diff --git a/apps/meteor/package.json b/apps/meteor/package.json
index fff0c403114c..cf8ecc753dac 100644
--- a/apps/meteor/package.json
+++ b/apps/meteor/package.json
@@ -426,7 +426,6 @@
 		"string-strip-html": "^7.0.3",
 		"suretype": "~2.4.1",
 		"swiper": "^9.3.2",
-		"tar-stream": "^1.6.2",
 		"textarea-caret": "^3.1.0",
 		"tinykeys": "^1.4.0",
 		"turndown": "^7.1.2",
diff --git a/apps/meteor/server/importPackages.ts b/apps/meteor/server/importPackages.ts
index 2b4e3106ed45..dfda85e52a9e 100644
--- a/apps/meteor/server/importPackages.ts
+++ b/apps/meteor/server/importPackages.ts
@@ -26,7 +26,6 @@ import '../app/google-oauth/server';
 import '../app/iframe-login/server';
 import '../app/importer/server';
 import '../app/importer-csv/server';
-import '../app/importer-hipchat-enterprise/server';
 import '../app/importer-pending-files/server';
 import '../app/importer-pending-avatars/server';
 import '../app/importer-slack/server';
diff --git a/apps/meteor/server/models/raw/ImportData.ts b/apps/meteor/server/models/raw/ImportData.ts
index e38670662a3f..19ec573fa239 100644
--- a/apps/meteor/server/models/raw/ImportData.ts
+++ b/apps/meteor/server/models/raw/ImportData.ts
@@ -6,7 +6,7 @@ import type {
 	RocketChatRecordDeleted,
 } from '@rocket.chat/core-typings';
 import type { IImportDataModel } from '@rocket.chat/model-typings';
-import type { Collection, FindCursor, Db, Filter, IndexDescription } from 'mongodb';
+import type { Collection, FindCursor, Db, IndexDescription } from 'mongodb';
 
 import { BaseRaw } from './BaseRaw';
 
@@ -102,15 +102,4 @@ export class ImportDataRaw extends BaseRaw<IImportRecord> implements IImportData
 
 		return channel?.data?.importIds?.shift();
 	}
-
-	findDMForImportedUsers(...users: Array<string>): Promise<IImportChannelRecord | null> {
-		const query: Filter<IImportRecord> = {
-			'dataType': 'channel',
-			'data.users': {
-				$all: users,
-			},
-		};
-
-		return this.findOne<IImportChannelRecord>(query);
-	}
 }
diff --git a/packages/i18n/src/locales/af.i18n.json b/packages/i18n/src/locales/af.i18n.json
index fe3a0b4cfc83..a8cb1f9b7f6f 100644
--- a/packages/i18n/src/locales/af.i18n.json
+++ b/packages/i18n/src/locales/af.i18n.json
@@ -1271,8 +1271,6 @@
   "Importer_done": "Invoer voltooi!",
   "Importer_finishing": "Voltooi die invoer.",
   "Importer_From_Description": "Invoer {{from}} data in Rocket.Chat.",
-  "Importer_HipChatEnterprise_BetaWarning": "Wees asseblief bewus daarvan dat hierdie invoer nog steeds 'n werk aan die gang is, meld asseblief enige foute wat in GitHub voorkom:",
-  "Importer_HipChatEnterprise_Information": "Die opgelaaide lêer moet 'n gedecodeerde tar.gz wees, lees asseblief die dokumentasie vir verdere inligting:",
   "Importer_import_cancelled": "Invoer gekanselleer.",
   "Importer_import_failed": "'N Fout het voorgekom terwyl die invoer uitgevoer word.",
   "Importer_importing_channels": "Die kanale invoer.",
diff --git a/packages/i18n/src/locales/ar.i18n.json b/packages/i18n/src/locales/ar.i18n.json
index a043c30c2856..bbddfeb5ab83 100644
--- a/packages/i18n/src/locales/ar.i18n.json
+++ b/packages/i18n/src/locales/ar.i18n.json
@@ -2143,8 +2143,6 @@
   "Importer_finishing": "يتم إنهاء الاستيراد.",
   "Importer_From_Description": "استيراد بيانات {{from}} إلى Rocket.Chat.",
   "Importer_From_Description_CSV": "استيراد بيانات CSV إلى Rocket.Chat. يجب أن يكون الملف الذي تم رفعه بتنسيق ZIP.",
-  "Importer_HipChatEnterprise_BetaWarning": "يرجى العلم أن هذا الاستيراد لا يزال قيد التقدم، يُرجى الإبلاغ عن أي أخطاء تحدث في GitHub:",
-  "Importer_HipChatEnterprise_Information": "يجب أن يكون الملف الذي تم تحميله بتنسيق tar.gz غير مشفر، تُرجى قراءة الوثائق للحصول على مزيد من المعلومات:",
   "Importer_import_cancelled": "تم إلغاء الاستيراد.",
   "Importer_import_failed": "حدث خطأ أثناء تشغيل الاستيراد.",
   "Importer_importing_channels": "يتم استيراد القنوات.",
diff --git a/packages/i18n/src/locales/az.i18n.json b/packages/i18n/src/locales/az.i18n.json
index 75d6b68ecff1..6380c1df5767 100644
--- a/packages/i18n/src/locales/az.i18n.json
+++ b/packages/i18n/src/locales/az.i18n.json
@@ -1271,8 +1271,6 @@
   "Importer_done": "Tamamilə idxal!",
   "Importer_finishing": "İthalatı bitirmək.",
   "Importer_From_Description": "Rocket.Chat'a {{from}} data verin.",
-  "Importer_HipChatEnterprise_BetaWarning": "Xahiş edirik, bu idxal hələ də davam edən bir iş olduğundan xəbərdar edin, GitHub'da meydana gələn hər hansı bir səhv bildirin:",
-  "Importer_HipChatEnterprise_Information": "Yüklənən fayl şifresi çözülmüş tar.gz olmalıdır, daha ətraflı məlumat üçün sənədləri oxuyun:",
   "Importer_import_cancelled": "İxrac ləğv edildi.",
   "Importer_import_failed": "İçeceğinizde çalışırken bir səhv baş verdi.",
   "Importer_importing_channels": "Kanalları idxal etmək.",
diff --git a/packages/i18n/src/locales/be-BY.i18n.json b/packages/i18n/src/locales/be-BY.i18n.json
index 11a1d1c60b52..21b458a73d1f 100644
--- a/packages/i18n/src/locales/be-BY.i18n.json
+++ b/packages/i18n/src/locales/be-BY.i18n.json
@@ -1287,8 +1287,6 @@
   "Importer_done": "Імпарт завершаны!",
   "Importer_finishing": "Завяршэнне імпарту.",
   "Importer_From_Description": "Імпартуе {{from}} дадзеныя ў Rocket.Chat.",
-  "Importer_HipChatEnterprise_BetaWarning": "Звярніце ўвагу, што гэты імпарт па-ранейшаму знаходзіцца ў стадыі распрацоўкі, просьба паведамляць пра памылкі, якія адбываюцца ў GitHub:",
-  "Importer_HipChatEnterprise_Information": "Загружаны файл павінен быць расшыфраваны tar.gz, калі ласка, прачытайце дакументацыю для атрымання дадатковай інфармацыі:",
   "Importer_import_cancelled": "Імпарт адменены.",
   "Importer_import_failed": "пры выкананні імпарту адбылася памылка.",
   "Importer_importing_channels": "Імпарт каналаў.",
diff --git a/packages/i18n/src/locales/bg.i18n.json b/packages/i18n/src/locales/bg.i18n.json
index c148b5c14b17..c9d71cc1d942 100644
--- a/packages/i18n/src/locales/bg.i18n.json
+++ b/packages/i18n/src/locales/bg.i18n.json
@@ -1269,8 +1269,6 @@
   "Importer_CSV_Information": "CSV вносителят изисква специален формат, прочетете документацията за това как да структурирате файла с цип:",
   "Importer_done": "Импортирането е завършено!",
   "Importer_finishing": "Завършване на импортирането.",
-  "Importer_HipChatEnterprise_BetaWarning": "Имайте предвид, че този внос все още е в процес на разработка, моля, отчетете всички грешки, които възникват в GitHub:",
-  "Importer_HipChatEnterprise_Information": "Каченият файл трябва да е декриптиран tar.gz, моля прочетете документацията за допълнителна информация:",
   "Importer_import_cancelled": "Импортирането бе отменено.",
   "Importer_import_failed": "Възникна грешка при изпълнение на импортирането.",
   "Importer_importing_channels": "Импортиране на каналите.",
diff --git a/packages/i18n/src/locales/bs.i18n.json b/packages/i18n/src/locales/bs.i18n.json
index c0a14e86d2b2..6073ac6d1a2f 100644
--- a/packages/i18n/src/locales/bs.i18n.json
+++ b/packages/i18n/src/locales/bs.i18n.json
@@ -1267,8 +1267,6 @@
   "Importer_done": "Uvoz dovršen!",
   "Importer_finishing": "Završavanje uvoza.",
   "Importer_From_Description": "Uvezi {{from}}  podatke u Rocket.Chat.",
-  "Importer_HipChatEnterprise_BetaWarning": "Imajte na umu da je taj uvoz još uvijek u tijeku, prijavite sve pogreške koje se pojavljuju u GitHubu:",
-  "Importer_HipChatEnterprise_Information": "Prenesena datoteka mora biti dekriptirana tar.gz, pročitajte dokumentaciju za daljnje informacije:",
   "Importer_import_cancelled": "Uvoz je otkazan.",
   "Importer_import_failed": "Došlo je do pogreške pri izvršavanju uvoza.",
   "Importer_importing_channels": "Prebacivanje kanala.",
diff --git a/packages/i18n/src/locales/ca.i18n.json b/packages/i18n/src/locales/ca.i18n.json
index 5caecf77c620..8b0e0504a4a8 100644
--- a/packages/i18n/src/locales/ca.i18n.json
+++ b/packages/i18n/src/locales/ca.i18n.json
@@ -2111,8 +2111,6 @@
   "Importer_finishing": "Finalitza la importació.",
   "Importer_From_Description": "Importa les dades de {{from}} a Rocket.Chat.",
   "Importer_From_Description_CSV": "Importa dades CSV a Rocket.Chat. El fitxer penjat ha de ser un fitxer ZIP.",
-  "Importer_HipChatEnterprise_BetaWarning": "Tingueu en compte que aquest sistema d'importació encara està en desenvolupament. Si us plau, notifiqueu-nos a GitHub els errors que es produeixin:",
-  "Importer_HipChatEnterprise_Information": "L'arxiu carregat ha de ser un tar.gz desxifrat, llegiu la documentació per obtenir més informació:",
   "Importer_import_cancelled": "Importació cancel·lada.",
   "Importer_import_failed": "S'ha produït un error durant la importació.",
   "Importer_importing_channels": "Important els canals.",
diff --git a/packages/i18n/src/locales/cs.i18n.json b/packages/i18n/src/locales/cs.i18n.json
index 040fd18936df..dcf68badc441 100644
--- a/packages/i18n/src/locales/cs.i18n.json
+++ b/packages/i18n/src/locales/cs.i18n.json
@@ -1814,8 +1814,6 @@
   "Importer_ExternalUrl_Description": "Můžete také použít adresu URL pro veřejně přístupný soubor:",
   "Importer_finishing": "Dokončuji import.",
   "Importer_From_Description": "Import dat {{from}} do Rocket.Chat.",
-  "Importer_HipChatEnterprise_BetaWarning": "Mějte prosím na paměti, že tato funkcionalita je stále ve vývoji, prosím nahlašte nám jakékoliv chyby přes github:",
-  "Importer_HipChatEnterprise_Information": "Nahraný soubor musí být nešifrovaný tar.gz, Více informací naleznete v dokumentaci:",
   "Importer_import_cancelled": "Import zrušen.",
   "Importer_import_failed": "Došlo k chybě při importu.",
   "Importer_importing_channels": "Importuji místnosti.",
diff --git a/packages/i18n/src/locales/cy.i18n.json b/packages/i18n/src/locales/cy.i18n.json
index 862bc0c9face..834a864458ff 100644
--- a/packages/i18n/src/locales/cy.i18n.json
+++ b/packages/i18n/src/locales/cy.i18n.json
@@ -1267,8 +1267,6 @@
   "Importer_done": "Mewnforio yn gyflawn!",
   "Importer_finishing": "Gorffen y mewnforio.",
   "Importer_From_Description": "Mewnforion {{from}} data i Rocket.Chat.",
-  "Importer_HipChatEnterprise_BetaWarning": "Cofiwch fod y mewnforio hwn yn dal i fod yn waith ar y gweill, rhowch wybod am unrhyw wallau sy'n digwydd yn GitHub:",
-  "Importer_HipChatEnterprise_Information": "Rhaid i'r ffeil a lwythir i fyny fod yn tar.gz dadgryptiedig, darllenwch y dogfennau i gael rhagor o wybodaeth:",
   "Importer_import_cancelled": "Canslo mewnforio.",
   "Importer_import_failed": "Digwyddodd gwall wrth redeg y mewnforio.",
   "Importer_importing_channels": "Mewnforio y sianeli.",
diff --git a/packages/i18n/src/locales/da.i18n.json b/packages/i18n/src/locales/da.i18n.json
index 55fe42056e52..b42193e2ddc3 100644
--- a/packages/i18n/src/locales/da.i18n.json
+++ b/packages/i18n/src/locales/da.i18n.json
@@ -1906,8 +1906,6 @@
   "Importer_ExternalUrl_Description": "Du kan også bruge en URL til en offentlig tilgængelig fil:",
   "Importer_finishing": "Afslutter importen.",
   "Importer_From_Description": "Importerer {{from}} data til Rocket.Chat.",
-  "Importer_HipChatEnterprise_BetaWarning": "Vær opmærksom på, at denne import stadig er under udvikling. Rapporter venligst eventuelle fejl der opstår til GitHub:",
-  "Importer_HipChatEnterprise_Information": "Den uploadede fil skal være en dekrypteret tar.gz. Du kan få mere at vide i dokumentationen:",
   "Importer_import_cancelled": "Import annulleret.",
   "Importer_import_failed": "Der opstod en fejl under udførelsen af importen.",
   "Importer_importing_channels": "Importerer kanalerne.",
diff --git a/packages/i18n/src/locales/de-AT.i18n.json b/packages/i18n/src/locales/de-AT.i18n.json
index 6d629b557af1..a7d876207a26 100644
--- a/packages/i18n/src/locales/de-AT.i18n.json
+++ b/packages/i18n/src/locales/de-AT.i18n.json
@@ -1273,8 +1273,6 @@
   "Importer_done": "Die Daten wurden erfolgreich importiert!",
   "Importer_finishing": "Import abgeschlossen.",
   "Importer_From_Description": "Importiert Daten von {{from}} nach Rocket.Chat.",
-  "Importer_HipChatEnterprise_BetaWarning": "Bitte beachten Sie, dass dieser Import noch in Arbeit ist. Bitte melden Sie alle Fehler, die in GitHub auftreten:",
-  "Importer_HipChatEnterprise_Information": "Die hochgeladene Datei muss eine entschlüsselte tar.gz sein. Bitte lesen Sie die Dokumentation für weitere Informationen:",
   "Importer_import_cancelled": "Der Import wurde abgebrochen.",
   "Importer_import_failed": "Während des Importierens ist ein Fehler aufgetreten.",
   "Importer_importing_channels": "Importiere die Kanäle.",
diff --git a/packages/i18n/src/locales/de-IN.i18n.json b/packages/i18n/src/locales/de-IN.i18n.json
index 32fee348394e..20451394f8ac 100644
--- a/packages/i18n/src/locales/de-IN.i18n.json
+++ b/packages/i18n/src/locales/de-IN.i18n.json
@@ -1463,8 +1463,6 @@
   "Importer_ExternalUrl_Description": "Du kannst eine öffentlich erreichbare URL zur Datei angeben.",
   "Importer_finishing": "Import abgeschlossen.",
   "Importer_From_Description": "Importiert Daten von {{from}} nach Rocket.Chat.",
-  "Importer_HipChatEnterprise_BetaWarning": "Bitte beachte, dass sich dieser Importer noch in der Entwicklung befindet. Bitte melde Fehler auf GitHub: ",
-  "Importer_HipChatEnterprise_Information": "Die hochgeladene Datei muss ein nicht-verschlüsseltes tar.gz sein. Bitte lies die Dokumentation für weiterführende Informationen.",
   "Importer_import_cancelled": "Der Import wurde abgebrochen.",
   "Importer_import_failed": "Während des Importierens ist ein Fehler aufgetreten.",
   "Importer_importing_channels": "Importiere die Kanäle.",
diff --git a/packages/i18n/src/locales/de.i18n.json b/packages/i18n/src/locales/de.i18n.json
index 776ec6961bd9..e263dee7f897 100644
--- a/packages/i18n/src/locales/de.i18n.json
+++ b/packages/i18n/src/locales/de.i18n.json
@@ -2384,8 +2384,6 @@
   "Importer_finishing": "Import abgeschlossen.",
   "Importer_From_Description": "Importiert Daten von {{from}} nach Rocket.Chat.",
   "Importer_From_Description_CSV": "Importiert CSV-Daten in Rocket.Chat. Die hochgeladene Fatei muss eine ZIP-Datei sein.",
-  "Importer_HipChatEnterprise_BetaWarning": "Bitte beachten Sie, dass sich dieser Importer noch in der Entwicklung befindet. Bitte berichten Sie über Fehler auf GitHub: ",
-  "Importer_HipChatEnterprise_Information": "Die hochgeladene Datei muss ein nicht verschlüsseltes tar.gz sein. Bitte lesen Sie die Dokumentation für weiterführende Informationen:",
   "Importer_import_cancelled": "Der Import wurde abgebrochen.",
   "Importer_import_failed": "Während des Importierens ist ein Fehler aufgetreten.",
   "Importer_importing_channels": "Importiere die Kanäle.",
diff --git a/packages/i18n/src/locales/el.i18n.json b/packages/i18n/src/locales/el.i18n.json
index 935ce3be7e0f..05cf60f4ae14 100644
--- a/packages/i18n/src/locales/el.i18n.json
+++ b/packages/i18n/src/locales/el.i18n.json
@@ -1278,8 +1278,6 @@
   "Importer_done": "Εισαγωγή πλήρης!",
   "Importer_finishing": "Ολοκλήρωση της εισαγωγής.",
   "Importer_From_Description": "Οι εισαγωγές {{from}} δεδομένων's σε Rocket.Chat.",
-  "Importer_HipChatEnterprise_BetaWarning": "Λάβετε υπόψη ότι αυτή η εισαγωγή εξακολουθεί να είναι εργασία σε εξέλιξη, αναφέρετε τυχόν λάθη που εμφανίζονται στο GitHub:",
-  "Importer_HipChatEnterprise_Information": "Το φορτωμένο αρχείο πρέπει να είναι αποκρυπτογραφημένο tar.gz, διαβάστε την τεκμηρίωση για περισσότερες πληροφορίες:",
   "Importer_import_cancelled": "Εισαγωγής ακυρωθεί.",
   "Importer_import_failed": "Παρουσιάστηκε σφάλμα κατά την εκτέλεση της εισαγωγής.",
   "Importer_importing_channels": "Εισάγει τα κανάλια.",
diff --git a/packages/i18n/src/locales/en.i18n.json b/packages/i18n/src/locales/en.i18n.json
index 46b91babb6fd..0a850c8964c0 100644
--- a/packages/i18n/src/locales/en.i18n.json
+++ b/packages/i18n/src/locales/en.i18n.json
@@ -2581,7 +2581,6 @@
   "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",
@@ -2647,8 +2646,6 @@
   "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.",
diff --git a/packages/i18n/src/locales/eo.i18n.json b/packages/i18n/src/locales/eo.i18n.json
index f41c951ddf48..84b4bcc88ad2 100644
--- a/packages/i18n/src/locales/eo.i18n.json
+++ b/packages/i18n/src/locales/eo.i18n.json
@@ -1271,8 +1271,6 @@
   "Importer_done": "Importante kompletan!",
   "Importer_finishing": "Finante la importadon.",
   "Importer_From_Description": "Importas {{from}}-datumojn en Rocket.Chat.",
-  "Importer_HipChatEnterprise_BetaWarning": "Bonvolu konscii, ke ĉi tiu importado ankoraŭ estas progreso, bonvolu raporti iujn erarojn, kiuj okazas en GitHub:",
-  "Importer_HipChatEnterprise_Information": "La dosiero alŝutita devas esti senĉifrita tar.gz, bonvolu legi la dokumentadon por pliaj informoj:",
   "Importer_import_cancelled": "Importi nuligita.",
   "Importer_import_failed": "Eraro okazis dum ĝi funkciis la importadon.",
   "Importer_importing_channels": "Importante la kanaloj.",
diff --git a/packages/i18n/src/locales/es.i18n.json b/packages/i18n/src/locales/es.i18n.json
index 313ee11766bf..4ac68b1d0515 100644
--- a/packages/i18n/src/locales/es.i18n.json
+++ b/packages/i18n/src/locales/es.i18n.json
@@ -2135,8 +2135,6 @@
   "Importer_finishing": "Terminando la importación.",
   "Importer_From_Description": "Importa datos de {{from}} a Rocket.Chat.",
   "Importer_From_Description_CSV": "Importa datos en formato CSV a Rocket.Chat. El archivo subido debe ser un archivo ZIP.",
-  "Importer_HipChatEnterprise_BetaWarning": "Ten en cuenta que esta importación aún se está desarrollando. Informa acerca de cualquier error que ocurra en GitHub:",
-  "Importer_HipChatEnterprise_Information": "El archivo subido debe ser un archivo tar.gz descifrado. Consulta la documentación para obtener más información:",
   "Importer_import_cancelled": "Importación cancelada.",
   "Importer_import_failed": "Se ha producido un error durante la ejecución de la importación.",
   "Importer_importing_channels": "Importando los canales.",
diff --git a/packages/i18n/src/locales/fa.i18n.json b/packages/i18n/src/locales/fa.i18n.json
index 206fec1f5461..04aacd33cd92 100644
--- a/packages/i18n/src/locales/fa.i18n.json
+++ b/packages/i18n/src/locales/fa.i18n.json
@@ -1530,8 +1530,6 @@
   "Importer_done": "وارد کردن تمام شد!",
   "Importer_finishing": "پایان دادن به وارد کردن.",
   "Importer_From_Description": "داده های {{from}} را وارد Rocket.chat می کند.",
-  "Importer_HipChatEnterprise_BetaWarning": "لطفا توجه داشته باشید که این واردات همچنان یک کار در حال انجام است، لطفا هر خطایی که در GitHub رخ می دهد گزارش دهید:",
-  "Importer_HipChatEnterprise_Information": "فایل آپلود شده باید یک tar.gz رمزگشایی شود، لطفا مستندات بیشتری برای اطلاعات بیشتر بخوانید:",
   "Importer_import_cancelled": "وارد کردن لغو شد.",
   "Importer_import_failed": "هنگام وارد کردن خطایی رخ داد.",
   "Importer_importing_channels": "وارد کردن کانال ها.",
diff --git a/packages/i18n/src/locales/fi.i18n.json b/packages/i18n/src/locales/fi.i18n.json
index 0026c5199402..fe936c2f2938 100644
--- a/packages/i18n/src/locales/fi.i18n.json
+++ b/packages/i18n/src/locales/fi.i18n.json
@@ -2426,8 +2426,6 @@
   "Importer_finishing": "Viimeistellään tuontia.",
   "Importer_From_Description": "Tuo tiedot kohteesta {{from}} Rocket.Chatiin.",
   "Importer_From_Description_CSV": "Tuo CSV-tiedot Rocket.Chatiin. Ladatun tiedoston on oltava ZIP-tiedosto.",
-  "Importer_HipChatEnterprise_BetaWarning": "Huomaa, että tuontitoiminto on edelleen kehitteillä. Ilmoita virheistä GitHubissa:",
-  "Importer_HipChatEnterprise_Information": "Ladattavan tiedoston on oltava purettu tar.gz-tiedosto. Katso lisätietoja oppaista:",
   "Importer_import_cancelled": "Tuonti peruutettu.",
   "Importer_import_failed": "Virhe tuotaessa.",
   "Importer_importing_channels": "Tuodaan kanavia.",
diff --git a/packages/i18n/src/locales/fr.i18n.json b/packages/i18n/src/locales/fr.i18n.json
index b79660384677..de7d7a369b37 100644
--- a/packages/i18n/src/locales/fr.i18n.json
+++ b/packages/i18n/src/locales/fr.i18n.json
@@ -2129,8 +2129,6 @@
   "Importer_finishing": "Finalisation de l'importation.",
   "Importer_From_Description": "Importer les données de {{from}} dans Rocket.Chat.",
   "Importer_From_Description_CSV": "Importe des données CSV dans Rocket.Chat. Le fichier chargé doit être un fichier ZIP.",
-  "Importer_HipChatEnterprise_BetaWarning": "Notez que la fonction d'importation est toujours en cours de développement, veuillez signaler toute erreur dans GitHub :",
-  "Importer_HipChatEnterprise_Information": "Le fichier chargé doit être au format tar.gz déchiffré, lisez la documentation pour plus d'informations :",
   "Importer_import_cancelled": "Importation annulée.",
   "Importer_import_failed": "Une erreur est survenue lors de l'importation.",
   "Importer_importing_channels": "Importation des canaux.",
diff --git a/packages/i18n/src/locales/hr.i18n.json b/packages/i18n/src/locales/hr.i18n.json
index 4d77095ef86c..f0d896382a5c 100644
--- a/packages/i18n/src/locales/hr.i18n.json
+++ b/packages/i18n/src/locales/hr.i18n.json
@@ -1401,8 +1401,6 @@
   "Importer_done": "Uvoz dovršen!",
   "Importer_finishing": "Završavanje uvoza.",
   "Importer_From_Description": "Uvezi {{from}}  podatke u Rocket.Chat.",
-  "Importer_HipChatEnterprise_BetaWarning": "Imajte na umu da je taj uvoz još uvijek u tijeku, prijavite sve pogreške koje se pojavljuju u GitHubu:",
-  "Importer_HipChatEnterprise_Information": "Prenesena datoteka mora biti dekriptirana tar.gz, pročitajte dokumentaciju za daljnje informacije:",
   "Importer_import_cancelled": "Uvoz je otkazan.",
   "Importer_import_failed": "Došlo je do pogreške pri izvršavanju uvoza.",
   "Importer_importing_channels": "Prebacivanje kanala.",
diff --git a/packages/i18n/src/locales/hu.i18n.json b/packages/i18n/src/locales/hu.i18n.json
index 141ab17ec3dc..959671f30498 100644
--- a/packages/i18n/src/locales/hu.i18n.json
+++ b/packages/i18n/src/locales/hu.i18n.json
@@ -2340,8 +2340,6 @@
   "Importer_finishing": "Az importálás befejezése.",
   "Importer_From_Description": "{{from}}-adatokat importál a Rocket.Chatbe.",
   "Importer_From_Description_CSV": "CSV-adatokat importál a Rocket.Chatbe. A feltöltött fájlnak ZIP-fájlnak kell lennie.",
-  "Importer_HipChatEnterprise_BetaWarning": "Felhívjuk a figyelmét, hogy ennek az importálásnak a munkálatai még folyamatban vannak, az esetleges hibákat a GitHubon jelentse:",
-  "Importer_HipChatEnterprise_Information": "A feltöltött fájlnak visszafejtett tar.gz-nek kell lennie, olvassa el a dokumentációt további információkért:",
   "Importer_import_cancelled": "Az importálás megszakítva.",
   "Importer_import_failed": "Hiba történt az importálás futása során.",
   "Importer_importing_channels": "A csatornák importálása.",
diff --git a/packages/i18n/src/locales/id.i18n.json b/packages/i18n/src/locales/id.i18n.json
index c0a9ed50b5c1..e9193758e06d 100644
--- a/packages/i18n/src/locales/id.i18n.json
+++ b/packages/i18n/src/locales/id.i18n.json
@@ -1271,8 +1271,6 @@
   "Importer_done": "Mengimpor lengkap!",
   "Importer_finishing": "Menyelesaikan impor.",
   "Importer_From_Description": "Impor {{from}} Data's menjadi Rocket.Chat.",
-  "Importer_HipChatEnterprise_BetaWarning": "Perlu diketahui bahwa impor ini masih dalam proses penyelesaian, laporkan kesalahan yang terjadi di GitHub:",
-  "Importer_HipChatEnterprise_Information": "File yang diunggah harus berupa tar.gz terdekrip, baca dokumentasi untuk informasi lebih lanjut:",
   "Importer_import_cancelled": "Impor dibatalkan.",
   "Importer_import_failed": "Terjadi kesalahan saat menjalankan impor.",
   "Importer_importing_channels": "Mengimpor saluran.",
diff --git a/packages/i18n/src/locales/it.i18n.json b/packages/i18n/src/locales/it.i18n.json
index 27231d8758de..00b1ebad87ef 100644
--- a/packages/i18n/src/locales/it.i18n.json
+++ b/packages/i18n/src/locales/it.i18n.json
@@ -1677,8 +1677,6 @@
   "Importer_done": "Importazione completata!",
   "Importer_finishing": "In fase di terminazione dell'importazione.",
   "Importer_From_Description": "Importa i dati da {{from}}  in Rocket.Chat.",
-  "Importer_HipChatEnterprise_BetaWarning": "Nota che questa importazione è in sviluppo, riporta ogni errori che può avvenire su GitHub:",
-  "Importer_HipChatEnterprise_Information": "Il file caricato deve essere un file tar.gz decriptato, leggi la documentazione per altre informazioni:",
   "Importer_import_cancelled": "Importazione annullata.",
   "Importer_import_failed": "Si è verificato un errore durante l'esecuzione dell'importazione.",
   "Importer_importing_channels": "In fase d'importazione dei canali.",
diff --git a/packages/i18n/src/locales/ja.i18n.json b/packages/i18n/src/locales/ja.i18n.json
index 6e4f98e559d7..f431e3f06941 100644
--- a/packages/i18n/src/locales/ja.i18n.json
+++ b/packages/i18n/src/locales/ja.i18n.json
@@ -2105,8 +2105,6 @@
   "Importer_finishing": "インポートを終了しています。",
   "Importer_From_Description": "{{from}}のデータをRocket.Chatへインポートします。",
   "Importer_From_Description_CSV": "CSVデータをRocket.Chatにインポートします。アップロードするファイルはZIPファイルである必要があります。",
-  "Importer_HipChatEnterprise_BetaWarning": "このインポートはまだ進行中です。GitHubで発生したエラーを報告してください。",
-  "Importer_HipChatEnterprise_Information": "アップロードされるファイルは暗号化を解除されたtar.gzでなければなりません。詳細はドキュメントを参照してください。",
   "Importer_import_cancelled": "インポートをキャンセルしました。",
   "Importer_import_failed": "インポートの実行中にエラーが発生しました。",
   "Importer_importing_channels": "チャネルをインポートしています。",
diff --git a/packages/i18n/src/locales/ka-GE.i18n.json b/packages/i18n/src/locales/ka-GE.i18n.json
index bb4737d8da80..2233f9fe3164 100644
--- a/packages/i18n/src/locales/ka-GE.i18n.json
+++ b/packages/i18n/src/locales/ka-GE.i18n.json
@@ -1716,8 +1716,6 @@
   "Importer_ExternalUrl_Description": "თქვენ ასევე შეგიძლიათ ნახოთ ბმული საჯარო წვდომის ფაილისთვის",
   "Importer_finishing": "იმპორტი სრულდება",
   "Importer_From_Description": "მონაცემებს აიმპორტებს  {{from}}-დან Rocket.Chat-ში",
-  "Importer_HipChatEnterprise_BetaWarning": "გთხოვთ გაითვალისწინოთ, რომ ეს იმპორტი კვლავ შემუშავების პროცესშია  \n გთხოვთ, აცნობეთ შეცდომების შესახებ GitHub– ში:",
-  "Importer_HipChatEnterprise_Information": "ატვირთული ფაილი უნდა იყოს გაშიფრული tar.gz, დამატებითი ინფორმაციისთვის წაიკითხეთ დოკუმენტაცია:",
   "Importer_import_cancelled": "იმპორტი გაუქმდა.",
   "Importer_import_failed": "იმპორტისას მოხდა შეცდომა.",
   "Importer_importing_channels": "არხების იმპორტი.",
diff --git a/packages/i18n/src/locales/km.i18n.json b/packages/i18n/src/locales/km.i18n.json
index c5e92acbf2cb..4d27fa3db746 100644
--- a/packages/i18n/src/locales/km.i18n.json
+++ b/packages/i18n/src/locales/km.i18n.json
@@ -1526,8 +1526,6 @@
   "Importer_ExternalUrl_Description": "អ្នកក៏អាចប្រើ URL សម្រាប់ឯកសារអាចចូលដំណើរការជាសាធារណៈបានដែរ:",
   "Importer_finishing": "បញ្ចប់ការនាំចូល។",
   "Importer_From_Description": "ការនាំចូល {{from}} ទិន្នន័យ's បានចូលទៅក្នុង Rocket.Chat ។",
-  "Importer_HipChatEnterprise_BetaWarning": "សូមជ្រាបថាការនាំចូលនេះនៅតែជាការងារកំពុងដំណើរការសូមរាយការណ៍កំហុសទាំងឡាយដែលកើតឡើងនៅក្នុង GitHub:",
-  "Importer_HipChatEnterprise_Information": "ឯកសារដែលបានផ្ទុកឡើងត្រូវតែជាឌីជីថលដែលបានឌិគ្រីបសូមអានឯកសារសម្រាប់ព័ត៌មានបន្ថែម:",
   "Importer_import_cancelled": "នាំចូលលុបចោល។",
   "Importer_import_failed": "កំហុសមួយបានកើតឡើងខណៈពេលកំពុងរត់ការនាំចូល។",
   "Importer_importing_channels": "ការនាំចូលបណ្តាញនេះ។",
diff --git a/packages/i18n/src/locales/ko.i18n.json b/packages/i18n/src/locales/ko.i18n.json
index 1b06b8917745..c6ef85de0fb4 100644
--- a/packages/i18n/src/locales/ko.i18n.json
+++ b/packages/i18n/src/locales/ko.i18n.json
@@ -1867,8 +1867,6 @@
   "Importer_ExternalUrl_Description": "외부에서 접근할 수 있는 파일의 URL을 사용할 수 있습니다.",
   "Importer_finishing": "가져오기 마무리 중..",
   "Importer_From_Description": "{{from}} 데이터를 Rocket.Chat으로 가져옵니다.",
-  "Importer_HipChatEnterprise_BetaWarning": "이 가져 오기가 아직 진행 중이므로 GitHub에서 발생하는 모든 오류를보고하십시오.",
-  "Importer_HipChatEnterprise_Information": "업로드 된 파일은 해독 된 tar.gz 여야합니다. 자세한 내용은 설명서를 참조하십시오.",
   "Importer_import_cancelled": "가져오기가 취소되었습니다.",
   "Importer_import_failed": "가져오기를 실행하는 동안 오류가 발생했습니다.",
   "Importer_importing_channels": "채널 가져오기",
diff --git a/packages/i18n/src/locales/ku.i18n.json b/packages/i18n/src/locales/ku.i18n.json
index ee6422a47746..ee63cc6a5b55 100644
--- a/packages/i18n/src/locales/ku.i18n.json
+++ b/packages/i18n/src/locales/ku.i18n.json
@@ -1266,8 +1266,6 @@
   "Importer_done": "Importing temam!",
   "Importer_finishing": "Despêk xwe import.",
   "Importer_From_Description": "Imports {{from}} welat's nav Rocket.Chat.",
-  "Importer_HipChatEnterprise_BetaWarning": "Ji kerema xwe bizanibin ku ev import jî hîn jî di pêşveçûnê de ye, kerema ku li GitHubê pêk tê rapor bikin:",
-  "Importer_HipChatEnterprise_Information": "Divê belgeyê belaş divê tar.gz, ji kerema xwe belgeyên bêtir agahdarî belgeyên bixwînin:",
   "Importer_import_cancelled": "Import betalkirin.",
   "Importer_import_failed": "dema ku li import An error teqîn pêk hat.",
   "Importer_importing_channels": "Importing kanalên.",
diff --git a/packages/i18n/src/locales/lo.i18n.json b/packages/i18n/src/locales/lo.i18n.json
index 4bc2481ca583..ac50955f2a5e 100644
--- a/packages/i18n/src/locales/lo.i18n.json
+++ b/packages/i18n/src/locales/lo.i18n.json
@@ -1305,8 +1305,6 @@
   "Importer_done": "ການນໍາເຂົ້າທີ່ສົມບູນ!",
   "Importer_finishing": "ສໍາເລັດເຖິງການນໍາເຂົ້າ.",
   "Importer_From_Description": "ການນໍາເຂົ້າ {{from}} ຂໍ້ມູນ's ເຂົ້າໄປໃນ Rocket.Chat.",
-  "Importer_HipChatEnterprise_BetaWarning": "ໂປດທາບວ່າການນໍາເຂົ້ານີ້ຍັງຄົງເປັນວຽກທີ່ກໍາລັງດໍາເນີນການ, ກະລຸນາລາຍງານຂໍ້ຜິດພາດທີ່ເກີດຂື້ນໃນ GitHub:",
-  "Importer_HipChatEnterprise_Information": "ໄຟລ໌ທີ່ອັບໂຫລດຕ້ອງເປັນ tar.gz ທີ່ຖືກລະຫັດ, ກະລຸນາອ່ານເອກສານສໍາລັບຂໍ້ມູນເພີ່ມເຕີມ:",
   "Importer_import_cancelled": "ການນໍາເຂົ້າຍົກເລີກ.",
   "Importer_import_failed": "ເກີດຄວາມຜິດພາດໃນຂະນະທີ່ເຮັດວຽກການນໍາເຂົ້າ.",
   "Importer_importing_channels": "ການນໍາເຂົ້າຊ່ອງທາງການ.",
diff --git a/packages/i18n/src/locales/lt.i18n.json b/packages/i18n/src/locales/lt.i18n.json
index 65c075aa66be..a5085e8a5554 100644
--- a/packages/i18n/src/locales/lt.i18n.json
+++ b/packages/i18n/src/locales/lt.i18n.json
@@ -1326,8 +1326,6 @@
   "Importer_done": "Importavimas baigtas!",
   "Importer_finishing": "Užbaigti importą.",
   "Importer_From_Description": "Importuoja {{from}} duomenis į Rocket.Chat.",
-  "Importer_HipChatEnterprise_BetaWarning": "Atminkite, kad šis importas vis dar vyksta, prašome pranešti apie klaidas, kurios atsiranda \"GitHub\":",
-  "Importer_HipChatEnterprise_Information": "Įkeltas failas turi būti iššifruotas tar.gz, prašome perskaityti dokumentus, kad gautumėte papildomos informacijos:",
   "Importer_import_cancelled": "Importas atšauktas.",
   "Importer_import_failed": "Paleidus importą įvyko klaida.",
   "Importer_importing_channels": "Kanalų importavimas.",
diff --git a/packages/i18n/src/locales/lv.i18n.json b/packages/i18n/src/locales/lv.i18n.json
index b06459434ffa..ef4656d9bf7b 100644
--- a/packages/i18n/src/locales/lv.i18n.json
+++ b/packages/i18n/src/locales/lv.i18n.json
@@ -1282,8 +1282,6 @@
   "Importer_CSV_Information": "CSV importer ir nepieciešams noteikts formāts, lūdzu, izlasiet dokumentāciju, kā veidot savu zip failu:",
   "Importer_done": "Importēšana ir pabeigta.",
   "Importer_finishing": "Importēšanas pabeigšana.",
-  "Importer_HipChatEnterprise_BetaWarning": "Lūdzu, ņemiet vērā, ka šis importēšana joprojām turpinās darbu, lūdzu, ziņojiet par visām kļūdām, kas rodas GitHub:",
-  "Importer_HipChatEnterprise_Information": "Augšupielādētajam failam jābūt atšifrētam tar.gz, lūdzu, izlasiet dokumentāciju, lai saņemtu sīkāku informāciju:",
   "Importer_import_cancelled": "Imports ir atcelts.",
   "Importer_import_failed": "Veicot importēšanu, radās kļūda.",
   "Importer_importing_channels": "Kanālu importēšana.",
diff --git a/packages/i18n/src/locales/mn.i18n.json b/packages/i18n/src/locales/mn.i18n.json
index 757fe0d9c356..a4843a4d208b 100644
--- a/packages/i18n/src/locales/mn.i18n.json
+++ b/packages/i18n/src/locales/mn.i18n.json
@@ -1266,8 +1266,6 @@
   "Importer_CSV_Information": "CSV-ийн импортлогч тодорхой форматыг шаарддаг бөгөөд таны zip файлыг хэрхэн бүтээх талаар баримтжуулалтыг уншина уу:",
   "Importer_done": "Бүрэн импортлох!",
   "Importer_finishing": "Импортыг дуусгах.",
-  "Importer_HipChatEnterprise_BetaWarning": "Энэ импорт нь одоо ч ажил дуусч байгаа гэдгийг анхаарна уу, GitHub-д тохиолддог аливаа алдааг мэдээлнэ үү:",
-  "Importer_HipChatEnterprise_Information": "Байршуулсан файл нь шифрлэгдсэн tar.gz байна, дэлгэрэнгүй мэдээллийг баримтжуулж уншина уу:",
   "Importer_import_cancelled": "Импорт цуцлагдсан.",
   "Importer_import_failed": "Импортыг ажиллуулж байхад алдаа гарлаа.",
   "Importer_importing_channels": "Суваг оруулах.",
diff --git a/packages/i18n/src/locales/ms-MY.i18n.json b/packages/i18n/src/locales/ms-MY.i18n.json
index aa8142905ec8..9fb7c0f1fe47 100644
--- a/packages/i18n/src/locales/ms-MY.i18n.json
+++ b/packages/i18n/src/locales/ms-MY.i18n.json
@@ -1269,8 +1269,6 @@
   "Importer_done": "Mengimport lengkap!",
   "Importer_finishing": "Hampir selesai import.",
   "Importer_From_Description": "Import {{from}} data's ke dalam Rocket.Chat.",
-  "Importer_HipChatEnterprise_BetaWarning": "Harap maklum bahawa import ini masih merupakan kerja yang sedang berjalan, sila laporkan kesilapan yang berlaku di GitHub:",
-  "Importer_HipChatEnterprise_Information": "Fail yang dimuat naik mestilah tar.gz disahsulit, sila baca dokumentasi untuk maklumat lanjut:",
   "Importer_import_cancelled": "Import dibatalkan.",
   "Importer_import_failed": "Ralat berlaku semasa berjalan import.",
   "Importer_importing_channels": "Mengimport saluran.",
diff --git a/packages/i18n/src/locales/nl.i18n.json b/packages/i18n/src/locales/nl.i18n.json
index 5f14ee05179f..bcce6c6aacca 100644
--- a/packages/i18n/src/locales/nl.i18n.json
+++ b/packages/i18n/src/locales/nl.i18n.json
@@ -2121,8 +2121,6 @@
   "Importer_finishing": "Afwerking van de import.",
   "Importer_From_Description": "Impoort {{from}}-gegevens in Rocket.Chat.",
   "Importer_From_Description_CSV": "Importeert CSV-gegevens in Rocket.Chat. De geüploade file moet een ZIP-bestand zijn.",
-  "Importer_HipChatEnterprise_BetaWarning": "Houd er rekening mee dat deze import nog steeds in uitvoering is, meld eventuele fouten die optreden op GitHub:",
-  "Importer_HipChatEnterprise_Information": "Het geüploade bestand moet een gedecodeerde tar.gz zijn, lees de documentatie voor meer informatie:",
   "Importer_import_cancelled": "Import geannuleerd.",
   "Importer_import_failed": "Er is een fout opgetreden tijdens het importeren.",
   "Importer_importing_channels": "Kanalen aan het importeren.",
diff --git a/packages/i18n/src/locales/no.i18n.json b/packages/i18n/src/locales/no.i18n.json
index 442a4bc68284..0f0f3db667b1 100644
--- a/packages/i18n/src/locales/no.i18n.json
+++ b/packages/i18n/src/locales/no.i18n.json
@@ -2210,8 +2210,6 @@
   "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.",
diff --git a/packages/i18n/src/locales/pl.i18n.json b/packages/i18n/src/locales/pl.i18n.json
index 6f504619f8ce..ebf61ff46f20 100644
--- a/packages/i18n/src/locales/pl.i18n.json
+++ b/packages/i18n/src/locales/pl.i18n.json
@@ -2313,8 +2313,6 @@
   "Importer_finishing": "Kończąc się na import.",
   "Importer_From_Description": "Import danych {{from}} 's do Rocket.Chat.",
   "Importer_From_Description_CSV": "Importuje dane CSV do Rocket.Chat. Przesłany plik musi być plikiem ZIP.",
-  "Importer_HipChatEnterprise_BetaWarning": "Należy pamiętać, że ten import jest nadal w toku, zgłoś wszelkie błędy występujące w GitHub:",
-  "Importer_HipChatEnterprise_Information": "Przesłany plik musi być odszyfrowanym tar.gz. Aby uzyskać więcej informacji, przeczytaj dokumentację:",
   "Importer_import_cancelled": "Importowanie anulowane.",
   "Importer_import_failed": "Wystąpił błąd podczas wykonywania importu.",
   "Importer_importing_channels": "Importowanie kanałów.",
diff --git a/packages/i18n/src/locales/pt-BR.i18n.json b/packages/i18n/src/locales/pt-BR.i18n.json
index ce98362e9d40..fb00ac5d3830 100644
--- a/packages/i18n/src/locales/pt-BR.i18n.json
+++ b/packages/i18n/src/locales/pt-BR.i18n.json
@@ -2188,8 +2188,6 @@
   "Importer_finishing": "Terminando a importação.",
   "Importer_From_Description": "Importa dados de {{from}}  para o Rocket.Chat.",
   "Importer_From_Description_CSV": "Importa dados de CSV para o Rocket.Chat. O arquivo importado deve ser um arquivo ZIP.",
-  "Importer_HipChatEnterprise_BetaWarning": "Saiba que esta importação é ainda um trabalho em andamento; informe quaisquer erros que ocorrerem no GitHub:",
-  "Importer_HipChatEnterprise_Information": "O arquivo carregado deve ser um tar.gz descriptografado; leia a documentação para obter mais informações:",
   "Importer_import_cancelled": "Importação cancelada.",
   "Importer_import_failed": "Ocorreu um erro durante a execução da importação.",
   "Importer_importing_channels": "Importando os canais.",
diff --git a/packages/i18n/src/locales/pt.i18n.json b/packages/i18n/src/locales/pt.i18n.json
index 2bc58d7fc19c..6b7625689724 100644
--- a/packages/i18n/src/locales/pt.i18n.json
+++ b/packages/i18n/src/locales/pt.i18n.json
@@ -1514,8 +1514,6 @@
   "Importer_ExternalUrl_Description": "Você também pode usar um URL para um arquivo acessível publicamente:",
   "Importer_finishing": "A terminar importação.",
   "Importer_From_Description": "Importar dados de {{from}}  para o Rocket.Chat.",
-  "Importer_HipChatEnterprise_BetaWarning": "Lembre-se de que esta importação ainda é um trabalho em andamento, informe quaisquer erros que ocorram no GitHub:",
-  "Importer_HipChatEnterprise_Information": "O arquivo carregado deve ser um tar.gz descienciado, leia a documentação para obter mais informações:",
   "Importer_import_cancelled": "Importação cancelada.",
   "Importer_import_failed": "Ocorreu um erro durante a execução da importação.",
   "Importer_importing_channels": "A importar os canais.",
diff --git a/packages/i18n/src/locales/ro.i18n.json b/packages/i18n/src/locales/ro.i18n.json
index 2b5dcac528b0..bdd37806aba8 100644
--- a/packages/i18n/src/locales/ro.i18n.json
+++ b/packages/i18n/src/locales/ro.i18n.json
@@ -1270,8 +1270,6 @@
   "Importer_done": "Import complet!",
   "Importer_finishing": "Se finalizează import.",
   "Importer_From_Description": "Importuri {{from}} 's date în Rocket.Chat.",
-  "Importer_HipChatEnterprise_BetaWarning": "Rețineți că acest import este încă o operațiune în curs, vă rugăm să raportați orice erori apărute în GitHub:",
-  "Importer_HipChatEnterprise_Information": "Fișierul încărcat trebuie să fie un tar.gz decriptat, citiți documentația pentru mai multe informații:",
   "Importer_import_cancelled": "Import anulat.",
   "Importer_import_failed": "A Apărut o eroare în timpul importului.",
   "Importer_importing_channels": "Se importă canalele.",
diff --git a/packages/i18n/src/locales/ru.i18n.json b/packages/i18n/src/locales/ru.i18n.json
index 56d72c4aa524..120cbc3633f8 100644
--- a/packages/i18n/src/locales/ru.i18n.json
+++ b/packages/i18n/src/locales/ru.i18n.json
@@ -2278,8 +2278,6 @@
   "Importer_finishing": "Завершить импорт данных.",
   "Importer_From_Description": "Импортировать данные из {{from}} в Rocket.Chat.",
   "Importer_From_Description_CSV": "Импортирует данные файла CSV в Rocket.Chat. Загруженный файл должен быть в формате ZIP.",
-  "Importer_HipChatEnterprise_BetaWarning": "Имейте в виду, что импорт всё ещё продолжается. Пожалуйста, сообщите о любых возникающих ошибках на GitHub:",
-  "Importer_HipChatEnterprise_Information": "Загруженный файл должен быть расшифрованным tar.gz, пожалуйста, прочитайте документацию для получения дополнительной информации:",
   "Importer_import_cancelled": "Импорт данных отменен.",
   "Importer_import_failed": "Во время импорта данных возникла ошибка.",
   "Importer_importing_channels": "Импортировать каналы.",
diff --git a/packages/i18n/src/locales/sk-SK.i18n.json b/packages/i18n/src/locales/sk-SK.i18n.json
index 13a823eb8bbc..1682b8806663 100644
--- a/packages/i18n/src/locales/sk-SK.i18n.json
+++ b/packages/i18n/src/locales/sk-SK.i18n.json
@@ -1281,8 +1281,6 @@
   "Importer_done": "Import je dokončený!",
   "Importer_finishing": "Dokončenie importu.",
   "Importer_From_Description": "Importuje {{from}} dáta do Rocket.Chat.",
-  "Importer_HipChatEnterprise_BetaWarning": "Majte na pamäti, že tento import je stále prebiehajúcim procesom, nahláste všetky chyby, ktoré sa vyskytli v GitHub:",
-  "Importer_HipChatEnterprise_Information": "Nahraný súbor musí byť dešifrovaný tar.gz, prečítajte si prosím dokumentáciu pre ďalšie informácie:",
   "Importer_import_cancelled": "Import bol zrušený.",
   "Importer_import_failed": "Počas spúšťania importu sa vyskytla chyba.",
   "Importer_importing_channels": "Importovanie kanálov.",
diff --git a/packages/i18n/src/locales/sl-SI.i18n.json b/packages/i18n/src/locales/sl-SI.i18n.json
index bb17e5cbee1e..ee9c8f33067b 100644
--- a/packages/i18n/src/locales/sl-SI.i18n.json
+++ b/packages/i18n/src/locales/sl-SI.i18n.json
@@ -1262,8 +1262,6 @@
   "Importer_done": "Uvoz končan!",
   "Importer_finishing": "Končujem uvoz. ",
   "Importer_From_Description": "Uvozi {{from}} podatki v Rocket.Chat.",
-  "Importer_HipChatEnterprise_BetaWarning": "Upoštevajte, da uvoz še kar poteka, prijavite napake, ki so se zgodile v GitHub:",
-  "Importer_HipChatEnterprise_Information": "Naložena datoteka mora biti dešifrirana tar.gz, za več informacij preberite navodila. ",
   "Importer_import_cancelled": "Uvoz preklican. ",
   "Importer_import_failed": "Napaka med uvozom.",
   "Importer_importing_channels": "Uvažanje kanalov. ",
diff --git a/packages/i18n/src/locales/sq.i18n.json b/packages/i18n/src/locales/sq.i18n.json
index 00a6b35d8a83..6954a744843f 100644
--- a/packages/i18n/src/locales/sq.i18n.json
+++ b/packages/i18n/src/locales/sq.i18n.json
@@ -1270,8 +1270,6 @@
   "Importer_done": "Importimi i plotë!",
   "Importer_finishing": "Përfunduar importin.",
   "Importer_From_Description": "Importet {{from}} dhënat's në Rocket.Chat.",
-  "Importer_HipChatEnterprise_BetaWarning": "Ju lutemi, kini parasysh se ky import ende është një punë në vazhdim, ju lutem raportoni çdo gabim që ndodh në GitHub:",
-  "Importer_HipChatEnterprise_Information": "Skedari i ngarkuar duhet të jetë tar.gz i dekriptuar, ju lutem lexoni dokumentacionin për informacione të mëtejshme:",
   "Importer_import_cancelled": "Import anuluar.",
   "Importer_import_failed": "Ndodhi një gabim gjatë drejtimin e importit.",
   "Importer_importing_channels": "Importimin e kanaleve.",
diff --git a/packages/i18n/src/locales/sr.i18n.json b/packages/i18n/src/locales/sr.i18n.json
index f02efa3acd54..c9a6e6a1bebd 100644
--- a/packages/i18n/src/locales/sr.i18n.json
+++ b/packages/i18n/src/locales/sr.i18n.json
@@ -1152,8 +1152,6 @@
   "Importer_CSV_Information": "ЦСВ увознику је потребан одређени формат, молимо прочитајте документацију како структурирати своју зип датотеку:",
   "Importer_done": "Увоз завршен!",
   "Importer_finishing": "Завршавање увоза.",
-  "Importer_HipChatEnterprise_BetaWarning": "Имајте на уму да је овај увоз и даље посао у току, пријавите грешке које се јављају у ГитХуб-у:",
-  "Importer_HipChatEnterprise_Information": "Датотека која је отпремљена мора бити дешифрована тар.гз, прочитајте документацију за додатне информације:",
   "Importer_import_cancelled": "Увоз отказан.",
   "Importer_import_failed": "Дошло је до грешке приликом увоза.",
   "Importer_importing_channels": "Увожење канала.",
diff --git a/packages/i18n/src/locales/sv.i18n.json b/packages/i18n/src/locales/sv.i18n.json
index 1c673b1af2c5..f29400fe1b6f 100644
--- a/packages/i18n/src/locales/sv.i18n.json
+++ b/packages/i18n/src/locales/sv.i18n.json
@@ -2431,8 +2431,6 @@
   "Importer_finishing": "Avslutar importen.",
   "Importer_From_Description": "Importera {{from}}s  data till Rocket.Chat.",
   "Importer_From_Description_CSV": "Importerar CSV-data till Rocket.Chat. Den uppladdade filen måste vara en zip-fil.",
-  "Importer_HipChatEnterprise_BetaWarning": "Var medveten om att denna import fortfarande är ett pågående arbete, var god rapportera eventuella fel som uppstår i GitHub:",
-  "Importer_HipChatEnterprise_Information": "Den uppladdade filen måste vara en dekrypterad tar.gz, läs dokumentationen för ytterligare information:",
   "Importer_import_cancelled": "Import avbruten.",
   "Importer_import_failed": "Ett fel uppstod under importen.",
   "Importer_importing_channels": "Importerar kanalerna.",
diff --git a/packages/i18n/src/locales/ta-IN.i18n.json b/packages/i18n/src/locales/ta-IN.i18n.json
index 9107ee1e26c3..df2f3dcdcb7f 100644
--- a/packages/i18n/src/locales/ta-IN.i18n.json
+++ b/packages/i18n/src/locales/ta-IN.i18n.json
@@ -1270,8 +1270,6 @@
   "Importer_done": "முழுமையான இறக்குமதி!",
   "Importer_finishing": "இறக்குமதி முடிக்கிறது.",
   "Importer_From_Description": "இறக்குமதி Rocket.Chat ஒரு 'கள் தரவு {{from}}.",
-  "Importer_HipChatEnterprise_BetaWarning": "இந்த இறக்குமதி இன்னமும் முன்னேற்றம் அடைந்ததை நினைவில் கொள்ளுங்கள், தயவுசெய்து GitHub இல் ஏற்படும் எந்த பிழைகளையும் தெரிவிக்கவும்:",
-  "Importer_HipChatEnterprise_Information": "பதிவேற்றிய கோப்பு ஒரு குறியாக்கப்பட்ட tar.gz ஆக இருக்க வேண்டும், மேலும் தகவலுக்கு ஆவணங்களைப் படிக்கவும்:",
   "Importer_import_cancelled": "இறக்குமதி ரத்துசெய்யப்பட்டது.",
   "Importer_import_failed": "இறக்குமதி இயங்கும் போது ஒரு பிழை ஏற்பட்டது.",
   "Importer_importing_channels": "சேனல்கள் இறக்குமதி.",
diff --git a/packages/i18n/src/locales/th-TH.i18n.json b/packages/i18n/src/locales/th-TH.i18n.json
index d22a87659fa9..a0ca4ae85214 100644
--- a/packages/i18n/src/locales/th-TH.i18n.json
+++ b/packages/i18n/src/locales/th-TH.i18n.json
@@ -1265,8 +1265,6 @@
   "Importer_CSV_Information": "ตัวนำเข้า CSV ต้องการรูปแบบเฉพาะโปรดอ่านเอกสารสำหรับวิธีจัดโครงสร้างไฟล์ซิปของคุณ:",
   "Importer_done": "การนำเข้าเสร็จสมบูรณ์!",
   "Importer_finishing": "เสร็จสิ้นการนำเข้า",
-  "Importer_HipChatEnterprise_BetaWarning": "โปรดทราบว่าการนำเข้านี้ยังคงเป็นงานระหว่างดำเนินการโปรดรายงานข้อผิดพลาดที่เกิดขึ้นใน GitHub:",
-  "Importer_HipChatEnterprise_Information": "ไฟล์ที่อัปโหลดต้องเป็น tar.gad ถอดรหัสลับโปรดอ่านเอกสารประกอบสำหรับข้อมูลเพิ่มเติม:",
   "Importer_import_cancelled": "ยกเลิกการนำเข้าแล้ว",
   "Importer_import_failed": "เกิดข้อผิดพลาดขณะเรียกใช้งานนำเข้า",
   "Importer_importing_channels": "การนำเข้าช่อง",
diff --git a/packages/i18n/src/locales/tr.i18n.json b/packages/i18n/src/locales/tr.i18n.json
index 7b6c78d1cbda..3ff69fa60867 100644
--- a/packages/i18n/src/locales/tr.i18n.json
+++ b/packages/i18n/src/locales/tr.i18n.json
@@ -1538,8 +1538,6 @@
   "Importer_ExternalUrl_Description": "Herkesin erişebileceği dosya için bir URL de kullanabilirsiniz:",
   "Importer_finishing": "İçe aktarım tamamlanıyor.",
   "Importer_From_Description": "{{from}} verisini Rocket.Chat'e aktarır.",
-  "Importer_HipChatEnterprise_BetaWarning": "Bu içe aktarma işlemi halen devam etmekte olan bir çalışma olduğuna dikkat edin, lütfen GitHub'ta oluşan hataları bildirin:",
-  "Importer_HipChatEnterprise_Information": "Yüklenen dosya, şifresi çözülmüş bir tar.gz olmalıdır; daha fazla bilgi için lütfen belgeleri okuyun:",
   "Importer_import_cancelled": "İçe aktarım iptal edildi.",
   "Importer_import_failed": "İçe aktarım sırasında bir hata oluştu.",
   "Importer_importing_channels": "Kanallar içe aktarılıyor.",
diff --git a/packages/i18n/src/locales/uk.i18n.json b/packages/i18n/src/locales/uk.i18n.json
index 572401cc2bf7..ce82cc10eb68 100644
--- a/packages/i18n/src/locales/uk.i18n.json
+++ b/packages/i18n/src/locales/uk.i18n.json
@@ -1683,8 +1683,6 @@
   "Importer_ExternalUrl_Description": "Ви також можете використовувати URL-адресу для загальнодоступного файлу:",
   "Importer_finishing": "Завершення імпорту.",
   "Importer_From_Description": "Imports {{from}} data  в Rocket.Chat.",
-  "Importer_HipChatEnterprise_BetaWarning": "Будь ласка, пам'ятайте, що цей імпорт все ще працює, повідомте про всі помилки, які виникають в GitHub:",
-  "Importer_HipChatEnterprise_Information": "Завантажений файл повинен бути розшифрованим tar.gz, будь ласка, ознайомтеся з документацією для отримання додаткової інформації:",
   "Importer_import_cancelled": "Імпорт скасований.",
   "Importer_import_failed": "Сталася помилка під час виконання імпорту.",
   "Importer_importing_channels": "Імпорт каналів.",
diff --git a/packages/i18n/src/locales/vi-VN.i18n.json b/packages/i18n/src/locales/vi-VN.i18n.json
index 1bfee9a0e7d7..7c59bc569d4a 100644
--- a/packages/i18n/src/locales/vi-VN.i18n.json
+++ b/packages/i18n/src/locales/vi-VN.i18n.json
@@ -1364,8 +1364,6 @@
   "Importer_done": "Nhập đầy đủ!",
   "Importer_finishing": "Hoàn thành việc nhập dữ liệu.",
   "Importer_From_Description": "Nhập dữ liệu {{from}} vào Rocket.Chat.",
-  "Importer_HipChatEnterprise_BetaWarning": "Xin lưu ý rằng phần nhập dữ liệu này vẫn đang trong quá trình hoàn thiện, hãy báo cáo bất kỳ lỗi nào xảy ra tại GitHub:",
-  "Importer_HipChatEnterprise_Information": "Tệp được tải lên phải là tệp được giải mã tar.gz, vui lòng đọc tài liệu để biết thêm thông tin:",
   "Importer_import_cancelled": "Nhập dữ liệu bị hủy.",
   "Importer_import_failed": "Đã xảy ra lỗi khi chạy.",
   "Importer_importing_channels": "Nhập các kênh.",
diff --git a/packages/i18n/src/locales/zh-HK.i18n.json b/packages/i18n/src/locales/zh-HK.i18n.json
index ef00dac8c9ac..b1e2d3e996f3 100644
--- a/packages/i18n/src/locales/zh-HK.i18n.json
+++ b/packages/i18n/src/locales/zh-HK.i18n.json
@@ -1291,8 +1291,6 @@
   "Importer_done": "导入完成！",
   "Importer_finishing": "完成进口。",
   "Importer_From_Description": "将{{from}}数据导入Rocket.Chat。",
-  "Importer_HipChatEnterprise_BetaWarning": "请注意，此导入仍在进行中，请报告GitHub中发生的任何错误：",
-  "Importer_HipChatEnterprise_Information": "上传的文件必须是解密的tar.gz，请阅读文档以获取更多信息：",
   "Importer_import_cancelled": "导入已取消。",
   "Importer_import_failed": "运行导入时发生错误。",
   "Importer_importing_channels": "导入频道。",
diff --git a/packages/i18n/src/locales/zh-TW.i18n.json b/packages/i18n/src/locales/zh-TW.i18n.json
index 1c0c9f4caa2e..09498faa25f4 100644
--- a/packages/i18n/src/locales/zh-TW.i18n.json
+++ b/packages/i18n/src/locales/zh-TW.i18n.json
@@ -2082,8 +2082,6 @@
   "Importer_finishing": "完成了匯入。",
   "Importer_From_Description": "匯入{{from}}的資料轉換成Rocket.Chat。",
   "Importer_From_Description_CSV": "匯入 CSV 資料到 Rocket.Chat。上傳的檔案必須為 ZIP 檔。",
-  "Importer_HipChatEnterprise_BetaWarning": "請注意，此匯入仍在進行中，請報告GitHub中發生的任何錯誤：",
-  "Importer_HipChatEnterprise_Information": "上傳的文件必須是解密的tar.gz，請閱讀文件以獲取更多訊息：",
   "Importer_import_cancelled": "匯入已取消。",
   "Importer_import_failed": "在執行匯入時出錯。",
   "Importer_importing_channels": "匯入頻道。",
diff --git a/packages/i18n/src/locales/zh.i18n.json b/packages/i18n/src/locales/zh.i18n.json
index 7c67c32cb221..5786d61fc24b 100644
--- a/packages/i18n/src/locales/zh.i18n.json
+++ b/packages/i18n/src/locales/zh.i18n.json
@@ -1899,8 +1899,6 @@
   "Importer_ExternalUrl_Description": "您还可以将URL用于可公开访问的文件：",
   "Importer_finishing": "导入即将完成。",
   "Importer_From_Description": "将 {{from}} 数据导入 Rocket.Chat。",
-  "Importer_HipChatEnterprise_BetaWarning": "请注意，导入功能尚处于开发阶段，如有错误发生请在 GitHub 向我们反馈：",
-  "Importer_HipChatEnterprise_Information": "上传的文件必须为未加密的 tar.gz 文件，请查阅文档进一步了解相关信息：",
   "Importer_import_cancelled": "已取消导入。",
   "Importer_import_failed": "导入过程中发生错误！",
   "Importer_importing_channels": "正在导入频道。",
diff --git a/packages/model-typings/src/models/IImportDataModel.ts b/packages/model-typings/src/models/IImportDataModel.ts
index 160eaaf604a0..95eaa8a4ce0d 100644
--- a/packages/model-typings/src/models/IImportDataModel.ts
+++ b/packages/model-typings/src/models/IImportDataModel.ts
@@ -12,5 +12,4 @@ export interface IImportDataModel extends IBaseModel<IImportRecord> {
 	checkIfDirectMessagesExists(): Promise<boolean>;
 	countMessages(): Promise<number>;
 	findChannelImportIdByNameOrImportId(channelIdentifier: string): Promise<string | undefined>;
-	findDMForImportedUsers(...users: Array<string>): Promise<IImportChannelRecord | null>;
 }
diff --git a/yarn.lock b/yarn.lock
index 97fe3c5151d5..4a7d572c89e3 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -9686,7 +9686,6 @@ __metadata:
     supports-color: ~7.2.0
     suretype: ~2.4.1
     swiper: ^9.3.2
-    tar-stream: ^1.6.2
     template-file: ^6.0.1
     textarea-caret: ^3.1.0
     tinykeys: ^1.4.0
@@ -39744,7 +39743,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"tar-stream@npm:^1.5.2, tar-stream@npm:^1.6.2":
+"tar-stream@npm:^1.5.2":
   version: 1.6.2
   resolution: "tar-stream@npm:1.6.2"
   dependencies:

From 051e14bfa892fdd86be094385e0bc3d7cf3f502a Mon Sep 17 00:00:00 2001
From: Guilherme Gazzo <guilhermegazzo@gmail.com>
Date: Thu, 11 Apr 2024 23:57:14 -0300
Subject: [PATCH 76/94] chore!: Removed Mongo 4.4. support and added 7.0
 (#32162)

Co-authored-by: Diego Sampaio <chinello@gmail.com>
---
 .changeset/fair-seahorses-laugh.md          | 13 +++++++++++++
 .changeset/fluffy-knives-count.md           |  5 +++++
 .github/workflows/ci-test-e2e.yml           |  8 ++++----
 .github/workflows/ci.yml                    |  8 ++++----
 apps/meteor/server/startup/serverRunning.js | 10 +++++-----
 docker-compose-local.yml                    |  8 ++++----
 6 files changed, 35 insertions(+), 17 deletions(-)
 create mode 100644 .changeset/fair-seahorses-laugh.md
 create mode 100644 .changeset/fluffy-knives-count.md

diff --git a/.changeset/fair-seahorses-laugh.md b/.changeset/fair-seahorses-laugh.md
new file mode 100644
index 000000000000..8f93695a8e17
--- /dev/null
+++ b/.changeset/fair-seahorses-laugh.md
@@ -0,0 +1,13 @@
+---
+'@rocket.chat/meteor': major
+---
+
+As per MongoDB Lifecycle Schedules ([mongodb.com/legal/support-policy/lifecycles](https://www.mongodb.com/legal/support-policy/lifecycles)) we're removing official support to MongoDB version 4.4 that has reached end of life in February 2024.
+
+We recommend upgrading to at least MongoDB 6.0+, though 5.0 is still a supported version.
+
+Here are official docs on how to upgrade to some of the supported versions:
+
+- [mongodb.com/docs/manual/release-notes/5.0-upgrade-replica-set](https://www.mongodb.com/docs/manual/release-notes/5.0-upgrade-replica-set/)
+- [mongodb.com/docs/manual/release-notes/6.0-upgrade-replica-set](https://www.mongodb.com/docs/manual/release-notes/6.0-upgrade-replica-set/)
+- [mongodb.com/docs/manual/release-notes/7.0-upgrade-replica-set](https://www.mongodb.com/docs/manual/release-notes/7.0-upgrade-replica-set/)
diff --git a/.changeset/fluffy-knives-count.md b/.changeset/fluffy-knives-count.md
new file mode 100644
index 000000000000..4e4e8aad3631
--- /dev/null
+++ b/.changeset/fluffy-knives-count.md
@@ -0,0 +1,5 @@
+---
+"@rocket.chat/meteor": major
+---
+
+Added MongoDB 7.0 support 
diff --git a/.github/workflows/ci-test-e2e.yml b/.github/workflows/ci-test-e2e.yml
index 920aea0aa308..ec62cbefb022 100644
--- a/.github/workflows/ci-test-e2e.yml
+++ b/.github/workflows/ci-test-e2e.yml
@@ -29,7 +29,7 @@ on:
       transporter:
         type: string
       mongodb-version:
-        default: "['4.4', '6.0']"
+        default: "['5.0', '7.0']"
         required: false
         type: string
       release:
@@ -80,8 +80,8 @@ jobs:
   test:
     runs-on: ubuntu-20.04
     env:
-      RC_DOCKERFILE: ${{ matrix.mongodb-version == '6.0' && inputs.rc-dockerfile-alpine || inputs.rc-dockerfile }}
-      RC_DOCKER_TAG: ${{ matrix.mongodb-version == '6.0' && inputs.rc-docker-tag-alpine || inputs.rc-docker-tag }}
+      RC_DOCKERFILE: ${{ matrix.mongodb-version == '7.0' && inputs.rc-dockerfile-alpine || inputs.rc-dockerfile }}
+      RC_DOCKER_TAG: ${{ matrix.mongodb-version == '7.0' && inputs.rc-docker-tag-alpine || inputs.rc-docker-tag }}
 
     strategy:
       fail-fast: false
@@ -89,7 +89,7 @@ jobs:
         mongodb-version: ${{ fromJSON(inputs.mongodb-version) }}
         shard: ${{ fromJSON(inputs.shard) }}
 
-    name: MongoDB ${{ matrix.mongodb-version }}${{ inputs.db-watcher-disabled == 'true' && ' [no watchers]' || '' }} (${{ matrix.shard }}/${{ inputs.total-shard }})${{ matrix.mongodb-version == '6.0' && ' - Alpine' || '' }}
+    name: MongoDB ${{ matrix.mongodb-version }}${{ inputs.db-watcher-disabled == 'true' && ' [no watchers]' || '' }} (${{ matrix.shard }}/${{ inputs.total-shard }})${{ matrix.mongodb-version == '7.0' && ' - Alpine' || '' }}
 
     steps:
       - name: Collect Workflow Telemetry
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index ce18d17b8b80..b94972ea126c 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -117,7 +117,7 @@ jobs:
           fi;
 
           curl -H "Content-Type: application/json" -H "X-Update-Token: $UPDATE_TOKEN" -d \
-              "{\"nodeVersion\": \"${{ needs.release-versions.outputs.node-version }}\", \"compatibleMongoVersions\": [\"4.4\", \"5.0\", \"6.0\"], \"commit\": \"$GITHUB_SHA\", \"tag\": \"$RC_VERSION\", \"branch\": \"$GIT_BRANCH\", \"artifactName\": \"$ARTIFACT_NAME\", \"releaseType\": \"draft\", \"draftAs\": \"$RC_RELEASE\"}" \
+              "{\"nodeVersion\": \"${{ needs.release-versions.outputs.node-version }}\", \"compatibleMongoVersions\": [\"5.0\", \"6.0\", \"7.0\"], \"commit\": \"$GITHUB_SHA\", \"tag\": \"$RC_VERSION\", \"branch\": \"$GIT_BRANCH\", \"artifactName\": \"$ARTIFACT_NAME\", \"releaseType\": \"draft\", \"draftAs\": \"$RC_RELEASE\"}" \
               https://releases.rocket.chat/update
 
   packages-build:
@@ -361,7 +361,7 @@ jobs:
       release: ee
       transporter: 'nats://nats:4222'
       enterprise-license: ${{ needs.release-versions.outputs.enterprise-license }}
-      mongodb-version: "['4.4']"
+      mongodb-version: "['5.0']"
       node-version: ${{ needs.release-versions.outputs.node-version }}
       lowercase-repo: ${{ needs.release-versions.outputs.lowercase-repo }}
       rc-dockerfile: ${{ needs.release-versions.outputs.rc-dockerfile }}
@@ -385,7 +385,7 @@ jobs:
       enterprise-license: ${{ needs.release-versions.outputs.enterprise-license }}
       shard: '[1, 2, 3, 4, 5]'
       total-shard: 5
-      mongodb-version: "['4.4']"
+      mongodb-version: "['5.0']"
       node-version: ${{ needs.release-versions.outputs.node-version }}
       lowercase-repo: ${{ needs.release-versions.outputs.lowercase-repo }}
       rc-dockerfile: ${{ needs.release-versions.outputs.rc-dockerfile }}
@@ -765,7 +765,7 @@ jobs:
           fi;
 
           curl -H "Content-Type: application/json" -H "X-Update-Token: $UPDATE_TOKEN" -d \
-              "{\"nodeVersion\": \"${{ needs.release-versions.outputs.node-version }}\", \"compatibleMongoVersions\": [\"4.4\", \"5.0\", \"6.0\"], \"commit\": \"$GITHUB_SHA\", \"tag\": \"$RC_VERSION\", \"branch\": \"$GIT_BRANCH\", \"artifactName\": \"$ARTIFACT_NAME\", \"releaseType\": \"$RC_RELEASE\"}" \
+              "{\"nodeVersion\": \"${{ needs.release-versions.outputs.node-version }}\", \"compatibleMongoVersions\": [\"5.0\", \"6.0\", \"7.0\"], \"commit\": \"$GITHUB_SHA\", \"tag\": \"$RC_VERSION\", \"branch\": \"$GIT_BRANCH\", \"artifactName\": \"$ARTIFACT_NAME\", \"releaseType\": \"$RC_RELEASE\"}" \
               https://releases.rocket.chat/update
 
           # Makes build fail if the release isn't there
diff --git a/apps/meteor/server/startup/serverRunning.js b/apps/meteor/server/startup/serverRunning.js
index 8d572036f16a..d642c006c4d2 100644
--- a/apps/meteor/server/startup/serverRunning.js
+++ b/apps/meteor/server/startup/serverRunning.js
@@ -78,8 +78,8 @@ Meteor.startup(async () => {
 			exitIfNotBypassed(process.env.BYPASS_NODEJS_VALIDATION);
 		}
 
-		if (!semver.satisfies(semver.coerce(mongoVersion), '>=4.4.0')) {
-			msg += ['', '', 'YOUR CURRENT MONGODB VERSION IS NOT SUPPORTED,', 'PLEASE UPGRADE TO VERSION 4.4 OR LATER'].join('\n');
+		if (semver.satisfies(semver.coerce(mongoVersion), '<5.0.0')) {
+			msg += ['', '', 'YOUR CURRENT MONGODB VERSION IS NOT SUPPORTED,', 'PLEASE UPGRADE TO VERSION 5.0 OR LATER'].join('\n');
 			showErrorBox('SERVER ERROR', msg);
 
 			exitIfNotBypassed(process.env.BYPASS_MONGO_VALIDATION);
@@ -88,11 +88,11 @@ Meteor.startup(async () => {
 		showSuccessBox('SERVER RUNNING', msg);
 
 		// Deprecation
-		if (!skipMongoDbDeprecationCheck && !semver.satisfies(semver.coerce(mongoVersion), '>=5.0.0')) {
+		if (!skipMongoDbDeprecationCheck && semver.satisfies(semver.coerce(mongoVersion), '<6.0.0')) {
 			msg = [
 				`YOUR CURRENT MONGODB VERSION (${mongoVersion}) IS DEPRECATED.`,
-				'IT WILL NOT BE SUPPORTED ON ROCKET.CHAT VERSION 7.0.0 AND GREATER,',
-				'PLEASE UPGRADE MONGODB TO VERSION 5.0 OR GREATER',
+				'IT WILL NOT BE SUPPORTED ON ROCKET.CHAT VERSION 8.0.0 AND GREATER,',
+				'PLEASE UPGRADE MONGODB TO VERSION 6.0 OR GREATER',
 			].join('\n');
 			showWarningBox('DEPRECATION', msg);
 
diff --git a/docker-compose-local.yml b/docker-compose-local.yml
index 16c64187461a..812899c7d946 100644
--- a/docker-compose-local.yml
+++ b/docker-compose-local.yml
@@ -112,7 +112,7 @@ services:
       - 'host.docker.internal:host-gateway'
     depends_on:
       - nats
-  
+
   queue-worker-service:
     platform: linux/amd64
     build:
@@ -128,7 +128,7 @@ services:
       - 'host.docker.internal:host-gateway'
     depends_on:
       - nats
-  
+
   omnichannel-transcript-service:
     platform: linux/amd64
     build:
@@ -144,9 +144,9 @@ services:
       - 'host.docker.internal:host-gateway'
     depends_on:
       - nats
-  
+
   mongo:
-    image: docker.io/bitnami/mongodb:4.4
+    image: docker.io/bitnami/mongodb:7.0
     restart: on-failure
     environment:
       MONGODB_REPLICA_SET_MODE: primary

From 5afa10b5cd35f989ef75224caefc27b1af4b988b Mon Sep 17 00:00:00 2001
From: Matheus Barbosa Silva
 <36537004+matheusbsilva137@users.noreply.github.com>
Date: Fri, 3 May 2024 10:30:41 -0300
Subject: [PATCH 77/94] chore!: Improve permissions check on channels endpoints
 (#32330)

* chore: Improve permission check on channels endpoints
---
 apps/meteor/app/api/server/v1/channels.ts     |  41 ++-
 .../tests/end-to-end/api/02-channels.js       | 279 +++++++++++++-----
 2 files changed, 217 insertions(+), 103 deletions(-)

diff --git a/apps/meteor/app/api/server/v1/channels.ts b/apps/meteor/app/api/server/v1/channels.ts
index 931cf4be2019..a713bfd29ac6 100644
--- a/apps/meteor/app/api/server/v1/channels.ts
+++ b/apps/meteor/app/api/server/v1/channels.ts
@@ -27,7 +27,7 @@ import { findUsersOfRoom } from '../../../../server/lib/findUsersOfRoom';
 import { hideRoomMethod } from '../../../../server/methods/hideRoom';
 import { removeUserFromRoomMethod } from '../../../../server/methods/removeUserFromRoom';
 import { canAccessRoomAsync } from '../../../authorization/server';
-import { hasPermissionAsync, hasAtLeastOnePermissionAsync } from '../../../authorization/server/functions/hasPermission';
+import { hasPermissionAsync } from '../../../authorization/server/functions/hasPermission';
 import { saveRoomSettings } from '../../../channel-settings/server/methods/saveRoomSettings';
 import { mountIntegrationQueryBasedOnPermissions } from '../../../integrations/server/lib/mountQueriesBasedOnPermission';
 import { addUsersToRoomMethod } from '../../../lib/server/methods/addUsersToRoom';
@@ -272,6 +272,7 @@ API.v1.addRoute(
 	{
 		authRequired: true,
 		validateParams: isChannelsMessagesProps,
+		permissionsRequired: ['view-c-room'],
 	},
 	{
 		async get() {
@@ -292,9 +293,6 @@ API.v1.addRoute(
 			) {
 				return API.v1.unauthorized();
 			}
-			if (!(await hasPermissionAsync(this.userId, 'view-c-room'))) {
-				return API.v1.unauthorized();
-			}
 
 			const { cursor, totalCount } = await Messages.findPaginated(ourQuery, {
 				sort: sort || { ts: -1 },
@@ -477,13 +475,10 @@ API.v1.addRoute(
 	{
 		authRequired: true,
 		validateParams: isChannelsConvertToTeamProps,
+		permissionsRequired: ['create-team'],
 	},
 	{
 		async post() {
-			if (!(await hasPermissionAsync(this.userId, 'create-team'))) {
-				return API.v1.unauthorized();
-			}
-
 			const { channelId, channelName } = this.bodyParams;
 
 			if (!channelId && !channelName) {
@@ -855,20 +850,22 @@ API.v1.addRoute(
 
 API.v1.addRoute(
 	'channels.getIntegrations',
-	{ authRequired: true },
 	{
-		async get() {
-			if (
-				!(await hasAtLeastOnePermissionAsync(this.userId, [
+		authRequired: true,
+		permissionsRequired: {
+			GET: {
+				permissions: [
 					'manage-outgoing-integrations',
 					'manage-own-outgoing-integrations',
 					'manage-incoming-integrations',
 					'manage-own-incoming-integrations',
-				]))
-			) {
-				return API.v1.unauthorized();
-			}
-
+				],
+				operation: 'hasAny',
+			},
+		},
+	},
+	{
+		async get() {
 			const findResult = await findChannelByIdOrName({
 				params: this.queryParams,
 				checkedArchived: false,
@@ -954,7 +951,12 @@ API.v1.addRoute(
 
 API.v1.addRoute(
 	'channels.list',
-	{ authRequired: true },
+	{
+		authRequired: true,
+		permissionsRequired: {
+			GET: { permissions: ['view-c-room', 'view-joined-room'], operation: 'hasAny' },
+		},
+	},
 	{
 		async get() {
 			const { offset, count } = await getPaginationItems(this.queryParams);
@@ -964,9 +966,6 @@ API.v1.addRoute(
 			const ourQuery: Record<string, any> = { ...query, t: 'c' };
 
 			if (!hasPermissionToSeeAllPublicChannels) {
-				if (!(await hasPermissionAsync(this.userId, 'view-joined-room'))) {
-					return API.v1.unauthorized();
-				}
 				const roomIds = (
 					await Subscriptions.findByUserIdAndType(this.userId, 'c', {
 						projection: { rid: 1 },
diff --git a/apps/meteor/tests/end-to-end/api/02-channels.js b/apps/meteor/tests/end-to-end/api/02-channels.js
index ded521f52509..64b9d2e14c4d 100644
--- a/apps/meteor/tests/end-to-end/api/02-channels.js
+++ b/apps/meteor/tests/end-to-end/api/02-channels.js
@@ -338,21 +338,98 @@ describe('[Channels]', function () {
 			.end(done);
 	});
 
-	it('/channels.list', (done) => {
-		request
-			.get(api('channels.list'))
-			.set(credentials)
-			.query({
-				roomId: channel._id,
-			})
-			.expect('Content-Type', 'application/json')
-			.expect(200)
-			.expect((res) => {
-				expect(res.body).to.have.property('success', true);
-				expect(res.body).to.have.property('count');
-				expect(res.body).to.have.property('total');
-			})
-			.end(done);
+	describe('/channels.list', () => {
+		let testChannel;
+		before(async () => {
+			await updatePermission('view-c-room', ['admin', 'user', 'bot', 'app', 'anonymous']);
+			await updatePermission('view-joined-room', ['guest', 'bot', 'app', 'anonymous']);
+			testChannel = (await createRoom({ type: 'c', name: `channels.messages.test.${Date.now()}` })).body.channel;
+		});
+
+		after(async () => {
+			await updatePermission('view-c-room', ['admin', 'user', 'bot', 'app', 'anonymous']);
+			await updatePermission('view-joined-room', ['guest', 'bot', 'app', 'anonymous']);
+			await deleteRoom({ type: 'c', roomId: testChannel._id });
+		});
+
+		it('should succesfully return a list of channels', async () => {
+			await request
+				.get(api('channels.list'))
+				.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('channels').that.is.an('array');
+					expect(res.body).to.have.property('count');
+					expect(res.body).to.have.property('total');
+				});
+		});
+
+		it('should correctly filter channel by id', async () => {
+			await request
+				.get(api('channels.list'))
+				.set(credentials)
+				.query({
+					query: JSON.stringify({
+						_id: testChannel._id,
+					}),
+				})
+				.expect('Content-Type', 'application/json')
+				.expect(200)
+				.expect((res) => {
+					expect(res.body).to.have.property('success', true);
+					expect(res.body).to.have.property('channels').that.is.an('array').of.length(1);
+					expect(res.body).to.have.property('count', 1);
+					expect(res.body).to.have.property('total');
+				});
+		});
+
+		it('should not be succesful when user does NOT have the permission to view channels or joined rooms', async () => {
+			await updatePermission('view-c-room', []);
+			await updatePermission('view-joined-room', []);
+			await request
+				.get(api('channels.list'))
+				.set(credentials)
+				.expect('Content-Type', 'application/json')
+				.expect(403)
+				.expect((res) => {
+					expect(res.body).to.have.property('success', false);
+					expect(res.body).to.have.property('error', 'User does not have the permissions required for this action [error-unauthorized]');
+				});
+		});
+
+		it('should be succesful when user does NOT have the permission to view channels, but can view joined rooms', async () => {
+			await updatePermission('view-c-room', []);
+			await updatePermission('view-joined-room', ['admin']);
+			await request
+				.get(api('channels.list'))
+				.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('channels').that.is.an('array');
+					expect(res.body).to.have.property('count');
+					expect(res.body).to.have.property('total');
+				});
+		});
+
+		it('should be succesful when user does NOT have the permission to view joined rooms, but can view channels', async () => {
+			await updatePermission('view-c-room', ['admin']);
+			await updatePermission('view-joined-room', []);
+			await request
+				.get(api('channels.list'))
+				.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('channels').that.is.an('array');
+					expect(res.body).to.have.property('count');
+					expect(res.body).to.have.property('total');
+				});
+		});
 	});
 
 	it('/channels.list.joined', (done) => {
@@ -1396,77 +1473,69 @@ describe('[Channels]', function () {
 			]);
 		});
 
-		it('should return the list of integrations of created channel and it should contain the integration created by user when the admin DOES have the permission', (done) => {
-			updatePermission('manage-incoming-integrations', ['admin']).then(() => {
-				request
-					.get(api('channels.getIntegrations'))
-					.set(credentials)
-					.query({
-						roomId: createdChannel._id,
-					})
-					.expect('Content-Type', 'application/json')
-					.expect(200)
-					.expect((res) => {
-						expect(res.body).to.have.property('success', true);
-						const integrationCreated = res.body.integrations.find(
-							(createdIntegration) => createdIntegration._id === integrationCreatedByAnUser._id,
-						);
-						expect(integrationCreated).to.be.an('object');
-						expect(integrationCreated._id).to.be.equal(integrationCreatedByAnUser._id);
-						expect(res.body).to.have.property('offset');
-						expect(res.body).to.have.property('total');
-					})
-					.end(done);
-			});
+		it('should return the list of integrations of created channel and it should contain the integration created by user when the admin DOES have the permission', async () => {
+			await updatePermission('manage-incoming-integrations', ['admin']);
+			await request
+				.get(api('channels.getIntegrations'))
+				.set(credentials)
+				.query({
+					roomId: createdChannel._id,
+				})
+				.expect('Content-Type', 'application/json')
+				.expect(200)
+				.expect((res) => {
+					expect(res.body).to.have.property('success', true);
+					const integrationCreated = res.body.integrations.find(
+						(createdIntegration) => createdIntegration._id === integrationCreatedByAnUser._id,
+					);
+					expect(integrationCreated).to.be.an('object');
+					expect(integrationCreated._id).to.be.equal(integrationCreatedByAnUser._id);
+					expect(res.body).to.have.property('offset');
+					expect(res.body).to.have.property('total');
+				});
 		});
 
-		it('should return the list of integrations created by the user only', (done) => {
-			updatePermission('manage-own-incoming-integrations', ['admin']).then(() => {
-				updatePermission('manage-incoming-integrations', []).then(() => {
-					request
-						.get(api('channels.getIntegrations'))
-						.set(credentials)
-						.query({
-							roomId: createdChannel._id,
-						})
-						.expect('Content-Type', 'application/json')
-						.expect(200)
-						.expect((res) => {
-							expect(res.body).to.have.property('success', true);
-							const integrationCreated = res.body.integrations.find(
-								(createdIntegration) => createdIntegration._id === integrationCreatedByAnUser._id,
-							);
-							expect(integrationCreated).to.be.equal(undefined);
-							expect(res.body).to.have.property('offset');
-							expect(res.body).to.have.property('total');
-						})
-						.end(done);
+		it('should return the list of integrations created by the user only', async () => {
+			await updatePermission('manage-own-incoming-integrations', ['admin']);
+			await updatePermission('manage-incoming-integrations', []);
+			await request
+				.get(api('channels.getIntegrations'))
+				.set(credentials)
+				.query({
+					roomId: createdChannel._id,
+				})
+				.expect('Content-Type', 'application/json')
+				.expect(200)
+				.expect((res) => {
+					expect(res.body).to.have.property('success', true);
+					const integrationCreated = res.body.integrations.find(
+						(createdIntegration) => createdIntegration._id === integrationCreatedByAnUser._id,
+					);
+					expect(integrationCreated).to.be.equal(undefined);
+					expect(res.body).to.have.property('offset');
+					expect(res.body).to.have.property('total');
 				});
-			});
 		});
 
-		it('should return unauthorized error when the user does not have any integrations permissions', (done) => {
-			updatePermission('manage-incoming-integrations', []).then(() => {
-				updatePermission('manage-own-incoming-integrations', []).then(() => {
-					updatePermission('manage-outgoing-integrations', []).then(() => {
-						updatePermission('manage-own-outgoing-integrations', []).then(() => {
-							request
-								.get(api('channels.getIntegrations'))
-								.set(credentials)
-								.query({
-									roomId: createdChannel._id,
-								})
-								.expect('Content-Type', 'application/json')
-								.expect(403)
-								.expect((res) => {
-									expect(res.body).to.have.property('success', false);
-									expect(res.body).to.have.property('error', 'unauthorized');
-								})
-								.end(done);
-						});
-					});
+		it('should return unauthorized error when the user does not have any integrations permissions', async () => {
+			await Promise.all([
+				updatePermission('manage-incoming-integrations', []),
+				updatePermission('manage-own-incoming-integrations', []),
+				updatePermission('manage-outgoing-integrations', []),
+				updatePermission('manage-own-outgoing-integrations', []),
+			]);
+			await request
+				.get(api('channels.getIntegrations'))
+				.set(credentials)
+				.query({
+					roomId: createdChannel._id,
+				})
+				.expect('Content-Type', 'application/json')
+				.expect(403)
+				.expect((res) => {
+					expect(res.body).to.have.property('success', false);
+					expect(res.body).to.have.property('error', 'User does not have the permissions required for this action [error-unauthorized]');
 				});
-			});
 		});
 	});
 
@@ -2041,7 +2110,7 @@ describe('[Channels]', function () {
 			]);
 		});
 
-		it('should fail to convert channel if lacking edit-room permission', async () => {
+		it('should fail to convert channel if lacking create-team permission', async () => {
 			await updatePermission('create-team', []);
 			await updatePermission('edit-room', ['admin']);
 
@@ -2055,7 +2124,7 @@ describe('[Channels]', function () {
 				});
 		});
 
-		it('should fail to convert channel if lacking create-team permission', async () => {
+		it('should fail to convert channel if lacking edit-room permission', async () => {
 			await updatePermission('create-team', ['admin']);
 			await updatePermission('edit-room', []);
 
@@ -2236,4 +2305,50 @@ describe('[Channels]', function () {
 				});
 		});
 	});
+
+	describe('[/channels.messages]', () => {
+		let testChannel;
+		before(async () => {
+			await updatePermission('view-c-room', ['admin', 'user', 'bot', 'app', 'anonymous']);
+			testChannel = (await createRoom({ type: 'c', name: `channels.messages.test.${Date.now()}` })).body.channel;
+		});
+
+		after(async () => {
+			await updatePermission('view-c-room', ['admin', 'user', 'bot', 'app', 'anonymous']);
+			await deleteRoom({ type: 'c', roomId: testChannel._id });
+		});
+
+		it('should return an empty array of messages when inspecting a new room', async () => {
+			await request
+				.get(api('channels.messages'))
+				.set(credentials)
+				.query({
+					roomId: testChannel._id,
+				})
+				.expect('Content-Type', 'application/json')
+				.expect(200)
+				.expect((res) => {
+					expect(res.body).to.have.property('success', true);
+					expect(res.body).to.have.property('messages').and.to.be.an('array').that.is.empty;
+					expect(res.body).to.have.property('count', 0);
+					expect(res.body).to.have.property('total', 0);
+				});
+		});
+
+		it('should not return message when the user does NOT have the necessary permission', async () => {
+			await updatePermission('view-c-room', []);
+			await request
+				.get(api('channels.messages'))
+				.set(credentials)
+				.query({
+					roomId: testChannel._id,
+				})
+				.expect('Content-Type', 'application/json')
+				.expect(403)
+				.expect((res) => {
+					expect(res.body).to.have.property('success', false);
+					expect(res.body).to.have.property('error', 'User does not have the permissions required for this action [error-unauthorized]');
+				});
+		});
+	});
 });

From e5c52d2faed8d28b717db3b1aab57561faba1c04 Mon Sep 17 00:00:00 2001
From: Matheus Barbosa Silva
 <36537004+matheusbsilva137@users.noreply.github.com>
Date: Fri, 3 May 2024 16:50:47 -0300
Subject: [PATCH 78/94] chore: Improve permissions check on cloud endpoints
 (#32331)

---
 apps/meteor/app/api/server/v1/cloud.ts | 25 ++++---------------------
 1 file changed, 4 insertions(+), 21 deletions(-)

diff --git a/apps/meteor/app/api/server/v1/cloud.ts b/apps/meteor/app/api/server/v1/cloud.ts
index 257612628bff..c0694deef4fa 100644
--- a/apps/meteor/app/api/server/v1/cloud.ts
+++ b/apps/meteor/app/api/server/v1/cloud.ts
@@ -2,7 +2,6 @@ import { check } from 'meteor/check';
 
 import { CloudWorkspaceRegistrationError } from '../../../../lib/errors/CloudWorkspaceRegistrationError';
 import { SystemLogger } from '../../../../server/lib/logger/system';
-import { hasPermissionAsync } from '../../../authorization/server/functions/hasPermission';
 import { hasRoleAsync } from '../../../authorization/server/functions/hasRole';
 import { getCheckoutUrl } from '../../../cloud/server/functions/getCheckoutUrl';
 import { getConfirmationPoll } from '../../../cloud/server/functions/getConfirmationPoll';
@@ -20,17 +19,13 @@ import { API } from '../api';
 
 API.v1.addRoute(
 	'cloud.manualRegister',
-	{ authRequired: true },
+	{ authRequired: true, permissionsRequired: ['register-on-cloud'] },
 	{
 		async post() {
 			check(this.bodyParams, {
 				cloudBlob: String,
 			});
 
-			if (!(await hasPermissionAsync(this.userId, 'register-on-cloud'))) {
-				return API.v1.unauthorized();
-			}
-
 			const registrationInfo = await retrieveRegistrationStatus();
 
 			if (registrationInfo.workspaceRegistered) {
@@ -48,7 +43,7 @@ API.v1.addRoute(
 
 API.v1.addRoute(
 	'cloud.createRegistrationIntent',
-	{ authRequired: true },
+	{ authRequired: true, permissionsRequired: ['manage-cloud'] },
 	{
 		async post() {
 			check(this.bodyParams, {
@@ -56,10 +51,6 @@ API.v1.addRoute(
 				email: String,
 			});
 
-			if (!(await hasPermissionAsync(this.userId, 'manage-cloud'))) {
-				return API.v1.unauthorized();
-			}
-
 			const intentData = await startRegisterWorkspaceSetupWizard(this.bodyParams.resend, this.bodyParams.email);
 
 			if (intentData) {
@@ -73,13 +64,9 @@ API.v1.addRoute(
 
 API.v1.addRoute(
 	'cloud.registerPreIntent',
-	{ authRequired: true },
+	{ authRequired: true, permissionsRequired: ['manage-cloud'] },
 	{
 		async post() {
-			if (!(await hasPermissionAsync(this.userId, 'manage-cloud'))) {
-				return API.v1.unauthorized();
-			}
-
 			return API.v1.success({ offline: !(await registerPreIntentWorkspaceWizard()) });
 		},
 	},
@@ -87,7 +74,7 @@ API.v1.addRoute(
 
 API.v1.addRoute(
 	'cloud.confirmationPoll',
-	{ authRequired: true },
+	{ authRequired: true, permissionsRequired: ['manage-cloud'] },
 	{
 		async get() {
 			const { deviceCode } = this.queryParams;
@@ -95,10 +82,6 @@ API.v1.addRoute(
 				deviceCode: String,
 			});
 
-			if (!(await hasPermissionAsync(this.userId, 'manage-cloud'))) {
-				return API.v1.unauthorized();
-			}
-
 			if (!deviceCode) {
 				return API.v1.failure('Invalid query');
 			}

From e72f328578e1c5d05bbd369cf9286688e05a28c9 Mon Sep 17 00:00:00 2001
From: Matheus Barbosa Silva
 <36537004+matheusbsilva137@users.noreply.github.com>
Date: Fri, 3 May 2024 17:05:32 -0300
Subject: [PATCH 79/94] chore: Improve permissions check on instances endpoints
 (#32334)

---
 apps/meteor/app/api/server/v1/instances.ts           | 7 +------
 apps/meteor/tests/end-to-end/api/00-miscellaneous.js | 2 +-
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/apps/meteor/app/api/server/v1/instances.ts b/apps/meteor/app/api/server/v1/instances.ts
index e5404ab3e53c..47f98c856f44 100644
--- a/apps/meteor/app/api/server/v1/instances.ts
+++ b/apps/meteor/app/api/server/v1/instances.ts
@@ -1,7 +1,6 @@
 import { InstanceStatus } from '@rocket.chat/models';
 
 import { isRunningMs } from '../../../../server/lib/isRunningMs';
-import { hasPermissionAsync } from '../../../authorization/server/functions/hasPermission';
 import { API } from '../api';
 import { getInstanceList } from '../helpers/getInstanceList';
 
@@ -15,13 +14,9 @@ const getConnections = (() => {
 
 API.v1.addRoute(
 	'instances.get',
-	{ authRequired: true },
+	{ authRequired: true, permissionsRequired: ['view-statistics'] },
 	{
 		async get() {
-			if (!(await hasPermissionAsync(this.userId, 'view-statistics'))) {
-				return API.v1.unauthorized();
-			}
-
 			const instanceRecords = await InstanceStatus.find().toArray();
 
 			const connections = await getConnections();
diff --git a/apps/meteor/tests/end-to-end/api/00-miscellaneous.js b/apps/meteor/tests/end-to-end/api/00-miscellaneous.js
index 1fe04b9b380a..b4fb482a4f5a 100644
--- a/apps/meteor/tests/end-to-end/api/00-miscellaneous.js
+++ b/apps/meteor/tests/end-to-end/api/00-miscellaneous.js
@@ -537,7 +537,7 @@ describe('miscellaneous', function () {
 				.expect(403)
 				.expect((res) => {
 					expect(res.body).to.have.property('success', false);
-					expect(res.body).to.have.property('error', 'unauthorized');
+					expect(res.body).to.have.property('error', 'User does not have the permissions required for this action [error-unauthorized]');
 				})
 				.end(done);
 		});

From d6c6281421b4d476aa17d6c8ef3424aca432e7de Mon Sep 17 00:00:00 2001
From: Matheus Barbosa Silva
 <36537004+matheusbsilva137@users.noreply.github.com>
Date: Fri, 3 May 2024 17:29:50 -0300
Subject: [PATCH 80/94] chore: Improve permissions check on LDAP endpoints
 (#32335)

---
 apps/meteor/app/api/server/v1/ldap.ts       | 13 +-----
 apps/meteor/tests/end-to-end/api/26-LDAP.ts | 52 ++++++++++++++++++++-
 2 files changed, 53 insertions(+), 12 deletions(-)

diff --git a/apps/meteor/app/api/server/v1/ldap.ts b/apps/meteor/app/api/server/v1/ldap.ts
index 9a057c9b0afc..4b112cfbf335 100644
--- a/apps/meteor/app/api/server/v1/ldap.ts
+++ b/apps/meteor/app/api/server/v1/ldap.ts
@@ -2,23 +2,18 @@ import { LDAP } from '@rocket.chat/core-services';
 import { Match, check } from 'meteor/check';
 
 import { SystemLogger } from '../../../../server/lib/logger/system';
-import { hasPermissionAsync } from '../../../authorization/server/functions/hasPermission';
 import { settings } from '../../../settings/server';
 import { API } from '../api';
 
 API.v1.addRoute(
 	'ldap.testConnection',
-	{ authRequired: true },
+	{ authRequired: true, permissionsRequired: ['test-admin-options'] },
 	{
 		async post() {
 			if (!this.userId) {
 				throw new Error('error-invalid-user');
 			}
 
-			if (!(await hasPermissionAsync(this.userId, 'test-admin-options'))) {
-				throw new Error('error-not-authorized');
-			}
-
 			if (settings.get<boolean>('LDAP_Enable') !== true) {
 				throw new Error('LDAP_disabled');
 			}
@@ -39,7 +34,7 @@ API.v1.addRoute(
 
 API.v1.addRoute(
 	'ldap.testSearch',
-	{ authRequired: true },
+	{ authRequired: true, permissionsRequired: ['test-admin-options'] },
 	{
 		async post() {
 			check(
@@ -53,10 +48,6 @@ API.v1.addRoute(
 				throw new Error('error-invalid-user');
 			}
 
-			if (!(await hasPermissionAsync(this.userId, 'test-admin-options'))) {
-				throw new Error('error-not-authorized');
-			}
-
 			if (settings.get('LDAP_Enable') !== true) {
 				throw new Error('LDAP_disabled');
 			}
diff --git a/apps/meteor/tests/end-to-end/api/26-LDAP.ts b/apps/meteor/tests/end-to-end/api/26-LDAP.ts
index b4bb796b1e52..c5740a1178db 100644
--- a/apps/meteor/tests/end-to-end/api/26-LDAP.ts
+++ b/apps/meteor/tests/end-to-end/api/26-LDAP.ts
@@ -1,8 +1,9 @@
 import { expect } from 'chai';
-import { before, describe, it } from 'mocha';
+import { before, after, describe, it } from 'mocha';
 import type { Response } from 'supertest';
 
 import { getCredentials, api, request, credentials } from '../../data/api-data.js';
+import { updatePermission } from '../../data/permissions.helper';
 
 describe('LDAP', function () {
 	this.retries(0);
@@ -44,4 +45,53 @@ describe('LDAP', function () {
 				});
 		});
 	});
+
+	describe('[/ldap.testSearch]', () => {
+		before(async () => {
+			return updatePermission('test-admin-options', ['admin']);
+		});
+
+		after(async () => {
+			return updatePermission('test-admin-options', ['admin']);
+		});
+
+		it('should not allow testing LDAP search if user does NOT have the test-admin-options permission', async () => {
+			await updatePermission('test-admin-options', []);
+			await request
+				.post(api('ldap.testSearch'))
+				.set(credentials)
+				.send({
+					username: 'test-search',
+				})
+				.expect('Content-Type', 'application/json')
+				.expect(403)
+				.expect((res: Response) => {
+					expect(res.body).to.have.property('success', false);
+					expect(res.body).to.have.property('error', 'User does not have the permissions required for this action [error-unauthorized]');
+				});
+		});
+	});
+
+	describe('[/ldap.testConnection]', () => {
+		before(async () => {
+			return updatePermission('test-admin-options', ['admin']);
+		});
+
+		after(async () => {
+			return updatePermission('test-admin-options', ['admin']);
+		});
+
+		it('should not allow testing LDAP connection if user does NOT have the test-admin-options permission', async () => {
+			await updatePermission('test-admin-options', []);
+			await request
+				.post(api('ldap.testConnection'))
+				.set(credentials)
+				.expect('Content-Type', 'application/json')
+				.expect(403)
+				.expect((res: Response) => {
+					expect(res.body).to.have.property('success', false);
+					expect(res.body).to.have.property('error', 'User does not have the permissions required for this action [error-unauthorized]');
+				});
+		});
+	});
 });

From 4bb64d248aaaabfa93d712f39436d95c769f011f Mon Sep 17 00:00:00 2001
From: Matheus Barbosa Silva
 <36537004+matheusbsilva137@users.noreply.github.com>
Date: Fri, 3 May 2024 17:30:48 -0300
Subject: [PATCH 81/94] chore!: Improve permissions check on mailer endpoints
 (#32336)

---
 apps/meteor/app/api/server/v1/mailer.ts       |  6 +---
 .../end-to-end/api/livechat/12-mailer.ts      | 32 +++++++++++++++++--
 2 files changed, 31 insertions(+), 7 deletions(-)

diff --git a/apps/meteor/app/api/server/v1/mailer.ts b/apps/meteor/app/api/server/v1/mailer.ts
index 767868090b91..56229e26dc31 100644
--- a/apps/meteor/app/api/server/v1/mailer.ts
+++ b/apps/meteor/app/api/server/v1/mailer.ts
@@ -1,6 +1,5 @@
 import { isMailerProps, isMailerUnsubscribeProps } from '@rocket.chat/rest-typings';
 
-import { hasPermissionAsync } from '../../../authorization/server/functions/hasPermission';
 import { API } from '../api';
 
 API.v1.addRoute(
@@ -8,13 +7,10 @@ API.v1.addRoute(
 	{
 		authRequired: true,
 		validateParams: isMailerProps,
+		permissionsRequired: ['send-mail'],
 	},
 	{
 		async post() {
-			if (!(await hasPermissionAsync(this.userId, 'send-mail'))) {
-				throw new Error('error-not-allowed');
-			}
-
 			const { from, subject, body, dryrun, query } = this.bodyParams;
 
 			const result = await Meteor.callAsync('Mailer.sendMail', from, subject, body, Boolean(dryrun), query);
diff --git a/apps/meteor/tests/end-to-end/api/livechat/12-mailer.ts b/apps/meteor/tests/end-to-end/api/livechat/12-mailer.ts
index 01a47594620d..c9bdaa613985 100644
--- a/apps/meteor/tests/end-to-end/api/livechat/12-mailer.ts
+++ b/apps/meteor/tests/end-to-end/api/livechat/12-mailer.ts
@@ -1,13 +1,22 @@
 import { expect } from 'chai';
-import { before, describe, it } from 'mocha';
+import { before, after, describe, it } from 'mocha';
 import type { Response } from 'supertest';
 
 import { api, request, credentials, getCredentials } from '../../../data/api-data';
+import { updatePermission } from '../../../data/permissions.helper';
 
 describe('Mailer', () => {
 	before((done) => getCredentials(done));
 
-	describe('POST mailer', () => {
+	describe('POST mailer', async () => {
+		before(async () => {
+			return updatePermission('send-mail', ['admin']);
+		});
+
+		after(async () => {
+			return updatePermission('send-mail', ['admin']);
+		});
+
 		it('should send an email if the payload is correct', async () => {
 			await request
 				.post(api('mailer'))
@@ -58,6 +67,25 @@ describe('Mailer', () => {
 					expect(res.body).to.have.property('success', false);
 				});
 		});
+		it('should throw an error if user does NOT have the send-mail permission', async () => {
+			await updatePermission('send-mail', []);
+			await request
+				.post(api('mailer'))
+				.set(credentials)
+				.send({
+					from: 'test-mail@test.com',
+					subject: 'Test email subject',
+					body: 'Test email body',
+					dryrun: true,
+					query: '',
+				})
+				.expect('Content-Type', 'application/json')
+				.expect(403)
+				.expect((res: Response) => {
+					expect(res.body).to.have.property('success', false);
+					expect(res.body).to.have.property('error', 'User does not have the permissions required for this action [error-unauthorized]');
+				});
+		});
 	});
 });
 

From 64b0bdea35428cb27583eb8707ec8e918ff2935d Mon Sep 17 00:00:00 2001
From: Matheus Barbosa Silva
 <36537004+matheusbsilva137@users.noreply.github.com>
Date: Mon, 6 May 2024 21:24:13 -0300
Subject: [PATCH 82/94] chore: Improve permissions check on users endpoints
 (#32353)

---
 apps/meteor/app/api/server/v1/users.ts       | 38 ++++++--------------
 apps/meteor/tests/end-to-end/api/01-users.js | 11 +++---
 2 files changed, 18 insertions(+), 31 deletions(-)

diff --git a/apps/meteor/app/api/server/v1/users.ts b/apps/meteor/app/api/server/v1/users.ts
index c26957fa1991..3aacae80301e 100644
--- a/apps/meteor/app/api/server/v1/users.ts
+++ b/apps/meteor/app/api/server/v1/users.ts
@@ -309,13 +309,9 @@ API.v1.addRoute(
 
 API.v1.addRoute(
 	'users.delete',
-	{ authRequired: true },
+	{ authRequired: true, permissionsRequired: ['delete-user'] },
 	{
 		async post() {
-			if (!(await hasPermissionAsync(this.userId, 'delete-user'))) {
-				return API.v1.unauthorized();
-			}
-
 			const user = await getUserFromParams(this.bodyParams);
 			const { confirmRelinquish = false } = this.bodyParams;
 
@@ -350,16 +346,15 @@ API.v1.addRoute(
 
 API.v1.addRoute(
 	'users.setActiveStatus',
-	{ authRequired: true, validateParams: isUserSetActiveStatusParamsPOST },
+	{
+		authRequired: true,
+		validateParams: isUserSetActiveStatusParamsPOST,
+		permissionsRequired: {
+			POST: { permissions: ['edit-other-user-active-status', 'manage-moderation-actions'], operation: 'hasAny' },
+		},
+	},
 	{
 		async post() {
-			if (
-				!(await hasPermissionAsync(this.userId, 'edit-other-user-active-status')) &&
-				!(await hasPermissionAsync(this.userId, 'manage-moderation-actions'))
-			) {
-				return API.v1.unauthorized();
-			}
-
 			const { userId, activeStatus, confirmRelinquish = false } = this.bodyParams;
 			await Meteor.callAsync('setUserActiveStatus', userId, activeStatus, confirmRelinquish);
 
@@ -376,13 +371,9 @@ API.v1.addRoute(
 
 API.v1.addRoute(
 	'users.deactivateIdle',
-	{ authRequired: true, validateParams: isUserDeactivateIdleParamsPOST },
+	{ authRequired: true, validateParams: isUserDeactivateIdleParamsPOST, permissionsRequired: ['edit-other-user-active-status'] },
 	{
 		async post() {
-			if (!(await hasPermissionAsync(this.userId, 'edit-other-user-active-status'))) {
-				return API.v1.unauthorized();
-			}
-
 			const { daysIdle, role = 'user' } = this.bodyParams;
 
 			const lastLoggedIn = new Date();
@@ -454,13 +445,10 @@ API.v1.addRoute(
 	{
 		authRequired: true,
 		queryOperations: ['$or', '$and'],
+		permissionsRequired: ['view-d-room'],
 	},
 	{
 		async get() {
-			if (!(await hasPermissionAsync(this.userId, 'view-d-room'))) {
-				return API.v1.unauthorized();
-			}
-
 			if (
 				settings.get('API_Apply_permission_view-outside-room_on_users-list') &&
 				!(await hasPermissionAsync(this.userId, 'view-outside-room'))
@@ -806,13 +794,9 @@ API.v1.addRoute(
 
 API.v1.addRoute(
 	'users.getPersonalAccessTokens',
-	{ authRequired: true },
+	{ authRequired: true, permissionsRequired: ['create-personal-access-tokens'] },
 	{
 		async get() {
-			if (!(await hasPermissionAsync(this.userId, 'create-personal-access-tokens'))) {
-				throw new Meteor.Error('not-authorized', 'Not Authorized');
-			}
-
 			const user = (await Users.getLoginTokensByUserId(this.userId).toArray())[0] as unknown as IUser | undefined;
 
 			const isPersonalAccessToken = (loginToken: ILoginToken | IPersonalAccessToken): loginToken is IPersonalAccessToken =>
diff --git a/apps/meteor/tests/end-to-end/api/01-users.js b/apps/meteor/tests/end-to-end/api/01-users.js
index ee53820daa2a..6abe01f6dab2 100644
--- a/apps/meteor/tests/end-to-end/api/01-users.js
+++ b/apps/meteor/tests/end-to-end/api/01-users.js
@@ -2660,7 +2660,7 @@ describe('[Users]', function () {
 				.expect(403)
 				.expect((res) => {
 					expect(res.body).to.have.property('success', false);
-					expect(res.body).to.have.property('error', 'unauthorized');
+					expect(res.body).to.have.property('error', 'User does not have the permissions required for this action [error-unauthorized]');
 				});
 		});
 
@@ -2923,10 +2923,10 @@ describe('[Users]', function () {
 						.get(api('users.getPersonalAccessTokens'))
 						.set(credentials)
 						.expect('Content-Type', 'application/json')
-						.expect(400)
+						.expect(403)
 						.expect((res) => {
 							expect(res.body).to.have.property('success', false);
-							expect(res.body.errorType).to.be.equal('not-authorized');
+							expect(res.body.error).to.be.equal('User does not have the permissions required for this action [error-unauthorized]');
 						})
 						.end(done);
 				});
@@ -3047,6 +3047,7 @@ describe('[Users]', function () {
 					.expect(403)
 					.expect((res) => {
 						expect(res.body).to.have.property('success', false);
+						expect(res.body).to.have.property('error', 'User does not have the permissions required for this action [error-unauthorized]');
 					})
 					.end(done);
 			});
@@ -3063,6 +3064,7 @@ describe('[Users]', function () {
 				.expect(403)
 				.expect((res) => {
 					expect(res.body).to.have.property('success', false);
+					expect(res.body).to.have.property('error', 'User does not have the permissions required for this action [error-unauthorized]');
 				})
 				.end(done);
 		});
@@ -3079,6 +3081,7 @@ describe('[Users]', function () {
 					.expect(403)
 					.expect((res) => {
 						expect(res.body).to.have.property('success', false);
+						expect(res.body).to.have.property('error', 'User does not have the permissions required for this action [error-unauthorized]');
 					})
 					.end(done);
 			});
@@ -3293,7 +3296,7 @@ describe('[Users]', function () {
 					.expect(403)
 					.expect((res) => {
 						expect(res.body).to.have.property('success', false);
-						expect(res.body).to.have.property('error', 'unauthorized');
+						expect(res.body).to.have.property('error', 'User does not have the permissions required for this action [error-unauthorized]');
 					})
 					.end(done);
 			});

From a82d47837e5b30090302140511d2d7a26bb0da60 Mon Sep 17 00:00:00 2001
From: Matheus Barbosa Silva
 <36537004+matheusbsilva137@users.noreply.github.com>
Date: Tue, 7 May 2024 12:54:20 -0300
Subject: [PATCH 83/94] chore!: Improve permissions check on groups endpoints
 (#32332)

---
 apps/meteor/app/api/server/v1/groups.ts       | 31 +++++-----
 apps/meteor/tests/end-to-end/api/03-groups.js | 58 ++++++++++---------
 2 files changed, 44 insertions(+), 45 deletions(-)

diff --git a/apps/meteor/app/api/server/v1/groups.ts b/apps/meteor/app/api/server/v1/groups.ts
index 34deb57304fc..df03e38dc147 100644
--- a/apps/meteor/app/api/server/v1/groups.ts
+++ b/apps/meteor/app/api/server/v1/groups.ts
@@ -9,11 +9,7 @@ import { findUsersOfRoom } from '../../../../server/lib/findUsersOfRoom';
 import { hideRoomMethod } from '../../../../server/methods/hideRoom';
 import { removeUserFromRoomMethod } from '../../../../server/methods/removeUserFromRoom';
 import { canAccessRoomAsync, roomAccessAttributes } from '../../../authorization/server';
-import {
-	hasAllPermissionAsync,
-	hasAtLeastOnePermissionAsync,
-	hasPermissionAsync,
-} from '../../../authorization/server/functions/hasPermission';
+import { hasAllPermissionAsync, hasPermissionAsync } from '../../../authorization/server/functions/hasPermission';
 import { saveRoomSettings } from '../../../channel-settings/server/methods/saveRoomSettings';
 import { mountIntegrationQueryBasedOnPermissions } from '../../../integrations/server/lib/mountQueriesBasedOnPermission';
 import { createPrivateGroupMethod } from '../../../lib/server/methods/createPrivateGroup';
@@ -412,20 +408,22 @@ API.v1.addRoute(
 
 API.v1.addRoute(
 	'groups.getIntegrations',
-	{ authRequired: true },
 	{
-		async get() {
-			if (
-				!(await hasAtLeastOnePermissionAsync(this.userId, [
+		authRequired: true,
+		permissionsRequired: {
+			GET: {
+				permissions: [
 					'manage-outgoing-integrations',
 					'manage-own-outgoing-integrations',
 					'manage-incoming-integrations',
 					'manage-own-incoming-integrations',
-				]))
-			) {
-				return API.v1.unauthorized();
-			}
-
+				],
+				operation: 'hasAny',
+			},
+		},
+	},
+	{
+		async get() {
 			const findResult = await findPrivateGroupByIdOrName({
 				params: this.queryParams,
 				userId: this.userId,
@@ -670,12 +668,9 @@ API.v1.addRoute(
 
 API.v1.addRoute(
 	'groups.listAll',
-	{ authRequired: true },
+	{ authRequired: true, permissionsRequired: ['view-room-administration'] },
 	{
 		async get() {
-			if (!(await hasPermissionAsync(this.userId, 'view-room-administration'))) {
-				return API.v1.unauthorized();
-			}
 			const { offset, count } = await getPaginationItems(this.queryParams);
 			const { sort, fields, query } = await this.parseJsonQuery();
 			const ourQuery = Object.assign({}, query, { t: 'p' as RoomType });
diff --git a/apps/meteor/tests/end-to-end/api/03-groups.js b/apps/meteor/tests/end-to-end/api/03-groups.js
index 2bf6bc774999..0c025ef3b485 100644
--- a/apps/meteor/tests/end-to-end/api/03-groups.js
+++ b/apps/meteor/tests/end-to-end/api/03-groups.js
@@ -1143,33 +1143,37 @@ describe('[Groups]', function () {
 	});
 
 	describe('/groups.listAll', () => {
-		it('should fail if the user doesnt have view-room-administration permission', (done) => {
-			updatePermission('view-room-administration', []).then(() => {
-				request
-					.get(api('groups.listAll'))
-					.set(credentials)
-					.expect('Content-Type', 'application/json')
-					.expect(403)
-					.expect((res) => {
-						expect(res.body).to.have.property('success', false);
-						expect(res.body).to.have.property('error', 'unauthorized');
-					})
-					.end(done);
-			});
+		before(async () => {
+			return updatePermission('view-room-administration', ['admin']);
 		});
-		it('should succeed if user has view-room-administration permission', (done) => {
-			updatePermission('view-room-administration', ['admin']).then(() => {
-				request
-					.get(api('groups.listAll'))
-					.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('groups').and.to.be.an('array');
-					})
-					.end(done);
-			});
+
+		after(async () => {
+			return updatePermission('view-room-administration', ['admin']);
+		});
+
+		it('should succeed if user has view-room-administration permission', async () => {
+			await request
+				.get(api('groups.listAll'))
+				.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('groups').and.to.be.an('array');
+				});
+		});
+
+		it('should fail if the user doesnt have view-room-administration permission', async () => {
+			await updatePermission('view-room-administration', []);
+			await request
+				.get(api('groups.listAll'))
+				.set(credentials)
+				.expect('Content-Type', 'application/json')
+				.expect(403)
+				.expect((res) => {
+					expect(res.body).to.have.property('success', false);
+					expect(res.body).to.have.property('error', 'User does not have the permissions required for this action [error-unauthorized]');
+				});
 		});
 	});
 
@@ -1333,7 +1337,7 @@ describe('[Groups]', function () {
 				.expect(403)
 				.expect((res) => {
 					expect(res.body).to.have.property('success', false);
-					expect(res.body).to.have.property('error', 'unauthorized');
+					expect(res.body).to.have.property('error', 'User does not have the permissions required for this action [error-unauthorized]');
 				});
 		});
 	});

From 11639da8cd286adceedaf80e1fb92b320a4b5192 Mon Sep 17 00:00:00 2001
From: Matheus Barbosa Silva
 <36537004+matheusbsilva137@users.noreply.github.com>
Date: Tue, 7 May 2024 15:13:42 -0300
Subject: [PATCH 84/94] chore!: Improve permissions check on integrations
 endpoints (#32355)

---
 apps/meteor/app/api/server/v1/integrations.ts | 54 ++++++++-------
 .../api/06-outgoing-integrations.js           | 69 +++++++++----------
 .../api/07-incoming-integrations.js           | 41 +++++------
 3 files changed, 81 insertions(+), 83 deletions(-)

diff --git a/apps/meteor/app/api/server/v1/integrations.ts b/apps/meteor/app/api/server/v1/integrations.ts
index f7eb9e5a1467..5306e7fbbea3 100644
--- a/apps/meteor/app/api/server/v1/integrations.ts
+++ b/apps/meteor/app/api/server/v1/integrations.ts
@@ -11,7 +11,6 @@ import { Match, check } from 'meteor/check';
 import { Meteor } from 'meteor/meteor';
 import type { Filter } from 'mongodb';
 
-import { hasAtLeastOnePermissionAsync } from '../../../authorization/server/functions/hasPermission';
 import {
 	mountIntegrationHistoryQueryBasedOnPermissions,
 	mountIntegrationQueryBasedOnPermissions,
@@ -43,15 +42,17 @@ API.v1.addRoute(
 
 API.v1.addRoute(
 	'integrations.history',
-	{ authRequired: true, validateParams: isIntegrationsHistoryProps },
+	{
+		authRequired: true,
+		validateParams: isIntegrationsHistoryProps,
+		permissionsRequired: {
+			GET: { permissions: ['manage-outgoing-integrations', 'manage-own-outgoing-integrations'], operation: 'hasAny' },
+		},
+	},
 	{
 		async get() {
 			const { userId, queryParams } = this;
 
-			if (!(await hasAtLeastOnePermissionAsync(userId, ['manage-outgoing-integrations', 'manage-own-outgoing-integrations']))) {
-				return API.v1.unauthorized();
-			}
-
 			if (!queryParams.id || queryParams.id.trim() === '') {
 				return API.v1.failure('Invalid integration id.');
 			}
@@ -83,20 +84,22 @@ API.v1.addRoute(
 
 API.v1.addRoute(
 	'integrations.list',
-	{ authRequired: true },
 	{
-		async get() {
-			if (
-				!(await hasAtLeastOnePermissionAsync(this.userId, [
+		authRequired: true,
+		permissionsRequired: {
+			GET: {
+				permissions: [
 					'manage-outgoing-integrations',
 					'manage-own-outgoing-integrations',
 					'manage-incoming-integrations',
 					'manage-own-incoming-integrations',
-				]))
-			) {
-				return API.v1.unauthorized();
-			}
-
+				],
+				operation: 'hasAny',
+			},
+		},
+	},
+	{
+		async get() {
 			const { offset, count } = await getPaginationItems(this.queryParams);
 			const { sort, fields: projection, query } = await this.parseJsonQuery();
 
@@ -124,20 +127,23 @@ API.v1.addRoute(
 
 API.v1.addRoute(
 	'integrations.remove',
-	{ authRequired: true, validateParams: isIntegrationsRemoveProps },
 	{
-		async post() {
-			if (
-				!(await hasAtLeastOnePermissionAsync(this.userId, [
+		authRequired: true,
+		validateParams: isIntegrationsRemoveProps,
+		permissionsRequired: {
+			POST: {
+				permissions: [
 					'manage-outgoing-integrations',
 					'manage-own-outgoing-integrations',
 					'manage-incoming-integrations',
 					'manage-own-incoming-integrations',
-				]))
-			) {
-				return API.v1.unauthorized();
-			}
-
+				],
+				operation: 'hasAny',
+			},
+		},
+	},
+	{
+		async post() {
 			const { bodyParams } = this;
 
 			let integration: IIntegration | null = null;
diff --git a/apps/meteor/tests/end-to-end/api/06-outgoing-integrations.js b/apps/meteor/tests/end-to-end/api/06-outgoing-integrations.js
index 120b467ec1b8..c14cfde70817 100644
--- a/apps/meteor/tests/end-to-end/api/06-outgoing-integrations.js
+++ b/apps/meteor/tests/end-to-end/api/06-outgoing-integrations.js
@@ -284,47 +284,42 @@ describe('[Outgoing Integrations]', function () {
 			});
 		});
 
-		it('should return unauthorized error when the user does not have any integrations permissions', (done) => {
-			updatePermission('manage-incoming-integrations', []).then(() => {
-				updatePermission('manage-own-incoming-integrations', []).then(() => {
-					updatePermission('manage-outgoing-integrations', []).then(() => {
-						updatePermission('manage-outgoing-integrations', []).then(() => {
-							request
-								.get(api('integrations.list'))
-								.set(credentials)
-								.expect('Content-Type', 'application/json')
-								.expect(403)
-								.expect((res) => {
-									expect(res.body).to.have.property('success', false);
-									expect(res.body).to.have.property('error', 'unauthorized');
-								})
-								.end(done);
-						});
-					});
+		it('should return unauthorized error when the user does not have any integrations permissions', async () => {
+			await Promise.all([
+				updatePermission('manage-incoming-integrations', []),
+				updatePermission('manage-own-incoming-integrations', []),
+				updatePermission('manage-outgoing-integrations', []),
+				updatePermission('manage-outgoing-integrations', []),
+			]);
+
+			await request
+				.get(api('integrations.list'))
+				.set(credentials)
+				.expect('Content-Type', 'application/json')
+				.expect(403)
+				.expect((res) => {
+					expect(res.body).to.have.property('success', false);
+					expect(res.body).to.have.property('error', 'User does not have the permissions required for this action [error-unauthorized]');
 				});
-			});
 		});
 	});
 
 	describe('[/integrations.history]', () => {
-		it('should return an error when the user DOES NOT the necessary permission', (done) => {
-			updatePermission('manage-outgoing-integrations', []).then(() => {
-				updatePermission('manage-own-outgoing-integrations', []).then(() => {
-					request
-						.get(api('integrations.history'))
-						.set(credentials)
-						.query({
-							id: integration._id,
-						})
-						.expect('Content-Type', 'application/json')
-						.expect(403)
-						.expect((res) => {
-							expect(res.body).to.have.property('success', false);
-							expect(res.body).to.have.property('error', 'unauthorized');
-						})
-						.end(done);
+		it('should return an error when the user DOES NOT the necessary permission', async () => {
+			await updatePermission('manage-outgoing-integrations', []);
+			await updatePermission('manage-own-outgoing-integrations', []);
+			await request
+				.get(api('integrations.history'))
+				.set(credentials)
+				.query({
+					id: integration._id,
+				})
+				.expect('Content-Type', 'application/json')
+				.expect(403)
+				.expect((res) => {
+					expect(res.body).to.have.property('success', false);
+					expect(res.body).to.have.property('error', 'User does not have the permissions required for this action [error-unauthorized]');
 				});
-			});
 		});
 
 		it('should return the history of outgoing integrations', (done) => {
@@ -457,7 +452,7 @@ describe('[Outgoing Integrations]', function () {
 					.expect(403)
 					.expect((res) => {
 						expect(res.body).to.have.property('success', false);
-						expect(res.body).to.have.property('error', 'unauthorized');
+						expect(res.body).to.have.property('error', 'User does not have the permissions required for this action [error-unauthorized]');
 					})
 					.end(done);
 			});
@@ -476,7 +471,7 @@ describe('[Outgoing Integrations]', function () {
 					.expect(403)
 					.expect((res) => {
 						expect(res.body).to.have.property('success', false);
-						expect(res.body).to.have.property('error', 'unauthorized');
+						expect(res.body).to.have.property('error', 'User does not have the permissions required for this action [error-unauthorized]');
 					})
 					.end(done);
 			});
diff --git a/apps/meteor/tests/end-to-end/api/07-incoming-integrations.js b/apps/meteor/tests/end-to-end/api/07-incoming-integrations.js
index 7c325a9e3cd2..beffbcae63a2 100644
--- a/apps/meteor/tests/end-to-end/api/07-incoming-integrations.js
+++ b/apps/meteor/tests/end-to-end/api/07-incoming-integrations.js
@@ -309,7 +309,7 @@ describe('[Incoming Integrations]', function () {
 	});
 
 	describe('[/integrations.history]', () => {
-		it('should return an error when trying to get history of incoming integrations', (done) => {
+		it('should return an error when trying to get history of incoming integrations if user does NOT have enough permissions', (done) => {
 			request
 				.get(api('integrations.history'))
 				.set(credentials)
@@ -320,7 +320,7 @@ describe('[Incoming Integrations]', function () {
 				.expect(403)
 				.expect((res) => {
 					expect(res.body).to.have.property('success', false);
-					expect(res.body).to.have.property('error', 'unauthorized');
+					expect(res.body).to.have.property('error', 'User does not have the permissions required for this action [error-unauthorized]');
 				})
 				.end(done);
 		});
@@ -395,25 +395,22 @@ describe('[Incoming Integrations]', function () {
 			});
 		});
 
-		it('should return unauthorized error when the user does not have any integrations permissions', (done) => {
-			updatePermission('manage-incoming-integrations', []).then(() => {
-				updatePermission('manage-own-incoming-integrations', []).then(() => {
-					updatePermission('manage-outgoing-integrations', []).then(() => {
-						updatePermission('manage-outgoing-integrations', []).then(() => {
-							request
-								.get(api('integrations.list'))
-								.set(credentials)
-								.expect('Content-Type', 'application/json')
-								.expect(403)
-								.expect((res) => {
-									expect(res.body).to.have.property('success', false);
-									expect(res.body).to.have.property('error', 'unauthorized');
-								})
-								.end(done);
-						});
-					});
+		it('should return unauthorized error when the user does not have any integrations permissions', async () => {
+			await Promise.all([
+				updatePermission('manage-incoming-integrations', []),
+				updatePermission('manage-own-incoming-integrations', []),
+				updatePermission('manage-outgoing-integrations', []),
+				updatePermission('manage-outgoing-integrations', []),
+			]);
+			await request
+				.get(api('integrations.list'))
+				.set(credentials)
+				.expect('Content-Type', 'application/json')
+				.expect(403)
+				.expect((res) => {
+					expect(res.body).to.have.property('success', false);
+					expect(res.body).to.have.property('error', 'User does not have the permissions required for this action [error-unauthorized]');
 				});
-			});
 		});
 	});
 
@@ -570,7 +567,7 @@ describe('[Incoming Integrations]', function () {
 					.expect(403)
 					.expect((res) => {
 						expect(res.body).to.have.property('success', false);
-						expect(res.body).to.have.property('error', 'unauthorized');
+						expect(res.body).to.have.property('error', 'User does not have the permissions required for this action [error-unauthorized]');
 					})
 					.end(done);
 			});
@@ -589,7 +586,7 @@ describe('[Incoming Integrations]', function () {
 					.expect(403)
 					.expect((res) => {
 						expect(res.body).to.have.property('success', false);
-						expect(res.body).to.have.property('error', 'unauthorized');
+						expect(res.body).to.have.property('error', 'User does not have the permissions required for this action [error-unauthorized]');
 					})
 					.end(done);
 			});

From 7535004192f34d987c5a1439375ed153d70c5bc0 Mon Sep 17 00:00:00 2001
From: Matheus Barbosa Silva
 <36537004+matheusbsilva137@users.noreply.github.com>
Date: Thu, 9 May 2024 17:48:28 -0300
Subject: [PATCH 85/94] chore!: Improve permissions check on oauth-apps
 endpoints (#32338)

Co-authored-by: Marcos Spessatto Defendi <marcos.defendi@rocket.chat>
---
 apps/meteor/app/api/server/v1/oauthapps.ts    |  28 +---
 .../tests/end-to-end/api/18-oauthapps.js      | 127 ++++++++++++------
 2 files changed, 90 insertions(+), 65 deletions(-)

diff --git a/apps/meteor/app/api/server/v1/oauthapps.ts b/apps/meteor/app/api/server/v1/oauthapps.ts
index 034a73f54104..d338eb6ee33f 100644
--- a/apps/meteor/app/api/server/v1/oauthapps.ts
+++ b/apps/meteor/app/api/server/v1/oauthapps.ts
@@ -1,20 +1,15 @@
 import { OAuthApps } from '@rocket.chat/models';
 import { isUpdateOAuthAppParams, isOauthAppsGetParams, isOauthAppsAddParams, isDeleteOAuthAppParams } from '@rocket.chat/rest-typings';
 
-import { hasPermissionAsync } from '../../../authorization/server/functions/hasPermission';
 import { apiDeprecationLogger } from '../../../lib/server/lib/deprecationWarningLogger';
 import { addOAuthApp } from '../../../oauth2-server-config/server/admin/functions/addOAuthApp';
 import { API } from '../api';
 
 API.v1.addRoute(
 	'oauth-apps.list',
-	{ authRequired: true },
+	{ authRequired: true, permissionsRequired: ['manage-oauth-apps'] },
 	{
 		async get() {
-			if (!(await hasPermissionAsync(this.userId, 'manage-oauth-apps'))) {
-				throw new Error('error-not-allowed');
-			}
-
 			return API.v1.success({
 				oauthApps: await OAuthApps.find().toArray(),
 			});
@@ -24,13 +19,9 @@ API.v1.addRoute(
 
 API.v1.addRoute(
 	'oauth-apps.get',
-	{ authRequired: true, validateParams: isOauthAppsGetParams },
+	{ authRequired: true, validateParams: isOauthAppsGetParams, permissionsRequired: ['manage-oauth-apps'] },
 	{
 		async get() {
-			if (!(await hasPermissionAsync(this.userId, 'manage-oauth-apps'))) {
-				return API.v1.unauthorized();
-			}
-
 			const oauthApp = await OAuthApps.findOneAuthAppByIdOrClientId(this.queryParams);
 
 			if (!oauthApp) {
@@ -53,13 +44,10 @@ API.v1.addRoute(
 	{
 		authRequired: true,
 		validateParams: isUpdateOAuthAppParams,
+		permissionsRequired: ['manage-oauth-apps'],
 	},
 	{
 		async post() {
-			if (!(await hasPermissionAsync(this.userId, 'manage-oauth-apps'))) {
-				return API.v1.unauthorized();
-			}
-
 			const { appId } = this.bodyParams;
 
 			const result = await Meteor.callAsync('updateOAuthApp', appId, this.bodyParams);
@@ -74,13 +62,10 @@ API.v1.addRoute(
 	{
 		authRequired: true,
 		validateParams: isDeleteOAuthAppParams,
+		permissionsRequired: ['manage-oauth-apps'],
 	},
 	{
 		async post() {
-			if (!(await hasPermissionAsync(this.userId, 'manage-oauth-apps'))) {
-				return API.v1.unauthorized();
-			}
-
 			const { appId } = this.bodyParams;
 
 			const result = await Meteor.callAsync('deleteOAuthApp', appId);
@@ -95,13 +80,10 @@ API.v1.addRoute(
 	{
 		authRequired: true,
 		validateParams: isOauthAppsAddParams,
+		permissionsRequired: ['manage-oauth-apps'],
 	},
 	{
 		async post() {
-			if (!(await hasPermissionAsync(this.userId, 'manage-oauth-apps'))) {
-				return API.v1.unauthorized();
-			}
-
 			const application = await addOAuthApp(this.bodyParams, this.userId);
 
 			return API.v1.success({ application });
diff --git a/apps/meteor/tests/end-to-end/api/18-oauthapps.js b/apps/meteor/tests/end-to-end/api/18-oauthapps.js
index 4566dab47967..dc12c39b0369 100644
--- a/apps/meteor/tests/end-to-end/api/18-oauthapps.js
+++ b/apps/meteor/tests/end-to-end/api/18-oauthapps.js
@@ -27,10 +27,10 @@ describe('[OAuthApps]', function () {
 				request
 					.get(api('oauth-apps.list'))
 					.set(credentials)
-					.expect(400)
+					.expect(403)
 					.expect((res) => {
 						expect(res.body).to.have.property('success', false);
-						expect(res.body.error).to.be.equal('error-not-allowed');
+						expect(res.body.error).to.be.equal('User does not have the permissions required for this action [error-unauthorized]');
 					})
 					.end(done);
 			});
@@ -75,31 +75,27 @@ describe('[OAuthApps]', function () {
 				})
 				.end(done);
 		});
-		it('should return a 403 Forbidden error when the user does not have the necessary permission by client id', (done) => {
-			updatePermission('manage-oauth-apps', []).then(() => {
-				request
-					.get(api('oauth-apps.get?clientId=zapier'))
-					.set(credentials)
-					.expect(403)
-					.expect((res) => {
-						expect(res.body).to.have.property('success', false);
-						expect(res.body.error).to.be.equal('unauthorized');
-					})
-					.end(done);
-			});
+		it('should return a 403 Forbidden error when the user does not have the necessary permission by client id', async () => {
+			await updatePermission('manage-oauth-apps', []);
+			await request
+				.get(api('oauth-apps.get?clientId=zapier'))
+				.set(credentials)
+				.expect(403)
+				.expect((res) => {
+					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]');
+				});
 		});
-		it('should return a 403 Forbidden error when the user does not have the necessary permission by app id', (done) => {
-			updatePermission('manage-oauth-apps', []).then(() => {
-				request
-					.get(api('oauth-apps.get?appId=zapier'))
-					.set(credentials)
-					.expect(403)
-					.expect((res) => {
-						expect(res.body).to.have.property('success', false);
-						expect(res.body.error).to.be.equal('unauthorized');
-					})
-					.end(done);
-			});
+		it('should return a 403 Forbidden error when the user does not have the necessary permission by app id', async () => {
+			await updatePermission('manage-oauth-apps', []);
+			await request
+				.get(api('oauth-apps.get?appId=zapier'))
+				.set(credentials)
+				.expect(403)
+				.expect((res) => {
+					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]');
+				});
 		});
 	});
 
@@ -116,7 +112,11 @@ describe('[OAuthApps]', function () {
 					active: false,
 				})
 				.expect('Content-Type', 'application/json')
-				.expect(403);
+				.expect(403)
+				.expect((res) => {
+					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 updatePermission('manage-oauth-apps', ['admin']);
 		});
 
@@ -199,11 +199,12 @@ describe('[OAuthApps]', function () {
 	describe('[/oauth-apps.update]', () => {
 		let appId;
 
-		before((done) => {
+		before(async () => {
+			await updatePermission('manage-oauth-apps', ['admin']);
 			const name = 'test-oauth-app';
 			const redirectUri = 'https://test.com';
 			const active = true;
-			request
+			const res = await request
 				.post(api('oauth-apps.create'))
 				.set(credentials)
 				.send({
@@ -212,12 +213,13 @@ describe('[OAuthApps]', function () {
 					active,
 				})
 				.expect('Content-Type', 'application/json')
-				.expect(200)
-				.end((err, res) => {
-					appId = res.body.application._id;
-					createdAppsIds.push(appId);
-					done();
-				});
+				.expect(200);
+			appId = res.body.application._id;
+			createdAppsIds.push(appId);
+		});
+
+		after(async () => {
+			await updatePermission('manage-oauth-apps', ['admin']);
 		});
 
 		it("should update an app's name, its Active and Redirect URI fields correctly by its id", async () => {
@@ -243,16 +245,40 @@ describe('[OAuthApps]', function () {
 					expect(res.body).to.have.property('name', name);
 				});
 		});
+
+		it('should fail updating an app if user does NOT have the manage-oauth-apps permission', async () => {
+			const name = `new app ${Date.now()}`;
+			const redirectUri = 'http://localhost:3000';
+			const active = false;
+
+			await updatePermission('manage-oauth-apps', []);
+			await request
+				.post(api(`oauth-apps.update`))
+				.set(credentials)
+				.send({
+					appId,
+					name,
+					redirectUri,
+					active,
+				})
+				.expect('Content-Type', 'application/json')
+				.expect(403)
+				.expect((res) => {
+					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]');
+				});
+		});
 	});
 
 	describe('[/oauth-apps.delete]', () => {
 		let appId;
 
-		before((done) => {
+		before(async () => {
+			await updatePermission('manage-oauth-apps', ['admin']);
 			const name = 'test-oauth-app';
 			const redirectUri = 'https://test.com';
 			const active = true;
-			request
+			const res = await request
 				.post(api('oauth-apps.create'))
 				.set(credentials)
 				.send({
@@ -261,11 +287,12 @@ describe('[OAuthApps]', function () {
 					active,
 				})
 				.expect('Content-Type', 'application/json')
-				.expect(200)
-				.end((err, res) => {
-					appId = res.body.application._id;
-					done();
-				});
+				.expect(200);
+			appId = res.body.application._id;
+		});
+
+		after(async () => {
+			await updatePermission('manage-oauth-apps', ['admin']);
 		});
 
 		it('should delete an app by its id', async () => {
@@ -281,5 +308,21 @@ describe('[OAuthApps]', function () {
 					expect(res.body).to.equals(true);
 				});
 		});
+
+		it('should fail deleting an app by its id if user does NOT have the manage-oauth-apps permission', async () => {
+			await updatePermission('manage-oauth-apps', []);
+			await request
+				.post(api(`oauth-apps.delete`))
+				.set(credentials)
+				.send({
+					appId,
+				})
+				.expect('Content-Type', 'application/json')
+				.expect(403)
+				.expect((res) => {
+					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]');
+				});
+		});
 	});
 });

From 7223444b2cab5e54009788d6b6ad07746d86bfff Mon Sep 17 00:00:00 2001
From: Matheus Barbosa Silva
 <36537004+matheusbsilva137@users.noreply.github.com>
Date: Thu, 9 May 2024 17:49:56 -0300
Subject: [PATCH 86/94] chore!: Improve permissions check on teams endpoints
 (#32351)

---
 apps/meteor/app/api/server/v1/teams.ts       | 17 +----
 apps/meteor/tests/end-to-end/api/25-teams.js | 78 ++++++++++++++++++++
 2 files changed, 81 insertions(+), 14 deletions(-)

diff --git a/apps/meteor/app/api/server/v1/teams.ts b/apps/meteor/app/api/server/v1/teams.ts
index 4ea8f2a48f38..6c01d0dc9665 100644
--- a/apps/meteor/app/api/server/v1/teams.ts
+++ b/apps/meteor/app/api/server/v1/teams.ts
@@ -44,13 +44,9 @@ API.v1.addRoute(
 
 API.v1.addRoute(
 	'teams.listAll',
-	{ authRequired: true },
+	{ authRequired: true, permissionsRequired: ['view-all-teams'] },
 	{
 		async get() {
-			if (!(await hasPermissionAsync(this.userId, 'view-all-teams'))) {
-				return API.v1.unauthorized();
-			}
-
 			const { offset, count } = await getPaginationItems(this.queryParams);
 
 			const { records, total } = await Team.listAll({ offset, count });
@@ -67,13 +63,9 @@ API.v1.addRoute(
 
 API.v1.addRoute(
 	'teams.create',
-	{ authRequired: true },
+	{ authRequired: true, permissionsRequired: ['create-team'] },
 	{
 		async post() {
-			if (!(await hasPermissionAsync(this.userId, 'create-team'))) {
-				return API.v1.unauthorized();
-			}
-
 			check(
 				this.bodyParams,
 				Match.ObjectIncluding({
@@ -285,10 +277,7 @@ API.v1.addRoute(
 
 			const allowPrivateTeam: boolean = await hasPermissionAsync(this.userId, 'view-all-teams', team.roomId);
 
-			let getAllRooms = false;
-			if (await hasPermissionAsync(this.userId, 'view-all-team-channels', team.roomId)) {
-				getAllRooms = true;
-			}
+			const getAllRooms = await hasPermissionAsync(this.userId, 'view-all-team-channels', team.roomId);
 
 			const listFilter = {
 				name: filter ?? undefined,
diff --git a/apps/meteor/tests/end-to-end/api/25-teams.js b/apps/meteor/tests/end-to-end/api/25-teams.js
index 6fc9899e403b..c1058bdf238a 100644
--- a/apps/meteor/tests/end-to-end/api/25-teams.js
+++ b/apps/meteor/tests/end-to-end/api/25-teams.js
@@ -22,6 +22,13 @@ describe('[Teams]', () => {
 		});
 
 		after(() => Promise.all([...createdTeams.map((team) => deleteTeam(credentials, team.name)), deleteUser(testUser)]));
+		before(async () => {
+			return updatePermission('create-team', ['admin', 'user']);
+		});
+
+		after(async () => {
+			return updatePermission('create-team', ['admin', 'user']);
+		});
 
 		it('should create a public team', (done) => {
 			request
@@ -144,6 +151,23 @@ describe('[Teams]', () => {
 				})
 				.end(done);
 		});
+
+		it('should not allow creating a team when the user does NOT have the create-team permission', async () => {
+			await updatePermission('create-team', []);
+			await request
+				.post(api('teams.create'))
+				.set(credentials)
+				.send({
+					name: `test-team-${Date.now()}`,
+					type: 0,
+				})
+				.expect('Content-Type', 'application/json')
+				.expect(403)
+				.expect((res) => {
+					expect(res.body).to.have.property('success', false);
+					expect(res.body).to.have.property('error', 'User does not have the permissions required for this action [error-unauthorized]');
+				});
+		});
 	});
 
 	describe('/teams.convertToChannel', () => {
@@ -535,6 +559,60 @@ describe('[Teams]', () => {
 		});
 	});
 
+	describe('/teams.listAll', () => {
+		let teamName;
+		before(async () => {
+			await updatePermission('view-all-teams', ['admin']);
+			teamName = `test-team-${Date.now()}`;
+			await request.post(api('teams.create')).set(credentials).send({
+				name: teamName,
+				type: 0,
+			});
+		});
+
+		after(() => Promise.all([deleteTeam(credentials, teamName), updatePermission('view-all-teams', ['admin'])]));
+
+		it('should list all teams', async () => {
+			await request
+				.get(api('teams.listAll'))
+				.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('count');
+					expect(res.body).to.have.property('offset', 0);
+					expect(res.body).to.have.property('total');
+					expect(res.body).to.have.property('teams');
+					expect(res.body.teams).to.be.an('array').that.is.not.empty;
+					expect(res.body.teams[0]).to.include.property('_id');
+					expect(res.body.teams[0]).to.include.property('_updatedAt');
+					expect(res.body.teams[0]).to.include.property('name');
+					expect(res.body.teams[0]).to.include.property('type');
+					expect(res.body.teams[0]).to.include.property('roomId');
+					expect(res.body.teams[0]).to.include.property('createdBy');
+					expect(res.body.teams[0].createdBy).to.include.property('_id');
+					expect(res.body.teams[0].createdBy).to.include.property('username');
+					expect(res.body.teams[0]).to.include.property('createdAt');
+					expect(res.body.teams[0]).to.include.property('rooms');
+					expect(res.body.teams[0]).to.include.property('numberOfUsers');
+				});
+		});
+
+		it('should return an error when the user does NOT have the view-all-teams permission', async () => {
+			await updatePermission('view-all-teams', []);
+			await request
+				.get(api('teams.listAll'))
+				.set(credentials)
+				.expect('Content-Type', 'application/json')
+				.expect(403)
+				.expect((res) => {
+					expect(res.body).to.have.property('success', false);
+					expect(res.body).to.have.property('error', 'User does not have the permissions required for this action [error-unauthorized]');
+				});
+		});
+	});
+
 	describe('/teams.updateMember', () => {
 		let testTeam;
 		const teamName = `test-team-update-member-${Date.now()}`;

From 034353420777416b687428edb1e98b231338861b Mon Sep 17 00:00:00 2001
From: Matheus Barbosa Silva
 <36537004+matheusbsilva137@users.noreply.github.com>
Date: Mon, 13 May 2024 08:48:41 -0300
Subject: [PATCH 87/94] chore!: Improve permissions check on im endpoints
 (#32333)

---
 apps/meteor/app/api/server/v1/im.ts           |  12 +-
 .../tests/end-to-end/api/04-direct-message.js | 182 ++++++++++--------
 2 files changed, 108 insertions(+), 86 deletions(-)

diff --git a/apps/meteor/app/api/server/v1/im.ts b/apps/meteor/app/api/server/v1/im.ts
index a640318a9cd0..1084ac96a188 100644
--- a/apps/meteor/app/api/server/v1/im.ts
+++ b/apps/meteor/app/api/server/v1/im.ts
@@ -395,7 +395,7 @@ API.v1.addRoute(
 
 API.v1.addRoute(
 	['dm.messages.others', 'im.messages.others'],
-	{ authRequired: true },
+	{ authRequired: true, permissionsRequired: ['view-room-administration'] },
 	{
 		async get() {
 			if (settings.get('API_Enable_Direct_Message_History_EndPoint') !== true) {
@@ -404,10 +404,6 @@ API.v1.addRoute(
 				});
 			}
 
-			if (!(await hasPermissionAsync(this.userId, 'view-room-administration'))) {
-				return API.v1.unauthorized();
-			}
-
 			const { roomId } = this.queryParams;
 			if (!roomId) {
 				throw new Meteor.Error('error-roomid-param-not-provided', 'The parameter "roomId" is required');
@@ -483,13 +479,9 @@ API.v1.addRoute(
 
 API.v1.addRoute(
 	['dm.list.everyone', 'im.list.everyone'],
-	{ authRequired: true },
+	{ authRequired: true, permissionsRequired: ['view-room-administration'] },
 	{
 		async get() {
-			if (!(await hasPermissionAsync(this.userId, 'view-room-administration'))) {
-				return API.v1.unauthorized();
-			}
-
 			const { offset, count }: { offset: number; count: number } = await getPaginationItems(this.queryParams);
 			const { sort, fields, query } = await this.parseJsonQuery();
 
diff --git a/apps/meteor/tests/end-to-end/api/04-direct-message.js b/apps/meteor/tests/end-to-end/api/04-direct-message.js
index be8868ef6b48..c20b454a9051 100644
--- a/apps/meteor/tests/end-to-end/api/04-direct-message.js
+++ b/apps/meteor/tests/end-to-end/api/04-direct-message.js
@@ -206,29 +206,51 @@ describe('[Direct Messages]', function () {
 			.end(done);
 	});
 
-	it('/im.list.everyone', (done) => {
-		request
-			.get(api('im.list.everyone'))
-			.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('count', 1);
-				expect(res.body).to.have.property('total', 1);
-				expect(res.body).to.have.property('ims').and.to.be.an('array');
-				const im = res.body.ims[0];
-				expect(im).to.have.property('_id');
-				expect(im).to.have.property('t').and.to.be.eq('d');
-				expect(im).to.have.property('msgs').and.to.be.a('number');
-				expect(im).to.have.property('usernames').and.to.be.an('array');
-				expect(im).to.have.property('ro');
-				expect(im).to.have.property('sysMes');
-				expect(im).to.have.property('_updatedAt');
-				expect(im).to.have.property('ts');
-				expect(im).to.have.property('lastMessage');
-			})
-			.end(done);
+	describe('/im.list.everyone', () => {
+		before(async () => {
+			return updatePermission('view-room-administration', ['admin']);
+		});
+
+		after(async () => {
+			return updatePermission('view-room-administration', ['admin']);
+		});
+
+		it('should succesfully return a list of direct messages', async () => {
+			await request
+				.get(api('im.list.everyone'))
+				.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('count', 1);
+					expect(res.body).to.have.property('total', 1);
+					expect(res.body).to.have.property('ims').and.to.be.an('array');
+					const im = res.body.ims[0];
+					expect(im).to.have.property('_id');
+					expect(im).to.have.property('t').and.to.be.eq('d');
+					expect(im).to.have.property('msgs').and.to.be.a('number');
+					expect(im).to.have.property('usernames').and.to.be.an('array');
+					expect(im).to.have.property('ro');
+					expect(im).to.have.property('sysMes');
+					expect(im).to.have.property('_updatedAt');
+					expect(im).to.have.property('ts');
+					expect(im).to.have.property('lastMessage');
+				});
+		});
+
+		it('should fail if user does NOT have the view-room-administration permission', async () => {
+			await updatePermission('view-room-administration', []);
+			await request
+				.get(api('im.list.everyone'))
+				.set(credentials)
+				.expect('Content-Type', 'application/json')
+				.expect(403)
+				.expect((res) => {
+					expect(res.body).to.have.property('success', false);
+					expect(res.body).to.have.property('error', 'User does not have the permissions required for this action [error-unauthorized]');
+				});
+		});
 	});
 
 	describe("Setting: 'Use Real Name': true", () => {
@@ -355,63 +377,71 @@ describe('[Direct Messages]', function () {
 	});
 
 	describe('/im.messages.others', () => {
-		it('should fail when the endpoint is disabled', (done) => {
-			updateSetting('API_Enable_Direct_Message_History_EndPoint', false).then(() => {
-				request
-					.get(api('im.messages.others'))
-					.set(credentials)
-					.query({
-						roomId: directMessage._id,
-					})
-					.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-endpoint-disabled');
-					})
-					.end(done);
-			});
+		it('should fail when the endpoint is disabled and the user has permissions', async () => {
+			await updateSetting('API_Enable_Direct_Message_History_EndPoint', false);
+			await request
+				.get(api('im.messages.others'))
+				.set(credentials)
+				.query({
+					roomId: directMessage._id,
+				})
+				.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-endpoint-disabled');
+				});
 		});
-		it('should fail when the endpoint is enabled but the user doesnt have permission', (done) => {
-			updateSetting('API_Enable_Direct_Message_History_EndPoint', true).then(() => {
-				updatePermission('view-room-administration', []).then(() => {
-					request
-						.get(api('im.messages.others'))
-						.set(credentials)
-						.query({
-							roomId: directMessage._id,
-						})
-						.expect('Content-Type', 'application/json')
-						.expect(403)
-						.expect((res) => {
-							expect(res.body).to.have.property('success', false);
-							expect(res.body).to.have.property('error', 'unauthorized');
-						})
-						.end(done);
+		it('should fail when the endpoint is disabled and the user doesnt have permission', async () => {
+			await updateSetting('API_Enable_Direct_Message_History_EndPoint', false);
+			await updatePermission('view-room-administration', ['admin']);
+			await request
+				.get(api('im.messages.others'))
+				.set(credentials)
+				.query({
+					roomId: directMessage._id,
+				})
+				.expect('Content-Type', 'application/json')
+				.expect(403)
+				.expect((res) => {
+					expect(res.body).to.have.property('success', false);
+					expect(res.body).to.have.property('error', 'User does not have the permissions required for this action [error-unauthorized]');
 				});
-			});
 		});
-		it('should succeed when the endpoint is enabled and user has permission', (done) => {
-			updateSetting('API_Enable_Direct_Message_History_EndPoint', true).then(() => {
-				updatePermission('view-room-administration', ['admin']).then(() => {
-					request
-						.get(api('im.messages.others'))
-						.set(credentials)
-						.query({
-							roomId: directMessage._id,
-						})
-						.expect('Content-Type', 'application/json')
-						.expect(200)
-						.expect((res) => {
-							expect(res.body).to.have.property('success', true);
-							expect(res.body).to.have.property('messages').and.to.be.an('array');
-							expect(res.body).to.have.property('offset');
-							expect(res.body).to.have.property('count');
-							expect(res.body).to.have.property('total');
-						})
-						.end(done);
+		it('should fail when the endpoint is enabled but the user doesnt have permission', async () => {
+			await updateSetting('API_Enable_Direct_Message_History_EndPoint', true);
+			await updatePermission('view-room-administration', []);
+			await request
+				.get(api('im.messages.others'))
+				.set(credentials)
+				.query({
+					roomId: directMessage._id,
+				})
+				.expect('Content-Type', 'application/json')
+				.expect(403)
+				.expect((res) => {
+					expect(res.body).to.have.property('success', false);
+					expect(res.body).to.have.property('error', 'User does not have the permissions required for this action [error-unauthorized]');
+				});
+		});
+		it('should succeed when the endpoint is enabled and user has permission', async () => {
+			await updateSetting('API_Enable_Direct_Message_History_EndPoint', true);
+			await updatePermission('view-room-administration', ['admin']);
+			await request
+				.get(api('im.messages.others'))
+				.set(credentials)
+				.query({
+					roomId: directMessage._id,
+				})
+				.expect('Content-Type', 'application/json')
+				.expect(200)
+				.expect((res) => {
+					expect(res.body).to.have.property('success', true);
+					expect(res.body).to.have.property('messages').and.to.be.an('array');
+					expect(res.body).to.have.property('offset');
+					expect(res.body).to.have.property('count');
+					expect(res.body).to.have.property('total');
 				});
-			});
 		});
 	});
 

From f1104c60def43d08bcf0ee4dc94939af2c32776b Mon Sep 17 00:00:00 2001
From: Matheus Barbosa Silva
 <36537004+matheusbsilva137@users.noreply.github.com>
Date: Mon, 13 May 2024 08:49:58 -0300
Subject: [PATCH 88/94] chore!: Improve permissions check on permissions
 endpoints (#32343)

---
 apps/meteor/app/api/server/v1/permissions.ts  |  7 +---
 .../tests/end-to-end/api/11-permissions.js    | 33 +++++++++++++++++++
 2 files changed, 34 insertions(+), 6 deletions(-)

diff --git a/apps/meteor/app/api/server/v1/permissions.ts b/apps/meteor/app/api/server/v1/permissions.ts
index 3613cc171354..65dfafe5ccce 100644
--- a/apps/meteor/app/api/server/v1/permissions.ts
+++ b/apps/meteor/app/api/server/v1/permissions.ts
@@ -3,7 +3,6 @@ import { Permissions, Roles } from '@rocket.chat/models';
 import { isBodyParamsValidPermissionUpdate } from '@rocket.chat/rest-typings';
 import { Meteor } from 'meteor/meteor';
 
-import { hasPermissionAsync } from '../../../authorization/server/functions/hasPermission';
 import { notifyOnPermissionChangedById } from '../../../lib/server/lib/notifyListener';
 import { API } from '../api';
 
@@ -41,13 +40,9 @@ API.v1.addRoute(
 
 API.v1.addRoute(
 	'permissions.update',
-	{ authRequired: true },
+	{ authRequired: true, permissionsRequired: ['access-permissions'] },
 	{
 		async post() {
-			if (!(await hasPermissionAsync(this.userId, 'access-permissions'))) {
-				return API.v1.failure('Editing permissions is not allowed', 'error-edit-permissions-not-allowed');
-			}
-
 			const { bodyParams } = this;
 
 			if (!isBodyParamsValidPermissionUpdate(bodyParams)) {
diff --git a/apps/meteor/tests/end-to-end/api/11-permissions.js b/apps/meteor/tests/end-to-end/api/11-permissions.js
index 30db3b5b67e2..1baea1ebef48 100644
--- a/apps/meteor/tests/end-to-end/api/11-permissions.js
+++ b/apps/meteor/tests/end-to-end/api/11-permissions.js
@@ -3,6 +3,8 @@ import { before, describe, it, after } from 'mocha';
 
 import { getCredentials, api, request, credentials } from '../../data/api-data.js';
 import { updatePermission } from '../../data/permissions.helper';
+import { password } from '../../data/user';
+import { createUser, deleteUser, login } from '../../data/users.helper.js';
 
 describe('[Permissions]', function () {
 	this.retries(0);
@@ -54,6 +56,19 @@ describe('[Permissions]', function () {
 	});
 
 	describe('[/permissions.update]', () => {
+		let testUser;
+		let testUserCredentials;
+		before(async () => {
+			testUser = await createUser();
+			testUserCredentials = await login(testUser.username, password);
+			await updatePermission('access-permissions', ['admin']);
+		});
+
+		after(async () => {
+			await updatePermission('access-permissions', ['admin']);
+			await deleteUser(testUser);
+		});
+
 		it('should change the permissions on the server', (done) => {
 			const permissions = [
 				{
@@ -127,5 +142,23 @@ describe('[Permissions]', function () {
 				})
 				.end(done);
 		});
+		it('should fail updating permission if user does NOT have the access-permissions permission', async () => {
+			const permissions = [
+				{
+					_id: 'add-oauth-service',
+					roles: ['admin', 'user'],
+				},
+			];
+			await request
+				.post(api('permissions.update'))
+				.set(testUserCredentials)
+				.send({ permissions })
+				.expect('Content-Type', 'application/json')
+				.expect(403)
+				.expect((res) => {
+					expect(res.body).to.have.property('success', false);
+					expect(res.body).to.have.property('error', 'User does not have the permissions required for this action [error-unauthorized]');
+				});
+		});
 	});
 });

From 68427217b878c4573eaa49f3d14dc0936fb1bcaf Mon Sep 17 00:00:00 2001
From: Matheus Barbosa Silva
 <36537004+matheusbsilva137@users.noreply.github.com>
Date: Mon, 13 May 2024 08:51:56 -0300
Subject: [PATCH 89/94] chore!: Improve permissions check on settings endpoints
 (#32350)

---
 apps/meteor/app/api/server/v1/settings.ts     | 15 +++--
 .../tests/end-to-end/api/08-settings.js       | 60 +++++++++++++++++--
 2 files changed, 63 insertions(+), 12 deletions(-)

diff --git a/apps/meteor/app/api/server/v1/settings.ts b/apps/meteor/app/api/server/v1/settings.ts
index 574f4ee64194..a77c0a248627 100644
--- a/apps/meteor/app/api/server/v1/settings.ts
+++ b/apps/meteor/app/api/server/v1/settings.ts
@@ -150,12 +150,15 @@ API.v1.addRoute(
 
 API.v1.addRoute(
 	'settings/:_id',
-	{ authRequired: true },
+	{
+		authRequired: true,
+		permissionsRequired: {
+			GET: { permissions: ['view-privileged-setting'], operation: 'hasAll' },
+			POST: { permissions: ['edit-privileged-setting'], operation: 'hasAll' },
+		},
+	},
 	{
 		async get() {
-			if (!(await hasPermissionAsync(this.userId, 'view-privileged-setting'))) {
-				return API.v1.unauthorized();
-			}
 			const setting = await Settings.findOneNotHiddenById(this.urlParams._id);
 			if (!setting) {
 				return API.v1.failure();
@@ -165,10 +168,6 @@ API.v1.addRoute(
 		post: {
 			twoFactorRequired: true,
 			async action(): Promise<ResultFor<'POST', '/v1/settings/:_id'>> {
-				if (!(await hasPermissionAsync(this.userId, 'edit-privileged-setting'))) {
-					return API.v1.unauthorized();
-				}
-
 				if (typeof this.urlParams._id !== 'string') {
 					throw new Meteor.Error('error-id-param-not-provided', 'The parameter "id" is required');
 				}
diff --git a/apps/meteor/tests/end-to-end/api/08-settings.js b/apps/meteor/tests/end-to-end/api/08-settings.js
index 4ea6a6ae778e..f8d74511e708 100644
--- a/apps/meteor/tests/end-to-end/api/08-settings.js
+++ b/apps/meteor/tests/end-to-end/api/08-settings.js
@@ -2,7 +2,7 @@ import { expect } from 'chai';
 import { before, describe, it, after } from 'mocha';
 
 import { getCredentials, api, request, credentials } from '../../data/api-data.js';
-import { updateSetting } from '../../data/permissions.helper';
+import { updatePermission, updateSetting } from '../../data/permissions.helper';
 
 describe('[Settings]', function () {
 	this.retries(0);
@@ -57,8 +57,18 @@ describe('[Settings]', function () {
 	});
 
 	describe('[/settings/:_id]', () => {
-		it('should return one setting', (done) => {
-			request
+		before(async () => {
+			await updatePermission('view-privileged-setting', ['admin']);
+			await updatePermission('edit-privileged-setting', ['admin']);
+		});
+
+		after(async () => {
+			await updatePermission('view-privileged-setting', ['admin']);
+			await updatePermission('edit-privileged-setting', ['admin']);
+		});
+
+		it('should succesfully return one setting (GET)', async () => {
+			return request
 				.get(api('settings/Site_Url'))
 				.set(credentials)
 				.expect('Content-Type', 'application/json')
@@ -67,8 +77,50 @@ describe('[Settings]', function () {
 					expect(res.body).to.have.property('success', true);
 					expect(res.body).to.have.property('_id', 'Site_Url');
 					expect(res.body).to.have.property('value');
+				});
+		});
+
+		it('should fail returning a setting if user does NOT have the view-privileged-setting permission (GET)', async () => {
+			await updatePermission('view-privileged-setting', []);
+			return request
+				.get(api('settings/Site_Url'))
+				.set(credentials)
+				.expect('Content-Type', 'application/json')
+				.expect(403)
+				.expect((res) => {
+					expect(res.body).to.have.property('success', false);
+					expect(res.body).to.have.property('error', 'User does not have the permissions required for this action [error-unauthorized]');
+				});
+		});
+
+		it('should succesfully set the value of a setting (POST)', async () => {
+			return request
+				.post(api('settings/LDAP_Enable'))
+				.set(credentials)
+				.send({
+					value: false,
 				})
-				.end(done);
+				.expect('Content-Type', 'application/json')
+				.expect(200)
+				.expect((res) => {
+					expect(res.body).to.have.property('success', true);
+				});
+		});
+
+		it('should fail updating the value of a setting if user does NOT have the edit-privileged-setting permission (POST)', async () => {
+			await updatePermission('edit-privileged-setting', []);
+			return request
+				.post(api('settings/LDAP_Enable'))
+				.set(credentials)
+				.send({
+					value: false,
+				})
+				.expect('Content-Type', 'application/json')
+				.expect(403)
+				.expect((res) => {
+					expect(res.body).to.have.property('success', false);
+					expect(res.body).to.have.property('error', 'User does not have the permissions required for this action [error-unauthorized]');
+				});
 		});
 	});
 

From 3086a2847b4011eefd551e3d8b43af25e5f0f94d Mon Sep 17 00:00:00 2001
From: Matheus Barbosa Silva
 <36537004+matheusbsilva137@users.noreply.github.com>
Date: Mon, 13 May 2024 09:00:35 -0300
Subject: [PATCH 90/94] chore!: Improve permissions check on licenses endpoints
 (#32354)

---
 apps/meteor/ee/server/api/licenses.ts           | 6 +-----
 apps/meteor/tests/end-to-end/api/20-licenses.js | 2 +-
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/apps/meteor/ee/server/api/licenses.ts b/apps/meteor/ee/server/api/licenses.ts
index 28b0b2e080f3..22ddbda9e31e 100644
--- a/apps/meteor/ee/server/api/licenses.ts
+++ b/apps/meteor/ee/server/api/licenses.ts
@@ -41,17 +41,13 @@ API.v1.addRoute(
 
 API.v1.addRoute(
 	'licenses.add',
-	{ authRequired: true },
+	{ authRequired: true, permissionsRequired: ['edit-privileged-setting'] },
 	{
 		async post() {
 			check(this.bodyParams, {
 				license: String,
 			});
 
-			if (!(await hasPermissionAsync(this.userId, 'edit-privileged-setting'))) {
-				return API.v1.unauthorized();
-			}
-
 			const { license } = this.bodyParams;
 			if (!(await License.validateFormat(license))) {
 				return API.v1.failure('Invalid license');
diff --git a/apps/meteor/tests/end-to-end/api/20-licenses.js b/apps/meteor/tests/end-to-end/api/20-licenses.js
index 83867712a80d..b9977c0e753b 100644
--- a/apps/meteor/tests/end-to-end/api/20-licenses.js
+++ b/apps/meteor/tests/end-to-end/api/20-licenses.js
@@ -46,7 +46,7 @@ describe('licenses', function () {
 				.expect(403)
 				.expect((res) => {
 					expect(res.body).to.have.property('success', false);
-					expect(res.body).to.have.property('error', 'unauthorized');
+					expect(res.body).to.have.property('error', 'User does not have the permissions required for this action [error-unauthorized]');
 				})
 				.end(done);
 		});

From c5af9c39cb38edd7cf54be4d5fb5db9faaea10fd Mon Sep 17 00:00:00 2001
From: Matheus Barbosa Silva
 <36537004+matheusbsilva137@users.noreply.github.com>
Date: Tue, 14 May 2024 16:20:12 -0300
Subject: [PATCH 91/94] test: fix im.messages.others endpoint tests (#32426)

---
 apps/meteor/tests/end-to-end/api/04-direct-message.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/meteor/tests/end-to-end/api/04-direct-message.js b/apps/meteor/tests/end-to-end/api/04-direct-message.js
index c20b454a9051..9ef666d742d3 100644
--- a/apps/meteor/tests/end-to-end/api/04-direct-message.js
+++ b/apps/meteor/tests/end-to-end/api/04-direct-message.js
@@ -394,7 +394,7 @@ describe('[Direct Messages]', function () {
 		});
 		it('should fail when the endpoint is disabled and the user doesnt have permission', async () => {
 			await updateSetting('API_Enable_Direct_Message_History_EndPoint', false);
-			await updatePermission('view-room-administration', ['admin']);
+			await updatePermission('view-room-administration', []);
 			await request
 				.get(api('im.messages.others'))
 				.set(credentials)

From 3c1622c201d2e9f5e3920b2d034352777d91bca0 Mon Sep 17 00:00:00 2001
From: Matheus Barbosa Silva
 <36537004+matheusbsilva137@users.noreply.github.com>
Date: Tue, 14 May 2024 18:10:09 -0300
Subject: [PATCH 92/94] chore!: Improve permissions check on misc endpoints
 (#32337)

---
 apps/meteor/app/api/server/v1/misc.ts         |  6 +--
 .../tests/end-to-end/api/00-miscellaneous.js  | 39 +++++++++++++++++++
 2 files changed, 40 insertions(+), 5 deletions(-)

diff --git a/apps/meteor/app/api/server/v1/misc.ts b/apps/meteor/app/api/server/v1/misc.ts
index dd4da47bff05..77d8eeaa5b46 100644
--- a/apps/meteor/app/api/server/v1/misc.ts
+++ b/apps/meteor/app/api/server/v1/misc.ts
@@ -22,7 +22,6 @@ import { v4 as uuidv4 } from 'uuid';
 import { i18n } from '../../../../server/lib/i18n';
 import { SystemLogger } from '../../../../server/lib/logger/system';
 import { getLogs } from '../../../../server/stream/stdout';
-import { hasPermissionAsync } from '../../../authorization/server/functions/hasPermission';
 import { passwordPolicy } from '../../../lib/server';
 import { notifyOnSettingChangedById } from '../../../lib/server/lib/notifyListener';
 import { settings } from '../../../settings/server';
@@ -473,12 +472,9 @@ API.v1.addRoute(
  */
 API.v1.addRoute(
 	'stdout.queue',
-	{ authRequired: true },
+	{ authRequired: true, permissionsRequired: ['view-logs'] },
 	{
 		async get() {
-			if (!(await hasPermissionAsync(this.userId, 'view-logs'))) {
-				return API.v1.unauthorized();
-			}
 			return API.v1.success({ queue: getLogs() });
 		},
 	},
diff --git a/apps/meteor/tests/end-to-end/api/00-miscellaneous.js b/apps/meteor/tests/end-to-end/api/00-miscellaneous.js
index b4fb482a4f5a..bb4632b14698 100644
--- a/apps/meteor/tests/end-to-end/api/00-miscellaneous.js
+++ b/apps/meteor/tests/end-to-end/api/00-miscellaneous.js
@@ -694,4 +694,43 @@ describe('miscellaneous', function () {
 				.end(done);
 		});
 	});
+
+	describe('/stdout.queue', () => {
+		before(async () => {
+			return updatePermission('view-logs', ['admin']);
+		});
+
+		after(async () => {
+			return updatePermission('view-logs', ['admin']);
+		});
+
+		it('should return server logs', async () => {
+			return 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').and.to.be.an('array').that.is.not.empty;
+					expect(res.body.queue[0]).to.be.an('object');
+					expect(res.body.queue[0]).to.have.property('id').and.to.be.a('string');
+					expect(res.body.queue[0]).to.have.property('string').and.to.be.a('string');
+					expect(res.body.queue[0]).to.have.property('ts').and.to.be.a('string');
+				});
+		});
+
+		it('should not return server logs if user does NOT have the view-logs permission', async () => {
+			await updatePermission('view-logs', []);
+			return request
+				.get(api('stdout.queue'))
+				.set(credentials)
+				.expect('Content-Type', 'application/json')
+				.expect(403)
+				.expect((res) => {
+					expect(res.body).to.have.property('success', false);
+					expect(res.body).to.have.property('error', 'User does not have the permissions required for this action [error-unauthorized]');
+				});
+		});
+	});
 });

From b484993c75a8ae75f94165e329232c06e85ac14e Mon Sep 17 00:00:00 2001
From: Matheus Barbosa Silva
 <36537004+matheusbsilva137@users.noreply.github.com>
Date: Mon, 20 May 2024 14:11:44 -0300
Subject: [PATCH 93/94] chore!: Improve permissions check on roles endpoints
 (#32347)

---
 apps/meteor/app/api/server/v1/roles.ts       |  17 +-
 apps/meteor/tests/end-to-end/api/28-roles.ts | 416 +++++++++++++++++++
 2 files changed, 419 insertions(+), 14 deletions(-)

diff --git a/apps/meteor/app/api/server/v1/roles.ts b/apps/meteor/app/api/server/v1/roles.ts
index 66c6677a9eed..fc9bd273996d 100644
--- a/apps/meteor/app/api/server/v1/roles.ts
+++ b/apps/meteor/app/api/server/v1/roles.ts
@@ -91,7 +91,7 @@ API.v1.addRoute(
 
 API.v1.addRoute(
 	'roles.getUsersInRole',
-	{ authRequired: true },
+	{ authRequired: true, permissionsRequired: ['access-permissions'] },
 	{
 		async get() {
 			const { roomId, role } = this.queryParams;
@@ -109,9 +109,6 @@ API.v1.addRoute(
 			if (!role) {
 				throw new Meteor.Error('error-param-not-provided', 'Query param "role" is required');
 			}
-			if (!(await hasPermissionAsync(this.userId, 'access-permissions'))) {
-				throw new Meteor.Error('error-not-allowed', 'Not allowed');
-			}
 			if (roomId && !(await hasPermissionAsync(this.userId, 'view-other-user-channels'))) {
 				throw new Meteor.Error('error-not-allowed', 'Not allowed');
 			}
@@ -150,7 +147,7 @@ API.v1.addRoute(
 
 API.v1.addRoute(
 	'roles.delete',
-	{ authRequired: true },
+	{ authRequired: true, permissionsRequired: ['access-permissions'] },
 	{
 		async post() {
 			const { bodyParams } = this;
@@ -158,10 +155,6 @@ API.v1.addRoute(
 				throw new Meteor.Error('error-invalid-role-properties', 'The role properties are invalid.');
 			}
 
-			if (!(await hasPermissionAsync(this.userId, 'access-permissions'))) {
-				throw new Meteor.Error('error-action-not-allowed', 'Accessing permissions is not allowed');
-			}
-
 			const role = await Roles.findOneByIdOrName(bodyParams.roleId);
 
 			if (!role) {
@@ -189,7 +182,7 @@ API.v1.addRoute(
 
 API.v1.addRoute(
 	'roles.removeUserFromRole',
-	{ authRequired: true },
+	{ authRequired: true, permissionsRequired: ['access-permissions'] },
 	{
 		async post() {
 			const { bodyParams } = this;
@@ -199,10 +192,6 @@ API.v1.addRoute(
 
 			const { roleId, roleName, username, scope } = bodyParams;
 
-			if (!(await hasPermissionAsync(this.userId, 'access-permissions'))) {
-				throw new Meteor.Error('error-not-allowed', 'Accessing permissions is not allowed');
-			}
-
 			if (!roleId) {
 				if (!roleName) {
 					return API.v1.failure('error-invalid-role-properties');
diff --git a/apps/meteor/tests/end-to-end/api/28-roles.ts b/apps/meteor/tests/end-to-end/api/28-roles.ts
index ad0e693bf2d8..6f8dfeab419e 100644
--- a/apps/meteor/tests/end-to-end/api/28-roles.ts
+++ b/apps/meteor/tests/end-to-end/api/28-roles.ts
@@ -1,8 +1,12 @@
+import type { IUser } from '@rocket.chat/core-typings';
 import { expect } from 'chai';
 import { after, before, describe, it } from 'mocha';
 import type { Response } from 'supertest';
 
 import { getCredentials, api, request, credentials } from '../../data/api-data.js';
+import { updatePermission } from '../../data/permissions.helper';
+import { password, adminUsername } from '../../data/user';
+import { createUser, deleteUser, login } from '../../data/users.helper.js';
 
 describe('[Roles]', function () {
 	this.retries(0);
@@ -140,4 +144,416 @@ describe('[Roles]', function () {
 				});
 		});
 	});
+
+	describe('[/roles.getUsersInRole]', () => {
+		let testUser: IUser;
+		let testUserCredentials: { 'X-Auth-Token': string; 'X-User-Id': string };
+		const testRoleName = `role.getUsersInRole.${Date.now()}`;
+		let testRoleId = '';
+
+		before(async () => {
+			await updatePermission('access-permissions', ['admin']);
+			testUser = await createUser();
+			testUserCredentials = await login(testUser.username, password);
+
+			if (!isEnterprise) {
+				return;
+			}
+
+			await request
+				.post(api('roles.create'))
+				.set(credentials)
+				.send({
+					name: testRoleName,
+				})
+				.expect('Content-Type', 'application/json')
+				.expect(200)
+				.expect((res: Response) => {
+					expect(res.body).to.have.property('success', true);
+					expect(res.body).to.have.property('role');
+					expect(res.body.role).to.have.property('name', testRoleName);
+					testRoleId = res.body.role._id;
+				});
+		});
+
+		after(async () => {
+			await deleteUser(testUser);
+			if (!isEnterprise) {
+				return;
+			}
+
+			await request.post(api('roles.delete')).set(credentials).send({
+				roleId: testRoleId,
+			});
+		});
+
+		it('should successfully get an empty list of users in a role if no user has been assigned to it', async function () {
+			if (!isEnterprise) {
+				this.skip();
+				return;
+			}
+
+			await request
+				.get(api('roles.getUsersInRole'))
+				.set(credentials)
+				.query({
+					role: testRoleId,
+				})
+				.expect('Content-Type', 'application/json')
+				.expect(200)
+				.expect((res: Response) => {
+					expect(res.body).to.have.property('success', true);
+					expect(res.body).to.have.property('total', 0);
+					expect(res.body).to.have.property('users').that.is.an('array').that.is.empty;
+				});
+		});
+
+		it('should successfully get a list of users in a role', async function () {
+			if (!isEnterprise) {
+				this.skip();
+				return;
+			}
+
+			await request
+				.post(api('roles.addUserToRole'))
+				.set(credentials)
+				.send({
+					roleId: testRoleId,
+					username: adminUsername,
+				})
+				.expect('Content-Type', 'application/json')
+				.expect(200)
+				.expect((res) => {
+					expect(res.body).to.have.property('success', true);
+				});
+
+			await request
+				.get(api('roles.getUsersInRole'))
+				.set(credentials)
+				.query({
+					role: testRoleId,
+				})
+				.expect('Content-Type', 'application/json')
+				.expect(200)
+				.expect((res: Response) => {
+					expect(res.body).to.have.property('success', true);
+					expect(res.body).to.have.property('total', 1);
+					expect(res.body).to.have.property('users').that.is.an('array').of.length(1);
+					expect(res.body.users[0]).to.have.property('_id', credentials['X-User-Id']);
+				});
+		});
+
+		it('should fail getting a list of users in a role in case an invalid role is provided', async function () {
+			if (!isEnterprise) {
+				this.skip();
+				return;
+			}
+
+			await request
+				.get(api('roles.getUsersInRole'))
+				.set(credentials)
+				.query({
+					role: 'invalid-role',
+				})
+				.expect('Content-Type', 'application/json')
+				.expect(400)
+				.expect((res: Response) => {
+					expect(res.body).to.have.property('success', false);
+					expect(res.body).to.have.property('errorType', 'error-invalid-roleId');
+				});
+		});
+
+		it('should fail when user does NOT have the access-permissions permission', async () => {
+			await request
+				.get(api('roles.getUsersInRole'))
+				.set(testUserCredentials)
+				.query({
+					role: 'admin',
+				})
+				.expect('Content-Type', 'application/json')
+				.expect(403)
+				.expect((res: Response) => {
+					expect(res.body).to.have.property('success', false);
+					expect(res.body).to.have.property('error', 'User does not have the permissions required for this action [error-unauthorized]');
+				});
+		});
+	});
+
+	describe('[/roles.delete]', () => {
+		let testUser: IUser;
+		let testUserCredentials: { 'X-Auth-Token': string; 'X-User-Id': string };
+		const testRoleName = `role.delete.${Date.now()}`;
+		let testRoleId = '';
+
+		before(async () => {
+			if (!isEnterprise) {
+				return;
+			}
+
+			testUser = await createUser();
+			testUserCredentials = await login(testUser.username, password);
+			await updatePermission('access-permissions', ['admin']);
+			await request
+				.post(api('roles.create'))
+				.set(credentials)
+				.send({
+					name: testRoleName,
+				})
+				.expect('Content-Type', 'application/json')
+				.expect(200)
+				.expect((res: Response) => {
+					expect(res.body).to.have.property('success', true);
+					expect(res.body).to.have.property('role');
+					expect(res.body.role).to.have.property('name', testRoleName);
+					testRoleId = res.body.role._id;
+				});
+		});
+
+		after(async () => {
+			if (!isEnterprise) {
+				return;
+			}
+			await deleteUser(testUser);
+		});
+
+		it('should fail deleting a role when user does NOT have the access-permissions permission', async function () {
+			// TODO this is not the right way to do it. We're doing this way for now just because we have separate CI jobs for EE and CE,
+			// ideally we should have a single CI job that adds a license and runs both CE and EE tests.
+			if (!isEnterprise) {
+				this.skip();
+				return;
+			}
+
+			await request
+				.post(api('roles.delete'))
+				.set(testUserCredentials)
+				.send({
+					roleId: testRoleId,
+				})
+				.expect('Content-Type', 'application/json')
+				.expect(403)
+				.expect((res: Response) => {
+					expect(res.body).to.have.property('success', false);
+					expect(res.body).to.have.property('error', 'User does not have the permissions required for this action [error-unauthorized]');
+				});
+		});
+
+		it('should fail deleting a role in EE in case an invalid role is provided', async function () {
+			// TODO this is not the right way to do it. We're doing this way for now just because we have separate CI jobs for EE and CE,
+			// ideally we should have a single CI job that adds a license and runs both CE and EE tests.
+			if (!isEnterprise) {
+				this.skip();
+				return;
+			}
+
+			await request
+				.post(api('roles.delete'))
+				.set(credentials)
+				.send({
+					roleId: 'invalid-role',
+				})
+				.expect('Content-Type', 'application/json')
+				.expect(400)
+				.expect((res: Response) => {
+					expect(res.body).to.have.property('success', false);
+					expect(res.body).to.have.property('errorType', 'error-invalid-roleId');
+					expect(res.body).to.have.property('error', 'This role does not exist [error-invalid-roleId]');
+				});
+		});
+
+		it('should successfully delete a role in EE', async function () {
+			// TODO this is not the right way to do it. We're doing this way for now just because we have separate CI jobs for EE and CE,
+			// ideally we should have a single CI job that adds a license and runs both CE and EE tests.
+			if (!isEnterprise) {
+				this.skip();
+				return;
+			}
+
+			await request
+				.post(api('roles.delete'))
+				.set(credentials)
+				.send({
+					roleId: testRoleId,
+				})
+				.expect('Content-Type', 'application/json')
+				.expect(200)
+				.expect((res: Response) => {
+					expect(res.body).to.have.property('success', true);
+				});
+		});
+	});
+
+	describe('[/roles.removeUserFromRole]', () => {
+		let testUser: IUser;
+		let testUserCredentials: { 'X-Auth-Token': string; 'X-User-Id': string };
+		const testRoleName = `role.removeUsersFromRole.${Date.now()}`;
+		let testRoleId = '';
+
+		before(async () => {
+			await updatePermission('access-permissions', ['admin']);
+			testUser = await createUser();
+			testUserCredentials = await login(testUser.username, password);
+			if (!isEnterprise) {
+				return;
+			}
+
+			await request
+				.post(api('roles.create'))
+				.set(credentials)
+				.send({
+					name: testRoleName,
+				})
+				.expect('Content-Type', 'application/json')
+				.expect(200)
+				.expect((res: Response) => {
+					expect(res.body).to.have.property('success', true);
+					expect(res.body).to.have.property('role');
+					expect(res.body.role).to.have.property('name', testRoleName);
+					testRoleId = res.body.role._id;
+				});
+			await request
+				.post(api('roles.addUserToRole'))
+				.set(credentials)
+				.send({
+					roleId: testRoleId,
+					username: testUser.username,
+				})
+				.expect('Content-Type', 'application/json')
+				.expect(200)
+				.expect((res) => {
+					expect(res.body).to.have.property('success', true);
+				});
+		});
+
+		after(async () => {
+			await request.post(api('roles.delete')).set(credentials).send({
+				roleId: testRoleId,
+			});
+			await deleteUser(testUser);
+		});
+
+		it('should fail removing a user from a role when user does NOT have the access-permissions permission', async () => {
+			await request
+				.post(api('roles.removeUserFromRole'))
+				.set(testUserCredentials)
+				.send({
+					roleId: testRoleId,
+					username: testUser.username,
+				})
+				.expect('Content-Type', 'application/json')
+				.expect(403)
+				.expect((res: Response) => {
+					expect(res.body).to.have.property('success', false);
+					expect(res.body).to.have.property('error', 'User does not have the permissions required for this action [error-unauthorized]');
+				});
+		});
+
+		it('should fail removing an invalid user from a role', async function () {
+			// TODO this is not the right way to do it. We're doing this way for now just because we have separate CI jobs for EE and CE,
+			// ideally we should have a single CI job that adds a license and runs both CE and EE tests.
+			if (!isEnterprise) {
+				this.skip();
+				return;
+			}
+
+			await request
+				.post(api('roles.removeUserFromRole'))
+				.set(credentials)
+				.send({
+					roleId: testRoleId,
+					username: 'invalid-username',
+				})
+				.expect('Content-Type', 'application/json')
+				.expect(400)
+				.expect((res: Response) => {
+					expect(res.body).to.have.property('success', false);
+					expect(res.body).to.have.property('errorType', 'error-invalid-user');
+					expect(res.body).to.have.property('error', 'There is no user with this username [error-invalid-user]');
+				});
+		});
+
+		it('should fail removing a user from an invalid role', async function () {
+			// TODO this is not the right way to do it. We're doing this way for now just because we have separate CI jobs for EE and CE,
+			// ideally we should have a single CI job that adds a license and runs both CE and EE tests.
+			if (!isEnterprise) {
+				this.skip();
+				return;
+			}
+
+			await request
+				.post(api('roles.removeUserFromRole'))
+				.set(credentials)
+				.send({
+					roleId: 'invalid-role',
+					username: testUser.username,
+				})
+				.expect('Content-Type', 'application/json')
+				.expect(400)
+				.expect((res: Response) => {
+					expect(res.body).to.have.property('success', false);
+					expect(res.body).to.have.property('errorType', 'error-invalid-roleId');
+					expect(res.body).to.have.property('error', 'This role does not exist [error-invalid-roleId]');
+				});
+		});
+
+		it('should fail removing a user from a role they do not have', async function () {
+			// TODO this is not the right way to do it. We're doing this way for now just because we have separate CI jobs for EE and CE,
+			// ideally we should have a single CI job that adds a license and runs both CE and EE tests.
+			if (!isEnterprise) {
+				this.skip();
+				return;
+			}
+
+			await request
+				.post(api('roles.removeUserFromRole'))
+				.set(credentials)
+				.send({
+					roleId: 'admin',
+					username: testUser.username,
+				})
+				.expect('Content-Type', 'application/json')
+				.expect(400)
+				.expect((res: Response) => {
+					expect(res.body).to.have.property('success', false);
+					expect(res.body).to.have.property('errorType', 'error-user-not-in-role');
+					expect(res.body).to.have.property('error', 'User is not in this role [error-user-not-in-role]');
+				});
+		});
+
+		it('should successfully remove a user from a role', async function () {
+			// TODO this is not the right way to do it. We're doing this way for now just because we have separate CI jobs for EE and CE,
+			// ideally we should have a single CI job that adds a license and runs both CE and EE tests.
+			if (!isEnterprise) {
+				this.skip();
+				return;
+			}
+
+			await request
+				.post(api('roles.removeUserFromRole'))
+				.set(credentials)
+				.send({
+					roleId: testRoleId,
+					username: testUser.username,
+				})
+				.expect('Content-Type', 'application/json')
+				.expect(200)
+				.expect((res: Response) => {
+					expect(res.body).to.have.property('success', true);
+				});
+			await request
+				.get(api('roles.getUsersInRole'))
+				.set(credentials)
+				.query({
+					role: testRoleId,
+				})
+				.expect('Content-Type', 'application/json')
+				.expect(200)
+				.expect((res: Response) => {
+					expect(res.body).to.have.property('success', true);
+					expect(res.body).to.have.property('total', 0);
+					expect(res.body).to.have.property('users');
+					expect(res.body.users).to.be.an('array').that.is.empty;
+				});
+		});
+	});
 });

From 76951f5ccdc9df1bb3b8b3a03e911d1e9e38d8c4 Mon Sep 17 00:00:00 2001
From: Abhinav Kumar <abhinav@avitechlab.com>
Date: Tue, 25 Jun 2024 01:23:57 +0530
Subject: [PATCH 94/94] refactor!: removed listEmojiCustom method (#32542)

---
 apps/meteor/app/emoji-custom/server/index.ts  |  1 -
 .../server/methods/listEmojiCustom.ts         | 35 -------------------
 2 files changed, 36 deletions(-)
 delete mode 100644 apps/meteor/app/emoji-custom/server/methods/listEmojiCustom.ts

diff --git a/apps/meteor/app/emoji-custom/server/index.ts b/apps/meteor/app/emoji-custom/server/index.ts
index 83866b83b569..3ec2051f8fff 100644
--- a/apps/meteor/app/emoji-custom/server/index.ts
+++ b/apps/meteor/app/emoji-custom/server/index.ts
@@ -1,5 +1,4 @@
 import './startup/emoji-custom';
-import './methods/listEmojiCustom';
 import './methods/deleteEmojiCustom';
 import './methods/insertOrUpdateEmoji';
 import './methods/uploadEmojiCustom';
diff --git a/apps/meteor/app/emoji-custom/server/methods/listEmojiCustom.ts b/apps/meteor/app/emoji-custom/server/methods/listEmojiCustom.ts
deleted file mode 100644
index 485737b95f9b..000000000000
--- a/apps/meteor/app/emoji-custom/server/methods/listEmojiCustom.ts
+++ /dev/null
@@ -1,35 +0,0 @@
-import type { IEmojiCustom } from '@rocket.chat/core-typings';
-import { EmojiCustom } from '@rocket.chat/models';
-import type { ServerMethods } from '@rocket.chat/ui-contexts';
-import { check, Match } from 'meteor/check';
-import { Meteor } from 'meteor/meteor';
-
-import { methodDeprecationLogger } from '../../../lib/server/lib/deprecationWarningLogger';
-
-declare module '@rocket.chat/ui-contexts' {
-	// eslint-disable-next-line @typescript-eslint/naming-convention
-	interface ServerMethods {
-		listEmojiCustom(options?: { name?: string; aliases?: string[] }): IEmojiCustom[];
-	}
-}
-
-Meteor.methods<ServerMethods>({
-	async listEmojiCustom(options = {}) {
-		methodDeprecationLogger.method('listEmojiCustom', '7.0.0');
-
-		const user = await Meteor.userAsync();
-
-		if (!user) {
-			throw new Meteor.Error('error-invalid-user', 'Invalid user', {
-				method: 'listEmojiCustom',
-			});
-		}
-
-		check(options, {
-			name: Match.Optional(String),
-			aliases: Match.Optional([String]),
-		});
-
-		return EmojiCustom.find(options).toArray();
-	},
-});