1 files changed, 18 insertions, 141 deletions

diff --git a/src/components/settings/account/AccountDashboard.js b/src/components/settings/account/AccountDashboard.js
index 68d88e218..ef7748343 100644
--- a/src/components/settings/account/AccountDashboard.js
+++ b/src/components/settings/account/AccountDashboard.js
@@ -3,14 +3,11 @@ import PropTypes from 'prop-types';
 import { observer, PropTypes as MobxPropTypes } from 'mobx-react';
 import { defineMessages, intlShape } from 'react-intl';
 import ReactTooltip from 'react-tooltip';
-import { ProBadge, H1, H2 } from '@meetfranz/ui';
-import moment from 'moment';
+import { H1, H2 } from '@meetfranz/ui';
 
 import Loader from '../../ui/Loader';
 import Button from '../../ui/Button';
 import Infobox from '../../ui/Infobox';
-import SubscriptionForm from '../../../containers/subscription/SubscriptionFormScreen';
-import { i18nPlanName } from '../../../helpers/plan-helpers';
 import { LOCAL_SERVER, LIVE_FRANZ_API } from '../../../config';
 
 const messages = defineMessages({
@@ -18,30 +15,10 @@ const messages = defineMessages({
     id: 'settings.account.headline',
     defaultMessage: '!!!Account',
   },
-  headlineSubscription: {
-    id: 'settings.account.headlineSubscription',
-    defaultMessage: '!!!Your Subscription',
-  },
   headlineDangerZone: {
     id: 'settings.account.headlineDangerZone',
     defaultMessage: '!!Danger Zone',
   },
-  manageSubscriptionButtonLabel: {
-    id: 'settings.account.manageSubscription.label',
-    defaultMessage: '!!!Manage your subscription',
-  },
-  upgradeAccountToPro: {
-    id: 'settings.account.upgradeToPro.label',
-    defaultMessage: '!!!Upgrade to Franz Professional',
-  },
-  accountTypeBasic: {
-    id: 'settings.account.accountType.basic',
-    defaultMessage: '!!!Basic Account',
-  },
-  accountTypePremium: {
-    id: 'settings.account.accountType.premium',
-    defaultMessage: '!!!Premium Supporter Account',
-  },
   accountEditButton: {
     id: 'settings.account.account.editButton',
     defaultMessage: '!!!Edit Account',
@@ -50,10 +27,6 @@ const messages = defineMessages({
     id: 'settings.account.headlineInvoices',
     defaultMessage: '!!Invoices',
   },
-  invoiceDownload: {
-    id: 'settings.account.invoiceDownload',
-    defaultMessage: '!!!Download',
-  },
   userInfoRequestFailed: {
     id: 'settings.account.userInfoRequestFailed',
     defaultMessage: '!!!Could not load user information',
@@ -76,23 +49,10 @@ const messages = defineMessages({
     defaultMessage:
       '!!!You have received an email with a link to confirm your account deletion. Your account and data cannot be restored!',
   },
-  trial: {
-    id: 'settings.account.trial',
-    defaultMessage: '!!!Free Trial',
-  },
   yourLicense: {
     id: 'settings.account.yourLicense',
     defaultMessage: '!!!Your Franz License:',
   },
-  trialEndsIn: {
-    id: 'settings.account.trialEndsIn',
-    defaultMessage: '!!!Your free trial ends in {duration}.',
-  },
-  trialUpdateBillingInformation: {
-    id: 'settings.account.trialUpdateBillingInfo',
-    defaultMessage:
-      '!!!Please update your billing info to continue using {license} after your trial period.',
-  },
   accountUnavailable: {
     id: 'settings.account.accountUnavailable',
     defaultMessage: 'Account is unavailable',
@@ -107,8 +67,6 @@ const messages = defineMessages({
 class AccountDashboard extends Component {
   static propTypes = {
     user: MobxPropTypes.observableObject.isRequired,
-    isPremiumOverrideUser: PropTypes.bool.isRequired,
-    isProUser: PropTypes.bool.isRequired,
     isLoading: PropTypes.bool.isRequired,
     userInfoRequestFailed: PropTypes.bool.isRequired,
     retryUserInfoRequest: PropTypes.func.isRequired,
@@ -116,10 +74,7 @@ class AccountDashboard extends Component {
     isLoadingDeleteAccount: PropTypes.bool.isRequired,
     isDeleteAccountSuccessful: PropTypes.bool.isRequired,
     openEditAccount: PropTypes.func.isRequired,
-    openBilling: PropTypes.func.isRequired,
-    upgradeToPro: PropTypes.func.isRequired,
     openInvoices: PropTypes.func.isRequired,
-    onCloseSubscriptionWindow: PropTypes.func.isRequired,
     server: PropTypes.string.isRequired,
   };
 
@@ -130,8 +85,6 @@ class AccountDashboard extends Component {
   render() {
     const {
       user,
-      isPremiumOverrideUser,
-      isProUser,
       isLoading,
       userInfoRequestFailed,
       retryUserInfoRequest,
@@ -139,20 +92,11 @@ class AccountDashboard extends Component {
       isLoadingDeleteAccount,
       isDeleteAccountSuccessful,
       openEditAccount,
-      openBilling,
-      upgradeToPro,
       openInvoices,
-      onCloseSubscriptionWindow,
       server,
     } = this.props;
     const { intl } = this.context;
 
-    let planName = '';
-
-    if (user.team && user.team.plan) {
-      planName = i18nPlanName(user.team.plan, intl);
-    }
-
     const isUsingWithoutAccount = server === LOCAL_SERVER;
     const isUsingFranzServer = server === LIVE_FRANZ_API;
 
@@ -210,98 +154,40 @@ class AccountDashboard extends Component {
                           <div className="account__info">
                             <H1>
                               <span className="username">{`${user.firstname} ${user.lastname}`}</span>
-                              {user.isPremium && (
-                                <>
-                                  {' '}
-                                  <ProBadge />
-                                </>
-                              )}
                             </H1>
                             <p>
                               {user.organization && `${user.organization}, `}
                               {user.email}
                             </p>
-                            {user.isPremium && (
-                              <div className="manage-user-links">
-                                <Button
-                                  label={intl.formatMessage(
-                                    messages.accountEditButton,
-                                  )}
-                                  className="franz-form__button--inverted"
-                                  onClick={openEditAccount}
-                                />
-                              </div>
-                            )}
+                            <div className="manage-user-links">
+                              <Button
+                                label={intl.formatMessage(
+                                  messages.accountEditButton,
+                                )}
+                                className="franz-form__button--inverted"
+                                onClick={openEditAccount}
+                              />
+                            </div>
                           </div>
-                          {!user.isPremium && (
-                            <Button
-                              label={intl.formatMessage(
-                                messages.accountEditButton,
-                              )}
-                              className="franz-form__button--inverted"
-                              onClick={openEditAccount}
-                            />
-                          )}
+                          <Button
+                            label={intl.formatMessage(
+                              messages.accountEditButton,
+                            )}
+                            className="franz-form__button--inverted"
+                            onClick={openEditAccount}
+                          />
                         </div>
                       </div>
-                      {user.isPremium && user.isSubscriptionOwner && isUsingFranzServer && (
+                      {user.isSubscriptionOwner && isUsingFranzServer && (
                         <div className="account">
                           <div className="account__box">
                             <H2>{intl.formatMessage(messages.yourLicense)}</H2>
                             <p>
                               Franz
-                              {' '}
-                              {isPremiumOverrideUser ? 'Premium' : planName}
-                              {user.team.isTrial && (
-                                <>
-                                  {' – '}
-                                  {intl.formatMessage(messages.trial)}
-                                </>
-                              )}
                             </p>
-                            {user.team.isTrial && (
-                              <>
-                                <br />
-                                <p>
-                                  {intl.formatMessage(messages.trialEndsIn, {
-                                    duration: moment
-                                      .duration(
-                                        moment().diff(user.team.trialEnd),
-                                      )
-                                      .humanize(),
-                                  })}
-                                </p>
-                                <p>
-                                  {intl.formatMessage(
-                                    messages.trialUpdateBillingInformation,
-                                    {
-                                      license: planName,
-                                    },
-                                  )}
-                                </p>
-                              </>
-                            )}
-                            {!isProUser && (
-                              <div className="manage-user-links">
-                                <Button
-                                  label={intl.formatMessage(
-                                    messages.upgradeAccountToPro,
-                                  )}
-                                  className="franz-form__button--primary"
-                                  onClick={upgradeToPro}
-                                />
-                              </div>
-                            )}
                             <div className="manage-user-links">
                               <Button
                                 label={intl.formatMessage(
-                                  messages.manageSubscriptionButtonLabel,
-                                )}
-                                className="franz-form__button--inverted"
-                                onClick={openBilling}
-                              />
-                              <Button
-                                label={intl.formatMessage(
                                   messages.invoicesButton,
                                 )}
                                 className="franz-form__button--inverted"
@@ -311,15 +197,6 @@ class AccountDashboard extends Component {
                           </div>
                         </div>
                       )}
-                      {!user.isPremium && (
-                        <div className="account franz-form">
-                          <div className="account__box">
-                            <SubscriptionForm
-                              onCloseWindow={onCloseSubscriptionWindow}
-                            />
-                          </div>
-                        </div>
-                      )}
                     </>
                   )}