summaryrefslogtreecommitdiffstats
path: root/webapp
diff options
context:
space:
mode:
authorJoram Wilander <jwawilander@gmail.com>2017-03-24 16:46:39 -0400
committerCorey Hulen <corey@hulen.com>2017-03-24 13:46:39 -0700
commit4dc03613b41b1e8a3cad77582fd4d80c6bf401f4 (patch)
tree25ae9593a765fe467f47de9c7d02598dc00a828f /webapp
parent69fb47b88bc8d97c4797fa72e60416f8fb658e20 (diff)
downloadchat-4dc03613b41b1e8a3cad77582fd4d80c6bf401f4.tar.gz
chat-4dc03613b41b1e8a3cad77582fd4d80c6bf401f4.tar.bz2
chat-4dc03613b41b1e8a3cad77582fd4d80c6bf401f4.zip
Check if LHS DM list needs updating on channel switch and channel members fetch (#5861)
Diffstat (limited to 'webapp')
-rw-r--r--webapp/actions/global_actions.jsx2
-rw-r--r--webapp/components/needs_team.jsx3
2 files changed, 4 insertions, 1 deletions
diff --git a/webapp/actions/global_actions.jsx b/webapp/actions/global_actions.jsx
index c81478069..1f22cd773 100644
--- a/webapp/actions/global_actions.jsx
+++ b/webapp/actions/global_actions.jsx
@@ -65,6 +65,8 @@ export function emitChannelClickEvent(channel) {
BrowserStore.setGlobalItem(chan.team_id, chan.id);
+ loadProfilesForSidebar();
+
AppDispatcher.handleViewAction({
type: ActionTypes.CLICK_CHANNEL,
name: chan.name,
diff --git a/webapp/components/needs_team.jsx b/webapp/components/needs_team.jsx
index 11e75bfb7..9ce4ed882 100644
--- a/webapp/components/needs_team.jsx
+++ b/webapp/components/needs_team.jsx
@@ -16,6 +16,7 @@ import PostStore from 'stores/post_store.jsx';
import * as GlobalActions from 'actions/global_actions.jsx';
import {startPeriodicStatusUpdates, stopPeriodicStatusUpdates} from 'actions/status_actions.jsx';
import {startPeriodicSync, stopPeriodicSync} from 'actions/websocket_actions.jsx';
+import {loadProfilesForSidebar} from 'actions/user_actions.jsx';
import Constants from 'utils/constants.jsx';
const TutorialSteps = Constants.TutorialSteps;
@@ -108,7 +109,7 @@ export default class NeedsTeam extends React.Component {
window.isActive = true;
if (new Date().getTime() - this.blurTime > UNREAD_CHECK_TIME_MILLISECONDS) {
- AsyncClient.getMyChannelMembers();
+ AsyncClient.getMyChannelMembers().then(loadProfilesForSidebar);
}
});