MM-25640 - Leaving archived channel does not return user to the last viewed channel

actions/views/channel.js

@@ -38,6 +38,7 @@ import {browserHistory} from 'utils/browser_history';
 import {Constants, ActionTypes, EventTypes, PostRequestTypes} from 'utils/constants';
 import {isMobile} from 'utils/utils.jsx';
 import LocalStorageStore from 'stores/local_storage_store.jsx';
+import {isArchivedChannel} from 'utils/channel_utils';
 
 export function checkAndSetMobileView() {
  return (dispatch) => {
@@ -116,14 +117,17 @@ export function leaveChannel(channelId) {
  const myPreferences = getMyPreferences(state);
  const currentUserId = getCurrentUserId(state);
  const currentTeam = getCurrentTeam(state);
+ const channel = getChannel(state, channelId);
 
  if (isFavoriteChannel(myPreferences, channelId)) {
  dispatch(unfavoriteChannel(channelId));
  }
 
  const teamUrl = getCurrentRelativeTeamUrl(state);
- LocalStorageStore.removePreviousChannelName(currentUserId, currentTeam.id, state);
 
+ if (!isArchivedChannel(channel)) {
+ LocalStorageStore.removePreviousChannelName(currentUserId, currentTeam.id, state);
+ }
  const {error} = await dispatch(leaveChannelRedux(channelId));
  if (error) {
  return {error};

actions/views/channel.test.js

@@ -21,9 +21,14 @@ jest.mock('utils/browser_history', () => ({
  },
 }));
 
-jest.mock('utils/channel_utils.jsx', () => ({
- getRedirectChannelNameForTeam: () => 'town-square',
-}));
+jest.mock('utils/channel_utils.jsx', () => {
+ const original = jest.requireActual('utils/channel_utils.jsx');
+
+ return {
+ ...original,
+ getRedirectChannelNameForTeam: () => 'town-square',
+ };
+});
 
 jest.mock('actions/channel_actions.jsx', () => ({
  openDirectChannelToUserId: jest.fn(() => ({type: ''})),