diff --git a/src/components/formik-forms/formik-input.jsx b/src/components/formik-forms/formik-input.jsx
index 26bff6a82..8df63032a 100644
--- a/src/components/formik-forms/formik-input.jsx
+++ b/src/components/formik-forms/formik-input.jsx
@@ -11,6 +11,7 @@ require('./formik-input.scss');
const FormikInput = ({
className,
error,
+ toolTip,
validationClassName,
wrapperClassName,
...props
@@ -31,11 +32,18 @@ const FormikInput = ({
)}
{...props}
/>
- {error && (
+ {error ? (
+ ) : toolTip && (
+
)}
);
@@ -44,6 +52,7 @@ const FormikInput = ({
FormikInput.propTypes = {
className: PropTypes.string,
error: PropTypes.string,
+ toolTip: PropTypes.oneOfType([PropTypes.bool, PropTypes.string]),
type: PropTypes.string,
validationClassName: PropTypes.string,
wrapperClassName: PropTypes.string
diff --git a/src/components/formik-forms/formik-select.jsx b/src/components/formik-forms/formik-select.jsx
index 4578d8a64..2bd1f6ff5 100644
--- a/src/components/formik-forms/formik-select.jsx
+++ b/src/components/formik-forms/formik-select.jsx
@@ -37,6 +37,7 @@ const FormikSelect = ({
{error && (
diff --git a/src/components/forms/validation-message.jsx b/src/components/forms/validation-message.jsx
index 10c05ce13..0664995fb 100644
--- a/src/components/forms/validation-message.jsx
+++ b/src/components/forms/validation-message.jsx
@@ -5,13 +5,24 @@ const React = require('react');
require('./validation-message.scss');
const ValidationMessage = props => (
-
+
{props.message}
);
ValidationMessage.propTypes = {
className: PropTypes.string,
+ isError: PropTypes.bool,
+ isOk: PropTypes.bool,
message: PropTypes.string
};
diff --git a/src/components/forms/validation-message.scss b/src/components/forms/validation-message.scss
index d10e30e27..7a2acbd84 100644
--- a/src/components/forms/validation-message.scss
+++ b/src/components/forms/validation-message.scss
@@ -11,7 +11,6 @@
margin-left: $arrow-border-width;
border: 1px solid $active-gray;
border-radius: 5px;
- background-color: $ui-orange;
padding: 1rem;
max-width: 18.75rem;
min-height: 1rem;
@@ -31,7 +30,6 @@
border-left: 1px solid $active-gray;
border-radius: 5px;
- background-color: $ui-orange;
width: $arrow-border-width;
height: $arrow-border-width;
@@ -52,3 +50,19 @@
}
}
}
+
+.validation-error {
+ background-color: $ui-orange;
+
+ &:before {
+ background-color: $ui-orange;
+ }
+}
+
+.validation-ok {
+ background-color: $ui-blue;
+
+ &:before {
+ background-color: $ui-blue;
+ }
+}