custom theme update comes from server side now

RocketChat · Aug 17, 2023 · 6cfae4b · 6cfae4b
1 parent 336e511
commit 6cfae4b
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 13 deletions.
diff --git a/src/injected.ts b/src/injected.ts
@@ -118,18 +118,12 @@ const start = (): void => {
     }
   });
 
-  Tracker.autorun(() => {
-    const { url, defaultUrl } = settings.get('Assets_background') || {};
-    window.RocketChatDesktop.setBackground(url || defaultUrl);
-  });
-
-  Tracker.autorun(() => {
-    const meteorCustomTheme = Meteor.settings['theme-custom-css'] || '';
-    console.log('[Rocket.Chat Desktop] meteorCustomTheme', meteorCustomTheme);
-    if (meteorCustomTheme.length > 0) {
-      window.RocketChatDesktop.setSidebarCustomTheme(meteorCustomTheme);
-    }
-  });
+  if (!versionIsGreaterOrEqualsTo(serverInfo.version, '6.4.0')) {
+    Tracker.autorun(() => {
+      const { url, defaultUrl } = settings.get('Assets_background') || {};
+      window.RocketChatDesktop.setBackground(url || defaultUrl);
+    });
+  }
 
   Tracker.autorun(() => {
     const userToken = Meteor._localStorage.getItem('Meteor.loginToken');

diff --git a/src/ui/components/SideBar/customTheme.tsx b/src/ui/components/SideBar/customTheme.tsx
@@ -7,7 +7,7 @@ interface CustomThemeProps {
 
 const CustomTheme: React.FC<CustomThemeProps> = ({ customTheme }) => {
   useEffect(() => {
-    const styleElement = document.createElement('customTheme');
+    const styleElement = document.createElement('style');
     styleElement.textContent = customTheme;
 
     document.head.appendChild(styleElement);