From 2a1d32f4d5d8ff3db9c5cea480ef56c8069987c4 Mon Sep 17 00:00:00 2001
From: Luke Barnard <lukeb@openmarket.com>
Date: Fri, 11 Nov 2016 13:49:25 +0000
Subject: [PATCH 1/2] Add key prop to memberlist summary

---
 src/components/structures/MessagePanel.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/structures/MessagePanel.js b/src/components/structures/MessagePanel.js
index 298372a4d8..ef4d10e66b 100644
--- a/src/components/structures/MessagePanel.js
+++ b/src/components/structures/MessagePanel.js
@@ -321,7 +321,7 @@ module.exports = React.createClass({
                 }
 
                 ret.push(
-                    <MemberEventListSummary events={summarisedEvents}>
+                    <MemberEventListSummary key={mxEv.getId()} events={summarisedEvents}>
                         {eventTiles}
                     </MemberEventListSummary>
                 );

From 5109833c4277277cd8236ea3ce8dc19cd99f9bef Mon Sep 17 00:00:00 2001
From: Luke Barnard <lukeb@openmarket.com>
Date: Fri, 11 Nov 2016 13:55:32 +0000
Subject: [PATCH 2/2] Use correct prop types

---
 src/components/views/avatars/MemberAvatar.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/views/avatars/MemberAvatar.js b/src/components/views/avatars/MemberAvatar.js
index 7f9630d416..161c37ef55 100644
--- a/src/components/views/avatars/MemberAvatar.js
+++ b/src/components/views/avatars/MemberAvatar.js
@@ -30,9 +30,9 @@ module.exports = React.createClass({
         height: React.PropTypes.number,
         resizeMethod: React.PropTypes.string,
         // The onClick to give the avatar
-        onClick: React.PropTypes.function,
+        onClick: React.PropTypes.func,
         // Whether the onClick of the avatar should be overriden to dispatch 'view_user'
-        viewUserOnClick: React.PropTypes.boolean,
+        viewUserOnClick: React.PropTypes.bool,
     },
 
     getDefaultProps: function() {