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

Fix race condition when selecting channel in PN (#723)

Browse source 
* Fix race condition when selecting channel in PN

* Feedback review
This commit is contained in:
enahum 2017-07-07 16:37:31 -04:00 committed by GitHub
parent 8afd7fe1cd
commit 458a2be333
2 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/actions/views/root.js
View file

@ -47,7 +47,7 @@ export function goToNotification(notification) {
dispatch(setChannelDisplayName(''));
if (teamId) {
handleTeamChange(teams[teamId])(dispatch, getState);
handleTeamChange(teams[teamId], false)(dispatch, getState);
await loadChannelsIfNecessary(teamId)(dispatch, getState);
} else {
await selectFirstAvailableTeam()(dispatch, getState);

17
app/actions/views/select_team.js
View file

@ -10,7 +10,7 @@ import {NavigationTypes} from 'app/constants';
import {setChannelDisplayName} from './channel';
export function handleTeamChange(team) {
export function handleTeamChange(team, selectChannel = true) {
return async (dispatch, getState) => {
const {currentTeamId} = getState().entities.teams;
if (currentTeamId === team.id) {
@ -18,14 +18,17 @@ export function handleTeamChange(team) {
}
const state = getState();
const lastChannelId = state.views.team.lastChannelForTeam[team.id] || '';
const actions = [
setChannelDisplayName(''),
{type: TeamTypes.SELECT_TEAM, data: team.id}
];
dispatch(setChannelDisplayName(''), getState);
if (selectChannel) {
const lastChannelId = state.views.team.lastChannelForTeam[team.id] || '';
actions.push({type: ChannelTypes.SELECT_CHANNEL, data: lastChannelId});
}
dispatch(batchActions([
{type: TeamTypes.SELECT_TEAM, data: team.id},
{type: ChannelTypes.SELECT_CHANNEL, data: lastChannelId}
]), getState);
dispatch(batchActions(actions), getState);
};
}