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

cancel VRD at the Modal level, so clicking in the bg cancels it

pull/21833/head
Matthew Hodgson 2021-03-08 04:45:44 +00:00
parent 7673818400
commit 6df8157a40
2 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/components/views/dialogs/NewSessionReviewDialog.js
View File

@ -66,6 +66,10 @@ export default class NewSessionReviewDialog extends React.PureComponent {
Modal.createTrackedDialog('New Session Verification', 'Starting dialog', VerificationRequestDialog, { Modal.createTrackedDialog('New Session Verification', 'Starting dialog', VerificationRequestDialog, {
verificationRequestPromise: requestPromise, verificationRequestPromise: requestPromise,
member: cli.getUser(userId), member: cli.getUser(userId),
onFinished: async () => {
const request = await requestPromise;
request.cancel();
},
}); });
} }

13
src/components/views/dialogs/VerificationRequestDialog.js
View File

@ -25,11 +25,11 @@ export default class VerificationRequestDialog extends React.Component {
verificationRequest: PropTypes.object, verificationRequest: PropTypes.object,
verificationRequestPromise: PropTypes.object, verificationRequestPromise: PropTypes.object,
onFinished: PropTypes.func.isRequired, onFinished: PropTypes.func.isRequired,
member: PropTypes.string,
}; };
constructor(...args) { constructor(...args) {
super(...args); super(...args);
this.onFinished = this.onFinished.bind(this);
this.state = {}; this.state = {};
if (this.props.verificationRequest) { if (this.props.verificationRequest) {
this.state.verificationRequest = this.props.verificationRequest; this.state.verificationRequest = this.props.verificationRequest;
@ -50,7 +50,7 @@ export default class VerificationRequestDialog extends React.Component {
const title = request && request.isSelfVerification ? const title = request && request.isSelfVerification ?
_t("Verify other session") : _t("Verification Request"); _t("Verify other session") : _t("Verification Request");
return <BaseDialog className="mx_InfoDialog" onFinished={this.onFinished} return <BaseDialog className="mx_InfoDialog" onFinished={this.props.onFinished}
contentId="mx_Dialog_content" contentId="mx_Dialog_content"
title={title} title={title}
hasCancel={true} hasCancel={true}
@ -64,13 +64,4 @@ export default class VerificationRequestDialog extends React.Component {
/> />
</BaseDialog>; </BaseDialog>;
} }
async onFinished() {
this.props.onFinished();
let request = this.props.verificationRequest;
if (!request && this.props.verificationRequestPromise) {
request = await this.props.verificationRequestPromise;
}
request.cancel();
}
} }