Merge branch 'develop' into i18n

1 files changed, 6 insertions, 6 deletions

diff --git a/src/containers/settings/EditServiceScreen.js b/src/containers/settings/EditServiceScreen.js
index c26195a1e..67c2731fc 100644
--- a/src/containers/settings/EditServiceScreen.js
+++ b/src/containers/settings/EditServiceScreen.js
@@ -121,7 +121,7 @@ export default class EditServiceScreen extends Component {
           label: intl.formatMessage(messages.team),
           placeholder: intl.formatMessage(messages.team),
           value: service.team,
-          validate: [required],
+          validators: [required],
         },
       });
     }
@@ -132,24 +132,24 @@ export default class EditServiceScreen extends Component {
           label: intl.formatMessage(messages.customUrl),
           placeholder: 'https://',
           value: service.customUrl,
-          validate: [required, url],
+          validators: [required, url],
         },
       });
     }
 
     // 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];
       }
     }