From 2e376b1eb9a08f34867df66d19149bb7c1a6b7dd Mon Sep 17 00:00:00 2001
From: Kegan Dougal <kegan@matrix.org>
Date: Fri, 20 Nov 2015 14:27:39 +0000
Subject: [PATCH] Clear the 'screen' to load the main left/middle/right panels,
 then show the settings after post-reg is done

---
 src/components/login/PostRegistration.js   | 8 ++------
 src/skins/vector/views/pages/MatrixChat.js | 4 ++++
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/components/login/PostRegistration.js b/src/components/login/PostRegistration.js
index 28e825eeef..20a58f1141 100644
--- a/src/components/login/PostRegistration.js
+++ b/src/components/login/PostRegistration.js
@@ -44,7 +44,6 @@ module.exports = React.createClass({
         this.setState({busy: true});
         var self = this;
         cli.getProfileInfo(cli.credentials.userId).done(function(result) {
-            console.log("Avatar: %s", MatrixClientPeg.get().mxcUrlToHttp(result.avatar_url));
             self.setState({
                 avatarUrl: MatrixClientPeg.get().mxcUrlToHttp(result.avatar_url),
                 busy: false
@@ -57,10 +56,6 @@ module.exports = React.createClass({
         });
     },
 
-    onProfileContinueClicked: function() {
-        console.log("onProfileContinueClicked");
-    },
-
     render: function() {
         var ChangeDisplayName = sdk.getComponent('molecules.ChangeDisplayName');
         var ChangeAvatar = sdk.getComponent('molecules.ChangeAvatar');
@@ -76,7 +71,8 @@ module.exports = React.createClass({
                         Upload an avatar:
                         <ChangeAvatar
                             initialAvatarUrl={this.state.avatarUrl} />
-                        <button onClick={this.onProfileContinueClicked}>Continue</button>
+                        <button onClick={this.props.onComplete}>Continue</button>
+                        {this.state.errorString}
                     </div>
                 </div>
             </div>
diff --git a/src/skins/vector/views/pages/MatrixChat.js b/src/skins/vector/views/pages/MatrixChat.js
index 9690533f5b..7a583495fe 100644
--- a/src/skins/vector/views/pages/MatrixChat.js
+++ b/src/skins/vector/views/pages/MatrixChat.js
@@ -118,6 +118,10 @@ module.exports = React.createClass({
 
     onFinishPostRegistration: function() {
         console.log("onFinishPostRegistration");
+        // Don't confuse this with "PageType" which is the middle window to show
+        this.setState({
+            screen: undefined
+        });
         this.showScreen("settings");
     },