From f6bdbb941a343eda6e29469dee7c0f59f8e01ea4 Mon Sep 17 00:00:00 2001
From: enahum <nahumhbl@gmail.com>
Date: Tue, 1 Aug 2017 18:21:26 -0400
Subject: [PATCH] Fix new message indicator in channel screen (#807)

---
 app/components/channel_drawer/channel_drawer.js | 4 ++--
 app/screens/search/search.js                    | 3 ++-
 yarn.lock                                       | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/app/components/channel_drawer/channel_drawer.js b/app/components/channel_drawer/channel_drawer.js
index 3c30808b2..23e2d79d9 100644
--- a/app/components/channel_drawer/channel_drawer.js
+++ b/app/components/channel_drawer/channel_drawer.js
@@ -162,9 +162,9 @@ export default class ChannelDrawer extends PureComponent {
             viewChannel
         } = actions;
 
-        setChannelLoading();
         markChannelAsRead(channel.id, currentChannel.id);
-        viewChannel(channel.id, currentChannel.id);
+        setChannelLoading();
+        viewChannel(currentChannel.id);
         setChannelDisplayName(channel.display_name);
         this.closeChannelDrawer();
         InteractionManager.runAfterInteractions(() => {
diff --git a/app/screens/search/search.js b/app/screens/search/search.js
index ffe216e0a..4574d803a 100644
--- a/app/screens/search/search.js
+++ b/app/screens/search/search.js
@@ -383,8 +383,9 @@ class Search extends Component {
             }
 
             this.props.navigator.dismissModal({animationType: 'none'});
-            setChannelLoading();
+
             markChannelAsRead(channelId, currentChannelId);
+            setChannelLoading();
             viewChannel(channelId, currentChannelId);
             setChannelDisplayName(displayName);
             handleSelectChannel(channelId);
diff --git a/yarn.lock b/yarn.lock
index f15cec87a..d8453e8bc 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3645,7 +3645,7 @@ makeerror@1.0.x:
 
 mattermost-redux@mattermost/mattermost-redux#master:
   version "0.0.1"
-  resolved "https://codeload.github.com/mattermost/mattermost-redux/tar.gz/5b676e2737c526617cd9b4e9c7dbb16f3615e269"
+  resolved "https://codeload.github.com/mattermost/mattermost-redux/tar.gz/09be47436ce729d8ab7a390e7e159fcfb75fd27f"
   dependencies:
     deep-equal "1.0.1"
     harmony-reflect "1.5.1"