Merge pull request #1133 from layer5io/branded-theme

map more tokens to brand pallete

Author: aabidsofi19

src/theme/theme.ts

@@ -2,22 +2,31 @@ import { Interactiveness, PaletteMode, createTheme } from '@mui/material';
 import { components } from './components';
 import { darkModePalette, lightModePalette } from './palette';
 import { typography } from './typography';
+import _ from 'lodash';
 
 export const drawerWidth = 240;
 
 export const createCustomTheme = (mode: PaletteMode, brandPalette?: Interactiveness) => {
   const basePalette = mode == 'light' ? lightModePalette : darkModePalette;
 
-  const themePalette = {
-    ...basePalette,
+  console.log('Creating theme with mode:', mode, 'and brandPalette:', brandPalette);
+
+  const customBrandedTheme = brandPalette ? {
+    primary: {
+        main: brandPalette.default ,
+        secondary: brandPalette.hover,
+    },
+    secondary: {
+      main: brandPalette.secondary,
+      secondary: brandPalette.secondary,
+    },
     background: {
-      ...(basePalette.background || {}),
-      brand: {
-        ...((basePalette?.background?.brand || {}) as Interactiveness),
-        ...(brandPalette || {})
-      }
+      brand: brandPalette
     }
-  };
+  } : {};
+
+  const themePalette = _.merge({}, basePalette, customBrandedTheme);
+  
 
   return createTheme({
     palette: {