From 5b312ffb03bdeb4465530ec29aba3473c725c113 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Mon, 25 Sep 2017 14:38:43 +0100
Subject: [PATCH] Show displayname / avatar in group member info

---
 src/components/views/groups/GroupMemberInfo.js | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/components/views/groups/GroupMemberInfo.js b/src/components/views/groups/GroupMemberInfo.js
index 8bf63e635a..3e0e82433c 100644
--- a/src/components/views/groups/GroupMemberInfo.js
+++ b/src/components/views/groups/GroupMemberInfo.js
@@ -154,10 +154,14 @@ module.exports = withMatrixClient(React.createClass({
 
         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={this.props.matrixClient.mxcUrlToHttp(this.props.groupMember.avatarUrl)}
+            />
         );
 
-        const groupMemberName = this.props.groupMember.userId;
+        const groupMemberName = (
+            this.props.groupMember.displayname || this.props.groupMember.userId
+        );
 
         const EmojiText = sdk.getComponent('elements.EmojiText');
         return (