OpenCloud
/
element-web
mirror of https://github.com/vector-im/element-web
1
0
Fork 0
Code Issues Releases Wiki Activity

cram the EncryptionPanel in CompleteSecurity instead of IncomingSasDialog 

so we get QR code support and support phases prior to STARTED
pull/21833/head
Bruno Windels 2020-01-31 12:20:48 +01:00
parent bc5a59339b
commit 3d91ff23ec
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/components/structures/auth/CompleteSecurity.js
View File

@ -138,9 +138,11 @@ export default class CompleteSecurity extends React.Component {
let body; let body;
if (this.state.verificationRequest) { if (this.state.verificationRequest) {
const IncomingSasDialog = sdk.getComponent("views.dialogs.IncomingSasDialog"); const EncryptionPanel = sdk.getComponent("views.right_panel.EncryptionPanel");
body = <IncomingSasDialog verifier={this.state.verificationRequest.verifier} body = <EncryptionPanel
onFinished={this.props.onFinished} verificationRequest={this.state.verificationRequest}
onClose={this.props.onFinished}
member={MatrixClientPeg.get().getUser(this.state.verificationRequest.otherUserId)}
/>; />;
} else if (phase === PHASE_INTRO) { } else if (phase === PHASE_INTRO) {
icon = <span className="mx_CompleteSecurity_headerIcon mx_E2EIcon_warning"></span>; icon = <span className="mx_CompleteSecurity_headerIcon mx_E2EIcon_warning"></span>;