Merge pull request #1434 from danskernesdigitalebibliotek/DDFHER-67-m…

…obile-number-appears-in-wrong-field-in-cicero
danskernesdigitalebibliotek · Sep 24, 2024 · 1083233 · 1083233
2 parents c650052 + 8e58b1e
commit 1083233
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 6 deletions.
diff --git a/src/apps/create-patron-user-info/UserInfo.tsx b/src/apps/create-patron-user-info/UserInfo.tsx
@@ -47,6 +47,7 @@ const UserInfo: FC<UserInfoProps> = ({ cpr, registerSuccessCallback }) => {
     set(copyUser, key, newValue);
     setPatron(copyUser);
   };
+
   const handleSubmit = (e: FormEvent<HTMLFormElement>) => {
     e.preventDefault();
     setIsLoading(true);
@@ -80,7 +81,7 @@ const UserInfo: FC<UserInfoProps> = ({ cpr, registerSuccessCallback }) => {
           </h1>
           <form onSubmit={(e) => handleSubmit(e)} ref={formRef}>
             <ContactInfoSection
-              showCheckboxes={false}
+              showCheckboxes={["phone"]}
               isDouble
               inLine
               changePatron={changePatron}

diff --git a/src/apps/patron-page/PatronPage.tsx b/src/apps/patron-page/PatronPage.tsx
@@ -107,7 +107,7 @@ const PatronPage: FC = () => {
             changePatron={changePatron}
             patron={patron}
             inLine={false}
-            showCheckboxes
+            showCheckboxes={["email", "phone"]}
           />
         )}
         {patron?.resident && <StatusSection />}

diff --git a/src/apps/patron-page/PatronPageSkeleton.tsx b/src/apps/patron-page/PatronPageSkeleton.tsx
@@ -17,7 +17,7 @@ const PatronPageSkeleton: React.FC = () => {
         changePatron={() => {}}
         patron={null}
         inLine={false}
-        showCheckboxes
+        showCheckboxes={["email", "phone"]}
       />
     </form>
   );

diff --git a/src/components/contact-info-section/ContactInfoSection.tsx b/src/components/contact-info-section/ContactInfoSection.tsx
@@ -12,7 +12,7 @@ interface ContactInfoSectionProps {
   inLine?: boolean;
   isDouble?: boolean;
   changePatron: ChangePatronProps;
-  showCheckboxes: boolean;
+  showCheckboxes: ("email" | "phone")[];
   requiredFields?: ("email" | "phone")[];
 }
 
@@ -43,7 +43,9 @@ const ContactInfoSection: FC<ContactInfoSectionProps> = ({
           changePatron={changePatron}
           patron={patron}
           isRequired={requiredFields.includes("phone")}
-          showCheckboxes={showCheckboxes && textNotificationsEnabledConfig}
+          showCheckboxes={
+            showCheckboxes.includes("phone") && textNotificationsEnabledConfig
+          }
         />
         <ContactInfoEmail
           className={clsx(inputsClass, {
@@ -52,7 +54,7 @@ const ContactInfoSection: FC<ContactInfoSectionProps> = ({
           changePatron={changePatron}
           patron={patron}
           isRequired={requiredFields.includes("email")}
-          showCheckboxes={showCheckboxes}
+          showCheckboxes={showCheckboxes.includes("email")}
         />
       </ContactInfoInputs>
     </section>