4 files changed, 57 insertions, 23 deletions

diff --git a/src/containers/settings/AccountScreen.js b/src/containers/settings/AccountScreen.js
index 008c495d4..c5c2982b0 100644
--- a/src/containers/settings/AccountScreen.js
+++ b/src/containers/settings/AccountScreen.js
@@ -32,14 +32,6 @@ export default class AccountScreen extends Component {
     payment.plansRequest.reload();
   }
 
-  stopMiner() {
-    const { update } = this.props.actions.user;
-
-    update({ userData: {
-      isMiner: false,
-    } });
-  }
-
   async handlePaymentDashboard() {
     const { actions, stores } = this.props;
 
@@ -67,7 +59,7 @@ export default class AccountScreen extends Component {
   }
 
   render() {
-    const { user, payment, app } = this.props.stores;
+    const { user, payment } = this.props.stores;
     const { openExternalUrl } = this.props.actions.app;
     const { user: userActions } = this.props.actions;
 
@@ -79,7 +71,6 @@ export default class AccountScreen extends Component {
       <AccountDashboard
         user={user.data}
         orders={payment.orders}
-        hashrate={app.minerHashrate}
         isLoading={isLoadingUserInfo}
         isLoadingOrdersInfo={isLoadingOrdersInfo}
         isLoadingPlans={isLoadingPlans}
@@ -89,7 +80,6 @@ export default class AccountScreen extends Component {
         openDashboard={price => this.handlePaymentDashboard(price)}
         openExternalUrl={url => openExternalUrl({ url })}
         onCloseSubscriptionWindow={() => this.onCloseWindow()}
-        stopMiner={() => this.stopMiner()}
         deleteAccount={userActions.delete}
         isLoadingDeleteAccount={user.deleteAccountRequest.isExecuting}
         isDeleteAccountSuccessful={user.deleteAccountRequest.wasExecuted && !user.deleteAccountRequest.isError}
diff --git a/src/containers/settings/EditServiceScreen.js b/src/containers/settings/EditServiceScreen.js
index c26195a1e..67c2731fc 100644
--- a/src/containers/settings/EditServiceScreen.js
+++ b/src/containers/settings/EditServiceScreen.js
@@ -121,7 +121,7 @@ export default class EditServiceScreen extends Component {
           label: intl.formatMessage(messages.team),
           placeholder: intl.formatMessage(messages.team),
           value: service.team,
-          validate: [required],
+          validators: [required],
         },
       });
     }
@@ -132,24 +132,24 @@ export default class EditServiceScreen extends Component {
           label: intl.formatMessage(messages.customUrl),
           placeholder: 'https://',
           value: service.customUrl,
-          validate: [required, url],
+          validators: [required, url],
         },
       });
     }
 
     // More fine grained and use case specific validation rules
     if (recipe.hasTeamId && recipe.hasCustomUrl) {
-      config.fields.team.validate = [oneRequired(['team', 'customUrl'])];
-      config.fields.customUrl.validate = [url, oneRequired(['team', 'customUrl'])];
+      config.fields.team.validators = [oneRequired(['team', 'customUrl'])];
+      config.fields.customUrl.validators = [url, oneRequired(['team', 'customUrl'])];
     }
 
     // If a service can be hosted and has a teamId or customUrl
     if (recipe.hasHostedOption && (recipe.hasTeamId || recipe.hasCustomUrl)) {
       if (config.fields.team) {
-        config.fields.team.validate = [];
+        config.fields.team.validators = [];
       }
       if (config.fields.customUrl) {
-        config.fields.customUrl.validate = [url];
+        config.fields.customUrl.validators = [url];
       }
     }
 
diff --git a/src/containers/settings/EditUserScreen.js b/src/containers/settings/EditUserScreen.js
index fb5c5db89..dda8ce513 100644
--- a/src/containers/settings/EditUserScreen.js
+++ b/src/containers/settings/EditUserScreen.js
@@ -81,23 +81,23 @@ export default class EditUserScreen extends Component {
           label: intl.formatMessage(messages.firstname),
           placeholder: intl.formatMessage(messages.firstname),
           value: user.firstname,
-          validate: [required],
+          validators: [required],
         },
         lastname: {
           label: intl.formatMessage(messages.lastname),
           placeholder: intl.formatMessage(messages.lastname),
           value: user.lastname,
-          validate: [required],
+          validators: [required],
         },
         email: {
           label: intl.formatMessage(messages.email),
           placeholder: intl.formatMessage(messages.email),
           value: user.email,
-          validate: [required, email],
+          validators: [required, email],
         },
         accountType: {
           value: user.accountType,
-          validate: [required],
+          validators: [required],
           label: intl.formatMessage(messages.accountType.label),
           options: [{
             value: 'individual',
@@ -118,12 +118,12 @@ export default class EditUserScreen extends Component {
         oldPassword: {
           label: intl.formatMessage(messages.currentPassword),
           type: 'password',
-          validate: [minLength(6)],
+          validators: [minLength(6)],
         },
         newPassword: {
           label: intl.formatMessage(messages.newPassword),
           type: 'password',
-          validate: [minLength(6)],
+          validators: [minLength(6)],
         },
       },
     };
diff --git a/src/containers/settings/InviteScreen.js b/src/containers/settings/InviteScreen.js
new file mode 100644
index 000000000..5f341b1b3
--- /dev/null
+++ b/src/containers/settings/InviteScreen.js
@@ -0,0 +1,44 @@
+import React, { Component } from 'react';
+import PropTypes from 'prop-types';
+import { inject, observer } from 'mobx-react';
+
+import Invite from '../../components/auth/Invite';
+import { gaPage } from '../../lib/analytics';
+
+@inject('stores', 'actions') @observer
+export default class InviteScreen extends Component {
+  componentDidMount() {
+    gaPage('Settings/Invite');
+  }
+
+  componentWillUnmount() {
+    this.props.stores.user.inviteRequest.reset();
+  }
+
+  render() {
+    const { actions } = this.props;
+    const { user } = this.props.stores;
+
+    return (
+      <Invite
+        onSubmit={actions.user.invite}
+        isLoadingInvite={user.inviteRequest.isExecuting}
+        isInviteSuccessful={user.inviteRequest.wasExecuted && !user.inviteRequest.isError}
+        embed
+      />
+    );
+  }
+}
+
+InviteScreen.wrappedComponent.propTypes = {
+  actions: PropTypes.shape({
+    user: PropTypes.shape({
+      invite: PropTypes.func.isRequired,
+    }).isRequired,
+  }).isRequired,
+  stores: PropTypes.shape({
+    user: PropTypes.shape({
+      inviteRequest: PropTypes.object,
+    }).isRequired,
+  }).isRequired,
+};