10 files changed, 19 insertions, 15 deletions

diff --git a/src/app.js b/src/app.js
index edcf273dc..814bfacf1 100644
--- a/src/app.js
+++ b/src/app.js
@@ -36,7 +36,7 @@ import ImportScreen from './containers/auth/ImportScreen';
 import PricingScreen from './containers/auth/PricingScreen';
 import InviteScreen from './containers/auth/InviteScreen';
 import AuthLayoutContainer from './containers/auth/AuthLayoutContainer';
-import SubscriptionPopupScreen from './containers/ui/SubscriptionPopupScreen';
+import SubscriptionPopupScreen from './containers/subscription/SubscriptionPopupScreen';
 
 // Add Polyfills
 smoothScroll.polyfill();
diff --git a/src/components/auth/Import.js b/src/components/auth/Import.js
index 078244434..9ba14e768 100644
--- a/src/components/auth/Import.js
+++ b/src/components/auth/Import.js
@@ -41,21 +41,21 @@ export default class Import extends Component {
     intl: intlShape,
   };
 
-  prepareForm() {
-    const { services } = this.props;
-
+  componentWillMount() {
     const config = {
       fields: {
-        import: [...services.filter(s => s.recipe).map(s => ({
-          add: {
-            default: true,
-            options: s,
+        import: [...this.props.services.filter(s => s.recipe).map(s => ({
+          fields: {
+            add: {
+              default: true,
+              options: s,
+            },
           },
         }))],
       },
     };
 
-    return new Form(config, this.context.intl);
+    this.form = new Form(config, this.context.intl);
   }
 
   submit(e) {
@@ -74,7 +74,6 @@ export default class Import extends Component {
   }
 
   render() {
-    this.form = this.prepareForm();
     const { intl } = this.context;
     const { services, isSubmitting, inviteRoute } = this.props;
 
diff --git a/src/components/auth/Pricing.js b/src/components/auth/Pricing.js
index 761561a89..3cc8d5f6b 100644
--- a/src/components/auth/Pricing.js
+++ b/src/components/auth/Pricing.js
@@ -7,7 +7,7 @@ import { defineMessages, intlShape } from 'react-intl';
 // import Button from '../ui/Button';
 import Loader from '../ui/Loader';
 import Appear from '../ui/effects/Appear';
-import SubscriptionForm from '../../containers/ui/SubscriptionFormScreen';
+import SubscriptionForm from '../../containers/subscription/SubscriptionFormScreen';
 
 const messages = defineMessages({
   headline: {
diff --git a/src/components/settings/account/AccountDashboard.js b/src/components/settings/account/AccountDashboard.js
index 43272fe96..4992f0913 100644
--- a/src/components/settings/account/AccountDashboard.js
+++ b/src/components/settings/account/AccountDashboard.js
@@ -9,7 +9,7 @@ import Loader from '../../ui/Loader';
 import Button from '../../ui/Button';
 import Infobox from '../../ui/Infobox';
 import Link from '../../ui/Link';
-import SubscriptionForm from '../../../containers/ui/SubscriptionFormScreen';
+import SubscriptionForm from '../../../containers/subscription/SubscriptionFormScreen';
 
 const messages = defineMessages({
   headline: {
diff --git a/src/components/ui/Subscription.js b/src/components/subscription/SubscriptionForm.js
index dd350479d..dd350479d 100644
--- a/src/components/ui/Subscription.js
+++ b/src/components/subscription/SubscriptionForm.js
diff --git a/src/components/ui/SubscriptionPopup.js b/src/components/subscription/SubscriptionPopup.js
index 528d02907..528d02907 100644
--- a/src/components/ui/SubscriptionPopup.js
+++ b/src/components/subscription/SubscriptionPopup.js
diff --git a/src/containers/ui/SubscriptionFormScreen.js b/src/containers/subscription/SubscriptionFormScreen.js
index ac4593670..fc6e3c4be 100644
--- a/src/containers/ui/SubscriptionFormScreen.js
+++ b/src/containers/subscription/SubscriptionFormScreen.js
@@ -5,7 +5,7 @@ import { inject, observer } from 'mobx-react';
 
 import PaymentStore from '../../stores/PaymentStore';
 
-import SubscriptionForm from '../../components/ui/Subscription';
+import SubscriptionForm from '../../components/subscription/SubscriptionForm';
 
 const { BrowserWindow } = remote;
 
diff --git a/src/containers/ui/SubscriptionPopupScreen.js b/src/containers/subscription/SubscriptionPopupScreen.js
index 0b6432e50..bb0603170 100644
--- a/src/containers/ui/SubscriptionPopupScreen.js
+++ b/src/containers/subscription/SubscriptionPopupScreen.js
@@ -2,7 +2,7 @@ import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import { inject, observer } from 'mobx-react';
 
-import SubscriptionPopup from '../../components/ui/SubscriptionPopup';
+import SubscriptionPopup from '../../components/subscription/SubscriptionPopup';
 
 
 @inject('stores', 'actions') @observer
diff --git a/src/models/Service.js b/src/models/Service.js
index 423510c7d..bafb3f564 100644
--- a/src/models/Service.js
+++ b/src/models/Service.js
@@ -6,6 +6,7 @@ export default class Service {
   id = '';
   recipe = '';
   webview = null;
+  timer = null;
   events: {};
 
   isAttached = false;
diff --git a/src/stores/ServicesStore.js b/src/stores/ServicesStore.js
index 20e07e540..99ffe5439 100644
--- a/src/stores/ServicesStore.js
+++ b/src/stores/ServicesStore.js
@@ -589,12 +589,16 @@ export default class ServicesStore extends Store {
     const delay = 1000;
 
     if (service) {
+      if (service.timer !== null) {
+        clearTimeout(service.timer);
+      }
+
       const loop = () => {
         if (!service.webview) return;
 
         service.webview.send('poll');
 
-        setTimeout(loop, delay);
+        service.timer = setTimeout(loop, delay);
       };
 
       loop();