Merge branch 'master' into develop

1 files changed, 16 insertions, 6 deletions

diff --git a/src/components/ui/ActivateTrialButton/index.js b/src/components/ui/ActivateTrialButton/index.js
index c3e5f4a6f..e0637da90 100644
--- a/src/components/ui/ActivateTrialButton/index.js
+++ b/src/components/ui/ActivateTrialButton/index.js
@@ -26,13 +26,23 @@ const messages = defineMessages({
     id: 'feature.delayApp.trial.actionShort',
     defaultMessage: '!!!Activate the free Franz Professional trial',
   },
+  noStringsAttachedHeadline: {
+    id: 'pricing.trial.terms.headline',
+    defaultMessage: '!!!No strings attached',
+  },
+  noCreditCard: {
+    id: 'pricing.trial.terms.noCreditCard',
+    defaultMessage: '!!!No credit card required',
+  },
+  automaticTrialEnd: {
+    id: 'pricing.trial.terms.automaticTrialEnd',
+    defaultMessage: '!!!Your free trial ends automatically after 14 days',
+  },
 });
 
 @inject('stores', 'actions') @observer
 class ActivateTrialButton extends Component {
   static propTypes = {
-    // eslint-disable-next-line
-    classes: PropTypes.object.isRequired,
     className: PropTypes.string,
     short: PropTypes.bool,
     gaEventInfo: PropTypes.shape({
@@ -55,19 +65,19 @@ class ActivateTrialButton extends Component {
   handleCTAClick() {
     const { actions, stores, gaEventInfo } = this.props;
     const { hadSubscription } = stores.user.data;
-    const { defaultTrialPlan } = stores.features.features;
+    // const { defaultTrialPlan } = stores.features.features;
 
     let label = '';
     if (!hadSubscription) {
-      actions.user.activateTrial({ planId: defaultTrialPlan });
+      // actions.user.activateTrial({ planId: defaultTrialPlan });
 
       label = 'Start Trial';
     } else {
-      actions.ui.openSettings({ path: 'user' });
-
       label = 'Upgrade Account';
     }
 
+    actions.ui.openSettings({ path: 'user' });
+
     if (gaEventInfo) {
       const { category, event } = gaEventInfo;
       gaEvent(category, event, label);