1 files changed, 13 insertions, 0 deletions
diff --git a/webapp/actions/websocket_actions.jsx b/webapp/actions/websocket_actions.jsx
index 2af9a5d96..9d53ead6b 100644
--- a/webapp/actions/websocket_actions.jsx
+++ b/webapp/actions/websocket_actions.jsx
@@ -225,6 +225,10 @@ function handleEvent(msg) {
         handleAddEmoji(msg);
         break;
 
+    case SocketEvents.CHANNEL_VIEWED:
+        handleChannelViewedEvent(msg);
+        break;
+
     default:
     }
 }
@@ -433,3 +437,12 @@ function handleReactionRemovedEvent(msg) {
         data: reaction
     });
 }
+
+function handleChannelViewedEvent(msg) {
+// Useful for when multiple devices have the app open to different channels
+    if (ChannelStore.getCurrentId() !== msg.data.channel_id &&
+        UserStore.getCurrentId() === msg.broadcast.user_id) {
+        // Mark previous and next channel as read
+        ChannelStore.resetCounts([msg.data.channel_id]);
+    }
+}