diff options
| author | Reed Garmsen <rgarmsen2295@gmail.com> | 2015-10-23 18:07:54 -0700 |
|---|---|---|
| committer | Reed Garmsen <rgarmsen2295@gmail.com> | 2015-10-23 18:07:54 -0700 |
| commit | 8f487412a890759ce387bb8c80187fbfaf7e7452 (patch) | |
| tree | c9691d0cc3a49951f22f32cb3fcd79a4d64ab08c | |
| parent | 03140752e60addd13e162036fe6605629b5591c6 (diff) | |
| download | chat-8f487412a890759ce387bb8c80187fbfaf7e7452.tar.gz chat-8f487412a890759ce387bb8c80187fbfaf7e7452.tar.bz2 chat-8f487412a890759ce387bb8c80187fbfaf7e7452.zip | |
Fixed various React warnings during the team signup process
| -rw-r--r-- | web/react/components/team_signup_send_invites_page.jsx | 5 | ||||
| -rw-r--r-- | web/react/components/team_signup_url_page.jsx | 6 | ||||
| -rw-r--r-- | web/react/components/team_signup_welcome_page.jsx | 18 |
3 files changed, 13 insertions, 16 deletions
diff --git a/web/react/components/team_signup_send_invites_page.jsx b/web/react/components/team_signup_send_invites_page.jsx index b42343da0..7b4db8fae 100644 --- a/web/react/components/team_signup_send_invites_page.jsx +++ b/web/react/components/team_signup_send_invites_page.jsx @@ -15,11 +15,6 @@ export default class TeamSignupSendInvitesPage extends React.Component { this.state = { emailEnabled: global.window.mm_config.SendEmailNotifications === 'true' }; - - if (!this.state.emailEnabled) { - this.props.state.wizard = 'username'; - this.props.updateParent(this.props.state); - } } submitBack(e) { e.preventDefault(); diff --git a/web/react/components/team_signup_url_page.jsx b/web/react/components/team_signup_url_page.jsx index 6d333aed6..02d5cab8e 100644 --- a/web/react/components/team_signup_url_page.jsx +++ b/web/react/components/team_signup_url_page.jsx @@ -54,7 +54,11 @@ export default class TeamSignupUrlPage extends React.Component { if (data) { this.setState({nameError: 'This URL is unavailable. Please try another.'}); } else { - this.props.state.wizard = 'send_invites'; + if (global.window.mm_config.SendEmailNotifications === 'true') { + this.props.state.wizard = 'send_invites'; + } else { + this.props.state.wizard = 'username'; + } this.props.state.team.type = 'O'; this.props.state.team.name = name; diff --git a/web/react/components/team_signup_welcome_page.jsx b/web/react/components/team_signup_welcome_page.jsx index ee325fcaf..9448413ce 100644 --- a/web/react/components/team_signup_welcome_page.jsx +++ b/web/react/components/team_signup_welcome_page.jsx @@ -104,21 +104,19 @@ export default class TeamSignupWelcomePage extends React.Component { return ( <div> - <p> - <img - className='signup-team-logo' - src='/static/images/logo.png' - /> - <h3 className='sub-heading'>Welcome to:</h3> - <h1 className='margin--top-none'>{global.window.mm_config.SiteName}</h1> - </p> + <img + className='signup-team-logo' + src='/static/images/logo.png' + /> + <h3 className='sub-heading'>Welcome to:</h3> + <h1 className='margin--top-none'>{global.window.mm_config.SiteName}</h1> <p className='margin--less'>Let's set up your new team</p> - <p> + <div> Please confirm your email address:<br /> <div className='inner__content'> <div className='block--gray'>{this.props.state.team.email}</div> </div> - </p> + </div> <p className='margin--extra color--light'> Your account will administer the new team site. <br /> You can add other administrators later. |