From 5492ca28b1f9349f8f2d9aef5074f5ccc82d64c0 Mon Sep 17 00:00:00 2001
From: Joram Wilander <jwawilander@gmail.com>
Date: Wed, 28 Jun 2017 09:38:19 -0400
Subject: Fix account creation redirect (#6765)

---
 webapp/actions/user_actions.jsx | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'webapp/actions')

diff --git a/webapp/actions/user_actions.jsx b/webapp/actions/user_actions.jsx
index 5ebec3efb..20912b778 100644
--- a/webapp/actions/user_actions.jsx
+++ b/webapp/actions/user_actions.jsx
@@ -32,12 +32,12 @@ import {savePreferences as savePreferencesRedux, deletePreferences} from 'matter
 
 import {Preferences as PreferencesRedux} from 'mattermost-redux/constants';
 
-export function loadMe() {
-    return UserActions.loadMe()(dispatch, getState).then(() => {
-        if (window.mm_config) {
-            loadCurrentLocale();
-        }
-    });
+export async function loadMe() {
+    await UserActions.loadMe()(dispatch, getState);
+
+    if (window.mm_config) {
+        loadCurrentLocale();
+    }
 }
 
 export function loadMeAndConfig(callback) {
-- 
cgit v1.2.3-1-g7c22