From 307c16df5f134f687a669f0efe0bf9bcb1c27437 Mon Sep 17 00:00:00 2001
From: Harrison Healey <harrisonmhealey@gmail.com>
Date: Thu, 31 Mar 2016 11:10:57 -0400
Subject: Fixed errors when joining a channel that doesn't exist yet

---
 webapp/components/popover_list_members.jsx | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'webapp/components/popover_list_members.jsx')

diff --git a/webapp/components/popover_list_members.jsx b/webapp/components/popover_list_members.jsx
index cd583e4c3..f21b8ee1c 100644
--- a/webapp/components/popover_list_members.jsx
+++ b/webapp/components/popover_list_members.jsx
@@ -57,7 +57,11 @@ export default class PopoverListMembers extends React.Component {
         const members = this.props.members;
         const teamMembers = UserStore.getProfilesUsernameMap();
         const currentUserId = UserStore.getCurrentId();
-        const ch = ChannelStore.getCurrent();
+        const ch = ChannelStore.get(this.props.channelId);
+
+        if (!ch) {
+            return null;
+        }
 
         if (members && teamMembers) {
             members.sort((a, b) => {
-- 
cgit v1.2.3-1-g7c22


From 098873e667126ad2e52bc6b61a1ad4e428c56ace Mon Sep 17 00:00:00 2001
From: Harrison Healey <harrisonmhealey@gmail.com>
Date: Thu, 31 Mar 2016 12:18:51 -0400
Subject: Changed ChannelHeader to pass channel to PopoverListMembers directly

---
 webapp/components/popover_list_members.jsx | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

(limited to 'webapp/components/popover_list_members.jsx')

diff --git a/webapp/components/popover_list_members.jsx b/webapp/components/popover_list_members.jsx
index f21b8ee1c..226a1889c 100644
--- a/webapp/components/popover_list_members.jsx
+++ b/webapp/components/popover_list_members.jsx
@@ -9,8 +9,6 @@ import * as Utils from 'utils/utils.jsx';
 import * as GlobalActions from 'action_creators/global_actions.jsx';
 import Constants from 'utils/constants.jsx';
 
-import ChannelStore from 'stores/channel_store.jsx';
-
 import {FormattedMessage} from 'react-intl';
 
 import React from 'react';
@@ -57,11 +55,6 @@ export default class PopoverListMembers extends React.Component {
         const members = this.props.members;
         const teamMembers = UserStore.getProfilesUsernameMap();
         const currentUserId = UserStore.getCurrentId();
-        const ch = ChannelStore.get(this.props.channelId);
-
-        if (!ch) {
-            return null;
-        }
 
         if (members && teamMembers) {
             members.sort((a, b) => {
@@ -73,7 +66,7 @@ export default class PopoverListMembers extends React.Component {
 
             members.forEach((m, i) => {
                 let button = '';
-                if (currentUserId !== m.id && ch.type !== 'D') {
+                if (currentUserId !== m.id && this.props.channel.type !== 'D') {
                     button = (
                         <a
                             href='#'
@@ -181,7 +174,7 @@ export default class PopoverListMembers extends React.Component {
 }
 
 PopoverListMembers.propTypes = {
+    channel: React.PropTypes.object.isRequired,
     members: React.PropTypes.array.isRequired,
-    memberCount: React.PropTypes.number,
-    channelId: React.PropTypes.string.isRequired
+    memberCount: React.PropTypes.number
 };
-- 
cgit v1.2.3-1-g7c22

