diff options
author | 2019-09-07 15:53:51 +0200 | |
---|---|---|
committer | 2019-09-07 15:53:51 +0200 | |
commit | 728c3ea49ac0d7d5df11869a3c7ebf715e528330 (patch) | |
tree | 024b015eeee6783bb260d6104bc69ad83f1666ec | |
parent | Remove analytics (diff) | |
download | ferdium-app-728c3ea49ac0d7d5df11869a3c7ebf715e528330.tar.gz ferdium-app-728c3ea49ac0d7d5df11869a3c7ebf715e528330.tar.zst ferdium-app-728c3ea49ac0d7d5df11869a3c7ebf715e528330.zip |
Fix merge bugs
-rw-r--r-- | src/api/server/ServerApi.js | 2 | ||||
-rw-r--r-- | src/components/layout/AppLayout.js | 1 | ||||
-rw-r--r-- | src/components/ui/ActivateTrialButton/index.js | 13 | ||||
-rw-r--r-- | src/lib/Menu.js | 1 |
4 files changed, 2 insertions, 15 deletions
diff --git a/src/api/server/ServerApi.js b/src/api/server/ServerApi.js index 293fcda26..d83c6e15b 100644 --- a/src/api/server/ServerApi.js +++ b/src/api/server/ServerApi.js | |||
@@ -77,7 +77,7 @@ export default class ServerApi { | |||
77 | } | 77 | } |
78 | 78 | ||
79 | async activateTrial(data) { | 79 | async activateTrial(data) { |
80 | const request = await sendAuthRequest(`${API_URL}/payment/trial`, { | 80 | const request = await sendAuthRequest(`${apiBase()}/payment/trial`, { |
81 | method: 'POST', | 81 | method: 'POST', |
82 | body: JSON.stringify(data), | 82 | body: JSON.stringify(data), |
83 | }); | 83 | }); |
diff --git a/src/components/layout/AppLayout.js b/src/components/layout/AppLayout.js index ed004d07e..c1979ff10 100644 --- a/src/components/layout/AppLayout.js +++ b/src/components/layout/AppLayout.js | |||
@@ -107,7 +107,6 @@ class AppLayout extends Component { | |||
107 | areRequiredRequestsSuccessful, | 107 | areRequiredRequestsSuccessful, |
108 | retryRequiredRequests, | 108 | retryRequiredRequests, |
109 | areRequiredRequestsLoading, | 109 | areRequiredRequestsLoading, |
110 | isDelayAppScreenVisible, | ||
111 | hasActivatedTrial, | 110 | hasActivatedTrial, |
112 | } = this.props; | 111 | } = this.props; |
113 | 112 | ||
diff --git a/src/components/ui/ActivateTrialButton/index.js b/src/components/ui/ActivateTrialButton/index.js index a9d9be75a..340123c2f 100644 --- a/src/components/ui/ActivateTrialButton/index.js +++ b/src/components/ui/ActivateTrialButton/index.js | |||
@@ -62,18 +62,7 @@ class ActivateTrialButton extends Component { | |||
62 | }; | 62 | }; |
63 | 63 | ||
64 | handleCTAClick() { | 64 | handleCTAClick() { |
65 | const { actions, stores } = this.props; | 65 | const { actions } = this.props; |
66 | const { hadSubscription } = stores.user.data; | ||
67 | // const { defaultTrialPlan } = stores.features.features; | ||
68 | |||
69 | let label = ''; | ||
70 | if (!hadSubscription) { | ||
71 | // actions.user.activateTrial({ planId: defaultTrialPlan }); | ||
72 | |||
73 | label = 'Start Trial'; | ||
74 | } else { | ||
75 | label = 'Upgrade Account'; | ||
76 | } | ||
77 | 66 | ||
78 | actions.ui.openSettings({ path: 'user' }); | 67 | actions.ui.openSettings({ path: 'user' }); |
79 | } | 68 | } |
diff --git a/src/lib/Menu.js b/src/lib/Menu.js index 13b31bcad..6bc739e55 100644 --- a/src/lib/Menu.js +++ b/src/lib/Menu.js | |||
@@ -935,7 +935,6 @@ export default class FranzMenu { | |||
935 | accelerator: `${cmdKey}+T`, | 935 | accelerator: `${cmdKey}+T`, |
936 | click: () => { | 936 | click: () => { |
937 | todoActions.toggleTodosPanel(); | 937 | todoActions.toggleTodosPanel(); |
938 | gaEvent(GA_CATEGORY_TODOS, 'toggleDrawer', 'menu'); | ||
939 | }, | 938 | }, |
940 | enabled: this.stores.user.isLoggedIn, | 939 | enabled: this.stores.user.isLoggedIn, |
941 | }, { | 940 | }, { |