From 4951da5232ad2e7257f14c9def998730f9912e49 Mon Sep 17 00:00:00 2001
From: Joram Wilander <jwawilander@gmail.com>
Date: Thu, 4 May 2017 18:06:25 -0400
Subject: Fix usernames not showing in DM list on first load (#6333)

---
 webapp/components/sidebar.jsx | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

(limited to 'webapp/components/sidebar.jsx')

diff --git a/webapp/components/sidebar.jsx b/webapp/components/sidebar.jsx
index b48d5a8f5..aa7b98be0 100644
--- a/webapp/components/sidebar.jsx
+++ b/webapp/components/sidebar.jsx
@@ -41,7 +41,8 @@ import favicon from 'images/favicon/favicon-16x16.png';
 import redFavicon from 'images/favicon/redfavicon-16x16.png';
 
 import store from 'stores/redux_store.jsx';
-import * as Selectors from 'mattermost-redux/selectors/entities/preferences';
+import {getMyPreferences} from 'mattermost-redux/selectors/entities/preferences';
+import {getUsers} from 'mattermost-redux/selectors/entities/users';
 
 export default class Sidebar extends React.Component {
     constructor(props) {
@@ -120,14 +121,18 @@ export default class Sidebar extends React.Component {
         const tutorialStep = PreferenceStore.getInt(Preferences.TUTORIAL_STEP, UserStore.getCurrentId(), 999);
 
         const channels = ChannelStore.getAll();
-        const preferences = Selectors.getMyPreferences(store.getState());
+        const preferences = getMyPreferences(store.getState());
+        const profiles = getUsers(store.getState());
         let displayableChannels = {};
-        if (channels !== this.oldChannels || preferences !== this.oldPreferences) {
+        if (channels !== this.oldChannels ||
+            preferences !== this.oldPreferences ||
+            profiles !== this.oldProfiles) {
             const channelsArray = channels.map((channel) => Object.assign({}, channel));
             displayableChannels = ChannelUtils.buildDisplayableChannelList(channelsArray);
         }
         this.oldChannels = channels;
         this.oldPreferences = preferences;
+        this.oldProfiles = profiles;
 
         return {
             activeId: currentChannelId,
-- 
cgit v1.2.3-1-g7c22

