#146 Add possible fix for 1.1.1.1 hack

4 files changed, 20 insertions, 6 deletions

diff --git a/src/stores/AppStore.js b/src/stores/AppStore.js
index 894c19347..124c117b0 100644
--- a/src/stores/AppStore.js
+++ b/src/stores/AppStore.js
@@ -181,7 +181,9 @@ export default class AppStore extends Store {
 
     this.locale = this._getDefaultLocale();
 
-    this._healthCheck();
+    setTimeout(() => {
+      this._healthCheck();
+    }, 1000);
 
     this.isSystemDarkModeEnabled = systemPreferences.isDarkMode();
 
diff --git a/src/stores/FeaturesStore.js b/src/stores/FeaturesStore.js
index ab5d762c7..780cde3a7 100644
--- a/src/stores/FeaturesStore.js
+++ b/src/stores/FeaturesStore.js
@@ -57,7 +57,10 @@ export default class FeaturesStore extends Store {
   _updateFeatures = () => {
     const features = Object.assign({}, DEFAULT_FEATURES_CONFIG);
     if (this.stores.user.isLoggedIn) {
-      const requestResult = this.featuresRequest.execute().result;
+      let requestResult = {};
+      try {
+        requestResult = this.featuresRequest.execute().result;
+      } catch (e) {} // eslint-disable-line no-empty
       Object.assign(features, requestResult);
     }
     runInAction('FeaturesStore::_updateFeatures', () => {
diff --git a/src/stores/UserStore.js b/src/stores/UserStore.js
index d6a2e5fde..ec0b0cf8d 100644
--- a/src/stores/UserStore.js
+++ b/src/stores/UserStore.js
@@ -348,7 +348,12 @@ export default class UserStore extends Store {
   // Reactions
   async _getUserData() {
     if (this.isLoggedIn) {
-      const data = await this.getUserInfoRequest.execute()._promise;
+      let data;
+      try {
+        data = await this.getUserInfoRequest.execute()._promise;
+      } catch (e) {
+        return false;
+      }
 
       // We need to set the beta flag for the SettingsStore
       this.actions.settings.update({
@@ -408,7 +413,11 @@ export default class UserStore extends Store {
   }
 
   async _migrateUserLocale() {
-    await this.getUserInfoRequest._promise;
+    try {
+      await this.getUserInfoRequest._promise;
+    } catch (e) {
+      return false;
+    }
 
     if (!this.data.locale) {
       debug('Migrate "locale" to user data');
diff --git a/src/stores/lib/CachedRequest.js b/src/stores/lib/CachedRequest.js
index ac8b2bd81..31c7ce241 100644
--- a/src/stores/lib/CachedRequest.js
+++ b/src/stores/lib/CachedRequest.js
@@ -39,7 +39,7 @@ export default class CachedRequest extends Request {
     }), 0);
 
     // Issue api call & save it as promise that is handled to update the results of the operation
-    this._promise = new Promise((resolve, reject) => {
+    this._promise = new Promise((resolve) => {
       this._api[this._method](...callArgs)
         .then((result) => {
           setTimeout(action(() => {
@@ -63,7 +63,7 @@ export default class CachedRequest extends Request {
             this.wasExecuted = true;
             this._isWaitingForResponse = false;
             this._triggerHooks();
-            reject(error);
+            // reject(error);
           }), 1);
         }));
     });