From d1e6f03395b4d2b668a8da6260aca8adf823f1db Mon Sep 17 00:00:00 2001
From: haraldox <hnaumann+github@gmail.com>
Date: Mon, 26 Feb 2018 16:43:57 +0100
Subject: ADD `features` request

REFACTOR `defaults` -> `base`
---
 src/containers/layout/AppLayoutContainer.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'src/containers/layout')

diff --git a/src/containers/layout/AppLayoutContainer.js b/src/containers/layout/AppLayoutContainer.js
index e4a9d60c3..2db2b7bb7 100644
--- a/src/containers/layout/AppLayoutContainer.js
+++ b/src/containers/layout/AppLayoutContainer.js
@@ -26,6 +26,7 @@ export default class AppLayoutContainer extends Component {
   render() {
     const {
       app,
+      features,
       services,
       ui,
       news,
@@ -64,10 +65,13 @@ export default class AppLayoutContainer extends Component {
 
     const { children } = this.props;
 
+    const isLoadingFeatures = features.featuresRequest.isExecuting
+      && features.featuresRequest.isExecutingFirstTime;
+
     const isLoadingServices = services.allServicesRequest.isExecuting
       && services.allServicesRequest.isExecutingFirstTime;
 
-    if (isLoadingServices) {
+    if (isLoadingFeatures || isLoadingServices) {
       return (
         <AppLoader />
       );
-- 
cgit v1.2.3-70-g09d2