5.0.0 beta.18v5.0.0-beta.18

2 files changed, 24 insertions, 12 deletions

diff --git a/src/models/Settings.js b/src/models/Settings.js
index e39b63087..0e4c59057 100644
--- a/src/models/Settings.js
+++ b/src/models/Settings.js
@@ -2,19 +2,29 @@ import { observable, extendObservable } from 'mobx';
 import { DEFAULT_APP_SETTINGS } from '../config';
 
 export default class Settings {
-  @observable autoLaunchInBackground = DEFAULT_APP_SETTINGS.autoLaunchInBackground;
-  @observable runInBackground = DEFAULT_APP_SETTINGS.runInBackground;
-  @observable enableSystemTray = DEFAULT_APP_SETTINGS.enableSystemTray;
-  @observable minimizeToSystemTray = DEFAULT_APP_SETTINGS.minimizeToSystemTray;
-  @observable showDisabledServices = DEFAULT_APP_SETTINGS.showDisabledServices;
-  @observable showMessageBadgeWhenMuted = DEFAULT_APP_SETTINGS.showMessageBadgeWhenMuted;
-  @observable enableSpellchecking = DEFAULT_APP_SETTINGS.enableSpellchecking;
-  @observable locale = DEFAULT_APP_SETTINGS.locale;
-  @observable beta = DEFAULT_APP_SETTINGS.beta;
-  @observable isAppMuted = DEFAULT_APP_SETTINGS.isAppMuted;
+  @observable app = DEFAULT_APP_SETTINGS
 
-  constructor(data) {
-    Object.assign(this, data);
+  @observable service = {
+    activeService: '',
+  }
+
+  @observable group = {
+    collapsed: [],
+    disabled: [],
+  }
+
+  @observable stats = {
+    appStarts: 0,
+  }
+
+  @observable migration = {}
+
+  constructor({ app, service, group, stats, migration }) {
+    Object.assign(this.app, app);
+    Object.assign(this.service, service);
+    Object.assign(this.group, group);
+    Object.assign(this.stats, stats);
+    Object.assign(this.migration, migration);
   }
 
   update(data) {
diff --git a/src/models/User.js b/src/models/User.js
index 2e5df4795..3e4aa187d 100644
--- a/src/models/User.js
+++ b/src/models/User.js
@@ -15,6 +15,7 @@ export default class User {
   @observable donor = {};
   @observable isDonor = false;
   @observable isMiner = false;
+  @observable locale = false;
 
   constructor(data) {
     if (!data.id) {
@@ -33,5 +34,6 @@ export default class User {
     this.isDonor = data.isDonor || this.isDonor;
     this.isSubscriptionOwner = data.isSubscriptionOwner || this.isSubscriptionOwner;
     this.isMiner = data.isMiner || this.isMiner;
+    this.locale = data.locale || this.locale;
   }
 }