Fix members being loaded before channel members and DM headers (#4369)

store/sql_channel_store.go

@@ -1039,7 +1039,7 @@ func (s SqlChannelStore) GetMembersForUser(teamId string, userId string) StoreCh
             FROM ChannelMembers cm
             INNER JOIN Channels c
                 ON c.Id = cm.ChannelId
-                AND c.TeamId = :TeamId
+                AND (c.TeamId = :TeamId OR c.TeamId = '')
             WHERE cm.UserId = :UserId
 		`, map[string]interface{}{"TeamId": teamId, "UserId": userId})
 

webapp/components/sidebar.jsx

@@ -127,6 +127,7 @@ export default class Sidebar extends React.Component {
         document.addEventListener('keydown', this.navigateUnreadChannelShortcut);
 
         loadProfilesAndTeamMembersForDMSidebar();
+        AsyncClient.getMyChannelMembers();
     }
 
     shouldComponentUpdate(nextProps, nextState) {

webapp/routes/route_team.jsx

@@ -78,8 +78,6 @@ function preNeedsTeam(nextState, replace, callback) {
                 channels: data
             });
 
-            AsyncClient.getMyChannelMembers();
-
             d1.resolve();
         },
         (err) => {