From b4f93793c8e36d6883e1365a4517e5542f000842 Mon Sep 17 00:00:00 2001
From: Roy Schut <roy@videodock.com>
Date: Fri, 6 Aug 2021 15:39:08 +0200
Subject: [PATCH] fix(auth): fix console error controlled checkbox

---
 src/components/Account/Account.tsx                   |  2 +-
 src/components/Dropdown/Dropdown.tsx                 | 11 +----------
 src/components/RegistrationForm/RegistrationForm.tsx |  8 ++++----
 3 files changed, 6 insertions(+), 15 deletions(-)

diff --git a/src/components/Account/Account.tsx b/src/components/Account/Account.tsx
index b8d3718dc..c37946929 100644
--- a/src/components/Account/Account.tsx
+++ b/src/components/Account/Account.tsx
@@ -215,7 +215,7 @@ const Account = ({
                   <Checkbox
                     key={index}
                     name={consent.name}
-                    value={values.consents?.[consent.name] || ''}
+                    value={values.consents?.[consent.value] || ''}
                     checked={(values.consents?.[consent.name] as boolean) || false}
                     onChange={(event) => (handleChange ? handleChange(event, { nestInto: 'consents' }) : null)}
                     label={formatConsentLabel(consent.label)}
diff --git a/src/components/Dropdown/Dropdown.tsx b/src/components/Dropdown/Dropdown.tsx
index e4fdddd15..36f90b891 100644
--- a/src/components/Dropdown/Dropdown.tsx
+++ b/src/components/Dropdown/Dropdown.tsx
@@ -52,16 +52,7 @@ const Dropdown: React.FC<Props & React.AriaAttributes> = ({
         </label>
       )}
       <div className={classNames(styles.dropdown, { [styles.fullWidth]: fullWidth })}>
-        <select
-          id={id}
-          className={styles.select}
-          name={name}
-          value={value}
-          onChange={onChange}
-          aria-required={required}
-          defaultValue={defaultLabel}
-          {...rest}
-        >
+        <select id={id} className={styles.select} name={name} value={value} onChange={onChange} aria-required={required} {...rest}>
           {defaultLabel && (
             <option className={classNames(styles.option, optionsStyle)} value="" disabled={required}>
               {defaultLabel}
diff --git a/src/components/RegistrationForm/RegistrationForm.tsx b/src/components/RegistrationForm/RegistrationForm.tsx
index 45019c9ce..83e00dc7e 100644
--- a/src/components/RegistrationForm/RegistrationForm.tsx
+++ b/src/components/RegistrationForm/RegistrationForm.tsx
@@ -96,12 +96,12 @@ const RegistrationForm: React.FC<Props> = ({
         label={t('registration.password')}
         placeholder={t('registration.password')}
         error={!!errors.password || !!errors.form}
-        helperText={(
+        helperText={
           <React.Fragment>
             <PasswordStrength password={values.password} />
             {t('registration.password_helper_text')}
           </React.Fragment>
-        )}
+        }
         name="password"
         type={viewPassword ? 'text' : 'password'}
         rightControl={
@@ -118,10 +118,10 @@ const RegistrationForm: React.FC<Props> = ({
         <Checkbox
           key={index}
           name={consent.name}
-          value={consent.name}
+          value={consent.value || ''}
           error={consentErrors?.includes(consent.name)}
           required={consent.required}
-          checked={consentValues[consent.name]}
+          checked={consentValues[consent.name] || false}
           onChange={onConsentChange}
           label={formatConsentLabel(consent.label)}
         />