diff options
author | Stefan Malzner <stefan@adlk.io> | 2019-09-07 00:53:14 +0200 |
---|---|---|
committer | Stefan Malzner <stefan@adlk.io> | 2019-09-07 00:53:14 +0200 |
commit | be914b698fc7bd586040df677d9f58b26e21ce22 (patch) | |
tree | deea46d51a13391b12267ff3bd85834b7b59cb69 /src | |
parent | feat(Todos): Add option to disable todos (diff) | |
parent | fix linting issues (diff) | |
download | ferdium-app-be914b698fc7bd586040df677d9f58b26e21ce22.tar.gz ferdium-app-be914b698fc7bd586040df677d9f58b26e21ce22.tar.zst ferdium-app-be914b698fc7bd586040df677d9f58b26e21ce22.zip |
Merge branch 'master' into develop
Diffstat (limited to 'src')
-rw-r--r-- | src/components/ui/ActivateTrialButton/index.js | 22 | ||||
-rw-r--r-- | src/i18n/messages/src/components/ui/ActivateTrialButton/index.json | 39 |
2 files changed, 55 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({ | |||
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 |