PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

Undo abortive first attempt at factoring out

Browse source
This commit is contained in:
David Baker 2019-01-19 11:54:01 +00:00
parent 630a6a479b
commit 60a8d560d1
1 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/components/views/dialogs/DeviceVerifyDialog.js
View file

@ -24,7 +24,6 @@ import * as FormattingUtils from '../../../utils/FormattingUtils';
import { _t } from '../../../languageHandler'; import { _t } from '../../../languageHandler';
import SettingsStore from '../../../settings/SettingsStore'; import SettingsStore from '../../../settings/SettingsStore';
import {verificationMethods} from 'matrix-js-sdk/lib/crypto'; import {verificationMethods} from 'matrix-js-sdk/lib/crypto';
import {renderSasWaitAccept} from '../../../sas_ui';
const MODE_LEGACY = 'legacy'; const MODE_LEGACY = 'legacy';
const MODE_SAS = 'sas'; const MODE_SAS = 'sas';
@ -128,7 +127,7 @@ export default class DeviceVerifyDialog extends React.Component {
body = this._renderSasVerificationPhaseStart(); body = this._renderSasVerificationPhaseStart();
break; break;
case PHASE_WAIT_FOR_PARTNER_TO_ACCEPT: case PHASE_WAIT_FOR_PARTNER_TO_ACCEPT:
body = renderSasWaitAccept(this.props.userId); body = this._renderSasVerificationPhaseWaitAccept();
break; break;
case PHASE_SHOW_SAS: case PHASE_SHOW_SAS:
body = this._renderSasVerificationPhaseShowSas(); body = this._renderSasVerificationPhaseShowSas();
@ -184,6 +183,17 @@ export default class DeviceVerifyDialog extends React.Component {
); );
} }
_renderSasVerificationPhaseWaitAccept() {
const Spinner = sdk.getComponent("views.elements.Spinner");
return (
<div>
<Spinner />
<p>{_t("Waiting for partner to accept...")}</p>
</div>
);
}
_renderSasVerificationPhaseShowSas() { _renderSasVerificationPhaseShowSas() {
const VerificationShowSas = sdk.getComponent('views.verification.VerificationShowSas'); const VerificationShowSas = sdk.getComponent('views.verification.VerificationShowSas');
return <VerificationShowSas return <VerificationShowSas