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

feat: remove 0conf steps from cashout setup wizard

Browse source
This commit is contained in:
André Sá 2022-03-08 17:12:05 +00:00
parent 348260931e
commit 93873306a9
2 changed files with 6 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

12
new-lamassu-admin/src/pages/Cashout/Wizard.js
View file

@ -17,7 +17,7 @@ const MODAL_WIDTH = 554
const MODAL_HEIGHT = 520 const MODAL_HEIGHT = 520
const Wizard = ({ machine, locale, onClose, save, error }) => { const Wizard = ({ machine, locale, onClose, save, error }) => {
const LAST_STEP = machine.numberOfCassettes + 2 const LAST_STEP = machine.numberOfCassettes + 1
const [{ step, config }, setState] = useState({ const [{ step, config }, setState] = useState({
step: 0, step: 0,
config: { active: true } config: { active: true }
@ -66,14 +66,6 @@ const Wizard = ({ machine, locale, onClose, save, error }) => {
1 1
) )
steps.push({
type: 'zeroConfLimit',
display: '0-conf Limit',
schema: Yup.object().shape({
zeroConfLimit: Yup.number().required()
})
})
const schema = () => const schema = () =>
Yup.object().shape({ Yup.object().shape({
cassette1: Yup.number().required(), cassette1: Yup.number().required(),
@ -113,7 +105,7 @@ const Wizard = ({ machine, locale, onClose, save, error }) => {
name={machine.name} name={machine.name}
numberOfCassettes={machine.numberOfCassettes} numberOfCassettes={machine.numberOfCassettes}
error={error} error={error}
lastStep={isLastStep} isLastStep={isLastStep}
steps={steps} steps={steps}
fiatCurrency={locale.fiatCurrency} fiatCurrency={locale.fiatCurrency}
options={options} options={options}

47
new-lamassu-admin/src/pages/Cashout/WizardStep.js
View file

@ -44,7 +44,7 @@ const WizardStep = ({
step, step,
schema, schema,
error, error,
lastStep, isLastStep,
onContinue, onContinue,
steps, steps,
fiatCurrency, fiatCurrency,
@ -53,7 +53,7 @@ const WizardStep = ({
}) => { }) => {
const classes = useStyles() const classes = useStyles()
const label = lastStep ? 'Finish' : 'Next' const label = isLastStep ? 'Finish' : 'Next'
return ( return (
<> <>
@ -62,7 +62,7 @@ const WizardStep = ({
<Stepper steps={steps.length + 1} currentStep={step} /> <Stepper steps={steps.length + 1} currentStep={step} />
</div> </div>
{step <= numberOfCassettes && ( {!isLastStep && (
<Formik <Formik
validateOnBlur={false} validateOnBlur={false}
validateOnChange={false} validateOnChange={false}
@ -121,46 +121,7 @@ const WizardStep = ({
</Formik> </Formik>
)} )}
{step === numberOfCassettes + 1 && ( {isLastStep && (
<Formik
validateOnBlur={false}
validateOnChange={false}
onSubmit={onContinue}
initialValues={{ zeroConfLimit: '' }}
enableReinitialize
validationSchema={steps[step - 1].schema}>
<Form>
<div className={classes.thirdStepHeader}>
<div className={classes.step}>
<H4 className={classes.edit}>Edit 0-conf Limit</H4>
<Label1>Choose a limit</Label1>
<div className={classes.bill}>
<Field
className={classes.billInput}
type="text"
size="lg"
autoFocus={true}
component={NumberInput}
fullWidth
decimalPlaces={0}
name={steps[step - 1].type}
/>
<Info1 noMargin className={classes.suffix}>
{fiatCurrency}
</Info1>
</div>
</div>
</div>
<Button className={classes.submit} type="submit">
{label}
</Button>
</Form>
</Formik>
)}
{lastStep && (
<div className={classes.disclaimer}> <div className={classes.disclaimer}>
<Info2 className={classes.title}>Cash Cassette Bill Count</Info2> <Info2 className={classes.title}>Cash Cassette Bill Count</Info2>
<P> <P>