3 files changed, 18 insertions, 14 deletions

diff --git a/src/features/delayApp/Component.js b/src/features/delayApp/Component.js
index 403340c7b..6e0532c9a 100644
--- a/src/features/delayApp/Component.js
+++ b/src/features/delayApp/Component.js
@@ -6,7 +6,7 @@ import injectSheet from 'react-jss';
 
 import Button from '../../components/ui/Button';
 
-import { config } from './';
+import { config } from '.';
 import styles from './styles';
 
 const messages = defineMessages({
@@ -38,11 +38,15 @@ export default @inject('actions') @injectSheet(styles) @observer class DelayApp
     countdown: config.delayDuration,
   }
 
+  countdownInterval = null;
+
+  countdownIntervalTimeout = 1000;
+
   componentDidMount() {
     this.countdownInterval = setInterval(() => {
-      this.setState({
-        countdown: this.state.countdown - this.countdownIntervalTimeout,
-      });
+      this.setState(prevState => ({
+        countdown: prevState.countdown - this.countdownIntervalTimeout,
+      }));
 
       if (this.state.countdown <= 0) {
         // reload();
@@ -55,9 +59,6 @@ export default @inject('actions') @injectSheet(styles) @observer class DelayApp
     clearInterval(this.countdownInterval);
   }
 
-  countdownInterval = null;
-  countdownIntervalTimeout = 1000;
-
   render() {
     const { classes, actions } = this.props;
     const { intl } = this.context;
@@ -71,9 +72,11 @@ export default @inject('actions') @injectSheet(styles) @observer class DelayApp
           buttonType="inverted"
           onClick={() => actions.ui.openSettings({ path: 'user' })}
         />
-        <p className="footnote">{intl.formatMessage(messages.text, {
-          seconds: this.state.countdown / 1000,
-        })}</p>
+        <p className="footnote">
+          {intl.formatMessage(messages.text, {
+            seconds: this.state.countdown / 1000,
+          })}
+        </p>
       </div>
     );
   }
diff --git a/src/features/delayApp/index.js b/src/features/delayApp/index.js
index 9ffa1d2fd..d5c544b78 100644
--- a/src/features/delayApp/index.js
+++ b/src/features/delayApp/index.js
@@ -67,4 +67,3 @@ export default function init(stores) {
 }
 
 export const Component = DelayAppComponent;
-
diff --git a/src/features/serviceProxy/index.js b/src/features/serviceProxy/index.js
index ee0b4e79c..4bea327ad 100644
--- a/src/features/serviceProxy/index.js
+++ b/src/features/serviceProxy/index.js
@@ -23,15 +23,18 @@ export default function init(stores) {
 
     const services = stores.services.enabled;
     const isPremiumUser = stores.user.data.isPremium;
+    const proxySettings = stores.settings.proxy;
+
+    debug('Service Proxy autorun');
 
     services.forEach((service) => {
       const s = session.fromPartition(`persist:service-${service.id}`);
 
       if (config.isEnabled && (isPremiumUser || !config.isPremium)) {
-        const serviceProxyConfig = stores.settings.proxy[service.id];
+        const serviceProxyConfig = proxySettings[service.id];
 
         if (serviceProxyConfig && serviceProxyConfig.isEnabled && serviceProxyConfig.host) {
-          const proxyHost = serviceProxyConfig.host;
+          const proxyHost = `${serviceProxyConfig.host}${serviceProxyConfig.port ? `:${serviceProxyConfig.port}` : ''}`;
           debug(`Setting proxy config from service settings for "${service.name}" (${service.id}) to`, proxyHost);
 
           s.setProxy({ proxyRules: proxyHost }, () => {
@@ -42,4 +45,3 @@ export default function init(stores) {
     });
   });
 }
-