From e2a0cba6cb4e42e10602ab604e7c560df1e31995 Mon Sep 17 00:00:00 2001
From: Luke Barnard <luke@matrix.org>
Date: Wed, 8 Nov 2017 13:57:38 +0000
Subject: [PATCH] If group member privilege level is equal, disambiguate with
 displayname or userId

---
 src/components/views/groups/GroupMemberList.js | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/components/views/groups/GroupMemberList.js b/src/components/views/groups/GroupMemberList.js
index 8520ac3321..063051625f 100644
--- a/src/components/views/groups/GroupMemberList.js
+++ b/src/components/views/groups/GroupMemberList.js
@@ -110,7 +110,19 @@ export default withMatrixClient(React.createClass({
         memberList = Object.keys(uniqueMembers).map((userId) => uniqueMembers[userId]);
         // Descending sort on isPrivileged = true = 1 to isPrivileged = false = 0
         memberList.sort((a, b) => {
-            return b.isPrivileged - a.isPrivileged;
+            if (a.isPrivileged === b.isPrivileged) {
+                const aName = a.displayname || a.userId;
+                const bName = b.displayname || b.userId;
+                if (aName < bName) {
+                    return -1;
+                } else if (aName > bName) {
+                    return 1;
+                } else {
+                    return 0;
+                }
+            } else {
+                return a.isPrivileged ? -1 : 1;
+            }
         });
 
         const memberTiles = memberList.map((m) => {