toki/mattermost-mobile
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Set the correct channel display name when switching teams (#2625)

Browse source
This commit is contained in:
Elias Nahum 2019-03-05 11:56:24 -03:00 committed by GitHub
parent 67fa577695
commit 41c675fd84
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
app/actions/views/channel.js
View file

@ -19,7 +19,7 @@ import {savePreferences} from 'mattermost-redux/actions/preferences';
import {getTeamMembersByIds} from 'mattermost-redux/actions/teams';
import {getProfilesInChannel} from 'mattermost-redux/actions/users';
import {General, Preferences} from 'mattermost-redux/constants';
import {getCurrentChannelId, getMyChannelMember} from 'mattermost-redux/selectors/entities/channels';
import {getChannel, getCurrentChannelId, getMyChannelMember} from 'mattermost-redux/selectors/entities/channels';
import {getCurrentTeamId, getTeamByName} from 'mattermost-redux/selectors/entities/teams';
import {
@ -314,7 +314,6 @@ export function selectPenultimateChannel(teamId) {
(lastChannel.team_id === teamId || isDMVisible || isGMVisible)
) {
dispatch(setChannelLoading(true));
dispatch(setChannelDisplayName(lastChannel.display_name));
dispatch(handleSelectChannel(lastChannelId));
return;
}
@ -341,7 +340,6 @@ export function selectDefaultChannel(teamId) {
}
if (channelId) {
dispatch(setChannelDisplayName(''));
dispatch(handleSelectChannel(channelId));
}
};
@ -350,6 +348,7 @@ export function selectDefaultChannel(teamId) {
export function handleSelectChannel(channelId) {
return async (dispatch, getState) => {
const state = getState();
const channel = getChannel(state, channelId);
const currentTeamId = getCurrentTeamId(state);
const currentChannelId = getCurrentChannelId(state);
const sameChannel = channelId === currentChannelId;
@ -359,6 +358,7 @@ export function handleSelectChannel(channelId) {
dispatch(loadPostsIfNecessaryWithRetry(channelId));
dispatch(batchActions([
selectChannel(channelId),
setChannelDisplayName(channel.display_name),
{
type: ViewTypes.SET_INITIAL_POST_VISIBILITY,
data: channelId,
@ -389,7 +389,6 @@ export function handleSelectChannelByName(channelName, teamName) {
const {data: channel} = await dispatch(getChannelByNameAndTeamName(teamName || currentTeamName, channelName));
const currentChannelId = getCurrentChannelId(state);
if (channel && currentChannelId !== channel.id) {
dispatch(setChannelDisplayName(channel.display_name));
dispatch(handleSelectChannel(channel.id));
}
};

10
app/components/sidebars/main/main_sidebar.js
View file

@ -164,14 +164,7 @@ export default class ChannelSidebar extends Component {
};
selectChannel = (channel, currentChannelId, closeDrawer = true) => {
const {
actions,
} = this.props;
const {
setChannelLoading,
setChannelDisplayName,
} = actions;
const {setChannelLoading} = this.props.actions;
tracker.channelSwitch = Date.now();
@ -195,7 +188,6 @@ export default class ChannelSidebar extends Component {
return;
}
setChannelDisplayName(channel.display_name);
EventEmitter.emit('switch_channel', channel, currentChannelId);
};