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 1/3] 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 (

From 58ec732fb36961dd113a9a47071e772b1adb259d Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Mon, 25 Sep 2017 14:51:21 +0100
Subject: [PATCH 2/3] Add width/height/resizeMethod params

---
 src/components/views/groups/GroupMemberInfo.js | 7 ++++++-
 src/components/views/groups/GroupMemberTile.js | 6 +++++-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/components/views/groups/GroupMemberInfo.js b/src/components/views/groups/GroupMemberInfo.js
index 3e0e82433c..e66c635f1f 100644
--- a/src/components/views/groups/GroupMemberInfo.js
+++ b/src/components/views/groups/GroupMemberInfo.js
@@ -152,10 +152,15 @@ 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}
-                url={this.props.matrixClient.mxcUrlToHttp(this.props.groupMember.avatarUrl)}
+                url={avatarUrl}
             />
         );
 
diff --git a/src/components/views/groups/GroupMemberTile.js b/src/components/views/groups/GroupMemberTile.js
index 705fa56cae..66d45e2f71 100644
--- 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}
             />
         );
 

From 0b96871be4919998bae8a7c13988329455cbe9f9 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Mon, 25 Sep 2017 15:07:02 +0100
Subject: [PATCH 3/3] Lint

---
 src/components/views/groups/GroupMemberInfo.js | 2 +-
 src/components/views/groups/GroupMemberTile.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/views/groups/GroupMemberInfo.js b/src/components/views/groups/GroupMemberInfo.js
index e66c635f1f..499fb43ccb 100644
--- a/src/components/views/groups/GroupMemberInfo.js
+++ b/src/components/views/groups/GroupMemberInfo.js
@@ -154,7 +154,7 @@ module.exports = withMatrixClient(React.createClass({
 
         const avatarUrl = this.props.matrixClient.mxcUrlToHttp(
             this.props.groupMember.avatarUrl,
-            36, 36, 'crop'
+            36, 36, 'crop',
         );
 
         const BaseAvatar = sdk.getComponent('avatars.BaseAvatar');
diff --git a/src/components/views/groups/GroupMemberTile.js b/src/components/views/groups/GroupMemberTile.js
index 66d45e2f71..f40c7ed1c5 100644
--- a/src/components/views/groups/GroupMemberTile.js
+++ b/src/components/views/groups/GroupMemberTile.js
@@ -50,7 +50,7 @@ export default withMatrixClient(React.createClass({
         const name = this.props.member.displayname || this.props.member.userId;
         const avatarUrl = this.props.matrixClient.mxcUrlToHttp(
             this.props.member.avatarUrl,
-            36, 36, 'crop'
+            36, 36, 'crop',
         );
 
         const av = (