From 1fef5bf5fe37f161959fbef5d53deccf0168cced Mon Sep 17 00:00:00 2001
From: Joram Wilander <jwawilander@gmail.com>
Date: Wed, 26 Apr 2017 11:07:19 -0400
Subject: Redux bug fixes (#6243)

* Fix save teams dispatch

* Fix login when MFA is enabled but not active

* Fix JS error caused by using deleted team member
---
 webapp/components/team_sidebar/team_sidebar_controller.jsx | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'webapp/components/team_sidebar')

diff --git a/webapp/components/team_sidebar/team_sidebar_controller.jsx b/webapp/components/team_sidebar/team_sidebar_controller.jsx
index 2f41d485c..758b51426 100644
--- a/webapp/components/team_sidebar/team_sidebar_controller.jsx
+++ b/webapp/components/team_sidebar/team_sidebar_controller.jsx
@@ -102,6 +102,9 @@ export default class TeamSidebar extends React.Component {
         for (const index in this.state.teamMembers) {
             if (this.state.teamMembers.hasOwnProperty(index)) {
                 const teamMember = this.state.teamMembers[index];
+                if (teamMember.delete_at > 0) {
+                    continue;
+                }
                 const teamId = teamMember.team_id;
                 myTeams.push(Object.assign({
                     unread: teamMember.msg_count > 0,
-- 
cgit v1.2.3-1-g7c22