Merge branch 'feature/features-api' into feature/enterprise-ui

2 files changed, 9 insertions, 5 deletions

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 />
       );
diff --git a/src/containers/settings/EditServiceScreen.js b/src/containers/settings/EditServiceScreen.js
index 9084b9889..0ddb84db0 100644
--- a/src/containers/settings/EditServiceScreen.js
+++ b/src/containers/settings/EditServiceScreen.js
@@ -141,17 +141,17 @@ export default class EditServiceScreen extends Component {
 
     // More fine grained and use case specific validation rules
     if (recipe.hasTeamId && recipe.hasCustomUrl) {
-      config.fields.team.validate = [oneRequired(['team', 'customUrl'])];
-      config.fields.customUrl.validate = [url, oneRequired(['team', 'customUrl'])];
+      config.fields.team.validators = [oneRequired(['team', 'customUrl'])];
+      config.fields.customUrl.validators = [url, oneRequired(['team', 'customUrl'])];
     }
 
     // If a service can be hosted and has a teamId or customUrl
     if (recipe.hasHostedOption && (recipe.hasTeamId || recipe.hasCustomUrl)) {
       if (config.fields.team) {
-        config.fields.team.validate = [];
+        config.fields.team.validators = [];
       }
       if (config.fields.customUrl) {
-        config.fields.customUrl.validate = [url];
+        config.fields.customUrl.validators = [url];
       }
     }