Merge pull request #4178 from n0emis/crosssigning-presence
Show the room presence indicator, even when cross-singing is enabled
This commit is contained in:
commit
3527fae275
1 changed files with 9 additions and 9 deletions
|
@ -490,16 +490,16 @@ export default createReactClass({
|
||||||
height="13"
|
height="13"
|
||||||
alt="dm"
|
alt="dm"
|
||||||
/>;
|
/>;
|
||||||
|
}
|
||||||
|
|
||||||
const { room } = this.props;
|
const { room } = this.props;
|
||||||
const member = room.getMember(dmUserId);
|
const member = room.getMember(dmUserId);
|
||||||
if (
|
if (
|
||||||
member && member.membership === "join" && room.getJoinedMemberCount() === 2 &&
|
member && member.membership === "join" && room.getJoinedMemberCount() === 2 &&
|
||||||
SettingsStore.isFeatureEnabled("feature_presence_in_room_list")
|
SettingsStore.isFeatureEnabled("feature_presence_in_room_list")
|
||||||
) {
|
) {
|
||||||
const UserOnlineDot = sdk.getComponent('rooms.UserOnlineDot');
|
const UserOnlineDot = sdk.getComponent('rooms.UserOnlineDot');
|
||||||
dmOnline = <UserOnlineDot userId={dmUserId} />;
|
dmOnline = <UserOnlineDot userId={dmUserId} />;
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// The following labels are written in such a fashion to increase screen reader efficiency (speed).
|
// The following labels are written in such a fashion to increase screen reader efficiency (speed).
|
||||||
|
|
Loading…
Reference in a new issue