From cc453a048d50e57802bab9363b59c2189143b784 Mon Sep 17 00:00:00 2001
From: Asaad Mahmood <asaad@spinpunch.com>
Date: Tue, 8 Mar 2016 15:07:43 +0500
Subject: Multiple UI Improvements

---
 web/react/components/channel_members_modal.jsx | 9 ++++-----
 1 file changed, 4 insertions(+), 5 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..dc8e3baaf 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) {
@@ -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>
         );
@@ -178,7 +178,6 @@ export default class ChannelMembersModal extends React.Component {
                                 this.props.onModalDismissed();
                             }}
                         >
-                            <i className='glyphicon glyphicon-envelope'/>
                             <FormattedMessage
                                 id='channel_members_modal.addNew'
                                 defaultMessage=' Add New Members'
-- 
cgit v1.2.3-1-g7c22