diff options
Diffstat (limited to 'src/containers/layout')
-rw-r--r-- | src/containers/layout/AppLayoutContainer.js | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/containers/layout/AppLayoutContainer.js b/src/containers/layout/AppLayoutContainer.js index fb3be13c0..affc1a0a2 100644 --- a/src/containers/layout/AppLayoutContainer.js +++ b/src/containers/layout/AppLayoutContainer.js | |||
@@ -5,6 +5,7 @@ import { inject, observer } from 'mobx-react'; | |||
5 | import AppStore from '../../stores/AppStore'; | 5 | import AppStore from '../../stores/AppStore'; |
6 | import RecipesStore from '../../stores/RecipesStore'; | 6 | import RecipesStore from '../../stores/RecipesStore'; |
7 | import ServicesStore from '../../stores/ServicesStore'; | 7 | import ServicesStore from '../../stores/ServicesStore'; |
8 | import FeaturesStore from '../../stores/FeaturesStore'; | ||
8 | import UIStore from '../../stores/UIStore'; | 9 | import UIStore from '../../stores/UIStore'; |
9 | import NewsStore from '../../stores/NewsStore'; | 10 | import NewsStore from '../../stores/NewsStore'; |
10 | import SettingsStore from '../../stores/SettingsStore'; | 11 | import SettingsStore from '../../stores/SettingsStore'; |
@@ -25,6 +26,7 @@ export default @inject('stores', 'actions') @observer class AppLayoutContainer e | |||
25 | render() { | 26 | render() { |
26 | const { | 27 | const { |
27 | app, | 28 | app, |
29 | features, | ||
28 | services, | 30 | services, |
29 | ui, | 31 | ui, |
30 | news, | 32 | news, |
@@ -63,10 +65,13 @@ export default @inject('stores', 'actions') @observer class AppLayoutContainer e | |||
63 | 65 | ||
64 | const { children } = this.props; | 66 | const { children } = this.props; |
65 | 67 | ||
68 | const isLoadingFeatures = features.featuresRequest.isExecuting | ||
69 | && !features.featuresRequest.wasExecuted; | ||
70 | |||
66 | const isLoadingServices = services.allServicesRequest.isExecuting | 71 | const isLoadingServices = services.allServicesRequest.isExecuting |
67 | && services.allServicesRequest.isExecutingFirstTime; | 72 | && services.allServicesRequest.isExecutingFirstTime; |
68 | 73 | ||
69 | if (isLoadingServices) { | 74 | if (isLoadingFeatures || isLoadingServices) { |
70 | return ( | 75 | return ( |
71 | <AppLoader /> | 76 | <AppLoader /> |
72 | ); | 77 | ); |
@@ -131,6 +136,7 @@ export default @inject('stores', 'actions') @observer class AppLayoutContainer e | |||
131 | AppLayoutContainer.wrappedComponent.propTypes = { | 136 | AppLayoutContainer.wrappedComponent.propTypes = { |
132 | stores: PropTypes.shape({ | 137 | stores: PropTypes.shape({ |
133 | services: PropTypes.instanceOf(ServicesStore).isRequired, | 138 | services: PropTypes.instanceOf(ServicesStore).isRequired, |
139 | features: PropTypes.instanceOf(FeaturesStore).isRequired, | ||
134 | recipes: PropTypes.instanceOf(RecipesStore).isRequired, | 140 | recipes: PropTypes.instanceOf(RecipesStore).isRequired, |
135 | app: PropTypes.instanceOf(AppStore).isRequired, | 141 | app: PropTypes.instanceOf(AppStore).isRequired, |
136 | ui: PropTypes.instanceOf(UIStore).isRequired, | 142 | ui: PropTypes.instanceOf(UIStore).isRequired, |