From 69a2c58f5e25c1bed61d9d1c02720ec0dc78a8ae Mon Sep 17 00:00:00 2001 From: Miguel Alatzar Date: Mon, 15 Apr 2019 10:53:02 -0700 Subject: [PATCH] Ensure the correct value for channelIsLoading is used (#2712) --- app/components/channel_loader/index.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/app/components/channel_loader/index.js b/app/components/channel_loader/index.js index 94494744f..397413b19 100644 --- a/app/components/channel_loader/index.js +++ b/app/components/channel_loader/index.js @@ -11,8 +11,12 @@ import {handleSelectChannel, setChannelLoading} from 'app/actions/views/channel' import ChannelLoader from './channel_loader'; function mapStateToProps(state, ownProps) { + const channelIsLoading = ownProps.hasOwnProperty('channelIsLoading') ? + ownProps.channelIsLoading : + state.views.channel.loading; + return { - channelIsLoading: ownProps.channelIsLoading || state.views.channel.loading, + channelIsLoading, theme: getTheme(state), }; }