From c94a0840fd7bfc394927564d70b311ba1d0de4df Mon Sep 17 00:00:00 2001 From: Chris Duarte Date: Thu, 19 Jan 2017 06:55:32 -0800 Subject: [PATCH] Show town square when selecting a team (#166) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Now selects the first channel if the default channel can’t be found --- app/actions/views/channel.js | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/app/actions/views/channel.js b/app/actions/views/channel.js index daf759179..ce11e28e6 100644 --- a/app/actions/views/channel.js +++ b/app/actions/views/channel.js @@ -95,12 +95,13 @@ export function selectInitialChannel(teamId) { return async (dispatch, getState) => { const channels = getState().entities.channels.channels; - for (const channel of Object.values(channels)) { - // TODO figure out how to handle when we can't find the town square - if (channel.team_id === teamId && channel.name === Constants.DEFAULT_CHANNEL) { - await selectChannel(channel.id)(dispatch, getState); - break; - } + const channel = Object.values(channels).find((c) => c.team_id === teamId && c.name === Constants.DEFAULT_CHANNEL); + if (channel) { + await selectChannel(channel.id)(dispatch, getState); + } else { + // Handle case when the default channel cannot be found + const firstChannel = Object.values(channels)[0]; + await selectChannel(firstChannel.id)(dispatch, getState); } }; }