imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Hide inline encryption icons except when hovering over a message

Browse source 
Closes https://github.com/vector-im/riot-web/issues/2882

This is a redo of https://github.com/matrix-org/matrix-react-sdk/pull/1707 (see associated discussion there and here: https://github.com/vector-im/riot-web/pull/5988)

I tried several times to resolve the conflicts correctly, but could not. Thus, fresh PR.
This commit is contained in:
Eric Newport 2018-04-22 22:30:37 -04:00
parent 44d92bb32e
commit d42fa9d17a
5 changed files with 22 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/components/views/rooms/EventTile.js
View file

@ -742,7 +742,11 @@ function E2ePadlockUnencrypted(props) {
}
function E2ePadlock(props) {
return <img className="mx_EventTile_e2eIcon" {...props} />;
if (SettingsStore.getValue("alwaysShowEncryptionIcons")) {
return <img className="mx_EventTile_e2eIcon" {...props} />;
} else {
return <img className="mx_EventTile_e2eIcon" hidden {...props} />;
}
}
module.exports.getHandlerTile = getHandlerTile;