Merge remote-tracking branch 'upstream/release-7.5.0' into chore/merge-release-into-dev-21-16-12

2021-12-16 13:38:43 +00:00 · 2021-12-16 13:38:43 +00:00 · e9b2280fc3
commit e9b2280fc3
parent 41c7e2a8c1 13b42b0753
33 changed files with 250 additions and 64 deletions
--- a/new-lamassu-admin/src/pages/Maintenance/Wizard/WizardStep.js
+++ b/new-lamassu-admin/src/pages/Maintenance/Wizard/WizardStep.js
@ -115,7 +115,8 @@ const WizardStep = ({
  lastStep,
  steps,
  fiatCurrency,
-  onContinue
+  onContinue,
+  initialValues
 }) => {
  const classes = useStyles()

@ -219,12 +220,7 @@ const WizardStep = ({
          validateOnBlur={false}
          validateOnChange={false}
          onSubmit={onContinue}
-          initialValues={{
-            cassette1: '',
-            cassette2: '',
-            cassette3: '',
-            cassette4: ''
-          }}
+          initialValues={initialValues}
          enableReinitialize
          validationSchema={steps[step - 1].schema}>
          {({ values, errors }) => (