From 22c51e3fb8e4aae09716411aa26c95f325763f49 Mon Sep 17 00:00:00 2001
From: SethBurkart123 <seth.burkart@hills.adventist.edu.au>
Date: Sun, 7 Apr 2024 16:40:14 +1000
Subject: [PATCH] fix case where theme color is empty

---
 src/interface/components/BackgroundSelector.tsx | 2 +-
 src/seqta/ui/colors/Manager.ts                  | 2 +-
 src/seqta/ui/themes/removeTheme.ts              | 4 +++-
 src/seqta/ui/themes/setTheme.ts                 | 2 +-
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/interface/components/BackgroundSelector.tsx b/src/interface/components/BackgroundSelector.tsx
index 343744b1..ab8b6b1f 100644
--- a/src/interface/components/BackgroundSelector.tsx
+++ b/src/interface/components/BackgroundSelector.tsx
@@ -25,7 +25,7 @@ async function GetTheme() {
 
 async function SetTheme(theme: string) {
   localStorage.setItem('selectedBackground', theme);
-  await browser.storage.local.set({ theme });
+  //await browser.storage.local.set({ theme });
 }
 
 function BackgroundSelector({ isEditMode, disableTheme }: BackgroundSelectorProps) {
diff --git a/src/seqta/ui/colors/Manager.ts b/src/seqta/ui/colors/Manager.ts
index f79ca4eb..b7262571 100644
--- a/src/seqta/ui/colors/Manager.ts
+++ b/src/seqta/ui/colors/Manager.ts
@@ -18,7 +18,7 @@ let DarkMode: any = null;
 
 export function updateAllColors(storedSetting: any, newColor = null) {
   // Determine the color to use
-  const selectedColor = newColor || storedSetting.selectedColor == '' ? '#007bff' : storedSetting.selectedColor;
+  const selectedColor = newColor || (storedSetting.selectedColor !== '' ? storedSetting.selectedColor : '#007bff');
 
   if (storedSetting.transparencyEffects) {
     document.documentElement.classList.add('transparencyEffects');
diff --git a/src/seqta/ui/themes/removeTheme.ts b/src/seqta/ui/themes/removeTheme.ts
index b77c946a..733eceae 100644
--- a/src/seqta/ui/themes/removeTheme.ts
+++ b/src/seqta/ui/themes/removeTheme.ts
@@ -10,7 +10,9 @@ export const removeTheme = async (theme: CustomTheme) => {
 
   // Reset default color
   const originalSelectedColor = await browser.storage.local.get('originalSelectedColor') as { originalSelectedColor: string; };
-  await browser.storage.local.set({ selectedColor: originalSelectedColor.originalSelectedColor });
+  if (originalSelectedColor.originalSelectedColor !== '') {
+    await browser.storage.local.set({ selectedColor: originalSelectedColor.originalSelectedColor });
+  }
   
   // Remove custom images
   const customImageVariables = theme.CustomImages.map((image) => image.variableName);
diff --git a/src/seqta/ui/themes/setTheme.ts b/src/seqta/ui/themes/setTheme.ts
index aadf6d51..8a4625e5 100644
--- a/src/seqta/ui/themes/setTheme.ts
+++ b/src/seqta/ui/themes/setTheme.ts
@@ -30,7 +30,7 @@ export const setTheme = async (themeId: string) => {
 
     await browser.storage.local.set({
       selectedTheme: themeId,
-      selectedColor: theme.defaultColour,
+      selectedColor: theme.defaultColour !== '' ? theme.defaultColour : '#007bff',
       originalSelectedColor: originalSelectedColor.selectedColor
     });