This commit is contained in:
Bruno Windels 2020-01-17 16:31:38 +01:00
parent 5556cb5749
commit a73b7229a7
2 changed files with 4 additions and 2 deletions

View file

@ -1455,7 +1455,6 @@ export default createReactClass({
cli.on("crypto.verification.request", request => { cli.on("crypto.verification.request", request => {
console.log(`MatrixChat got a .request ${request.channel.transactionId}`, request.event.getRoomId()); console.log(`MatrixChat got a .request ${request.channel.transactionId}`, request.event.getRoomId());
if (request.pending) { if (request.pending) {
console.log(`emitting toast for verification request with txnid ${request.channel.transactionId}`, request.event && request.event.getId());
ToastStore.sharedInstance().addOrReplaceToast({ ToastStore.sharedInstance().addOrReplaceToast({
key: 'verifreq_' + request.channel.transactionId, key: 'verifreq_' + request.channel.transactionId,
title: _t("Verification Request"), title: _t("Verification Request"),

View file

@ -41,7 +41,10 @@ export default class VerificationPanel extends React.PureComponent {
if (request.requested) { if (request.requested) {
return (<p>Waiting for {request.otherUserId} to accept ... <Spinner /></p>); return (<p>Waiting for {request.otherUserId} to accept ... <Spinner /></p>);
} else if (request.ready) { } else if (request.ready) {
return (<p>{request.otherUserId} is ready, start <AccessibleButton kind="primary" onClick={this._startSAS}>Verify by emoji</AccessibleButton></p>); const verifyButton = <AccessibleButton kind="primary" onClick={this._startSAS}>
Verify by emoji
</AccessibleButton>;
return (<p>{request.otherUserId} is ready, start {verifyButton}</p>);
} else if (request.started) { } else if (request.started) {
if (this.state.sasWaitingForOtherParty) { if (this.state.sasWaitingForOtherParty) {
return <p>Waiting for {request.otherUserId} to confirm ...</p>; return <p>Waiting for {request.otherUserId} to confirm ...</p>;