Merge pull request #5657 from vector-im/luke/fix-member-count-format

Use badge count format for member count in RightPanel
This commit is contained in:
Luke Barnard 2017-11-20 13:30:40 +00:00 committed by GitHub
commit f2e66590da
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -29,6 +29,8 @@ import AccessibleButton from 'matrix-react-sdk/lib/components/views/elements/Acc
import { showGroupInviteDialog, showGroupAddRoomDialog } from 'matrix-react-sdk/lib/GroupAddressPicker'; import { showGroupInviteDialog, showGroupAddRoomDialog } from 'matrix-react-sdk/lib/GroupAddressPicker';
import GroupStoreCache from 'matrix-react-sdk/lib/stores/GroupStoreCache'; import GroupStoreCache from 'matrix-react-sdk/lib/stores/GroupStoreCache';
import { formatCount } from 'matrix-react-sdk/lib/utils/FormattingUtils';
class HeaderButton extends React.Component { class HeaderButton extends React.Component {
constructor() { constructor() {
super(); super();
@ -264,7 +266,7 @@ module.exports = React.createClass({
const room = cli.getRoom(this.props.roomId); const room = cli.getRoom(this.props.roomId);
let userIsInRoom; let userIsInRoom;
if (room) { if (room) {
membersBadge = room.getJoinedMembers().length; membersBadge = formatCount(room.getJoinedMembers().length);
userIsInRoom = room.hasMembershipState( userIsInRoom = room.hasMembershipState(
this.context.matrixClient.credentials.userId, 'join', this.context.matrixClient.credentials.userId, 'join',
); );