Merge branch 'master' into develop

4 files changed, 62 insertions, 7 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 14787bffc..4ba50e0a9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,9 @@
+## [5.3.1](https://github.com/meetfranz/franz/compare/v5.3.0...v5.3.1) (2019-09-06)
+
+### Features
+
+* **App:** Add second confirmation step for the free 14 day trial.
+
 # [5.3.0](https://github.com/meetfranz/franz/compare/v5.2.1-beta.1...v5.3.0) (2019-09-06)
 
 ### Features
diff --git a/package.json b/package.json
index 2a415e361..980242e5f 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
   "name": "franz",
   "productName": "Franz",
   "appId": "com.meetfranz.franz",
-  "version": "5.3.0",
+  "version": "5.3.1",
   "description": "Messaging app for WhatsApp, Slack, Telegram, HipChat, Hangouts and many many more.",
   "copyright": "adlk x franz - Stefan Malzner",
   "main": "index.js",
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);
diff --git a/src/i18n/messages/src/components/ui/ActivateTrialButton/index.json b/src/i18n/messages/src/components/ui/ActivateTrialButton/index.json
index 08c1a9293..fd969da78 100644
--- a/src/i18n/messages/src/components/ui/ActivateTrialButton/index.json
+++ b/src/i18n/messages/src/components/ui/ActivateTrialButton/index.json
@@ -50,5 +50,44 @@
       "line": 28,
       "column": 3
     }
+  },
+  {
+    "id": "pricing.trial.terms.headline",
+    "defaultMessage": "!!!No strings attached",
+    "file": "src/components/ui/ActivateTrialButton/index.js",
+    "start": {
+      "line": 29,
+      "column": 29
+    },
+    "end": {
+      "line": 32,
+      "column": 3
+    }
+  },
+  {
+    "id": "pricing.trial.terms.noCreditCard",
+    "defaultMessage": "!!!No credit card required",
+    "file": "src/components/ui/ActivateTrialButton/index.js",
+    "start": {
+      "line": 33,
+      "column": 16
+    },
+    "end": {
+      "line": 36,
+      "column": 3
+    }
+  },
+  {
+    "id": "pricing.trial.terms.automaticTrialEnd",
+    "defaultMessage": "!!!Your free trial ends automatically after 14 days",
+    "file": "src/components/ui/ActivateTrialButton/index.js",
+    "start": {
+      "line": 37,
+      "column": 21
+    },
+    "end": {
+      "line": 40,
+      "column": 3
+    }
   }
 ]
\ No newline at end of file