From cde9e9068f35f11618683d73ca0c753dcb1c172c Mon Sep 17 00:00:00 2001
From: xareyli <xareyli@gmail.com>
Date: Thu, 1 Dec 2022 05:17:11 +0300
Subject: [PATCH 01/12] Regression: Bad words Filtering not working on new
 Message Parser (#27368)

---
 apps/meteor/server/hooks/messages/markdownParser.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/meteor/server/hooks/messages/markdownParser.ts b/apps/meteor/server/hooks/messages/markdownParser.ts
index abc3e75217b..da858a18791 100644
--- a/apps/meteor/server/hooks/messages/markdownParser.ts
+++ b/apps/meteor/server/hooks/messages/markdownParser.ts
@@ -29,7 +29,7 @@ if (process.env.DISABLE_MESSAGE_PARSER !== 'true') {
 
 			return message;
 		},
-		callbacks.priority.HIGH,
+		callbacks.priority.MEDIUM,
 		'markdownParser',
 	);
 }

From 5ec5b2c6f9cdbe37666d7ac908d0d523663c66b6 Mon Sep 17 00:00:00 2001
From: Guilherme Gazzo <guilhermegazzo@gmail.com>
Date: Thu, 1 Dec 2022 16:31:13 -0300
Subject: [PATCH 02/12] [FIX] Fix Piwik and add extra setting to allow
 workarounds (#27416)

---
 .../meteor/app/analytics/client/loadScript.js |  85 ------------
 .../meteor/app/analytics/client/loadScript.ts | 122 ++++++++++++++++++
 apps/meteor/app/cors/server/cors.js           |  12 +-
 .../meteor/app/lib/server/startup/settings.ts |   5 +
 .../rocketchat-i18n/i18n/en.i18n.json         |   4 +-
 5 files changed, 141 insertions(+), 87 deletions(-)
 delete mode 100644 apps/meteor/app/analytics/client/loadScript.js
 create mode 100644 apps/meteor/app/analytics/client/loadScript.ts

diff --git a/apps/meteor/app/analytics/client/loadScript.js b/apps/meteor/app/analytics/client/loadScript.js
deleted file mode 100644
index 4cc3e45c2f4..00000000000
--- a/apps/meteor/app/analytics/client/loadScript.js
+++ /dev/null
@@ -1,85 +0,0 @@
-import { Meteor } from 'meteor/meteor';
-import { Template } from 'meteor/templating';
-
-import { settings } from '../../settings';
-
-Template.body.onRendered(function () {
-	this.autorun((c) => {
-		const piwikUrl = settings.get('PiwikAnalytics_enabled') && settings.get('PiwikAnalytics_url');
-		const piwikSiteId = piwikUrl && settings.get('PiwikAnalytics_siteId');
-		const piwikPrependDomain = piwikUrl && settings.get('PiwikAnalytics_prependDomain');
-		const piwikCookieDomain = piwikUrl && settings.get('PiwikAnalytics_cookieDomain');
-		const piwikDomains = piwikUrl && settings.get('PiwikAnalytics_domains');
-		const piwikAdditionalTracker = piwikUrl && settings.get('PiwikAdditionalTrackers');
-		const googleId = settings.get('GoogleAnalytics_enabled') && settings.get('GoogleAnalytics_ID');
-		if (piwikSiteId || googleId) {
-			c.stop();
-
-			if (piwikSiteId) {
-				window._paq = window._paq || [];
-				if (Meteor.userId()) {
-					window._paq.push(['setUserId', Meteor.userId()]);
-				}
-
-				window._paq.push(['trackPageView']);
-				window._paq.push(['enableLinkTracking']);
-				if (piwikPrependDomain) {
-					window._paq.push(['setDocumentTitle', `${window.location.hostname}/${document.title}`]);
-				}
-				const upperLevelDomain = `*.${window.location.hostname.split('.').slice(1).join('.')}`;
-				if (piwikCookieDomain) {
-					window._paq.push(['setCookieDomain', upperLevelDomain]);
-				}
-				if (piwikDomains) {
-					// array
-					const domainsArray = piwikDomains.split(/\n/);
-					const domains = [];
-					for (let i = 0; i < domainsArray.length; i++) {
-						// only push domain if it contains a non whitespace character.
-						if (/\S/.test(domainsArray[i])) {
-							domains.push(`*.${domainsArray[i].trim()}`);
-						}
-					}
-					window._paq.push(['setDomains', domains]);
-				}
-				(() => {
-					try {
-						if (/\S/.test(piwikAdditionalTracker)) {
-							// piwikAdditionalTracker is not empty or whitespace only
-							const addTrackers = JSON.parse(piwikAdditionalTracker);
-							for (let i = 0; i < addTrackers.length; i++) {
-								const tracker = addTrackers[i];
-								window._paq.push(['addTracker', `${tracker.trackerURL}js/`, tracker.siteId]);
-							}
-						}
-					} catch (e) {
-						// parsing JSON faild
-						console.log('Error while parsing JSON value of "piwikAdditionalTracker": ', e);
-					}
-					window._paq.push(['setTrackerUrl', `${piwikUrl}js/`]);
-					window._paq.push(['setSiteId', Number.parseInt(piwikSiteId)]);
-					const d = document;
-					const g = d.createElement('script');
-					const s = d.getElementsByTagName('script')[0];
-					g.type = 'text/javascript';
-					g.async = true;
-					g.defer = true;
-					g.src = `${piwikUrl}js/`;
-					s.parentNode.insertBefore(g, s);
-				})();
-			}
-
-			if (googleId) {
-				/*eslint-disable */
-			  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-			  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-			  m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-			  })(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
-
-			  ga('create', googleId, 'auto');
-			  ga('send', 'pageview');
-				/* eslint-enable */
-			}
-		}
-	});
-});
diff --git a/apps/meteor/app/analytics/client/loadScript.ts b/apps/meteor/app/analytics/client/loadScript.ts
new file mode 100644
index 00000000000..7ddce14102c
--- /dev/null
+++ b/apps/meteor/app/analytics/client/loadScript.ts
@@ -0,0 +1,122 @@
+import { Meteor } from 'meteor/meteor';
+import { Template } from 'meteor/templating';
+
+import { settings } from '../../settings/client';
+
+declare global {
+	// eslint-disable-next-line @typescript-eslint/naming-convention
+	interface Window {
+		_paq: [string, ...unknown[]][];
+		GoogleAnalyticsObject: unknown;
+		ga: qa;
+	}
+
+	type qa = {
+		(...args: unknown[]): void;
+		l: number;
+		q: unknown[];
+	};
+}
+
+Template.body.onRendered(function () {
+	this.autorun(() => {
+		const uid = Meteor.userId();
+		if (uid) {
+			window._paq = window._paq || [];
+			window._paq.push(['setUserId', uid]);
+		}
+	});
+
+	this.autorun((c) => {
+		const googleId = settings.get('GoogleAnalytics_enabled') && settings.get('GoogleAnalytics_ID');
+		if (googleId) {
+			c.stop();
+
+			if (googleId) {
+				/*eslint-disable */
+				(function (i, s, o, g, r: 'ga', a?: any, m?: any) {
+					i['GoogleAnalyticsObject'] = r;
+					(i[r] =
+						i[r] ||
+						function () {
+							(i[r].q = i[r].q || []).push(arguments);
+						}),
+						(i[r].l = new Date().getTime());
+					(a = s.createElement(o)), (m = s.getElementsByTagName(o)[0]);
+					a.async = 1;
+					a.src = g;
+					m.parentNode.insertBefore(a, m);
+				})(window, document, 'script', 'https://www.google-analytics.com/analytics.js', 'ga');
+
+				window.ga('create', googleId, 'auto');
+				window.ga('send', 'pageview');
+				/* eslint-enable */
+			}
+		}
+	});
+
+	this.autorun(() => {
+		const piwikUrl = settings.get('PiwikAnalytics_enabled') && settings.get('PiwikAnalytics_url');
+
+		if (!piwikUrl) {
+			document.getElementById('piwik-analytics')?.remove();
+			window._paq = [];
+			return;
+		}
+
+		const piwikSiteId = piwikUrl && settings.get('PiwikAnalytics_siteId');
+		const piwikPrependDomain = piwikUrl && settings.get('PiwikAnalytics_prependDomain');
+		const piwikCookieDomain = piwikUrl && settings.get('PiwikAnalytics_cookieDomain');
+		const piwikDomains = piwikUrl && settings.get('PiwikAnalytics_domains');
+		const piwikAdditionalTracker = piwikUrl && settings.get('PiwikAdditionalTrackers');
+		window._paq = window._paq || [];
+
+		window._paq.push(['trackPageView']);
+		window._paq.push(['enableLinkTracking']);
+		if (piwikPrependDomain) {
+			window._paq.push(['setDocumentTitle', `${window.location.hostname}/${document.title}`]);
+		}
+		const upperLevelDomain = `*.${window.location.hostname.split('.').slice(1).join('.')}`;
+		if (piwikCookieDomain) {
+			window._paq.push(['setCookieDomain', upperLevelDomain]);
+		}
+		if (piwikDomains) {
+			// array
+			const domainsArray = piwikDomains.split(/\n/);
+			const domains = [];
+			for (let i = 0; i < domainsArray.length; i++) {
+				// only push domain if it contains a non whitespace character.
+				if (/\S/.test(domainsArray[i])) {
+					domains.push(`*.${domainsArray[i].trim()}`);
+				}
+			}
+			window._paq.push(['setDomains', domains]);
+		}
+		(() => {
+			try {
+				if (/\S/.test(piwikAdditionalTracker)) {
+					// piwikAdditionalTracker is not empty or whitespace only
+					const addTrackers = JSON.parse(piwikAdditionalTracker);
+					for (let i = 0; i < addTrackers.length; i++) {
+						const tracker = addTrackers[i];
+						window._paq.push(['addTracker', `${tracker.trackerURL}js/`, tracker.siteId]);
+					}
+				}
+			} catch (e) {
+				// parsing JSON faild
+				console.log('Error while parsing JSON value of "piwikAdditionalTracker": ', e);
+			}
+			window._paq.push(['setTrackerUrl', `${piwikUrl}js/`]);
+			window._paq.push(['setSiteId', Number.parseInt(piwikSiteId)]);
+			const d = document;
+			const g = d.createElement('script');
+			g.setAttribute('id', 'piwik-analytics');
+			const s = d.getElementsByTagName('script')[0];
+			g.type = 'text/javascript';
+			g.async = true;
+			g.defer = true;
+			g.src = `${piwikUrl}js/`;
+			s.parentNode?.insertBefore(g, s);
+		})();
+	});
+});
diff --git a/apps/meteor/app/cors/server/cors.js b/apps/meteor/app/cors/server/cors.js
index c4f3c9e7693..cc6bcefb932 100644
--- a/apps/meteor/app/cors/server/cors.js
+++ b/apps/meteor/app/cors/server/cors.js
@@ -35,7 +35,17 @@ WebApp.rawConnectHandlers.use(function (req, res, next) {
 		]
 			.filter(Boolean)
 			.join(' ');
-		const external = [settings.get('Accounts_OAuth_Apple') && 'https://appleid.cdn-apple.com'].filter(Boolean).join(' ');
+		const external = [
+			settings.get('Accounts_OAuth_Apple') && 'https://appleid.cdn-apple.com',
+			settings.get('PiwikAnalytics_enabled') && settings.get('PiwikAnalytics_url'),
+			settings.get('GoogleAnalytics_enabled' && 'https://www.google-analytics.com'),
+			...settings
+				.get('Extra_CSP_Domains')
+				.split(/[ \n\,]/gim)
+				.filter((e) => Boolean(e.trim())),
+		]
+			.filter(Boolean)
+			.join(' ');
 		res.setHeader(
 			'Content-Security-Policy',
 			[
diff --git a/apps/meteor/app/lib/server/startup/settings.ts b/apps/meteor/app/lib/server/startup/settings.ts
index 1d96dee517f..64238249fe1 100644
--- a/apps/meteor/app/lib/server/startup/settings.ts
+++ b/apps/meteor/app/lib/server/startup/settings.ts
@@ -884,6 +884,11 @@ settingsRegistry.addGroup('General', function () {
 		type: 'boolean',
 	});
 
+	this.add('Extra_CSP_Domains', '', {
+		type: 'string',
+		multiline: true,
+	});
+
 	this.add('Iframe_Restrict_Access', true, {
 		type: 'boolean',
 		secret: true,
diff --git a/apps/meteor/packages/rocketchat-i18n/i18n/en.i18n.json b/apps/meteor/packages/rocketchat-i18n/i18n/en.i18n.json
index 53fc9b1aeb4..cd71e39c0b7 100644
--- a/apps/meteor/packages/rocketchat-i18n/i18n/en.i18n.json
+++ b/apps/meteor/packages/rocketchat-i18n/i18n/en.i18n.json
@@ -1782,6 +1782,8 @@
   "Enable_Auto_Away": "Enable Auto Away",
   "Enable_CSP": "Enable Content-Security-Policy",
   "Enable_CSP_Description": "Do not disable this option unless you have a custom build and are having problems due to inline-scripts",
+  "Extra_CSP_Domains": "Extra CSP Domains",
+  "Extra_CSP_Domains_Description": "Extra domains to add to the Content-Security-Policy",
   "Enable_Desktop_Notifications": "Enable Desktop Notifications",
   "Enable_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",
@@ -5537,4 +5539,4 @@
   "Theme_dark": "Dark",
   "Join_your_team": "Join your team",
   "Create_an_account": "Create an account"
-}
\ No newline at end of file
+}

From c58567cd532196e0df218cb03b1d9af6d9c5a548 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrique=20Guimar=C3=A3es=20Ribeiro?=
 <henrique.jobs1@gmail.com>
Date: Thu, 1 Dec 2022 16:44:03 -0300
Subject: [PATCH 03/12] Regression: Admin menu apps option not working (#27422)

---
 .../client/views/admin/apps/AppsRoute.tsx     | 19 +++++++++++--------
 apps/meteor/client/views/admin/routes.tsx     |  7 -------
 2 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/apps/meteor/client/views/admin/apps/AppsRoute.tsx b/apps/meteor/client/views/admin/apps/AppsRoute.tsx
index a014a94c0cc..34c966b230e 100644
--- a/apps/meteor/client/views/admin/apps/AppsRoute.tsx
+++ b/apps/meteor/client/views/admin/apps/AppsRoute.tsx
@@ -15,9 +15,19 @@ const AppsRoute = (): ReactElement => {
 	const appsWhatIsItRoute = useRoute('admin-apps-disabled');
 	const marketplaceRoute = useRoute('admin-marketplace');
 
+	const context = useRouteParameter('context');
+	const id = useRouteParameter('id');
+	const page = useRouteParameter('page');
+
+	const isMarketplace = !context;
+
 	useEffect(() => {
 		let mounted = true;
 
+		if (!context) {
+			marketplaceRoute.replace({ context: 'all', page: 'list' });
+		}
+
 		const initialize = async (): Promise<void> => {
 			if (!canManageApps) {
 				return;
@@ -40,14 +50,7 @@ const AppsRoute = (): ReactElement => {
 		return (): void => {
 			mounted = false;
 		};
-	}, [canManageApps, isAppsEngineEnabled, appsWhatIsItRoute, marketplaceRoute]);
-
-	const context = useRouteParameter('context');
-
-	const isMarketplace = !context;
-
-	const id = useRouteParameter('id');
-	const page = useRouteParameter('page');
+	}, [canManageApps, isAppsEngineEnabled, appsWhatIsItRoute, marketplaceRoute, context]);
 
 	if (!canManageApps) {
 		return <NotAuthorizedPage />;
diff --git a/apps/meteor/client/views/admin/routes.tsx b/apps/meteor/client/views/admin/routes.tsx
index dd3a08c2015..fa06088048f 100644
--- a/apps/meteor/client/views/admin/routes.tsx
+++ b/apps/meteor/client/views/admin/routes.tsx
@@ -24,13 +24,6 @@ registerAdminRoute('/apps/what-is-it', {
 registerAdminRoute('/marketplace/:context?/:page?/:id?/:version?/:tab?', {
 	name: 'admin-marketplace',
 	component: lazy(() => import('./apps/AppsRoute')),
-	triggersEnter: [
-		(context, redirect): void => {
-			if (!context.params.context) {
-				redirect('/admin/marketplace/all/list');
-			}
-		},
-	],
 });
 
 registerAdminRoute('/info', {

From ac0e2ee39aee94643dc783623711124bc5032094 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BAlia=20Jaeger=20Foresti?=
 <60678893+juliajforesti@users.noreply.github.com>
Date: Thu, 1 Dec 2022 20:09:40 -0300
Subject: [PATCH 04/12] Regression: message-box-editing-color (#27420)

---
 apps/meteor/app/theme/client/imports/components/message-box.css | 2 +-
 apps/meteor/app/theme/client/imports/general/variables.css      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/meteor/app/theme/client/imports/components/message-box.css b/apps/meteor/app/theme/client/imports/components/message-box.css
index 2129b6fd5e8..ab5638d3203 100644
--- a/apps/meteor/app/theme/client/imports/components/message-box.css
+++ b/apps/meteor/app/theme/client/imports/components/message-box.css
@@ -97,7 +97,7 @@
 		align-items: center;
 
 		&.editing {
-			background-color: var(--message-box-editing-color);
+			background-color: var(--rcx-color-status-background-warning-2, var(--message-box-editing-color));
 		}
 	}
 
diff --git a/apps/meteor/app/theme/client/imports/general/variables.css b/apps/meteor/app/theme/client/imports/general/variables.css
index 26c6b253527..b2dac619910 100644
--- a/apps/meteor/app/theme/client/imports/general/variables.css
+++ b/apps/meteor/app/theme/client/imports/general/variables.css
@@ -327,7 +327,7 @@
 	--message-box-container-border-color: var(--rcx-input-colors-border-color, var(--rcx-color-stroke-light, var(--rcx-color-neutral-500, var(--color-gray-medium))));
 	--message-box-container-border-width: var(--border);
 	--message-box-container-border-radius: var(--border-radius);
-	--message-box-editing-color: var(--rcx-color-status-background-warning, var(--rcx-color-status-warning, #ffecad));
+	--message-box-editing-color: var(--rcx-color-status-background-warning-2, #fff6d6);
 	--message-box-popover-title-text-color: var(--rcx-color-font-annotation, var(--rcx-color-neutral-600, var(--color-gray)));
 	--message-box-popover-title-text-size: 0.75rem;
 	--message-box-color: var(--rcx-color-font-default, var(--rcx-color-neutral-800, #2f343d));

From c98c719c788f9e5a7011eff18ee0ab1acc34212c Mon Sep 17 00:00:00 2001
From: Guilherme Gazzo <guilherme@gazzo.xyz>
Date: Thu, 1 Dec 2022 22:46:42 -0300
Subject: [PATCH 05/12] Regression: fix sidebar status

---
 apps/meteor/client/sidebar/hooks/useSidebarPaletteColor.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/apps/meteor/client/sidebar/hooks/useSidebarPaletteColor.ts b/apps/meteor/client/sidebar/hooks/useSidebarPaletteColor.ts
index ec03a7866d6..cce160116d2 100644
--- a/apps/meteor/client/sidebar/hooks/useSidebarPaletteColor.ts
+++ b/apps/meteor/client/sidebar/hooks/useSidebarPaletteColor.ts
@@ -106,6 +106,7 @@ const getStyle = (
 		${selector} {
 			--rcx-color-neutral-100: ${toVar(colors.n900)};
 			--rcx-color-neutral-200: ${toVar(colors.n800)};
+			--rcx-color-neutral-250: ${toVar(colors.n800)};
 			--rcx-color-neutral-300: ${toVar(colors.n700)};
 			--rcx-color-neutral-400: ${toVar(colors.n600)};
 			--rcx-color-neutral-500: ${toVar(colors.n500)};

From de47a4db0dee1cbafd2034f0be43c26ad6530450 Mon Sep 17 00:00:00 2001
From: Allan RIbeiro <35040806+AllanPazRibeiro@users.noreply.github.com>
Date: Fri, 2 Dec 2022 09:58:14 -0300
Subject: [PATCH 06/12] Chore: bumping apps engine version (#27414)

Co-authored-by: Douglas Gubert <douglas.gubert@gmail.com>
---
 apps/meteor/package.json |  2 +-
 yarn.lock                | 18 +++++++++---------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/apps/meteor/package.json b/apps/meteor/package.json
index c042a8add8c..c5891323d20 100644
--- a/apps/meteor/package.json
+++ b/apps/meteor/package.json
@@ -205,7 +205,7 @@
 		"@react-aria/color": "^3.0.0-beta.15",
 		"@rocket.chat/agenda": "workspace:^",
 		"@rocket.chat/api-client": "workspace:^",
-		"@rocket.chat/apps-engine": "alpha",
+		"@rocket.chat/apps-engine": "1.36.0-alpha.0.77",
 		"@rocket.chat/cas-validate": "workspace:^",
 		"@rocket.chat/core-typings": "workspace:^",
 		"@rocket.chat/css-in-js": "next",
diff --git a/yarn.lock b/yarn.lock
index 7c21393c3b8..b2dd112e86f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5385,9 +5385,9 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@rocket.chat/apps-engine@npm:^1.32.0":
-  version: 1.35.0
-  resolution: "@rocket.chat/apps-engine@npm:1.35.0"
+"@rocket.chat/apps-engine@npm:1.36.0-alpha.0.77":
+  version: 1.36.0-alpha.0.77
+  resolution: "@rocket.chat/apps-engine@npm:1.36.0-alpha.0.77"
   dependencies:
     adm-zip: ^0.5.9
     cryptiles: ^4.1.3
@@ -5396,13 +5396,13 @@ __metadata:
     stack-trace: 0.0.10
     uuid: ^3.4.0
     vm2: ^3.9.11
-  checksum: 36c1aeeca2163a0bcde0de8f28eceedccb2cb0a55f014487c4924b72ba00e0969d9a28797a70aa40f8a6e3856b541608a0af251292b077e173c9e4fd9d0010f1
+  checksum: 028e9e13620ae5427eb6253a96f4986f5a4a558b0696a5287dd0f364c286d7dbc3a30bdc05e55fdd3cc632ab4c3af710ff6429b811579197f130ac0306a554a4
   languageName: node
   linkType: hard
 
-"@rocket.chat/apps-engine@npm:alpha":
-  version: 1.36.0-alpha.0.75
-  resolution: "@rocket.chat/apps-engine@npm:1.36.0-alpha.0.75"
+"@rocket.chat/apps-engine@npm:^1.32.0":
+  version: 1.35.0
+  resolution: "@rocket.chat/apps-engine@npm:1.35.0"
   dependencies:
     adm-zip: ^0.5.9
     cryptiles: ^4.1.3
@@ -5411,7 +5411,7 @@ __metadata:
     stack-trace: 0.0.10
     uuid: ^3.4.0
     vm2: ^3.9.11
-  checksum: 90f773f5f9be4a61bb14c50dabd992efa416617726e87aa89c0b2e04b47041dc3d429afed260d1188d9b072ad8c5998ffde12afcedbe9f7948c8ed8889178f85
+  checksum: 36c1aeeca2163a0bcde0de8f28eceedccb2cb0a55f014487c4924b72ba00e0969d9a28797a70aa40f8a6e3856b541608a0af251292b077e173c9e4fd9d0010f1
   languageName: node
   linkType: hard
 
@@ -5996,7 +5996,7 @@ __metadata:
     "@react-aria/color": ^3.0.0-beta.15
     "@rocket.chat/agenda": "workspace:^"
     "@rocket.chat/api-client": "workspace:^"
-    "@rocket.chat/apps-engine": alpha
+    "@rocket.chat/apps-engine": 1.36.0-alpha.0.77
     "@rocket.chat/cas-validate": "workspace:^"
     "@rocket.chat/core-typings": "workspace:^"
     "@rocket.chat/css-in-js": next

From 07ea6d1d8a1eab0746b1d06dd06cbac8d0a18154 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cau=C3=AA=20Felchar?=
 <11652381+cauefcr@users.noreply.github.com>
Date: Fri, 2 Dec 2022 09:59:10 -0300
Subject: [PATCH 07/12] [FIX] Livechat: Allow resolving external image and
 media blocks (#27387)

Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
---
 packages/livechat/src/components/helpers.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/livechat/src/components/helpers.js b/packages/livechat/src/components/helpers.js
index 0223813ae32..f7319445ffc 100644
--- a/packages/livechat/src/components/helpers.js
+++ b/packages/livechat/src/components/helpers.js
@@ -129,7 +129,7 @@ export const msgTypesNotRendered = ['livechat_video_call', 'livechat_navigation_
 
 export const canRenderMessage = ({ t }) => !msgTypesNotRendered.includes(t);
 
-export const getAttachmentUrl = (url) => `${Livechat.client.host}${url}`;
+export const getAttachmentUrl = (url) => new URL(url, Livechat.client.host).toString();
 
 export const sortArrayByColumn = (array, column, inverted) =>
 	array.sort((a, b) => {

From e3295d4c1b566234f3d6b81d800b0141beb23e7c Mon Sep 17 00:00:00 2001
From: Filipe Marins <filipe.marins@rocket.chat>
Date: Fri, 2 Dec 2022 15:18:25 -0300
Subject: [PATCH 08/12] [FIX] Threads replied message not clickable on new
 message template (#27359)

Co-authored-by: Guilherme Jun Grillo <48109548+guijun13@users.noreply.github.com>
---
 .../components/ThreadMessagePreview.tsx          | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/apps/meteor/client/views/room/MessageList/components/ThreadMessagePreview.tsx b/apps/meteor/client/views/room/MessageList/components/ThreadMessagePreview.tsx
index d1bf96eb669..c5e1574281f 100644
--- a/apps/meteor/client/views/room/MessageList/components/ThreadMessagePreview.tsx
+++ b/apps/meteor/client/views/room/MessageList/components/ThreadMessagePreview.tsx
@@ -45,13 +45,21 @@ const ThreadMessagePreview: FC<{ message: IThreadMessage; sequential: boolean }>
 			data-qa-selected={isSelected}
 		>
 			{!sequential && (
-				<ThreadMessageRow>
+				<ThreadMessageRow onClick={!isSelecting && parentMessage.isSuccess ? openThread(message.tmid, parentMessage.data?._id) : undefined}>
 					<ThreadMessageLeftContainer>
 						<ThreadMessageIconThread />
 					</ThreadMessageLeftContainer>
 					<ThreadMessageContainer>
 						<ThreadMessageOrigin system={!!messageType}>
-							{parentMessage.isSuccess && !messageType && <ThreadMessagePreviewBody message={{ ...parentMessage.data, msg: body }} />}
+							{parentMessage.isSuccess && !messageType && (
+								<>
+									{(parentMessage.data as { ignored?: boolean })?.ignored ? (
+										t('Message_Ignored')
+									) : (
+										<ThreadMessagePreviewBody message={{ ...parentMessage.data, msg: body }} />
+									)}
+								</>
+							)}
 							{messageType && t(messageType.message, messageType.data ? messageType.data(message) : {})}
 							{parentMessage.isLoading && <Skeleton />}
 						</ThreadMessageOrigin>
@@ -59,9 +67,7 @@ const ThreadMessagePreview: FC<{ message: IThreadMessage; sequential: boolean }>
 					</ThreadMessageContainer>
 				</ThreadMessageRow>
 			)}
-			<ThreadMessageRow
-				onClick={!(message as { ignored?: boolean }).ignored && !isSelecting ? openThread(message.tmid, message._id) : undefined}
-			>
+			<ThreadMessageRow onClick={!isSelecting ? openThread(message.tmid, message._id) : undefined}>
 				<ThreadMessageLeftContainer>
 					{!isSelecting && <UserAvatar username={message.u.username} size='x18' />}
 					{isSelecting && <CheckBox checked={isSelected} onChange={toggleSelected} />}

From 57b334709b476ea7b5d9cf94234bb39d3c6360c8 Mon Sep 17 00:00:00 2001
From: Douglas Gubert <douglas.gubert@gmail.com>
Date: Fri, 2 Dec 2022 16:32:12 -0300
Subject: [PATCH 09/12] Chore: Update Apps-Engine to latest (#27433)

---
 apps/meteor/package.json |  2 +-
 yarn.lock                | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/apps/meteor/package.json b/apps/meteor/package.json
index c5891323d20..9e65050c262 100644
--- a/apps/meteor/package.json
+++ b/apps/meteor/package.json
@@ -205,7 +205,7 @@
 		"@react-aria/color": "^3.0.0-beta.15",
 		"@rocket.chat/agenda": "workspace:^",
 		"@rocket.chat/api-client": "workspace:^",
-		"@rocket.chat/apps-engine": "1.36.0-alpha.0.77",
+		"@rocket.chat/apps-engine": "1.36.0",
 		"@rocket.chat/cas-validate": "workspace:^",
 		"@rocket.chat/core-typings": "workspace:^",
 		"@rocket.chat/css-in-js": "next",
diff --git a/yarn.lock b/yarn.lock
index b2dd112e86f..f8dede1f3ab 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5385,9 +5385,9 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@rocket.chat/apps-engine@npm:1.36.0-alpha.0.77":
-  version: 1.36.0-alpha.0.77
-  resolution: "@rocket.chat/apps-engine@npm:1.36.0-alpha.0.77"
+"@rocket.chat/apps-engine@npm:1.36.0":
+  version: 1.36.0
+  resolution: "@rocket.chat/apps-engine@npm:1.36.0"
   dependencies:
     adm-zip: ^0.5.9
     cryptiles: ^4.1.3
@@ -5396,7 +5396,7 @@ __metadata:
     stack-trace: 0.0.10
     uuid: ^3.4.0
     vm2: ^3.9.11
-  checksum: 028e9e13620ae5427eb6253a96f4986f5a4a558b0696a5287dd0f364c286d7dbc3a30bdc05e55fdd3cc632ab4c3af710ff6429b811579197f130ac0306a554a4
+  checksum: 2711a20cd128aa96eed368088ff432e70d4c964210379df5bd9a124781f6180052e750e0ba2ee20568cbff45a4e1c074c7fd0b19bfb637ab427b5823bb0e10cc
   languageName: node
   linkType: hard
 
@@ -5996,7 +5996,7 @@ __metadata:
     "@react-aria/color": ^3.0.0-beta.15
     "@rocket.chat/agenda": "workspace:^"
     "@rocket.chat/api-client": "workspace:^"
-    "@rocket.chat/apps-engine": 1.36.0-alpha.0.77
+    "@rocket.chat/apps-engine": 1.36.0
     "@rocket.chat/cas-validate": "workspace:^"
     "@rocket.chat/core-typings": "workspace:^"
     "@rocket.chat/css-in-js": next
@@ -23428,7 +23428,7 @@ __metadata:
   resolution: "lamejs@https://github.com/zhuker/lamejs.git#commit=582bbba6a12f981b984d8fb9e1874499fed85675"
   dependencies:
     use-strict: 1.0.1
-  checksum: fa829e0c170a65573e653b4d908a44aaf06a50e1bbade3b1217a300a03ccd59a537e294e2d924a584f9d70c7726a12d4c3af9c675436d48d08be5fb94b5eb400
+  checksum: ed7f6f1c9629b53c17023eb04b4fc5a222e9c34fcb4a2f61214488fc64e5cfea825e4588d959c5fb20f3a91f0120103fa60307dd43df995d498ff5ddb6200cd9
   languageName: node
   linkType: hard
 
@@ -23550,7 +23550,7 @@ __metadata:
       optional: true
   bin:
     lessc: ./bin/lessc
-  checksum: 61568b56b5289fdcfe3d51baf3c13e7db7140022c0a37ef0ae343169f0de927a4b4f4272bc10c20101796e8ee79e934e024051321bba93b3ae071f734309bd98
+  checksum: c9646e8377f8ce59648891ecdb7ebf1aea23349d145cc2f7d192785b8ede1677eb2582aa991175dcf18a63a092f81a1d3f8554a2826493f94d6db82b6007f409
   languageName: node
   linkType: hard
 

From 8b6c999201614f3d9f9a1a9c56a60f73efa4d03c Mon Sep 17 00:00:00 2001
From: Douglas Fabris <devfabris@gmail.com>
Date: Fri, 2 Dec 2022 16:40:36 -0300
Subject: [PATCH 10/12] Regression: Elevation and components z-index fixes
 (#27421)

Co-authored-by: Guilherme Gazzo <guilherme@gazzo.xyz>
---
 .../sidebar/hooks/useSidebarPaletteColor.ts   |   1 -
 .../room/components/body/RoomForeword.tsx     |   6 +-
 apps/meteor/ee/server/services/package.json   |  10 +-
 apps/meteor/package.json                      |  28 +-
 ee/apps/account-service/package.json          |   4 +-
 ee/apps/authorization-service/package.json    |   4 +-
 ee/apps/ddp-streamer/package.json             |   4 +-
 ee/apps/presence-service/package.json         |   4 +-
 ee/apps/stream-hub-service/package.json       |   4 +-
 ee/packages/ui-theming/package.json           |   8 +-
 packages/core-typings/package.json            |   6 +-
 packages/fuselage-ui-kit/package.json         |  14 +-
 packages/gazzodown/package.json               |  10 +-
 packages/livechat/package.json                |   6 +-
 packages/rest-typings/package.json            |   4 +-
 packages/ui-client/package.json               |   8 +-
 packages/ui-composer/package.json             |   4 +-
 packages/ui-contexts/package.json             |   4 +-
 packages/ui-video-conf/package.json           |  12 +-
 .../src/VideoConfPopup/VideoConfPopup.tsx     |   4 +-
 yarn.lock                                     | 294 +++++++++---------
 21 files changed, 219 insertions(+), 220 deletions(-)

diff --git a/apps/meteor/client/sidebar/hooks/useSidebarPaletteColor.ts b/apps/meteor/client/sidebar/hooks/useSidebarPaletteColor.ts
index cce160116d2..378661c032b 100644
--- a/apps/meteor/client/sidebar/hooks/useSidebarPaletteColor.ts
+++ b/apps/meteor/client/sidebar/hooks/useSidebarPaletteColor.ts
@@ -165,7 +165,6 @@ const getStyle = (
 			--rcx-sidebar-item-color-selected: var(--rcx-color-neutral-400, ${toVar(colors.n400)});
 			--rcx-sidebar-footer-highlight-color: var(--rcx-color-neutral-400, ${toVar(colors.n400)});
 			--rcx-sidebar-item-color-highlighted: ${toVar(colors.white)};
-
 		}
 
 		.rcx-badge--danger {
diff --git a/apps/meteor/client/views/room/components/body/RoomForeword.tsx b/apps/meteor/client/views/room/components/body/RoomForeword.tsx
index 19e91fa9dfc..7a15a47afc6 100644
--- a/apps/meteor/client/views/room/components/body/RoomForeword.tsx
+++ b/apps/meteor/client/views/room/components/body/RoomForeword.tsx
@@ -46,10 +46,8 @@ const RoomForeword = ({ user, room }: RoomForewordProps): ReactElement | null =>
 			<Box is='div' flexGrow={1} display='flex' justifyContent='center'>
 				{usernames.map((username, index) => (
 					<Box mi='x4' is='a' href={roomCoordinator.getRouteLink('d', { name: username }) || undefined} key={index}>
-						<Tag className='mention-link' data-username={username} large>
-							<>
-								<Icon name='user' size='x18' /> {username}
-							</>
+						<Tag icon={<Icon name='user' size='x20' />} className='mention-link' data-username={username} large>
+							{username}
 						</Tag>
 					</Box>
 				))}
diff --git a/apps/meteor/ee/server/services/package.json b/apps/meteor/ee/server/services/package.json
index 277798c838e..54582245e97 100644
--- a/apps/meteor/ee/server/services/package.json
+++ b/apps/meteor/ee/server/services/package.json
@@ -20,13 +20,13 @@
 	"dependencies": {
 		"@rocket.chat/apps-engine": "^1.32.0",
 		"@rocket.chat/core-typings": "workspace:^",
-		"@rocket.chat/emitter": "next",
-		"@rocket.chat/message-parser": "next",
+		"@rocket.chat/emitter": "0.31.22",
+		"@rocket.chat/message-parser": "0.31.22",
 		"@rocket.chat/model-typings": "workspace:^",
 		"@rocket.chat/models": "workspace:^",
 		"@rocket.chat/rest-typings": "workspace:^",
-		"@rocket.chat/string-helpers": "next",
-		"@rocket.chat/ui-kit": "next",
+		"@rocket.chat/string-helpers": "0.31.22",
+		"@rocket.chat/ui-kit": "0.31.22",
 		"ajv": "^8.11.0",
 		"bcrypt": "^5.0.1",
 		"body-parser": "^1.20.0",
@@ -50,7 +50,7 @@
 		"ws": "^8.8.1"
 	},
 	"devDependencies": {
-		"@rocket.chat/icons": "next",
+		"@rocket.chat/icons": "0.31.22",
 		"@types/cookie": "^0.5.1",
 		"@types/cookie-parser": "^1.4.3",
 		"@types/ejson": "^2.2.0",
diff --git a/apps/meteor/package.json b/apps/meteor/package.json
index 9e65050c262..c7e6c3cd8de 100644
--- a/apps/meteor/package.json
+++ b/apps/meteor/package.json
@@ -208,35 +208,35 @@
 		"@rocket.chat/apps-engine": "1.36.0",
 		"@rocket.chat/cas-validate": "workspace:^",
 		"@rocket.chat/core-typings": "workspace:^",
-		"@rocket.chat/css-in-js": "next",
-		"@rocket.chat/emitter": "next",
+		"@rocket.chat/css-in-js": "0.31.22",
+		"@rocket.chat/emitter": "0.31.22",
 		"@rocket.chat/favicon": "workspace:^",
 		"@rocket.chat/forked-matrix-appservice-bridge": "^4.0.1",
 		"@rocket.chat/forked-matrix-bot-sdk": "^0.6.0-beta.2",
-		"@rocket.chat/fuselage": "next",
-		"@rocket.chat/fuselage-hooks": "next",
-		"@rocket.chat/fuselage-polyfills": "next",
-		"@rocket.chat/fuselage-toastbar": "next",
-		"@rocket.chat/fuselage-tokens": "next",
+		"@rocket.chat/fuselage": "0.31.22",
+		"@rocket.chat/fuselage-hooks": "0.31.22",
+		"@rocket.chat/fuselage-polyfills": "0.31.22",
+		"@rocket.chat/fuselage-toastbar": "0.31.22",
+		"@rocket.chat/fuselage-tokens": "0.31.22",
 		"@rocket.chat/fuselage-ui-kit": "workspace:^",
 		"@rocket.chat/gazzodown": "workspace:^",
-		"@rocket.chat/icons": "next",
+		"@rocket.chat/icons": "0.31.22",
 		"@rocket.chat/layout": "next",
-		"@rocket.chat/logo": "next",
-		"@rocket.chat/memo": "next",
-		"@rocket.chat/message-parser": "next",
+		"@rocket.chat/logo": "0.31.22",
+		"@rocket.chat/memo": "0.31.22",
+		"@rocket.chat/message-parser": "0.31.22",
 		"@rocket.chat/model-typings": "workspace:^",
 		"@rocket.chat/models": "workspace:^",
 		"@rocket.chat/mp3-encoder": "0.24.0",
-		"@rocket.chat/onboarding-ui": "next",
+		"@rocket.chat/onboarding-ui": "0.31.22",
 		"@rocket.chat/poplib": "workspace:^",
 		"@rocket.chat/presence": "workspace:^",
 		"@rocket.chat/rest-typings": "workspace:^",
-		"@rocket.chat/string-helpers": "next",
+		"@rocket.chat/string-helpers": "0.31.22",
 		"@rocket.chat/ui-client": "workspace:^",
 		"@rocket.chat/ui-composer": "workspace:^",
 		"@rocket.chat/ui-contexts": "workspace:^",
-		"@rocket.chat/ui-kit": "next",
+		"@rocket.chat/ui-kit": "0.31.22",
 		"@rocket.chat/ui-theming": "workspace:^",
 		"@rocket.chat/ui-video-conf": "workspace:^",
 		"@rocket.chat/web-ui-registration": "workspace:^",
diff --git a/ee/apps/account-service/package.json b/ee/apps/account-service/package.json
index b9340ac77b3..b98189fce97 100644
--- a/ee/apps/account-service/package.json
+++ b/ee/apps/account-service/package.json
@@ -16,11 +16,11 @@
 	"author": "Rocket.Chat",
 	"dependencies": {
 		"@rocket.chat/core-typings": "workspace:^",
-		"@rocket.chat/emitter": "next",
+		"@rocket.chat/emitter": "0.31.22",
 		"@rocket.chat/model-typings": "workspace:^",
 		"@rocket.chat/models": "workspace:^",
 		"@rocket.chat/rest-typings": "workspace:^",
-		"@rocket.chat/string-helpers": "next",
+		"@rocket.chat/string-helpers": "0.31.22",
 		"@types/node": "^14.18.21",
 		"bcrypt": "^5.0.1",
 		"ejson": "^2.2.2",
diff --git a/ee/apps/authorization-service/package.json b/ee/apps/authorization-service/package.json
index a8033c89ebc..eadb0aff00e 100644
--- a/ee/apps/authorization-service/package.json
+++ b/ee/apps/authorization-service/package.json
@@ -16,11 +16,11 @@
 	"author": "Rocket.Chat",
 	"dependencies": {
 		"@rocket.chat/core-typings": "workspace:^",
-		"@rocket.chat/emitter": "next",
+		"@rocket.chat/emitter": "0.31.22",
 		"@rocket.chat/model-typings": "workspace:^",
 		"@rocket.chat/models": "workspace:^",
 		"@rocket.chat/rest-typings": "workspace:^",
-		"@rocket.chat/string-helpers": "next",
+		"@rocket.chat/string-helpers": "0.31.22",
 		"@types/node": "^14.18.21",
 		"ejson": "^2.2.2",
 		"eventemitter3": "^4.0.7",
diff --git a/ee/apps/ddp-streamer/package.json b/ee/apps/ddp-streamer/package.json
index d4b9c836b67..b2d86d03de2 100644
--- a/ee/apps/ddp-streamer/package.json
+++ b/ee/apps/ddp-streamer/package.json
@@ -17,11 +17,11 @@
 	"dependencies": {
 		"@rocket.chat/apps-engine": "^1.32.0",
 		"@rocket.chat/core-typings": "workspace:^",
-		"@rocket.chat/emitter": "next",
+		"@rocket.chat/emitter": "0.31.22",
 		"@rocket.chat/model-typings": "workspace:^",
 		"@rocket.chat/models": "workspace:^",
 		"@rocket.chat/rest-typings": "workspace:^",
-		"@rocket.chat/string-helpers": "next",
+		"@rocket.chat/string-helpers": "0.31.22",
 		"colorette": "^1.4.0",
 		"ejson": "^2.2.2",
 		"eventemitter3": "^4.0.7",
diff --git a/ee/apps/presence-service/package.json b/ee/apps/presence-service/package.json
index a9ae0e0288a..80dfc154de7 100644
--- a/ee/apps/presence-service/package.json
+++ b/ee/apps/presence-service/package.json
@@ -16,11 +16,11 @@
 	"author": "Rocket.Chat",
 	"dependencies": {
 		"@rocket.chat/core-typings": "workspace:^",
-		"@rocket.chat/emitter": "next",
+		"@rocket.chat/emitter": "0.31.22",
 		"@rocket.chat/model-typings": "workspace:^",
 		"@rocket.chat/models": "workspace:^",
 		"@rocket.chat/presence": "workspace:^",
-		"@rocket.chat/string-helpers": "next",
+		"@rocket.chat/string-helpers": "0.31.22",
 		"@types/node": "^14.18.21",
 		"ejson": "^2.2.2",
 		"eventemitter3": "^4.0.7",
diff --git a/ee/apps/stream-hub-service/package.json b/ee/apps/stream-hub-service/package.json
index 1d4c4491eb7..4b1f019dbc5 100644
--- a/ee/apps/stream-hub-service/package.json
+++ b/ee/apps/stream-hub-service/package.json
@@ -16,10 +16,10 @@
 	"author": "Rocket.Chat",
 	"dependencies": {
 		"@rocket.chat/core-typings": "workspace:^",
-		"@rocket.chat/emitter": "next",
+		"@rocket.chat/emitter": "0.31.22",
 		"@rocket.chat/model-typings": "workspace:^",
 		"@rocket.chat/models": "workspace:^",
-		"@rocket.chat/string-helpers": "next",
+		"@rocket.chat/string-helpers": "0.31.22",
 		"@types/node": "^14.18.21",
 		"ejson": "^2.2.2",
 		"eventemitter3": "^4.0.7",
diff --git a/ee/packages/ui-theming/package.json b/ee/packages/ui-theming/package.json
index 0130d828426..7eb1366030e 100644
--- a/ee/packages/ui-theming/package.json
+++ b/ee/packages/ui-theming/package.json
@@ -3,10 +3,10 @@
 	"version": "0.0.1",
 	"private": true,
 	"devDependencies": {
-		"@rocket.chat/css-in-js": "next",
-		"@rocket.chat/fuselage": "next",
-		"@rocket.chat/fuselage-hooks": "next",
-		"@rocket.chat/icons": "next",
+		"@rocket.chat/css-in-js": "0.31.22",
+		"@rocket.chat/fuselage": "0.31.22",
+		"@rocket.chat/fuselage-hooks": "0.31.22",
+		"@rocket.chat/icons": "0.31.22",
 		"@rocket.chat/ui-contexts": "workspace:~",
 		"@storybook/addon-actions": "~6.5.10",
 		"@storybook/addon-docs": "~6.5.10",
diff --git a/packages/core-typings/package.json b/packages/core-typings/package.json
index 27ae9d5549c..fdb28e8f031 100644
--- a/packages/core-typings/package.json
+++ b/packages/core-typings/package.json
@@ -23,8 +23,8 @@
 	],
 	"dependencies": {
 		"@rocket.chat/apps-engine": "^1.32.0",
-		"@rocket.chat/icons": "next",
-		"@rocket.chat/message-parser": "next",
-		"@rocket.chat/ui-kit": "next"
+		"@rocket.chat/icons": "0.31.22",
+		"@rocket.chat/message-parser": "0.31.22",
+		"@rocket.chat/ui-kit": "0.31.22"
 	}
 }
diff --git a/packages/fuselage-ui-kit/package.json b/packages/fuselage-ui-kit/package.json
index d55b72db832..18c6f0656b7 100644
--- a/packages/fuselage-ui-kit/package.json
+++ b/packages/fuselage-ui-kit/package.json
@@ -56,14 +56,14 @@
   "devDependencies": {
     "@rocket.chat/apps-engine": "~1.30.0",
     "@rocket.chat/eslint-config": "workspace:^",
-    "@rocket.chat/fuselage": "next",
-    "@rocket.chat/fuselage-hooks": "next",
-    "@rocket.chat/fuselage-polyfills": "next",
-    "@rocket.chat/icons": "next",
+    "@rocket.chat/fuselage": "0.31.22",
+    "@rocket.chat/fuselage-hooks": "0.31.22",
+    "@rocket.chat/fuselage-polyfills": "0.31.22",
+    "@rocket.chat/icons": "0.31.22",
     "@rocket.chat/prettier-config": "next",
-    "@rocket.chat/styled": "next",
+    "@rocket.chat/styled": "0.31.22",
     "@rocket.chat/ui-contexts": "workspace:^",
-    "@rocket.chat/ui-kit": "next",
+    "@rocket.chat/ui-kit": "0.31.22",
     "@rocket.chat/ui-video-conf": "workspace:^",
     "@storybook/addon-essentials": "~6.5.10",
     "@storybook/addons": "~6.5.10",
@@ -89,7 +89,7 @@
     "webpack": "~5.68.0"
   },
   "dependencies": {
-    "@rocket.chat/ui-kit": "next",
+    "@rocket.chat/ui-kit": "0.31.22",
     "tslib": "^2.3.1"
   }
 }
diff --git a/packages/gazzodown/package.json b/packages/gazzodown/package.json
index 1b03439e4d1..fc50b23ab5e 100644
--- a/packages/gazzodown/package.json
+++ b/packages/gazzodown/package.json
@@ -6,11 +6,11 @@
 		"@babel/core": "~7.18.13",
 		"@mdx-js/react": "^1.6.22",
 		"@rocket.chat/core-typings": "workspace:^",
-		"@rocket.chat/css-in-js": "next",
-		"@rocket.chat/fuselage": "next",
-		"@rocket.chat/fuselage-tokens": "next",
-		"@rocket.chat/message-parser": "next",
-		"@rocket.chat/styled": "next",
+		"@rocket.chat/css-in-js": "0.31.22",
+		"@rocket.chat/fuselage": "0.31.22",
+		"@rocket.chat/fuselage-tokens": "0.31.22",
+		"@rocket.chat/message-parser": "0.31.22",
+		"@rocket.chat/styled": "0.31.22",
 		"@rocket.chat/ui-client": "workspace:^",
 		"@rocket.chat/ui-contexts": "workspace:^",
 		"@storybook/addon-actions": "~6.5.10",
diff --git a/packages/livechat/package.json b/packages/livechat/package.json
index cf8203eb4e3..032951db881 100644
--- a/packages/livechat/package.json
+++ b/packages/livechat/package.json
@@ -27,8 +27,8 @@
 		"@babel/eslint-parser": "^7.18.9",
 		"@babel/preset-env": "^7.18.10",
 		"@rocket.chat/eslint-config": "^0.4.0",
-		"@rocket.chat/fuselage-tokens": "next",
-		"@rocket.chat/logo": "next",
+		"@rocket.chat/fuselage-tokens": "0.31.22",
+		"@rocket.chat/logo": "0.31.22",
 		"@storybook/addon-actions": "~6.5.10",
 		"@storybook/addon-backgrounds": "~6.5.10",
 		"@storybook/addon-essentials": "~6.5.10",
@@ -86,7 +86,7 @@
 	},
 	"dependencies": {
 		"@rocket.chat/sdk": "^1.0.0-alpha.42",
-		"@rocket.chat/ui-kit": "next",
+		"@rocket.chat/ui-kit": "0.31.22",
 		"crypto-js": "^4.1.1",
 		"css-vars-ponyfill": "^2.4.7",
 		"date-fns": "^2.15.0",
diff --git a/packages/rest-typings/package.json b/packages/rest-typings/package.json
index 603c229976c..1083efaad4b 100644
--- a/packages/rest-typings/package.json
+++ b/packages/rest-typings/package.json
@@ -26,8 +26,8 @@
 	"dependencies": {
 		"@rocket.chat/apps-engine": "^1.32.0",
 		"@rocket.chat/core-typings": "workspace:^",
-		"@rocket.chat/message-parser": "next",
-		"@rocket.chat/ui-kit": "next",
+		"@rocket.chat/message-parser": "0.31.22",
+		"@rocket.chat/ui-kit": "0.31.22",
 		"ajv": "^8.11.0"
 	}
 }
diff --git a/packages/ui-client/package.json b/packages/ui-client/package.json
index 39aaa9d9cb6..608afdde2f0 100644
--- a/packages/ui-client/package.json
+++ b/packages/ui-client/package.json
@@ -4,10 +4,10 @@
 	"private": true,
 	"devDependencies": {
 		"@babel/core": "~7.18.13",
-		"@rocket.chat/css-in-js": "next",
-		"@rocket.chat/fuselage": "next",
-		"@rocket.chat/fuselage-hooks": "next",
-		"@rocket.chat/icons": "next",
+		"@rocket.chat/css-in-js": "0.31.22",
+		"@rocket.chat/fuselage": "0.31.22",
+		"@rocket.chat/fuselage-hooks": "0.31.22",
+		"@rocket.chat/icons": "0.31.22",
 		"@rocket.chat/ui-contexts": "workspace:~",
 		"@storybook/addon-actions": "~6.5.10",
 		"@storybook/addon-docs": "~6.5.10",
diff --git a/packages/ui-composer/package.json b/packages/ui-composer/package.json
index 6cd3858d674..aa5c075a2c5 100644
--- a/packages/ui-composer/package.json
+++ b/packages/ui-composer/package.json
@@ -5,8 +5,8 @@
   "devDependencies": {
     "@babel/core": "~7.18.13",
     "@rocket.chat/eslint-config": "workspace:^",
-    "@rocket.chat/fuselage": "next",
-    "@rocket.chat/icons": "next",
+    "@rocket.chat/fuselage": "0.31.22",
+    "@rocket.chat/icons": "0.31.22",
     "@storybook/addon-actions": "~6.5.12",
     "@storybook/addon-docs": "~6.5.12",
     "@storybook/addon-essentials": "~6.5.12",
diff --git a/packages/ui-contexts/package.json b/packages/ui-contexts/package.json
index 7bfd1f95fdc..f117f2227f7 100644
--- a/packages/ui-contexts/package.json
+++ b/packages/ui-contexts/package.json
@@ -4,8 +4,8 @@
 	"private": true,
 	"devDependencies": {
 		"@rocket.chat/core-typings": "workspace:^",
-		"@rocket.chat/emitter": "next",
-		"@rocket.chat/fuselage-hooks": "next",
+		"@rocket.chat/emitter": "0.31.22",
+		"@rocket.chat/fuselage-hooks": "0.31.22",
 		"@rocket.chat/rest-typings": "workspace:^",
 		"@types/jest": "^27.4.1",
 		"@types/react": "~17.0.48",
diff --git a/packages/ui-video-conf/package.json b/packages/ui-video-conf/package.json
index b09a72beb13..41dc9829270 100644
--- a/packages/ui-video-conf/package.json
+++ b/packages/ui-video-conf/package.json
@@ -4,12 +4,12 @@
 	"private": true,
 	"devDependencies": {
 		"@babel/core": "~7.18.13",
-		"@rocket.chat/css-in-js": "next",
+		"@rocket.chat/css-in-js": "0.31.22",
 		"@rocket.chat/eslint-config": "workspace:^",
-		"@rocket.chat/fuselage": "next",
-		"@rocket.chat/fuselage-hooks": "next",
-		"@rocket.chat/icons": "next",
-		"@rocket.chat/styled": "next",
+		"@rocket.chat/fuselage": "0.31.22",
+		"@rocket.chat/fuselage-hooks": "0.31.22",
+		"@rocket.chat/icons": "0.31.22",
+		"@rocket.chat/styled": "0.31.22",
 		"@rocket.chat/ui-contexts": "workspace:^",
 		"@storybook/addon-actions": "~6.5.10",
 		"@storybook/addon-docs": "~6.5.10",
@@ -52,6 +52,6 @@
 		"/dist"
 	],
 	"dependencies": {
-		"@rocket.chat/emitter": "next"
+		"@rocket.chat/emitter": "0.31.22"
 	}
 }
diff --git a/packages/ui-video-conf/src/VideoConfPopup/VideoConfPopup.tsx b/packages/ui-video-conf/src/VideoConfPopup/VideoConfPopup.tsx
index b25af970e93..badac9c8cfb 100644
--- a/packages/ui-video-conf/src/VideoConfPopup/VideoConfPopup.tsx
+++ b/packages/ui-video-conf/src/VideoConfPopup/VideoConfPopup.tsx
@@ -6,8 +6,10 @@ import type { ReactNode, ReactElement, HTMLAttributes, Ref } from 'react';
 export const VideoConfPopupContainer = styled('div', ({ position: _position, ...props }: { position?: number }) => props)`
 	width: 100%;
 	position: absolute;
-	box-shadow: 0px 4px 32px rgba(0, 0, 0, 0.15);
+	box-shadow: 0px 0px 2px 0px ${Palette.shadow['shadow-elevation-2x'].toString()},
+		0px 0px 12px 0px ${Palette.shadow['shadow-elevation-2y'].toString()};
 	background-color: ${Palette.surface['surface-light'].toString()};
+	border: 1px solid ${Palette.stroke['stroke-extra-light'].toString()}
 	border-radius: 0.25rem;
 	top: ${(p): string => (p.position ? `${p.position}px` : '0')};
 	left: -${(p): string => (p.position ? `${p.position}px` : '0')};
diff --git a/yarn.lock b/yarn.lock
index f8dede1f3ab..b0c23be701e 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5320,12 +5320,12 @@ __metadata:
   resolution: "@rocket.chat/account-service@workspace:ee/apps/account-service"
   dependencies:
     "@rocket.chat/core-typings": "workspace:^"
-    "@rocket.chat/emitter": next
+    "@rocket.chat/emitter": 0.31.22
     "@rocket.chat/eslint-config": "workspace:^"
     "@rocket.chat/model-typings": "workspace:^"
     "@rocket.chat/models": "workspace:^"
     "@rocket.chat/rest-typings": "workspace:^"
-    "@rocket.chat/string-helpers": next
+    "@rocket.chat/string-helpers": 0.31.22
     "@types/bcrypt": ^5.0.0
     "@types/eslint": ^8
     "@types/node": ^14.18.21
@@ -5434,12 +5434,12 @@ __metadata:
   resolution: "@rocket.chat/authorization-service@workspace:ee/apps/authorization-service"
   dependencies:
     "@rocket.chat/core-typings": "workspace:^"
-    "@rocket.chat/emitter": next
+    "@rocket.chat/emitter": 0.31.22
     "@rocket.chat/eslint-config": "workspace:^"
     "@rocket.chat/model-typings": "workspace:^"
     "@rocket.chat/models": "workspace:^"
     "@rocket.chat/rest-typings": "workspace:^"
-    "@rocket.chat/string-helpers": next
+    "@rocket.chat/string-helpers": 0.31.22
     "@types/eslint": ^8
     "@types/node": ^14.18.21
     "@types/polka": ^0.5.4
@@ -5477,9 +5477,9 @@ __metadata:
   dependencies:
     "@rocket.chat/apps-engine": ^1.32.0
     "@rocket.chat/eslint-config": "workspace:^"
-    "@rocket.chat/icons": next
-    "@rocket.chat/message-parser": next
-    "@rocket.chat/ui-kit": next
+    "@rocket.chat/icons": 0.31.22
+    "@rocket.chat/message-parser": 0.31.22
+    "@rocket.chat/ui-kit": 0.31.22
     eslint: ^8.22.0
     mongodb: ^4.3.1
     prettier: ^2.7.1
@@ -5487,25 +5487,25 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@rocket.chat/css-in-js@npm:next, @rocket.chat/css-in-js@npm:~0.31.22-dev.30":
-  version: 0.31.22-dev.30
-  resolution: "@rocket.chat/css-in-js@npm:0.31.22-dev.30"
+"@rocket.chat/css-in-js@npm:0.31.22, @rocket.chat/css-in-js@npm:^0.31.22":
+  version: 0.31.22
+  resolution: "@rocket.chat/css-in-js@npm:0.31.22"
   dependencies:
     "@emotion/hash": ^0.9.0
-    "@rocket.chat/css-supports": ~0.31.22-dev.30
-    "@rocket.chat/memo": ~0.31.22-dev.30
-    "@rocket.chat/stylis-logical-props-middleware": ~0.31.22-dev.30
+    "@rocket.chat/css-supports": ^0.31.22
+    "@rocket.chat/memo": ^0.31.22
+    "@rocket.chat/stylis-logical-props-middleware": ^0.31.22
     stylis: ~4.1.3
-  checksum: 942808194eb940973dd0f531e2f54af0df6fca716c558ff8abb63ab30b6e05bf3bf50a1cd21ff9b7679328432fd7d1d438c58c1f8582ca6f587f7aee3a7f1b9b
+  checksum: 77566d76f8e8cdcf4bdfd89323816428ec2ad6b17c7d6375544a5de334fcc229495d17b3c6afcd7bf67ff8bc0adb94198b582d28426038540645b820d048e2d7
   languageName: node
   linkType: hard
 
-"@rocket.chat/css-supports@npm:~0.31.22-dev.30":
-  version: 0.31.22-dev.30
-  resolution: "@rocket.chat/css-supports@npm:0.31.22-dev.30"
+"@rocket.chat/css-supports@npm:^0.31.22":
+  version: 0.31.22
+  resolution: "@rocket.chat/css-supports@npm:0.31.22"
   dependencies:
-    "@rocket.chat/memo": ~0.31.22-dev.30
-  checksum: db314a7666e6c40555838ad6dffb0f1d6a222aa7833931572cc16fe56bf76f576f278a4687d5a836099329dbcc78f0ea4fa3fff82cbe5df2f9d04de6c4b06fc7
+    "@rocket.chat/memo": ^0.31.22
+  checksum: 1dc41a3812c5f46d76ad66fd6c393b27793ed88d96bd7b011462bf684e0bd7530810cc86a82dfaacdf67b98c836c84ffbc40b80b77993dd3086c11f36635852c
   languageName: node
   linkType: hard
 
@@ -5515,12 +5515,12 @@ __metadata:
   dependencies:
     "@rocket.chat/apps-engine": ^1.32.0
     "@rocket.chat/core-typings": "workspace:^"
-    "@rocket.chat/emitter": next
+    "@rocket.chat/emitter": 0.31.22
     "@rocket.chat/eslint-config": "workspace:^"
     "@rocket.chat/model-typings": "workspace:^"
     "@rocket.chat/models": "workspace:^"
     "@rocket.chat/rest-typings": "workspace:^"
-    "@rocket.chat/string-helpers": next
+    "@rocket.chat/string-helpers": 0.31.22
     "@types/ejson": ^2.2.0
     "@types/eslint": ^8
     "@types/meteor": 2.7.1
@@ -5550,10 +5550,10 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@rocket.chat/emitter@npm:next":
-  version: 0.31.22-dev.30
-  resolution: "@rocket.chat/emitter@npm:0.31.22-dev.30"
-  checksum: c1ea859c2a3809d44ba118cb14422e0bc350652afd4d2e653555766938d68d8f130f227d194593aff695441c1a1e7fdf5cc885568adae3a558ef7efdfe80b540
+"@rocket.chat/emitter@npm:0.31.22":
+  version: 0.31.22
+  resolution: "@rocket.chat/emitter@npm:0.31.22"
+  checksum: 0c14b4fffb3a89189b4f03a43be49c77f37889738fc31a0495c0591c8df232e456c2657365bed06d1396b97540c6a80a185009b9d3124c1f33c8dfac2a44d9d3
   languageName: node
   linkType: hard
 
@@ -5656,21 +5656,21 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@rocket.chat/fuselage-hooks@npm:next, @rocket.chat/fuselage-hooks@npm:~0.32.0-dev.132":
-  version: 0.32.0-dev.132
-  resolution: "@rocket.chat/fuselage-hooks@npm:0.32.0-dev.132"
+"@rocket.chat/fuselage-hooks@npm:0.31.22, @rocket.chat/fuselage-hooks@npm:^0.31.22":
+  version: 0.31.22
+  resolution: "@rocket.chat/fuselage-hooks@npm:0.31.22"
   dependencies:
     use-sync-external-store: ~1.2.0
   peerDependencies:
     "@rocket.chat/fuselage-tokens": "*"
     react: ^17.0.2
-  checksum: c1128f3df0b194638958e446f409eb9e462322751f1be66e196b773547c1bedd1a09dd9324422693cebd16b465b11d891bc9c2c68800b13e2e7148979869b42d
+  checksum: de98e0cf0e3a6b1f487087a441e46c584a01a75cd2a9118abb4e4e7eac6fb3b796976109efe1fe7f361d4d7b8dec68771adf667bcf4fb929a7887fbb161d10b9
   languageName: node
   linkType: hard
 
-"@rocket.chat/fuselage-polyfills@npm:next":
-  version: 0.31.22-dev.30
-  resolution: "@rocket.chat/fuselage-polyfills@npm:0.31.22-dev.30"
+"@rocket.chat/fuselage-polyfills@npm:0.31.22":
+  version: 0.31.22
+  resolution: "@rocket.chat/fuselage-polyfills@npm:0.31.22"
   dependencies:
     "@juggle/resize-observer": ^3.4.0
     clipboard-polyfill: ^3.0.3
@@ -5678,13 +5678,13 @@ __metadata:
     focus-visible: ^5.2.0
     focus-within-polyfill: ^5.2.1
     new-event-polyfill: ^1.0.1
-  checksum: 00dfddd4db11b6af14e6ff45626c8cba3ff4771424f936744b8f51f28f9b5835dcb9db44a94d67fe9f890797eb0d08febe458e95be4e3747ccf2b1419a51dd01
+  checksum: 6884bc8437c00253a136b1c89588db19029f036f7925419134f2323a36f663fe9e7e03682efe069ccaef657c1f039dcf220e3e6873679ec30280e7313a01cd65
   languageName: node
   linkType: hard
 
-"@rocket.chat/fuselage-toastbar@npm:next":
-  version: 0.32.0-dev.193
-  resolution: "@rocket.chat/fuselage-toastbar@npm:0.32.0-dev.193"
+"@rocket.chat/fuselage-toastbar@npm:0.31.22":
+  version: 0.31.22
+  resolution: "@rocket.chat/fuselage-toastbar@npm:0.31.22"
   peerDependencies:
     "@rocket.chat/fuselage": "*"
     "@rocket.chat/fuselage-hooks": "*"
@@ -5692,14 +5692,14 @@ __metadata:
     "@rocket.chat/styled": "*"
     react: ^17.0.2
     react-dom: ^17.0.2
-  checksum: 381e73cf92509d0046ea5dbdd4656febdddb015599f23382691ac4be31e5c2788ae47da71d7c730990cb912f9c8c6db510c5c286e8c8b7b46dea0cd1edb213ef
+  checksum: e3fb1126d49cc28cbcce64836e0660d8dd4ec0adb31c50af16fa71b0b04d0bffdcb0ed65ad688f1baa225022fe61cfc2b52c702cd741c748437f702cbefcc67c
   languageName: node
   linkType: hard
 
-"@rocket.chat/fuselage-tokens@npm:next, @rocket.chat/fuselage-tokens@npm:~0.32.0-dev.169":
-  version: 0.32.0-dev.169
-  resolution: "@rocket.chat/fuselage-tokens@npm:0.32.0-dev.169"
-  checksum: c98f477aa44e237ee05d661e05500561f2cba7da03e2a4b90f6b8ab1d4f6884c6957cbe3e158c06a8ee5c146a3770bf16b8cb46dcd8d6d108c3fcdf0b06904b9
+"@rocket.chat/fuselage-tokens@npm:0.31.22, @rocket.chat/fuselage-tokens@npm:^0.31.22":
+  version: 0.31.22
+  resolution: "@rocket.chat/fuselage-tokens@npm:0.31.22"
+  checksum: a6814211193ff7944255e06c74edec0f760a3f668eb5e227c45e0332c6e0a592829adcd09d852d1ca675ccdc7d9ead2cc5affec283b0e3830625daad11ee55f2
   languageName: node
   linkType: hard
 
@@ -5709,14 +5709,14 @@ __metadata:
   dependencies:
     "@rocket.chat/apps-engine": ~1.30.0
     "@rocket.chat/eslint-config": "workspace:^"
-    "@rocket.chat/fuselage": next
-    "@rocket.chat/fuselage-hooks": next
-    "@rocket.chat/fuselage-polyfills": next
-    "@rocket.chat/icons": next
+    "@rocket.chat/fuselage": 0.31.22
+    "@rocket.chat/fuselage-hooks": 0.31.22
+    "@rocket.chat/fuselage-polyfills": 0.31.22
+    "@rocket.chat/icons": 0.31.22
     "@rocket.chat/prettier-config": next
-    "@rocket.chat/styled": next
+    "@rocket.chat/styled": 0.31.22
     "@rocket.chat/ui-contexts": "workspace:^"
-    "@rocket.chat/ui-kit": next
+    "@rocket.chat/ui-kit": 0.31.22
     "@rocket.chat/ui-video-conf": "workspace:^"
     "@storybook/addon-essentials": ~6.5.10
     "@storybook/addons": ~6.5.10
@@ -5758,15 +5758,15 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@rocket.chat/fuselage@npm:next":
-  version: 0.32.0-dev.219
-  resolution: "@rocket.chat/fuselage@npm:0.32.0-dev.219"
+"@rocket.chat/fuselage@npm:0.31.22":
+  version: 0.31.22
+  resolution: "@rocket.chat/fuselage@npm:0.31.22"
   dependencies:
-    "@rocket.chat/css-in-js": ~0.31.22-dev.30
-    "@rocket.chat/css-supports": ~0.31.22-dev.30
-    "@rocket.chat/fuselage-tokens": ~0.32.0-dev.169
-    "@rocket.chat/memo": ~0.31.22-dev.30
-    "@rocket.chat/styled": ~0.31.22-dev.30
+    "@rocket.chat/css-in-js": ^0.31.22
+    "@rocket.chat/css-supports": ^0.31.22
+    "@rocket.chat/fuselage-tokens": ^0.31.22
+    "@rocket.chat/memo": ^0.31.22
+    "@rocket.chat/styled": ^0.31.22
     invariant: ^2.2.4
     react-aria: ~3.19.0
     react-keyed-flatten-children: ^1.3.0
@@ -5778,7 +5778,7 @@ __metadata:
     react: ^17.0.2
     react-dom: ^17.0.2
     react-virtuoso: 1.2.4
-  checksum: 2d17c6b3d6ef2b623351aaa8b0f86e5eb5d4312c4607badec6c6cd7c72a4dd7b608192501fa0554c87c2bf229de63d1300b12fd07b6d369551525d05283bb084
+  checksum: 5469e86a7db2c9ba6b71eb498177b138e0dfbac9fa41bf3a203ed2aa6fddeaefd8ed4438cf8e9ed60485c51417dc995118e669489e2a376cd7e87c47efb958e2
   languageName: node
   linkType: hard
 
@@ -5789,11 +5789,11 @@ __metadata:
     "@babel/core": ~7.18.13
     "@mdx-js/react": ^1.6.22
     "@rocket.chat/core-typings": "workspace:^"
-    "@rocket.chat/css-in-js": next
-    "@rocket.chat/fuselage": next
-    "@rocket.chat/fuselage-tokens": next
-    "@rocket.chat/message-parser": next
-    "@rocket.chat/styled": next
+    "@rocket.chat/css-in-js": 0.31.22
+    "@rocket.chat/fuselage": 0.31.22
+    "@rocket.chat/fuselage-tokens": 0.31.22
+    "@rocket.chat/message-parser": 0.31.22
+    "@rocket.chat/styled": 0.31.22
     "@rocket.chat/ui-client": "workspace:^"
     "@rocket.chat/ui-contexts": "workspace:^"
     "@storybook/addon-actions": ~6.5.10
@@ -5843,10 +5843,10 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@rocket.chat/icons@npm:next":
-  version: 0.32.0-dev.201
-  resolution: "@rocket.chat/icons@npm:0.32.0-dev.201"
-  checksum: ed28af2a0cce62e00fbedb0006b6b8c6720e364ebcd77887b71b218476260f748b2bbbbd51851f0f093f0f35680d66e8570ca40df10bab4f7126dedfff421431
+"@rocket.chat/icons@npm:0.31.22":
+  version: 0.31.22
+  resolution: "@rocket.chat/icons@npm:0.31.22"
+  checksum: 33d393502bf131a85ded67747221ecca6b2d2c97b54ad051d954cf6bae129ae6c765266b11856e6c394a9f9538d2ef993bf845e9036abc8010864ee2a9c7951e
   languageName: node
   linkType: hard
 
@@ -5869,10 +5869,10 @@ __metadata:
     "@babel/eslint-parser": ^7.18.9
     "@babel/preset-env": ^7.18.10
     "@rocket.chat/eslint-config": ^0.4.0
-    "@rocket.chat/fuselage-tokens": next
-    "@rocket.chat/logo": next
+    "@rocket.chat/fuselage-tokens": 0.31.22
+    "@rocket.chat/logo": 0.31.22
     "@rocket.chat/sdk": ^1.0.0-alpha.42
-    "@rocket.chat/ui-kit": next
+    "@rocket.chat/ui-kit": 0.31.22
     "@storybook/addon-actions": ~6.5.10
     "@storybook/addon-backgrounds": ~6.5.10
     "@storybook/addon-essentials": ~6.5.10
@@ -5943,31 +5943,31 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@rocket.chat/logo@npm:next":
-  version: 0.32.0-dev.169
-  resolution: "@rocket.chat/logo@npm:0.32.0-dev.169"
+"@rocket.chat/logo@npm:0.31.22":
+  version: 0.31.22
+  resolution: "@rocket.chat/logo@npm:0.31.22"
   dependencies:
-    "@rocket.chat/fuselage-hooks": ~0.32.0-dev.132
-    "@rocket.chat/styled": ~0.31.22-dev.30
+    "@rocket.chat/fuselage-hooks": ^0.31.22
+    "@rocket.chat/styled": ^0.31.22
     tslib: ^2.3.1
   peerDependencies:
     react: 17.0.2
     react-dom: 17.0.2
-  checksum: eab63b52882332dda888beb88232232582f0e7424811003e017d6d7f7503270855ad9810443a380e1af6a31855c7795722bd2bf839eb0598c39f0e8e054e7b1c
+  checksum: 6099c3fc2ffa99eee7b2c05b49d875628b9214d338f27484406a0a5aab61766b5c640ea9409dffbe0f8e96d2c6cf26587d923a77c4c913fae2c85cad637afd55
   languageName: node
   linkType: hard
 
-"@rocket.chat/memo@npm:next, @rocket.chat/memo@npm:~0.31.22-dev.30":
-  version: 0.31.22-dev.30
-  resolution: "@rocket.chat/memo@npm:0.31.22-dev.30"
-  checksum: 2897d958d8b17d990252e22db2417f3265abe171456c0b84cad4391a93d4f3f23c4fe871d7fc47b189d98d7d8f1a47546196e0fc8ff076ae36997d7de8555d8e
+"@rocket.chat/memo@npm:0.31.22, @rocket.chat/memo@npm:^0.31.22":
+  version: 0.31.22
+  resolution: "@rocket.chat/memo@npm:0.31.22"
+  checksum: 61b0ff9b0fa952ef4a3899ffc7d6fe4e96ced5dfd867dcd18521876a8d9a0888aaa73869d471229c145ba5f437a2be629c7d4914b14f08495a3882a6027c9dca
   languageName: node
   linkType: hard
 
-"@rocket.chat/message-parser@npm:next":
-  version: 0.32.0-dev.167
-  resolution: "@rocket.chat/message-parser@npm:0.32.0-dev.167"
-  checksum: ab464d07b2548ff0daf39773a175bce27ec59475b6b292a5425fb216af6dc1df794a34ea5cabee33c4611cf8ea4b45df762e8db036a1d8a034e2806da7ba5dfb
+"@rocket.chat/message-parser@npm:0.31.22":
+  version: 0.31.22
+  resolution: "@rocket.chat/message-parser@npm:0.31.22"
+  checksum: f5fa9ee5c239d03ad512af30c049b9d09a6b35776d2888e98a795b401b6a8f817473c94d8bd06afdb8b8f087c083646684ceb0516c11fa5e2aa8c3c9b29256ab
   languageName: node
   linkType: hard
 
@@ -5999,37 +5999,37 @@ __metadata:
     "@rocket.chat/apps-engine": 1.36.0
     "@rocket.chat/cas-validate": "workspace:^"
     "@rocket.chat/core-typings": "workspace:^"
-    "@rocket.chat/css-in-js": next
-    "@rocket.chat/emitter": next
+    "@rocket.chat/css-in-js": 0.31.22
+    "@rocket.chat/emitter": 0.31.22
     "@rocket.chat/eslint-config": "workspace:^"
     "@rocket.chat/favicon": "workspace:^"
     "@rocket.chat/forked-matrix-appservice-bridge": ^4.0.1
     "@rocket.chat/forked-matrix-bot-sdk": ^0.6.0-beta.2
-    "@rocket.chat/fuselage": next
-    "@rocket.chat/fuselage-hooks": next
-    "@rocket.chat/fuselage-polyfills": next
-    "@rocket.chat/fuselage-toastbar": next
-    "@rocket.chat/fuselage-tokens": next
+    "@rocket.chat/fuselage": 0.31.22
+    "@rocket.chat/fuselage-hooks": 0.31.22
+    "@rocket.chat/fuselage-polyfills": 0.31.22
+    "@rocket.chat/fuselage-toastbar": 0.31.22
+    "@rocket.chat/fuselage-tokens": 0.31.22
     "@rocket.chat/fuselage-ui-kit": "workspace:^"
     "@rocket.chat/gazzodown": "workspace:^"
-    "@rocket.chat/icons": next
+    "@rocket.chat/icons": 0.31.22
     "@rocket.chat/layout": next
     "@rocket.chat/livechat": "workspace:^"
-    "@rocket.chat/logo": next
-    "@rocket.chat/memo": next
-    "@rocket.chat/message-parser": next
+    "@rocket.chat/logo": 0.31.22
+    "@rocket.chat/memo": 0.31.22
+    "@rocket.chat/message-parser": 0.31.22
     "@rocket.chat/model-typings": "workspace:^"
     "@rocket.chat/models": "workspace:^"
     "@rocket.chat/mp3-encoder": 0.24.0
-    "@rocket.chat/onboarding-ui": next
+    "@rocket.chat/onboarding-ui": 0.31.22
     "@rocket.chat/poplib": "workspace:^"
     "@rocket.chat/presence": "workspace:^"
     "@rocket.chat/rest-typings": "workspace:^"
-    "@rocket.chat/string-helpers": next
+    "@rocket.chat/string-helpers": 0.31.22
     "@rocket.chat/ui-client": "workspace:^"
     "@rocket.chat/ui-composer": "workspace:^"
     "@rocket.chat/ui-contexts": "workspace:^"
-    "@rocket.chat/ui-kit": next
+    "@rocket.chat/ui-kit": 0.31.22
     "@rocket.chat/ui-theming": "workspace:^"
     "@rocket.chat/ui-video-conf": "workspace:^"
     "@rocket.chat/web-ui-registration": "workspace:^"
@@ -6344,9 +6344,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@rocket.chat/onboarding-ui@npm:next":
-  version: 0.32.0-dev.219
-  resolution: "@rocket.chat/onboarding-ui@npm:0.32.0-dev.219"
+"@rocket.chat/onboarding-ui@npm:0.31.22":
+  version: 0.31.22
+  resolution: "@rocket.chat/onboarding-ui@npm:0.31.22"
   dependencies:
     i18next: ~21.6.16
     react-hook-form: ~7.27.1
@@ -6362,7 +6362,7 @@ __metadata:
     react: 17.0.2
     react-dom: 17.0.2
     react-i18next: ~11.15.4
-  checksum: 0fe7cd1d0e27c6b05f5644134c5449c6583e1a7b236d8d779abbd86d6486a82817b07167d00f6975a515711341fe0fd19fc6e96fc3c38849926f851d394e23c3
+  checksum: c2ac4f91e087353c0ad9eb61ec8ef532d5da98e50a9a6023a256c4a1dd18046e19d26d1f7c76c1396925061bf913d96bbde20c32cefa6a83f64220400082dfef
   languageName: node
   linkType: hard
 
@@ -6383,12 +6383,12 @@ __metadata:
   resolution: "@rocket.chat/presence-service@workspace:ee/apps/presence-service"
   dependencies:
     "@rocket.chat/core-typings": "workspace:^"
-    "@rocket.chat/emitter": next
+    "@rocket.chat/emitter": 0.31.22
     "@rocket.chat/eslint-config": "workspace:^"
     "@rocket.chat/model-typings": "workspace:^"
     "@rocket.chat/models": "workspace:^"
     "@rocket.chat/presence": "workspace:^"
-    "@rocket.chat/string-helpers": next
+    "@rocket.chat/string-helpers": 0.31.22
     "@types/eslint": ^8
     "@types/node": ^14.18.21
     "@types/polka": ^0.5.4
@@ -6443,8 +6443,8 @@ __metadata:
     "@rocket.chat/apps-engine": ^1.32.0
     "@rocket.chat/core-typings": "workspace:^"
     "@rocket.chat/eslint-config": "workspace:^"
-    "@rocket.chat/message-parser": next
-    "@rocket.chat/ui-kit": next
+    "@rocket.chat/message-parser": 0.31.22
+    "@rocket.chat/ui-kit": 0.31.22
     "@types/jest": ^27.4.1
     ajv: ^8.11.0
     eslint: ^8.22.0
@@ -6473,12 +6473,12 @@ __metadata:
   resolution: "@rocket.chat/stream-hub-service@workspace:ee/apps/stream-hub-service"
   dependencies:
     "@rocket.chat/core-typings": "workspace:^"
-    "@rocket.chat/emitter": next
+    "@rocket.chat/emitter": 0.31.22
     "@rocket.chat/eslint-config": "workspace:^"
     "@rocket.chat/model-typings": "workspace:^"
     "@rocket.chat/models": "workspace:^"
     "@rocket.chat/rest-typings": "workspace:^"
-    "@rocket.chat/string-helpers": next
+    "@rocket.chat/string-helpers": 0.31.22
     "@types/bcrypt": ^5.0.0
     "@types/eslint": ^8
     "@types/node": ^14.18.21
@@ -6498,34 +6498,34 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@rocket.chat/string-helpers@npm:next":
-  version: 0.31.22-dev.30
-  resolution: "@rocket.chat/string-helpers@npm:0.31.22-dev.30"
+"@rocket.chat/string-helpers@npm:0.31.22":
+  version: 0.31.22
+  resolution: "@rocket.chat/string-helpers@npm:0.31.22"
   dependencies:
     tslib: ^2.3.1
-  checksum: 975c2806d620f0b86d799902b07b71f3c6818df338187df062e866aa0e720f8d9761e8f2e2a520e698c08c70173f1d701f50ac6eb0e27cbe152eb38ed07d7001
+  checksum: 5c574c9b8d0b72b44e48ff91dfa83c3648d1fbc2757fc5959ea8a18fafa5959a843e89551aa3e2b7a612b6e1d929f60b5dd8dc0f522841640b7ddd0b90c31faa
   languageName: node
   linkType: hard
 
-"@rocket.chat/styled@npm:next, @rocket.chat/styled@npm:~0.31.22-dev.30":
-  version: 0.31.22-dev.30
-  resolution: "@rocket.chat/styled@npm:0.31.22-dev.30"
+"@rocket.chat/styled@npm:0.31.22, @rocket.chat/styled@npm:^0.31.22":
+  version: 0.31.22
+  resolution: "@rocket.chat/styled@npm:0.31.22"
   dependencies:
-    "@rocket.chat/css-in-js": ~0.31.22-dev.30
+    "@rocket.chat/css-in-js": ^0.31.22
     tslib: ^2.3.1
-  checksum: b9cc8a132121be2d97db1d7efa574eb04211c620ec9c16d8bb85fe1fb07faf9c45c249f0bf71628b477ad42b8e7c232aaf0ce293908055d727d3d10b69dcd6c3
+  checksum: 15807eb82dc74931c489fa8af98eb06b1a3c29b7dccebed5b45973e4d58759224fcedb6b809412951ade9fb84994e6138594ed407aaed2aed8b31952f9638e56
   languageName: node
   linkType: hard
 
-"@rocket.chat/stylis-logical-props-middleware@npm:~0.31.22-dev.30":
-  version: 0.31.22-dev.30
-  resolution: "@rocket.chat/stylis-logical-props-middleware@npm:0.31.22-dev.30"
+"@rocket.chat/stylis-logical-props-middleware@npm:^0.31.22":
+  version: 0.31.22
+  resolution: "@rocket.chat/stylis-logical-props-middleware@npm:0.31.22"
   dependencies:
-    "@rocket.chat/css-supports": ~0.31.22-dev.30
+    "@rocket.chat/css-supports": ^0.31.22
     tslib: ^2.3.1
   peerDependencies:
     stylis: 4.0.10
-  checksum: 2da5fae371ba0ad0315594dcc731bbbfe9be0c75e4cb69a1b83d7ef5ed1f17885aeecbf266b97fd6ad7f6ce265174e4362432d156166e4c10b281143e24fa424
+  checksum: c11ed6a62691e623029dd6880e956f6c33a3c6e287366f3441458bf270681e18417e1abac2a8592db47bb2e3528e1766d1cfb5e1a0c24bd56503ef08c5a64511
   languageName: node
   linkType: hard
 
@@ -6534,10 +6534,10 @@ __metadata:
   resolution: "@rocket.chat/ui-client@workspace:packages/ui-client"
   dependencies:
     "@babel/core": ~7.18.13
-    "@rocket.chat/css-in-js": next
-    "@rocket.chat/fuselage": next
-    "@rocket.chat/fuselage-hooks": next
-    "@rocket.chat/icons": next
+    "@rocket.chat/css-in-js": 0.31.22
+    "@rocket.chat/fuselage": 0.31.22
+    "@rocket.chat/fuselage-hooks": 0.31.22
+    "@rocket.chat/icons": 0.31.22
     "@rocket.chat/ui-contexts": "workspace:~"
     "@storybook/addon-actions": ~6.5.10
     "@storybook/addon-docs": ~6.5.10
@@ -6586,8 +6586,8 @@ __metadata:
   dependencies:
     "@babel/core": ~7.18.13
     "@rocket.chat/eslint-config": "workspace:^"
-    "@rocket.chat/fuselage": next
-    "@rocket.chat/icons": next
+    "@rocket.chat/fuselage": 0.31.22
+    "@rocket.chat/icons": 0.31.22
     "@storybook/addon-actions": ~6.5.12
     "@storybook/addon-docs": ~6.5.12
     "@storybook/addon-essentials": ~6.5.12
@@ -6617,8 +6617,8 @@ __metadata:
   resolution: "@rocket.chat/ui-contexts@workspace:packages/ui-contexts"
   dependencies:
     "@rocket.chat/core-typings": "workspace:^"
-    "@rocket.chat/emitter": next
-    "@rocket.chat/fuselage-hooks": next
+    "@rocket.chat/emitter": 0.31.22
+    "@rocket.chat/fuselage-hooks": 0.31.22
     "@rocket.chat/rest-typings": "workspace:^"
     "@types/jest": ^27.4.1
     "@types/react": ~17.0.48
@@ -6641,10 +6641,10 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@rocket.chat/ui-kit@npm:next":
-  version: 0.32.0-dev.154
-  resolution: "@rocket.chat/ui-kit@npm:0.32.0-dev.154"
-  checksum: dadb7737c39b20b76ed10b841523445fc555f0833ad03df440aff397e1cabc03bb99e1d86375b53289babb07e497d03ba679996b7301da369d889a397c89bc81
+"@rocket.chat/ui-kit@npm:0.31.22":
+  version: 0.31.22
+  resolution: "@rocket.chat/ui-kit@npm:0.31.22"
+  checksum: b28d64523b005dcaeac9ed94dc8230f949eeb29eedd90a9611fb99bbb87f6135ca7d470514905656f21f45a456b9ed69f92b8dd6421857b1b3c94f7902e00ea9
   languageName: node
   linkType: hard
 
@@ -6652,10 +6652,10 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@rocket.chat/ui-theming@workspace:ee/packages/ui-theming"
   dependencies:
-    "@rocket.chat/css-in-js": next
-    "@rocket.chat/fuselage": next
-    "@rocket.chat/fuselage-hooks": next
-    "@rocket.chat/icons": next
+    "@rocket.chat/css-in-js": 0.31.22
+    "@rocket.chat/fuselage": 0.31.22
+    "@rocket.chat/fuselage-hooks": 0.31.22
+    "@rocket.chat/icons": 0.31.22
     "@rocket.chat/ui-contexts": "workspace:~"
     "@storybook/addon-actions": ~6.5.10
     "@storybook/addon-docs": ~6.5.10
@@ -6700,13 +6700,13 @@ __metadata:
   resolution: "@rocket.chat/ui-video-conf@workspace:packages/ui-video-conf"
   dependencies:
     "@babel/core": ~7.18.13
-    "@rocket.chat/css-in-js": next
-    "@rocket.chat/emitter": next
+    "@rocket.chat/css-in-js": 0.31.22
+    "@rocket.chat/emitter": 0.31.22
     "@rocket.chat/eslint-config": "workspace:^"
-    "@rocket.chat/fuselage": next
-    "@rocket.chat/fuselage-hooks": next
-    "@rocket.chat/icons": next
-    "@rocket.chat/styled": next
+    "@rocket.chat/fuselage": 0.31.22
+    "@rocket.chat/fuselage-hooks": 0.31.22
+    "@rocket.chat/icons": 0.31.22
+    "@rocket.chat/styled": 0.31.22
     "@rocket.chat/ui-contexts": "workspace:^"
     "@storybook/addon-actions": ~6.5.10
     "@storybook/addon-docs": ~6.5.10
@@ -30885,14 +30885,14 @@ __metadata:
   dependencies:
     "@rocket.chat/apps-engine": ^1.32.0
     "@rocket.chat/core-typings": "workspace:^"
-    "@rocket.chat/emitter": next
-    "@rocket.chat/icons": next
-    "@rocket.chat/message-parser": next
+    "@rocket.chat/emitter": 0.31.22
+    "@rocket.chat/icons": 0.31.22
+    "@rocket.chat/message-parser": 0.31.22
     "@rocket.chat/model-typings": "workspace:^"
     "@rocket.chat/models": "workspace:^"
     "@rocket.chat/rest-typings": "workspace:^"
-    "@rocket.chat/string-helpers": next
-    "@rocket.chat/ui-kit": next
+    "@rocket.chat/string-helpers": 0.31.22
+    "@rocket.chat/ui-kit": 0.31.22
     "@types/cookie": ^0.5.1
     "@types/cookie-parser": ^1.4.3
     "@types/ejson": ^2.2.0

From e5f67e32338fa1b6d3d2cb9501c4ad3857834431 Mon Sep 17 00:00:00 2001
From: Debdut Chakraborty <debdut.chakraborty@rocket.chat>
Date: Sat, 3 Dec 2022 01:13:37 +0530
Subject: [PATCH 11/12] [FIX] Unable to set idleTimeLimit for users (#26951)

Co-authored-by: yash-rajpal <rajpal.yash03@gmail.com>
---
 .../preferences/AccountPreferencesPage.tsx        |  1 +
 apps/meteor/tests/data/user.js                    |  1 +
 apps/meteor/tests/end-to-end/api/01-users.js      | 15 ++++++++-------
 .../src/v1/users/UsersSetPreferenceParamsPOST.ts  |  5 +++++
 4 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/apps/meteor/client/views/account/preferences/AccountPreferencesPage.tsx b/apps/meteor/client/views/account/preferences/AccountPreferencesPage.tsx
index 615752be97d..325dc68a01d 100644
--- a/apps/meteor/client/views/account/preferences/AccountPreferencesPage.tsx
+++ b/apps/meteor/client/views/account/preferences/AccountPreferencesPage.tsx
@@ -44,6 +44,7 @@ type CurrentData = {
 	sidebarDisplayAvatar: boolean;
 	sidebarGroupByType: boolean;
 	muteFocusedConversations: boolean;
+	receiveLoginDetectionEmail: boolean;
 	dontAskAgainList: [action: string, label: string][];
 };
 
diff --git a/apps/meteor/tests/data/user.js b/apps/meteor/tests/data/user.js
index a36353b8f1a..80836c5fe9f 100644
--- a/apps/meteor/tests/data/user.js
+++ b/apps/meteor/tests/data/user.js
@@ -30,5 +30,6 @@ export const preferences = {
 		displayAvatars: true,
 		hideFlexTab: false,
 		sendOnEnter: 'normal',
+		idleTimeLimit: 3600,
 	},
 };
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 ab8ad48e97a..d9409f4f22b 100644
--- a/apps/meteor/tests/end-to-end/api/01-users.js
+++ b/apps/meteor/tests/end-to-end/api/01-users.js
@@ -1648,6 +1648,7 @@ describe('[Users]', function () {
 		});
 	});
 
+	// TODO check for all response fields
 	describe('[/users.setPreferences]', () => {
 		it('should return an error when the user try to update info of another user and does not have the necessary permission', (done) => {
 			const userPreferences = {
@@ -1671,7 +1672,7 @@ describe('[Users]', function () {
 					.end(done);
 			});
 		});
-		it('should return an error when the user try to update info of an inexistent user', (done) => {
+		it('should return an error when the user try to update info of an nonexistent user', (done) => {
 			const userPreferences = {
 				userId: 'invalid-id',
 				data: {
@@ -3235,9 +3236,9 @@ describe('[Users]', function () {
 
 		it('should invalidate all active sesions', (done) => {
 			/* We want to validate that the login with the "old" credentials fails
-			However, the removal of the tokens is done asynchronously.
-			Thus, we check that within the next seconds, at least one try to
-			access an authentication requiring route fails */
+      		However, the removal of the tokens is done asynchronously.
+      		Thus, we check that within the next seconds, at least one try to
+      		access an authentication requiring route fails */
 			let counter = 0;
 
 			async function checkAuthenticationFails() {
@@ -3594,9 +3595,9 @@ describe('[Users]', function () {
 
 		it('should invalidate all active sesions', (done) => {
 			/* We want to validate that the login with the "old" credentials fails
-			However, the removal of the tokens is done asynchronously.
-			Thus, we check that within the next seconds, at least one try to
-			access an authentication requiring route fails */
+      		However, the removal of the tokens is done asynchronously.
+      		Thus, we check that within the next seconds, at least one try to
+      		access an authentication requiring route fails */
 			let counter = 0;
 
 			async function checkAuthenticationFails() {
diff --git a/packages/rest-typings/src/v1/users/UsersSetPreferenceParamsPOST.ts b/packages/rest-typings/src/v1/users/UsersSetPreferenceParamsPOST.ts
index 9b060bf73d4..11fec0d6e89 100644
--- a/packages/rest-typings/src/v1/users/UsersSetPreferenceParamsPOST.ts
+++ b/packages/rest-typings/src/v1/users/UsersSetPreferenceParamsPOST.ts
@@ -41,6 +41,7 @@ export type UsersSetPreferencesParamsPOST = {
 		dontAskAgainList?: Array<{ action: string; label: string }>;
 		receiveLoginDetectionEmail?: boolean;
 		useLegacyMessageTemplate?: boolean;
+		idleTimeLimit?: number;
 	};
 };
 
@@ -201,6 +202,10 @@ const UsersSetPreferencesParamsPostSchema = {
 					type: 'boolean',
 					nullable: true,
 				},
+				idleTimeLimit: {
+					type: 'number',
+					nullable: true,
+				},
 			},
 			required: [],
 			additionalProperties: false,

From b64502ab7257bf66097e24fd0406308f82d03a79 Mon Sep 17 00:00:00 2001
From: Guilherme Gazzo <guilhermegazzo@gmail.com>
Date: Fri, 2 Dec 2022 18:49:03 -0300
Subject: [PATCH 12/12] [FIX] Fix watch db being started on Micro Services env
 (#27435)

---
 apps/meteor/server/routes/health.ts | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/apps/meteor/server/routes/health.ts b/apps/meteor/server/routes/health.ts
index e1ae205ac94..aa2ab6cda0d 100644
--- a/apps/meteor/server/routes/health.ts
+++ b/apps/meteor/server/routes/health.ts
@@ -1,17 +1,21 @@
 import { WebApp } from 'meteor/webapp';
 
-import { isLastDocDelayed } from '../startup/watchDb';
+import { isRunningMs } from '../lib/isRunningMs';
 
-WebApp.rawConnectHandlers.use('/health', function (_req, res) {
+WebApp.rawConnectHandlers.use('/health', async function (_req, res) {
 	res.setHeader('Cache-Control', 'no-cache, no-store, must-revalidate');
 	res.setHeader('Pragma', 'no-cache');
 	res.setHeader('Expires', 0);
 	res.setHeader('Content-Type', 'text/plain');
 
-	if (isLastDocDelayed()) {
-		res.writeHead(500);
-		res.end('not healthy');
-		return;
+	if (!isRunningMs()) {
+		const { isLastDocDelayed } = await import('../startup/watchDb');
+
+		if (isLastDocDelayed()) {
+			res.writeHead(500);
+			res.end('not healthy');
+			return;
+		}
 	}
 
 	res.end('ok');