Fixing websocket and team store issues when leaving team (#4412)

2 files changed, 5 insertions, 7 deletions

diff --git a/webapp/actions/websocket_actions.jsx b/webapp/actions/websocket_actions.jsx
index c7010dcd4..431922b0d 100644
--- a/webapp/actions/websocket_actions.jsx
+++ b/webapp/actions/websocket_actions.jsx
@@ -211,10 +211,10 @@ function handleNewUserEvent(msg) {
 
 function handleLeaveTeamEvent(msg) {
     if (UserStore.getCurrentId() === msg.data.user_id) {
-        TeamStore.removeMyTeamMember(msg.broadcast.team_id);
+        TeamStore.removeMyTeamMember(msg.data.team_id);
 
         // if they are on the team being removed redirect them to the root
-        if (TeamStore.getCurrentId() === msg.broadcast.team_id) {
+        if (TeamStore.getCurrentId() === msg.data.team_id) {
             TeamStore.setCurrentId('');
             Client.setTeamId('');
             browserHistory.push('/');
diff --git a/webapp/stores/team_store.jsx b/webapp/stores/team_store.jsx
index 8a3457a4d..858e2688e 100644
--- a/webapp/stores/team_store.jsx
+++ b/webapp/stores/team_store.jsx
@@ -176,11 +176,9 @@ class TeamStoreClass extends EventEmitter {
     }
 
     removeMyTeamMember(teamId) {
-        for (var index in this.my_team_members) {
-            if (this.my_team_members.hasOwnProperty(index)) {
-                if (this.my_team_members[index].team_id === teamId) {
-                    Reflect.deleteProperty(this.my_team_members, index);
-                }
+        for (let i = 0; i < this.my_team_members.length; i++) {
+            if (this.my_team_members[i].team_id === teamId) {
+                this.my_team_members.splice(i, 1);
             }
         }
     }