3 files changed, 36 insertions, 6 deletions

diff --git a/src/components/auth/Invite.js b/src/components/auth/Invite.js
index c4c35d538..1fe594d73 100644
--- a/src/components/auth/Invite.js
+++ b/src/components/auth/Invite.js
@@ -69,6 +69,11 @@ export default class Invite extends Component {
     this.form.submit({
       onSuccess: (form) => {
 
+        this.props.onSubmit({ 
+          invites: form.values().invite,
+          from: this.props.from
+        });
+
         const atLeastOneEmailAddress = form.$('invite')
           .map(invite => {return invite.$('email').value})
           .some(email => email.trim() !== '')
@@ -87,6 +92,7 @@ export default class Invite extends Component {
   render() {
     const { form } = this;
     const { intl } = this.context;
+    const { from } = this.props;
 
     const atLeastOneEmailAddress = form.$('invite')
       .map(invite => {return invite.$('email').value})
@@ -123,7 +129,7 @@ export default class Invite extends Component {
             label={intl.formatMessage(messages.submitButtonLabel)}
           />
           <Link
-            to="/"
+            to={ !!from ? from : '/'}
             className="franz-form__button franz-form__button--secondary auth__button auth__button--skip"
           >
             {intl.formatMessage(messages.skipButtonLabel)}
diff --git a/src/components/settings/account/AccountDashboard.js b/src/components/settings/account/AccountDashboard.js
index 43272fe96..d5f2e238c 100644
--- a/src/components/settings/account/AccountDashboard.js
+++ b/src/components/settings/account/AccountDashboard.js
@@ -48,6 +48,11 @@ const messages = defineMessages({
     id: 'settings.account.account.editButton',
     defaultMessage: '!!!Edit Account',
   },
+  accountInviteButton: {
+    id: "settings.account.account.inviteButton",
+    defaultMessage: '!!!Invite Friends',
+  },
+
   invoiceDownload: {
     id: 'settings.account.invoiceDownload',
     defaultMessage: '!!!Download',
@@ -113,6 +118,7 @@ export default class AccountDashboard extends Component {
       deleteAccount,
       isLoadingDeleteAccount,
       isDeleteAccountSuccessful,
+      pathname,
     } = this.props;
     const { intl } = this.context;
 
@@ -174,10 +180,25 @@ export default class AccountDashboard extends Component {
                         <span className="badge badge--premium">{intl.formatMessage(messages.accountTypePremium)}</span>
                       )}
                     </div>
-                    <Link to="/settings/user/edit" className="button">
-                      {intl.formatMessage(messages.accountEditButton)}
-                    </Link>
-
+                    <div className="grid">
+                      <div className="grid__row">
+                        <Link to="/settings/user/edit" className="button account__edit-button">
+                          {intl.formatMessage(messages.accountEditButton)}
+                        </Link>
+                      </div>
+                      <div className="grid__row">
+                        <Link
+                          to={{
+                            pathname: '/auth/signup/invite',
+                            query: { from: pathname },
+                            // state: { "from": 'hi' } // is not being passed to route
+                          }}
+                          className="button account__invite-button">
+                          {intl.formatMessage(messages.accountInviteButton)}
+                        </Link>  
+                      </div>
+                    </div>
+                    
                     {user.emailValidated}
                   </div>
                 </div>
diff --git a/src/components/ui/Link.js b/src/components/ui/Link.js
index f5da921fa..bc3c2d8aa 100644
--- a/src/components/ui/Link.js
+++ b/src/components/ui/Link.js
@@ -62,7 +62,10 @@ Link.wrappedComponent.propTypes = {
     oneOrManyChildElements,
     PropTypes.string,
   ]).isRequired,
-  to: PropTypes.string.isRequired,
+  to: PropTypes.oneOfType([
+    PropTypes.string,
+    PropTypes.object
+  ]).isRequired,
   className: PropTypes.string,
   activeClassName: PropTypes.string,
   strictFilter: PropTypes.bool,