matrix/matrix-react-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-react-sdk.git synced 2025-11-11 20:22:36 +03:00
Code Activity

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

Browse Source 
Prevent Re-request encryption keys from appearing under redacted messages
This commit is contained in:
Travis Ralston
2021-03-31 18:23:47 -06:00
committed by GitHub
parent 7c4437ac9b 4974cb43af
commit 2ab304189d
1 changed files with 1 additions and 1 deletions
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 }