diff --git a/package-lock.json b/package-lock.json index f3fcb95cb..535c2505f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -13488,9 +13488,9 @@ } }, "node_modules/ws": { - "version": "8.15.1", - "resolved": "https://registry.npmjs.org/ws/-/ws-8.15.1.tgz", - "integrity": "sha512-W5OZiCjXEmk0yZ66ZN82beM5Sz7l7coYxpRkzS+p9PP+ToQry8szKh+61eNktr7EA9DOwvFGhfC605jDHbP6QQ==", + "version": "8.17.1", + "resolved": "https://registry.npmjs.org/ws/-/ws-8.17.1.tgz", + "integrity": "sha512-6XQFvXTkbfUOZOKKILFG1PDK2NDQs4azKQl26T0YS5CxqWLgXajbPZ+h4gZekJyRqFU8pvnbAbbs/3TgRPy+GQ==", "dev": true, "engines": { "node": ">=10.0.0" @@ -22875,9 +22875,9 @@ } }, "ws": { - "version": "8.15.1", - "resolved": "https://registry.npmjs.org/ws/-/ws-8.15.1.tgz", - "integrity": "sha512-W5OZiCjXEmk0yZ66ZN82beM5Sz7l7coYxpRkzS+p9PP+ToQry8szKh+61eNktr7EA9DOwvFGhfC605jDHbP6QQ==", + "version": "8.17.1", + "resolved": "https://registry.npmjs.org/ws/-/ws-8.17.1.tgz", + "integrity": "sha512-6XQFvXTkbfUOZOKKILFG1PDK2NDQs4azKQl26T0YS5CxqWLgXajbPZ+h4gZekJyRqFU8pvnbAbbs/3TgRPy+GQ==", "dev": true, "requires": {} }, diff --git a/src/custom/Modal/index.tsx b/src/custom/Modal/index.tsx index 4b6aaa1d0..a4b294d1e 100644 --- a/src/custom/Modal/index.tsx +++ b/src/custom/Modal/index.tsx @@ -161,7 +161,7 @@ export const ModalFooter: React.FC = ({ helpText, children, va return ( {helpText && ( - + diff --git a/src/theme/theme.ts b/src/theme/theme.ts index 71a42e9ba..f0e560815 100644 --- 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: {