From 382ba0b0d18f67d473ad677f9b5151bc5e468e14 Mon Sep 17 00:00:00 2001
From: Joram Wilander <jwawilander@gmail.com>
Date: Tue, 6 Jun 2017 07:56:07 -0400
Subject: Fix race causing channels to not clear mention on focus (#6587)

---
 webapp/components/needs_team/needs_team.jsx | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'webapp/components')

diff --git a/webapp/components/needs_team/needs_team.jsx b/webapp/components/needs_team/needs_team.jsx
index 75ec40653..95556fb31 100644
--- a/webapp/components/needs_team/needs_team.jsx
+++ b/webapp/components/needs_team/needs_team.jsx
@@ -119,12 +119,12 @@ export default class NeedsTeam extends React.Component {
 
         // Set up tracking for whether the window is active
         window.isActive = true;
-        $(window).on('focus', () => {
-            this.props.actions.viewChannel(ChannelStore.getCurrentId());
+        $(window).on('focus', async () => {
             ChannelStore.resetCounts([ChannelStore.getCurrentId()]);
             ChannelStore.emitChange();
-
             window.isActive = true;
+
+            await this.props.actions.viewChannel(ChannelStore.getCurrentId());
             if (new Date().getTime() - this.blurTime > UNREAD_CHECK_TIME_MILLISECONDS) {
                 this.props.actions.getMyChannelMembers(TeamStore.getCurrentId()).then(loadProfilesForSidebar);
             }
-- 
cgit v1.2.3-1-g7c22