From f00f32f91e69566dc38a1e3db892bb14c6c0dc5a Mon Sep 17 00:00:00 2001
From: vantezzen <hello@vantezzen.io>
Date: Wed, 25 Mar 2020 17:13:47 +0100
Subject: Improve information about premium

As seen in #496, the current way Ferdi displays information about the Premium status may be irritating to new users.
This commit will:
- Hide all premium sections if we are not using the Franz server
- Hide teams section if we are not using the Franz server
- Update the description on the Teams page to reflect the use of Teams in Ferdi
- Fix accessing the Team Management page to go to meetfranz.com instead of getferdi.com
---
 .../settings/account/AccountDashboard.js           | 41 ++++++++++++----------
 .../settings/navigation/SettingsNavigation.js      | 25 +++++++------
 src/components/settings/team/TeamDashboard.js      |  6 ++--
 3 files changed, 39 insertions(+), 33 deletions(-)

(limited to 'src/components')

diff --git a/src/components/settings/account/AccountDashboard.js b/src/components/settings/account/AccountDashboard.js
index 7d6bad883..809bfda6e 100644
--- a/src/components/settings/account/AccountDashboard.js
+++ b/src/components/settings/account/AccountDashboard.js
@@ -154,6 +154,7 @@ class AccountDashboard extends Component {
     }
 
     const isUsingWithoutAccount = server === LOCAL_SERVER;
+    const isUsingFranzServer = server === 'https://api.franzinfra.com';
 
     return (
       <div className="settings__main">
@@ -243,7 +244,7 @@ class AccountDashboard extends Component {
                           )}
                         </div>
                       </div>
-                      {user.isPremium && user.isSubscriptionOwner && (
+                      {user.isPremium && user.isSubscriptionOwner && isUsingFranzServer && (
                         <div className="account">
                           <div className="account__box">
                             <H2>{intl.formatMessage(messages.yourLicense)}</H2>
@@ -322,25 +323,27 @@ class AccountDashboard extends Component {
                     </>
                   )}
 
-                  <div className="account franz-form">
-                    <div className="account__box">
-                      <H2>{intl.formatMessage(messages.headlineDangerZone)}</H2>
-                      {!isDeleteAccountSuccessful && (
-                        <div className="account__subscription">
-                          <p>{intl.formatMessage(messages.deleteInfo)}</p>
-                          <Button
-                            label={intl.formatMessage(messages.deleteAccount)}
-                            buttonType="danger"
-                            onClick={() => deleteAccount()}
-                            loaded={!isLoadingDeleteAccount}
-                          />
-                        </div>
-                      )}
-                      {isDeleteAccountSuccessful && (
-                        <p>{intl.formatMessage(messages.deleteEmailSent)}</p>
-                      )}
+                  {isUsingFranzServer && (
+                    <div className="account franz-form">
+                      <div className="account__box">
+                        <H2>{intl.formatMessage(messages.headlineDangerZone)}</H2>
+                        {!isDeleteAccountSuccessful && (
+                          <div className="account__subscription">
+                            <p>{intl.formatMessage(messages.deleteInfo)}</p>
+                            <Button
+                              label={intl.formatMessage(messages.deleteAccount)}
+                              buttonType="danger"
+                              onClick={() => deleteAccount()}
+                              loaded={!isLoadingDeleteAccount}
+                            />
+                          </div>
+                        )}
+                        {isDeleteAccountSuccessful && (
+                          <p>{intl.formatMessage(messages.deleteEmailSent)}</p>
+                        )}
+                      </div>
                     </div>
-                  </div>
+                  )}
                 </>
               )}
             </>
diff --git a/src/components/settings/navigation/SettingsNavigation.js b/src/components/settings/navigation/SettingsNavigation.js
index eb3249fa0..6b03f05be 100644
--- a/src/components/settings/navigation/SettingsNavigation.js
+++ b/src/components/settings/navigation/SettingsNavigation.js
@@ -105,6 +105,7 @@ export default @inject('stores', 'actions') @observer class SettingsNavigation e
     const { intl } = this.context;
     const isLoggedIn = Boolean(localStorage.getItem('authToken'));
     const isUsingWithoutAccount = stores.settings.app.server === LOCAL_SERVER;
+    const isUsingFranzServer = stores.settings.app.server === 'https://api.franzinfra.com';
 
     return (
       <div className="settings-navigation">
@@ -154,17 +155,19 @@ export default @inject('stores', 'actions') @observer class SettingsNavigation e
         >
           {intl.formatMessage(messages.account)}
         </Link>
-        <Link
-          to="/settings/team"
-          className="settings-navigation__link"
-          activeClassName="is-active"
-          disabled={!isLoggedIn}
-        >
-          {intl.formatMessage(messages.team)}
-          {!user.data.isPremium && (
-            <ProBadge inverted={!isDarkThemeActive && router.location.pathname === '/settings/team'} />
-          )}
-        </Link>
+        {isUsingFranzServer && (
+          <Link
+            to="/settings/team"
+            className="settings-navigation__link"
+            activeClassName="is-active"
+            disabled={!isLoggedIn}
+          >
+            {intl.formatMessage(messages.team)}
+            {!user.data.isPremium && (
+              <ProBadge inverted={!isDarkThemeActive && router.location.pathname === '/settings/team'} />
+            )}
+          </Link>
+        )}
         <Link
           to="/settings/app"
           className="settings-navigation__link"
diff --git a/src/components/settings/team/TeamDashboard.js b/src/components/settings/team/TeamDashboard.js
index 3d5358d89..72358d485 100644
--- a/src/components/settings/team/TeamDashboard.js
+++ b/src/components/settings/team/TeamDashboard.js
@@ -20,15 +20,15 @@ const messages = defineMessages({
   },
   contentHeadline: {
     id: 'settings.team.contentHeadline',
-    defaultMessage: '!!!Ferdi for Teams',
+    defaultMessage: '!!!Franz Team Management',
   },
   intro: {
     id: 'settings.team.intro',
-    defaultMessage: '!!!You and your team use Franz? You can now manage Premium subscriptions for as many colleagues, friends or family members as you want, all from within one account.',
+    defaultMessage: '!!!Your are currently using Franz Servers, which is why you have access to Team Management.',
   },
   copy: {
     id: 'settings.team.copy',
-    defaultMessage: '!!!Ferdi for Teams gives you the option to invite co-workers to your team by sending them email invitations and manage their subscriptions in your account’s preferences. Don’t waste time setting up subscriptions for every team member individually, forget about multiple invoices and different billing cycles - one team to rule them all!',
+    defaultMessage: '!!!Franz\'s Team Management allows you to manage Franz Subscriptions for multiple users. Please keep in mind that having a Franz Premium subscription will give you no advantages in using Ferdi: The only reason you still have access to Team Management is so you can manage your legacy Franz Teams and so that you don\'t loose any functionality in managing your account.',
   },
   manageButton: {
     id: 'settings.team.manageAction',
-- 
cgit v1.2.3-54-g00ecf


From aac09ccbacb05b9d50c0f1a74227e06c80bfe94b Mon Sep 17 00:00:00 2001
From: vantezzen <hello@vantezzen.io>
Date: Sat, 28 Mar 2020 09:37:21 +0100
Subject: Hide user lastname on Ferdi servers as it is not stored

---
 src/components/settings/account/AccountDashboard.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/components')

diff --git a/src/components/settings/account/AccountDashboard.js b/src/components/settings/account/AccountDashboard.js
index 809bfda6e..5c3dc21d0 100644
--- a/src/components/settings/account/AccountDashboard.js
+++ b/src/components/settings/account/AccountDashboard.js
@@ -209,7 +209,7 @@ class AccountDashboard extends Component {
                           </div>
                           <div className="account__info">
                             <H1>
-                              <span className="username">{`${user.firstname} ${user.lastname}`}</span>
+                              <span className="username">{`${user.firstname} ${isUsingFranzServer ? user.lastname : ''}`}</span>
                               {user.isPremium && (
                                 <>
                                   {' '}
-- 
cgit v1.2.3-54-g00ecf