From 4ce7f0b487e9d4497910f71a6e00b600aa551a13 Mon Sep 17 00:00:00 2001
From: Andrew Bastin <andrewbastin.k@gmail.com>
Date: Wed, 16 Jun 2021 22:33:17 -0400
Subject: [PATCH] Remove redudant applySettingFB

---
 helpers/fb/settings.ts | 10 +++-------
 newstore/settings.ts   | 29 -----------------------------
 2 files changed, 3 insertions(+), 36 deletions(-)

diff --git a/helpers/fb/settings.ts b/helpers/fb/settings.ts
index 5b4f06c3f..e51b127a6 100644
--- a/helpers/fb/settings.ts
+++ b/helpers/fb/settings.ts
@@ -1,10 +1,6 @@
 import firebase from "firebase"
 import { currentUser$ } from "./auth"
-import {
-  applySettingFB,
-  settingsStore,
-  SettingsType,
-} from "~/newstore/settings"
+import { applySetting, settingsStore, SettingsType } from "~/newstore/settings"
 
 /**
  * Used locally to prevent infinite loop when settings sync update
@@ -51,7 +47,7 @@ export function initSettings() {
         Object.keys(dispatch.payload).forEach((key) => {
           writeSettings(key, dispatch.payload[key])
         })
-      } else if (dispatch.dispatcher !== "applySettingFB") {
+      } else {
         writeSettings(
           dispatch.payload.settingKey,
           settingsStore.value[dispatch.payload.settingKey as keyof SettingsType]
@@ -86,7 +82,7 @@ export function initSettings() {
           loadedSettings = false
           settings.forEach((e) => {
             if (e && e.name && e.value != null) {
-              applySettingFB(e.name, e.value)
+              applySetting(e.name, e.value)
             }
           })
           loadedSettings = true
diff --git a/newstore/settings.ts b/newstore/settings.ts
index 2b3536e53..e51a66598 100644
--- a/newstore/settings.ts
+++ b/newstore/settings.ts
@@ -64,22 +64,6 @@ const dispatchers = defineDispatchers({
     const result: Partial<SettingsType> = {}
     result[settingKey] = value
 
-    return result
-  },
-  applySettingFB<K extends keyof SettingsType>(
-    _currentState: SettingsType,
-    { settingKey, value }: { settingKey: K; value: SettingsType[K] }
-  ) {
-    if (!validKeys.includes(settingKey)) {
-      console.log(
-        `Ignoring non-existent setting key '${settingKey}' assignment by firebase`
-      )
-      return {}
-    }
-
-    const result: Partial<SettingsType> = {}
-    result[settingKey] = value
-
     return result
   },
 })
@@ -120,16 +104,3 @@ export function applySetting<K extends keyof SettingsType>(
     },
   })
 }
-
-export function applySettingFB<K extends keyof SettingsType>(
-  settingKey: K,
-  value: SettingsType[K]
-) {
-  settingsStore.dispatch({
-    dispatcher: "applySettingFB",
-    payload: {
-      settingKey,
-      value,
-    },
-  })
-}