return to account screen from invite screen

cheap solution because `state` prop of `<Link>` is not being passed to route

3 files changed, 13 insertions, 4 deletions

diff --git a/src/components/auth/Invite.js b/src/components/auth/Invite.js
index c1d815dcd..d4d789781 100644
--- a/src/components/auth/Invite.js
+++ b/src/components/auth/Invite.js
@@ -64,7 +64,10 @@ export default class Invite extends Component {
     e.preventDefault();
     this.form.submit({
       onSuccess: (form) => {
-        this.props.onSubmit({ invites: form.values().invite });
+        this.props.onSubmit({ 
+          invites: form.values().invite,
+          from: this.props.from
+        });
       },
       onError: () => {},
     });
@@ -73,6 +76,7 @@ export default class Invite extends Component {
   render() {
     const { form } = this;
     const { intl } = this.context;
+    const { from } = this.props;
 
     return (
       <div className="auth__container auth__container--signup">
@@ -99,7 +103,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 1e71beadf..d5f2e238c 100644
--- a/src/components/settings/account/AccountDashboard.js
+++ b/src/components/settings/account/AccountDashboard.js
@@ -118,6 +118,7 @@ export default class AccountDashboard extends Component {
       deleteAccount,
       isLoadingDeleteAccount,
       isDeleteAccountSuccessful,
+      pathname,
     } = this.props;
     const { intl } = this.context;
 
@@ -189,7 +190,8 @@ export default class AccountDashboard extends Component {
                         <Link
                           to={{
                             pathname: '/auth/signup/invite',
-                            state: { fromSettings: true }
+                            query: { from: pathname },
+                            // state: { "from": 'hi' } // is not being passed to route
                           }}
                           className="button account__invite-button">
                           {intl.formatMessage(messages.accountInviteButton)}
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,