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

Ensure the correct value for channelIsLoading is used (#2712)

Browse source
This commit is contained in:
Miguel Alatzar 2019-04-15 10:53:02 -07:00 committed by Miguel Alatzar
parent 7efb044aa9
commit 69a2c58f5e
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/components/channel_loader/index.js
View file

@ -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),
};
}