fixed 1.0.5 new settings bugs

src/main.tsx

@@ -74,16 +74,6 @@ function Main(): JSX.Element {
     void setupTauriEventListeners()
     void getWiresockVersion()
 
-    // Handle version 1.0.5 adding 'startMinimized' setting
-    if (settings.startMinimized === undefined) {
-      setSettings({ ...settings, startMinimized: false })
-    }
-
-    // Handle version 1.0.5 adding 'minimizeToTray' setting
-    if (settings.minimizeToTray === undefined) {
-      setSettings({ ...settings, minimizeToTray: true })
-    }
-
     // Show the app window
     if (!settings.startMinimized) {
       void invoke('show_app')

src/models/SettingsModel.ts

@@ -5,11 +5,11 @@ export default class SettingsModel {
   startMinimized: boolean
   minimizeToTray: boolean
 
-  constructor() {
-    this.autoStart = false
-    this.autoConnectTunnelID = ''
-    this.logLevel = 'debug'
-    this.startMinimized = false
-    this.minimizeToTray = true
+  constructor(data?: Partial<SettingsModel>) {
+    this.autoStart = data?.autoStart ?? false
+    this.autoConnectTunnelID = data?.autoConnectTunnelID ?? ''
+    this.logLevel = data?.logLevel ?? 'debug'
+    this.startMinimized = data?.startMinimized ?? false
+    this.minimizeToTray = data?.minimizeToTray ?? true
   }
 }

src/utilities/storageUtils.ts

@@ -70,6 +70,7 @@ export function saveSettingsToStorage(settings: SettingsModel): void {
 export function getSettingsFromStorage(): SettingsModel {
   console.log('Retrieving settings from local storage')
   const settingsStorageItem = localStorage.getItem('settings')
-  const settings = settingsStorageItem !== null ? JSON.parse(settingsStorageItem) : new SettingsModel()
-  return settings
+  const settingsData = settingsStorageItem !== null ? JSON.parse(settingsStorageItem) : {}
+  // Use the constructor to handle default values
+  return new SettingsModel(settingsData)
 }