Merge branch 'develop' into feat/openapi-webdav

cardoso · web-flow · commit 8e5fc1dc56a7 · 2025-06-30T13:27:06.000-03:00
diff --git a/.changeset/big-bees-crash.md b/.changeset/big-bees-crash.md
@@ -0,0 +1,5 @@
+---
+'@rocket.chat/meteor': minor
+---
+
+Adds theme palette to Application error page
diff --git a/apps/meteor/client/views/root/AppErrorPage.tsx b/apps/meteor/client/views/root/AppErrorPage.tsx
@@ -1,4 +1,5 @@
-import { Box, States, StatesAction, StatesActions, StatesIcon, StatesSubtitle, StatesTitle } from '@rocket.chat/fuselage';
+import { Box, PaletteStyleTag, States, StatesAction, StatesActions, StatesIcon, StatesSubtitle, StatesTitle } from '@rocket.chat/fuselage';
+import { useThemeMode } from '@rocket.chat/ui-theming';
 import type { ErrorInfo, ReactElement } from 'react';
 
 type AppErrorPageProps = {
@@ -8,30 +9,35 @@ type AppErrorPageProps = {
 };
 
 const AppErrorPage = (_props: AppErrorPageProps): ReactElement => {
+	const [, , theme] = useThemeMode();
+
 	return (
-		<Box display='flex' justifyContent='center' height='full' backgroundColor='surface'>
-			<States>
-				<StatesIcon name='error-circle' />
-				<StatesTitle>Application Error</StatesTitle>
-				<StatesSubtitle>The application GUI just crashed.</StatesSubtitle>
+		<>
+			<PaletteStyleTag theme={theme} tagId='app-error-palette' />
+			<Box display='flex' justifyContent='center' height='full' backgroundColor='surface'>
+				<States>
+					<StatesIcon name='error-circle' />
+					<StatesTitle>Application Error</StatesTitle>
+					<StatesSubtitle>The application GUI just crashed.</StatesSubtitle>
 
-				<StatesActions>
-					<StatesAction
-						onClick={() => {
-							const result = indexedDB.deleteDatabase('MeteorDynamicImportCache');
-							result.onsuccess = () => {
-								window.location.reload();
-							};
-							result.onerror = () => {
-								window.location.reload();
-							};
-						}}
-					>
-						Reload Application
-					</StatesAction>
-				</StatesActions>
-			</States>
-		</Box>
+					<StatesActions>
+						<StatesAction
+							onClick={() => {
+								const result = indexedDB.deleteDatabase('MeteorDynamicImportCache');
+								result.onsuccess = () => {
+									window.location.reload();
+								};
+								result.onerror = () => {
+									window.location.reload();
+								};
+							}}
+						>
+							Reload Application
+						</StatesAction>
+					</StatesActions>
+				</States>
+			</Box>
+		</>
 	);
 };
 
diff --git a/ee/apps/queue-worker/Dockerfile b/ee/apps/queue-worker/Dockerfile
@@ -71,6 +71,9 @@ COPY ./packages/tsconfig packages/tsconfig
 COPY ./packages/ui-kit/package.json packages/ui-kit/package.json
 COPY ./packages/ui-kit/dist packages/ui-kit/dist
 
+COPY ./packages/i18n/package.json packages/i18n/package.json
+COPY ./packages/i18n/dist packages/i18n/dist
+
 COPY ./ee/apps/${SERVICE}/dist .
 
 COPY ./package.json .
diff --git a/ee/packages/omnichannel-services/package.json b/ee/packages/omnichannel-services/package.json
@@ -15,6 +15,7 @@
 		"@rocket.chat/core-services": "workspace:^",
 		"@rocket.chat/core-typings": "workspace:^",
 		"@rocket.chat/emitter": "~0.31.25",
+		"@rocket.chat/i18n": "workspace:^",
 		"@rocket.chat/logger": "workspace:^",
 		"@rocket.chat/model-typings": "workspace:^",
 		"@rocket.chat/models": "workspace:^",
diff --git a/yarn.lock b/yarn.lock
@@ -8322,6 +8322,7 @@ __metadata:
     "@rocket.chat/core-typings": "workspace:^"
     "@rocket.chat/emitter": "npm:~0.31.25"
     "@rocket.chat/eslint-config": "workspace:^"
+    "@rocket.chat/i18n": "workspace:^"
     "@rocket.chat/jest-presets": "workspace:~"
     "@rocket.chat/logger": "workspace:^"
     "@rocket.chat/model-typings": "workspace:^"

-Original file line number
+Diff line change
@@ @@ -0,0 +1,5 @@ @@
 +---
 +'@rocket.chat/meteor': minor
 +---
++
 +Adds theme palette to Application error page