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

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
+1 -1
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 }