From 6664d2531b5fd8212a5616cfeabd1d975df361dc Mon Sep 17 00:00:00 2001 From: Elias Nahum Date: Wed, 17 Jun 2020 17:37:46 -0400 Subject: [PATCH] Fix unhandled error when logging out from the select team screen (#4423) --- app/screens/select_team/index.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/screens/select_team/index.js b/app/screens/select_team/index.js index 3445e1ccd..664dc7bce 100644 --- a/app/screens/select_team/index.js +++ b/app/screens/select_team/index.js @@ -5,6 +5,7 @@ import {bindActionCreators} from 'redux'; import {connect} from 'react-redux'; import {getTeams, addUserToTeam} from '@mm-redux/actions/teams'; +import {General} from '@mm-redux/constants'; import {getTheme} from '@mm-redux/selectors/entities/preferences'; import {getSortedJoinableTeams} from '@mm-redux/selectors/entities/teams'; import {getCurrentUser} from '@mm-redux/selectors/entities/users'; @@ -19,13 +20,14 @@ import SelectTeam from './select_team.js'; function mapStateToProps(state) { const currentUser = getCurrentUser(state); const currentUserIsGuest = isGuest(currentUser); + const locale = currentUser?.locale || General.DEFAULT_LOCALE; return { currentUserId: currentUser && currentUser.id, currentUserIsGuest, isLandscape: isLandscape(state), teamsRequest: state.requests.teams.getTeams, - teams: getSortedJoinableTeams(state, currentUser.locale), + teams: getSortedJoinableTeams(state, locale), theme: getTheme(state), }; }