From c7dd7be2879635bb74e90cc88b8018193bc14d33 Mon Sep 17 00:00:00 2001
From: kytwb <kytwb@pm.me>
Date: Sun, 2 Jan 2022 20:45:58 +0100
Subject: Handle invalid accent color, fix loader styling

---
 src/features/appearance/index.ts | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/features/appearance/index.ts b/src/features/appearance/index.ts
index ea19b9759..9c0268707 100644
--- a/src/features/appearance/index.ts
+++ b/src/features/appearance/index.ts
@@ -26,11 +26,12 @@ function darkenAbsolute(originalColor, absoluteChange) {
 }
 
 function generateAccentStyle(accentColorStr) {
-  let accentColor = color(DEFAULT_APP_SETTINGS.accentColor);
+  let accentColor;
   try {
     accentColor = color(accentColorStr);
   } catch {
-    // Ignore invalid accent color.
+    accentColorStr = DEFAULT_APP_SETTINGS.accentColor;
+    accentColor = color(accentColorStr);
   }
   const darkerColorStr = darkenAbsolute(accentColor, 5).hex();
   return `
@@ -69,7 +70,8 @@ function generateAccentStyle(accentColorStr) {
     .theme__dark .franz-form__button,
     .franz-form__button,
     .ferdi__fab,
-    .franz-form .franz-form__slider-wrapper .slider::-webkit-slider-thumb {
+    .franz-form .franz-form__slider-wrapper .slider::-webkit-slider-thumb,
+    span.loader div > div > div {
       background: ${accentColorStr};
     }
 
-- 
cgit v1.2.3-54-g00ecf