PLT-5044 Fix unread team messages for deleted channels (#4836)

store/sql_team_store.go

@@ -599,7 +599,7 @@ func (s SqlTeamStore) GetTeamsUnreadForUser(teamId, userId string) StoreChannel
 				Channels,
 				ChannelMembers
 			WHERE
-				Channels.Id = ChannelMembers.ChannelId AND
+				Channels.Id = ChannelMembers.ChannelId AND Channels.DeleteAt = 0 AND
 				ChannelMembers.UserId = :UserId AND Channels.TeamId != :TeamId
 			GROUP BY
 				Channels.TeamId`, map[string]interface{}{"UserId": userId, "TeamId": teamId})

webapp/routes/route_team.jsx

@@ -70,7 +70,7 @@ function preNeedsTeam(nextState, replace, callback) {
         browserHistory.push('/');
         return;
     }
-
+    if (nextState.location.pathname.indexOf('/channels/') > -1) {
         GlobalActions.emitCloseRightHandSide();
 
         TeamStore.saveMyTeam(team);
@@ -101,6 +101,9 @@ function preNeedsTeam(nextState, replace, callback) {
         $.when(d1).done(() => {
             callback();
         });
+    } else {
+        callback();
+    }
 }
 
 function selectLastChannel(nextState, replace, callback) {