From 478b5fc6574765072eafd4fa074ae832e67627bf Mon Sep 17 00:00:00 2001
From: Stefan Malzner <stefan@adlk.io>
Date: Mon, 19 Aug 2019 12:11:38 +0200
Subject: Add trial / subscription handling

---
 .../settings/account/AccountDashboard.js           |  12 +-
 src/components/settings/team/TeamDashboard.js      |  10 +-
 src/components/subscription/SubscriptionForm.js    |  52 ++--
 src/components/subscription/SubscriptionPopup.js   |   6 +-
 src/components/subscription/TrialForm.js           |  99 ++++++
 .../subscription/SubscriptionFormScreen.js         |  83 ++----
 .../subscription/SubscriptionPopupScreen.js        |   3 +-
 src/features/workspaces/store.js                   |   4 +-
 src/i18n/locales/defaultMessages.json              | 332 ++++++++-------------
 src/i18n/locales/en-US.json                        |  26 +-
 .../settings/account/AccountDashboard.json         |  77 ++---
 .../components/subscription/SubscriptionForm.json  |  51 ++--
 .../src/components/subscription/TrialForm.json     |  80 +++++
 src/stores/UserStore.js                            |   2 -
 14 files changed, 423 insertions(+), 414 deletions(-)
 create mode 100644 src/components/subscription/TrialForm.js
 create mode 100644 src/i18n/messages/src/components/subscription/TrialForm.json

diff --git a/src/components/settings/account/AccountDashboard.js b/src/components/settings/account/AccountDashboard.js
index 079d50380..6d10487e8 100644
--- a/src/components/settings/account/AccountDashboard.js
+++ b/src/components/settings/account/AccountDashboard.js
@@ -23,10 +23,6 @@ const messages = defineMessages({
     id: 'settings.account.headlineSubscription',
     defaultMessage: '!!!Your Subscription',
   },
-  headlineUpgrade: {
-    id: 'settings.account.headlineTrialUpgrade',
-    defaultMessage: '!!!Get the free 14 day Franz Professional Trial',
-  },
   headlineDangerZone: {
     id: 'settings.account.headlineDangerZone',
     defaultMessage: '!!Danger Zone',
@@ -97,10 +93,8 @@ export default @observer class AccountDashboard extends Component {
   static propTypes = {
     user: MobxPropTypes.observableObject.isRequired,
     isLoading: PropTypes.bool.isRequired,
-    isLoadingPlans: PropTypes.bool.isRequired,
     userInfoRequestFailed: PropTypes.bool.isRequired,
     retryUserInfoRequest: PropTypes.func.isRequired,
-    onCloseSubscriptionWindow: PropTypes.func.isRequired,
     deleteAccount: PropTypes.func.isRequired,
     isLoadingDeleteAccount: PropTypes.bool.isRequired,
     isDeleteAccountSuccessful: PropTypes.bool.isRequired,
@@ -117,10 +111,8 @@ export default @observer class AccountDashboard extends Component {
     const {
       user,
       isLoading,
-      isLoadingPlans,
       userInfoRequestFailed,
       retryUserInfoRequest,
-      onCloseSubscriptionWindow,
       deleteAccount,
       isLoadingDeleteAccount,
       isDeleteAccountSuccessful,
@@ -134,7 +126,6 @@ export default @observer class AccountDashboard extends Component {
 
     if (user.team && user.team.plan) {
       planName = i18nPlanName(user.team.plan, intl);
-      console.log(planName);
     }
 
     return (
@@ -221,7 +212,7 @@ export default @observer class AccountDashboard extends Component {
                       )}
                     </div>
                   </div>
-                  {user.isSubscriptionOwner && (
+                  {user.isPremium && user.isSubscriptionOwner && (
                     <div className="account">
                       <div className="account__box">
                         <H2>
@@ -268,7 +259,6 @@ export default @observer class AccountDashboard extends Component {
                   {!user.isPremium && (
                     <div className="account franz-form">
                       <div className="account__box">
-                        <H2>{intl.formatMessage(messages.headlineUpgrade)}</H2>
                         <SubscriptionForm />
                       </div>
                     </div>
diff --git a/src/components/settings/team/TeamDashboard.js b/src/components/settings/team/TeamDashboard.js
index 82c517fcb..990ee52e7 100644
--- a/src/components/settings/team/TeamDashboard.js
+++ b/src/components/settings/team/TeamDashboard.js
@@ -133,13 +133,13 @@ export default @injectSheet(styles) @observer class TeamDashboard extends Compon
                         </div>
                         <img className={classes.image} src="https://cdn.franzinfra.com/announcements/assets/teams.png" alt="Franz for Teams" />
                       </div>
-                      <Button
-                        label={intl.formatMessage(messages.manageButton)}
-                        onClick={openTeamManagement}
-                        className={classes.cta}
-                      />
                     </>
                   </PremiumFeatureContainer>
+                  <Button
+                    label={intl.formatMessage(messages.manageButton)}
+                    onClick={openTeamManagement}
+                    className={classes.cta}
+                  />
                 </>
               )}
             </>
diff --git a/src/components/subscription/SubscriptionForm.js b/src/components/subscription/SubscriptionForm.js
index 0c630f047..641368734 100644
--- a/src/components/subscription/SubscriptionForm.js
+++ b/src/components/subscription/SubscriptionForm.js
@@ -1,35 +1,30 @@
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import { observer } from 'mobx-react';
-import { defineMessages, intlShape } from 'react-intl';
+import { defineMessages, intlShape, IntlProvider } from 'react-intl';
 import injectSheet from 'react-jss';
 
-import { H3 } from '@meetfranz/ui';
+import { H3, H2 } from '@meetfranz/ui';
 
 import { Button } from '@meetfranz/forms';
 import { FeatureList } from '../ui/FeatureList';
-import { FeatureItem } from '../ui/FeatureItem';
 
 const messages = defineMessages({
   submitButtonLabel: {
-    id: 'subscription.cta.activateTrial',
-    defaultMessage: '!!!Yes, upgrade my account to Franz Professional',
+    id: 'subscription.cta.choosePlan',
+    defaultMessage: '!!!Choose your plan',
   },
-  includedFeatures: {
-    id: 'subscription.includedProFeatures',
-    defaultMessage: '!!!The Franz Professional Plan includes:',
-  },
-  noStringsAttachedHeadline: {
-    id: 'pricing.trial.terms.headline',
-    defaultMessage: '!!!No strings attached',
+  teaserHeadline: {
+    id: 'settings.account.headlineUpgradeAccount',
+    defaultMessage: '!!!Upgrade your account and get the full Franz experience',
   },
-  noCreditCard: {
-    id: 'pricing.trial.terms.noCreditCard',
-    defaultMessage: '!!!No credit card required',
+  teaserText: {
+    id: 'subscription.teaser.intro',
+    defaultMessage: '!!!Franz 5 comes with a wide range of new features to boost up your everyday communication - batteries included. Check out our new plans and find out which one suits you most!',
   },
-  automaticTrialEnd: {
-    id: 'pricing.trial.terms.automaticTrialEnd',
-    defaultMessage: '!!!Your free trial ends automatically after 14 days',
+  includedFeatures: {
+    id: 'subscription.teaser.includedFeatures',
+    defaultMessage: '!!!Paid Franz Plans include:',
   },
 });
 
@@ -37,14 +32,11 @@ const styles = () => ({
   activateTrialButton: {
     margin: [40, 0, 50],
   },
-  keyTerms: {
-    marginTop: 20,
-  },
 });
 
 export default @observer @injectSheet(styles) class SubscriptionForm extends Component {
   static propTypes = {
-    activateTrial: PropTypes.func.isRequired,
+    selectPlan: PropTypes.func.isRequired,
     isActivatingTrial: PropTypes.bool.isRequired,
     classes: PropTypes.object.isRequired,
   };
@@ -56,28 +48,20 @@ export default @observer @injectSheet(styles) class SubscriptionForm extends Com
   render() {
     const {
       isActivatingTrial,
-      activateTrial,
+      selectPlan,
       classes,
     } = this.props;
     const { intl } = this.context;
 
-    console.log('isActivatingTrial', isActivatingTrial);
-
     return (
       <>
-        <H3 className={classes.keyTerms}>
-          {intl.formatMessage(messages.noStringsAttachedHeadline)}
-        </H3>
-        <ul>
-          <FeatureItem icon="👉" name={intl.formatMessage(messages.noCreditCard)} />
-          <FeatureItem icon="👉" name={intl.formatMessage(messages.automaticTrialEnd)} />
-        </ul>
-
+        <H2>{intl.formatMessage(messages.teaserHeadline)}</H2>
+        <p>{intl.formatMessage(messages.teaserText)}</p>
         <Button
           label={intl.formatMessage(messages.submitButtonLabel)}
           className={classes.activateTrialButton}
           busy={isActivatingTrial}
-          onClick={activateTrial}
+          onClick={selectPlan}
           stretch
         />
         <div className="subscription__premium-info">
diff --git a/src/components/subscription/SubscriptionPopup.js b/src/components/subscription/SubscriptionPopup.js
index 0f6f0260f..9404e9c19 100644
--- a/src/components/subscription/SubscriptionPopup.js
+++ b/src/components/subscription/SubscriptionPopup.js
@@ -43,7 +43,7 @@ export default @observer class SubscriptionPopup extends Component {
 
     setTimeout(() => {
       this.props.closeWindow();
-    }, ms('4s'));
+    }, ms('1s'));
   }
 
   render() {
@@ -61,8 +61,8 @@ export default @observer class SubscriptionPopup extends Component {
             autosize
             src={encodeURI(url)}
             onDidNavigate={completeCheck}
-            // onNewWindow={(event, url, frameName, options) =>
-            //   openWindow({ event, url, frameName, options })}
+            // webpreferences="allowpopups"
+            // onNewWindow={(event, url, frameName, options) => console.log(event, url)}
           />
         </div>
         <div className="subscription-popup__toolbar franz-form">
diff --git a/src/components/subscription/TrialForm.js b/src/components/subscription/TrialForm.js
new file mode 100644
index 000000000..9c512b5f2
--- /dev/null
+++ b/src/components/subscription/TrialForm.js
@@ -0,0 +1,99 @@
+import React, { Component } from 'react';
+import PropTypes from 'prop-types';
+import { observer } from 'mobx-react';
+import { defineMessages, intlShape } from 'react-intl';
+import injectSheet from 'react-jss';
+
+import { H3, H2 } from '@meetfranz/ui';
+
+import { Button } from '@meetfranz/forms';
+import { FeatureList } from '../ui/FeatureList';
+import { FeatureItem } from '../ui/FeatureItem';
+
+const messages = defineMessages({
+  submitButtonLabel: {
+    id: 'subscription.cta.activateTrial',
+    defaultMessage: '!!!Yes, start the free Franz Professional trial',
+  },
+  teaserHeadline: {
+    id: 'settings.account.headlineTrialUpgrade',
+    defaultMessage: '!!!Get the free 14 day Franz Professional Trial',
+  },
+  includedFeatures: {
+    id: 'subscription.includedProFeatures',
+    defaultMessage: '!!!The Franz Professional Plan includes:',
+  },
+  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',
+  },
+});
+
+const styles = () => ({
+  activateTrialButton: {
+    margin: [40, 0, 50],
+  },
+  keyTerms: {
+    marginTop: 20,
+  },
+});
+
+export default @observer @injectSheet(styles) class TrialForm extends Component {
+  static propTypes = {
+    activateTrial: PropTypes.func.isRequired,
+    isActivatingTrial: PropTypes.bool.isRequired,
+    classes: PropTypes.object.isRequired,
+  };
+
+  static contextTypes = {
+    intl: intlShape,
+  };
+
+  render() {
+    const {
+      isActivatingTrial,
+      activateTrial,
+      classes,
+    } = this.props;
+    const { intl } = this.context;
+
+    console.log('isActivatingTrial', isActivatingTrial);
+
+    return (
+      <>
+        <H2>{intl.formatMessage(messages.teaserHeadline)}</H2>
+        <H3 className={classes.keyTerms}>
+          {intl.formatMessage(messages.noStringsAttachedHeadline)}
+        </H3>
+        <ul>
+          <FeatureItem icon="👉" name={intl.formatMessage(messages.noCreditCard)} />
+          <FeatureItem icon="👉" name={intl.formatMessage(messages.automaticTrialEnd)} />
+        </ul>
+
+        <Button
+          label={intl.formatMessage(messages.submitButtonLabel)}
+          className={classes.activateTrialButton}
+          busy={isActivatingTrial}
+          onClick={activateTrial}
+          stretch
+        />
+        <div className="subscription__premium-info">
+          <H3>
+            {intl.formatMessage(messages.includedFeatures)}
+          </H3>
+          <div className="subscription">
+            <FeatureList />
+          </div>
+        </div>
+      </>
+    );
+  }
+}
diff --git a/src/containers/subscription/SubscriptionFormScreen.js b/src/containers/subscription/SubscriptionFormScreen.js
index 7486cc498..587889e7f 100644
--- a/src/containers/subscription/SubscriptionFormScreen.js
+++ b/src/containers/subscription/SubscriptionFormScreen.js
@@ -1,4 +1,3 @@
-import { remote } from 'electron';
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import { inject, observer } from 'mobx-react';
@@ -6,70 +5,31 @@ import { inject, observer } from 'mobx-react';
 import PaymentStore from '../../stores/PaymentStore';
 
 import SubscriptionForm from '../../components/subscription/SubscriptionForm';
-
-const { BrowserWindow } = remote;
+import TrialForm from '../../components/subscription/TrialForm';
 
 export default @inject('stores', 'actions') @observer class SubscriptionFormScreen extends Component {
-  static propTypes = {
-    onCloseWindow: PropTypes.func,
-    content: PropTypes.node,
-    showSkipOption: PropTypes.bool,
-    skipAction: PropTypes.func,
-    skipButtonLabel: PropTypes.string,
-    hideInfo: PropTypes.bool,
-  }
-
-  static defaultProps = {
-    onCloseWindow: () => null,
-    content: '',
-    showSkipOption: false,
-    skipAction: () => null,
-    skipButtonLabel: '',
-    hideInfo: false,
-  }
-
-  async handlePayment(plan) {
+  async openBrowser() {
     const {
       actions,
       stores,
-      onCloseWindow,
     } = this.props;
 
-    const interval = plan;
+    const {
+      user,
+      features,
+    } = stores;
+
+    let hostedPageURL = user.data.hadSubscription ? features.features.planSelectionURL : features.features.subscribeURL;
+    const url = new URL(hostedPageURL);
+    const params = new URLSearchParams(url.search.slice(1));
 
-    const { id } = stores.payment.plan[interval];
-    actions.payment.createHostedPage({
-      planId: id,
-    });
+    params.append('authToken', user.authToken);
 
-    const hostedPage = await stores.payment.createHostedPageRequest;
+    hostedPageURL = `${url.origin}${url.pathname}?${params.toString()}`;
 
-    if (hostedPage.url) {
-      if (hostedPage.legacyCheckoutFlow) {
-        const paymentWindow = new BrowserWindow({
-          parent: remote.getCurrentWindow(),
-          modal: true,
-          title: '🔒 Franz Supporter License',
-          width: 600,
-          height: window.innerHeight - 100,
-          maxWidth: 600,
-          minWidth: 600,
-          webPreferences: {
-            nodeIntegration: true,
-            webviewTag: true,
-          },
-        });
-        paymentWindow.loadURL(`file://${__dirname}/../../index.html#/payment/${encodeURIComponent(hostedPage.url)}`);
+    actions.app.openExternalUrl({ url: hostedPageURL });
 
-        paymentWindow.on('closed', () => {
-          onCloseWindow();
-        });
-      } else {
-        actions.app.openExternalUrl({
-          url: hostedPage.url,
-        });
-      }
-    }
+    console.log('hostedPage', hostedPageURL);
   }
 
   render() {
@@ -77,8 +37,21 @@ export default @inject('stores', 'actions') @observer class SubscriptionFormScre
       actions,
       stores,
     } = this.props;
+
+    const { data: user } = stores.user;
+
+    if (user.hadSubscription) {
+      return (
+        <SubscriptionForm
+          plan={stores.payment.plan}
+          selectPlan={() => this.openBrowser()}
+          isActivatingTrial={stores.user.activateTrialRequest.isExecuting || stores.user.getUserInfoRequest.isExecuting}
+        />
+      );
+    }
+
     return (
-      <SubscriptionForm
+      <TrialForm
         plan={stores.payment.plan}
         activateTrial={() => actions.user.activateTrial({ planId: stores.features.features.defaultTrialPlan })}
         isActivatingTrial={stores.user.activateTrialRequest.isExecuting || stores.user.getUserInfoRequest.isExecuting}
diff --git a/src/containers/subscription/SubscriptionPopupScreen.js b/src/containers/subscription/SubscriptionPopupScreen.js
index f76d6c5a6..0de5a87c4 100644
--- a/src/containers/subscription/SubscriptionPopupScreen.js
+++ b/src/containers/subscription/SubscriptionPopupScreen.js
@@ -3,6 +3,7 @@ import PropTypes from 'prop-types';
 import { inject, observer } from 'mobx-react';
 
 import SubscriptionPopup from '../../components/subscription/SubscriptionPopup';
+import { isDevMode } from '../../environment';
 
 
 export default @inject('stores', 'actions') @observer class SubscriptionPopupScreen extends Component {
@@ -13,7 +14,7 @@ export default @inject('stores', 'actions') @observer class SubscriptionPopupScr
   completeCheck(event) {
     const { url } = event;
 
-    if ((url.includes('recurly') && url.includes('confirmation')) || (url.includes('meetfranz') && url.includes('success'))) {
+    if ((url.includes('recurly') && url.includes('confirmation')) || ((url.includes('meetfranz') || isDevMode) && url.includes('success'))) {
       this.setState({
         complete: true,
       });
diff --git a/src/features/workspaces/store.js b/src/features/workspaces/store.js
index caa73619e..e44569be9 100644
--- a/src/features/workspaces/store.js
+++ b/src/features/workspaces/store.js
@@ -256,8 +256,8 @@ export default class WorkspacesStore extends FeatureStore {
     const { features, user } = this.stores;
     const { isPremium } = user.data;
     const { isWorkspaceIncludedInCurrentPlan } = features.features;
-    this.isPremiumFeature = isWorkspaceIncludedInCurrentPlan;
-    this.isPremiumUpgradeRequired = isWorkspaceIncludedInCurrentPlan && !isPremium;
+    this.isPremiumFeature = !isWorkspaceIncludedInCurrentPlan;
+    this.isPremiumUpgradeRequired = !isWorkspaceIncludedInCurrentPlan && !isPremium;
   };
 
   _setWorkspaceBeingEditedReaction = () => {
diff --git a/src/i18n/locales/defaultMessages.json b/src/i18n/locales/defaultMessages.json
index bdb1def11..e3c50f259 100644
--- a/src/i18n/locales/defaultMessages.json
+++ b/src/i18n/locales/defaultMessages.json
@@ -1242,247 +1242,234 @@
         "defaultMessage": "!!!Account",
         "end": {
           "column": 3,
-          "line": 19
+          "line": 21
         },
         "file": "src/components/settings/account/AccountDashboard.js",
         "id": "settings.account.headline",
         "start": {
           "column": 12,
-          "line": 16
+          "line": 18
         }
       },
       {
         "defaultMessage": "!!!Your Subscription",
         "end": {
           "column": 3,
-          "line": 23
+          "line": 25
         },
         "file": "src/components/settings/account/AccountDashboard.js",
         "id": "settings.account.headlineSubscription",
         "start": {
           "column": 24,
-          "line": 20
-        }
-      },
-      {
-        "defaultMessage": "!!!Upgrade your Account",
-        "end": {
-          "column": 3,
-          "line": 27
-        },
-        "file": "src/components/settings/account/AccountDashboard.js",
-        "id": "settings.account.headlineUpgrade",
-        "start": {
-          "column": 19,
-          "line": 24
+          "line": 22
         }
       },
       {
         "defaultMessage": "!!Danger Zone",
         "end": {
           "column": 3,
-          "line": 31
+          "line": 29
         },
         "file": "src/components/settings/account/AccountDashboard.js",
         "id": "settings.account.headlineDangerZone",
         "start": {
           "column": 22,
-          "line": 28
+          "line": 26
         }
       },
       {
         "defaultMessage": "!!!Manage your subscription",
         "end": {
           "column": 3,
-          "line": 35
+          "line": 33
         },
         "file": "src/components/settings/account/AccountDashboard.js",
         "id": "settings.account.manageSubscription.label",
         "start": {
           "column": 33,
-          "line": 32
+          "line": 30
         }
       },
       {
         "defaultMessage": "!!!Basic Account",
         "end": {
           "column": 3,
-          "line": 39
+          "line": 37
         },
         "file": "src/components/settings/account/AccountDashboard.js",
         "id": "settings.account.accountType.basic",
         "start": {
           "column": 20,
-          "line": 36
+          "line": 34
         }
       },
       {
         "defaultMessage": "!!!Premium Supporter Account",
         "end": {
           "column": 3,
-          "line": 43
+          "line": 41
         },
         "file": "src/components/settings/account/AccountDashboard.js",
         "id": "settings.account.accountType.premium",
         "start": {
           "column": 22,
-          "line": 40
+          "line": 38
         }
       },
       {
         "defaultMessage": "!!!Edit Account",
         "end": {
           "column": 3,
-          "line": 47
+          "line": 45
         },
         "file": "src/components/settings/account/AccountDashboard.js",
         "id": "settings.account.account.editButton",
         "start": {
           "column": 21,
-          "line": 44
+          "line": 42
         }
       },
       {
         "defaultMessage": "!!Invoices",
         "end": {
           "column": 3,
-          "line": 51
+          "line": 49
         },
         "file": "src/components/settings/account/AccountDashboard.js",
         "id": "settings.account.headlineInvoices",
         "start": {
           "column": 18,
-          "line": 48
+          "line": 46
         }
       },
       {
         "defaultMessage": "!!!Download",
         "end": {
           "column": 3,
-          "line": 55
+          "line": 53
         },
         "file": "src/components/settings/account/AccountDashboard.js",
         "id": "settings.account.invoiceDownload",
         "start": {
           "column": 19,
-          "line": 52
+          "line": 50
         }
       },
       {
         "defaultMessage": "!!!Could not load user information",
         "end": {
           "column": 3,
-          "line": 59
+          "line": 57
         },
         "file": "src/components/settings/account/AccountDashboard.js",
         "id": "settings.account.userInfoRequestFailed",
         "start": {
           "column": 25,
-          "line": 56
+          "line": 54
         }
       },
       {
         "defaultMessage": "!!!Try again",
         "end": {
           "column": 3,
-          "line": 63
+          "line": 61
         },
         "file": "src/components/settings/account/AccountDashboard.js",
         "id": "settings.account.tryReloadUserInfoRequest",
         "start": {
           "column": 28,
-          "line": 60
+          "line": 58
         }
       },
       {
         "defaultMessage": "!!!Delete account",
         "end": {
           "column": 3,
-          "line": 67
+          "line": 65
         },
         "file": "src/components/settings/account/AccountDashboard.js",
         "id": "settings.account.deleteAccount",
         "start": {
           "column": 17,
-          "line": 64
+          "line": 62
         }
       },
       {
         "defaultMessage": "!!!If you don't need your Franz account any longer, you can delete your account and all related data here.",
         "end": {
           "column": 3,
-          "line": 71
+          "line": 69
         },
         "file": "src/components/settings/account/AccountDashboard.js",
         "id": "settings.account.deleteInfo",
         "start": {
           "column": 14,
-          "line": 68
+          "line": 66
         }
       },
       {
         "defaultMessage": "!!!You have received an email with a link to confirm your account deletion. Your account and data cannot be restored!",
         "end": {
           "column": 3,
-          "line": 75
+          "line": 73
         },
         "file": "src/components/settings/account/AccountDashboard.js",
         "id": "settings.account.deleteEmailSent",
         "start": {
           "column": 19,
-          "line": 72
+          "line": 70
         }
       },
       {
         "defaultMessage": "!!!Free Trial",
         "end": {
           "column": 3,
-          "line": 79
+          "line": 77
         },
         "file": "src/components/settings/account/AccountDashboard.js",
         "id": "settings.account.trial",
         "start": {
           "column": 9,
-          "line": 76
+          "line": 74
         }
       },
       {
         "defaultMessage": "!!!Your license:",
         "end": {
           "column": 3,
-          "line": 83
+          "line": 81
         },
         "file": "src/components/settings/account/AccountDashboard.js",
         "id": "settings.account.yourLicense",
         "start": {
           "column": 15,
-          "line": 80
+          "line": 78
         }
       },
       {
         "defaultMessage": "!!!Your free trial ends in {duration}.",
         "end": {
           "column": 3,
-          "line": 87
+          "line": 85
         },
         "file": "src/components/settings/account/AccountDashboard.js",
         "id": "settings.account.trialEndsIn",
         "start": {
           "column": 15,
-          "line": 84
+          "line": 82
         }
       },
       {
         "defaultMessage": "!!!Please update your billing info to continue using {license} after your trial period.",
         "end": {
           "column": 3,
-          "line": 91
+          "line": 89
         },
         "file": "src/components/settings/account/AccountDashboard.js",
         "id": "settings.account.trialUpdateBillingInfo",
         "start": {
           "column": 33,
-          "line": 88
+          "line": 86
         }
       }
     ],
@@ -2706,220 +2693,173 @@
   {
     "descriptors": [
       {
-        "defaultMessage": "!!!Support the development of Franz",
+        "defaultMessage": "!!!Choose your plan",
         "end": {
           "column": 3,
-          "line": 17
+          "line": 16
         },
         "file": "src/components/subscription/SubscriptionForm.js",
-        "id": "subscription.submit.label",
+        "id": "subscription.cta.choosePlan",
         "start": {
           "column": 21,
-          "line": 14
-        }
-      },
-      {
-        "defaultMessage": "!!!Could not initialize payment form",
-        "end": {
-          "column": 3,
-          "line": 21
-        },
-        "file": "src/components/subscription/SubscriptionForm.js",
-        "id": "subscription.paymentSessionError",
-        "start": {
-          "column": 23,
-          "line": 18
-        }
-      },
-      {
-        "defaultMessage": "!!!free",
-        "end": {
-          "column": 3,
-          "line": 25
-        },
-        "file": "src/components/subscription/SubscriptionForm.js",
-        "id": "subscription.type.free",
-        "start": {
-          "column": 12,
-          "line": 22
+          "line": 13
         }
       },
       {
-        "defaultMessage": "!!!month",
+        "defaultMessage": "!!!Upgrade your account and get the full Franz experience",
         "end": {
           "column": 3,
-          "line": 29
+          "line": 20
         },
         "file": "src/components/subscription/SubscriptionForm.js",
-        "id": "subscription.type.month",
+        "id": "settings.account.headlineUpgradeAccount",
         "start": {
-          "column": 15,
-          "line": 26
+          "column": 18,
+          "line": 17
         }
       },
       {
-        "defaultMessage": "!!!year",
+        "defaultMessage": "!!!Franz 5 comes with a wide range of new features to boost up your everyday communication - batteries included. Check out our new plans and find out which one suits you most!",
         "end": {
           "column": 3,
-          "line": 33
+          "line": 24
         },
         "file": "src/components/subscription/SubscriptionForm.js",
-        "id": "subscription.type.year",
+        "id": "subscription.teaser.intro",
         "start": {
           "column": 14,
-          "line": 30
+          "line": 21
         }
       },
       {
-        "defaultMessage": "!!!The Franz Premium Supporter Account includes",
+        "defaultMessage": "!!!Paid Franz Plans include:",
         "end": {
           "column": 3,
-          "line": 37
+          "line": 28
         },
         "file": "src/components/subscription/SubscriptionForm.js",
-        "id": "subscription.includedFeatures",
+        "id": "subscription.teaser.includedFeatures",
         "start": {
           "column": 20,
-          "line": 34
-        }
-      },
-      {
-        "defaultMessage": "!!!Add on-premise/hosted services like Mattermost",
-        "end": {
-          "column": 3,
-          "line": 41
-        },
-        "file": "src/components/subscription/SubscriptionForm.js",
-        "id": "subscription.features.onpremise.mattermost",
-        "start": {
-          "column": 13,
-          "line": 38
+          "line": 25
         }
-      },
+      }
+    ],
+    "path": "src/components/subscription/SubscriptionForm.json"
+  },
+  {
+    "descriptors": [
       {
-        "defaultMessage": "!!!No app delays & nagging to upgrade license",
+        "defaultMessage": "!!!Cancel",
         "end": {
           "column": 3,
-          "line": 45
+          "line": 14
         },
-        "file": "src/components/subscription/SubscriptionForm.js",
-        "id": "subscription.features.noInterruptions",
+        "file": "src/components/subscription/SubscriptionPopup.js",
+        "id": "subscriptionPopup.buttonCancel",
         "start": {
-          "column": 19,
-          "line": 42
+          "column": 16,
+          "line": 11
         }
       },
       {
-        "defaultMessage": "!!!Proxy support for services",
+        "defaultMessage": "!!!Done",
         "end": {
           "column": 3,
-          "line": 49
+          "line": 18
         },
-        "file": "src/components/subscription/SubscriptionForm.js",
-        "id": "subscription.features.proxy",
+        "file": "src/components/subscription/SubscriptionPopup.js",
+        "id": "subscriptionPopup.buttonDone",
         "start": {
-          "column": 9,
-          "line": 46
+          "column": 14,
+          "line": 15
         }
-      },
+      }
+    ],
+    "path": "src/components/subscription/SubscriptionPopup.json"
+  },
+  {
+    "descriptors": [
       {
-        "defaultMessage": "!!!Support for Spellchecker",
+        "defaultMessage": "!!!Yes, start the free Franz Professional trial",
         "end": {
           "column": 3,
-          "line": 53
+          "line": 17
         },
-        "file": "src/components/subscription/SubscriptionForm.js",
-        "id": "subscription.features.spellchecker",
+        "file": "src/components/subscription/TrialForm.js",
+        "id": "subscription.cta.activateTrial",
         "start": {
-          "column": 16,
-          "line": 50
+          "column": 21,
+          "line": 14
         }
       },
       {
-        "defaultMessage": "!!!Organize your services in workspaces",
+        "defaultMessage": "!!!Get the free 14 day Franz Professional Trial",
         "end": {
           "column": 3,
-          "line": 57
+          "line": 21
         },
-        "file": "src/components/subscription/SubscriptionForm.js",
-        "id": "subscription.features.workspaces",
+        "file": "src/components/subscription/TrialForm.js",
+        "id": "settings.account.headlineTrialUpgrade",
         "start": {
-          "column": 14,
-          "line": 54
+          "column": 18,
+          "line": 18
         }
       },
       {
-        "defaultMessage": "!!!No ads, ever!",
+        "defaultMessage": "!!!The Franz Professional Plan includes:",
         "end": {
           "column": 3,
-          "line": 61
+          "line": 25
         },
-        "file": "src/components/subscription/SubscriptionForm.js",
-        "id": "subscription.features.ads",
+        "file": "src/components/subscription/TrialForm.js",
+        "id": "subscription.includedProFeatures",
         "start": {
-          "column": 7,
-          "line": 58
+          "column": 20,
+          "line": 22
         }
       },
       {
-        "defaultMessage": "!!!coming soon",
+        "defaultMessage": "!!!No strings attached",
         "end": {
           "column": 3,
-          "line": 65
+          "line": 29
         },
-        "file": "src/components/subscription/SubscriptionForm.js",
-        "id": "subscription.features.comingSoon",
+        "file": "src/components/subscription/TrialForm.js",
+        "id": "pricing.trial.terms.headline",
         "start": {
-          "column": 14,
-          "line": 62
+          "column": 29,
+          "line": 26
         }
       },
       {
-        "defaultMessage": "!!!EU residents: local sales tax may apply",
-        "end": {
-          "column": 3,
-          "line": 69
-        },
-        "file": "src/components/subscription/SubscriptionForm.js",
-        "id": "subscription.euTaxInfo",
-        "start": {
-          "column": 13,
-          "line": 66
-        }
-      }
-    ],
-    "path": "src/components/subscription/SubscriptionForm.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "!!!Cancel",
+        "defaultMessage": "!!!No credit card required",
         "end": {
           "column": 3,
-          "line": 14
+          "line": 33
         },
-        "file": "src/components/subscription/SubscriptionPopup.js",
-        "id": "subscriptionPopup.buttonCancel",
+        "file": "src/components/subscription/TrialForm.js",
+        "id": "pricing.trial.terms.noCreditCard",
         "start": {
           "column": 16,
-          "line": 11
+          "line": 30
         }
       },
       {
-        "defaultMessage": "!!!Done",
+        "defaultMessage": "!!!Your free trial ends automatically after 14 days",
         "end": {
           "column": 3,
-          "line": 18
+          "line": 37
         },
-        "file": "src/components/subscription/SubscriptionPopup.js",
-        "id": "subscriptionPopup.buttonDone",
+        "file": "src/components/subscription/TrialForm.js",
+        "id": "pricing.trial.terms.automaticTrialEnd",
         "start": {
-          "column": 14,
-          "line": 15
+          "column": 21,
+          "line": 34
         }
       }
     ],
-    "path": "src/components/subscription/SubscriptionPopup.json"
+    "path": "src/components/subscription/TrialForm.json"
   },
   {
     "descriptors": [
@@ -4254,81 +4194,55 @@
   {
     "descriptors": [
       {
-        "defaultMessage": "!!!Franz Professional Yearly",
+        "defaultMessage": "!!!Franz Professional",
         "end": {
           "column": 3,
           "line": 8
         },
         "file": "src/helpers/plan-helpers.js",
-        "id": "pricing.plan.pro-yearly",
+        "id": "pricing.plan.pro",
         "start": {
-          "column": 22,
+          "column": 15,
           "line": 5
         }
       },
       {
-        "defaultMessage": "!!!Franz Professional Monthly",
+        "defaultMessage": "!!!Franz Personal",
         "end": {
           "column": 3,
           "line": 12
         },
         "file": "src/helpers/plan-helpers.js",
-        "id": "pricing.plan.pro-monthly",
+        "id": "pricing.plan.personal",
         "start": {
-          "column": 23,
+          "column": 20,
           "line": 9
         }
       },
-      {
-        "defaultMessage": "!!!Franz Personal Yearly",
-        "end": {
-          "column": 3,
-          "line": 16
-        },
-        "file": "src/helpers/plan-helpers.js",
-        "id": "pricing.plan.personal-yearly",
-        "start": {
-          "column": 27,
-          "line": 13
-        }
-      },
-      {
-        "defaultMessage": "!!!Franz Personal Monthly",
-        "end": {
-          "column": 3,
-          "line": 20
-        },
-        "file": "src/helpers/plan-helpers.js",
-        "id": "pricing.plan.personal-monthly",
-        "start": {
-          "column": 28,
-          "line": 17
-        }
-      },
       {
         "defaultMessage": "!!!Franz Free",
         "end": {
           "column": 3,
-          "line": 24
+          "line": 16
         },
         "file": "src/helpers/plan-helpers.js",
         "id": "pricing.plan.free",
         "start": {
           "column": 16,
-          "line": 21
+          "line": 13
         }
       },
       {
         "defaultMessage": "!!!Franz Premium",
         "end": {
           "column": 3,
-          "line": 28
+          "line": 20
         },
         "file": "src/helpers/plan-helpers.js",
         "id": "pricing.plan.legacy",
         "start": {
           "column": 18,
-          "line": 25
+          "line": 17
         }
       }
     ],
diff --git a/src/i18n/locales/en-US.json b/src/i18n/locales/en-US.json
index a4c828f92..57785b74a 100644
--- a/src/i18n/locales/en-US.json
+++ b/src/i18n/locales/en-US.json
@@ -123,7 +123,11 @@
   "pricing.plan.free": "Franz Free",
   "pricing.plan.legacy": "Franz Premium",
   "pricing.plan.personal": "Franz Personal",
+  "pricing.plan.personal-monthly": "Franz Personal Monthly",
+  "pricing.plan.personal-yearly": "Franz Personal Yearly",
   "pricing.plan.pro": "Franz Professional",
+  "pricing.plan.pro-monthly": "Franz Professional Monthly",
+  "pricing.plan.pro-yearly": "Franz Professional Yearly",
   "pricing.trial.cta.accept": "Yes, upgrade my account to Franz Professional",
   "pricing.trial.cta.skip": "Continue to Franz",
   "pricing.trial.error": "Sorry, we could not activate your trial!",
@@ -166,7 +170,8 @@
   "settings.account.headlinePassword": "Change password",
   "settings.account.headlineProfile": "Update profile",
   "settings.account.headlineSubscription": "Your subscription",
-  "settings.account.headlineUpgrade": "Upgrade your account & support Franz",
+  "settings.account.headlineTrialUpgrade": "Get the free 14 day Franz Professional Trial",
+  "settings.account.headlineUpgradeAccount": "Upgrade your account & get the full Franz experience",
   "settings.account.invoiceDownload": "Download",
   "settings.account.manageSubscription.label": "Manage your subscription",
   "settings.account.successInfo": "Your changes have been saved",
@@ -327,20 +332,11 @@
   "signup.link.login": "Already have an account, sign in?",
   "signup.password.label": "Password",
   "signup.submit.label": "Create account",
-  "subscription.euTaxInfo": "EU residents: local sales tax may apply",
-  "subscription.features.ads": "No ads, ever!",
-  "subscription.features.comingSoon": "coming soon",
-  "subscription.features.noInterruptions": "No app delays & nagging to upgrade license",
-  "subscription.features.onpremise.mattermost": "Add on-premise/hosted services like Mattermost",
-  "subscription.features.proxy": "Proxy support for services",
-  "subscription.features.spellchecker": "Support for spellchecker",
-  "subscription.features.workspaces": "Organize your services in workspaces",
-  "subscription.includedFeatures": "Paid Franz Premium Supporter Account includes",
-  "subscription.paymentSessionError": "Could not initialize payment form",
-  "subscription.submit.label": "I want to support the development of Franz",
-  "subscription.type.free": "free",
-  "subscription.type.month": "month",
-  "subscription.type.year": "year",
+  "subscription.cta.activateTrial": "Yes, start the free Franz Professional trial",
+  "subscription.cta.choosePlan": "Choose your plan",
+  "subscription.includedProFeatures": "The Franz Professional Plan includes:",
+  "subscription.teaser.includedFeatures": "Paid Franz Plans include:",
+  "subscription.teaser.intro": "Franz 5 comes with a wide range of new features to boost up your everyday communication - batteries included. Check out our new plans and find out which one suits you most!",
   "subscriptionPopup.buttonCancel": "Cancel",
   "subscriptionPopup.buttonDone": "Done",
   "tabs.item.deleteService": "Delete service",
diff --git a/src/i18n/messages/src/components/settings/account/AccountDashboard.json b/src/i18n/messages/src/components/settings/account/AccountDashboard.json
index 1e21bad69..68d3e6dd1 100644
--- a/src/i18n/messages/src/components/settings/account/AccountDashboard.json
+++ b/src/i18n/messages/src/components/settings/account/AccountDashboard.json
@@ -25,29 +25,16 @@
       "column": 3
     }
   },
-  {
-    "id": "settings.account.headlineTrialUpgrade",
-    "defaultMessage": "!!!Get the free 14 day Franz Professional Trial",
-    "file": "src/components/settings/account/AccountDashboard.js",
-    "start": {
-      "line": 26,
-      "column": 19
-    },
-    "end": {
-      "line": 29,
-      "column": 3
-    }
-  },
   {
     "id": "settings.account.headlineDangerZone",
     "defaultMessage": "!!Danger Zone",
     "file": "src/components/settings/account/AccountDashboard.js",
     "start": {
-      "line": 30,
+      "line": 26,
       "column": 22
     },
     "end": {
-      "line": 33,
+      "line": 29,
       "column": 3
     }
   },
@@ -56,11 +43,11 @@
     "defaultMessage": "!!!Manage your subscription",
     "file": "src/components/settings/account/AccountDashboard.js",
     "start": {
-      "line": 34,
+      "line": 30,
       "column": 33
     },
     "end": {
-      "line": 37,
+      "line": 33,
       "column": 3
     }
   },
@@ -69,11 +56,11 @@
     "defaultMessage": "!!!Basic Account",
     "file": "src/components/settings/account/AccountDashboard.js",
     "start": {
-      "line": 38,
+      "line": 34,
       "column": 20
     },
     "end": {
-      "line": 41,
+      "line": 37,
       "column": 3
     }
   },
@@ -82,11 +69,11 @@
     "defaultMessage": "!!!Premium Supporter Account",
     "file": "src/components/settings/account/AccountDashboard.js",
     "start": {
-      "line": 42,
+      "line": 38,
       "column": 22
     },
     "end": {
-      "line": 45,
+      "line": 41,
       "column": 3
     }
   },
@@ -95,11 +82,11 @@
     "defaultMessage": "!!!Edit Account",
     "file": "src/components/settings/account/AccountDashboard.js",
     "start": {
-      "line": 46,
+      "line": 42,
       "column": 21
     },
     "end": {
-      "line": 49,
+      "line": 45,
       "column": 3
     }
   },
@@ -108,11 +95,11 @@
     "defaultMessage": "!!Invoices",
     "file": "src/components/settings/account/AccountDashboard.js",
     "start": {
-      "line": 50,
+      "line": 46,
       "column": 18
     },
     "end": {
-      "line": 53,
+      "line": 49,
       "column": 3
     }
   },
@@ -121,11 +108,11 @@
     "defaultMessage": "!!!Download",
     "file": "src/components/settings/account/AccountDashboard.js",
     "start": {
-      "line": 54,
+      "line": 50,
       "column": 19
     },
     "end": {
-      "line": 57,
+      "line": 53,
       "column": 3
     }
   },
@@ -134,11 +121,11 @@
     "defaultMessage": "!!!Could not load user information",
     "file": "src/components/settings/account/AccountDashboard.js",
     "start": {
-      "line": 58,
+      "line": 54,
       "column": 25
     },
     "end": {
-      "line": 61,
+      "line": 57,
       "column": 3
     }
   },
@@ -147,11 +134,11 @@
     "defaultMessage": "!!!Try again",
     "file": "src/components/settings/account/AccountDashboard.js",
     "start": {
-      "line": 62,
+      "line": 58,
       "column": 28
     },
     "end": {
-      "line": 65,
+      "line": 61,
       "column": 3
     }
   },
@@ -160,11 +147,11 @@
     "defaultMessage": "!!!Delete account",
     "file": "src/components/settings/account/AccountDashboard.js",
     "start": {
-      "line": 66,
+      "line": 62,
       "column": 17
     },
     "end": {
-      "line": 69,
+      "line": 65,
       "column": 3
     }
   },
@@ -173,11 +160,11 @@
     "defaultMessage": "!!!If you don't need your Franz account any longer, you can delete your account and all related data here.",
     "file": "src/components/settings/account/AccountDashboard.js",
     "start": {
-      "line": 70,
+      "line": 66,
       "column": 14
     },
     "end": {
-      "line": 73,
+      "line": 69,
       "column": 3
     }
   },
@@ -186,11 +173,11 @@
     "defaultMessage": "!!!You have received an email with a link to confirm your account deletion. Your account and data cannot be restored!",
     "file": "src/components/settings/account/AccountDashboard.js",
     "start": {
-      "line": 74,
+      "line": 70,
       "column": 19
     },
     "end": {
-      "line": 77,
+      "line": 73,
       "column": 3
     }
   },
@@ -199,11 +186,11 @@
     "defaultMessage": "!!!Free Trial",
     "file": "src/components/settings/account/AccountDashboard.js",
     "start": {
-      "line": 78,
+      "line": 74,
       "column": 9
     },
     "end": {
-      "line": 81,
+      "line": 77,
       "column": 3
     }
   },
@@ -212,11 +199,11 @@
     "defaultMessage": "!!!Your license:",
     "file": "src/components/settings/account/AccountDashboard.js",
     "start": {
-      "line": 82,
+      "line": 78,
       "column": 15
     },
     "end": {
-      "line": 85,
+      "line": 81,
       "column": 3
     }
   },
@@ -225,11 +212,11 @@
     "defaultMessage": "!!!Your free trial ends in {duration}.",
     "file": "src/components/settings/account/AccountDashboard.js",
     "start": {
-      "line": 86,
+      "line": 82,
       "column": 15
     },
     "end": {
-      "line": 89,
+      "line": 85,
       "column": 3
     }
   },
@@ -238,11 +225,11 @@
     "defaultMessage": "!!!Please update your billing info to continue using {license} after your trial period.",
     "file": "src/components/settings/account/AccountDashboard.js",
     "start": {
-      "line": 90,
+      "line": 86,
       "column": 33
     },
     "end": {
-      "line": 93,
+      "line": 89,
       "column": 3
     }
   }
diff --git a/src/i18n/messages/src/components/subscription/SubscriptionForm.json b/src/i18n/messages/src/components/subscription/SubscriptionForm.json
index 224a78c4c..6d235254e 100644
--- a/src/i18n/messages/src/components/subscription/SubscriptionForm.json
+++ b/src/i18n/messages/src/components/subscription/SubscriptionForm.json
@@ -1,66 +1,53 @@
 [
   {
-    "id": "subscription.cta.activateTrial",
-    "defaultMessage": "!!!Yes, upgrade my account to Franz Professional",
+    "id": "subscription.cta.choosePlan",
+    "defaultMessage": "!!!Choose your plan",
     "file": "src/components/subscription/SubscriptionForm.js",
     "start": {
-      "line": 14,
+      "line": 13,
       "column": 21
     },
     "end": {
-      "line": 17,
+      "line": 16,
       "column": 3
     }
   },
   {
-    "id": "subscription.includedProFeatures",
-    "defaultMessage": "!!!The Franz Professional Plan includes:",
+    "id": "settings.account.headlineUpgradeAccount",
+    "defaultMessage": "!!!Upgrade your account and get the full Franz experience",
     "file": "src/components/subscription/SubscriptionForm.js",
     "start": {
-      "line": 18,
-      "column": 20
-    },
-    "end": {
-      "line": 21,
-      "column": 3
-    }
-  },
-  {
-    "id": "pricing.trial.terms.headline",
-    "defaultMessage": "!!!No strings attached",
-    "file": "src/components/subscription/SubscriptionForm.js",
-    "start": {
-      "line": 22,
-      "column": 29
+      "line": 17,
+      "column": 18
     },
     "end": {
-      "line": 25,
+      "line": 20,
       "column": 3
     }
   },
   {
-    "id": "pricing.trial.terms.noCreditCard",
-    "defaultMessage": "!!!No credit card required",
+    "id": "subscription.teaser.intro",
+    "defaultMessage": "!!!Franz 5 comes with a wide range of new features to boost up your everyday communication - batteries included. Check out our new plans and find out which one suits you most!",
     "file": "src/components/subscription/SubscriptionForm.js",
     "start": {
-      "line": 26,
-      "column": 16
+      "line": 21,
+      "column": 14
     },
     "end": {
-      "line": 29,
+      "line": 24,
       "column": 3
     }
   },
   {
-    "id": "pricing.trial.terms.automaticTrialEnd",
-    "defaultMessage": "!!!Your free trial ends automatically after 14 days",
+    "id": "subscription.teaser.includedFeatures",
+    "defaultMessage": "!!!Paid Franz Plans include:",
     "file": "src/components/subscription/SubscriptionForm.js",
     "start": {
-      "line": 30,
-      "column": 21
+      "line": 25,
+      "column": 20
     },
     "end": {
-      "line": 33,
+      "line": 28,
       "column": 3
     }
   }
diff --git a/src/i18n/messages/src/components/subscription/TrialForm.json b/src/i18n/messages/src/components/subscription/TrialForm.json
new file mode 100644
index 000000000..da1f01518
--- /dev/null
+++ b/src/i18n/messages/src/components/subscription/TrialForm.json
@@ -0,0 +1,80 @@
+[
+  {
+    "id": "subscription.cta.activateTrial",
+    "defaultMessage": "!!!Yes, start the free Franz Professional trial",
+    "file": "src/components/subscription/TrialForm.js",
+    "start": {
+      "line": 14,
+      "column": 21
+    },
+    "end": {
+      "line": 17,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.account.headlineTrialUpgrade",
+    "defaultMessage": "!!!Get the free 14 day Franz Professional Trial",
+    "file": "src/components/subscription/TrialForm.js",
+    "start": {
+      "line": 18,
+      "column": 18
+    },
+    "end": {
+      "line": 21,
+      "column": 3
+    }
+  },
+  {
+    "id": "subscription.includedProFeatures",
+    "defaultMessage": "!!!The Franz Professional Plan includes:",
+    "file": "src/components/subscription/TrialForm.js",
+    "start": {
+      "line": 22,
+      "column": 20
+    },
+    "end": {
+      "line": 25,
+      "column": 3
+    }
+  },
+  {
+    "id": "pricing.trial.terms.headline",
+    "defaultMessage": "!!!No strings attached",
+    "file": "src/components/subscription/TrialForm.js",
+    "start": {
+      "line": 26,
+      "column": 29
+    },
+    "end": {
+      "line": 29,
+      "column": 3
+    }
+  },
+  {
+    "id": "pricing.trial.terms.noCreditCard",
+    "defaultMessage": "!!!No credit card required",
+    "file": "src/components/subscription/TrialForm.js",
+    "start": {
+      "line": 30,
+      "column": 16
+    },
+    "end": {
+      "line": 33,
+      "column": 3
+    }
+  },
+  {
+    "id": "pricing.trial.terms.automaticTrialEnd",
+    "defaultMessage": "!!!Your free trial ends automatically after 14 days",
+    "file": "src/components/subscription/TrialForm.js",
+    "start": {
+      "line": 34,
+      "column": 21
+    },
+    "end": {
+      "line": 37,
+      "column": 3
+    }
+  }
+]
\ No newline at end of file
diff --git a/src/stores/UserStore.js b/src/stores/UserStore.js
index e7516e6e6..03679a163 100644
--- a/src/stores/UserStore.js
+++ b/src/stores/UserStore.js
@@ -350,8 +350,6 @@ export default class UserStore extends Store {
     if (this.hasActivatedTrial) {
       await sleep(ms('12s'));
 
-      console.log('resetting this.hasActivatedTrial', this.hasActivatedTrial);
-
       this.hasActivatedTrial = false;
     }
   }
-- 
cgit v1.2.3-54-g00ecf