From c0ffa8b59a33ce2b3431d7146343a8bbbff18062 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Wed, 1 Apr 2020 11:32:13 -0600
Subject: [PATCH] Fix merge conflict between react warnings and SSO

---
 src/components/views/auth/InteractiveAuthEntryComponents.js | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/components/views/auth/InteractiveAuthEntryComponents.js b/src/components/views/auth/InteractiveAuthEntryComponents.js
index 0ed93ed7d3..327451be17 100644
--- 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;