fix: wizard validation
This commit is contained in:
parent
d07ca5c20d
commit
ee94ff03e6
6 changed files with 7 additions and 5 deletions
|
|
@ -194,7 +194,7 @@ const Wallet = ({ name: SCREEN_KEY }) => {
|
||||||
<FormRenderer
|
<FormRenderer
|
||||||
save={wizardSave}
|
save={wizardSave}
|
||||||
elements={editingSchema.elements}
|
elements={editingSchema.elements}
|
||||||
validationSchema={editingSchema.validationSchema}
|
validationSchema={editingSchema.getValidationSchema(accounts[editingSchema.code])}
|
||||||
value={accounts[editingSchema.code]}
|
value={accounts[editingSchema.code]}
|
||||||
/>
|
/>
|
||||||
</Modal>
|
</Modal>
|
||||||
|
|
|
||||||
|
|
@ -135,6 +135,7 @@ const Wizard = ({
|
||||||
fiatCurrency={fiatCurrency}
|
fiatCurrency={fiatCurrency}
|
||||||
error={error}
|
error={error}
|
||||||
step={step}
|
step={step}
|
||||||
|
accounts={accounts}
|
||||||
maxSteps={MAX_STEPS}
|
maxSteps={MAX_STEPS}
|
||||||
lastStep={lastStep}
|
lastStep={lastStep}
|
||||||
isLastStep={isLastStep}
|
isLastStep={isLastStep}
|
||||||
|
|
|
||||||
|
|
@ -62,6 +62,7 @@ const WizardStep = ({
|
||||||
maxSteps,
|
maxSteps,
|
||||||
lastStep,
|
lastStep,
|
||||||
isLastStep,
|
isLastStep,
|
||||||
|
accounts,
|
||||||
onContinue,
|
onContinue,
|
||||||
fiatCurrency,
|
fiatCurrency,
|
||||||
filled,
|
filled,
|
||||||
|
|
@ -177,7 +178,7 @@ const WizardStep = ({
|
||||||
<FormRenderer
|
<FormRenderer
|
||||||
save={it => innerContinue({ [type]: form.code }, { [form.code]: it })}
|
save={it => innerContinue({ [type]: form.code }, { [form.code]: it })}
|
||||||
elements={schemas[form.code].elements}
|
elements={schemas[form.code].elements}
|
||||||
validationSchema={schemas[form.code].validationSchema}
|
validationSchema={schemas[form.code].getValidationSchema(accounts[form.code])}
|
||||||
value={getValue(form.code)}
|
value={getValue(form.code)}
|
||||||
buttonLabel={label}
|
buttonLabel={label}
|
||||||
/>
|
/>
|
||||||
|
|
|
||||||
|
|
@ -126,7 +126,7 @@ const Mailgun = () => {
|
||||||
value={accounts.mailgun}
|
value={accounts.mailgun}
|
||||||
save={saveAccount}
|
save={saveAccount}
|
||||||
elements={mailgunSchema.elements}
|
elements={mailgunSchema.elements}
|
||||||
validationSchema={mailgunSchema.validationSchema}
|
validationSchema={mailgunSchema.getValidationSchema(accounts.mailgun)}
|
||||||
buttonLabel={'Save'}
|
buttonLabel={'Save'}
|
||||||
/>
|
/>
|
||||||
</>
|
</>
|
||||||
|
|
|
||||||
|
|
@ -138,7 +138,7 @@ function Twilio({ doContinue }) {
|
||||||
save={save}
|
save={save}
|
||||||
value={accounts.twilio}
|
value={accounts.twilio}
|
||||||
elements={twilio.elements}
|
elements={twilio.elements}
|
||||||
validationSchema={twilio.validationSchema}
|
validationSchema={twilio.getValidationSchema(accounts.twilio)}
|
||||||
buttonLabel={'Continue'}
|
buttonLabel={'Continue'}
|
||||||
buttonClass={classes.formButton}
|
buttonClass={classes.formButton}
|
||||||
/>
|
/>
|
||||||
|
|
|
||||||
|
|
@ -118,7 +118,7 @@ const ChooseExchange = ({ data: currentData, addData }) => {
|
||||||
value={accounts[selected]}
|
value={accounts[selected]}
|
||||||
save={saveExchange(selected)}
|
save={saveExchange(selected)}
|
||||||
elements={schema[selected].elements}
|
elements={schema[selected].elements}
|
||||||
validationSchema={schema[selected].validationSchema}
|
validationSchema={schema[selected].getValidationSchema(accounts[selected])}
|
||||||
buttonLabel={'Continue'}
|
buttonLabel={'Continue'}
|
||||||
buttonClass={classes.formButton}
|
buttonClass={classes.formButton}
|
||||||
/>
|
/>
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue