From 3c0290588ca1ec951775aef4aab5406fd6947ca8 Mon Sep 17 00:00:00 2001 From: David Baker Date: Mon, 5 Jun 2017 16:17:32 +0100 Subject: [PATCH 1/2] Always show the spinner during the first sync Before, we were relying on the fact that `ready` would still have been false from before. This was not the case, for example, if we naviagted straight to /#/login (which causes a guest session to be set up and the sync for that completes after we navigate to the login screen). We should always mark ourselves as not-ready after login since we will always have to wait for the sync. --- src/components/structures/MatrixChat.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/structures/MatrixChat.js b/src/components/structures/MatrixChat.js index 72a745107e..e3792410b2 100644 --- a/src/components/structures/MatrixChat.js +++ b/src/components/structures/MatrixChat.js @@ -507,7 +507,7 @@ module.exports = React.createClass({ this._onSetTheme(payload.value); break; case 'on_logging_in': - this.setState({loggingIn: true}); + this.setState({loggingIn: true, ready: false}); break; case 'on_logged_in': this._onLoggedIn(payload.teamToken); From 3dbea45426fdace08e68982373fce5ef4c176e6d Mon Sep 17 00:00:00 2001 From: David Baker Date: Mon, 5 Jun 2017 16:50:00 +0100 Subject: [PATCH 2/2] Comment --- src/components/structures/MatrixChat.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/components/structures/MatrixChat.js b/src/components/structures/MatrixChat.js index e3792410b2..c4d3df03d3 100644 --- a/src/components/structures/MatrixChat.js +++ b/src/components/structures/MatrixChat.js @@ -507,6 +507,10 @@ module.exports = React.createClass({ this._onSetTheme(payload.value); break; case 'on_logging_in': + // We are now logging in, so set the state to reflect that + // and also that we're not ready (we'll be marked as logged + // in once the login completes, then ready once the sync + // completes). this.setState({loggingIn: true, ready: false}); break; case 'on_logged_in':