merge devel
This commit is contained in:
@@ -60,6 +60,7 @@ class ContactList extends React.Component {
|
||||
}
|
||||
|
||||
const isChannel = Tinode.isChannelTopicName(key);
|
||||
const isGroup = !isChannel && Tinode.isGroupTopicName(key);
|
||||
const selected = showCheckmark ?
|
||||
(this.props.topicSelected.indexOf(key) > -1) :
|
||||
(this.props.topicSelected === key);
|
||||
@@ -112,6 +113,7 @@ class ContactList extends React.Component {
|
||||
selected={selected}
|
||||
showOnline={this.props.showOnline && !isChannel}
|
||||
isChannel={isChannel}
|
||||
isGroup={isGroup}
|
||||
showContextMenu={this.props.showContextMenu}
|
||||
isVerified={c.trusted && c.trusted.verified}
|
||||
isStaff={c.trusted && c.trusted.staff}
|
||||
|
||||
Reference in New Issue
Block a user