lamassu/lamassu-server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: add validation errors to the update wizard

Browse source
This commit is contained in:
Nikola Ubavic 2021-10-18 14:40:47 +02:00
parent ff474ee507
commit a88c5f2a9a
2 changed files with 35 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

19
new-lamassu-admin/src/pages/Maintenance/Wizard/WizardStep.js
View file

@ -14,7 +14,7 @@ import cashbox from 'src/styling/icons/cassettes/acceptor-left.svg'
import cassetteOne from 'src/styling/icons/cassettes/dispenser-1.svg'
import cassetteTwo from 'src/styling/icons/cassettes/dispenser-2.svg'
import { ReactComponent as TxOutIcon } from 'src/styling/icons/direction/cash-out.svg'
import { comet } from 'src/styling/variables'
import { comet, errorColor } from 'src/styling/variables'
const styles = {
content: {
@ -83,6 +83,9 @@ const styles = {
},
fiatTotal: {
color: comet
},
errorMessage: {
color: errorColor
}
}
@ -142,7 +145,7 @@ const WizardStep = ({
initialValues={{ wasCashboxEmptied: '' }}
enableReinitialize
validationSchema={steps[step - 1].schema}>
{({ values }) => (
{({ values, errors }) => (
<Form>
<div
className={classnames(classes.horizontalAlign, classes.form)}>
@ -163,6 +166,11 @@ const WizardStep = ({
options={stepOneRadioOptions}
className={classes.horizontalAlign}
/>
{errors.wasCashboxEmptied && (
<div className={classes.errorMessage}>
{errors.wasCashboxEmptied}
</div>
)}
<div
className={classnames(
classes.horizontalAlign,
@ -205,7 +213,7 @@ const WizardStep = ({
initialValues={{ cassette1Count: '', cassette2Count: '' }}
enableReinitialize
validationSchema={steps[step - 1].schema}>
{({ values }) => (
{({ values, errors }) => (
<Form>
<div
className={classnames(classes.horizontalAlign, classes.form)}>
@ -269,6 +277,11 @@ const WizardStep = ({
cassetteInfo.denomination}{' '}
{fiatCurrency}
</P>
<P className={classes.errorMessage}>
{step === 2
? errors.cassette1Count
: errors.cassette2Count}
</P>
</div>
</div>
</div>