Fix teams being incorrectly marked unread across tabs (#7062)

1 files changed, 5 insertions, 0 deletions

diff --git a/webapp/stores/team_store.jsx b/webapp/stores/team_store.jsx
index 83a59a32e..1c38ba5e7 100644
--- a/webapp/stores/team_store.jsx
+++ b/webapp/stores/team_store.jsx
@@ -10,6 +10,7 @@ import Constants from 'utils/constants.jsx';
 const NotificationPrefs = Constants.NotificationPrefs;
 
 import {getSiteURL} from 'utils/url.jsx';
+import {isSystemMessage, isFromWebhook} from 'utils/post_utils.jsx';
 const ActionTypes = Constants.ActionTypes;
 
 const CHANGE_EVENT = 'change';
@@ -449,6 +450,10 @@ TeamStore.dispatchToken = AppDispatcher.register((payload) => {
             return;
         }
 
+        if (action.post.user_id === UserStore.getCurrentId() && !isSystemMessage(action.post) && !isFromWebhook(action.post)) {
+            return;
+        }
+
         var id = action.websocketMessageProps ? action.websocketMessageProps.team_id : null;
         if (id && TeamStore.getCurrentId() !== id) {
             TeamStore.incrementMessages(id, action.post.channel_id);