feat(#28) Migrations fixes

sp-engineering · Oct 22, 2024 · d005397 · d005397
1 parent 7522670
commit d005397
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/i18n/pl.ts b/i18n/pl.ts
@@ -120,7 +120,7 @@ export default {
   'settings.locale.datesDisplay.option.descriptive': 'Opisowo',
   'settings.locale.datesDisplay.option.numeric': 'Numerycznie',
   'settings.app.header': 'Aplikacja',
-  'settings.app.colorScheme.label': 'Schemat koloróœ',
+  'settings.app.colorScheme.label': 'Schemat kolorów',
   'settings.app.colorScheme.option.auto': 'Automatyczny',
   'settings.app.colorScheme.option.light': 'Jasny',
   'settings.app.colorScheme.option.dark': 'Ciemny',

diff --git a/store/settings.ts b/store/settings.ts
@@ -165,10 +165,8 @@ const v1Migrations = (settings?: ISettings): ISettings | undefined => {
   };
 };
 
-export const settingsMigrations = (state: State): State => {
-  return {
-    v1: fillGaps(initialSettings, v1Migrations(state.v1)),
-  };
+export const settingsMigrations = (settings: ISettings): ISettings => {
+  return fillGaps(initialSettings, v1Migrations(settings));
 };
 
 /**
@@ -215,8 +213,12 @@ export const selectServers = (state: RootState) =>
 
 const temporaryEmptyServer = emptyServer();
 
-export const selectServer = (state: RootState) =>
-  selectSettings(state).servers[0] ?? temporaryEmptyServer;
+export const selectServer = (state: RootState) => {
+  const settings = selectSettings(state);
+  return 'servers' in settings && settings.servers.length > 0
+    ? settings.servers[0]
+    : temporaryEmptyServer;
+};
 
 /* locale */