summaryrefslogtreecommitdiffstats
path: root/webapp/components/user_list_row.jsx
diff options
context:
space:
mode:
authorJonathan <jonfritz@gmail.com>2017-07-24 08:22:19 -0400
committerHarrison Healey <harrisonmhealey@gmail.com>2017-07-24 08:22:19 -0400
commit87746227bfbc738bf79bda35cb8c06859f186c18 (patch)
treee585a2e6379b25dd1478090e314a3f3224b8f7ea /webapp/components/user_list_row.jsx
parentb27d51d512bbb73fb322d5613dafa299843f05b9 (diff)
downloadchat-87746227bfbc738bf79bda35cb8c06859f186c18.tar.gz
chat-87746227bfbc738bf79bda35cb8c06859f186c18.tar.bz2
chat-87746227bfbc738bf79bda35cb8c06859f186c18.zip
PLT-3470: Changed all instances of user list to show full name, username, and nickname (#6994)
Diffstat (limited to 'webapp/components/user_list_row.jsx')
-rw-r--r--webapp/components/user_list_row.jsx8
1 files changed, 1 insertions, 7 deletions
diff --git a/webapp/components/user_list_row.jsx b/webapp/components/user_list_row.jsx
index c8a4ac7ba..af71a8f0d 100644
--- a/webapp/components/user_list_row.jsx
+++ b/webapp/components/user_list_row.jsx
@@ -14,12 +14,6 @@ import React from 'react';
import {FormattedHTMLMessage} from 'react-intl';
export default function UserListRow({user, extraInfo, actions, actionProps, actionUserProps, userCount}) {
- const displayName = Utils.displayUsernameForUser(user);
- let name = `${displayName} (@${user.username})`;
- if (displayName === user.username) {
- name = user.username;
- }
-
let buttons = null;
if (actions) {
buttons = actions.map((Action, index) => {
@@ -80,7 +74,7 @@ export default function UserListRow({user, extraInfo, actions, actionProps, acti
id={userCountID}
className='more-modal__name'
>
- {name}
+ {Utils.displayEntireNameForUser(user)}
</div>
<div
id={userCountEmail}