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

Merge pull request #4081 from matrix-org/bwindels/cancelondialogclose

Browse source 
Cancel verification request on dialog close
This commit is contained in:
Bruno Windels 2020-02-20 11:00:00 +00:00 committed by GitHub
commit 913caf67a9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/components/views/dialogs/VerificationRequestDialog.js
View file

@ -26,10 +26,15 @@ export default class VerificationRequestDialog extends React.Component {
onFinished: PropTypes.func.isRequired, onFinished: PropTypes.func.isRequired,
}; };
constructor(...args) {
super(...args);
this.onFinished = this.onFinished.bind(this);
}
render() { render() {
const BaseDialog = sdk.getComponent("views.dialogs.BaseDialog"); const BaseDialog = sdk.getComponent("views.dialogs.BaseDialog");
const EncryptionPanel = sdk.getComponent("views.right_panel.EncryptionPanel"); const EncryptionPanel = sdk.getComponent("views.right_panel.EncryptionPanel");
return <BaseDialog className="mx_InfoDialog" onFinished={this.props.onFinished} return <BaseDialog className="mx_InfoDialog" onFinished={this.onFinished}
contentId="mx_Dialog_content" contentId="mx_Dialog_content"
title={_t("Verification Request")} title={_t("Verification Request")}
hasCancel={true} hasCancel={true}
@ -42,4 +47,9 @@ export default class VerificationRequestDialog extends React.Component {
/> />
</BaseDialog>; </BaseDialog>;
} }
onFinished() {
this.props.verificationRequest.cancel();
this.props.onFinished();
}
} }