From 37897e6283c693352c0d1ff0af8c06617c2b7b8d Mon Sep 17 00:00:00 2001
From: Harrison Healey <harrisonmhealey@gmail.com>
Date: Mon, 7 Mar 2016 09:41:38 -0500
Subject: Changed 'Remove Member' to 'Remove' in Channel Members modal

---
 web/react/components/channel_members_modal.jsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'web/react/components/channel_members_modal.jsx')

diff --git a/web/react/components/channel_members_modal.jsx b/web/react/components/channel_members_modal.jsx
index 688ab7dd2..d67ebf7d4 100644
--- a/web/react/components/channel_members_modal.jsx
+++ b/web/react/components/channel_members_modal.jsx
@@ -130,8 +130,8 @@ export default class ChannelMembersModal extends React.Component {
                 onClick={this.handleRemove.bind(this, user)}
             >
                 <FormattedMessage
-                    id='channel_members_modal.removeMember'
-                    defaultMessage='Remove Member'
+                    id='channel_members_modal.remove'
+                    defaultMessage='Remove'
                 />
             </button>
         );
-- 
cgit v1.2.3-1-g7c22


From 8f917a2925d9e99c5dc7710c3df7b0d5d755a0df Mon Sep 17 00:00:00 2001
From: Harrison Healey <harrisonmhealey@gmail.com>
Date: Mon, 7 Mar 2016 09:55:57 -0500
Subject: Changed Channel Members modal to list full user objects with all
 fields populated

---
 web/react/components/channel_members_modal.jsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'web/react/components/channel_members_modal.jsx')

diff --git a/web/react/components/channel_members_modal.jsx b/web/react/components/channel_members_modal.jsx
index d67ebf7d4..3ec93a616 100644
--- a/web/react/components/channel_members_modal.jsx
+++ b/web/react/components/channel_members_modal.jsx
@@ -44,6 +44,7 @@ export default class ChannelMembersModal extends React.Component {
     }
     getStateFromStores() {
         const extraInfo = ChannelStore.getCurrentExtraInfo();
+        const profiles = UserStore.getActiveOnlyProfiles();
 
         if (extraInfo.member_count !== extraInfo.members.length) {
             AsyncClient.getChannelExtraInfo(this.props.channel.id, -1);
@@ -53,9 +54,8 @@ export default class ChannelMembersModal extends React.Component {
             };
         }
 
-        // clone the member list since we mutate it later on
         const memberList = extraInfo.members.map((member) => {
-            return Object.assign({}, member);
+            return profiles[member.id];
         });
 
         function compareByUsername(a, b) {
-- 
cgit v1.2.3-1-g7c22

