diff options
author | vantezzen <hello@vantezzen.io> | 2020-03-25 17:13:47 +0100 |
---|---|---|
committer | vantezzen <hello@vantezzen.io> | 2020-03-25 17:13:47 +0100 |
commit | f00f32f91e69566dc38a1e3db892bb14c6c0dc5a (patch) | |
tree | 6016b96bbf3fc64eff533d46a58495f8ef972cee /src/components/settings/account | |
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/account')
-rw-r--r-- | src/components/settings/account/AccountDashboard.js | 41 |
1 files changed, 22 insertions, 19 deletions
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 { | |||
154 | } | 154 | } |
155 | 155 | ||
156 | const isUsingWithoutAccount = server === LOCAL_SERVER; | 156 | const isUsingWithoutAccount = server === LOCAL_SERVER; |
157 | const isUsingFranzServer = server === 'https://api.franzinfra.com'; | ||
157 | 158 | ||
158 | return ( | 159 | return ( |
159 | <div className="settings__main"> | 160 | <div className="settings__main"> |
@@ -243,7 +244,7 @@ class AccountDashboard extends Component { | |||
243 | )} | 244 | )} |
244 | </div> | 245 | </div> |
245 | </div> | 246 | </div> |
246 | {user.isPremium && user.isSubscriptionOwner && ( | 247 | {user.isPremium && user.isSubscriptionOwner && isUsingFranzServer && ( |
247 | <div className="account"> | 248 | <div className="account"> |
248 | <div className="account__box"> | 249 | <div className="account__box"> |
249 | <H2>{intl.formatMessage(messages.yourLicense)}</H2> | 250 | <H2>{intl.formatMessage(messages.yourLicense)}</H2> |
@@ -322,25 +323,27 @@ class AccountDashboard extends Component { | |||
322 | </> | 323 | </> |
323 | )} | 324 | )} |
324 | 325 | ||
325 | <div className="account franz-form"> | 326 | {isUsingFranzServer && ( |
326 | <div className="account__box"> | 327 | <div className="account franz-form"> |
327 | <H2>{intl.formatMessage(messages.headlineDangerZone)}</H2> | 328 | <div className="account__box"> |
328 | {!isDeleteAccountSuccessful && ( | 329 | <H2>{intl.formatMessage(messages.headlineDangerZone)}</H2> |
329 | <div className="account__subscription"> | 330 | {!isDeleteAccountSuccessful && ( |
330 | <p>{intl.formatMessage(messages.deleteInfo)}</p> | 331 | <div className="account__subscription"> |
331 | <Button | 332 | <p>{intl.formatMessage(messages.deleteInfo)}</p> |
332 | label={intl.formatMessage(messages.deleteAccount)} | 333 | <Button |
333 | buttonType="danger" | 334 | label={intl.formatMessage(messages.deleteAccount)} |
334 | onClick={() => deleteAccount()} | 335 | buttonType="danger" |
335 | loaded={!isLoadingDeleteAccount} | 336 | onClick={() => deleteAccount()} |
336 | /> | 337 | loaded={!isLoadingDeleteAccount} |
337 | </div> | 338 | /> |
338 | )} | 339 | </div> |
339 | {isDeleteAccountSuccessful && ( | 340 | )} |
340 | <p>{intl.formatMessage(messages.deleteEmailSent)}</p> | 341 | {isDeleteAccountSuccessful && ( |
341 | )} | 342 | <p>{intl.formatMessage(messages.deleteEmailSent)}</p> |
343 | )} | ||
344 | </div> | ||
342 | </div> | 345 | </div> |
343 | </div> | 346 | )} |
344 | </> | 347 | </> |
345 | )} | 348 | )} |
346 | </> | 349 | </> |