Merge branch 'develop'v5.5.0-gm

1 files changed, 38 insertions, 0 deletions

diff --git a/src/stores/SettingsStore.js b/src/stores/SettingsStore.js
index 71d4e1702..227eb2145 100644
--- a/src/stores/SettingsStore.js
+++ b/src/stores/SettingsStore.js
@@ -110,6 +110,7 @@ export default class SettingsStore extends Store {
       }
       debug('Get appSettings resolves', resp.type, resp.data);
       Object.assign(this._fileSystemSettingsCache[resp.type], resp.data);
+      ipcRenderer.send('initialAppSettings', resp);
     });
 
     this.fileSystemSettingsTypes.forEach((type) => {
@@ -263,5 +264,42 @@ export default class SettingsStore extends Store {
         },
       });
     }
+
+    if (!this.all.migration['5.4.4-beta.4-settings']) {
+      this.actions.settings.update({
+        type: 'app',
+        data: {
+          todoServer: 'isUsingCustomTodoService',
+          customTodoServer: legacySettings.todoServer,
+        },
+      });
+
+      this.actions.settings.update({
+        type: 'migration',
+        data: {
+          '5.4.4-beta.4-settings': true,
+        },
+      });
+
+      debug('Migrated old todo setting to new custom todo setting');
+    }
+
+    if (!this.all.migration['5.4.4-beta.4-settings']) {
+      this.actions.settings.update({
+        type: 'app',
+        data: {
+          automaticUpdates: !(legacySettings.noUpdates),
+        },
+      });
+
+      this.actions.settings.update({
+        type: 'migration',
+        data: {
+          '5.4.4-beta.4-settings': true,
+        },
+      });
+
+      debug('Migrated updates settings');
+    }
   }
 }