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

Design pass for room icons

Browse source
This commit is contained in:
Zoe 2020-01-24 12:59:46 +00:00
parent 1d686fe49e
commit 75da5b7944
3 changed files with 5 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/components/views/rooms/RoomList.js
View file

@ -719,7 +719,7 @@ export default createReactClass({
},
{
list: this.state.lists['im.vector.fake.direct'],
label: _t('People'),
label: _t('Direct Messages'),
tagName: "im.vector.fake.direct",
order: "recent",
incomingCall: incomingCallIfTaggedAs('im.vector.fake.direct'),

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

@ -478,7 +478,8 @@ export default createReactClass({
let dmIndicator;
let dmOnline;
if (dmUserId) {
// If we can place a shield, do that instead
if (dmUserId && !this.state.e2eStatus) {
dmIndicator = <img
src={require("../../../../res/img/icon_person.svg")}
className="mx_RoomTile_dm"
@ -527,8 +528,7 @@ export default createReactClass({
}
let e2eIcon = null;
// For now, skip the icon for DMs. Possibly we want to move the DM icon elsewhere?
if (!dmUserId && this.state.e2eStatus) {
if (this.state.e2eStatus) {
e2eIcon = <E2EIcon status={this.state.e2eStatus} className="mx_RoomTile_e2eIcon" />;
}