Merge pull request #1410 from hmhealey/plt906

PLT-906 Added ChannelExtra.MemberCount field

1 files changed, 5 insertions, 1 deletions

diff --git a/web/react/components/channel_header.jsx b/web/react/components/channel_header.jsx
index 895dc5fe4..dcc3bf87d 100644
--- a/web/react/components/channel_header.jsx
+++ b/web/react/components/channel_header.jsx
@@ -39,11 +39,14 @@ export default class ChannelHeader extends React.Component {
         this.state = state;
     }
     getStateFromStores() {
+        const extraInfo = ChannelStore.getCurrentExtraInfo();
+
         return {
             channel: ChannelStore.getCurrent(),
             memberChannel: ChannelStore.getCurrentMember(),
             memberTeam: UserStore.getCurrentUser(),
-            users: ChannelStore.getCurrentExtraInfo().members,
+            users: extraInfo.members,
+            userCount: extraInfo.member_count,
             searchVisible: SearchStore.getSearchResults() !== null
         };
     }
@@ -373,6 +376,7 @@ export default class ChannelHeader extends React.Component {
                             <th>
                                 <PopoverListMembers
                                     members={this.state.users}
+                                    memberCount={this.state.userCount}
                                     channelId={channel.id}
                                 />
                             </th>