diff options
author | Stefan Malzner <stefan@adlk.io> | 2019-10-16 15:16:26 +0200 |
---|---|---|
committer | Stefan Malzner <stefan@adlk.io> | 2019-10-16 15:16:26 +0200 |
commit | 0b08e1e7e6a07acd21af71fd27f4c4acfa34dbba (patch) | |
tree | 9ee5b287f3c0451012153cf281659159597d63e7 /src/features/planSelection/containers/PlanSelectionScreen.js | |
parent | polishing (diff) | |
download | ferdium-app-0b08e1e7e6a07acd21af71fd27f4c4acfa34dbba.tar.gz ferdium-app-0b08e1e7e6a07acd21af71fd27f4c4acfa34dbba.tar.zst ferdium-app-0b08e1e7e6a07acd21af71fd27f4c4acfa34dbba.zip |
Add trialStatusBar & polishing
Diffstat (limited to 'src/features/planSelection/containers/PlanSelectionScreen.js')
-rw-r--r-- | src/features/planSelection/containers/PlanSelectionScreen.js | 13 |
1 files changed, 6 insertions, 7 deletions
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 { | |||
43 | } | 43 | } |
44 | 44 | ||
45 | upgradeAccount(planId) { | 45 | upgradeAccount(planId) { |
46 | const { upgradeAccount, hideOverlay } = this.props.actions.planSelection; | 46 | const { upgradeAccount } = this.props.actions.payment; |
47 | 47 | ||
48 | upgradeAccount({ | 48 | upgradeAccount({ |
49 | planId, | 49 | planId, |
50 | onCloseWindow: () => { | ||
51 | hideOverlay(); | ||
52 | }, | ||
53 | }); | 50 | }); |
54 | } | 51 | } |
55 | 52 | ||
@@ -63,7 +60,7 @@ class PlanSelectionScreen extends Component { | |||
63 | const { user, features } = this.props.stores; | 60 | const { user, features } = this.props.stores; |
64 | const { plans, currency } = features.features.pricingConfig; | 61 | const { plans, currency } = features.features.pricingConfig; |
65 | const { activateTrial } = this.props.actions.user; | 62 | const { activateTrial } = this.props.actions.user; |
66 | const { upgradeAccount, downgradeAccount, hideOverlay } = this.props.actions.planSelection; | 63 | const { downgradeAccount, hideOverlay } = this.props.actions.planSelection; |
67 | 64 | ||
68 | return ( | 65 | return ( |
69 | <ErrorBoundary> | 66 | <ErrorBoundary> |
@@ -102,7 +99,7 @@ class PlanSelectionScreen extends Component { | |||
102 | downgradeAccount(); | 99 | downgradeAccount(); |
103 | hideOverlay(); | 100 | hideOverlay(); |
104 | } else { | 101 | } else { |
105 | upgradeAccount(plans.personal.yearly.id); | 102 | this.upgradeAccount(plans.personal.yearly.id); |
106 | 103 | ||
107 | gaEvent(GA_CATEGORY_PLAN_SELECTION, 'SelectPlan', 'Revoke'); | 104 | gaEvent(GA_CATEGORY_PLAN_SELECTION, 'SelectPlan', 'Revoke'); |
108 | } | 105 | } |
@@ -123,8 +120,10 @@ PlanSelectionScreen.wrappedComponent.propTypes = { | |||
123 | user: PropTypes.instanceOf(UserStore).isRequired, | 120 | user: PropTypes.instanceOf(UserStore).isRequired, |
124 | }).isRequired, | 121 | }).isRequired, |
125 | actions: PropTypes.shape({ | 122 | actions: PropTypes.shape({ |
126 | planSelection: PropTypes.shape({ | 123 | payment: PropTypes.shape({ |
127 | upgradeAccount: PropTypes.func.isRequired, | 124 | upgradeAccount: PropTypes.func.isRequired, |
125 | }), | ||
126 | planSelection: PropTypes.shape({ | ||
128 | downgradeAccount: PropTypes.func.isRequired, | 127 | downgradeAccount: PropTypes.func.isRequired, |
129 | hideOverlay: PropTypes.func.isRequired, | 128 | hideOverlay: PropTypes.func.isRequired, |
130 | }), | 129 | }), |