6 files changed, 151 insertions, 32 deletions

diff --git a/src/features/delayApp/Component.js b/src/features/delayApp/Component.js
index 2bfa1162e..403340c7b 100644
--- a/src/features/delayApp/Component.js
+++ b/src/features/delayApp/Component.js
@@ -24,7 +24,7 @@ const messages = defineMessages({
   },
 });
 
-export default @inject('actions') @observer @injectSheet(styles) class DelayApp extends Component {
+export default @inject('actions') @injectSheet(styles) @observer class DelayApp extends Component {
   static propTypes = {
     // eslint-disable-next-line
     classes: PropTypes.object.isRequired,
@@ -39,8 +39,6 @@ export default @inject('actions') @observer @injectSheet(styles) class DelayApp
   }
 
   componentDidMount() {
-    // const { reload } = this.props;
-
     this.countdownInterval = setInterval(() => {
       this.setState({
         countdown: this.state.countdown - this.countdownIntervalTimeout,
@@ -53,6 +51,10 @@ export default @inject('actions') @observer @injectSheet(styles) class DelayApp
     }, this.countdownIntervalTimeout);
   }
 
+  componentWillUnmount() {
+    clearInterval(this.countdownInterval);
+  }
+
   countdownInterval = null;
   countdownIntervalTimeout = 1000;
 
diff --git a/src/features/delayApp/index.js b/src/features/delayApp/index.js
index a3cce03ee..334433df8 100644
--- a/src/features/delayApp/index.js
+++ b/src/features/delayApp/index.js
@@ -38,8 +38,8 @@ export default function init(stores) {
         let shownAfterLaunch = false;
         let timeLastDelay = moment();
 
-        config.delayOffset = globalConfig.delayOffset || DEFAULT_DELAY_OFFSET;
-        config.delayDuration = globalConfig.wait || DEFAULT_DELAY_DURATION;
+        config.delayOffset = globalConfig.delayOffset !== undefined ? globalConfig.delayOffset : DEFAULT_DELAY_OFFSET;
+        config.delayDuration = globalConfig.wait !== undefined ? globalConfig.wait : DEFAULT_DELAY_DURATION;
 
         autorun(() => {
           const diff = moment().diff(timeLastDelay);
@@ -63,5 +63,5 @@ export default function init(stores) {
   );
 }
 
-export const component = DelayAppComponent;
+export const Component = DelayAppComponent;
 
diff --git a/src/features/delayApp/styles.js b/src/features/delayApp/styles.js
index 097368d9a..5c214cfdf 100644
--- a/src/features/delayApp/styles.js
+++ b/src/features/delayApp/styles.js
@@ -1,26 +1,23 @@
-export default (theme) => {
-  console.log(theme);
-  return ({
-    container: {
-      background: theme.colorBackground,
-      position: 'absolute',
-      top: 0,
-      width: '100%',
-      display: 'flex',
-      'flex-direction': 'column',
-      'align-items': 'center',
-      'justify-content': 'center',
-      'z-index': 150,
-    },
-    headline: {
-      color: theme.colorHeadline,
-      margin: [25, 0, 40],
-      'max-width': 500,
-      'text-align': 'center',
-      'line-height': '1.3em',
-    },
-    button: {
-      margin: [40, 0, 20],
-    },
-  });
-};
+export default theme => ({
+  container: {
+    background: theme.colorBackground,
+    position: 'absolute',
+    top: 0,
+    width: '100%',
+    display: 'flex',
+    'flex-direction': 'column',
+    'align-items': 'center',
+    'justify-content': 'center',
+    'z-index': 150,
+  },
+  headline: {
+    color: theme.colorHeadline,
+    margin: [25, 0, 40],
+    'max-width': 500,
+    'text-align': 'center',
+    'line-height': '1.3em',
+  },
+  button: {
+    margin: [40, 0, 20],
+  },
+});
diff --git a/src/features/serviceProxy/index.js b/src/features/serviceProxy/index.js
new file mode 100644
index 000000000..edb1c9367
--- /dev/null
+++ b/src/features/serviceProxy/index.js
@@ -0,0 +1,56 @@
+import { autorun, reaction, observable } from 'mobx';
+import { remote } from 'electron';
+
+const { session } = remote;
+
+const debug = require('debug')('Franz:feature:serviceProxy');
+
+const DEFAULT_ENABLED = false;
+const DEFAULT_IS_PREMIUM = true;
+
+export const config = observable({
+  isEnabled: DEFAULT_ENABLED,
+  isPremium: DEFAULT_IS_PREMIUM,
+});
+
+export default function init(stores) {
+  reaction(
+    () => stores.features.features.isServiceProxyEnabled,
+    (enabled, r) => {
+      if (enabled) {
+        debug('Initializing `serviceProxy` feature');
+
+        // Dispose the reaction to run this only once
+        r.dispose();
+
+        const { isServiceProxyEnabled, isServiceProxyPremiumFeature } = stores.features.features;
+
+        config.isEnabled = isServiceProxyEnabled !== undefined ? isServiceProxyEnabled : DEFAULT_ENABLED;
+        config.isPremium = isServiceProxyPremiumFeature !== undefined ? isServiceProxyPremiumFeature : DEFAULT_IS_PREMIUM;
+
+        autorun(() => {
+          const services = stores.services.all;
+          const isPremiumUser = stores.user.isPremium;
+
+          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);
+            });
+          });
+        });
+      }
+    },
+  );
+}
+
diff --git a/src/features/spellchecker/index.js b/src/features/spellchecker/index.js
new file mode 100644
index 000000000..8b3fb7e00
--- /dev/null
+++ b/src/features/spellchecker/index.js
@@ -0,0 +1,38 @@
+import { autorun, reaction } from 'mobx';
+
+const debug = require('debug')('Franz:feature:spellchecker');
+
+const DEFAULT_IS_PREMIUM_FEATURE = true;
+
+export const config = {
+  isPremiumFeature: DEFAULT_IS_PREMIUM_FEATURE,
+};
+
+export default function init(stores) {
+  reaction(
+    () => stores.features.features.isSpellcheckerPremiumFeature,
+    (enabled, r) => {
+      if (enabled) {
+        debug('Initializing `spellchecker` feature');
+
+        // Dispose the reaction to run this only once
+        r.dispose();
+
+        const { isSpellcheckerPremiumFeature } = stores.features.features;
+
+        config.isPremiumFeature = isSpellcheckerPremiumFeature !== undefined ? isSpellcheckerPremiumFeature : DEFAULT_IS_PREMIUM_FEATURE;
+
+        autorun(() => {
+          if (!stores.user.data.isPremium && config.isPremiumFeature) {
+            debug('Override settings.spellcheckerEnabled flag to false');
+
+            Object.assign(stores.settings.all.app, {
+              enableSpellchecker: false,
+            });
+          }
+        });
+      }
+    },
+  );
+}
+
diff --git a/src/features/spellchecker/styles.js b/src/features/spellchecker/styles.js
new file mode 100644
index 000000000..097368d9a
--- /dev/null
+++ b/src/features/spellchecker/styles.js
@@ -0,0 +1,26 @@
+export default (theme) => {
+  console.log(theme);
+  return ({
+    container: {
+      background: theme.colorBackground,
+      position: 'absolute',
+      top: 0,
+      width: '100%',
+      display: 'flex',
+      'flex-direction': 'column',
+      'align-items': 'center',
+      'justify-content': 'center',
+      'z-index': 150,
+    },
+    headline: {
+      color: theme.colorHeadline,
+      margin: [25, 0, 40],
+      'max-width': 500,
+      'text-align': 'center',
+      'line-height': '1.3em',
+    },
+    button: {
+      margin: [40, 0, 20],
+    },
+  });
+};