diff --git a/new-lamassu-admin/src/pages/Cashout/Wizard.js b/new-lamassu-admin/src/pages/Cashout/Wizard.js index 6b7cb824..f9d5f187 100644 --- a/new-lamassu-admin/src/pages/Cashout/Wizard.js +++ b/new-lamassu-admin/src/pages/Cashout/Wizard.js @@ -17,7 +17,7 @@ const MODAL_WIDTH = 554 const MODAL_HEIGHT = 520 const Wizard = ({ machine, locale, onClose, save, error }) => { - const LAST_STEP = machine.numberOfCassettes + 2 + const LAST_STEP = machine.numberOfCassettes + 1 const [{ step, config }, setState] = useState({ step: 0, config: { active: true } @@ -66,14 +66,6 @@ const Wizard = ({ machine, locale, onClose, save, error }) => { 1 ) - steps.push({ - type: 'zeroConfLimit', - display: '0-conf Limit', - schema: Yup.object().shape({ - zeroConfLimit: Yup.number().required() - }) - }) - const schema = () => Yup.object().shape({ cassette1: Yup.number().required(), @@ -113,7 +105,7 @@ const Wizard = ({ machine, locale, onClose, save, error }) => { name={machine.name} numberOfCassettes={machine.numberOfCassettes} error={error} - lastStep={isLastStep} + isLastStep={isLastStep} steps={steps} fiatCurrency={locale.fiatCurrency} options={options} diff --git a/new-lamassu-admin/src/pages/Cashout/WizardStep.js b/new-lamassu-admin/src/pages/Cashout/WizardStep.js index f292503b..c4694c35 100644 --- a/new-lamassu-admin/src/pages/Cashout/WizardStep.js +++ b/new-lamassu-admin/src/pages/Cashout/WizardStep.js @@ -44,7 +44,7 @@ const WizardStep = ({ step, schema, error, - lastStep, + isLastStep, onContinue, steps, fiatCurrency, @@ -53,7 +53,7 @@ const WizardStep = ({ }) => { const classes = useStyles() - const label = lastStep ? 'Finish' : 'Next' + const label = isLastStep ? 'Finish' : 'Next' return ( <> @@ -62,7 +62,7 @@ const WizardStep = ({ - {step <= numberOfCassettes && ( + {!isLastStep && ( )} - {step === numberOfCassettes + 1 && ( - -
-
-
-

Edit 0-conf Limit

- - Choose a limit -
- - - {fiatCurrency} - -
-
-
- - -
-
- )} - - {lastStep && ( + {isLastStep && (
Cash Cassette Bill Count