From 5fe2d782115ec6faf9ac743f5999a786126a3251 Mon Sep 17 00:00:00 2001
From: Christopher Speller <crspeller@gmail.com>
Date: Tue, 8 Nov 2016 09:59:14 -0500
Subject: [PATCH] Fixing loading of team members for dm list (#4477)

---
 webapp/components/sidebar.jsx | 4 ----
 webapp/routes/route_team.jsx  | 4 ++++
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/webapp/components/sidebar.jsx b/webapp/components/sidebar.jsx
index 626ac2866d..5c6645833f 100644
--- a/webapp/components/sidebar.jsx
+++ b/webapp/components/sidebar.jsx
@@ -19,7 +19,6 @@ import * as AsyncClient from 'utils/async_client.jsx';
 import * as Utils from 'utils/utils.jsx';
 import * as ChannelUtils from 'utils/channel_utils.jsx';
 import * as ChannelActions from 'actions/channel_actions.jsx';
-import {loadProfilesAndTeamMembersForDMSidebar} from 'actions/user_actions.jsx';
 
 import Constants from 'utils/constants.jsx';
 
@@ -125,9 +124,6 @@ export default class Sidebar extends React.Component {
 
         document.addEventListener('keydown', this.navigateChannelShortcut);
         document.addEventListener('keydown', this.navigateUnreadChannelShortcut);
-
-        loadProfilesAndTeamMembersForDMSidebar();
-        AsyncClient.getMyChannelMembers();
     }
 
     shouldComponentUpdate(nextProps, nextState) {
diff --git a/webapp/routes/route_team.jsx b/webapp/routes/route_team.jsx
index 5b6948ea27..4bdfd1cc66 100644
--- a/webapp/routes/route_team.jsx
+++ b/webapp/routes/route_team.jsx
@@ -17,6 +17,8 @@ import ChannelStore from 'stores/channel_store.jsx';
 import emojiRoute from 'routes/route_emoji.jsx';
 import integrationsRoute from 'routes/route_integrations.jsx';
 
+import {loadProfilesAndTeamMembersForDMSidebar} from 'actions/user_actions.jsx';
+
 function onChannelEnter(nextState, replace, callback) {
     doChannelChange(nextState, replace, callback);
 }
@@ -68,6 +70,8 @@ function preNeedsTeam(nextState, replace, callback) {
 
     TeamStore.saveMyTeam(team);
     TeamStore.emitChange();
+    loadProfilesAndTeamMembersForDMSidebar();
+    AsyncClient.getMyChannelMembers();
 
     var d1 = $.Deferred(); //eslint-disable-line new-cap