Add state merge

src/renderer/store/app.store.ts

@@ -1,3 +1,4 @@
+import merge from 'lodash/merge';
 import create from 'zustand';
 import { devtools, persist } from 'zustand/middleware';
 import { immer } from 'zustand/middleware/immer';
@@ -47,7 +48,7 @@ export const useAppStore = create<AppSlice>()(
           list: {
             display: CardDisplayType.CARD,
             size: 50,
-            type: 'list',
+            type: 'grid',
           },
         },
         platform: Platform.WINDOWS,
@@ -72,8 +73,14 @@ export const useAppStore = create<AppSlice>()(
           rightWidth: '230px',
         },
       })),
-      { name: 'app' }
+      { name: 'store_app' }
     ),
-    { name: 'store_app' }
+    {
+      merge: (persistedState, currentState) => {
+        return merge(currentState, persistedState);
+      },
+      name: 'store_app',
+      version: 1,
+    }
   )
 );

src/renderer/store/auth.store.ts

@@ -1,3 +1,4 @@
+import merge from 'lodash/merge';
 import create from 'zustand';
 import { devtools, persist } from 'zustand/middleware';
 import { immer } from 'zustand/middleware/immer';
@@ -106,8 +107,14 @@ export const useAuthStore = create<AuthSlice>()(
           return set({ currentServer: server });
         },
       })),
-      { name: 'authentication' }
+      { name: 'store_authentication' }
     ),
-    { name: 'store_authentication' }
+    {
+      merge: (persistedState, currentState) => {
+        return merge(currentState, persistedState);
+      },
+      name: 'store_authentication',
+      version: 1,
+    }
   )
 );

src/renderer/store/settings.store.ts

@@ -77,7 +77,7 @@ export const useSettingsStore = create<SettingsSlice>()(
     ),
     {
       merge: (persistedState, currentState) => {
-        return merge(persistedState, currentState);
+        return merge(currentState, persistedState);
       },
       name: 'store_settings',
       version: 1,