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

---
 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 +-
 4 files changed, 12 insertions(+), 7 deletions(-)

(limited to 'src')

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-54-g00ecf