diff --git a/src/components/Checkbox/Checkbox.tsx b/src/components/Checkbox/Checkbox.tsx index ae423bd97..e4ddbfd1a 100644 --- a/src/components/Checkbox/Checkbox.tsx +++ b/src/components/Checkbox/Checkbox.tsx @@ -33,7 +33,7 @@ const Checkbox: React.FC = ({ label, name, onChange, header, checked, val ) : null}
- +
{helperText ?
{helperText}
: null} diff --git a/src/components/Checkbox/__snapshots__/Checkbox.test.tsx.snap b/src/components/Checkbox/__snapshots__/Checkbox.test.tsx.snap index 3f632029a..65a4973f6 100644 --- a/src/components/Checkbox/__snapshots__/Checkbox.test.tsx.snap +++ b/src/components/Checkbox/__snapshots__/Checkbox.test.tsx.snap @@ -17,6 +17,7 @@ exports[` renders and matches snapshot 1`] = ` diff --git a/src/components/RegistrationForm/RegistrationForm.test.tsx b/src/components/RegistrationForm/RegistrationForm.test.tsx index 5cf844892..77ac45c26 100644 --- a/src/components/RegistrationForm/RegistrationForm.test.tsx +++ b/src/components/RegistrationForm/RegistrationForm.test.tsx @@ -15,6 +15,7 @@ describe('', () => { consentErrors={[]} consentValues={{}} loading={false} + canSubmit={true} onConsentChange={jest.fn()} />, ); diff --git a/src/components/RegistrationForm/RegistrationForm.tsx b/src/components/RegistrationForm/RegistrationForm.tsx index cc8a2c6b3..ce9d4a73b 100644 --- a/src/components/RegistrationForm/RegistrationForm.tsx +++ b/src/components/RegistrationForm/RegistrationForm.tsx @@ -28,6 +28,7 @@ type Props = { consentValues: Record; consentErrors: string[]; submitting: boolean; + canSubmit: boolean; publisherConsents?: Consent[]; }; @@ -38,6 +39,7 @@ const RegistrationForm: React.FC = ({ errors, submitting, loading, + canSubmit, publisherConsents, consentValues, onConsentChange, @@ -113,6 +115,7 @@ const RegistrationForm: React.FC = ({ name={consent.name} value={consent.name} error={consentErrors?.includes(consent.name)} + required={consent.required} checked={consentValues[consent.name]} onChange={onConsentChange} label={formatConsentLabel(consent.label)} @@ -125,7 +128,7 @@ const RegistrationForm: React.FC = ({ variant="contained" color="primary" size="large" - disabled={submitting} + disabled={submitting || !canSubmit} fullWidth />
diff --git a/src/containers/AccountModal/forms/Registration.tsx b/src/containers/AccountModal/forms/Registration.tsx index 592567e4f..ed62109e4 100644 --- a/src/containers/AccountModal/forms/Registration.tsx +++ b/src/containers/AccountModal/forms/Registration.tsx @@ -91,6 +91,7 @@ const Registration = () => { publisherConsents={publisherConsents} loading={publisherConsentsLoading} onConsentChange={handleChangeConsent} + canSubmit={!!values.email && !!values.password} /> ); };