chore: upgrade intl dependencies (#1920)

1 files changed, 25 insertions, 24 deletions

diff --git a/src/components/settings/navigation/SettingsNavigation.js b/src/components/settings/navigation/SettingsNavigation.js
index 0a5ace586..72c7faa66 100644
--- a/src/components/settings/navigation/SettingsNavigation.js
+++ b/src/components/settings/navigation/SettingsNavigation.js
@@ -1,6 +1,6 @@
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
-import { defineMessages, intlShape } from 'react-intl';
+import { defineMessages, injectIntl } from 'react-intl';
 import { inject, observer } from 'mobx-react';
 import { RouterStore } from 'mobx-react-router';
 
@@ -15,35 +15,37 @@ import globalMessages from '../../../i18n/globalMessages';
 const messages = defineMessages({
   availableServices: {
     id: 'settings.navigation.availableServices',
-    defaultMessage: '!!!Available services',
+    defaultMessage: 'Available services',
   },
   yourServices: {
     id: 'settings.navigation.yourServices',
-    defaultMessage: '!!!Your services',
+    defaultMessage: 'Your services',
   },
   yourWorkspaces: {
     id: 'settings.navigation.yourWorkspaces',
-    defaultMessage: '!!!Your workspaces',
+    defaultMessage: 'Your workspaces',
   },
   account: {
     id: 'settings.navigation.account',
-    defaultMessage: '!!!Account',
+    defaultMessage: 'Account',
   },
   team: {
     id: 'settings.navigation.team',
-    defaultMessage: '!!!Manage Team',
+    defaultMessage: 'Manage Team',
   },
   supportFerdi: {
     id: 'settings.navigation.supportFerdi',
-    defaultMessage: '!!!About Ferdi',
+    defaultMessage: 'About Ferdi',
   },
   logout: {
     id: 'settings.navigation.logout',
-    defaultMessage: '!!!Logout',
+    defaultMessage: 'Logout',
   },
 });
 
-export default @inject('stores', 'actions') @observer class SettingsNavigation extends Component {
+@inject('stores', 'actions')
+@observer
+class SettingsNavigation extends Component {
   static propTypes = {
     stores: PropTypes.shape({
       ui: PropTypes.instanceOf(UIStore).isRequired,
@@ -58,13 +60,10 @@ export default @inject('stores', 'actions') @observer class SettingsNavigation e
     workspaceCount: PropTypes.number.isRequired,
   };
 
-  static contextTypes = {
-    intl: intlShape,
-  };
-
   handleLoginLogout() {
     const isLoggedIn = Boolean(localStorage.getItem('authToken'));
-    const isUsingWithoutAccount = this.props.stores.settings.app.server === LOCAL_SERVER;
+    const isUsingWithoutAccount =
+      this.props.stores.settings.app.server === LOCAL_SERVER;
 
     if (isLoggedIn) {
       // Remove current auth token
@@ -82,7 +81,9 @@ export default @inject('stores', 'actions') @observer class SettingsNavigation e
       this.props.stores.user.isLoggingOut = true;
     }
 
-    this.props.stores.router.push(isLoggedIn ? '/auth/logout' : '/auth/welcome');
+    this.props.stores.router.push(
+      isLoggedIn ? '/auth/logout' : '/auth/welcome',
+    );
 
     if (isLoggedIn) {
       // Reload Ferdi, otherwise many settings won't sync correctly with the server
@@ -93,7 +94,7 @@ export default @inject('stores', 'actions') @observer class SettingsNavigation e
 
   render() {
     const { serviceCount, workspaceCount, stores } = this.props;
-    const { intl } = this.context;
+    const { intl } = this.props;
     const isLoggedIn = Boolean(localStorage.getItem('authToken'));
     const isUsingWithoutAccount = stores.settings.app.server === LOCAL_SERVER;
     const isUsingFranzServer = stores.settings.app.server === LIVE_FRANZ_API;
@@ -113,11 +114,8 @@ export default @inject('stores', 'actions') @observer class SettingsNavigation e
           activeClassName="is-active"
           disabled={!isLoggedIn}
         >
-          {intl.formatMessage(messages.yourServices)}
-          {' '}
-          <span className="badge">
-            {serviceCount}
-          </span>
+          {intl.formatMessage(messages.yourServices)}{' '}
+          <span className="badge">{serviceCount}</span>
         </Link>
         {workspaceStore.isFeatureEnabled ? (
           <Link
@@ -126,8 +124,7 @@ export default @inject('stores', 'actions') @observer class SettingsNavigation e
             activeClassName="is-active"
             disabled={!isLoggedIn}
           >
-            {intl.formatMessage(messages.yourWorkspaces)}
-            {' '}
+            {intl.formatMessage(messages.yourWorkspaces)}{' '}
             <span className="badge">{workspaceCount}</span>
           </Link>
         ) : null}
@@ -172,9 +169,13 @@ export default @inject('stores', 'actions') @observer class SettingsNavigation e
           className="settings-navigation__link"
           onClick={this.handleLoginLogout.bind(this)}
         >
-          { isLoggedIn && !isUsingWithoutAccount ? intl.formatMessage(messages.logout) : 'Login'}
+          {isLoggedIn && !isUsingWithoutAccount
+            ? intl.formatMessage(messages.logout)
+            : 'Login'}
         </button>
       </div>
     );
   }
 }
+
+export default injectIntl(SettingsNavigation);