From b2a19d649c18d6abcae33e43da9ad625af73d7c8 Mon Sep 17 00:00:00 2001
From: Guilherme Gazzo <guilhermegazzo@gmail.com>
Date: Fri, 17 Feb 2023 02:16:20 -0300
Subject: [PATCH] Chore: move PaletteStyleTag (#28086)

---
 apps/meteor/client/views/root/AppLayout.tsx                   | 4 ----
 .../meteor/client/views/root/MainLayout/LayoutWithSidebar.tsx | 4 ++++
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/apps/meteor/client/views/root/AppLayout.tsx b/apps/meteor/client/views/root/AppLayout.tsx
index 6e093dff27b..aa8e89ab905 100644
--- a/apps/meteor/client/views/root/AppLayout.tsx
+++ b/apps/meteor/client/views/root/AppLayout.tsx
@@ -1,5 +1,3 @@
-import { PaletteStyleTag } from '@rocket.chat/ui-theming/src/PaletteStyleTag';
-import { SidebarPaletteStyleTag } from '@rocket.chat/ui-theming/src/SidebarPaletteStyleTag';
 import type { ReactElement } from 'react';
 import React, { useEffect, Suspense } from 'react';
 import { useSyncExternalStore } from 'use-sync-external-store/shim';
@@ -30,8 +28,6 @@ const AppLayout = (): ReactElement => {
 
 	return (
 		<>
-			<PaletteStyleTag />
-			<SidebarPaletteStyleTag />
 			<Suspense fallback={<PageLoading />}>{layout}</Suspense>
 			{portals}
 		</>
diff --git a/apps/meteor/client/views/root/MainLayout/LayoutWithSidebar.tsx b/apps/meteor/client/views/root/MainLayout/LayoutWithSidebar.tsx
index c9845e7df8e..c4d73dc1e4e 100644
--- a/apps/meteor/client/views/root/MainLayout/LayoutWithSidebar.tsx
+++ b/apps/meteor/client/views/root/MainLayout/LayoutWithSidebar.tsx
@@ -1,5 +1,7 @@
 import { Box } from '@rocket.chat/fuselage';
 import { useLayout, useCurrentRoute, useRoutePath, useSetting, useCurrentModal, useRoute } from '@rocket.chat/ui-contexts';
+import { PaletteStyleTag } from '@rocket.chat/ui-theming/src/PaletteStyleTag';
+import { SidebarPaletteStyleTag } from '@rocket.chat/ui-theming/src/SidebarPaletteStyleTag';
 import type { ReactElement, ReactNode } from 'react';
 import React, { useEffect, useRef } from 'react';
 
@@ -45,6 +47,8 @@ const LayoutWithSidebar = ({ children }: { children: ReactNode }): ReactElement
 			className={[embeddedLayout ? 'embedded-view' : undefined, 'menu-nav'].filter(Boolean).join(' ')}
 			aria-hidden={Boolean(modal)}
 		>
+			<PaletteStyleTag />
+			<SidebarPaletteStyleTag />
 			{!removeSidenav ? <Sidebar /> : null}
 			<div className={['rc-old', 'main-content', readReceiptsEnabled ? 'read-receipts-enabled' : undefined].filter(Boolean).join(' ')}>
 				{children}