From 2ba4ad04d1428c77c8fc0eb8bed2f7457856fe68 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Mon, 22 Jun 2015 13:15:14 +0100
Subject: [PATCH] Little fixes on member list

---
 src/controllers/molecules/MemberTile.js | 4 +++-
 src/controllers/organisms/MemberList.js | 1 +
 src/views/organisms/MemberList.js       | 3 +--
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/controllers/molecules/MemberTile.js b/src/controllers/molecules/MemberTile.js
index e23ac2904e..41b350a9d3 100644
--- a/src/controllers/molecules/MemberTile.js
+++ b/src/controllers/molecules/MemberTile.js
@@ -1,10 +1,12 @@
 var dis = require("../../dispatcher");
 
+var MatrixClientPeg = require("../../MatrixClientPeg");
+
 module.exports = {
     onClick: function() {
         dis.dispatch({
             action: 'view_user',
-            room_id: this.props.member.userId
+            user_id: this.props.member.userId
         });
     },
 };
diff --git a/src/controllers/organisms/MemberList.js b/src/controllers/organisms/MemberList.js
index 191db90d31..66243a0afd 100644
--- a/src/controllers/organisms/MemberList.js
+++ b/src/controllers/organisms/MemberList.js
@@ -22,6 +22,7 @@ module.exports = {
     },*/
 
     onRoomStateMember: function(ev, state, member) {
+        var cli = MatrixClientPeg.get();
         this.setState({
             memberDict: cli.getRoom(this.props.roomId).currentState.members
         });
diff --git a/src/views/organisms/MemberList.js b/src/views/organisms/MemberList.js
index 499cf12836..e76f9cb6e6 100644
--- a/src/views/organisms/MemberList.js
+++ b/src/views/organisms/MemberList.js
@@ -16,10 +16,9 @@ module.exports = React.createClass({
         return Object.keys(that.state.memberDict).map(function(userId) {
             var m = that.state.memberDict[userId];
             return (
-                <li>
+                <li key={userId}>
                 <MemberTile
                     member={m}
-                    key={userId}
                 />
                 </li>
             );