Merge branch 'master' into style/modal

layer5io · Jun 26, 2024 · 759897f · 759897f
2 parents ce9ec91 + d16e206
commit 759897f
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 14 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/src/custom/Modal/index.tsx b/src/custom/Modal/index.tsx
@@ -161,7 +161,7 @@ export const ModalFooter: React.FC<ModalFooterProps> = ({ helpText, children, va
   return (
     <StyledFooter variant={variant} hasHelpText={!!helpText}>
       {helpText && (
-        <CustomTooltip title={helpText} placement="top">
+        <CustomTooltip title={helpText} variant="standard" placement="top">
           <IconButton>
             <InfoCircleIcon {...iconMedium} className="InfoCircleIcon" />
           </IconButton>

diff --git a/src/theme/theme.ts b/src/theme/theme.ts
@@ -7,13 +7,17 @@ export const drawerWidth = 240;
 
 export const createCustomTheme = (mode: PaletteMode, brandPalette?: Interactiveness) => {
   const basePalette = mode == 'light' ? lightModePalette : darkModePalette;
-  const themePalette = brandPalette
-    ? Object.assign({}, basePalette, {
-        background: {
-          brand: brandPalette
-        }
-      })
-    : basePalette;
+
+  const themePalette = {
+    ...basePalette,
+    background: {
+      ...(basePalette.background || {}),
+      brand: {
+        ...((basePalette?.background?.brand || {}) as Interactiveness),
+        ...(brandPalette || {})
+      }
+    }
+  };
 
   return createTheme({
     palette: {