diff options
author | haraldox <hnaumann+github@gmail.com> | 2018-01-22 14:26:31 +0100 |
---|---|---|
committer | haraldox <hnaumann+github@gmail.com> | 2018-01-22 14:26:31 +0100 |
commit | 945cb5982c4b1b42d17ce91171b6a6740eb3a3e5 (patch) | |
tree | 8481794625abecea3230e49f789b7336be512bf0 /src/containers | |
parent | ADDED invite button in Account Settings (diff) | |
download | ferdium-app-945cb5982c4b1b42d17ce91171b6a6740eb3a3e5.tar.gz ferdium-app-945cb5982c4b1b42d17ce91171b6a6740eb3a3e5.tar.zst ferdium-app-945cb5982c4b1b42d17ce91171b6a6740eb3a3e5.zip |
return to account screen from invite screen
cheap solution because `state` prop of `<Link>` is not being passed to route
Diffstat (limited to 'src/containers')
-rw-r--r-- | src/containers/auth/InviteScreen.js | 8 | ||||
-rw-r--r-- | src/containers/settings/AccountScreen.js | 1 |
2 files changed, 6 insertions, 3 deletions
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 { | |||
11 | } | 11 | } |
12 | 12 | ||
13 | render() { | 13 | render() { |
14 | const { actions } = this.props; | 14 | const { |
15 | 15 | actions, | |
16 | console.log(this.props.location.state) | 16 | location |
17 | } = this.props; | ||
17 | 18 | ||
18 | return ( | 19 | return ( |
19 | <Invite | 20 | <Invite |
20 | onSubmit={actions.user.invite} | 21 | onSubmit={actions.user.invite} |
22 | from={location.query.from} | ||
21 | /> | 23 | /> |
22 | ); | 24 | ); |
23 | } | 25 | } |
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 { | |||
83 | deleteAccount={userActions.delete} | 83 | deleteAccount={userActions.delete} |
84 | isLoadingDeleteAccount={user.deleteAccountRequest.isExecuting} | 84 | isLoadingDeleteAccount={user.deleteAccountRequest.isExecuting} |
85 | isDeleteAccountSuccessful={user.deleteAccountRequest.wasExecuted && !user.deleteAccountRequest.isError} | 85 | isDeleteAccountSuccessful={user.deleteAccountRequest.wasExecuted && !user.deleteAccountRequest.isError} |
86 | pathname={this.props.location.pathname} | ||
86 | /> | 87 | /> |
87 | ); | 88 | ); |
88 | } | 89 | } |