Merge branch 'develop' into release/5.0.0-beta.19

6 files changed, 44 insertions, 56 deletions

diff --git a/src/features/delayApp/index.js b/src/features/delayApp/index.js
index 3fc0f2570..92d2dcf6a 100644
--- a/src/features/delayApp/index.js
+++ b/src/features/delayApp/index.js
@@ -40,6 +40,11 @@ export default function init(stores) {
         config.delayDuration = globalConfig.wait !== undefined ? globalConfig.wait : DEFAULT_FEATURES_CONFIG.needToWaitToProceedConfig.wait;
 
         autorun(() => {
+          if (stores.services.all.length === 0) {
+            shownAfterLaunch = true;
+            return;
+          }
+          
           const diff = moment().diff(timeLastDelay);
           if ((stores.app.isFocused && diff >= config.delayOffset) || !shownAfterLaunch) {
             debug(`App will be delayed for ${config.delayDuration / 1000}s`);
diff --git a/src/features/serviceProxy/index.js b/src/features/serviceProxy/index.js
index 50dea8c9b..5a74685a4 100644
--- a/src/features/serviceProxy/index.js
+++ b/src/features/serviceProxy/index.js
@@ -13,43 +13,33 @@ export const config = observable({
 });
 
 export default function init(stores) {
-  reaction(
-    () => stores.features.features.isServiceProxyEnabled,
-    (enabled, r) => {
-      if (enabled) {
-        debug('Initializing `serviceProxy` feature');
+  debug('Initializing `serviceProxy` feature');
 
-        // Dispose the reaction to run this only once
-        r.dispose();
+  autorun(() => {
+    const { isServiceProxyEnabled, isServiceProxyPremiumFeature } = stores.features.features;
 
-        const { isServiceProxyEnabled, isServiceProxyPremiumFeature } = stores.features.features;
+    config.isEnabled = isServiceProxyEnabled !== undefined ? isServiceProxyEnabled : DEFAULT_FEATURES_CONFIG.isServiceProxyEnabled;
+    config.isPremium = isServiceProxyPremiumFeature !== undefined ? isServiceProxyPremiumFeature : DEFAULT_FEATURES_CONFIG.isServiceProxyPremiumFeature;
 
-        config.isEnabled = isServiceProxyEnabled !== undefined ? isServiceProxyEnabled : DEFAULT_FEATURES_CONFIG.isServiceProxyEnabled;
-        config.isPremium = isServiceProxyPremiumFeature !== undefined ? isServiceProxyPremiumFeature : DEFAULT_FEATURES_CONFIG.isServiceProxyPremiumFeature;
+    const services = stores.services.all;
+    const isPremiumUser = stores.user.data.isPremium;
 
-        autorun(() => {
-          const services = stores.services.all;
-          const isPremiumUser = stores.user.isPremium;
+    services.forEach((service) => {
+      const s = session.fromPartition(`persist:service-${service.id}`);
+      let proxyHost = 'direct://';
 
-          if (config.isPremium && !isPremiumUser) return;
-
-          services.forEach((service) => {
-            const s = session.fromPartition(`persist:service-${service.id}`);
-            let proxyHost = 'direct://';
-
-            const serviceProxyConfig = stores.settings.proxy[service.id];
-
-            if (serviceProxyConfig && serviceProxyConfig.isEnabled && serviceProxyConfig.host) {
-              proxyHost = serviceProxyConfig.host;
-            }
-
-            s.setProxy({ proxyRules: proxyHost }, (e) => {
-              debug(`Using proxy "${proxyHost}" for "${service.name}" (${service.id})`, e);
-            });
-          });
-        });
+      if (config.isEnabled && (isPremiumUser || !config.isPremium)) {
+        const serviceProxyConfig = stores.settings.proxy[service.id];
+  
+        if (serviceProxyConfig && serviceProxyConfig.isEnabled && serviceProxyConfig.host) {
+          proxyHost = serviceProxyConfig.host;
+        }
       }
-    },
-  );
+
+      s.setProxy({ proxyRules: proxyHost }, (e) => {
+        debug(`Using proxy "${proxyHost}" for "${service.name}" (${service.id})`, e);
+      });
+    });
+  });
 }
 
diff --git a/src/features/spellchecker/index.js b/src/features/spellchecker/index.js
index 454096e4e..63506103c 100644
--- a/src/features/spellchecker/index.js
+++ b/src/features/spellchecker/index.js
@@ -1,36 +1,27 @@
-import { autorun, reaction } from 'mobx';
+import { autorun, observable } from 'mobx';
 
 import { DEFAULT_FEATURES_CONFIG } from '../../config';
 
 const debug = require('debug')('Franz:feature:spellchecker');
 
-export const config = {
+export const config = observable({
   isPremiumFeature: DEFAULT_FEATURES_CONFIG.isSpellcheckerPremiumFeature,
-};
+});
 
 export default function init(stores) {
-  reaction(
-    () => stores.features.features.isSpellcheckerPremiumFeature,
-    (enabled, r) => {
-      debug('Initializing `spellchecker` feature');
+  debug('Initializing `spellchecker` feature');
 
-      // Dispose the reaction to run this only once
-      r.dispose();
+  autorun(() => {
+    const { isSpellcheckerPremiumFeature } = stores.features.features;
 
-      const { isSpellcheckerPremiumFeature } = stores.features.features;
+    config.isPremiumFeature = isSpellcheckerPremiumFeature !== undefined ? isSpellcheckerPremiumFeature : DEFAULT_FEATURES_CONFIG.isSpellcheckerPremiumFeature;
 
-      config.isPremiumFeature = isSpellcheckerPremiumFeature !== undefined ? isSpellcheckerPremiumFeature : DEFAULT_FEATURES_CONFIG.isSpellcheckerPremiumFeature;
+    if (!stores.user.data.isPremium && config.isPremiumFeature && stores.settings.app.enableSpellchecking) {
+      debug('Override settings.spellcheckerEnabled flag to false');
 
-      autorun(() => {
-        if (!stores.user.data.isPremium && config.isPremiumFeature) {
-          debug('Override settings.spellcheckerEnabled flag to false');
-
-          Object.assign(stores.settings.all.app, {
-            enableSpellchecking: false,
-          });
-        }
+      Object.assign(stores.settings.app, {
+        enableSpellchecking: false,
       });
-    },
-  );
+    }
+  });
 }
-
diff --git a/src/lib/Menu.js b/src/lib/Menu.js
index 9d7df551c..32ec1b207 100644
--- a/src/lib/Menu.js
+++ b/src/lib/Menu.js
@@ -685,7 +685,7 @@ export default class FranzMenu {
     if (this.stores.user.isLoggedIn) {
       return services.map((service, i) => ({
         label: this._getServiceName(service),
-        accelerator: i <= 9 ? `${cmdKey}+${i + 1}` : null,
+        accelerator: i < 9 ? `${cmdKey}+${i + 1}` : null,
         type: 'radio',
         checked: service.isActive,
         click: () => {
diff --git a/src/stores/ServicesStore.js b/src/stores/ServicesStore.js
index 8f217ea94..99b091589 100644
--- a/src/stores/ServicesStore.js
+++ b/src/stores/ServicesStore.js
@@ -439,6 +439,8 @@ export default class ServicesStore extends Store {
 
   @action _reload({ serviceId }) {
     const service = this.one(serviceId);
+    if (!service.isEnabled) return;
+
     service.resetMessageCount();
 
     service.webview.loadURL(service.url);
diff --git a/src/webview/contextMenu.js b/src/webview/contextMenu.js
index 9b148b220..195306fda 100644
--- a/src/webview/contextMenu.js
+++ b/src/webview/contextMenu.js
@@ -35,7 +35,7 @@ const buildMenuTpl = (props, suggestions) => {
       id: 'cut',
       role: can('Cut') ? 'cut' : '',
       enabled: can('Cut'),
-      visible: props.selectionText.trim(),
+      visible: !!props.selectionText.trim(),
     }, {
       id: 'copy',
       label: 'Copy',