From 7bdd9f57a59d89838686b6aca0c74c5a1b13007d Mon Sep 17 00:00:00 2001
From: Kegan Dougal <kegan@matrix.org>
Date: Wed, 3 Feb 2016 16:16:52 +0000
Subject: [PATCH 1/2] Add MatrixChat.onNewVersion to trigger the new version
 bar

---
 src/components/structures/MatrixChat.js | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/src/components/structures/MatrixChat.js b/src/components/structures/MatrixChat.js
index fb6d36ce35..677d69de6d 100644
--- a/src/components/structures/MatrixChat.js
+++ b/src/components/structures/MatrixChat.js
@@ -804,6 +804,12 @@ module.exports = React.createClass({
         this.showScreen("settings");
     },
 
+    onNewVersion: function(current, latest) {
+        this.setState({
+            hasNewVersion: true
+        });
+    },
+
     updateFavicon: function() {
         var notifCount = 0;
 
@@ -851,6 +857,7 @@ module.exports = React.createClass({
         var RoomDirectory = sdk.getComponent('structures.RoomDirectory');
         var MatrixToolbar = sdk.getComponent('globals.MatrixToolbar');
         var GuestWarningBar = sdk.getComponent('globals.GuestWarningBar');
+        var NewVersionBar = sdk.getComponent('globals.NewVersionBar');
         var ForgotPassword = sdk.getComponent('structures.login.ForgotPassword');
 
         // needs to be before normal PageTypes as you are logged in technically
@@ -920,6 +927,19 @@ module.exports = React.createClass({
                             </div>
                         </div>
                 );
+            } else if (this.state.hasNewVersion) {
+                return (
+                        <div className="mx_MatrixChat_wrapper">
+                            <NewVersionBar />
+                            <div className="mx_MatrixChat mx_MatrixChat_toolbarShowing">
+                                <LeftPanel selectedRoom={this.state.currentRoom} collapsed={this.state.collapse_lhs} />
+                                <main className="mx_MatrixChat_middlePanel">
+                                    {page_element}
+                                </main>
+                                {right_panel}
+                            </div>
+                        </div>
+                );
             }
             else {
                 return (

From 8b96af4ccbef2660be629218748f4ddabe9ae415 Mon Sep 17 00:00:00 2001
From: Kegan Dougal <kegan@matrix.org>
Date: Wed, 3 Feb 2016 16:51:53 +0000
Subject: [PATCH 2/2] Display the version in UserSettings. Change
 MatrixChat.onNewVersion to onVersion

---
 src/components/structures/MatrixChat.js   | 7 ++++---
 src/components/structures/UserSettings.js | 3 +++
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/components/structures/MatrixChat.js b/src/components/structures/MatrixChat.js
index 677d69de6d..a46efc8025 100644
--- a/src/components/structures/MatrixChat.js
+++ b/src/components/structures/MatrixChat.js
@@ -804,9 +804,10 @@ module.exports = React.createClass({
         this.showScreen("settings");
     },
 
-    onNewVersion: function(current, latest) {
+    onVersion: function(current, latest) {
         this.setState({
-            hasNewVersion: true
+            version: current,
+            hasNewVersion: current !== latest
         });
     },
 
@@ -887,7 +888,7 @@ module.exports = React.createClass({
                     right_panel = <RightPanel roomId={this.state.currentRoom} collapsed={this.state.collapse_rhs} />
                     break;
                 case this.PageTypes.UserSettings:
-                    page_element = <UserSettings onClose={this.onUserSettingsClose} />
+                    page_element = <UserSettings onClose={this.onUserSettingsClose} version={this.state.version} />
                     right_panel = <RightPanel collapsed={this.state.collapse_rhs}/>
                     break;
                 case this.PageTypes.CreateRoom:
diff --git a/src/components/structures/UserSettings.js b/src/components/structures/UserSettings.js
index 9bf0793fc3..8f7e138bc0 100644
--- a/src/components/structures/UserSettings.js
+++ b/src/components/structures/UserSettings.js
@@ -30,6 +30,7 @@ module.exports = React.createClass({
     displayName: 'UserSettings',
 
     propTypes: {
+        version: React.PropTypes.string,
         onClose: React.PropTypes.func
     },
 
@@ -377,6 +378,8 @@ module.exports = React.createClass({
                     </div>
                     <div className="mx_UserSettings_advanced">
                         Version {this.state.clientVersion}
+                        <br />
+                        {this.props.version}
                     </div>
                 </div>