Merge pull request #570 from rgarmsen2295/fix-initial-state-calls

Refactor remaining uses of getInitialState and componentWillMount

1 files changed, 5 insertions, 6 deletions

diff --git a/web/react/components/team_signup_send_invites_page.jsx b/web/react/components/team_signup_send_invites_page.jsx
index 35d2441c5..11a9980d7 100644
--- a/web/react/components/team_signup_send_invites_page.jsx
+++ b/web/react/components/team_signup_send_invites_page.jsx
@@ -18,6 +18,11 @@ export default class TeamSignupSendInvitesPage extends React.Component {
         this.state = {
             emailEnabled: !ConfigStore.getSettingAsBoolean('ByPassEmail', false)
         };
+
+        if (!this.state.emailEnabled) {
+            this.props.state.wizard = 'username';
+            this.props.updateParent(this.props.state);
+        }
     }
     submitBack(e) {
         e.preventDefault();
@@ -75,12 +80,6 @@ export default class TeamSignupSendInvitesPage extends React.Component {
             this.submitNext(e);
         }
     }
-    componentWillMount() {
-        if (!this.state.emailEnabled) {
-            this.props.state.wizard = 'username';
-            this.props.updateParent(this.props.state);
-        }
-    }
     componentDidMount() {
         if (!this.state.emailEnabled) {
             // Must use keypress not keyup due to event chain of pressing enter