From 7896d387759d330eabc0eb2ce2787a3e00104808 Mon Sep 17 00:00:00 2001
From: Guilherme Gazzo <guilhermegazzo@gmail.com>
Date: Wed, 20 Nov 2024 01:12:25 -0300
Subject: [PATCH 01/18] feat: create `UiKitSubscriptionLicenseSurface`

---
 .../uikit/hooks/useBannerContextValue.ts      |   1 +
 .../admin/subscription/SubscriptionPage.tsx   |  21 +++-
 .../surface/UiKitSubscriptionLicense.tsx      | 102 ++++++++++++++++++
 .../UiKitSubscriptionLicenseSurface.tsx       |  33 ++++++
 4 files changed, 153 insertions(+), 4 deletions(-)
 create mode 100644 apps/meteor/client/views/admin/subscription/surface/UiKitSubscriptionLicense.tsx
 create mode 100644 apps/meteor/client/views/admin/subscription/surface/UiKitSubscriptionLicenseSurface.tsx

diff --git a/apps/meteor/client/uikit/hooks/useBannerContextValue.ts b/apps/meteor/client/uikit/hooks/useBannerContextValue.ts
index 35b38e8dee63..81cb70af6636 100644
--- a/apps/meteor/client/uikit/hooks/useBannerContextValue.ts
+++ b/apps/meteor/client/uikit/hooks/useBannerContextValue.ts
@@ -41,6 +41,7 @@ export const useBannerContextValue = ({ view, values }: UseBannerContextValuePar
 		},
 		updateState: (): void => undefined,
 		appId: view.appId,
+		viewId: view.viewId,
 		values,
 	};
 };
diff --git a/apps/meteor/client/views/admin/subscription/SubscriptionPage.tsx b/apps/meteor/client/views/admin/subscription/SubscriptionPage.tsx
index e6f5beffe7ba..a0c229341195 100644
--- a/apps/meteor/client/views/admin/subscription/SubscriptionPage.tsx
+++ b/apps/meteor/client/views/admin/subscription/SubscriptionPage.tsx
@@ -21,9 +21,12 @@ import PlanCardCommunity from './components/cards/PlanCard/PlanCardCommunity';
 import SeatsCard from './components/cards/SeatsCard';
 import { useCancelSubscriptionModal } from './hooks/useCancelSubscriptionModal';
 import { useWorkspaceSync } from './hooks/useWorkspaceSync';
-import { Page, PageHeader, PageScrollableContentWithShadow } from '../../../components/Page';
+import UiKitSubscriptionLicense from './surface/UiKitSubscriptionLicense';
+import { Page, PageScrollableContentWithShadow } from '../../../components/Page';
+import PageBlockWithBorder from '../../../components/Page/PageBlockWithBorder';
+import PageHeaderNoShadow from '../../../components/Page/PageHeaderNoShadow';
 import { useIsEnterprise } from '../../../hooks/useIsEnterprise';
-import { useInvalidateLicense, useLicense } from '../../../hooks/useLicense';
+import { useInvalidateLicense } from '../../../hooks/useLicense';
 import { useRegistrationStatus } from '../../../hooks/useRegistrationStatus';
 
 function useShowLicense() {
@@ -99,7 +102,7 @@ const SubscriptionPage = () => {
 
 	return (
 		<Page bg='tint'>
-			<PageHeader title={t('Subscription')}>
+			<PageHeaderNoShadow title={t('Subscription')}>
 				<ButtonGroup>
 					{isRegistered && (
 						<Button loading={syncLicenseUpdate.isLoading} icon='reload' onClick={() => handleSyncLicenseUpdate()}>
@@ -110,7 +113,17 @@ const SubscriptionPage = () => {
 						{t(isEnterprise ? 'Manage_subscription' : 'Upgrade')}
 					</UpgradeButton>
 				</ButtonGroup>
-			</PageHeader>
+			</PageHeaderNoShadow>
+			<PageBlockWithBorder>
+				<UiKitSubscriptionLicense
+					key='license'
+					initialView={{
+						viewId: 'license',
+						appId: 'cloud-announcements-core',
+						blocks: [],
+					}}
+				/>
+			</PageBlockWithBorder>
 			<PageScrollableContentWithShadow p={16}>
 				{(showSubscriptionCallout || syncLicenseUpdate.isLoading) && (
 					<Callout type='info' title={t('Sync_license_update_Callout_Title')} m={8}>
diff --git a/apps/meteor/client/views/admin/subscription/surface/UiKitSubscriptionLicense.tsx b/apps/meteor/client/views/admin/subscription/surface/UiKitSubscriptionLicense.tsx
new file mode 100644
index 000000000000..9946425673fa
--- /dev/null
+++ b/apps/meteor/client/views/admin/subscription/surface/UiKitSubscriptionLicense.tsx
@@ -0,0 +1,102 @@
+import { useDebouncedCallback } from '@rocket.chat/fuselage-hooks';
+import { UiKitContext, bannerParser, UiKitComponent } from '@rocket.chat/fuselage-ui-kit';
+import type { View } from '@rocket.chat/ui-kit';
+import type { ContextType, Dispatch, ReactElement } from 'react';
+import React, { useMemo } from 'react';
+
+import type { SubscriptionLicenseLayout } from './UiKitSubscriptionLicenseSurface';
+import { UiKitSubscriptionLicenseSurface } from './UiKitSubscriptionLicenseSurface';
+import MarkdownText from '../../../../components/MarkdownText';
+import { useUiKitActionManager } from '../../../../uikit/hooks/useUiKitActionManager';
+import { useUiKitView } from '../../../../uikit/hooks/useUiKitView';
+
+// TODO: move this to fuselage-ui-kit itself
+bannerParser.mrkdwn = ({ text }): ReactElement => <MarkdownText variant='inline' content={text} />;
+
+type UiKitSubscriptionLicenseProps = {
+	key: string;
+	initialView: {
+		viewId: string;
+		appId: string;
+		blocks: SubscriptionLicenseLayout;
+	};
+};
+
+type UseSubscriptionLicenseContextValueParams = {
+	view: View & {
+		viewId: string;
+	};
+	values: {
+		[actionId: string]: {
+			value: unknown;
+			blockId?: string | undefined;
+		};
+	};
+	updateValues: Dispatch<{
+		actionId: string;
+		payload: {
+			value: unknown;
+			blockId?: string | undefined;
+		};
+	}>;
+};
+type UseSubscriptionLicenseContextValueReturn = ContextType<typeof UiKitContext>;
+
+const useSubscriptionLicenseContextValue = ({
+	view,
+	values,
+	updateValues,
+}: UseSubscriptionLicenseContextValueParams): UseSubscriptionLicenseContextValueReturn => {
+	const actionManager = useUiKitActionManager();
+
+	const emitInteraction = useMemo(() => actionManager.emitInteraction.bind(actionManager), [actionManager]);
+	const debouncedEmitInteraction = useDebouncedCallback(emitInteraction, 700);
+
+	return {
+		action: async ({ appId, viewId, actionId, dispatchActionConfig, blockId, value }): Promise<void> => {
+			if (!appId || !viewId) {
+				return;
+			}
+
+			const emit = dispatchActionConfig?.includes('on_character_entered') ? debouncedEmitInteraction : emitInteraction;
+
+			await emit(appId, {
+				type: 'blockAction',
+				actionId,
+				container: {
+					type: 'view',
+					id: viewId,
+				},
+				payload: {
+					blockId,
+					value,
+				},
+			});
+		},
+		updateState: ({ actionId, value, blockId = 'default' }) => {
+			updateValues({
+				actionId,
+				payload: {
+					blockId,
+					value,
+				},
+			});
+		},
+		...view,
+		values,
+		viewId: view.viewId,
+	};
+};
+
+const UiKitSubscriptionLicense = ({ initialView }: UiKitSubscriptionLicenseProps) => {
+	const { view, values, updateValues } = useUiKitView(initialView);
+	const contextValue = useSubscriptionLicenseContextValue({ view, values, updateValues });
+
+	return (
+		<UiKitContext.Provider value={contextValue}>
+			<UiKitComponent render={UiKitSubscriptionLicenseSurface} blocks={view.blocks} />
+		</UiKitContext.Provider>
+	);
+};
+
+export default UiKitSubscriptionLicense;
diff --git a/apps/meteor/client/views/admin/subscription/surface/UiKitSubscriptionLicenseSurface.tsx b/apps/meteor/client/views/admin/subscription/surface/UiKitSubscriptionLicenseSurface.tsx
new file mode 100644
index 000000000000..d3642f772f1f
--- /dev/null
+++ b/apps/meteor/client/views/admin/subscription/surface/UiKitSubscriptionLicenseSurface.tsx
@@ -0,0 +1,33 @@
+import { Margins } from '@rocket.chat/fuselage';
+import { createSurfaceRenderer, Surface, FuselageSurfaceRenderer, renderTextObject } from '@rocket.chat/fuselage-ui-kit';
+import type { CalloutBlock, ContextBlock, DividerBlock, ImageBlock, SectionBlock } from '@rocket.chat/ui-kit';
+import type { ReactElement, ReactNode } from 'react';
+import React from 'react';
+
+type SubscriptionLicenseSurfaceProps = {
+	children?: ReactNode;
+};
+
+type SubscriptionLicenseLayoutBlock = ContextBlock | DividerBlock | ImageBlock | SectionBlock | CalloutBlock;
+
+export type SubscriptionLicenseLayout = SubscriptionLicenseLayoutBlock[];
+
+const SubscriptionLicenseSurface = ({ children }: SubscriptionLicenseSurfaceProps): ReactElement => (
+	<Surface type='custom'>
+		<Margins blockEnd={16}>{children}</Margins>
+	</Surface>
+);
+
+export class SubscriptionLicenseSurfaceRenderer extends FuselageSurfaceRenderer {
+	public constructor() {
+		super(['context', 'divider', 'image', 'section', 'callout']);
+	}
+
+	plain_text = renderTextObject;
+
+	mrkdwn = renderTextObject;
+}
+
+export default SubscriptionLicenseSurface;
+
+export const UiKitSubscriptionLicenseSurface = createSurfaceRenderer(SubscriptionLicenseSurface, new SubscriptionLicenseSurfaceRenderer());

From dff79572a0e06555a8e4c13c2a5507502ac7489b Mon Sep 17 00:00:00 2001
From: Guilherme Gazzo <guilhermegazzo@gmail.com>
Date: Wed, 20 Nov 2024 01:38:52 -0300
Subject: [PATCH 02/18] chore: adds logic to handle cloud announcement data

---
 .../functions/syncWorkspace/syncCloudData.ts    |  9 ++++++++-
 .../admin/subscription/SubscriptionPage.tsx     | 17 ++++++-----------
 apps/meteor/server/settings/setup-wizard.ts     |  5 +++++
 ee/packages/license/src/license.ts              |  5 ++++-
 .../src/cloud/WorkspaceSyncPayload.ts           |  1 +
 .../core-typings/src/license/LicenseInfo.ts     |  1 +
 6 files changed, 25 insertions(+), 13 deletions(-)

diff --git a/apps/meteor/app/cloud/server/functions/syncWorkspace/syncCloudData.ts b/apps/meteor/app/cloud/server/functions/syncWorkspace/syncCloudData.ts
index fc55fc9e34fd..2d24701e99a9 100644
--- a/apps/meteor/app/cloud/server/functions/syncWorkspace/syncCloudData.ts
+++ b/apps/meteor/app/cloud/server/functions/syncWorkspace/syncCloudData.ts
@@ -1,5 +1,6 @@
 import type { Cloud, Serialized } from '@rocket.chat/core-typings';
 import { DuplicatedLicenseError } from '@rocket.chat/license';
+import { Settings } from '@rocket.chat/models';
 import { serverFetch as fetch } from '@rocket.chat/server-fetch';
 import { v, compile } from 'suretype';
 
@@ -67,11 +68,17 @@ export async function syncCloudData() {
 
 		const workspaceRegistrationData = await buildWorkspaceRegistrationData(undefined);
 
-		const { license, removeLicense = false } = await fetchWorkspaceSyncPayload({
+		const {
+			license,
+			removeLicense = false,
+			cloudSyncAnnouncement,
+		} = await fetchWorkspaceSyncPayload({
 			token,
 			data: workspaceRegistrationData,
 		});
 
+		await Settings.updateValueById('Cloud_Sync_Announcement_Payload', JSON.stringify(cloudSyncAnnouncement ?? null));
+
 		if (removeLicense) {
 			await callbacks.run('workspaceLicenseRemoved');
 		} else {
diff --git a/apps/meteor/client/views/admin/subscription/SubscriptionPage.tsx b/apps/meteor/client/views/admin/subscription/SubscriptionPage.tsx
index a0c229341195..59ba68943746 100644
--- a/apps/meteor/client/views/admin/subscription/SubscriptionPage.tsx
+++ b/apps/meteor/client/views/admin/subscription/SubscriptionPage.tsx
@@ -59,7 +59,7 @@ const SubscriptionPage = () => {
 
 	const showSubscriptionCallout = useDebouncedValue(subscriptionSuccess || syncLicenseUpdate.isLoading, 10000);
 
-	const { license, limits, activeModules = [] } = licensesData || {};
+	const { license, limits, activeModules = [], cloudSyncAnnouncement } = licensesData || {};
 	const { isEnterprise = true } = enterpriseData || {};
 
 	const getKeyLimit = (key: 'monthlyActiveContacts' | 'activeUsers') => {
@@ -114,16 +114,11 @@ const SubscriptionPage = () => {
 					</UpgradeButton>
 				</ButtonGroup>
 			</PageHeaderNoShadow>
-			<PageBlockWithBorder>
-				<UiKitSubscriptionLicense
-					key='license'
-					initialView={{
-						viewId: 'license',
-						appId: 'cloud-announcements-core',
-						blocks: [],
-					}}
-				/>
-			</PageBlockWithBorder>
+			{cloudSyncAnnouncement && (
+				<PageBlockWithBorder>
+					<UiKitSubscriptionLicense key='license' initialView={JSON.parse(cloudSyncAnnouncement)} />
+				</PageBlockWithBorder>
+			)}
 			<PageScrollableContentWithShadow p={16}>
 				{(showSubscriptionCallout || syncLicenseUpdate.isLoading) && (
 					<Callout type='info' title={t('Sync_license_update_Callout_Title')} m={8}>
diff --git a/apps/meteor/server/settings/setup-wizard.ts b/apps/meteor/server/settings/setup-wizard.ts
index 91e3125d1280..4947f4d83463 100644
--- a/apps/meteor/server/settings/setup-wizard.ts
+++ b/apps/meteor/server/settings/setup-wizard.ts
@@ -1342,5 +1342,10 @@ export const createSetupWSettings = () =>
 				},
 				secret: true,
 			});
+			await this.add('Cloud_Sync_Announcement_Payload', 'null', {
+				type: 'string', // tODO: replace setting type string for object once is implemented.
+				hidden: true,
+				secret: true,
+			});
 		});
 	});
diff --git a/ee/packages/license/src/license.ts b/ee/packages/license/src/license.ts
index 99433ca1a8e1..b2377ab25866 100644
--- a/ee/packages/license/src/license.ts
+++ b/ee/packages/license/src/license.ts
@@ -12,6 +12,7 @@ import type {
 	LicenseModule,
 } from '@rocket.chat/core-typings';
 import { Emitter } from '@rocket.chat/emitter';
+import { Settings } from '@rocket.chat/models';
 
 import { getLicenseLimit } from './deprecated';
 import { DuplicatedLicenseError } from './errors/DuplicatedLicenseError';
@@ -474,7 +475,8 @@ export class LicenseManager extends Emitter<LicenseEvents> {
 		const activeModules = getModules.call(this);
 		const externalModules = getExternalModules.call(this);
 		const license = this.getLicense();
-
+		const cloudSyncAnnouncementSetting = await Settings.findOneById('Cloud_Sync_Announcement_Payload');
+		console.info(cloudSyncAnnouncementSetting);
 		// Get all limits present in the license and their current value
 		const limits = Object.fromEntries(
 			(includeLimits &&
@@ -502,6 +504,7 @@ export class LicenseManager extends Emitter<LicenseEvents> {
 			limits: limits as Record<LicenseLimitKind, { max: number; value: number }>,
 			tags: license?.information.tags || [],
 			trial: Boolean(license?.information.trial),
+			cloudSyncAnnouncement: cloudSyncAnnouncementSetting?.value,
 		};
 	}
 }
diff --git a/packages/core-typings/src/cloud/WorkspaceSyncPayload.ts b/packages/core-typings/src/cloud/WorkspaceSyncPayload.ts
index 1a3e6c12cf5e..e8821e93ac13 100644
--- a/packages/core-typings/src/cloud/WorkspaceSyncPayload.ts
+++ b/packages/core-typings/src/cloud/WorkspaceSyncPayload.ts
@@ -49,6 +49,7 @@ export interface WorkspaceSyncResponse {
 	publicKey: string;
 	license: unknown;
 	removeLicense?: boolean;
+	cloudSyncAnnouncement: unknown;
 }
 
 export interface WorkspaceCommsRequestPayload {
diff --git a/packages/core-typings/src/license/LicenseInfo.ts b/packages/core-typings/src/license/LicenseInfo.ts
index 85e7c3fba506..5da73b8917be 100644
--- a/packages/core-typings/src/license/LicenseInfo.ts
+++ b/packages/core-typings/src/license/LicenseInfo.ts
@@ -10,4 +10,5 @@ export type LicenseInfo = {
 	limits: Record<LicenseLimitKind, { value?: number; max: number }>;
 	tags: ILicenseTag[];
 	trial: boolean;
+	cloudSyncAnnouncement?: unknown;
 };

From bd9e14c07e2c6a0c3c0832f55bc0f93eaa0fcc99 Mon Sep 17 00:00:00 2001
From: Aleksander Nicacio da Silva <aleksander.silva@rocket.chat>
Date: Fri, 18 Oct 2024 15:51:36 -0300
Subject: [PATCH 03/18] fix: improves cloud announcement handling

---
 apps/meteor/client/hooks/useLicense.ts        | 15 +++++++++++-
 .../admin/subscription/SubscriptionPage.tsx   | 14 +++++------
 apps/meteor/ee/server/api/licenses.ts         | 23 +++++++++++++++++--
 ee/packages/license/src/license.ts            |  4 ----
 packages/rest-typings/src/v1/licenses.ts      |  9 ++++++++
 5 files changed, 51 insertions(+), 14 deletions(-)

diff --git a/apps/meteor/client/hooks/useLicense.ts b/apps/meteor/client/hooks/useLicense.ts
index 4ec8d29ec49c..9eea7c9cb9bd 100644
--- a/apps/meteor/client/hooks/useLicense.ts
+++ b/apps/meteor/client/hooks/useLicense.ts
@@ -49,7 +49,20 @@ export const useLicenseBase = <TData = LicenseDataType>({
 };
 
 export const useLicense = (params?: LicenseParams) => {
-	return useLicenseBase({ params, select: (data) => data.license });
+	return useLicenseBase({
+		params,
+		select: (data) => data.license,
+	});
+};
+
+export const useLicenseWithCloudAnnouncement = (params?: LicenseParams) => {
+	return useLicenseBase({
+		params,
+		select: (data) => ({
+			license: data.license,
+			cloudSyncAnnouncement: data.cloudSyncAnnouncement,
+		}),
+	});
 };
 
 export const useHasLicense = (): UseQueryResult<boolean> => {
diff --git a/apps/meteor/client/views/admin/subscription/SubscriptionPage.tsx b/apps/meteor/client/views/admin/subscription/SubscriptionPage.tsx
index 59ba68943746..2570c8f3bffb 100644
--- a/apps/meteor/client/views/admin/subscription/SubscriptionPage.tsx
+++ b/apps/meteor/client/views/admin/subscription/SubscriptionPage.tsx
@@ -26,7 +26,7 @@ import { Page, PageScrollableContentWithShadow } from '../../../components/Page'
 import PageBlockWithBorder from '../../../components/Page/PageBlockWithBorder';
 import PageHeaderNoShadow from '../../../components/Page/PageHeaderNoShadow';
 import { useIsEnterprise } from '../../../hooks/useIsEnterprise';
-import { useInvalidateLicense } from '../../../hooks/useLicense';
+import { useInvalidateLicense, useLicenseWithCloudAnnouncement } from '../../../hooks/useLicense';
 import { useRegistrationStatus } from '../../../hooks/useRegistrationStatus';
 
 function useShowLicense() {
@@ -51,7 +51,7 @@ const SubscriptionPage = () => {
 	const router = useRouter();
 	const { data: enterpriseData } = useIsEnterprise();
 	const { isRegistered } = useRegistrationStatus();
-	const { data: licensesData, isLoading: isLicenseLoading } = useLicense({ loadValues: true });
+	const { data: licensesData, isLoading: isLicenseLoading } = useLicenseWithCloudAnnouncement({ loadValues: true });
 	const syncLicenseUpdate = useWorkspaceSync();
 	const invalidateLicenseQuery = useInvalidateLicense();
 
@@ -59,7 +59,7 @@ const SubscriptionPage = () => {
 
 	const showSubscriptionCallout = useDebouncedValue(subscriptionSuccess || syncLicenseUpdate.isLoading, 10000);
 
-	const { license, limits, activeModules = [], cloudSyncAnnouncement } = licensesData || {};
+	const { license, limits, activeModules = [], trial } = licensesData?.license || {};
 	const { isEnterprise = true } = enterpriseData || {};
 
 	const getKeyLimit = (key: 'monthlyActiveContacts' | 'activeUsers') => {
@@ -114,9 +114,9 @@ const SubscriptionPage = () => {
 					</UpgradeButton>
 				</ButtonGroup>
 			</PageHeaderNoShadow>
-			{cloudSyncAnnouncement && (
+			{licensesData?.cloudSyncAnnouncement && (
 				<PageBlockWithBorder>
-					<UiKitSubscriptionLicense key='license' initialView={JSON.parse(cloudSyncAnnouncement)} />
+					<UiKitSubscriptionLicense key='license' initialView={licensesData.cloudSyncAnnouncement} />
 				</PageBlockWithBorder>
 			)}
 			<PageScrollableContentWithShadow p={16}>
@@ -149,7 +149,7 @@ const SubscriptionPage = () => {
 								{seatsLimit.value !== undefined && (
 									<Grid.Item lg={6} xs={4} p={8}>
 										{seatsLimit.max !== Infinity ? (
-											<SeatsCard value={seatsLimit.value} max={seatsLimit.max} hideManageSubscription={licensesData?.trial} />
+											<SeatsCard value={seatsLimit.value} max={seatsLimit.max} hideManageSubscription={trial} />
 										) : (
 											<CountSeatsCard activeUsers={seatsLimit?.value} />
 										)}
@@ -159,7 +159,7 @@ const SubscriptionPage = () => {
 								{macLimit.value !== undefined && (
 									<Grid.Item lg={6} xs={4} p={8}>
 										{macLimit.max !== Infinity ? (
-											<MACCard max={macLimit.max} value={macLimit.value} hideManageSubscription={licensesData?.trial} />
+											<MACCard max={macLimit.max} value={macLimit.value} hideManageSubscription={trial} />
 										) : (
 											<CountMACCard macsCount={macLimit.value} />
 										)}
diff --git a/apps/meteor/ee/server/api/licenses.ts b/apps/meteor/ee/server/api/licenses.ts
index 1e5a2a90575c..5c686c0e532e 100644
--- a/apps/meteor/ee/server/api/licenses.ts
+++ b/apps/meteor/ee/server/api/licenses.ts
@@ -6,6 +6,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';
+import { settings } from '../../../app/settings/server';
 import { updateAuditedByUser } from '../../../server/settings/lib/auditedSettingUpdates';
 
 API.v1.addRoute(
@@ -16,9 +17,27 @@ API.v1.addRoute(
 			const unrestrictedAccess = await hasPermissionAsync(this.userId, 'view-privileged-setting');
 			const loadCurrentValues = unrestrictedAccess && Boolean(this.queryParams.loadValues);
 
-			const license = await License.getInfo({ limits: unrestrictedAccess, license: unrestrictedAccess, currentValues: loadCurrentValues });
+			const license = await License.getInfo({
+				limits: unrestrictedAccess,
+				license: unrestrictedAccess,
+				currentValues: loadCurrentValues,
+			});
+
+			try {
+				// TODO: Remove this logic after setting type object is implemented.
+				const cloudSyncAnnouncement = JSON.parse(settings.get('Cloud_Sync_Announcement_Payload') ?? null);
+				const canManageCloud = await hasPermissionAsync(this.userId, 'manage-cloud');
+				return API.v1.success({
+					license,
+					...(canManageCloud && cloudSyncAnnouncement && { cloudSyncAnnouncement }),
+				});
+			} catch (error) {
+				console.error('Unable to parse Cloud_Sync_Announcement_Payload');
+			}
 
-			return API.v1.success({ license });
+			return API.v1.success({
+				license,
+			});
 		},
 	},
 );
diff --git a/ee/packages/license/src/license.ts b/ee/packages/license/src/license.ts
index b2377ab25866..723ffa134bbe 100644
--- a/ee/packages/license/src/license.ts
+++ b/ee/packages/license/src/license.ts
@@ -12,7 +12,6 @@ import type {
 	LicenseModule,
 } from '@rocket.chat/core-typings';
 import { Emitter } from '@rocket.chat/emitter';
-import { Settings } from '@rocket.chat/models';
 
 import { getLicenseLimit } from './deprecated';
 import { DuplicatedLicenseError } from './errors/DuplicatedLicenseError';
@@ -475,8 +474,6 @@ export class LicenseManager extends Emitter<LicenseEvents> {
 		const activeModules = getModules.call(this);
 		const externalModules = getExternalModules.call(this);
 		const license = this.getLicense();
-		const cloudSyncAnnouncementSetting = await Settings.findOneById('Cloud_Sync_Announcement_Payload');
-		console.info(cloudSyncAnnouncementSetting);
 		// Get all limits present in the license and their current value
 		const limits = Object.fromEntries(
 			(includeLimits &&
@@ -504,7 +501,6 @@ export class LicenseManager extends Emitter<LicenseEvents> {
 			limits: limits as Record<LicenseLimitKind, { max: number; value: number }>,
 			tags: license?.information.tags || [],
 			trial: Boolean(license?.information.trial),
-			cloudSyncAnnouncement: cloudSyncAnnouncementSetting?.value,
 		};
 	}
 }
diff --git a/packages/rest-typings/src/v1/licenses.ts b/packages/rest-typings/src/v1/licenses.ts
index 99ba936e3492..6427e45b0af4 100644
--- a/packages/rest-typings/src/v1/licenses.ts
+++ b/packages/rest-typings/src/v1/licenses.ts
@@ -1,4 +1,5 @@
 import type { LicenseInfo } from '@rocket.chat/core-typings';
+import type { CalloutBlock, ContextBlock, DividerBlock, ImageBlock, SectionBlock } from '@rocket.chat/ui-kit';
 import Ajv from 'ajv';
 
 const ajv = new Ajv({
@@ -39,10 +40,18 @@ const licensesInfoPropsSchema = {
 
 export const isLicensesInfoProps = ajv.compile<licensesInfoProps>(licensesInfoPropsSchema);
 
+type CloudSyncAnnouncementLayoutBlock = ContextBlock | DividerBlock | ImageBlock | SectionBlock | CalloutBlock;
+type CloudSyncAnnouncementLayout = CloudSyncAnnouncementLayoutBlock[];
+
 export type LicensesEndpoints = {
 	'/v1/licenses.info': {
 		GET: (params: licensesInfoProps) => {
 			license: LicenseInfo;
+			cloudSyncAnnouncement?: {
+				viewId: string;
+				appId: string;
+				blocks: CloudSyncAnnouncementLayout[];
+			};
 		};
 	};
 	'/v1/licenses.add': {

From 08d6453fd68d10de209c5bbe5191441021f8e96e Mon Sep 17 00:00:00 2001
From: Guilherme Gazzo <guilhermegazzo@gmail.com>
Date: Mon, 9 Dec 2024 16:09:51 -0300
Subject: [PATCH 04/18] chore: create CloudSubscriptionCommunication app
 service

---
 .../core-apps/cloudAnnouncements.module.ts    |  5 +--
 .../cloudSubscriptionCommunication.module.ts  | 37 +++++++++++++++++++
 apps/meteor/server/startup/coreApps.ts        |  2 +
 3 files changed, 41 insertions(+), 3 deletions(-)
 create mode 100644 apps/meteor/server/modules/core-apps/cloudSubscriptionCommunication.module.ts

diff --git a/apps/meteor/server/modules/core-apps/cloudAnnouncements.module.ts b/apps/meteor/server/modules/core-apps/cloudAnnouncements.module.ts
index 68599162cdef..569e9d639b17 100644
--- a/apps/meteor/server/modules/core-apps/cloudAnnouncements.module.ts
+++ b/apps/meteor/server/modules/core-apps/cloudAnnouncements.module.ts
@@ -67,9 +67,8 @@ export class CloudAnnouncementsModule implements IUiKitCoreApp {
 		const type = announcement?.surface === 'banner' ? 'banner.close' : 'modal.close';
 
 		// for viewClosed we just need to let Cloud know that the banner was closed, no need to wait for the response
-		setImmediate(async () => {
-			await this.handlePayload(payload);
-		});
+
+		void this.handlePayload(payload);
 
 		return {
 			type,
diff --git a/apps/meteor/server/modules/core-apps/cloudSubscriptionCommunication.module.ts b/apps/meteor/server/modules/core-apps/cloudSubscriptionCommunication.module.ts
new file mode 100644
index 000000000000..8e5789f91099
--- /dev/null
+++ b/apps/meteor/server/modules/core-apps/cloudSubscriptionCommunication.module.ts
@@ -0,0 +1,37 @@
+import type { UiKitCoreAppPayload } from '@rocket.chat/core-services';
+import type * as UiKit from '@rocket.chat/ui-kit';
+
+import { CloudAnnouncementsModule } from './cloudAnnouncements.module';
+
+export class CloudSubscriptionCommunication extends CloudAnnouncementsModule {
+	appId = 'cloud-communication-core';
+
+	async viewClosed(payload: UiKitCoreAppPayload): Promise<UiKit.ServerInteraction> {
+		const {
+			payload: { view: { viewId } = {} },
+			user: { _id: userId } = {},
+		} = payload;
+
+		if (!userId) {
+			throw new Error('invalid user');
+		}
+
+		if (!viewId) {
+			throw new Error('invalid view');
+		}
+
+		if (!payload.triggerId) {
+			throw new Error('invalid triggerId');
+		}
+
+		// for viewClosed we just need to let Cloud know that the banner was closed, no need to wait for the response
+
+		void this.handlePayload(payload);
+
+		return {
+			type: 'modal.close',
+			triggerId: payload.triggerId,
+			appId: payload.appId,
+		};
+	}
+}
diff --git a/apps/meteor/server/startup/coreApps.ts b/apps/meteor/server/startup/coreApps.ts
index 9638d99ab559..38f95da93d20 100644
--- a/apps/meteor/server/startup/coreApps.ts
+++ b/apps/meteor/server/startup/coreApps.ts
@@ -1,11 +1,13 @@
 import { BannerModule } from '../modules/core-apps/banner.module';
 import { CloudAnnouncementsModule } from '../modules/core-apps/cloudAnnouncements.module';
+import { CloudSubscriptionCommunication } from '../modules/core-apps/cloudSubscriptionCommunication.module';
 import { MentionModule } from '../modules/core-apps/mention.module';
 import { Nps } from '../modules/core-apps/nps.module';
 import { VideoConfModule } from '../modules/core-apps/videoconf.module';
 import { registerCoreApp } from '../services/uikit-core-app/service';
 
 registerCoreApp(new CloudAnnouncementsModule());
+registerCoreApp(new CloudSubscriptionCommunication());
 registerCoreApp(new Nps());
 registerCoreApp(new BannerModule());
 registerCoreApp(new VideoConfModule());

From 09668d24469ce52b02492816e0ee2598b2ff6527 Mon Sep 17 00:00:00 2001
From: Lucas Pelegrino <lucas.pelegrino@icloud.com>
Date: Mon, 21 Oct 2024 14:29:36 -0300
Subject: [PATCH 05/18] chore: adds minor improvements to
 useLicenseWithCloudAnnouncement

---
 apps/meteor/client/hooks/useLicense.ts                 |  6 +++---
 .../views/admin/subscription/SubscriptionPage.tsx      | 10 +++++-----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/apps/meteor/client/hooks/useLicense.ts b/apps/meteor/client/hooks/useLicense.ts
index 9eea7c9cb9bd..6c50ff55fe74 100644
--- a/apps/meteor/client/hooks/useLicense.ts
+++ b/apps/meteor/client/hooks/useLicense.ts
@@ -58,9 +58,9 @@ export const useLicense = (params?: LicenseParams) => {
 export const useLicenseWithCloudAnnouncement = (params?: LicenseParams) => {
 	return useLicenseBase({
 		params,
-		select: (data) => ({
-			license: data.license,
-			cloudSyncAnnouncement: data.cloudSyncAnnouncement,
+		select: ({ license, cloudSyncAnnouncement }) => ({
+			...license,
+			cloudSyncAnnouncement,
 		}),
 	});
 };
diff --git a/apps/meteor/client/views/admin/subscription/SubscriptionPage.tsx b/apps/meteor/client/views/admin/subscription/SubscriptionPage.tsx
index 2570c8f3bffb..aaf4f984c89e 100644
--- a/apps/meteor/client/views/admin/subscription/SubscriptionPage.tsx
+++ b/apps/meteor/client/views/admin/subscription/SubscriptionPage.tsx
@@ -59,7 +59,7 @@ const SubscriptionPage = () => {
 
 	const showSubscriptionCallout = useDebouncedValue(subscriptionSuccess || syncLicenseUpdate.isLoading, 10000);
 
-	const { license, limits, activeModules = [], trial } = licensesData?.license || {};
+	const { license, limits, activeModules = [], cloudSyncAnnouncement } = licensesData || {};
 	const { isEnterprise = true } = enterpriseData || {};
 
 	const getKeyLimit = (key: 'monthlyActiveContacts' | 'activeUsers') => {
@@ -114,9 +114,9 @@ const SubscriptionPage = () => {
 					</UpgradeButton>
 				</ButtonGroup>
 			</PageHeaderNoShadow>
-			{licensesData?.cloudSyncAnnouncement && (
+			{cloudSyncAnnouncement && (
 				<PageBlockWithBorder>
-					<UiKitSubscriptionLicense key='license' initialView={licensesData.cloudSyncAnnouncement} />
+					<UiKitSubscriptionLicense key='license' initialView={cloudSyncAnnouncement} />
 				</PageBlockWithBorder>
 			)}
 			<PageScrollableContentWithShadow p={16}>
@@ -149,7 +149,7 @@ const SubscriptionPage = () => {
 								{seatsLimit.value !== undefined && (
 									<Grid.Item lg={6} xs={4} p={8}>
 										{seatsLimit.max !== Infinity ? (
-											<SeatsCard value={seatsLimit.value} max={seatsLimit.max} hideManageSubscription={trial} />
+											<SeatsCard value={seatsLimit.value} max={seatsLimit.max} hideManageSubscription={licensesData?.trial} />
 										) : (
 											<CountSeatsCard activeUsers={seatsLimit?.value} />
 										)}
@@ -159,7 +159,7 @@ const SubscriptionPage = () => {
 								{macLimit.value !== undefined && (
 									<Grid.Item lg={6} xs={4} p={8}>
 										{macLimit.max !== Infinity ? (
-											<MACCard max={macLimit.max} value={macLimit.value} hideManageSubscription={trial} />
+											<MACCard max={macLimit.max} value={macLimit.value} hideManageSubscription={licensesData?.trial} />
 										) : (
 											<CountMACCard macsCount={macLimit.value} />
 										)}

From 76e9cabd471a18af30eca250bc5864778dabd985 Mon Sep 17 00:00:00 2001
From: Lucas Pelegrino <lucas.pelegrino@icloud.com>
Date: Tue, 22 Oct 2024 16:05:38 -0300
Subject: [PATCH 06/18] chore: isolates CloudSyncAnnouncement to be reused as
 needed

---
 .../core-typings/src/cloud/CloudSyncAnnouncement.ts  | 11 +++++++++++
 packages/core-typings/src/cloud/index.ts             |  1 +
 packages/core-typings/src/license/LicenseInfo.ts     |  3 ++-
 packages/rest-typings/src/v1/licenses.ts             | 12 ++----------
 4 files changed, 16 insertions(+), 11 deletions(-)
 create mode 100644 packages/core-typings/src/cloud/CloudSyncAnnouncement.ts

diff --git a/packages/core-typings/src/cloud/CloudSyncAnnouncement.ts b/packages/core-typings/src/cloud/CloudSyncAnnouncement.ts
new file mode 100644
index 000000000000..ce18882fcc65
--- /dev/null
+++ b/packages/core-typings/src/cloud/CloudSyncAnnouncement.ts
@@ -0,0 +1,11 @@
+/* eslint-disable @typescript-eslint/naming-convention */
+import type { CalloutBlock, ContextBlock, DividerBlock, ImageBlock, SectionBlock } from '@rocket.chat/ui-kit';
+
+type CloudSyncAnnouncementLayoutBlock = ContextBlock | DividerBlock | ImageBlock | SectionBlock | CalloutBlock;
+type CloudSyncAnnouncementLayout = CloudSyncAnnouncementLayoutBlock[];
+
+export interface CloudSyncAnnouncement {
+	viewId: string;
+	appId: string;
+	blocks: CloudSyncAnnouncementLayout;
+}
diff --git a/packages/core-typings/src/cloud/index.ts b/packages/core-typings/src/cloud/index.ts
index 8232ffce267f..510b342a90d6 100644
--- a/packages/core-typings/src/cloud/index.ts
+++ b/packages/core-typings/src/cloud/index.ts
@@ -9,3 +9,4 @@ export {
 	WorkspaceCommsResponsePayload,
 	WorkspaceInteractionResponsePayload,
 } from './WorkspaceSyncPayload';
+export { CloudSyncAnnouncement } from './CloudSyncAnnouncement';
diff --git a/packages/core-typings/src/license/LicenseInfo.ts b/packages/core-typings/src/license/LicenseInfo.ts
index 5da73b8917be..6b9a10a118ad 100644
--- a/packages/core-typings/src/license/LicenseInfo.ts
+++ b/packages/core-typings/src/license/LicenseInfo.ts
@@ -1,6 +1,7 @@
 import type { ILicenseTag } from './ILicenseTag';
 import type { ExternalModule, ILicenseV3, LicenseLimitKind } from './ILicenseV3';
 import type { LicenseModule } from './LicenseModule';
+import type { CloudSyncAnnouncement } from '../cloud/CloudSyncAnnouncement';
 
 export type LicenseInfo = {
 	license?: ILicenseV3;
@@ -10,5 +11,5 @@ export type LicenseInfo = {
 	limits: Record<LicenseLimitKind, { value?: number; max: number }>;
 	tags: ILicenseTag[];
 	trial: boolean;
-	cloudSyncAnnouncement?: unknown;
+	cloudSyncAnnouncement?: CloudSyncAnnouncement;
 };
diff --git a/packages/rest-typings/src/v1/licenses.ts b/packages/rest-typings/src/v1/licenses.ts
index 6427e45b0af4..0801a5e1696a 100644
--- a/packages/rest-typings/src/v1/licenses.ts
+++ b/packages/rest-typings/src/v1/licenses.ts
@@ -1,5 +1,4 @@
-import type { LicenseInfo } from '@rocket.chat/core-typings';
-import type { CalloutBlock, ContextBlock, DividerBlock, ImageBlock, SectionBlock } from '@rocket.chat/ui-kit';
+import type { LicenseInfo, Cloud } from '@rocket.chat/core-typings';
 import Ajv from 'ajv';
 
 const ajv = new Ajv({
@@ -40,18 +39,11 @@ const licensesInfoPropsSchema = {
 
 export const isLicensesInfoProps = ajv.compile<licensesInfoProps>(licensesInfoPropsSchema);
 
-type CloudSyncAnnouncementLayoutBlock = ContextBlock | DividerBlock | ImageBlock | SectionBlock | CalloutBlock;
-type CloudSyncAnnouncementLayout = CloudSyncAnnouncementLayoutBlock[];
-
 export type LicensesEndpoints = {
 	'/v1/licenses.info': {
 		GET: (params: licensesInfoProps) => {
 			license: LicenseInfo;
-			cloudSyncAnnouncement?: {
-				viewId: string;
-				appId: string;
-				blocks: CloudSyncAnnouncementLayout[];
-			};
+			cloudSyncAnnouncement?: Cloud.CloudSyncAnnouncement;
 		};
 	};
 	'/v1/licenses.add': {

From 34a8b59f204cf9c19bfcc6bd5561191aeb9ed082 Mon Sep 17 00:00:00 2001
From: Lucas Pelegrino <lucas.pelegrino@icloud.com>
Date: Tue, 29 Oct 2024 15:17:05 -0300
Subject: [PATCH 07/18] refactor: minor improvements to cloudSyncAnnouncement
 logic

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

diff --git a/apps/meteor/client/components/Page/PageHeaderNoShadow.tsx b/apps/meteor/client/components/Page/PageHeaderNoShadow.tsx
index 51feca504834..afc3891a5714 100644
--- a/apps/meteor/client/components/Page/PageHeaderNoShadow.tsx
+++ b/apps/meteor/client/components/Page/PageHeaderNoShadow.tsx
@@ -22,7 +22,7 @@ const PageHeaderNoShadow = ({ children = undefined, title, onClickBack, ...props
 	useDocumentTitle(typeof title === 'string' ? title : undefined);
 
 	return (
-		<Box is='header' borderBlockEndWidth='default' borderBlockEndColor='transparent' {...props}>
+		<Box is='header' borderBlockEndWidth='default' pb={8} borderBlockEndColor='transparent' {...props}>
 			<Box
 				height='100%'
 				marginInline={24}

From 7fb1b8c71fe875f267b606054b6199158b4acd79 Mon Sep 17 00:00:00 2001
From: Lucas Pelegrino <lucas.pelegrino@icloud.com>
Date: Fri, 1 Nov 2024 15:24:22 -0300
Subject: [PATCH 08/18] refactor: extracts fetchWorkspaceSyncPayload() function
 to its own file

---
 .../fetchWorkspaceSyncPayload.ts              | 46 +++++++++++++++++++
 .../functions/syncWorkspace/syncCloudData.ts  | 46 +------------------
 2 files changed, 47 insertions(+), 45 deletions(-)
 create mode 100644 apps/meteor/app/cloud/server/functions/syncWorkspace/fetchWorkspaceSyncPayload.ts

diff --git a/apps/meteor/app/cloud/server/functions/syncWorkspace/fetchWorkspaceSyncPayload.ts b/apps/meteor/app/cloud/server/functions/syncWorkspace/fetchWorkspaceSyncPayload.ts
new file mode 100644
index 000000000000..170ad41ee1a1
--- /dev/null
+++ b/apps/meteor/app/cloud/server/functions/syncWorkspace/fetchWorkspaceSyncPayload.ts
@@ -0,0 +1,46 @@
+import type { Cloud, Serialized } from '@rocket.chat/core-typings';
+import { serverFetch as fetch } from '@rocket.chat/server-fetch';
+import { v, compile } from 'suretype';
+
+import { CloudWorkspaceConnectionError } from '../../../../../lib/errors/CloudWorkspaceConnectionError';
+import { settings } from '../../../../settings/server';
+
+const workspaceSyncPayloadSchema = v.object({
+	workspaceId: v.string().required(),
+	publicKey: v.string(),
+	license: v.string().required(),
+});
+
+const assertWorkspaceSyncPayload = compile(workspaceSyncPayloadSchema);
+
+export async function fetchWorkspaceSyncPayload({
+	token,
+	data,
+}: {
+	token: string;
+	data: Cloud.WorkspaceSyncRequestPayload;
+}): Promise<Serialized<Cloud.WorkspaceSyncResponse>> {
+	const workspaceRegistrationClientUri = settings.get<string>('Cloud_Workspace_Registration_Client_Uri');
+	const response = await fetch(`${workspaceRegistrationClientUri}/sync`, {
+		method: 'POST',
+		headers: {
+			Authorization: `Bearer ${token}`,
+		},
+		body: data,
+	});
+
+	if (!response.ok) {
+		try {
+			const { error } = await response.json();
+			throw new CloudWorkspaceConnectionError(`Failed to connect to Rocket.Chat Cloud: ${error}`);
+		} catch (error) {
+			throw new CloudWorkspaceConnectionError(`Failed to connect to Rocket.Chat Cloud: ${response.statusText}`);
+		}
+	}
+
+	const payload = await response.json();
+
+	assertWorkspaceSyncPayload(payload);
+
+	return payload;
+}
diff --git a/apps/meteor/app/cloud/server/functions/syncWorkspace/syncCloudData.ts b/apps/meteor/app/cloud/server/functions/syncWorkspace/syncCloudData.ts
index 2d24701e99a9..f28821b08387 100644
--- a/apps/meteor/app/cloud/server/functions/syncWorkspace/syncCloudData.ts
+++ b/apps/meteor/app/cloud/server/functions/syncWorkspace/syncCloudData.ts
@@ -1,58 +1,14 @@
-import type { Cloud, Serialized } from '@rocket.chat/core-typings';
 import { DuplicatedLicenseError } from '@rocket.chat/license';
 import { Settings } from '@rocket.chat/models';
-import { serverFetch as fetch } from '@rocket.chat/server-fetch';
-import { v, compile } from 'suretype';
 
 import { callbacks } from '../../../../../lib/callbacks';
 import { CloudWorkspaceAccessError } from '../../../../../lib/errors/CloudWorkspaceAccessError';
-import { CloudWorkspaceConnectionError } from '../../../../../lib/errors/CloudWorkspaceConnectionError';
 import { CloudWorkspaceRegistrationError } from '../../../../../lib/errors/CloudWorkspaceRegistrationError';
 import { SystemLogger } from '../../../../../server/lib/logger/system';
-import { settings } from '../../../../settings/server';
 import { buildWorkspaceRegistrationData } from '../buildRegistrationData';
 import { CloudWorkspaceAccessTokenEmptyError, getWorkspaceAccessToken } from '../getWorkspaceAccessToken';
 import { retrieveRegistrationStatus } from '../retrieveRegistrationStatus';
-
-const workspaceSyncPayloadSchema = v.object({
-	workspaceId: v.string().required(),
-	publicKey: v.string(),
-	license: v.string().required(),
-});
-
-const assertWorkspaceSyncPayload = compile(workspaceSyncPayloadSchema);
-
-const fetchWorkspaceSyncPayload = async ({
-	token,
-	data,
-}: {
-	token: string;
-	data: Cloud.WorkspaceSyncRequestPayload;
-}): Promise<Serialized<Cloud.WorkspaceSyncResponse>> => {
-	const workspaceRegistrationClientUri = settings.get<string>('Cloud_Workspace_Registration_Client_Uri');
-	const response = await fetch(`${workspaceRegistrationClientUri}/sync`, {
-		method: 'POST',
-		headers: {
-			Authorization: `Bearer ${token}`,
-		},
-		body: data,
-	});
-
-	if (!response.ok) {
-		try {
-			const { error } = await response.json();
-			throw new CloudWorkspaceConnectionError(`Failed to connect to Rocket.Chat Cloud: ${error}`);
-		} catch (error) {
-			throw new CloudWorkspaceConnectionError(`Failed to connect to Rocket.Chat Cloud: ${response.statusText}`);
-		}
-	}
-
-	const payload = await response.json();
-
-	assertWorkspaceSyncPayload(payload);
-
-	return payload;
-};
+import { fetchWorkspaceSyncPayload } from './fetchWorkspaceSyncPayload';
 
 export async function syncCloudData() {
 	try {

From 834868dc4d0b57a88687c0bc35695add0fe1285f Mon Sep 17 00:00:00 2001
From: Lucas Pelegrino <lucas.pelegrino@icloud.com>
Date: Fri, 1 Nov 2024 17:03:53 -0300
Subject: [PATCH 09/18] tests: adds unit tests for syncCloudData

---
 .../syncWorkspace/syncCloudData.spec.ts       | 101 ++++++++++++++++++
 1 file changed, 101 insertions(+)
 create mode 100644 apps/meteor/tests/unit/app/cloud/server/functions/syncWorkspace/syncCloudData.spec.ts

diff --git a/apps/meteor/tests/unit/app/cloud/server/functions/syncWorkspace/syncCloudData.spec.ts b/apps/meteor/tests/unit/app/cloud/server/functions/syncWorkspace/syncCloudData.spec.ts
new file mode 100644
index 000000000000..f17cb5986da8
--- /dev/null
+++ b/apps/meteor/tests/unit/app/cloud/server/functions/syncWorkspace/syncCloudData.spec.ts
@@ -0,0 +1,101 @@
+import { expect } from 'chai';
+import { describe, it, beforeEach } from 'mocha';
+import proxyquire from 'proxyquire';
+import sinon from 'sinon';
+
+const models = {
+	Settings: { updateValueById: sinon.stub() },
+};
+
+const mockedFetchWorkspaceSyncPayload = sinon.stub();
+
+const { syncCloudData } = proxyquire.noCallThru().load('../../../../../../../app/cloud/server/functions/syncWorkspace/syncCloudData.ts', {
+	'@rocket.chat/license': { DuplicatedLicenseError: sinon.stub() },
+	'@rocket.chat/models': models,
+	'../../../../../lib/callbacks': { callbacks: { run: sinon.stub() } },
+	'../../../../../lib/errors/CloudWorkspaceAccessError': { CloudWorkspaceAccessError: sinon.stub() },
+	'../../../../../lib/errors/CloudWorkspaceRegistrationError': { CloudWorkspaceRegistrationError: sinon.stub() },
+	'../../../../../server/lib/logger/system': { SystemLogger: { info: sinon.stub(), error: sinon.stub() } },
+	'../buildRegistrationData': { buildWorkspaceRegistrationData: sinon.stub().resolves({}) },
+	'../getWorkspaceAccessToken': {
+		getWorkspaceAccessToken: sinon.stub().resolves('token'),
+		CloudWorkspaceAccessTokenEmptyError: sinon.stub(),
+	},
+	'../retrieveRegistrationStatus': { retrieveRegistrationStatus: sinon.stub().resolves({ workspaceRegistered: true }) },
+	'./fetchWorkspaceSyncPayload': { fetchWorkspaceSyncPayload: mockedFetchWorkspaceSyncPayload },
+});
+
+describe('SyncCloudData', () => {
+	beforeEach(() => {
+		models.Settings.updateValueById.reset();
+		mockedFetchWorkspaceSyncPayload.reset();
+	});
+
+	it('should save cloudSyncAnnouncement payload on Cloud_Sync_Announcement_Payload setting when present', async () => {
+		const workspaceSyncPayloadResponse = {
+			workspaceId: 'workspaceId',
+			publicKey: 'publicKey',
+			license: {},
+			removeLicense: false,
+			cloudSyncAnnouncement: {
+				viewId: 'subscription-announcement',
+				appId: 'cloud-announcements-core',
+				blocks: [
+					{
+						type: 'callout',
+						title: {
+							type: 'plain_text',
+							text: 'Workspace eligible for Starter Plan',
+						},
+						text: {
+							type: 'plain_text',
+							text: 'Get free access to premium capabilities for up to 50 users',
+						},
+						accessory: {
+							type: 'button',
+							text: {
+								type: 'plain_text',
+								text: 'Switch Plan',
+							},
+							actionId: 'callout-action',
+							appId: 'cloud-announcements-core',
+							blockId: 'section-button',
+						},
+					},
+				],
+			},
+		};
+
+		mockedFetchWorkspaceSyncPayload.resolves(workspaceSyncPayloadResponse);
+
+		await syncCloudData();
+
+		expect(mockedFetchWorkspaceSyncPayload.calledOnce).to.be.true;
+
+		expect(
+			models.Settings.updateValueById.calledOnceWith(
+				'Cloud_Sync_Announcement_Payload',
+				JSON.stringify(workspaceSyncPayloadResponse.cloudSyncAnnouncement),
+			),
+		).to.be.true;
+	});
+
+	it("Should save as 'null' the setting update if cloudSyncAnnouncement is not present", async () => {
+		const workspaceSyncPayloadResponse = {
+			workspaceId: 'workspaceId',
+			publicKey: 'publicKey',
+			license: {},
+			removeLicense: false,
+		};
+
+		mockedFetchWorkspaceSyncPayload.resolves(workspaceSyncPayloadResponse);
+
+		await syncCloudData();
+
+		expect(mockedFetchWorkspaceSyncPayload.calledOnce).to.be.true;
+
+		expect(models.Settings.updateValueById.calledOnce).to.be.true;
+
+		expect(models.Settings.updateValueById.calledWith('Cloud_Sync_Announcement_Payload', 'null')).to.be.true;
+	});
+});

From 4cefc7bc03f81645bac1bb89ddff144ff67eed36 Mon Sep 17 00:00:00 2001
From: Lucas Pelegrino <lucas.pelegrino@icloud.com>
Date: Tue, 19 Nov 2024 22:44:07 -0300
Subject: [PATCH 10/18] doc: adds changeset

---
 .changeset/wicked-socks-hide.md | 7 +++++++
 1 file changed, 7 insertions(+)
 create mode 100644 .changeset/wicked-socks-hide.md

diff --git a/.changeset/wicked-socks-hide.md b/.changeset/wicked-socks-hide.md
new file mode 100644
index 000000000000..9dcd022bb3de
--- /dev/null
+++ b/.changeset/wicked-socks-hide.md
@@ -0,0 +1,7 @@
+---
+"@rocket.chat/meteor": patch
+"@rocket.chat/core-typings": patch
+"@rocket.chat/rest-typings": patch
+---
+
+feat: Added new callout in the subscription page to inform users of subscription upgrade eligibility when applicable.

From f6ece87a3d480375fb7e52bd1512330ed1c56adc Mon Sep 17 00:00:00 2001
From: Guilherme Gazzo <guilhermegazzo@gmail.com>
Date: Fri, 18 Oct 2024 22:58:09 -0300
Subject: [PATCH 11/18] mock

---
 .../fetchWorkspaceSyncPayload.ts              | 30 +++++-
 .../core-apps/cloudAnnouncements.module.ts    | 94 +++++++++++++++++++
 2 files changed, 123 insertions(+), 1 deletion(-)

diff --git a/apps/meteor/app/cloud/server/functions/syncWorkspace/fetchWorkspaceSyncPayload.ts b/apps/meteor/app/cloud/server/functions/syncWorkspace/fetchWorkspaceSyncPayload.ts
index 170ad41ee1a1..73f1fafd2139 100644
--- a/apps/meteor/app/cloud/server/functions/syncWorkspace/fetchWorkspaceSyncPayload.ts
+++ b/apps/meteor/app/cloud/server/functions/syncWorkspace/fetchWorkspaceSyncPayload.ts
@@ -42,5 +42,33 @@ export async function fetchWorkspaceSyncPayload({
 
 	assertWorkspaceSyncPayload(payload);
 
-	return payload;
+	const cloudSyncAnnouncement = {
+		viewId: 'subscription-announcement',
+		appId: 'cloud-communication-core',
+		blocks: [
+			{
+				type: 'callout',
+				title: {
+					type: 'plain_text',
+					text: 'Workspace eligible for Starter Plan',
+				},
+				text: {
+					type: 'plain_text',
+					text: 'Get free access to premium capabilities for up to 50 users',
+				},
+				accessory: {
+					type: 'button',
+					text: {
+						type: 'plain_text',
+						text: 'Switch Plan',
+					},
+					actionId: 'callout-action',
+					appId: 'cloud-announcements-core',
+					blockId: 'section-button',
+				},
+			},
+		],
+	};
+
+	return { ...payload, cloudSyncAnnouncement };
 }
diff --git a/apps/meteor/server/modules/core-apps/cloudAnnouncements.module.ts b/apps/meteor/server/modules/core-apps/cloudAnnouncements.module.ts
index 569e9d639b17..db3430eb4587 100644
--- a/apps/meteor/server/modules/core-apps/cloudAnnouncements.module.ts
+++ b/apps/meteor/server/modules/core-apps/cloudAnnouncements.module.ts
@@ -242,6 +242,100 @@ export class CloudAnnouncementsModule implements IUiKitCoreApp {
 			...userInteraction,
 		};
 
+		if (
+			userInteraction.type === 'blockAction' &&
+			userInteraction.container?.type === 'view' &&
+			userInteraction.actionId === 'callout-action' &&
+			userInteraction.container?.id === 'subscription-announcement'
+		) {
+			return {
+				type: 'modal.open',
+				triggerId: userInteraction.triggerId,
+				appId: this.appId,
+				view: {
+					showIcon: false,
+					id: userInteraction.container.id,
+					title: {
+						type: 'plain_text',
+						text: 'Hello from Cloud',
+					},
+					blocks: [
+						{
+							type: 'image',
+							title: {
+								type: 'plain_text',
+								text: 'I Need a Marg',
+								emoji: true,
+							},
+							imageUrl: 'https://picsum.photos/200/300',
+							altText: 'marg',
+						},
+						{
+							type: 'context',
+							elements: [
+								{
+									type: 'mrkdwn',
+									text: '*This* is :smile: markdown',
+								},
+							],
+						},
+					],
+					appId: this.appId,
+					// export type ButtonElement = Actionable<{
+					// 	type: 'button';
+					// 	text: PlainText;
+					// 	url?: string;
+					// 	value?: string;
+					// 	style?: 'primary' | 'secondary' | 'danger' | 'warning' | 'success';
+					// 	secondary?: boolean;
+					// }>;
+
+					close: {
+						appId: this.appId,
+						blockId: userInteraction.container.id,
+						type: 'button',
+						text: {
+							type: 'plain_text',
+							text: 'Close',
+							emoji: true,
+						},
+						actionId: 'close-modal',
+						url: 'https://rocket.chat',
+					},
+					submit: {
+						appId: this.appId,
+						blockId: userInteraction.container.id,
+						type: 'button',
+						text: {
+							type: 'plain_text',
+							text: 'Submit',
+							emoji: true,
+						},
+						actionId: 'submit-modal',
+						url: 'https://rocket.chat',
+					},
+				},
+			};
+		}
+
+		if (
+			userInteraction.type === 'blockAction' &&
+			userInteraction.container?.type === 'view' &&
+			(userInteraction.actionId === 'submit-modal' || userInteraction.actionId === 'close-modal')
+		) {
+			if (userInteraction.actionId === 'submit-modal') {
+				await syncWorkspace();
+			}
+
+			return {
+				type: 'modal.close',
+				triggerId: userInteraction.triggerId,
+				appId: this.appId,
+			};
+		}
+
+		console.log(userInteraction);
+
 		const response = await fetch(`${this.getCloudUrl()}/api/v3/comms/workspace/interaction`, {
 			method: 'POST',
 			headers: {

From d423071f6734d7a585a9b1aa81e138a918441220 Mon Sep 17 00:00:00 2001
From: Guilherme Gazzo <guilhermegazzo@gmail.com>
Date: Wed, 20 Nov 2024 02:13:21 -0300
Subject: [PATCH 12/18] Revert "mock"

This reverts commit fcdad802b49b3f2ae03c7bcdf85e962261064b2f.
---
 .../fetchWorkspaceSyncPayload.ts              | 30 +-----
 .../core-apps/cloudAnnouncements.module.ts    | 94 -------------------
 2 files changed, 1 insertion(+), 123 deletions(-)

diff --git a/apps/meteor/app/cloud/server/functions/syncWorkspace/fetchWorkspaceSyncPayload.ts b/apps/meteor/app/cloud/server/functions/syncWorkspace/fetchWorkspaceSyncPayload.ts
index 73f1fafd2139..170ad41ee1a1 100644
--- a/apps/meteor/app/cloud/server/functions/syncWorkspace/fetchWorkspaceSyncPayload.ts
+++ b/apps/meteor/app/cloud/server/functions/syncWorkspace/fetchWorkspaceSyncPayload.ts
@@ -42,33 +42,5 @@ export async function fetchWorkspaceSyncPayload({
 
 	assertWorkspaceSyncPayload(payload);
 
-	const cloudSyncAnnouncement = {
-		viewId: 'subscription-announcement',
-		appId: 'cloud-communication-core',
-		blocks: [
-			{
-				type: 'callout',
-				title: {
-					type: 'plain_text',
-					text: 'Workspace eligible for Starter Plan',
-				},
-				text: {
-					type: 'plain_text',
-					text: 'Get free access to premium capabilities for up to 50 users',
-				},
-				accessory: {
-					type: 'button',
-					text: {
-						type: 'plain_text',
-						text: 'Switch Plan',
-					},
-					actionId: 'callout-action',
-					appId: 'cloud-announcements-core',
-					blockId: 'section-button',
-				},
-			},
-		],
-	};
-
-	return { ...payload, cloudSyncAnnouncement };
+	return payload;
 }
diff --git a/apps/meteor/server/modules/core-apps/cloudAnnouncements.module.ts b/apps/meteor/server/modules/core-apps/cloudAnnouncements.module.ts
index db3430eb4587..569e9d639b17 100644
--- a/apps/meteor/server/modules/core-apps/cloudAnnouncements.module.ts
+++ b/apps/meteor/server/modules/core-apps/cloudAnnouncements.module.ts
@@ -242,100 +242,6 @@ export class CloudAnnouncementsModule implements IUiKitCoreApp {
 			...userInteraction,
 		};
 
-		if (
-			userInteraction.type === 'blockAction' &&
-			userInteraction.container?.type === 'view' &&
-			userInteraction.actionId === 'callout-action' &&
-			userInteraction.container?.id === 'subscription-announcement'
-		) {
-			return {
-				type: 'modal.open',
-				triggerId: userInteraction.triggerId,
-				appId: this.appId,
-				view: {
-					showIcon: false,
-					id: userInteraction.container.id,
-					title: {
-						type: 'plain_text',
-						text: 'Hello from Cloud',
-					},
-					blocks: [
-						{
-							type: 'image',
-							title: {
-								type: 'plain_text',
-								text: 'I Need a Marg',
-								emoji: true,
-							},
-							imageUrl: 'https://picsum.photos/200/300',
-							altText: 'marg',
-						},
-						{
-							type: 'context',
-							elements: [
-								{
-									type: 'mrkdwn',
-									text: '*This* is :smile: markdown',
-								},
-							],
-						},
-					],
-					appId: this.appId,
-					// export type ButtonElement = Actionable<{
-					// 	type: 'button';
-					// 	text: PlainText;
-					// 	url?: string;
-					// 	value?: string;
-					// 	style?: 'primary' | 'secondary' | 'danger' | 'warning' | 'success';
-					// 	secondary?: boolean;
-					// }>;
-
-					close: {
-						appId: this.appId,
-						blockId: userInteraction.container.id,
-						type: 'button',
-						text: {
-							type: 'plain_text',
-							text: 'Close',
-							emoji: true,
-						},
-						actionId: 'close-modal',
-						url: 'https://rocket.chat',
-					},
-					submit: {
-						appId: this.appId,
-						blockId: userInteraction.container.id,
-						type: 'button',
-						text: {
-							type: 'plain_text',
-							text: 'Submit',
-							emoji: true,
-						},
-						actionId: 'submit-modal',
-						url: 'https://rocket.chat',
-					},
-				},
-			};
-		}
-
-		if (
-			userInteraction.type === 'blockAction' &&
-			userInteraction.container?.type === 'view' &&
-			(userInteraction.actionId === 'submit-modal' || userInteraction.actionId === 'close-modal')
-		) {
-			if (userInteraction.actionId === 'submit-modal') {
-				await syncWorkspace();
-			}
-
-			return {
-				type: 'modal.close',
-				triggerId: userInteraction.triggerId,
-				appId: this.appId,
-			};
-		}
-
-		console.log(userInteraction);
-
 		const response = await fetch(`${this.getCloudUrl()}/api/v3/comms/workspace/interaction`, {
 			method: 'POST',
 			headers: {

From d651af2f7d143385766b2df950ed796721562e36 Mon Sep 17 00:00:00 2001
From: Lucas Pelegrino <lucas.pelegrino@icloud.com>
Date: Wed, 11 Dec 2024 14:20:54 -0300
Subject: [PATCH 13/18] docs: updates changeset to meet guidelines

---
 .changeset/wicked-socks-hide.md | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.changeset/wicked-socks-hide.md b/.changeset/wicked-socks-hide.md
index 9dcd022bb3de..7042967940f3 100644
--- a/.changeset/wicked-socks-hide.md
+++ b/.changeset/wicked-socks-hide.md
@@ -1,7 +1,7 @@
 ---
-"@rocket.chat/meteor": patch
-"@rocket.chat/core-typings": patch
-"@rocket.chat/rest-typings": patch
+"@rocket.chat/meteor": minor
+"@rocket.chat/core-typings": minor
+"@rocket.chat/rest-typings": minor
 ---
 
-feat: Added new callout in the subscription page to inform users of subscription upgrade eligibility when applicable.
+Add new callout in the subscription page to inform users of subscription upgrade eligibility when applicable.

From d11b2941f9d19255f6a05d74decf3d89bdd6aaa9 Mon Sep 17 00:00:00 2001
From: Lucas Pelegrino <lucas.pelegrino@icloud.com>
Date: Wed, 11 Dec 2024 14:22:00 -0300
Subject: [PATCH 14/18] style: removes eslint-disable line from file

---
 packages/core-typings/src/cloud/CloudSyncAnnouncement.ts | 3 +--
 packages/core-typings/src/cloud/index.ts                 | 2 +-
 packages/core-typings/src/license/LicenseInfo.ts         | 4 ++--
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/packages/core-typings/src/cloud/CloudSyncAnnouncement.ts b/packages/core-typings/src/cloud/CloudSyncAnnouncement.ts
index ce18882fcc65..96856538ff72 100644
--- a/packages/core-typings/src/cloud/CloudSyncAnnouncement.ts
+++ b/packages/core-typings/src/cloud/CloudSyncAnnouncement.ts
@@ -1,10 +1,9 @@
-/* eslint-disable @typescript-eslint/naming-convention */
 import type { CalloutBlock, ContextBlock, DividerBlock, ImageBlock, SectionBlock } from '@rocket.chat/ui-kit';
 
 type CloudSyncAnnouncementLayoutBlock = ContextBlock | DividerBlock | ImageBlock | SectionBlock | CalloutBlock;
 type CloudSyncAnnouncementLayout = CloudSyncAnnouncementLayoutBlock[];
 
-export interface CloudSyncAnnouncement {
+export interface ICloudSyncAnnouncement {
 	viewId: string;
 	appId: string;
 	blocks: CloudSyncAnnouncementLayout;
diff --git a/packages/core-typings/src/cloud/index.ts b/packages/core-typings/src/cloud/index.ts
index 510b342a90d6..63efbd0bcf18 100644
--- a/packages/core-typings/src/cloud/index.ts
+++ b/packages/core-typings/src/cloud/index.ts
@@ -9,4 +9,4 @@ export {
 	WorkspaceCommsResponsePayload,
 	WorkspaceInteractionResponsePayload,
 } from './WorkspaceSyncPayload';
-export { CloudSyncAnnouncement } from './CloudSyncAnnouncement';
+export { ICloudSyncAnnouncement } from './CloudSyncAnnouncement';
diff --git a/packages/core-typings/src/license/LicenseInfo.ts b/packages/core-typings/src/license/LicenseInfo.ts
index 6b9a10a118ad..855602283cd3 100644
--- a/packages/core-typings/src/license/LicenseInfo.ts
+++ b/packages/core-typings/src/license/LicenseInfo.ts
@@ -1,7 +1,7 @@
 import type { ILicenseTag } from './ILicenseTag';
 import type { ExternalModule, ILicenseV3, LicenseLimitKind } from './ILicenseV3';
 import type { LicenseModule } from './LicenseModule';
-import type { CloudSyncAnnouncement } from '../cloud/CloudSyncAnnouncement';
+import type { ICloudSyncAnnouncement } from '../cloud';
 
 export type LicenseInfo = {
 	license?: ILicenseV3;
@@ -11,5 +11,5 @@ export type LicenseInfo = {
 	limits: Record<LicenseLimitKind, { value?: number; max: number }>;
 	tags: ILicenseTag[];
 	trial: boolean;
-	cloudSyncAnnouncement?: CloudSyncAnnouncement;
+	cloudSyncAnnouncement?: ICloudSyncAnnouncement;
 };

From 6fd40dc773a22f8de3c521e62de315026b4acdd6 Mon Sep 17 00:00:00 2001
From: Lucas Pelegrino <lucas.pelegrino@icloud.com>
Date: Wed, 11 Dec 2024 14:32:54 -0300
Subject: [PATCH 15/18] style: removes spacing changes

---
 ee/packages/license/src/license.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ee/packages/license/src/license.ts b/ee/packages/license/src/license.ts
index 723ffa134bbe..99433ca1a8e1 100644
--- a/ee/packages/license/src/license.ts
+++ b/ee/packages/license/src/license.ts
@@ -474,6 +474,7 @@ export class LicenseManager extends Emitter<LicenseEvents> {
 		const activeModules = getModules.call(this);
 		const externalModules = getExternalModules.call(this);
 		const license = this.getLicense();
+
 		// Get all limits present in the license and their current value
 		const limits = Object.fromEntries(
 			(includeLimits &&

From cacc6425706b01971b023022ec7e0aa00ceaf189 Mon Sep 17 00:00:00 2001
From: Lucas Pelegrino <lucas.pelegrino@icloud.com>
Date: Wed, 11 Dec 2024 14:57:20 -0300
Subject: [PATCH 16/18] fix: typos and interface naming

---
 .changeset/wicked-socks-hide.md          | 2 +-
 packages/rest-typings/src/v1/licenses.ts | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.changeset/wicked-socks-hide.md b/.changeset/wicked-socks-hide.md
index 7042967940f3..3f425c3228e2 100644
--- a/.changeset/wicked-socks-hide.md
+++ b/.changeset/wicked-socks-hide.md
@@ -4,4 +4,4 @@
 "@rocket.chat/rest-typings": minor
 ---
 
-Add new callout in the subscription page to inform users of subscription upgrade eligibility when applicable.
+Adds a new callout in the subscription page to inform users of subscription upgrade eligibility when applicable.
diff --git a/packages/rest-typings/src/v1/licenses.ts b/packages/rest-typings/src/v1/licenses.ts
index 0801a5e1696a..8240546ddc37 100644
--- a/packages/rest-typings/src/v1/licenses.ts
+++ b/packages/rest-typings/src/v1/licenses.ts
@@ -43,7 +43,7 @@ export type LicensesEndpoints = {
 	'/v1/licenses.info': {
 		GET: (params: licensesInfoProps) => {
 			license: LicenseInfo;
-			cloudSyncAnnouncement?: Cloud.CloudSyncAnnouncement;
+			cloudSyncAnnouncement?: Cloud.ICloudSyncAnnouncement;
 		};
 	};
 	'/v1/licenses.add': {

From ca8f11b3d992fd5a5f97ed763e360778de9ffdd3 Mon Sep 17 00:00:00 2001
From: Lucas Pelegrino <lucas.pelegrino@rocket.chat>
Date: Wed, 11 Dec 2024 15:42:42 -0300
Subject: [PATCH 17/18] style: fix typo on comment

Co-authored-by: Kevin Aleman <kaleman960@gmail.com>
---
 apps/meteor/server/settings/setup-wizard.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/meteor/server/settings/setup-wizard.ts b/apps/meteor/server/settings/setup-wizard.ts
index 4947f4d83463..13d76a6070d9 100644
--- a/apps/meteor/server/settings/setup-wizard.ts
+++ b/apps/meteor/server/settings/setup-wizard.ts
@@ -1343,7 +1343,7 @@ export const createSetupWSettings = () =>
 				secret: true,
 			});
 			await this.add('Cloud_Sync_Announcement_Payload', 'null', {
-				type: 'string', // tODO: replace setting type string for object once is implemented.
+				type: 'string', // TODO: replace setting type string for object once is implemented.
 				hidden: true,
 				secret: true,
 			});

From f5e7ef6dbfd2864386b439026559183f4b973ef4 Mon Sep 17 00:00:00 2001
From: Lucas Pelegrino <lucas.pelegrino@icloud.com>
Date: Thu, 12 Dec 2024 17:32:36 -0300
Subject: [PATCH 18/18] chore: refactors trycatch to handle errors more
 gracefully

---
 .../functions/syncWorkspace/fetchWorkspaceSyncPayload.ts  | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/apps/meteor/app/cloud/server/functions/syncWorkspace/fetchWorkspaceSyncPayload.ts b/apps/meteor/app/cloud/server/functions/syncWorkspace/fetchWorkspaceSyncPayload.ts
index 170ad41ee1a1..7d01f6305c83 100644
--- a/apps/meteor/app/cloud/server/functions/syncWorkspace/fetchWorkspaceSyncPayload.ts
+++ b/apps/meteor/app/cloud/server/functions/syncWorkspace/fetchWorkspaceSyncPayload.ts
@@ -30,12 +30,8 @@ export async function fetchWorkspaceSyncPayload({
 	});
 
 	if (!response.ok) {
-		try {
-			const { error } = await response.json();
-			throw new CloudWorkspaceConnectionError(`Failed to connect to Rocket.Chat Cloud: ${error}`);
-		} catch (error) {
-			throw new CloudWorkspaceConnectionError(`Failed to connect to Rocket.Chat Cloud: ${response.statusText}`);
-		}
+		const { error } = await response.json();
+		throw new CloudWorkspaceConnectionError(`Failed to connect to Rocket.Chat Cloud: ${error}`);
 	}
 
 	const payload = await response.json();