summaryrefslogtreecommitdiffstats
path: root/webapp
diff options
context:
space:
mode:
authorJoram Wilander <jwawilander@gmail.com>2016-06-01 08:54:31 -0400
committerChristopher Speller <crspeller@gmail.com>2016-06-01 08:54:31 -0400
commit7be2a05cf58c22d1edfab12a2b55569c5e48ab2f (patch)
tree5bb520880d200cba90c5ada250c63144e18c3333 /webapp
parent5f7ce2214a9fd91a0ab62312674f5cffd811f8ca (diff)
downloadchat-7be2a05cf58c22d1edfab12a2b55569c5e48ab2f.tar.gz
chat-7be2a05cf58c22d1edfab12a2b55569c5e48ab2f.tar.bz2
chat-7be2a05cf58c22d1edfab12a2b55569c5e48ab2f.zip
Allow clearing direct messages across team based on channel view events (#3176)
Diffstat (limited to 'webapp')
-rw-r--r--webapp/actions/websocket_actions.jsx2
1 files changed, 1 insertions, 1 deletions
diff --git a/webapp/actions/websocket_actions.jsx b/webapp/actions/websocket_actions.jsx
index e317b8db0..ffeb27fb2 100644
--- a/webapp/actions/websocket_actions.jsx
+++ b/webapp/actions/websocket_actions.jsx
@@ -245,7 +245,7 @@ function handleUserRemovedEvent(msg) {
function handleChannelViewedEvent(msg) {
// Useful for when multiple devices have the app open to different channels
- if (TeamStore.getCurrentId() === msg.team_id && ChannelStore.getCurrentId() !== msg.channel_id && UserStore.getCurrentId() === msg.user_id) {
+ if (ChannelStore.getCurrentId() !== msg.channel_id && UserStore.getCurrentId() === msg.user_id) {
AsyncClient.getChannel(msg.channel_id);
}
}