diff --git a/src/Mixin.js b/src/Mixin.js index 4568815d..d615fc7a 100644 --- a/src/Mixin.js +++ b/src/Mixin.js @@ -166,7 +166,7 @@ module.exports = { return this.state._isRequired; }, showError: function () { - return this.showRequired() && !this.isValid(); + return !this.showRequired() && !this.isValid(); }, isValidValue: function (value) { return this.context.formsy.isValidValue.call(null, this, value); diff --git a/src/main.js b/src/main.js index 60435837..f7b5e8eb 100644 --- a/src/main.js +++ b/src/main.js @@ -278,7 +278,7 @@ Formsy.Form = React.createClass({ } if (isRequired) { - var error = validationErrors[requiredResults.success[0]] || validationError; + var error = validationErrors[requiredResults.success[0]]; return error ? [error] : null; }