From 6ea67987e609a6ed5950a4a4cb58c7a94a3c08c5 Mon Sep 17 00:00:00 2001
From: Scott Bishel <scott.bishel@mattermost.com>
Date: Thu, 20 Oct 2022 03:00:12 -0600
Subject: [PATCH] GH-4007 Fix for welcome screen flashing (#4042)

* fix for welcome screen flashing

* fix lint
---
 webapp/src/store/users.ts | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/webapp/src/store/users.ts b/webapp/src/store/users.ts
index 180040d15..0bb90dec9 100644
--- a/webapp/src/store/users.ts
+++ b/webapp/src/store/users.ts
@@ -20,7 +20,13 @@ import {RootState} from './index'
 
 export const fetchMe = createAsyncThunk(
     'users/fetchMe',
-    async () => client.getMe(),
+    async () => {
+        const [me, myConfig] = await Promise.all([
+            client.getMe(),
+            client.getMyConfig(),
+        ])
+        return {me, myConfig}
+    },
 )
 
 export const versionProperty = 'version72MessageCanceled'
@@ -84,12 +90,16 @@ const usersSlice = createSlice({
     },
     extraReducers: (builder) => {
         builder.addCase(fetchMe.fulfilled, (state, action) => {
-            state.me = action.payload || null
+            state.me = action.payload.me || null
             state.loggedIn = Boolean(state.me)
+            if (action.payload.myConfig) {
+                state.myConfig = parseUserProps(action.payload.myConfig)
+            }
         })
         builder.addCase(fetchMe.rejected, (state) => {
             state.me = null
             state.loggedIn = false
+            state.myConfig = {}
         })
 
         // TODO: change this when the initial load is complete