matrix/matrix-js-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-js-sdk.git synced 2025-11-23 17:02:25 +03:00
Code Activity

Exclude cancelled requests from in-progress lists (#5016)

Browse Source 
Fixes https://github.com/element-hq/element-web/issues/29882

When we ask for the in-progress verification requests, exclude requests
that have been cancelled. This means that we don't erroneously tell the
user that the new request they are about to create has been cancelled.
This commit is contained in:
Andy Balaam
2025-09-23 14:51:19 +01:00
committed by GitHub
parent 9f3ca71495
commit dbe441de33
2 changed files with 54 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/rust-crypto/rust-crypto.ts
View File

@@ -1040,7 +1040,7 @@ export class RustCrypto extends TypedEventEmitter<RustCryptoEvents, CryptoEventH
new RustSdkCryptoJs.UserId(userId),
);
return requests
.filter((request) => request.roomId === undefined)
.filter((request) => request.roomId === undefined && !request.isCancelled())
.map((request) => this.makeVerificationRequest(request));
}
@@ -1063,7 +1063,7 @@ export class RustCrypto extends TypedEventEmitter<RustCryptoEvents, CryptoEventH
);
// Search for the verification request for the given room id
const request = requests.find((request) => request.roomId?.toString() === roomId);
const request = requests.find((request) => request.roomId?.toString() === roomId && !request.isCancelled());
if (request) {
return this.makeVerificationRequest(request);