4 files changed, 11 insertions, 48 deletions

diff --git a/src/features/planSelection/actions.js b/src/features/planSelection/actions.js
index 21aa38ace..83f58bfd7 100644
--- a/src/features/planSelection/actions.js
+++ b/src/features/planSelection/actions.js
@@ -2,10 +2,6 @@ import PropTypes from 'prop-types';
 import { createActionsFromDefinitions } from '../../actions/lib/actions';
 
 export const planSelectionActions = createActionsFromDefinitions({
-  upgradeAccount: {
-    planId: PropTypes.string.isRequired,
-    onCloseWindow: PropTypes.func.isRequired,
-  },
   downgradeAccount: {},
   hideOverlay: {},
 }, PropTypes.checkPropTypes);
diff --git a/src/features/planSelection/components/PlanSelection.js b/src/features/planSelection/components/PlanSelection.js
index 1a45cf035..cf4474114 100644
--- a/src/features/planSelection/components/PlanSelection.js
+++ b/src/features/planSelection/components/PlanSelection.js
@@ -205,7 +205,7 @@ class PlanSelection extends Component {
                 price={plans.pro.yearly.price}
                 currency={currency}
                 ctaLabel={intl.formatMessage(hadSubscription ? messages.shortActionPro : messages.actionTrial)}
-                upgrade={() => upgradeAccount(plans.personal.yearly.id)}
+                upgrade={() => upgradeAccount(plans.pro.yearly.id)}
                 className={classes.featuredPlan}
                 perUser
                 bestValue
diff --git a/src/features/planSelection/containers/PlanSelectionScreen.js b/src/features/planSelection/containers/PlanSelectionScreen.js
index dff9051d8..6e8cdbf47 100644
--- a/src/features/planSelection/containers/PlanSelectionScreen.js
+++ b/src/features/planSelection/containers/PlanSelectionScreen.js
@@ -43,13 +43,10 @@ class PlanSelectionScreen extends Component {
   }
 
   upgradeAccount(planId) {
-    const { upgradeAccount, hideOverlay } = this.props.actions.planSelection;
+    const { upgradeAccount } = this.props.actions.payment;
 
     upgradeAccount({
       planId,
-      onCloseWindow: () => {
-        hideOverlay();
-      },
     });
   }
 
@@ -63,7 +60,7 @@ class PlanSelectionScreen extends Component {
     const { user, features } = this.props.stores;
     const { plans, currency } = features.features.pricingConfig;
     const { activateTrial } = this.props.actions.user;
-    const { upgradeAccount, downgradeAccount, hideOverlay } = this.props.actions.planSelection;
+    const { downgradeAccount, hideOverlay } = this.props.actions.planSelection;
 
     return (
       <ErrorBoundary>
@@ -102,7 +99,7 @@ class PlanSelectionScreen extends Component {
               downgradeAccount();
               hideOverlay();
             } else {
-              upgradeAccount(plans.personal.yearly.id);
+              this.upgradeAccount(plans.personal.yearly.id);
 
               gaEvent(GA_CATEGORY_PLAN_SELECTION, 'SelectPlan', 'Revoke');
             }
@@ -123,8 +120,10 @@ PlanSelectionScreen.wrappedComponent.propTypes = {
     user: PropTypes.instanceOf(UserStore).isRequired,
   }).isRequired,
   actions: PropTypes.shape({
-    planSelection: PropTypes.shape({
+    payment: PropTypes.shape({
       upgradeAccount: PropTypes.func.isRequired,
+    }),
+    planSelection: PropTypes.shape({
       downgradeAccount: PropTypes.func.isRequired,
       hideOverlay: PropTypes.func.isRequired,
     }),
diff --git a/src/features/planSelection/store.js b/src/features/planSelection/store.js
index e229c37e5..0d4672722 100644
--- a/src/features/planSelection/store.js
+++ b/src/features/planSelection/store.js
@@ -42,7 +42,6 @@ export default class PlanSelectionStore extends FeatureStore {
     // ACTIONS
 
     this._registerActions(createActionBindings([
-      [planSelectionActions.upgradeAccount, this._upgradeAccount],
       [planSelectionActions.downgradeAccount, this._downgradeAccount],
       [planSelectionActions.hideOverlay, this._hideOverlay],
     ]));
@@ -64,47 +63,12 @@ export default class PlanSelectionStore extends FeatureStore {
   @action stop() {
     super.stop();
     debug('PlanSelectionStore::stop');
-    this.reset();
     this.isFeatureActive = false;
   }
 
   // ========== PRIVATE METHODS ========= //
 
   // Actions
-
-  @action _upgradeAccount = ({ planId, onCloseWindow = () => null }) => {
-    let hostedPageURL = this.stores.features.features.subscribeURL;
-
-    const parsedUrl = new URL(hostedPageURL);
-    const params = new URLSearchParams(parsedUrl.search.slice(1));
-
-    params.set('plan', planId);
-
-    hostedPageURL = this.stores.user.getAuthURL(`${parsedUrl.origin}${parsedUrl.pathname}?${params.toString()}`);
-
-    const win = new BrowserWindow({
-      parent: remote.getCurrentWindow(),
-      modal: true,
-      title: '🔒 Upgrade Your Franz Account',
-      width: 800,
-      height: window.innerHeight - 100,
-      maxWidth: 800,
-      minWidth: 600,
-      webPreferences: {
-        nodeIntegration: true,
-        webviewTag: true,
-      },
-    });
-    win.loadURL(`file://${__dirname}/../../index.html#/payment/${encodeURIComponent(hostedPageURL)}`);
-
-    win.on('closed', () => {
-      this.stores.user.getUserInfoRequest.invalidate({ immediately: true });
-      this.stores.features.featuresRequest.invalidate({ immediately: true });
-
-      onCloseWindow();
-    });
-  };
-
   @action _downgradeAccount = () => {
     downgradeUserRequest.execute();
   }
@@ -112,4 +76,8 @@ export default class PlanSelectionStore extends FeatureStore {
   @action _hideOverlay = () => {
     this.hideOverlay = true;
   }
+
+  @action _showOverlay = () => {
+    this.hideOverlay = false;
+  }
 }