From ce1383721693e850456b68e4d5782b88c420b4d8 Mon Sep 17 00:00:00 2001
From: Luke Barnard <lukeb@openmarket.com>
Date: Thu, 28 Sep 2017 09:46:10 +0100
Subject: [PATCH 1/2] Remove `key` prop pass-thru on HeaderButton

This is redundant and throws a warning
---
 src/components/structures/RightPanel.js | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/components/structures/RightPanel.js b/src/components/structures/RightPanel.js
index 90b4c5f67d..2a7416a3d3 100644
--- a/src/components/structures/RightPanel.js
+++ b/src/components/structures/RightPanel.js
@@ -45,11 +45,7 @@ class HeaderButton extends React.Component {
         const TintableSvg = sdk.getComponent("elements.TintableSvg");
         const AccessibleButton = sdk.getComponent("elements.AccessibleButton");
 
-        return <AccessibleButton
-            className="mx_RightPanel_headerButton"
-            key={this.props.key}
-            onClick={ this.onClick }
-        >
+        return <AccessibleButton className="mx_RightPanel_headerButton" onClick={ this.onClick } >
             <div className="mx_RightPanel_headerButton_badge">
                 { this.props.badge ? this.props.badge : <span>&nbsp;</span>}
             </div>

From f9a92ad15a7525dbb728a104a21074529130ca84 Mon Sep 17 00:00:00 2001
From: Luke Barnard <lukeb@openmarket.com>
Date: Thu, 28 Sep 2017 10:02:16 +0100
Subject: [PATCH 2/2] Lint

---
 src/components/structures/RightPanel.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/structures/RightPanel.js b/src/components/structures/RightPanel.js
index 2a7416a3d3..c671d65f7a 100644
--- a/src/components/structures/RightPanel.js
+++ b/src/components/structures/RightPanel.js
@@ -45,9 +45,9 @@ class HeaderButton extends React.Component {
         const TintableSvg = sdk.getComponent("elements.TintableSvg");
         const AccessibleButton = sdk.getComponent("elements.AccessibleButton");
 
-        return <AccessibleButton className="mx_RightPanel_headerButton" onClick={ this.onClick } >
+        return <AccessibleButton className="mx_RightPanel_headerButton" onClick={this.onClick} >
             <div className="mx_RightPanel_headerButton_badge">
-                { this.props.badge ? this.props.badge : <span>&nbsp;</span>}
+                { this.props.badge ? this.props.badge : <span>&nbsp;</span> }
             </div>
             <TintableSvg src={this.props.iconSrc} width="25" height="25"/>
             { this.props.isHighlighted ? <div className="mx_RightPanel_headerButton_highlight"></div> : <div/> }