diff options
author | haraldox <hnaumann+github@gmail.com> | 2018-02-06 09:10:31 +0100 |
---|---|---|
committer | haraldox <hnaumann+github@gmail.com> | 2018-02-06 09:10:31 +0100 |
commit | 48059682d04c5911add9f962a85ef6d514355ee5 (patch) | |
tree | 9f22d69b0720a3162a9492037feaa2369c829656 /src/containers | |
parent | Merge branch 'develop' into feature/invite-button (diff) | |
download | ferdium-app-48059682d04c5911add9f962a85ef6d514355ee5.tar.gz ferdium-app-48059682d04c5911add9f962a85ef6d514355ee5.tar.zst ferdium-app-48059682d04c5911add9f962a85ef6d514355ee5.zip |
[MINOR] house cleaning
Diffstat (limited to 'src/containers')
-rw-r--r-- | src/containers/auth/InviteScreen.js | 11 | ||||
-rw-r--r-- | src/containers/settings/AccountScreen.js | 6 |
2 files changed, 2 insertions, 15 deletions
diff --git a/src/containers/auth/InviteScreen.js b/src/containers/auth/InviteScreen.js index 7102df0b9..e54d8d225 100644 --- a/src/containers/auth/InviteScreen.js +++ b/src/containers/auth/InviteScreen.js | |||
@@ -11,16 +11,12 @@ export default class InviteScreen extends Component { | |||
11 | } | 11 | } |
12 | 12 | ||
13 | render() { | 13 | render() { |
14 | const { | 14 | const { actions } = this.props; |
15 | actions, | ||
16 | location, | ||
17 | } = this.props; | ||
18 | 15 | ||
19 | return ( | 16 | return ( |
20 | <div className="auth__container auth__container--signup"> | 17 | <div className="auth__container auth__container--signup"> |
21 | <Invite | 18 | <Invite |
22 | onSubmit={actions.user.invite} | 19 | onSubmit={actions.user.invite} |
23 | from={location.query.from} | ||
24 | embed={false} | 20 | embed={false} |
25 | /> | 21 | /> |
26 | </div> | 22 | </div> |
@@ -34,9 +30,4 @@ InviteScreen.wrappedComponent.propTypes = { | |||
34 | invite: PropTypes.func.isRequired, | 30 | invite: PropTypes.func.isRequired, |
35 | }).isRequired, | 31 | }).isRequired, |
36 | }).isRequired, | 32 | }).isRequired, |
37 | location: PropTypes.shape({ | ||
38 | query: PropTypes.shape({ | ||
39 | from: PropTypes.string, | ||
40 | }), | ||
41 | }).isRequired, | ||
42 | }; | 33 | }; |
diff --git a/src/containers/settings/AccountScreen.js b/src/containers/settings/AccountScreen.js index 9ee93a9e9..c5c2982b0 100644 --- a/src/containers/settings/AccountScreen.js +++ b/src/containers/settings/AccountScreen.js | |||
@@ -61,7 +61,7 @@ export default class AccountScreen extends Component { | |||
61 | render() { | 61 | render() { |
62 | const { user, payment } = this.props.stores; | 62 | const { user, payment } = this.props.stores; |
63 | const { openExternalUrl } = this.props.actions.app; | 63 | const { openExternalUrl } = this.props.actions.app; |
64 | const { user: userActions } = this.props.actions; // @adlk: :+1 what's the opposite of git blame? | 64 | const { user: userActions } = this.props.actions; |
65 | 65 | ||
66 | const isLoadingUserInfo = user.getUserInfoRequest.isExecuting; | 66 | const isLoadingUserInfo = user.getUserInfoRequest.isExecuting; |
67 | const isLoadingOrdersInfo = payment.ordersDataRequest.isExecuting; | 67 | const isLoadingOrdersInfo = payment.ordersDataRequest.isExecuting; |
@@ -83,7 +83,6 @@ 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} | ||
87 | /> | 86 | /> |
88 | ); | 87 | ); |
89 | } | 88 | } |
@@ -107,7 +106,4 @@ AccountScreen.wrappedComponent.propTypes = { | |||
107 | delete: PropTypes.func.isRequired, | 106 | delete: PropTypes.func.isRequired, |
108 | }).isRequired, | 107 | }).isRequired, |
109 | }).isRequired, | 108 | }).isRequired, |
110 | location: PropTypes.shape({ | ||
111 | pathname: PropTypes.string, | ||
112 | }).isRequired, | ||
113 | }; | 109 | }; |