3 files changed, 37 insertions, 41 deletions

diff --git a/src/components/auth/Invite.js b/src/components/auth/Invite.js
index 2dcce7f83..dfe6a00b7 100644
--- a/src/components/auth/Invite.js
+++ b/src/components/auth/Invite.js
@@ -13,6 +13,10 @@ import Input from '../ui/Input';
 import Button from '../ui/Button';
 
 const messages = defineMessages({
+  settingsHeadline: {
+    id: 'settings.invite.headline',
+    defaultMessage: '!!!Invite Friends',
+  },
   headline: {
     id: 'invite.headline.friends',
     defaultMessage: '!!!Invite 3 of your friends or colleagues',
@@ -117,17 +121,19 @@ export default class Invite extends Component {
       'invite__embed--button': embed,
     });
 
-    return (
+    const renderForm = (
       <div>
-        {this.state.showSuccessInfo && isInviteSuccessful && (<Appear>
-          <Infobox
-            type="success"
-            icon="checkbox-marked-circle-outline"
-            dismissable
-          >
-            {intl.formatMessage(messages.inviteSuccessInfo)}
-          </Infobox>
-        </Appear>)}
+        {this.state.showSuccessInfo && isInviteSuccessful && (
+          <Appear>
+            <Infobox
+              type="success"
+              icon="checkbox-marked-circle-outline"
+              dismissable
+            >
+              {intl.formatMessage(messages.inviteSuccessInfo)}
+            </Infobox>
+          </Appear>
+        )}
 
         <form className="franz-form auth__form" onSubmit={e => this.submit(e)}>
           {!embed && (<img
@@ -162,5 +168,16 @@ export default class Invite extends Component {
         </form>
       </div>
     );
+
+    return (
+      <div className={!embed ? 'auth__container auth__container--signup' : 'settings__main'}>
+        {embed && (
+          <div className="settings__header">
+            <h1>{this.context.intl.formatMessage(messages.settingsHeadline)}</h1>
+          </div>
+        )}
+        {!embed ? <div>{renderForm}</div> : <div className="settings__body invite__form">{renderForm}</div>}
+      </div>
+    );
   }
 }
diff --git a/src/containers/auth/InviteScreen.js b/src/containers/auth/InviteScreen.js
index e54d8d225..059888c99 100644
--- a/src/containers/auth/InviteScreen.js
+++ b/src/containers/auth/InviteScreen.js
@@ -14,12 +14,10 @@ export default class InviteScreen extends Component {
     const { actions } = this.props;
 
     return (
-      <div className="auth__container auth__container--signup">
-        <Invite
-          onSubmit={actions.user.invite}
-          embed={false}
-        />
-      </div>
+      <Invite
+        onSubmit={actions.user.invite}
+        embed={false}
+      />
     );
   }
 }
diff --git a/src/containers/settings/InviteScreen.js b/src/containers/settings/InviteScreen.js
index 1947e79f0..5f341b1b3 100644
--- a/src/containers/settings/InviteScreen.js
+++ b/src/containers/settings/InviteScreen.js
@@ -1,24 +1,12 @@
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import { inject, observer } from 'mobx-react';
-import { defineMessages, intlShape } from 'react-intl';
 
 import Invite from '../../components/auth/Invite';
 import { gaPage } from '../../lib/analytics';
 
-const messages = defineMessages({
-  headline: {
-    id: 'settings.invite.headline',
-    defaultMessage: '!!!Invite Friends',
-  },
-});
-
 @inject('stores', 'actions') @observer
 export default class InviteScreen extends Component {
-  static contextTypes = {
-    intl: intlShape,
-  };
-
   componentDidMount() {
     gaPage('Settings/Invite');
   }
@@ -32,19 +20,12 @@ export default class InviteScreen extends Component {
     const { user } = this.props.stores;
 
     return (
-      <div className="settings__main">
-        <div className="settings__header">
-          <h1>{this.context.intl.formatMessage(messages.headline)}</h1>
-        </div>
-        <div className="settings__body invite__form">
-          <Invite
-            onSubmit={actions.user.invite}
-            isLoadingInvite={user.inviteRequest.isExecuting}
-            isInviteSuccessful={user.inviteRequest.wasExecuted && !user.inviteRequest.isError}
-            embed
-          />
-        </div>
-      </div>
+      <Invite
+        onSubmit={actions.user.invite}
+        isLoadingInvite={user.inviteRequest.isExecuting}
+        isInviteSuccessful={user.inviteRequest.wasExecuted && !user.inviteRequest.isError}
+        embed
+      />
     );
   }
 }