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

Merge pull request #5816 from aaronraimist/redact-re-request 

Prevent Re-request encryption keys from appearing under redacted messages
pull/21833/head
Travis Ralston 2021-03-31 18:23:47 -06:00 committed by GitHub
parent 7c4437ac9b 4974cb43af
commit 2ab304189d
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

@ -936,7 +936,7 @@ export default class EventTile extends React.Component {
); );
const TooltipButton = sdk.getComponent('elements.TooltipButton'); const TooltipButton = sdk.getComponent('elements.TooltipButton');
const keyRequestInfo = isEncryptionFailure ? const keyRequestInfo = isEncryptionFailure && !isRedacted ?
<div className="mx_EventTile_keyRequestInfo"> <div className="mx_EventTile_keyRequestInfo">
<span className="mx_EventTile_keyRequestInfo_text"> <span className="mx_EventTile_keyRequestInfo_text">
{ keyRequestInfoContent } { keyRequestInfoContent }