diff options
-rw-r--r-- | CHANGELOG.md | 6 | ||||
-rw-r--r-- | package.json | 2 | ||||
-rw-r--r-- | src/components/ui/ActivateTrialButton/index.js | 22 | ||||
-rw-r--r-- | src/i18n/messages/src/components/ui/ActivateTrialButton/index.json | 39 |
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 @@ | |||
1 | ## [5.3.1](https://github.com/meetfranz/franz/compare/v5.3.0...v5.3.1) (2019-09-06) | ||
2 | |||
3 | ### Features | ||
4 | |||
5 | * **App:** Add second confirmation step for the free 14 day trial. | ||
6 | |||
1 | # [5.3.0](https://github.com/meetfranz/franz/compare/v5.2.1-beta.1...v5.3.0) (2019-09-06) | 7 | # [5.3.0](https://github.com/meetfranz/franz/compare/v5.2.1-beta.1...v5.3.0) (2019-09-06) |
2 | 8 | ||
3 | ### Features | 9 | ### Features |
diff --git a/package.json b/package.json index 2a415e361..980242e5f 100644 --- a/package.json +++ b/package.json | |||
@@ -2,7 +2,7 @@ | |||
2 | "name": "franz", | 2 | "name": "franz", |
3 | "productName": "Franz", | 3 | "productName": "Franz", |
4 | "appId": "com.meetfranz.franz", | 4 | "appId": "com.meetfranz.franz", |
5 | "version": "5.3.0", | 5 | "version": "5.3.1", |
6 | "description": "Messaging app for WhatsApp, Slack, Telegram, HipChat, Hangouts and many many more.", | 6 | "description": "Messaging app for WhatsApp, Slack, Telegram, HipChat, Hangouts and many many more.", |
7 | "copyright": "adlk x franz - Stefan Malzner", | 7 | "copyright": "adlk x franz - Stefan Malzner", |
8 | "main": "index.js", | 8 | "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({ | |||
26 | id: 'feature.delayApp.trial.actionShort', | 26 | id: 'feature.delayApp.trial.actionShort', |
27 | defaultMessage: '!!!Activate the free Franz Professional trial', | 27 | defaultMessage: '!!!Activate the free Franz Professional trial', |
28 | }, | 28 | }, |
29 | noStringsAttachedHeadline: { | ||
30 | id: 'pricing.trial.terms.headline', | ||
31 | defaultMessage: '!!!No strings attached', | ||
32 | }, | ||
33 | noCreditCard: { | ||
34 | id: 'pricing.trial.terms.noCreditCard', | ||
35 | defaultMessage: '!!!No credit card required', | ||
36 | }, | ||
37 | automaticTrialEnd: { | ||
38 | id: 'pricing.trial.terms.automaticTrialEnd', | ||
39 | defaultMessage: '!!!Your free trial ends automatically after 14 days', | ||
40 | }, | ||
29 | }); | 41 | }); |
30 | 42 | ||
31 | @inject('stores', 'actions') @observer | 43 | @inject('stores', 'actions') @observer |
32 | class ActivateTrialButton extends Component { | 44 | class ActivateTrialButton extends Component { |
33 | static propTypes = { | 45 | static propTypes = { |
34 | // eslint-disable-next-line | ||
35 | classes: PropTypes.object.isRequired, | ||
36 | className: PropTypes.string, | 46 | className: PropTypes.string, |
37 | short: PropTypes.bool, | 47 | short: PropTypes.bool, |
38 | gaEventInfo: PropTypes.shape({ | 48 | gaEventInfo: PropTypes.shape({ |
@@ -55,19 +65,19 @@ class ActivateTrialButton extends Component { | |||
55 | handleCTAClick() { | 65 | handleCTAClick() { |
56 | const { actions, stores, gaEventInfo } = this.props; | 66 | const { actions, stores, gaEventInfo } = this.props; |
57 | const { hadSubscription } = stores.user.data; | 67 | const { hadSubscription } = stores.user.data; |
58 | const { defaultTrialPlan } = stores.features.features; | 68 | // const { defaultTrialPlan } = stores.features.features; |
59 | 69 | ||
60 | let label = ''; | 70 | let label = ''; |
61 | if (!hadSubscription) { | 71 | if (!hadSubscription) { |
62 | actions.user.activateTrial({ planId: defaultTrialPlan }); | 72 | // actions.user.activateTrial({ planId: defaultTrialPlan }); |
63 | 73 | ||
64 | label = 'Start Trial'; | 74 | label = 'Start Trial'; |
65 | } else { | 75 | } else { |
66 | actions.ui.openSettings({ path: 'user' }); | ||
67 | |||
68 | label = 'Upgrade Account'; | 76 | label = 'Upgrade Account'; |
69 | } | 77 | } |
70 | 78 | ||
79 | actions.ui.openSettings({ path: 'user' }); | ||
80 | |||
71 | if (gaEventInfo) { | 81 | if (gaEventInfo) { |
72 | const { category, event } = gaEventInfo; | 82 | const { category, event } = gaEventInfo; |
73 | gaEvent(category, event, label); | 83 | 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 @@ | |||
50 | "line": 28, | 50 | "line": 28, |
51 | "column": 3 | 51 | "column": 3 |
52 | } | 52 | } |
53 | }, | ||
54 | { | ||
55 | "id": "pricing.trial.terms.headline", | ||
56 | "defaultMessage": "!!!No strings attached", | ||
57 | "file": "src/components/ui/ActivateTrialButton/index.js", | ||
58 | "start": { | ||
59 | "line": 29, | ||
60 | "column": 29 | ||
61 | }, | ||
62 | "end": { | ||
63 | "line": 32, | ||
64 | "column": 3 | ||
65 | } | ||
66 | }, | ||
67 | { | ||
68 | "id": "pricing.trial.terms.noCreditCard", | ||
69 | "defaultMessage": "!!!No credit card required", | ||
70 | "file": "src/components/ui/ActivateTrialButton/index.js", | ||
71 | "start": { | ||
72 | "line": 33, | ||
73 | "column": 16 | ||
74 | }, | ||
75 | "end": { | ||
76 | "line": 36, | ||
77 | "column": 3 | ||
78 | } | ||
79 | }, | ||
80 | { | ||
81 | "id": "pricing.trial.terms.automaticTrialEnd", | ||
82 | "defaultMessage": "!!!Your free trial ends automatically after 14 days", | ||
83 | "file": "src/components/ui/ActivateTrialButton/index.js", | ||
84 | "start": { | ||
85 | "line": 37, | ||
86 | "column": 21 | ||
87 | }, | ||
88 | "end": { | ||
89 | "line": 40, | ||
90 | "column": 3 | ||
91 | } | ||
53 | } | 92 | } |
54 | ] \ No newline at end of file | 93 | ] \ No newline at end of file |