Merge pull request #5816 from aaronraimist/redact-re-request
Prevent Re-request encryption keys from appearing under redacted messages
This commit is contained in:
commit
2ab304189d
1 changed files with 1 additions and 1 deletions
|
@ -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 }
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue