diff --git a/src/components/views/dialogs/IncomingSasDialog.js b/src/components/views/dialogs/IncomingSasDialog.js index 5158b004f3..0720fedddc 100644 --- a/src/components/views/dialogs/IncomingSasDialog.js +++ b/src/components/views/dialogs/IncomingSasDialog.js @@ -34,9 +34,15 @@ export default class IncomingSasDialog extends React.Component { constructor(props) { super(props); + let phase = PHASE_START; + if (this.props.verifier.cancelled) { + console.log("Verifier was cancelled in the background."); + phase = PHASE_CANCELLED; + } + this._showSasEvent = null; this.state = { - phase: PHASE_START, + phase: phase, sasVerified: false, opponentProfile: null, opponentProfileError: null, @@ -46,13 +52,6 @@ export default class IncomingSasDialog extends React.Component { this._fetchOpponentProfile(); } - componentWillMount() { - if (this.props.verifier.cancelled) { - console.log("Verifier was cancelled in the background."); - this.setState({phase: PHASE_CANCELLED}); - } - } - componentWillUnmount() { if (this.state.phase !== PHASE_CANCELLED && this.state.phase !== PHASE_VERIFIED) { this.props.verifier.cancel('User cancel');