From 3bb50ff96ef25191fa88c524a66a0ad0a91e9e8e Mon Sep 17 00:00:00 2001
From: Harrison Healey <harrisonmhealey@gmail.com>
Date: Mon, 3 Jul 2017 07:52:27 -0400
Subject: [PATCH] Fixed some potential bugs in goToNotification action (#696)

---
 app/actions/views/root.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/actions/views/root.js b/app/actions/views/root.js
index 10445b469..dd5c6ed65 100644
--- a/app/actions/views/root.js
+++ b/app/actions/views/root.js
@@ -51,7 +51,7 @@ export function goToNotification(notification) {
             await loadChannelsIfNecessary(teamId)(dispatch, getState);
         } else {
             await selectFirstAvailableTeam()(dispatch, getState);
-            teamId = currentTeamId;
+            teamId = state.entities.team.currentTeamId;
         }
 
         viewChannel(channelId)(dispatch, getState);
@@ -60,7 +60,7 @@ export function goToNotification(notification) {
         if (channelId !== currentChannelId) {
             handleSelectChannel(channelId)(dispatch, getState);
         }
-        markChannelAsRead(teamId, channelId)(dispatch, getState).then(() => true).catch(() => true);
+        markChannelAsRead(channelId, currentChannelId)(dispatch, getState);
     };
 }