1 files changed, 12 insertions, 13 deletions

diff --git a/src/components/ui/Input.js b/src/components/ui/Input.js
index 7417fef1c..335367f03 100644
--- a/src/components/ui/Input.js
+++ b/src/components/ui/Input.js
@@ -3,18 +3,17 @@ import PropTypes from 'prop-types';
 import { observer } from 'mobx-react';
 import { Field } from 'mobx-react-form';
 import classnames from 'classnames';
-import { defineMessages, intlShape } from 'react-intl';
+import { defineMessages, injectIntl } from 'react-intl';
 
 import { scorePassword as scorePasswordFunc } from '../../helpers/password-helpers';
 
 const messages = defineMessages({
   passwordToggle: {
     id: 'settings.app.form.passwordToggle',
-    defaultMessage: '!!!Password toggle',
+    defaultMessage: 'Password toggle',
   },
 });
 
-export default
 @observer
 class Input extends Component {
   static propTypes = {
@@ -38,10 +37,6 @@ class Input extends Component {
     suffix: '',
   };
 
-  static contextTypes = {
-    intl: intlShape,
-  };
-
   state = {
     showPassword: false,
     passwordScore: 0,
@@ -82,7 +77,7 @@ class Input extends Component {
 
     const { passwordScore } = this.state;
 
-    const { intl } = this.context;
+    const { intl } = this.props;
 
     let { type } = field;
     if (type === 'password' && this.state.showPassword) {
@@ -106,10 +101,10 @@ class Input extends Component {
             name={field.name}
             value={field.value}
             placeholder={field.placeholder}
-            onChange={(e) => this.onChange(e)}
+            onChange={e => this.onChange(e)}
             onBlur={field.onBlur}
             onFocus={field.onFocus}
-            ref={(element) => {
+            ref={element => {
               this.inputElement = element;
             }}
             disabled={field.disabled}
@@ -124,9 +119,11 @@ class Input extends Component {
                 'mdi-eye': !this.state.showPassword,
                 'mdi-eye-off': this.state.showPassword,
               })}
-              onClick={() => this.setState((prevState) => ({
-                showPassword: !prevState.showPassword,
-              }))}
+              onClick={() =>
+                this.setState(prevState => ({
+                  showPassword: !prevState.showPassword,
+                }))
+              }
               tabIndex={-1}
               aria-label={intl.formatMessage(messages.passwordToggle)}
             />
@@ -154,3 +151,5 @@ class Input extends Component {
     );
   }
 }
+
+export default injectIntl(Input);