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

Team selection causes blank channel view fix (#203)

Browse source
This commit is contained in:
Chris Duarte 2017-01-31 06:08:26 -08:00 committed by Harrison Healey
parent a50b9bd337
commit c9e513f83b
3 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -8,6 +8,11 @@ import {updateStorage} from 'app/actions/storage';
export function handleTeamChange(team) {
return async (dispatch, getState) => {
const currentTeamId = getState().entities.teams.currentId;
if (currentTeamId === team.id) {
return;
}
const storage = await updateStorage('currentTeamId', team.id);
const lastChannelForTeam = storage[team.id] ? storage[team.id].currentChannelId : '';

4
app/scenes/channel_drawer/channel_drawer.js
View file

@ -9,7 +9,7 @@ export default class ChannelDrawer extends React.PureComponent {
static propTypes = {
actions: React.PropTypes.shape({
closeDrawers: React.PropTypes.func.isRequired,
selectChannel: React.PropTypes.func.isRequired
handleSelectChannel: React.PropTypes.func.isRequired
}).isRequired,
currentTeam: React.PropTypes.object,
currentChannel: React.PropTypes.object,
@ -19,7 +19,7 @@ export default class ChannelDrawer extends React.PureComponent {
};
selectChannel = (id) => {
this.props.actions.selectChannel(id);
this.props.actions.handleSelectChannel(id);
this.props.actions.closeDrawers();
};

8
app/scenes/channel_drawer/channel_drawer_container.js
View file

@ -5,9 +5,9 @@ import {bindActionCreators} from 'redux';
import {connect} from 'react-redux';
import {closeDrawers} from 'app/actions/navigation';
import {closeDMChannel, leaveChannel, markFavorite, unmarkFavorite} from 'app/actions/views/channel';
import {closeDMChannel, handleSelectChannel, leaveChannel, markFavorite, unmarkFavorite} from 'app/actions/views/channel';
import {selectChannel, viewChannel} from 'service/actions/channels';
import {viewChannel} from 'service/actions/channels';
import {getChannelsByCategory, getCurrentChannel} from 'service/selectors/entities/channels';
import {getTheme} from 'service/selectors/entities/preferences';
import {getCurrentTeam} from 'service/selectors/entities/teams';
@ -27,13 +27,13 @@ function mapStateToProps(state) {
function mapDispatchToProps(dispatch) {
return {
actions: bindActionCreators({
selectChannel,
viewChannel,
closeDMChannel,
closeDrawers,
leaveChannel,
markFavorite,
unmarkFavorite
unmarkFavorite,
handleSelectChannel
}, dispatch)
};
}