diff options
author | Christopher Speller <crspeller@gmail.com> | 2016-03-07 17:14:15 -0500 |
---|---|---|
committer | Christopher Speller <crspeller@gmail.com> | 2016-03-07 17:14:15 -0500 |
commit | e0c08d4ed609adf3e324d07810862b6853792a94 (patch) | |
tree | 0f08f0c5089c70c6f0bacbaf6b06d7edf1f25833 /web/react | |
parent | 1dde831daf29497343492b2101c52b4cc1ef5aad (diff) | |
parent | 8f917a2925d9e99c5dc7710c3df7b0d5d755a0df (diff) | |
download | chat-e0c08d4ed609adf3e324d07810862b6853792a94.tar.gz chat-e0c08d4ed609adf3e324d07810862b6853792a94.tar.bz2 chat-e0c08d4ed609adf3e324d07810862b6853792a94.zip |
Merge pull request #2348 from hmhealey/member
Updated Channel Members modal UI
Diffstat (limited to 'web/react')
-rw-r--r-- | web/react/components/channel_members_modal.jsx | 8 | ||||
-rw-r--r-- | web/react/components/user_list_row.jsx | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/web/react/components/channel_members_modal.jsx b/web/react/components/channel_members_modal.jsx index 688ab7dd2..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) { @@ -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> ); diff --git a/web/react/components/user_list_row.jsx b/web/react/components/user_list_row.jsx index 2aeca7d47..d75078619 100644 --- a/web/react/components/user_list_row.jsx +++ b/web/react/components/user_list_row.jsx @@ -10,9 +10,9 @@ export default function UserListRow({user, actions}) { let name = user.username; if (user.nickname && nameFormat === Constants.Preferences.DISPLAY_PREFER_NICKNAME) { - name = `${user.nickname} (${user.username})`; + name = `${user.nickname} (@${user.username})`; } else if ((user.first_name || user.last_name) && (nameFormat === Constants.Preferences.DISPLAY_PREFER_NICKNAME || nameFormat === Constants.Preferences.DISPLAY_PREFER_FULL_NAME)) { - name = `${Utils.getFullName(user)} (${user.username})`; + name = `${Utils.getFullName(user)} (@${user.username})`; } const buttons = actions.map((Action, index) => { |