Merge pull request #3831 from matrix-org/jryans/feature-presence-indicator

Add feature flag around the presence indicator in room list
This commit is contained in:
J. Ryan Stinnett 2020-01-13 12:25:00 +00:00 committed by GitHub
commit 56a7b6c33e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 1 deletions

View file

@ -394,7 +394,10 @@ module.exports = createReactClass({
const { room } = this.props;
const member = room.getMember(dmUserId);
if (member && member.membership === "join" && room.getJoinedMemberCount() === 2) {
if (
member && member.membership === "join" && room.getJoinedMemberCount() === 2 &&
SettingsStore.isFeatureEnabled("feature_presence_in_room_list")
) {
const UserOnlineDot = sdk.getComponent('rooms.UserOnlineDot');
dmOnline = <UserOnlineDot userId={dmUserId} />;
}