diff options
Diffstat (limited to 'src/containers')
-rw-r--r-- | src/containers/settings/AccountScreen.js | 2 | ||||
-rw-r--r-- | src/containers/settings/InviteScreen.js | 17 |
2 files changed, 14 insertions, 5 deletions
diff --git a/src/containers/settings/AccountScreen.js b/src/containers/settings/AccountScreen.js index 5b0f1073b..9ee93a9e9 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; | 64 | const { user: userActions } = this.props.actions; // @adlk: :+1 what's the opposite of git blame? |
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; |
diff --git a/src/containers/settings/InviteScreen.js b/src/containers/settings/InviteScreen.js index 923f08069..a1170bfec 100644 --- a/src/containers/settings/InviteScreen.js +++ b/src/containers/settings/InviteScreen.js | |||
@@ -22,11 +22,17 @@ export default class InviteScreen extends Component { | |||
22 | gaPage('Settings/Invite'); | 22 | gaPage('Settings/Invite'); |
23 | } | 23 | } |
24 | 24 | ||
25 | |||
26 | componentWillUnmount () { | ||
27 | this.props.stores.user.inviteRequest.reset() | ||
28 | } | ||
29 | |||
25 | render() { | 30 | render() { |
26 | const { | 31 | const { actions, location } = this.props; |
27 | actions, | 32 | const { user } = this.props.stores; |
28 | location, | 33 | |
29 | } = this.props; | 34 | const isLoadingInvite = user.inviteRequest.isExecuting; |
35 | const isInviteSuccessful = user.inviteRequest.wasExecuted && !user.inviteRequest.isError; | ||
30 | 36 | ||
31 | return ( | 37 | return ( |
32 | <div className="settings__main"> | 38 | <div className="settings__main"> |
@@ -36,6 +42,9 @@ export default class InviteScreen extends Component { | |||
36 | <div className="settings__body invite__form"> | 42 | <div className="settings__body invite__form"> |
37 | <Invite | 43 | <Invite |
38 | onSubmit={actions.user.invite} | 44 | onSubmit={actions.user.invite} |
45 | // status={user.actionStatus} // not needed | ||
46 | isLoadingInvite={user.inviteRequest.isExecuting} | ||
47 | isInviteSuccessful={user.inviteRequest.wasExecuted && !user.inviteRequest.isError} | ||
39 | from={location.query.from} | 48 | from={location.query.from} |
40 | embed={true} | 49 | embed={true} |
41 | success={location.query.success} | 50 | success={location.query.success} |