simplify plan selection

2 files changed, 399 insertions, 43 deletions

diff --git a/src/i18n/locales/defaultMessages.json b/src/i18n/locales/defaultMessages.json
index 703f800f9..210ea001a 100644
--- a/src/i18n/locales/defaultMessages.json
+++ b/src/i18n/locales/defaultMessages.json
@@ -430,7 +430,7 @@
         }
       },
       {
-        "defaultMessage": "!!!Your personal welcome offer:",
+        "defaultMessage": "!!!Here's a special welcome for you:",
         "end": {
           "column": 3,
           "line": 22
@@ -495,7 +495,7 @@
         }
       },
       {
-        "defaultMessage": "!!!Yes, upgrade my account to Franz Professional",
+        "defaultMessage": "!!!Start my 14-day Franz Professional Trial",
         "end": {
           "column": 3,
           "line": 42
@@ -721,39 +721,39 @@
         "defaultMessage": "!!!Your services have been updated.",
         "end": {
           "column": 3,
-          "line": 31
+          "line": 32
         },
         "file": "src/components/layout/AppLayout.js",
         "id": "infobar.servicesUpdated",
         "start": {
           "column": 19,
-          "line": 28
+          "line": 29
         }
       },
       {
         "defaultMessage": "!!!Reload services",
         "end": {
           "column": 3,
-          "line": 35
+          "line": 36
         },
         "file": "src/components/layout/AppLayout.js",
         "id": "infobar.buttonReloadServices",
         "start": {
           "column": 24,
-          "line": 32
+          "line": 33
         }
       },
       {
         "defaultMessage": "!!!Could not load services and user information",
         "end": {
           "column": 3,
-          "line": 39
+          "line": 40
         },
         "file": "src/components/layout/AppLayout.js",
         "id": "infobar.requiredRequestsFailed",
         "start": {
           "column": 26,
-          "line": 36
+          "line": 37
         }
       }
     ],
@@ -3017,133 +3017,198 @@
   {
     "descriptors": [
       {
+        "defaultMessage": "!!!Choose from more than 70 Services",
+        "end": {
+          "column": 3,
+          "line": 12
+        },
+        "file": "src/components/ui/FeatureList.js",
+        "id": "pricing.features.recipes",
+        "start": {
+          "column": 20,
+          "line": 9
+        }
+      },
+      {
+        "defaultMessage": "!!!Account Synchronisation",
+        "end": {
+          "column": 3,
+          "line": 16
+        },
+        "file": "src/components/ui/FeatureList.js",
+        "id": "pricing.features.accountSync",
+        "start": {
+          "column": 15,
+          "line": 13
+        }
+      },
+      {
+        "defaultMessage": "!!!Desktop Notifications",
+        "end": {
+          "column": 3,
+          "line": 20
+        },
+        "file": "src/components/ui/FeatureList.js",
+        "id": "pricing.features.desktopNotifications",
+        "start": {
+          "column": 24,
+          "line": 17
+        }
+      },
+      {
         "defaultMessage": "!!!Add unlimited services",
         "end": {
           "column": 3,
-          "line": 11
+          "line": 24
         },
         "file": "src/components/ui/FeatureList.js",
         "id": "pricing.features.unlimitedServices",
         "start": {
           "column": 21,
-          "line": 8
+          "line": 21
+        }
+      },
+      {
+        "defaultMessage": "!!!Add up to 3 services",
+        "end": {
+          "column": 3,
+          "line": 28
+        },
+        "file": "src/components/ui/FeatureList.js",
+        "id": "pricing.features.upToThreeServices",
+        "start": {
+          "column": 21,
+          "line": 25
+        }
+      },
+      {
+        "defaultMessage": "!!!Add up to 6 services",
+        "end": {
+          "column": 3,
+          "line": 32
+        },
+        "file": "src/components/ui/FeatureList.js",
+        "id": "pricing.features.upToSixServices",
+        "start": {
+          "column": 19,
+          "line": 29
         }
       },
       {
         "defaultMessage": "!!!Spellchecker support",
         "end": {
           "column": 3,
-          "line": 15
+          "line": 36
         },
         "file": "src/components/ui/FeatureList.js",
         "id": "pricing.features.spellchecker",
         "start": {
           "column": 16,
-          "line": 12
+          "line": 33
         }
       },
       {
         "defaultMessage": "!!!Workspaces",
         "end": {
           "column": 3,
-          "line": 19
+          "line": 40
         },
         "file": "src/components/ui/FeatureList.js",
         "id": "pricing.features.workspaces",
         "start": {
           "column": 14,
-          "line": 16
+          "line": 37
         }
       },
       {
         "defaultMessage": "!!!Add Custom Websites",
         "end": {
           "column": 3,
-          "line": 23
+          "line": 44
         },
         "file": "src/components/ui/FeatureList.js",
         "id": "pricing.features.customWebsites",
         "start": {
           "column": 18,
-          "line": 20
+          "line": 41
         }
       },
       {
         "defaultMessage": "!!!On-premise & other Hosted Services",
         "end": {
           "column": 3,
-          "line": 27
+          "line": 48
         },
         "file": "src/components/ui/FeatureList.js",
         "id": "pricing.features.onPremise",
         "start": {
           "column": 13,
-          "line": 24
+          "line": 45
         }
       },
       {
         "defaultMessage": "!!!Install 3rd party services",
         "end": {
           "column": 3,
-          "line": 31
+          "line": 52
         },
         "file": "src/components/ui/FeatureList.js",
         "id": "pricing.features.thirdPartyServices",
         "start": {
           "column": 22,
-          "line": 28
+          "line": 49
         }
       },
       {
         "defaultMessage": "!!!Service Proxies",
         "end": {
           "column": 3,
-          "line": 35
+          "line": 56
         },
         "file": "src/components/ui/FeatureList.js",
         "id": "pricing.features.serviceProxies",
         "start": {
           "column": 18,
-          "line": 32
+          "line": 53
         }
       },
       {
         "defaultMessage": "!!!Team Management",
         "end": {
           "column": 3,
-          "line": 39
+          "line": 60
         },
         "file": "src/components/ui/FeatureList.js",
         "id": "pricing.features.teamManagement",
         "start": {
           "column": 18,
-          "line": 36
+          "line": 57
         }
       },
       {
         "defaultMessage": "!!!No Waiting Screens",
         "end": {
           "column": 3,
-          "line": 43
+          "line": 64
         },
         "file": "src/components/ui/FeatureList.js",
         "id": "pricing.features.appDelays",
         "start": {
           "column": 13,
-          "line": 40
+          "line": 61
         }
       },
       {
         "defaultMessage": "!!!Forever ad-free",
         "end": {
           "column": 3,
-          "line": 47
+          "line": 68
         },
         "file": "src/components/ui/FeatureList.js",
         "id": "pricing.features.adFree",
         "start": {
           "column": 10,
-          "line": 44
+          "line": 65
         }
       }
     ],
@@ -3834,6 +3899,273 @@
   {
     "descriptors": [
       {
+        "defaultMessage": "!!!per month",
+        "end": {
+          "column": 3,
+          "line": 22
+        },
+        "file": "src/features/planSelection/components/PlanItem.js",
+        "id": "subscription.interval.perMonth",
+        "start": {
+          "column": 12,
+          "line": 19
+        }
+      },
+      {
+        "defaultMessage": "!!!per month & user",
+        "end": {
+          "column": 3,
+          "line": 26
+        },
+        "file": "src/features/planSelection/components/PlanItem.js",
+        "id": "subscription.interval.perMonthPerUser",
+        "start": {
+          "column": 19,
+          "line": 23
+        }
+      }
+    ],
+    "path": "src/features/planSelection/components/PlanItem.json"
+  },
+  {
+    "descriptors": [
+      {
+        "defaultMessage": "!!!Welcome back, {name}",
+        "end": {
+          "column": 3,
+          "line": 19
+        },
+        "file": "src/features/planSelection/components/PlanSelection.js",
+        "id": "feature.planSelection.fullscreen.welcome",
+        "start": {
+          "column": 11,
+          "line": 16
+        }
+      },
+      {
+        "defaultMessage": "!!!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.",
+        "end": {
+          "column": 3,
+          "line": 23
+        },
+        "file": "src/features/planSelection/components/PlanSelection.js",
+        "id": "feature.planSelection.fullscreen.subheadline",
+        "start": {
+          "column": 15,
+          "line": 20
+        }
+      },
+      {
+        "defaultMessage": "!!!Basic functionality",
+        "end": {
+          "column": 3,
+          "line": 27
+        },
+        "file": "src/features/planSelection/components/PlanSelection.js",
+        "id": "feature.planSelection.free.text",
+        "start": {
+          "column": 12,
+          "line": 24
+        }
+      },
+      {
+        "defaultMessage": "!!!More services, no waiting - ideal for personal use.",
+        "end": {
+          "column": 3,
+          "line": 31
+        },
+        "file": "src/features/planSelection/components/PlanSelection.js",
+        "id": "feature.planSelection.personal.text",
+        "start": {
+          "column": 16,
+          "line": 28
+        }
+      },
+      {
+        "defaultMessage": "!!!Unlimited services and professional features for you - and your team.",
+        "end": {
+          "column": 3,
+          "line": 35
+        },
+        "file": "src/features/planSelection/components/PlanSelection.js",
+        "id": "feature.planSelection.pro.text",
+        "start": {
+          "column": 20,
+          "line": 32
+        }
+      },
+      {
+        "defaultMessage": "!!!Stay on Free",
+        "end": {
+          "column": 3,
+          "line": 39
+        },
+        "file": "src/features/planSelection/components/PlanSelection.js",
+        "id": "feature.planSelection.cta.stayOnFree",
+        "start": {
+          "column": 17,
+          "line": 36
+        }
+      },
+      {
+        "defaultMessage": "!!!Downgrade to Free",
+        "end": {
+          "column": 3,
+          "line": 43
+        },
+        "file": "src/features/planSelection/components/PlanSelection.js",
+        "id": "feature.planSelection.cta.ctaDowngradeFree",
+        "start": {
+          "column": 20,
+          "line": 40
+        }
+      },
+      {
+        "defaultMessage": "!!!Start my free 14-days Trial",
+        "end": {
+          "column": 3,
+          "line": 47
+        },
+        "file": "src/features/planSelection/components/PlanSelection.js",
+        "id": "feature.planSelection.cta.trial",
+        "start": {
+          "column": 15,
+          "line": 44
+        }
+      },
+      {
+        "defaultMessage": "!!!Choose Personal",
+        "end": {
+          "column": 3,
+          "line": 51
+        },
+        "file": "src/features/planSelection/components/PlanSelection.js",
+        "id": "feature.planSelection.cta.upgradePersonal",
+        "start": {
+          "column": 23,
+          "line": 48
+        }
+      },
+      {
+        "defaultMessage": "!!!Choose Professional",
+        "end": {
+          "column": 3,
+          "line": 55
+        },
+        "file": "src/features/planSelection/components/PlanSelection.js",
+        "id": "feature.planSelection.cta.upgradePro",
+        "start": {
+          "column": 18,
+          "line": 52
+        }
+      },
+      {
+        "defaultMessage": "!!!Complete comparison of all plans",
+        "end": {
+          "column": 3,
+          "line": 59
+        },
+        "file": "src/features/planSelection/components/PlanSelection.js",
+        "id": "feature.planSelection.fullFeatureList",
+        "start": {
+          "column": 19,
+          "line": 56
+        }
+      }
+    ],
+    "path": "src/features/planSelection/components/PlanSelection.json"
+  },
+  {
+    "descriptors": [
+      {
+        "defaultMessage": "!!!per {interval}",
+        "end": {
+          "column": 3,
+          "line": 19
+        },
+        "file": "src/features/planSelection/components/PlanTeaser.js",
+        "id": "subscription.interval.per",
+        "start": {
+          "column": 7,
+          "line": 16
+        }
+      },
+      {
+        "defaultMessage": "!!!Upgrade Account",
+        "end": {
+          "column": 3,
+          "line": 23
+        },
+        "file": "src/features/planSelection/components/PlanTeaser.js",
+        "id": "subscription.planItem.upgradeAccount",
+        "start": {
+          "column": 7,
+          "line": 20
+        }
+      }
+    ],
+    "path": "src/features/planSelection/components/PlanTeaser.json"
+  },
+  {
+    "descriptors": [
+      {
+        "defaultMessage": "!!!Downgrade your Franz Plan",
+        "end": {
+          "column": 3,
+          "line": 19
+        },
+        "file": "src/features/planSelection/containers/PlanSelectionScreen.js",
+        "id": "feature.planSelection.fullscreen.dialog.title",
+        "start": {
+          "column": 15,
+          "line": 16
+        }
+      },
+      {
+        "defaultMessage": "!!!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.",
+        "end": {
+          "column": 3,
+          "line": 23
+        },
+        "file": "src/features/planSelection/containers/PlanSelectionScreen.js",
+        "id": "feature.planSelection.fullscreen.dialog.message",
+        "start": {
+          "column": 17,
+          "line": 20
+        }
+      },
+      {
+        "defaultMessage": "!!!Downgrade to Free",
+        "end": {
+          "column": 3,
+          "line": 27
+        },
+        "file": "src/features/planSelection/containers/PlanSelectionScreen.js",
+        "id": "feature.planSelection.fullscreen.dialog.cta.downgrade",
+        "start": {
+          "column": 22,
+          "line": 24
+        }
+      },
+      {
+        "defaultMessage": "!!!Choose Personal",
+        "end": {
+          "column": 3,
+          "line": 31
+        },
+        "file": "src/features/planSelection/containers/PlanSelectionScreen.js",
+        "id": "feature.planSelection.fullscreen.dialog.cta.upgrade",
+        "start": {
+          "column": 20,
+          "line": 28
+        }
+      }
+    ],
+    "path": "src/features/planSelection/containers/PlanSelectionScreen.json"
+  },
+  {
+    "descriptors": [
+      {
         "defaultMessage": "!!!Changes in Franz {version}",
         "end": {
           "column": 3,
@@ -4487,7 +4819,7 @@
   {
     "descriptors": [
       {
-        "defaultMessage": "!!!Franz Professional",
+        "defaultMessage": "!!!Professional",
         "end": {
           "column": 3,
           "line": 8
@@ -4500,7 +4832,7 @@
         }
       },
       {
-        "defaultMessage": "!!!Franz Personal",
+        "defaultMessage": "!!!Personal",
         "end": {
           "column": 3,
           "line": 12
@@ -4513,7 +4845,7 @@
         }
       },
       {
-        "defaultMessage": "!!!Franz Free",
+        "defaultMessage": "!!!Free",
         "end": {
           "column": 3,
           "line": 16
@@ -4526,7 +4858,7 @@
         }
       },
       {
-        "defaultMessage": "!!!Franz Premium",
+        "defaultMessage": "!!!Premium",
         "end": {
           "column": 3,
           "line": 20
diff --git a/src/i18n/locales/en-US.json b/src/i18n/locales/en-US.json
index aea74768d..4e1b01419 100644
--- a/src/i18n/locales/en-US.json
+++ b/src/i18n/locales/en-US.json
@@ -9,6 +9,21 @@
   "feature.delayApp.trial.headline": "Get the free Franz Professional 14 day trial and skip the line",
   "feature.delayApp.upgrade.action": "Get a Franz Supporter License",
   "feature.delayApp.upgrade.actionShort": "Upgrade account",
+  "feature.planSelection.cta.ctaDowngradeFree": "Downgrade to Free",
+  "feature.planSelection.cta.stayOnFree": "Stay on Free",
+  "feature.planSelection.cta.trial": "Start my free 14-days Trial",
+  "feature.planSelection.cta.upgradePersonal": "Choose Personal",
+  "feature.planSelection.cta.upgradePro": "Choose Professional",
+  "feature.planSelection.free.text": "Basic functionality",
+  "feature.planSelection.fullFeatureList": "Complete comparison of all plans",
+  "feature.planSelection.fullscreen.dialog.cta.downgrade": "Downgrade to Free",
+  "feature.planSelection.fullscreen.dialog.cta.upgrade": "Choose Personal",
+  "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.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.",
   "feature.shareFranz.action.email": "Send as email",
   "feature.shareFranz.action.facebook": "Share on Facebook",
@@ -123,30 +138,35 @@
   "password.submit.label": "Submit",
   "password.successInfo": "Please check your email",
   "premiumFeature.button.upgradeAccount": "Upgrade account",
+  "pricing.features.accountSync": "Account Synchronisation",
   "pricing.features.adFree": "Forever ad-free",
   "pricing.features.appDelays": "No Waiting Screens",
   "pricing.features.customWebsites": "Add Custom Websites",
+  "pricing.features.desktopNotifications": "Desktop Notifications",
   "pricing.features.onPremise": "On-premise & other Hosted Services",
+  "pricing.features.recipes": "Choose from more than 70 Services",
   "pricing.features.serviceProxies": "Service Proxies",
   "pricing.features.spellchecker": "Spellchecker support",
   "pricing.features.teamManagement": "Team Management",
   "pricing.features.thirdPartyServices": "Install 3rd party services",
   "pricing.features.unlimitedServices": "Add unlimited services",
+  "pricing.features.upToSixServices": "Add up to 6 services",
+  "pricing.features.upToThreeServices": "Add up to 3 services",
   "pricing.features.workspaces": "Workspaces",
-  "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.plan.free": "Free",
+  "pricing.plan.legacy": "Premium",
+  "pricing.plan.personal": "Personal",
+  "pricing.plan.personal-monthly": "Personal Monthly",
+  "pricing.plan.personal-yearly": "Personal Yearly",
+  "pricing.plan.pro": "Professional",
+  "pricing.plan.pro-monthly": "Professional Monthly",
+  "pricing.plan.pro-yearly": "Professional Yearly",
+  "pricing.trial.cta.accept": "Start my 14-day Franz Professional Trial ",
   "pricing.trial.cta.skip": "Continue to Franz",
   "pricing.trial.error": "Sorry, we could not activate your trial!",
   "pricing.trial.features.headline": "Franz Professional includes:",
   "pricing.trial.headline": "Franz Professional",
-  "pricing.trial.subheadline": "Your personal welcome offer:",
+  "pricing.trial.subheadline": "Here's a special welcome for you:",
   "pricing.trial.terms.automaticTrialEnd": "Your free trial ends automatically after 14 days",
   "pricing.trial.terms.headline": "No strings attached",
   "pricing.trial.terms.noCreditCard": "No credit card required",
@@ -353,6 +373,10 @@
   "subscription.cta.allOptions": "See all options",
   "subscription.cta.choosePlan": "Choose your plan",
   "subscription.includedProFeatures": "The Franz Professional Plan includes:",
+  "subscription.interval.per": "per {interval}",
+  "subscription.interval.perMonth": "per month",
+  "subscription.interval.perMonthPerUser": "per month & user",
+  "subscription.planItem.upgradeAccount": "Upgrade Account",
   "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",
@@ -389,4 +413,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
+}