From b595dcb997941b418fa8bb1609f54aeb978c91da Mon Sep 17 00:00:00 2001 From: haraldox Date: Fri, 19 Jan 2018 11:54:13 +0100 Subject: Revert "fix property change due to mobx-react-form update" This reverts commit 34949a6a005df240fa79f679675a0de1f3839776. --- src/components/auth/Invite.js | 2 +- src/components/auth/Login.js | 4 ++-- src/components/auth/Password.js | 2 +- src/components/auth/Signup.js | 10 +++++----- src/components/subscription/SubscriptionForm.js | 2 +- src/containers/settings/EditServiceScreen.js | 4 ++-- src/containers/settings/EditUserScreen.js | 12 ++++++------ 7 files changed, 18 insertions(+), 18 deletions(-) (limited to 'src') diff --git a/src/components/auth/Invite.js b/src/components/auth/Invite.js index a420f98a2..c1d815dcd 100644 --- a/src/components/auth/Invite.js +++ b/src/components/auth/Invite.js @@ -53,7 +53,7 @@ export default class Invite extends Component { email: { label: this.context.intl.formatMessage(messages.emailLabel), // value: '', - validators: [email], + validate: [email], placeholder: this.context.intl.formatMessage(messages.emailLabel), }, })], diff --git a/src/components/auth/Login.js b/src/components/auth/Login.js index 4a3cd6776..67e92849d 100644 --- a/src/components/auth/Login.js +++ b/src/components/auth/Login.js @@ -76,12 +76,12 @@ export default class Login extends Component { email: { label: this.context.intl.formatMessage(messages.emailLabel), value: '', - validators: [required, email], + validate: [required, email], }, password: { label: this.context.intl.formatMessage(messages.passwordLabel), value: '', - validators: [required], + validate: [required], type: 'password', }, }, diff --git a/src/components/auth/Password.js b/src/components/auth/Password.js index 5bcc80b6e..d2b196853 100644 --- a/src/components/auth/Password.js +++ b/src/components/auth/Password.js @@ -60,7 +60,7 @@ export default class Password extends Component { email: { label: this.context.intl.formatMessage(messages.emailLabel), value: '', - validators: [required, email], + validate: [required, email], }, }, }, this.context.intl); diff --git a/src/components/auth/Signup.js b/src/components/auth/Signup.js index 219948274..a990a112e 100644 --- a/src/components/auth/Signup.js +++ b/src/components/auth/Signup.js @@ -82,7 +82,7 @@ export default class Signup extends Component { fields: { accountType: { value: 'individual', - validators: [required], + validate: [required], options: [{ value: 'individual', label: 'Individual', @@ -97,17 +97,17 @@ export default class Signup extends Component { firstname: { label: this.context.intl.formatMessage(messages.firstnameLabel), value: '', - validators: [required], + validate: [required], }, lastname: { label: this.context.intl.formatMessage(messages.lastnameLabel), value: '', - validators: [required], + validate: [required], }, email: { label: this.context.intl.formatMessage(messages.emailLabel), value: '', - validators: [required, email], + validate: [required, email], }, organization: { label: this.context.intl.formatMessage(messages.companyLabel), @@ -116,7 +116,7 @@ export default class Signup extends Component { password: { label: this.context.intl.formatMessage(messages.passwordLabel), value: '', - validators: [required, minLength(6)], + validate: [required, minLength(6)], type: 'password', }, }, diff --git a/src/components/subscription/SubscriptionForm.js b/src/components/subscription/SubscriptionForm.js index dd350479d..41f8ba5d7 100644 --- a/src/components/subscription/SubscriptionForm.js +++ b/src/components/subscription/SubscriptionForm.js @@ -108,7 +108,7 @@ export default class SubscriptionForm extends Component { fields: { paymentTier: { value: 'year', - validators: [required], + validate: [required], options: [{ value: 'month', label: `€ ${Object.hasOwnProperty.call(this.props.plan, 'month') diff --git a/src/containers/settings/EditServiceScreen.js b/src/containers/settings/EditServiceScreen.js index 00e888cc4..c26195a1e 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, - validators: [required], + validate: [required], }, }); } @@ -132,7 +132,7 @@ export default class EditServiceScreen extends Component { label: intl.formatMessage(messages.customUrl), placeholder: 'https://', value: service.customUrl, - validators: [required, url], + validate: [required, url], }, }); } diff --git a/src/containers/settings/EditUserScreen.js b/src/containers/settings/EditUserScreen.js index dda8ce513..fb5c5db89 100644 --- a/src/containers/settings/EditUserScreen.js +++ b/src/containers/settings/EditUserScreen.js @@ -81,23 +81,23 @@ export default class EditUserScreen extends Component { label: intl.formatMessage(messages.firstname), placeholder: intl.formatMessage(messages.firstname), value: user.firstname, - validators: [required], + validate: [required], }, lastname: { label: intl.formatMessage(messages.lastname), placeholder: intl.formatMessage(messages.lastname), value: user.lastname, - validators: [required], + validate: [required], }, email: { label: intl.formatMessage(messages.email), placeholder: intl.formatMessage(messages.email), value: user.email, - validators: [required, email], + validate: [required, email], }, accountType: { value: user.accountType, - validators: [required], + validate: [required], label: intl.formatMessage(messages.accountType.label), options: [{ value: 'individual', @@ -118,12 +118,12 @@ export default class EditUserScreen extends Component { oldPassword: { label: intl.formatMessage(messages.currentPassword), type: 'password', - validators: [minLength(6)], + validate: [minLength(6)], }, newPassword: { label: intl.formatMessage(messages.newPassword), type: 'password', - validators: [minLength(6)], + validate: [minLength(6)], }, }, }; -- cgit v1.2.3-70-g09d2