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

Fix currentUser is null on SelectTeam screen (#1041)

Browse source
This commit is contained in:
enahum 2017-10-19 13:08:41 -03:00 committed by Jarred Witt
parent 04ec27f333
commit 360dc045cf
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
app/screens/select_team/index.js
View file

@ -12,23 +12,23 @@ import {joinTeam} from 'mattermost-redux/actions/teams';
import {logout} from 'mattermost-redux/actions/users';
import {getCurrentChannelId} from 'mattermost-redux/selectors/entities/channels';
import {getJoinableTeams} from 'mattermost-redux/selectors/entities/teams';
import {getCurrentUser} from 'mattermost-redux/selectors/entities/users';
import {getCurrentLocale} from 'app/selectors/i18n';
import SelectTeam from './select_team.js';
function mapStateToProps(state, ownProps) {
const user = getCurrentUser(state);
function mapStateToProps(state) {
const locale = getCurrentLocale(state);
function sortTeams(a, b) {
return a.display_name.localeCompare(b.display_name, user.locale, {numeric: true});
return a.display_name.localeCompare(b.display_name, locale, {numeric: true});
}
return {
teamsRequest: state.requests.teams.getMyTeams,
teams: Object.values(getJoinableTeams(state)).sort(sortTeams),
currentChannelId: getCurrentChannelId(state),
joinTeamRequest: state.requests.teams.joinTeam,
...ownProps
joinTeamRequest: state.requests.teams.joinTeam
};
}