2 files changed, 12 insertions, 6 deletions

diff --git a/src/containers/layout/AppLayoutContainer.js b/src/containers/layout/AppLayoutContainer.js
index 2db2b7bb7..7a398ed2d 100644
--- a/src/containers/layout/AppLayoutContainer.js
+++ b/src/containers/layout/AppLayoutContainer.js
@@ -5,6 +5,7 @@ import { inject, observer } from 'mobx-react';
 import AppStore from '../../stores/AppStore';
 import RecipesStore from '../../stores/RecipesStore';
 import ServicesStore from '../../stores/ServicesStore';
+import FeaturesStore from '../../stores/FeaturesStore';
 import UIStore from '../../stores/UIStore';
 import NewsStore from '../../stores/NewsStore';
 import SettingsStore from '../../stores/SettingsStore';
@@ -66,7 +67,7 @@ export default class AppLayoutContainer extends Component {
     const { children } = this.props;
 
     const isLoadingFeatures = features.featuresRequest.isExecuting
-      && features.featuresRequest.isExecutingFirstTime;
+      && !features.featuresRequest.wasExecuted;
 
     const isLoadingServices = services.allServicesRequest.isExecuting
       && services.allServicesRequest.isExecutingFirstTime;
@@ -134,6 +135,7 @@ export default class AppLayoutContainer extends Component {
 AppLayoutContainer.wrappedComponent.propTypes = {
   stores: PropTypes.shape({
     services: PropTypes.instanceOf(ServicesStore).isRequired,
+    features: PropTypes.instanceOf(FeaturesStore).isRequired,
     recipes: PropTypes.instanceOf(RecipesStore).isRequired,
     app: PropTypes.instanceOf(AppStore).isRequired,
     ui: PropTypes.instanceOf(UIStore).isRequired,
diff --git a/src/containers/settings/EditServiceScreen.js b/src/containers/settings/EditServiceScreen.js
index 0ddb84db0..f2d5550e1 100644
--- a/src/containers/settings/EditServiceScreen.js
+++ b/src/containers/settings/EditServiceScreen.js
@@ -6,6 +6,7 @@ import { defineMessages, intlShape } from 'react-intl';
 import UserStore from '../../stores/UserStore';
 import RecipesStore from '../../stores/RecipesStore';
 import ServicesStore from '../../stores/ServicesStore';
+import FeaturesStore from '../../stores/FeaturesStore';
 import Form from '../../lib/Form';
 import { gaPage } from '../../lib/analytics';
 
@@ -77,7 +78,7 @@ export default class EditServiceScreen extends Component {
     }
   }
 
-  prepareForm(recipe, service, userCanManageService) {
+  prepareForm(recipe, service, userCanManageServices) {
     const { intl } = this.context;
     const config = {
       fields: {
@@ -118,7 +119,7 @@ export default class EditServiceScreen extends Component {
     if (recipe.hasTeamId) {
       Object.assign(config.fields, {
         team: {
-          disabled: !userCanManageService,
+          disabled: !userCanManageServices,
           label: intl.formatMessage(messages.team),
           placeholder: intl.formatMessage(messages.team),
           value: service.team,
@@ -130,7 +131,7 @@ export default class EditServiceScreen extends Component {
     if (recipe.hasCustomUrl) {
       Object.assign(config.fields, {
         customUrl: {
-          disabled: !userCanManageService,
+          disabled: !userCanManageServices,
           label: intl.formatMessage(messages.customUrl),
           placeholder: 'https://',
           value: service.customUrl,
@@ -182,7 +183,7 @@ export default class EditServiceScreen extends Component {
   }
 
   render() {
-    const { recipes, services, user } = this.props.stores;
+    const { recipes, services, user, features } = this.props.stores;
     const { action } = this.props.router.params;
 
     let recipe;
@@ -217,7 +218,8 @@ export default class EditServiceScreen extends Component {
       );
     }
 
-    const form = this.prepareForm(recipe, service, user.data.clientSettings.userCanManageServices);
+    const userCanManageServices = features.features.userCanManageServices;
+    const form = this.prepareForm(recipe, service, userCanManageServices);
 
     return (
       <EditServiceForm
@@ -225,6 +227,7 @@ export default class EditServiceScreen extends Component {
         recipe={recipe}
         service={service}
         user={user.data}
+        userCanManageServices={userCanManageServices}
         form={form}
         status={services.actionStatus}
         isSaving={services.updateServiceRequest.isExecuting || services.createServiceRequest.isExecuting}
@@ -241,6 +244,7 @@ EditServiceScreen.wrappedComponent.propTypes = {
     user: PropTypes.instanceOf(UserStore).isRequired,
     recipes: PropTypes.instanceOf(RecipesStore).isRequired,
     services: PropTypes.instanceOf(ServicesStore).isRequired,
+    features: PropTypes.instanceOf(FeaturesStore).isRequired,
   }).isRequired,
   router: PropTypes.shape({
     params: PropTypes.shape({