mirror of https://github.com/vector-im/riot-web
Fix merge conflict between react warnings and SSO
parent
36ccb7e752
commit
c0ffa8b59a
|
@ -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;
|
||||
|
|
Loading…
Reference in New Issue