From 7045906d5d61dfded52c937e833a6034b5435412 Mon Sep 17 00:00:00 2001 From: David Baker Date: Fri, 15 Jan 2016 18:58:18 +0000 Subject: [PATCH 1/2] Show user settings screen on registration instead of the PostRegister stuff. --- src/components/structures/MatrixChat.js | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/components/structures/MatrixChat.js b/src/components/structures/MatrixChat.js index e5af2a86b5..1286592665 100644 --- a/src/components/structures/MatrixChat.js +++ b/src/components/structures/MatrixChat.js @@ -697,7 +697,14 @@ module.exports = React.createClass({ onRegistered: function(credentials) { this.onLoggedIn(credentials); // do post-registration stuff - this.showScreen("post_registration"); + // This now goes straight to user settings + // We use _setPage since if we wait for + // showScreen to do the dispatch loop, + // we'll see the page type is still unset + // when the MatrixClient is started and show + // the Room Directory instead. + //this.showScreen("view_user_settings"); + this._setPage(this.PageTypes.UserSettings); }, onFinishPostRegistration: function() { From 0ac997491ef0bad4dbd234f1df54c5126a98b240 Mon Sep 17 00:00:00 2001 From: David Baker Date: Mon, 18 Jan 2016 14:23:31 +0000 Subject: [PATCH 2/2] Clarify comment --- src/components/structures/MatrixChat.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/components/structures/MatrixChat.js b/src/components/structures/MatrixChat.js index 1286592665..7a52132af2 100644 --- a/src/components/structures/MatrixChat.js +++ b/src/components/structures/MatrixChat.js @@ -700,9 +700,10 @@ module.exports = React.createClass({ // This now goes straight to user settings // We use _setPage since if we wait for // showScreen to do the dispatch loop, - // we'll see the page type is still unset - // when the MatrixClient is started and show - // the Room Directory instead. + // the showScreen dispatch will race with the + // sdk sync finishing and we'll probably see + // the page type still unset when the MatrixClient + // is started and show the Room Directory instead. //this.showScreen("view_user_settings"); this._setPage(this.PageTypes.UserSettings); },