Merge branch 'fix-themes-select' into shigusegubu

* fix-themes-select:
  Fixed mergedConfig misbehaving on first boot
  lint

src/components/settings_modal/tabs/theme_tab/theme_tab.js

@@ -745,7 +745,7 @@ export default {
         console.warn(e)
       }
     },
-    selected() {
+    selected () {
       this.selectedTheme = Object.entries(this.availableStyles).find(([k, s]) => {
         if (Array.isArray(s)) {
           console.log(s[0] === this.selected, this.selected)

src/modules/config.js

@@ -97,7 +97,8 @@ const config = {
       const { defaultConfig } = rootGetters
       return {
         ...defaultConfig,
-        ...state
+        // Do not override with undefined
+        ...Object.fromEntries(Object.entries(state).filter(([k, v]) => v !== undefined))
       }
     }
   },