diff --git a/packages/forms/src/shared/helpers/getValidationText.js b/packages/forms/src/shared/helpers/getValidationText.js index 29b80d2f36..e617a51237 100644 --- a/packages/forms/src/shared/helpers/getValidationText.js +++ b/packages/forms/src/shared/helpers/getValidationText.js @@ -1,6 +1,21 @@ import { hasError } from './hasError.js' -const getValidationText = (meta, validationText, error) => - validationText || (hasError(meta, error) && meta.error) || '' +const getValidationText = (meta, validationText, error) => { + if (validationText) { + return validationText + } + + if (hasError(meta, error)) { + if (meta.error) { + return meta.error + } + + if (meta.submitError) { + return meta.submitError + } + } + + return '' +} export { getValidationText }