Merge pull request #587 from meetfranz/feature/remove-miner

[PR] Remove mining feature to get access to premium features

2 files changed, 23 insertions, 44 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/ui/SubscriptionFormScreen.js b/src/containers/ui/SubscriptionFormScreen.js
index d08507809..ac4593670 100644
--- a/src/containers/ui/SubscriptionFormScreen.js
+++ b/src/containers/ui/SubscriptionFormScreen.js
@@ -34,47 +34,36 @@ export default class SubscriptionFormScreen extends Component {
       actions,
       stores,
       onCloseWindow,
-      skipAction,
     } = this.props;
 
-    if (plan !== 'mining') {
-      const interval = plan;
-
-      const { id } = stores.payment.plan[interval];
-      actions.payment.createHostedPage({
-        planId: id,
-      });
+    const interval = plan;
 
-      const hostedPage = await stores.payment.createHostedPageRequest;
-      const url = `file://${__dirname}/../../index.html#/payment/${encodeURIComponent(hostedPage.url)}`;
+    const { id } = stores.payment.plan[interval];
+    actions.payment.createHostedPage({
+      planId: id,
+    });
 
-      if (hostedPage.url) {
-        const paymentWindow = new BrowserWindow({
-          parent: remote.getCurrentWindow(),
-          modal: true,
-          title: '🔒 Franz Supporter License',
-          width: 600,
-          height: window.innerHeight - 100,
-          maxWidth: 600,
-          minWidth: 600,
-          webPreferences: {
-            nodeIntegration: true,
-          },
-        });
-        paymentWindow.loadURL(url);
+    const hostedPage = await stores.payment.createHostedPageRequest;
+    const url = `file://${__dirname}/../../index.html#/payment/${encodeURIComponent(hostedPage.url)}`;
 
-        paymentWindow.on('closed', () => {
-          onCloseWindow();
-        });
-      }
-    } else {
-      actions.user.update({
-        userData: {
-          isMiner: true,
+    if (hostedPage.url) {
+      const paymentWindow = new BrowserWindow({
+        parent: remote.getCurrentWindow(),
+        modal: true,
+        title: '🔒 Franz Supporter License',
+        width: 600,
+        height: window.innerHeight - 100,
+        maxWidth: 600,
+        minWidth: 600,
+        webPreferences: {
+          nodeIntegration: true,
         },
       });
+      paymentWindow.loadURL(url);
 
-      skipAction();
+      paymentWindow.on('closed', () => {
+        onCloseWindow();
+      });
     }
   }