diff --git a/src/components/views/groups/GroupMemberList.js b/src/components/views/groups/GroupMemberList.js index 85e17a5bb3..273a04da20 100644 --- a/src/components/views/groups/GroupMemberList.js +++ b/src/components/views/groups/GroupMemberList.js @@ -90,11 +90,10 @@ export default withMatrixClient(React.createClass({ let memberList = this.state.members; if (query) { memberList = memberList.filter((m) => { - // TODO: add this when we have this info from the API - //const matchesName = m.name.toLowerCase().indexOf(query) !== -1; + const matchesName = m.displayname.toLowerCase().indexOf(query) !== -1; const matchesId = m.userId.toLowerCase().includes(query); - if (/*!matchesName &&*/ !matchesId) { + if (!matchesName && !matchesId) { return false; } diff --git a/src/components/views/groups/GroupMemberTile.js b/src/components/views/groups/GroupMemberTile.js index 9ffde967f0..705fa56cae 100644 --- a/src/components/views/groups/GroupMemberTile.js +++ b/src/components/views/groups/GroupMemberTile.js @@ -47,10 +47,13 @@ export default withMatrixClient(React.createClass({ const BaseAvatar = sdk.getComponent('avatars.BaseAvatar'); const EntityTile = sdk.getComponent('rooms.EntityTile'); - const name = this.props.member.userId; + const name = this.props.member.displayname || this.props.member.userId; const av = ( - + ); return ( diff --git a/src/groups.js b/src/groups.js index 06627a4ae3..24c0562bde 100644 --- a/src/groups.js +++ b/src/groups.js @@ -18,10 +18,14 @@ import PropTypes from 'prop-types'; export const GroupMemberType = PropTypes.shape({ userId: PropTypes.string.isRequired, + displayname: PropTypes.string, + avatarUrl: PropTypes.string, }); export function groupMemberFromApiObject(apiObject) { return { userId: apiObject.user_id, + displayname: apiObject.displayname, + avatarUrl: apiObject.avatar_url, }; }