Fix merge conflict between react warnings and SSO

2020-04-01 11:32:13 -06:00
parent 36ccb7e752
commit c0ffa8b59a
1 changed files with 2 additions and 4 deletions
--- a/src/components/views/auth/InteractiveAuthEntryComponents.js
+++ b/src/components/views/auth/InteractiveAuthEntryComponents.js
@@ -455,10 +455,6 @@ export const MsisdnAuthEntry = createReactClass({
        onPhaseChange: PropTypes.func.isRequired,
    },

-    componentDidMount: function() {
-        this.props.onPhaseChange(DEFAULT_PHASE);
-    },
-
    getInitialState: function() {
        return {
            token: '',
@@ -467,6 +463,8 @@ export const MsisdnAuthEntry = createReactClass({
    },

    componentDidMount: function() {
+        this.props.onPhaseChange(DEFAULT_PHASE);
+
        this._submitUrl = null;
        this._sid = null;
        this._msisdn = null;