Fixing redirection on leave channel (mattermost#4234)

* Fixing redirection on leave channel * fixing tests
Revanth47 · Nov 15, 2019 · 8fbe8d2 · 8fbe8d2
1 parent 77948dd
commit 8fbe8d2
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 11 deletions.
diff --git a/actions/global_actions.jsx b/actions/global_actions.jsx
@@ -280,7 +280,7 @@ async function getTeamRedirectChannelIfIsAccesible(user, team) {
  let channel = null;
 
  const myMember = getMyTeamMember(state, team.id);
- if (!myMember) {
+ if (!myMember || Object.keys(myMember).length === 0) {
  return null;
  }
 

diff --git a/actions/global_actions.test.js b/actions/global_actions.test.js
@@ -88,8 +88,8 @@ describe('actions/global_actions', () => {
  team2: {id: 'team2', display_name: 'Team 2', name: 'team2', delete_at: 0},
  },
  myMembers: {
- team1: {},
- team2: {},
+ team1: {id: 'team1'},
+ team2: {id: 'team2'},
  },
  },
  channels: {
@@ -164,8 +164,8 @@ describe('actions/global_actions', () => {
  team2: {id: 'team2', display_name: 'Team 2', name: 'team2', delete_at: 0},
  },
  myMembers: {
- team1: {},
- team2: {},
+ team1: {id: 'team1'},
+ team2: {id: 'team2'},
  },
  },
  channels: {
@@ -239,8 +239,8 @@ describe('actions/global_actions', () => {
  team2: {id: 'team2', display_name: 'Team 2', name: 'team2', delete_at: 0},
  },
  myMembers: {
- team1: {},
- team2: {},
+ team1: {id: 'team1'},
+ team2: {id: 'team2'},
  },
  },
  channels: {
@@ -307,8 +307,8 @@ describe('actions/global_actions', () => {
  team2: {id: 'team2', display_name: 'Team 2', name: 'team2', delete_at: 0},
  },
  myMembers: {
- team1: {},
- team2: {},
+ team1: {id: 'team1'},
+ team2: {id: 'team2'},
  },
  },
  users: {
@@ -346,8 +346,8 @@ describe('actions/global_actions', () => {
  team2: {id: 'team2', display_name: 'Team 2', name: 'team2', delete_at: 0},
  },
  myMembers: {
- team1: {},
- team2: {},
+ team1: {id: 'team1'},
+ team2: {id: 'team2'},
  },
  },
  channels: {