Merge branch 'master' into develop

4 files changed, 6 insertions, 32 deletions

diff --git a/src/containers/layout/AppLayoutContainer.js b/src/containers/layout/AppLayoutContainer.js
index ce7f89c42..e1423bdaa 100644
--- a/src/containers/layout/AppLayoutContainer.js
+++ b/src/containers/layout/AppLayoutContainer.js
@@ -43,7 +43,6 @@ export default @inject('stores', 'actions') @observer class AppLayoutContainer e
       handleIPCMessage,
       setWebviewReference,
       openWindow,
-      reloadUpdatedServices,
       reorder,
       reload,
       toggleNotifications,
@@ -122,7 +121,7 @@ export default @inject('stores', 'actions') @observer class AppLayoutContainer e
           services={servicesContainer}
           news={news.latest}
           removeNewsItem={hide}
-          reloadServicesAfterUpdate={reloadUpdatedServices}
+          reloadServicesAfterUpdate={() => window.location.reload()}
           installAppUpdate={installUpdate}
           globalError={globalError.error}
           showRequiredRequestsError={requests.showRequiredRequestsError}
diff --git a/src/stores/AppStore.js b/src/stores/AppStore.js
index 45335c488..6f156a96d 100644
--- a/src/stores/AppStore.js
+++ b/src/stores/AppStore.js
@@ -326,31 +326,6 @@ export default class AppStore extends Store {
       defaultLocale,
       fallbackLocale: DEFAULT_APP_SETTINGS.fallbackLocale,
     });
-
-    // if (locales[locale] === undefined) {
-    //   let localeFuzzy;
-    //   Object.keys(locales).forEach((localStr) => {
-    //     if (locales && Object.hasOwnProperty.call(locales, localStr)) {
-    //       if (locale.substring(0, 2) === localStr.substring(0, 2)) {
-    //         localeFuzzy = localStr;
-    //       }
-    //     }
-    //   });
-
-    //   if (localeFuzzy !== undefined) {
-    //     locale = localeFuzzy;
-    //   }
-    // }
-
-    // if (locales[locale] === undefined) {
-    //   locale = defaultLocale;
-    // }
-
-    // if (!locale) {
-    //   locale = DEFAULT_APP_SETTINGS.fallbackLocale;
-    // }
-
-    // return locale;
   }
 
   _muteAppHandler() {
diff --git a/src/stores/FeaturesStore.js b/src/stores/FeaturesStore.js
index 9480e27ab..10c893d3f 100644
--- a/src/stores/FeaturesStore.js
+++ b/src/stores/FeaturesStore.js
@@ -22,12 +22,16 @@ export default class FeaturesStore extends Store {
     setTimeout(this._enableFeatures.bind(this), 1);
   }
 
+  @computed get anonymousFeatures() {
+    return this.defaultFeaturesRequest.execute().result || DEFAULT_FEATURES_CONFIG;
+  }
+
   @computed get features() {
     if (this.stores.user.isLoggedIn) {
       return this.featuresRequest.execute().result || DEFAULT_FEATURES_CONFIG;
     }
 
-    return this.defaultFeaturesRequest.execute().result || DEFAULT_FEATURES_CONFIG;
+    return DEFAULT_FEATURES_CONFIG;
   }
 
   _monitorLoginStatus() {
diff --git a/src/stores/SettingsStore.js b/src/stores/SettingsStore.js
index 61528ba2c..4c01e9910 100644
--- a/src/stores/SettingsStore.js
+++ b/src/stores/SettingsStore.js
@@ -176,10 +176,6 @@ export default class SettingsStore extends Store {
           '5.0.0-beta.19-settings': true,
         },
       });
-
-      localStorage.removeItem('app');
-
-      debug('Set up dark mode');
     }
   }