return to account screen from invite screen

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

6 files changed, 21 insertions, 11 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,
diff --git a/src/containers/auth/InviteScreen.js b/src/containers/auth/InviteScreen.js
index 6b39b1dd1..a624e2245 100644
--- a/src/containers/auth/InviteScreen.js
+++ b/src/containers/auth/InviteScreen.js
@@ -11,13 +11,15 @@ export default class InviteScreen extends Component {
   }
 
   render() {
-    const { actions } = this.props;
-
-    console.log(this.props.location.state)
+    const { 
+      actions,
+      location
+    } = this.props;
 
     return (
       <Invite
         onSubmit={actions.user.invite}
+        from={location.query.from}
       />
     );
   }
diff --git a/src/containers/settings/AccountScreen.js b/src/containers/settings/AccountScreen.js
index c5c2982b0..b57530884 100644
--- a/src/containers/settings/AccountScreen.js
+++ b/src/containers/settings/AccountScreen.js
@@ -83,6 +83,7 @@ export default class AccountScreen extends Component {
         deleteAccount={userActions.delete}
         isLoadingDeleteAccount={user.deleteAccountRequest.isExecuting}
         isDeleteAccountSuccessful={user.deleteAccountRequest.wasExecuted && !user.deleteAccountRequest.isError}
+        pathname={this.props.location.pathname}
       />
     );
   }
diff --git a/src/stores/UserStore.js b/src/stores/UserStore.js
index 2c164f1bf..476c1f040 100644
--- a/src/stores/UserStore.js
+++ b/src/stores/UserStore.js
@@ -160,15 +160,13 @@ export default class UserStore extends Store {
     gaEvent('User', 'retrievePassword');
   }
 
-  @action _invite({ invites }) {
+  @action _invite({ invites, from }) {
     const data = invites.filter(invite => invite.email !== '');
 
     this.inviteRequest.execute(data);
 
-    console.log(this.stores.router.location )
-
     // we do not wait for a server response before redirecting the user
-    this.stores.router.push('/');
+    this.stores.router.push(!!from ? from : '/');
 
     gaEvent('User', 'inviteUsers');
   }