From fa866800366c077dc2329303492788ae9240f139 Mon Sep 17 00:00:00 2001
From: Mattermost Build <build@mattermost.com>
Date: Thu, 2 Jul 2020 22:56:42 +0200
Subject: [PATCH] Wait for hydration before app launch (#4525)

Co-authored-by: Elias Nahum <nahumhbl@gmail.com>
---
 app/mattermost.js | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/mattermost.js b/app/mattermost.js
index cf6d9306f..a02d8df7f 100644
--- a/app/mattermost.js
+++ b/app/mattermost.js
@@ -56,8 +56,8 @@ const launchApp = (credentials) => {
     ]);
 
     const store = Store.redux;
-    if (credentials) {
-        waitForHydration(store, async () => {
+    waitForHydration(store, async () => {
+        if (credentials) {
             const {previousVersion} = store.getState().app;
             const valid = validatePreviousVersion(previousVersion);
             if (valid) {
@@ -69,10 +69,10 @@ const launchApp = (credentials) => {
                 captureJSException(error, false, store);
                 store.dispatch(logout());
             }
-        });
-    } else {
-        resetToSelectServer(emmProvider.allowOtherServers);
-    }
+        } else {
+            resetToSelectServer(emmProvider.allowOtherServers);
+        }
+    });
 
     telemetry.startSinceLaunch(['start:splash_screen']);
     EphemeralStore.appStarted = true;