Minor refactoring for aligning on usage of 'intl' package

6 files changed, 42 insertions, 35 deletions

diff --git a/src/components/auth/ChangeServer.js b/src/components/auth/ChangeServer.js
index aa4598928..a7aa33ab1 100644
--- a/src/components/auth/ChangeServer.js
+++ b/src/components/auth/ChangeServer.js
@@ -50,11 +50,12 @@ class ChangeServer extends Component {
 
   defaultServers = [this.ferdiumServer, this.franzServer, this.ferdiServer];
 
-  form = new Form(
-    {
+  form = (() => {
+    const { intl } = this.props;
+    return new Form({
       fields: {
         server: {
-          label: this.props.intl.formatMessage(messages.label),
+          label: intl.formatMessage(messages.label),
           value: this.props.server,
           options: [
             { value: this.ferdiumServer, label: 'Ferdium (Default)' },
@@ -69,14 +70,15 @@ class ChangeServer extends Component {
           ],
         },
         customServer: {
-          label: this.props.intl.formatMessage(messages.customServerLabel),
+          label: intl.formatMessage(messages.customServerLabel),
           value: '',
           validators: [url, required],
         },
       },
     },
-    this.props.intl,
+    intl,
   );
+  })();
 
   componentDidMount() {
     if (this.defaultServers.includes(this.props.server)) {
diff --git a/src/components/auth/Invite.js b/src/components/auth/Invite.js
index 81618b3bd..84adb320f 100644
--- a/src/components/auth/Invite.js
+++ b/src/components/auth/Invite.js
@@ -61,6 +61,7 @@ class Invite extends Component {
   state = { showSuccessInfo: false };
 
   componentDidMount() {
+    const { intl } = this.props;
     this.form = new Form(
       {
         fields: {
@@ -68,8 +69,8 @@ class Invite extends Component {
             ...Array.from({ length: 3 }).fill({
               fields: {
                 name: {
-                  label: this.props.intl.formatMessage(messages.nameLabel),
-                  placeholder: this.props.intl.formatMessage(
+                  label: intl.formatMessage(messages.nameLabel),
+                  placeholder: intl.formatMessage(
                     messages.nameLabel,
                   ),
                   onChange: () => {
@@ -78,8 +79,8 @@ class Invite extends Component {
                   // related: ['invite.0.email'], // path accepted but does not work
                 },
                 email: {
-                  label: this.props.intl.formatMessage(messages.emailLabel),
-                  placeholder: this.props.intl.formatMessage(
+                  label: intl.formatMessage(messages.emailLabel),
+                  placeholder: intl.formatMessage(
                     messages.emailLabel,
                   ),
                   onChange: () => {
@@ -92,7 +93,7 @@ class Invite extends Component {
           ],
         },
       },
-      this.props.intl,
+      intl,
     );
 
     document.querySelector('input:first-child')?.focus();
@@ -185,7 +186,7 @@ class Invite extends Component {
       >
         {embed && (
           <div className="settings__header">
-            <H1>{this.props.intl.formatMessage(messages.settingsHeadline)}</H1>
+            <H1>{intl.formatMessage(messages.settingsHeadline)}</H1>
           </div>
         )}
         {!embed ? (
diff --git a/src/components/auth/Locked.js b/src/components/auth/Locked.js
index e09a7d540..710810f2b 100644
--- a/src/components/auth/Locked.js
+++ b/src/components/auth/Locked.js
@@ -52,18 +52,19 @@ class Locked extends Component {
     error: globalErrorPropType.isRequired,
   };
 
-  form = new Form(
-    {
+  form = (() => {
+    const { intl } = this.props;
+    return new Form({
       fields: {
         password: {
-          label: this.props.intl.formatMessage(messages.passwordLabel),
+          label: intl.formatMessage(messages.passwordLabel),
           value: '',
           type: 'password',
         },
       },
     },
-    this.props.intl,
-  );
+    intl,
+  )})();
 
   submit(e) {
     e.preventDefault();
diff --git a/src/components/auth/Login.js b/src/components/auth/Login.js
index d6c9e6feb..f1c58a020 100644
--- a/src/components/auth/Login.js
+++ b/src/components/auth/Login.js
@@ -73,24 +73,25 @@ class Login extends Component {
     error: globalErrorPropType.isRequired,
   };
 
-  form = new Form(
-    {
+  form = (() => {
+    const { intl } = this.props;
+    return new Form({
       fields: {
         email: {
-          label: this.props.intl.formatMessage(messages.emailLabel),
+          label: intl.formatMessage(messages.emailLabel),
           value: '',
           validators: [required, email],
         },
         password: {
-          label: this.props.intl.formatMessage(messages.passwordLabel),
+          label: intl.formatMessage(messages.passwordLabel),
           value: '',
           validators: [required],
           type: 'password',
         },
       },
     },
-    this.props.intl,
-  );
+    intl,
+  )})();
 
   submit(e) {
     e.preventDefault();
diff --git a/src/components/auth/Password.js b/src/components/auth/Password.js
index 8a5ef28f3..0e87cb028 100644
--- a/src/components/auth/Password.js
+++ b/src/components/auth/Password.js
@@ -48,18 +48,19 @@ class Password extends Component {
     status: MobxPropTypes.arrayOrObservableArray.isRequired,
   };
 
-  form = new Form(
-    {
+  form = (() => {
+    const { intl } = this.props;
+    return new Form({
       fields: {
         email: {
-          label: this.props.intl.formatMessage(messages.emailLabel),
+          label: intl.formatMessage(messages.emailLabel),
           value: '',
           validators: [required, email],
         },
       },
     },
-    this.props.intl,
-  );
+    intl,
+  )})();
 
   submit(e) {
     e.preventDefault();
diff --git a/src/components/auth/Signup.js b/src/components/auth/Signup.js
index 1c7b8e247..930b24491 100644
--- a/src/components/auth/Signup.js
+++ b/src/components/auth/Signup.js
@@ -73,34 +73,35 @@ class Signup extends Component {
     error: globalErrorPropType.isRequired,
   };
 
-  form = new Form(
-    {
+  form = (() => {
+    const { intl } = this.props;
+    return new Form({
       fields: {
         firstname: {
-          label: this.props.intl.formatMessage(messages.firstnameLabel),
+          label: intl.formatMessage(messages.firstnameLabel),
           value: '',
           validators: [required],
         },
         lastname: {
-          label: this.props.intl.formatMessage(messages.lastnameLabel),
+          label: intl.formatMessage(messages.lastnameLabel),
           value: '',
           validators: [required],
         },
         email: {
-          label: this.props.intl.formatMessage(messages.emailLabel),
+          label: intl.formatMessage(messages.emailLabel),
           value: '',
           validators: [required, email],
         },
         password: {
-          label: this.props.intl.formatMessage(messages.passwordLabel),
+          label: intl.formatMessage(messages.passwordLabel),
           value: '',
           validators: [required, minLength(6)],
           type: 'password',
         },
       },
     },
-    this.props.intl,
-  );
+    intl,
+  )})();
 
   submit(e) {
     e.preventDefault();