diff options
author | 2020-03-25 17:13:47 +0100 | |
---|---|---|
committer | 2020-03-25 17:13:47 +0100 | |
commit | f00f32f91e69566dc38a1e3db892bb14c6c0dc5a (patch) | |
tree | 6016b96bbf3fc64eff533d46a58495f8ef972cee /src/components/settings/navigation | |
parent | Improve user onboarding (#493) (diff) | |
download | ferdium-app-f00f32f91e69566dc38a1e3db892bb14c6c0dc5a.tar.gz ferdium-app-f00f32f91e69566dc38a1e3db892bb14c6c0dc5a.tar.zst ferdium-app-f00f32f91e69566dc38a1e3db892bb14c6c0dc5a.zip |
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
Diffstat (limited to 'src/components/settings/navigation')
-rw-r--r-- | src/components/settings/navigation/SettingsNavigation.js | 25 |
1 files changed, 14 insertions, 11 deletions
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 | |||
105 | const { intl } = this.context; | 105 | const { intl } = this.context; |
106 | const isLoggedIn = Boolean(localStorage.getItem('authToken')); | 106 | const isLoggedIn = Boolean(localStorage.getItem('authToken')); |
107 | const isUsingWithoutAccount = stores.settings.app.server === LOCAL_SERVER; | 107 | const isUsingWithoutAccount = stores.settings.app.server === LOCAL_SERVER; |
108 | const isUsingFranzServer = stores.settings.app.server === 'https://api.franzinfra.com'; | ||
108 | 109 | ||
109 | return ( | 110 | return ( |
110 | <div className="settings-navigation"> | 111 | <div className="settings-navigation"> |
@@ -154,17 +155,19 @@ export default @inject('stores', 'actions') @observer class SettingsNavigation e | |||
154 | > | 155 | > |
155 | {intl.formatMessage(messages.account)} | 156 | {intl.formatMessage(messages.account)} |
156 | </Link> | 157 | </Link> |
157 | <Link | 158 | {isUsingFranzServer && ( |
158 | to="/settings/team" | 159 | <Link |
159 | className="settings-navigation__link" | 160 | to="/settings/team" |
160 | activeClassName="is-active" | 161 | className="settings-navigation__link" |
161 | disabled={!isLoggedIn} | 162 | activeClassName="is-active" |
162 | > | 163 | disabled={!isLoggedIn} |
163 | {intl.formatMessage(messages.team)} | 164 | > |
164 | {!user.data.isPremium && ( | 165 | {intl.formatMessage(messages.team)} |
165 | <ProBadge inverted={!isDarkThemeActive && router.location.pathname === '/settings/team'} /> | 166 | {!user.data.isPremium && ( |
166 | )} | 167 | <ProBadge inverted={!isDarkThemeActive && router.location.pathname === '/settings/team'} /> |
167 | </Link> | 168 | )} |
169 | </Link> | ||
170 | )} | ||
168 | <Link | 171 | <Link |
169 | to="/settings/app" | 172 | to="/settings/app" |
170 | className="settings-navigation__link" | 173 | className="settings-navigation__link" |