4 files changed, 24 insertions, 109 deletions

diff --git a/src/containers/auth/PricingScreen.js b/src/containers/auth/PricingScreen.js
deleted file mode 100644
index 97bf1f6be..000000000
--- a/src/containers/auth/PricingScreen.js
+++ /dev/null
@@ -1,83 +0,0 @@
-import React, { Component } from 'react';
-import PropTypes from 'prop-types';
-import { inject, observer } from 'mobx-react';
-import { RouterStore } from 'mobx-react-router';
-
-import Pricing from '../../components/auth/Pricing';
-import UserStore from '../../stores/UserStore';
-
-import { globalError as globalErrorPropType } from '../../prop-types';
-import FeaturesStore from '../../stores/FeaturesStore';
-
-export default @inject('stores', 'actions') @observer class PricingScreen extends Component {
-  static propTypes = {
-    error: globalErrorPropType.isRequired,
-  };
-
-  async submit() {
-    const {
-      actions,
-      stores,
-    } = this.props;
-
-    const { activateTrialRequest } = stores.user;
-    const { defaultTrialPlan, canSkipTrial } = stores.features.anonymousFeatures;
-
-    if (!canSkipTrial) {
-      stores.router.push('/');
-      stores.user.hasCompletedSignup = true;
-    } else {
-      actions.user.activateTrial({ planId: defaultTrialPlan });
-      await activateTrialRequest._promise;
-
-      if (!activateTrialRequest.isError) {
-        stores.router.push('/');
-        stores.user.hasCompletedSignup = true;
-      }
-    }
-  }
-
-  render() {
-    const {
-      error,
-      stores,
-    } = this.props;
-
-    const { getUserInfoRequest, activateTrialRequest, data } = stores.user;
-    const { featuresRequest, features } = stores.features;
-
-    const { pricingConfig } = features;
-
-    let currency = '$';
-    let price = 5.99;
-    if (pricingConfig) {
-      ({ currency } = pricingConfig);
-      ({ price } = pricingConfig.plans.pro.yearly);
-    }
-
-    return (
-      <Pricing
-        onSubmit={this.submit.bind(this)}
-        isLoadingRequiredData={(getUserInfoRequest.isExecuting || !getUserInfoRequest.wasExecuted) || (featuresRequest.isExecuting || !featuresRequest.wasExecuted)}
-        isActivatingTrial={activateTrialRequest.isExecuting}
-        trialActivationError={activateTrialRequest.isError}
-        canSkipTrial={features.canSkipTrial}
-        error={error}
-        currency={currency}
-        price={price}
-        name={data.firstname}
-      />
-    );
-  }
-}
-
-PricingScreen.wrappedComponent.propTypes = {
-  actions: PropTypes.shape({
-    user: PropTypes.instanceOf(UserStore).isRequired,
-  }).isRequired,
-  stores: PropTypes.shape({
-    user: PropTypes.instanceOf(UserStore).isRequired,
-    router: PropTypes.instanceOf(RouterStore).isRequired,
-    features: PropTypes.instanceOf(FeaturesStore).isRequired,
-  }).isRequired,
-};
diff --git a/src/containers/auth/SetupAssistantScreen.js b/src/containers/auth/SetupAssistantScreen.js
index 2a8f2c010..d7036969a 100644
--- a/src/containers/auth/SetupAssistantScreen.js
+++ b/src/containers/auth/SetupAssistantScreen.js
@@ -4,14 +4,28 @@ import PropTypes from 'prop-types';
 import { inject, observer } from 'mobx-react';
 
 import { RouterStore } from 'mobx-react-router';
-import { DEFAULT_TODO_RECIPE_ID, DEFAULT_TODO_SERVICE_NAME } from '../../config';
+import {
+  DEFAULT_TODO_RECIPE_ID,
+  DEFAULT_TODO_SERVICE_NAME,
+} from '../../config';
 import { sleep } from '../../helpers/async-helpers';
 import SetupAssistant from '../../components/auth/SetupAssistant';
 import ServicesStore from '../../stores/ServicesStore';
 import RecipesStore from '../../stores/RecipesStore';
 import UserStore from '../../stores/UserStore';
 
-export default @inject('stores', 'actions') @observer class SetupAssistantScreen extends Component {
+export default
+@inject('stores', 'actions')
+@observer
+class SetupAssistantScreen extends Component {
+  constructor(props) {
+    super(props);
+    this.state = {
+      isSettingUpServices: false,
+    };
+  }
+
+  // TODO: Why are these hardcoded here? Do they need to conform to specific services in the packaged recipes? If so, its more important to fix this
   services = {
     whatsapp: {
       name: 'WhatsApp',
@@ -49,21 +63,18 @@ export default @inject('stores', 'actions') @observer class SetupAssistantScreen
       name: 'LinkedIn',
       hasTeamId: false,
     },
-  }
-
-  state = {
-    isSettingUpServices: false,
-  }
+  };
 
   async setupServices(serviceConfig) {
-    const { stores: { services, router, user } } = this.props;
-    console.log(serviceConfig);
+    const {
+      stores: { services },
+    } = this.props;
 
     this.setState({
       isSettingUpServices: true,
     });
 
-    // The store requests are not build for paralell requests so we need to finish one request after another
+    // The store requests are not build for parallel requests so we need to finish one request after another
     for (const config of serviceConfig) {
       const serviceData = {
         name: this.services[config.id].name,
@@ -96,10 +107,6 @@ export default @inject('stores', 'actions') @observer class SetupAssistantScreen
     this.setState({
       isSettingUpServices: false,
     });
-
-    await sleep(100);
-
-    router.push(user.pricingRoute);
   }
 
   render() {
diff --git a/src/containers/auth/SignupScreen.js b/src/containers/auth/SignupScreen.js
index 42ee09f33..38c5dfb43 100644
--- a/src/containers/auth/SignupScreen.js
+++ b/src/containers/auth/SignupScreen.js
@@ -14,16 +14,7 @@ export default @inject('stores', 'actions') @observer class SignupScreen extends
   };
 
   onSignup(values) {
-    const { actions, stores } = this.props;
-
-    const { canSkipTrial, defaultTrialPlan, pricingConfig } = stores.features.anonymousFeatures;
-
-    if (!canSkipTrial) {
-      Object.assign(values, {
-        plan: defaultTrialPlan,
-        currency: pricingConfig.currencyID,
-      });
-    }
+    const { actions } = this.props;
 
     actions.user.signup(values);
   }
@@ -33,7 +24,7 @@ export default @inject('stores', 'actions') @observer class SignupScreen extends
 
     return (
       <Signup
-        onSubmit={values => this.onSignup(values)}
+        onSubmit={(values) => this.onSignup(values)}
         isSubmitting={stores.user.signupRequest.isExecuting}
         loginRoute={stores.user.loginRoute}
         changeServerRoute={stores.user.changeServerRoute}
diff --git a/src/containers/auth/WelcomeScreen.js b/src/containers/auth/WelcomeScreen.js
index 6f2d0eee6..bfcc880d0 100644
--- a/src/containers/auth/WelcomeScreen.js
+++ b/src/containers/auth/WelcomeScreen.js
@@ -15,7 +15,7 @@ export default @inject('stores', 'actions') @observer class LoginScreen extends
         loginRoute={user.loginRoute}
         signupRoute={user.signupRoute}
         changeServerRoute={user.changeServerRoute}
-        recipes={recipePreviews.featured}
+        recipes={recipePreviews.all}
       />
     );
   }