Add support to use custom servers

2 files changed, 3 insertions, 1 deletions

diff --git a/src/stores/SettingsStore.js b/src/stores/SettingsStore.js
index a456195bf..bc01291d8 100644
--- a/src/stores/SettingsStore.js
+++ b/src/stores/SettingsStore.js
@@ -8,6 +8,7 @@ import Store from './lib/Store';
 import Request from './lib/Request';
 import CachedRequest from './lib/CachedRequest';
 import { getLocale } from '../helpers/i18n-helpers';
+import { API } from '../environment';
 
 import { DEFAULT_APP_SETTINGS, FILE_SYSTEM_SETTINGS_TYPES } from '../config';
 import { SPELLCHECKER_LOCALES } from '../i18n/languages';
@@ -147,6 +148,7 @@ export default class SettingsStore extends Store {
           runInBackground: legacySettings.runInBackground,
           enableSystemTray: legacySettings.enableSystemTray,
           minimizeToSystemTray: legacySettings.minimizeToSystemTray,
+          server: API,
           isAppMuted: legacySettings.isAppMuted,
           enableGPUAcceleration: legacySettings.enableGPUAcceleration,
           showMessageBadgeWhenMuted: legacySettings.showMessageBadgeWhenMuted,
diff --git a/src/stores/UserStore.js b/src/stores/UserStore.js
index 104416f06..bd451661a 100644
--- a/src/stores/UserStore.js
+++ b/src/stores/UserStore.js
@@ -84,7 +84,7 @@ export default class UserStore extends Store {
 
     // Reactions
     this.registerReactions([
-      this._requireAuthenticatedUser,
+      // this._requireAuthenticatedUser,
       this._getUserData.bind(this),
     ]);
   }