Commit 111db434 authored by Jesús Espino's avatar Jesús Espino Committed by Carlos Tadeu Panato Junior

MM-11576: Fixed join to archived channel by clicking link (#596)

parent eb191aec
......@@ -672,7 +672,7 @@ export function joinChannel(userId, teamId, channelId, channelName) {
member = await Client4.addToChannel(userId, channelId);
channel = await Client4.getChannel(channelId);
} else if (channelName) {
channel = await Client4.getChannelByName(teamId, channelName);
channel = await Client4.getChannelByName(teamId, channelName, true);
if ((channel.type === General.GM_CHANNEL) || (channel.type === General.DM_CHANNEL)) {
member = await Client4.getChannelMember(channel.id, userId);
} else {
......
......@@ -1754,7 +1754,7 @@ describe('Actions.Channels', () => {
TestHelper.fakeChannel(TestHelper.basicTeam.id));
nock(Client4.getTeamsRoute()).
get(`/${TestHelper.basicTeam.id}/channels/name/${secondChannel.name}?include_deleted=false`).
get(`/${TestHelper.basicTeam.id}/channels/name/${secondChannel.name}?include_deleted=true`).
reply(200, secondChannel);
nock(Client4.getChannelsRoute()).
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment