1 files changed, 44 insertions, 35 deletions

diff --git a/src/components/auth/ChangeServer.js b/src/components/auth/ChangeServer.js
index 8e8a7af32..b98fb50f7 100644
--- a/src/components/auth/ChangeServer.js
+++ b/src/components/auth/ChangeServer.js
@@ -1,7 +1,7 @@
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import { observer } from 'mobx-react';
-import { defineMessages, intlShape } from 'react-intl';
+import { defineMessages, injectIntl } from 'react-intl';
 import Form from '../../lib/Form';
 import Input from '../ui/Input';
 import Select from '../ui/Select';
@@ -14,56 +14,65 @@ import globalMessages from '../../i18n/globalMessages';
 const messages = defineMessages({
   headline: {
     id: 'changeserver.headline',
-    defaultMessage: '!!!Change server',
+    defaultMessage: 'Change server',
   },
   label: {
     id: 'changeserver.label',
-    defaultMessage: '!!!Server',
+    defaultMessage: 'Server',
   },
   warning: {
     id: 'changeserver.warning',
-    defaultMessage: '!!!Extra settings offered by Ferdi will not be saved',
+    defaultMessage: 'Extra settings offered by Ferdi will not be saved',
   },
   customServerLabel: {
     id: 'changeserver.customServerLabel',
-    defaultMessage: '!!!Custom server',
+    defaultMessage: 'Custom server',
   },
   urlError: {
     id: 'changeserver.urlError',
-    defaultMessage: '!!!Enter a valid URL',
+    defaultMessage: 'Enter a valid URL',
   },
 });
 
-export default @observer class ChangeServer extends Component {
+@observer
+class ChangeServer extends Component {
   static propTypes = {
     onSubmit: PropTypes.func.isRequired,
     server: PropTypes.string.isRequired,
   };
 
-  static contextTypes = {
-    intl: intlShape,
-  };
-
-  ferdiServer=LIVE_FERDI_API;
+  ferdiServer = LIVE_FERDI_API;
 
-  franzServer=LIVE_FRANZ_API;
+  franzServer = LIVE_FRANZ_API;
 
-  defaultServers=[this.franzServer, this.ferdiServer];
+  defaultServers = [this.franzServer, this.ferdiServer];
 
-  form = new Form({
-    fields: {
-      server: {
-        label: this.context.intl.formatMessage(messages.label),
-        value: this.props.server,
-        options: [{ value: this.ferdiServer, label: 'Ferdi' }, { value: this.franzServer, label: 'Franz' }, { value: this.defaultServers.includes(this.props.server) ? '' : this.props.server, label: 'Custom' }],
-      },
-      customServer: {
-        label: this.context.intl.formatMessage(messages.customServerLabel),
-        value: '',
-        validators: [url, required],
+  form = new Form(
+    {
+      fields: {
+        server: {
+          label: this.props.intl.formatMessage(messages.label),
+          value: this.props.server,
+          options: [
+            { value: this.ferdiServer, label: 'Ferdi' },
+            { value: this.franzServer, label: 'Franz' },
+            {
+              value: this.defaultServers.includes(this.props.server)
+                ? ''
+                : this.props.server,
+              label: 'Custom',
+            },
+          ],
+        },
+        customServer: {
+          label: this.props.intl.formatMessage(messages.customServerLabel),
+          value: '',
+          validators: [url, required],
+        },
       },
     },
-  }, this.context.intl);
+    this.props.intl,
+  );
 
   componentDidMount() {
     if (this.defaultServers.includes(this.props.server)) {
@@ -77,13 +86,13 @@ export default @observer class ChangeServer extends Component {
   submit(e) {
     e.preventDefault();
     this.form.submit({
-      onSuccess: (form) => {
+      onSuccess: form => {
         if (!this.defaultServers.includes(form.values().server)) {
           form.$('server').onChange(form.values().customServer);
         }
         this.props.onSubmit(form.values());
       },
-      onError: (form) => {
+      onError: form => {
         if (this.defaultServers.includes(form.values().server)) {
           this.props.onSubmit(form.values());
         }
@@ -93,23 +102,21 @@ export default @observer class ChangeServer extends Component {
 
   render() {
     const { form } = this;
-    const { intl } = this.context;
+    const { intl } = this.props;
     return (
       <div className="auth__container">
-        <form className="franz-form auth__form" onSubmit={(e) => this.submit(e)}>
+        <form className="franz-form auth__form" onSubmit={e => this.submit(e)}>
           <h1>{intl.formatMessage(messages.headline)}</h1>
-          {form.$('server').value === this.franzServer
-          && (
+          {form.$('server').value === this.franzServer && (
             <Infobox type="warning">
               {intl.formatMessage(messages.warning)}
             </Infobox>
           )}
           <Select field={form.$('server')} />
-          {!this.defaultServers.includes(form.$('server').value)
-          && (
+          {!this.defaultServers.includes(form.$('server').value) && (
             <Input
               placeholder="Custom Server"
-              onChange={(e) => this.submit(e)}
+              onChange={e => this.submit(e)}
               field={form.$('customServer')}
             />
           )}
@@ -123,3 +130,5 @@ export default @observer class ChangeServer extends Component {
     );
   }
 }
+
+export default injectIntl(ChangeServer);