From c62cd9898a95e195671f911c603c408b30a6fd3a Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Wed, 30 Mar 2022 12:08:02 -0500
Subject: [PATCH] Fix background shapes for dark mode

---
 app/soapbox/features/ui/components/background_shapes.js | 6 +++---
 app/soapbox/normalizers/soapbox/soapbox_config.ts       | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/soapbox/features/ui/components/background_shapes.js b/app/soapbox/features/ui/components/background_shapes.js
index 586e9e772..efb7f846c 100644
--- a/app/soapbox/features/ui/components/background_shapes.js
+++ b/app/soapbox/features/ui/components/background_shapes.js
@@ -13,13 +13,13 @@ export default () => (
           </filter>
           <path id='a' d='M0 0h1754v1336H0z' />
         </defs>
-        <g fill='none' fill-rule='evenodd'>
+        <g fill='none' fillRule='evenodd'>
           <mask id='b' fill='#fff'>
             <use xlinkHref='#a' />
           </mask>
           <g mask='url(#b)'>
-            <path className='fill-bg-shape-1' d='M1257.79 335.852C1262 527.117 897.55 530.28 792.32 977.19 600.48 981.41 435.29 545.31 431.08 354.046 426.871 162.782 578.976 4.31 770.815.088c191.844-4.222 482.764 144.5 486.974 335.764Z' fill-rule='nonzero' filter='url(#c)' transform='translate(309.54 -367.538)' />
-            <path className='fill-bg-shape-2' d='M71.127 1126.654c206.164 179.412 502.452 211.232 661.777 71.072 159.325-140.163 295.165-510.155 8.23-504.412-320.079 6.405-381.35-817.422-540.675-677.258-31 368-335.497 931.182-129.332 1110.598Z' fill-rule='nonzero' filter='url(#d)' transform='translate(309.54 -141.056)' opacity='.1' />
+            <path className='fill-bg-shape-1' d='M1257.79 335.852C1262 527.117 897.55 530.28 792.32 977.19 600.48 981.41 435.29 545.31 431.08 354.046 426.871 162.782 578.976 4.31 770.815.088c191.844-4.222 482.764 144.5 486.974 335.764Z' fillRule='nonzero' filter='url(#c)' transform='translate(309.54 -367.538)' opacity='.1' />
+            <path className='fill-bg-shape-2' d='M71.127 1126.654c206.164 179.412 502.452 211.232 661.777 71.072 159.325-140.163 295.165-510.155 8.23-504.412-320.079 6.405-381.35-817.422-540.675-677.258-31 368-335.497 931.182-129.332 1110.598Z' fillRule='nonzero' filter='url(#d)' transform='translate(309.54 -141.056)' opacity='.1' />
           </g>
         </g>
       </svg>
diff --git a/app/soapbox/normalizers/soapbox/soapbox_config.ts b/app/soapbox/normalizers/soapbox/soapbox_config.ts
index 3d0658851..ef28788d4 100644
--- a/app/soapbox/normalizers/soapbox/soapbox_config.ts
+++ b/app/soapbox/normalizers/soapbox/soapbox_config.ts
@@ -150,12 +150,12 @@ const normalizeColors = (soapboxConfig: SoapboxConfigMap): SoapboxConfigMap => {
 const maybeAddMissingColors = (soapboxConfig: SoapboxConfigMap): SoapboxConfigMap => {
   const colors = soapboxConfig.get('colors');
 
-  const missing = {
+  const missing = ImmutableMap({
     'bg-shape-1': colors.getIn(['accent', '50']),
     'bg-shape-2': colors.getIn(['primary', '500']),
-  };
+  });
 
-  return soapboxConfig.set('colors', colors.mergeDeep(missing));
+  return soapboxConfig.set('colors', missing.mergeDeep(colors));
 };
 
 export const normalizeSoapboxConfig = (soapboxConfig: Record<string, any>) => {