From 65b0912c4595b0b3cfad0f1d19255f70ba2bc48a Mon Sep 17 00:00:00 2001
From: Stefan Malzner <stefan@adlk.io>
Date: Mon, 14 Oct 2019 13:59:48 +0200
Subject: Move checkout to in app instead of external handling

---
 src/containers/settings/AccountScreen.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'src/containers/settings/AccountScreen.js')

diff --git a/src/containers/settings/AccountScreen.js b/src/containers/settings/AccountScreen.js
index 9c74cf2ab..b0354c86b 100644
--- a/src/containers/settings/AccountScreen.js
+++ b/src/containers/settings/AccountScreen.js
@@ -5,6 +5,7 @@ import { inject, observer } from 'mobx-react';
 import PaymentStore from '../../stores/PaymentStore';
 import UserStore from '../../stores/UserStore';
 import AppStore from '../../stores/AppStore';
+import FeaturesStore from '../../stores/FeaturesStore';
 
 import AccountDashboard from '../../components/settings/account/AccountDashboard';
 import ErrorBoundary from '../../components/util/ErrorBoundary';
@@ -12,8 +13,9 @@ import { WEBSITE } from '../../environment';
 
 export default @inject('stores', 'actions') @observer class AccountScreen extends Component {
   onCloseWindow() {
-    const { user } = this.props.stores;
+    const { user, features } = this.props.stores;
     user.getUserInfoRequest.invalidate({ immediately: true });
+    features.featuresRequest.invalidate({ immediately: true });
   }
 
   reloadData() {
@@ -65,6 +67,7 @@ export default @inject('stores', 'actions') @observer class AccountScreen extend
 AccountScreen.wrappedComponent.propTypes = {
   stores: PropTypes.shape({
     user: PropTypes.instanceOf(UserStore).isRequired,
+    features: PropTypes.instanceOf(FeaturesStore).isRequired,
     payment: PropTypes.instanceOf(PaymentStore).isRequired,
     app: PropTypes.instanceOf(AppStore).isRequired,
   }).isRequired,
-- 
cgit v1.2.3-70-g09d2


From 86b692b8e6c9710f216b17a04d96a815a8715387 Mon Sep 17 00:00:00 2001
From: Stefan Malzner <stefan@adlk.io>
Date: Wed, 16 Oct 2019 22:24:40 +0200
Subject: polishing

---
 src/components/settings/account/AccountDashboard.js            | 8 +++++---
 src/containers/settings/AccountScreen.js                       | 7 +++++--
 src/features/trialStatusBar/containers/TrialStatusBarScreen.js | 2 --
 3 files changed, 10 insertions(+), 7 deletions(-)

(limited to 'src/containers/settings/AccountScreen.js')

diff --git a/src/components/settings/account/AccountDashboard.js b/src/components/settings/account/AccountDashboard.js
index 776a8fd08..b4ff072ab 100644
--- a/src/components/settings/account/AccountDashboard.js
+++ b/src/components/settings/account/AccountDashboard.js
@@ -242,14 +242,16 @@ class AccountDashboard extends Component {
                             </p>
                           </>
                         )}
-                        <div className="manage-user-links">
-                          {!isProUser && (
+                        {!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"
diff --git a/src/containers/settings/AccountScreen.js b/src/containers/settings/AccountScreen.js
index b0354c86b..b08b52e6f 100644
--- a/src/containers/settings/AccountScreen.js
+++ b/src/containers/settings/AccountScreen.js
@@ -34,12 +34,14 @@ export default @inject('stores', 'actions') @observer class AccountScreen extend
   }
 
   render() {
-    const { user, payment } = this.props.stores;
+    const { user, payment, features } = this.props.stores;
     const { user: userActions } = this.props.actions;
 
     const isLoadingUserInfo = user.getUserInfoRequest.isExecuting;
     const isLoadingPlans = payment.plansRequest.isExecuting;
 
+    const { upgradeAccount } = payment;
+
     return (
       <ErrorBoundary>
         <AccountDashboard
@@ -55,7 +57,7 @@ export default @inject('stores', 'actions') @observer class AccountScreen extend
           isLoadingDeleteAccount={user.deleteAccountRequest.isExecuting}
           isDeleteAccountSuccessful={user.deleteAccountRequest.wasExecuted && !user.deleteAccountRequest.isError}
           openEditAccount={() => this.handleWebsiteLink('/user/profile')}
-          upgradeToPro={() => this.handleWebsiteLink('/inapp/user/licenses')}
+          upgradeToPro={() => upgradeAccount({ planId: features.features.pricingConfig.pro.yearly.id })}
           openBilling={() => this.handleWebsiteLink('/user/billing')}
           openInvoices={() => this.handleWebsiteLink('/user/invoices')}
         />
@@ -74,6 +76,7 @@ AccountScreen.wrappedComponent.propTypes = {
   actions: PropTypes.shape({
     payment: PropTypes.shape({
       createDashboardUrl: PropTypes.func.isRequired,
+      upgradeAccount: PropTypes.func.isRequired,
     }).isRequired,
     app: PropTypes.shape({
       openExternalUrl: PropTypes.func.isRequired,
diff --git a/src/features/trialStatusBar/containers/TrialStatusBarScreen.js b/src/features/trialStatusBar/containers/TrialStatusBarScreen.js
index eb0aafaea..15201496b 100644
--- a/src/features/trialStatusBar/containers/TrialStatusBarScreen.js
+++ b/src/features/trialStatusBar/containers/TrialStatusBarScreen.js
@@ -67,8 +67,6 @@ class TrialStatusBarScreen extends Component {
     const { user } = this.props.stores;
     const { upgradeAccount } = this.props.actions.payment;
 
-    console.log('hasEnded', hasEnded);
-
     return (
       <ErrorBoundary>
         <TrialStatusBar
-- 
cgit v1.2.3-70-g09d2


From ab78d8ad9097ce92eae337f319245819ba93ca40 Mon Sep 17 00:00:00 2001
From: Stefan Malzner <stefan@adlk.io>
Date: Thu, 17 Oct 2019 10:58:45 +0200
Subject: polishing

---
 packages/theme/src/themes/default/index.ts                       | 9 +++++----
 src/containers/settings/AccountScreen.js                         | 9 ++++++---
 src/features/planSelection/components/PlanSelection.js           | 4 +++-
 src/i18n/locales/en-US.json                                      | 4 ++--
 .../src/features/planSelection/components/PlanSelection.json     | 2 +-
 5 files changed, 17 insertions(+), 11 deletions(-)

(limited to 'src/containers/settings/AccountScreen.js')

diff --git a/packages/theme/src/themes/default/index.ts b/packages/theme/src/themes/default/index.ts
index b484d9972..3decec88f 100644
--- a/packages/theme/src/themes/default/index.ts
+++ b/packages/theme/src/themes/default/index.ts
@@ -1,6 +1,7 @@
 import color from 'color';
 import { cloneDeep } from 'lodash';
 
+import { darkgreen } from 'color-name';
 import * as legacyStyles from '../legacy';
 
 export interface IStyleTypes {
@@ -224,7 +225,7 @@ export const signup = {
 // Todos
 export const todos = {
   todosLayer: {
-    borderLeftColor: legacyStyles.themeGrayLighter,
+    borderLeftColor: color(legacyStyles.themeGrayLighter).darken(0.1).hex(),
   },
   toggleButton: {
     background: styleTypes.primary.accent,
@@ -242,10 +243,10 @@ export const todos = {
 // TrialStatusBar
 export const trialStatusBar = {
   bar: {
-    background: legacyStyles.themeGray,
+    background: legacyStyles.themeGrayLightest,
   },
   progressBar: {
-    background: legacyStyles.themeGrayLight,
-    progressIndicator: legacyStyles.themeGrayLighter,
+    background: color(legacyStyles.themeGrayLighter).darken(0.1).hex(),
+    progressIndicator: legacyStyles.themeGrayLight,
   },
 };
diff --git a/src/containers/settings/AccountScreen.js b/src/containers/settings/AccountScreen.js
index b08b52e6f..88ecd55d5 100644
--- a/src/containers/settings/AccountScreen.js
+++ b/src/containers/settings/AccountScreen.js
@@ -35,12 +35,15 @@ export default @inject('stores', 'actions') @observer class AccountScreen extend
 
   render() {
     const { user, payment, features } = this.props.stores;
-    const { user: userActions } = this.props.actions;
+    const {
+      user: userActions,
+      payment: paymentActions,
+    } = this.props.actions;
 
     const isLoadingUserInfo = user.getUserInfoRequest.isExecuting;
     const isLoadingPlans = payment.plansRequest.isExecuting;
 
-    const { upgradeAccount } = payment;
+    const { upgradeAccount } = paymentActions;
 
     return (
       <ErrorBoundary>
@@ -57,7 +60,7 @@ export default @inject('stores', 'actions') @observer class AccountScreen extend
           isLoadingDeleteAccount={user.deleteAccountRequest.isExecuting}
           isDeleteAccountSuccessful={user.deleteAccountRequest.wasExecuted && !user.deleteAccountRequest.isError}
           openEditAccount={() => this.handleWebsiteLink('/user/profile')}
-          upgradeToPro={() => upgradeAccount({ planId: features.features.pricingConfig.pro.yearly.id })}
+          upgradeToPro={() => upgradeAccount({ planId: features.features.pricingConfig.plans.pro.yearly.id })}
           openBilling={() => this.handleWebsiteLink('/user/billing')}
           openInvoices={() => this.handleWebsiteLink('/user/invoices')}
         />
diff --git a/src/features/planSelection/components/PlanSelection.js b/src/features/planSelection/components/PlanSelection.js
index cf4474114..9407f6dd3 100644
--- a/src/features/planSelection/components/PlanSelection.js
+++ b/src/features/planSelection/components/PlanSelection.js
@@ -16,7 +16,7 @@ import Appear from '../../../components/ui/effects/Appear';
 const messages = defineMessages({
   welcome: {
     id: 'feature.planSelection.fullscreen.welcome',
-    defaultMessage: '!!!Welcome back, {name}',
+    defaultMessage: '!!!Are you ready to choose, {name}',
   },
   subheadline: {
     id: 'feature.planSelection.fullscreen.subheadline',
@@ -83,6 +83,7 @@ const styles = theme => ({
 
     '& h1, & h2': {
       textAlign: 'center',
+      color: theme.styleTypes.primary.contrast,
     },
   },
   plans: {
@@ -111,6 +112,7 @@ const styles = theme => ({
     '& svg': {
       width: '80px !important',
       filter: 'drop-shadow( 0px 2px 3px rgba(0, 0, 0, 0.3))',
+      fill: theme.styleTypes.danger.contrast,
     },
   },
   headline: {
diff --git a/src/i18n/locales/en-US.json b/src/i18n/locales/en-US.json
index ce35c29a8..8af42554b 100644
--- a/src/i18n/locales/en-US.json
+++ b/src/i18n/locales/en-US.json
@@ -21,7 +21,7 @@
   "feature.planSelection.fullscreen.dialog.message": "You're about to downgrade to our Free account. Are you sure? Click here instead to get more services and functionality for just {currency}{price} a month.",
   "feature.planSelection.fullscreen.dialog.title": "Downgrade your Franz Plan",
   "feature.planSelection.fullscreen.subheadline": "It's time to make a choice. Franz works best on our Personal and Professional plans. Please have a look and choose the best one for you.",
-  "feature.planSelection.fullscreen.welcome": "Welcome back, {name}",
+  "feature.planSelection.fullscreen.welcome": "Are you ready to choose, {name}?",
   "feature.planSelection.personal.text": "More services, no waiting - ideal for personal use.",
   "feature.planSelection.pro.text": "Unlimited services and professional features for you - and your team.",
   "feature.serviceLimit.limitReached": "You have added {amount} out of {limit} services that are included in your plan. Please upgrade your account to add more services.",
@@ -422,4 +422,4 @@
   "workspaceDrawer.workspaceFeatureInfo": "<p>Franz Workspaces let you focus on what’s important right now. Set up different sets of services and easily switch between them at any time.</p><p>You decide which services you need when and where, so we can help you stay on top of your game - or easily switch off from work whenever you want.</p>",
   "workspaceDrawer.workspacesSettingsTooltip": "Edit workspaces settings",
   "workspaces.switchingIndicator.switchingTo": "Switching to"
-}
\ No newline at end of file
+}
diff --git a/src/i18n/messages/src/features/planSelection/components/PlanSelection.json b/src/i18n/messages/src/features/planSelection/components/PlanSelection.json
index 76f4ed50b..2e66c8dfe 100644
--- a/src/i18n/messages/src/features/planSelection/components/PlanSelection.json
+++ b/src/i18n/messages/src/features/planSelection/components/PlanSelection.json
@@ -1,7 +1,7 @@
 [
   {
     "id": "feature.planSelection.fullscreen.welcome",
-    "defaultMessage": "!!!Welcome back, {name}",
+    "defaultMessage": "!!!Are you ready to choose, {name}",
     "file": "src/features/planSelection/components/PlanSelection.js",
     "start": {
       "line": 17,
-- 
cgit v1.2.3-70-g09d2