Merge pull request #1426 from matrix-org/dbkr/profile_in_group_member…

…_info Show displayname / avatar in group member info
matrix-org · Sep 25, 2017 · d9c2f6e · d9c2f6e
2 parents af2df77 + 0b96871
commit d9c2f6e
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 3 deletions.
diff --git a/src/components/views/groups/GroupMemberInfo.js b/src/components/views/groups/GroupMemberInfo.js
@@ -152,12 +152,21 @@ module.exports = withMatrixClient(React.createClass({
                 </div>;
         }
 
+        const avatarUrl = this.props.matrixClient.mxcUrlToHttp(
+            this.props.groupMember.avatarUrl,
+            36, 36, 'crop',
+        );
+
         const BaseAvatar = sdk.getComponent('avatars.BaseAvatar');
         const avatar = (
-            <BaseAvatar name={this.props.groupMember.userId} width={36} height={36} />
+            <BaseAvatar name={this.props.groupMember.userId} width={36} height={36}
+                url={avatarUrl}
+            />
         );
 
-        const groupMemberName = this.props.groupMember.userId;
+        const groupMemberName = (
+            this.props.groupMember.displayname || this.props.groupMember.userId
+        );
 
         const EmojiText = sdk.getComponent('elements.EmojiText');
         return (

diff --git a/src/components/views/groups/GroupMemberTile.js b/src/components/views/groups/GroupMemberTile.js
@@ -48,11 +48,15 @@ export default withMatrixClient(React.createClass({
         const EntityTile = sdk.getComponent('rooms.EntityTile');
 
         const name = this.props.member.displayname || this.props.member.userId;
+        const avatarUrl = this.props.matrixClient.mxcUrlToHttp(
+            this.props.member.avatarUrl,
+            36, 36, 'crop',
+        );
 
         const av = (
             <BaseAvatar name={this.props.member.userId}
                 width={36} height={36}
-                url={this.props.matrixClient.mxcUrlToHttp(this.props.member.avatarUrl)}
+                url={avatarUrl}
             />
         );