diff options
author | Alex Ford <alexrford@users.noreply.github.com> | 2017-07-07 17:13:13 +0100 |
---|---|---|
committer | Joram Wilander <jwawilander@gmail.com> | 2017-07-07 12:13:13 -0400 |
commit | e6ca2974cd504b26eee2549deb59b924daa4a104 (patch) | |
tree | e60b052c11c8b8c4b8b1e00e979a4f8a3aa84696 /webapp/components | |
parent | 39b071bc0e620b24a9dc8b13fcd6ccf5f6732ea5 (diff) | |
download | chat-e6ca2974cd504b26eee2549deb59b924daa4a104.tar.gz chat-e6ca2974cd504b26eee2549deb59b924daa4a104.tar.bz2 chat-e6ca2974cd504b26eee2549deb59b924daa4a104.zip |
Fix for SignupEmail invite handling (#6820)
* Fix SignupEmail invite handling
* Fix eslint errors
Diffstat (limited to 'webapp/components')
-rw-r--r-- | webapp/components/signup/components/signup_email.jsx | 39 |
1 files changed, 21 insertions, 18 deletions
diff --git a/webapp/components/signup/components/signup_email.jsx b/webapp/components/signup/components/signup_email.jsx index 25d2c25bd..872439eda 100644 --- a/webapp/components/signup/components/signup_email.jsx +++ b/webapp/components/signup/components/signup_email.jsx @@ -52,9 +52,9 @@ export default class SignupEmail extends React.Component { let teamDisplayName = ''; let teamName = ''; let teamId = ''; - let loading = true; - let serverError = ''; - let noOpenServerError = false; + let loading = false; + const serverError = ''; + const noOpenServerError = false; if (hash && hash.length > 0) { const parsedData = JSON.parse(data); @@ -62,37 +62,40 @@ export default class SignupEmail extends React.Component { teamDisplayName = parsedData.display_name; teamName = parsedData.name; teamId = parsedData.id; - loading = false; } else if (inviteId && inviteId.length > 0) { loading = true; getInviteInfo( inviteId, (inviteData) => { if (!inviteData) { + this.setState({loading: false}); return; } - serverError = ''; - teamDisplayName = inviteData.display_name; - teamName = inviteData.name; - teamId = inviteData.id; + this.setState({ + loading: false, + serverError: '', + teamDisplayName: inviteData.display_name, + teamName: inviteData.name, + teamId: inviteData.id + }); }, () => { - noOpenServerError = true; - serverError = ( - <FormattedMessage - id='signup_user_completed.invalid_invite' - defaultMessage='The invite link was invalid. Please speak with your Administrator to receive an invitation.' - /> - ); + this.setState({ + loading: false, + noOpenServerError: true, + serverError: ( + <FormattedMessage + id='signup_user_completed.invalid_invite' + defaultMessage='The invite link was invalid. Please speak with your Administrator to receive an invitation.' + /> + ) + }); } ); - loading = false; data = null; hash = null; - } else { - loading = false; } return { |