From 5edb0ec9122ffb578afcd8d90c3eb13bb92b621c Mon Sep 17 00:00:00 2001
From: Stuart Mumford <stuart@cadair.com>
Date: Sat, 18 Jan 2020 23:23:46 +0000
Subject: [PATCH] Resolve correct screen not being shown after new registration

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

diff --git a/src/components/structures/MatrixChat.js b/src/components/structures/MatrixChat.js
index a9bb8e3a7d..e226b6aaf7 100644
--- a/src/components/structures/MatrixChat.js
+++ b/src/components/structures/MatrixChat.js
@@ -1182,7 +1182,15 @@ export default createReactClass({
     _onLoggedIn: async function() {
         ThemeController.isLogin = false;
         this.setStateForNewView({ view: VIEWS.LOGGED_IN });
-        if (MatrixClientPeg.currentUserIsJustRegistered()) {
+        // If a specific screen is set to be shown after login, show that above
+        // all else, as it probably means the user clicked on something already.
+        if (this._screenAfterLogin && this._screenAfterLogin.screen) {
+            this.showScreen(
+                this._screenAfterLogin.screen,
+                this._screenAfterLogin.params,
+            );
+            this._screenAfterLogin = null;
+        } else if (MatrixClientPeg.currentUserIsJustRegistered()) {
             MatrixClientPeg.setJustRegisteredUserId(null);
 
             if (this.props.config.welcomeUserId && getCurrentLanguage().startsWith("en")) {