From 02aef861b74b36b209e5603d8b1383116e5cd68f Mon Sep 17 00:00:00 2001 From: enahum Date: Thu, 19 Oct 2017 13:10:51 -0300 Subject: [PATCH] Fix crashes when currentUser is null after offline store purge (#1040) --- app/components/channel_drawer/teams_list/index.js | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/app/components/channel_drawer/teams_list/index.js b/app/components/channel_drawer/teams_list/index.js index 570905e35..cbf59f594 100644 --- a/app/components/channel_drawer/teams_list/index.js +++ b/app/components/channel_drawer/teams_list/index.js @@ -6,17 +6,16 @@ import {connect} from 'react-redux'; import {getCurrentUrl} from 'mattermost-redux/selectors/entities/general'; import {getCurrentTeamId, getJoinableTeamIds, getMySortedTeamIds} from 'mattermost-redux/selectors/entities/teams'; -import {getCurrentUser} from 'mattermost-redux/selectors/entities/users'; +import {getTheme} from 'mattermost-redux/selectors/entities/preferences'; import {handleTeamChange} from 'app/actions/views/select_team'; -import {getTheme} from 'mattermost-redux/selectors/entities/preferences'; +import {getCurrentLocale} from 'app/selectors/i18n'; import {removeProtocol} from 'app/utils/url'; import TeamsList from './teams_list'; function mapStateToProps(state) { - const currentUser = getCurrentUser(state); - const locale = currentUser ? currentUser.locale : 'en'; + const locale = getCurrentLocale(state); return { canJoinOtherTeams: getJoinableTeamIds(state).length > 0,