Fix merge bugs

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 {
   }
 
   async activateTrial(data) {
-    const request = await sendAuthRequest(`${API_URL}/payment/trial`, {
+    const request = await sendAuthRequest(`${apiBase()}/payment/trial`, {
       method: 'POST',
       body: JSON.stringify(data),
     });
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 {
       areRequiredRequestsSuccessful,
       retryRequiredRequests,
       areRequiredRequestsLoading,
-      isDelayAppScreenVisible,
       hasActivatedTrial,
     } = this.props;
 
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 {
   };
 
   handleCTAClick() {
-    const { actions, stores } = this.props;
-    const { hadSubscription } = stores.user.data;
-    // const { defaultTrialPlan } = stores.features.features;
-
-    let label = '';
-    if (!hadSubscription) {
-      // actions.user.activateTrial({ planId: defaultTrialPlan });
-
-      label = 'Start Trial';
-    } else {
-      label = 'Upgrade Account';
-    }
+    const { actions } = this.props;
 
     actions.ui.openSettings({ path: 'user' });
   }
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 {
       accelerator: `${cmdKey}+T`,
       click: () => {
         todoActions.toggleTodosPanel();
-        gaEvent(GA_CATEGORY_TODOS, 'toggleDrawer', 'menu');
       },
       enabled: this.stores.user.isLoggedIn,
     }, {