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

Merge pull request #4664 from matrix-org/foldleft/13523-hide-empty-verifications 

Bubble up a decline-to-render of verification events to outside wrapper
pull/21833/head
Travis Ralston 2020-06-03 10:10:06 -06:00 committed by GitHub
parent 3c922329fe 472c421150
commit 013751e308
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/views/rooms/EventTile.js
View File

@ -104,7 +104,7 @@ export function getHandlerTile(ev) {
// fall back to showing hidden events, if we're viewing hidden events // fall back to showing hidden events, if we're viewing hidden events
// XXX: This is extremely a hack. Possibly these components should have an interface for // XXX: This is extremely a hack. Possibly these components should have an interface for
// declining to render? // declining to render?
if (type === "m.key.verification.cancel" && SettingsStore.getValue("showHiddenEventsInTimeline")) { if (type === "m.key.verification.cancel" || type === "m.key.verification.done") {
const MKeyVerificationConclusion = sdk.getComponent("messages.MKeyVerificationConclusion"); const MKeyVerificationConclusion = sdk.getComponent("messages.MKeyVerificationConclusion");
if (!MKeyVerificationConclusion.prototype._shouldRender.call(null, ev, ev.request)) { if (!MKeyVerificationConclusion.prototype._shouldRender.call(null, ev, ev.request)) {
return; return;