small optimization and bug fix

cfpb · Oct 24, 2024 · d21bdb5 · d21bdb5
1 parent 500b822
commit d21bdb5
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 8 deletions.
diff --git a/src/pages/PointOfContact/index.tsx b/src/pages/PointOfContact/index.tsx
@@ -123,6 +123,7 @@ function FilingDetails(): JSX.Element {
 
   /** Populate form with pre-existing data, when it exists  */
   useEffect(() => {
+    let shouldCheck = false;
     // Checks if the fetched contact info passes validation
     // @ts-expect-error Part of code cleanup for post-mvp see: https://github.com/cfpb/sbl-frontend/issues/717
     const checkPreviousContactInfo = async (): void => {
@@ -136,7 +137,7 @@ function FilingDetails(): JSX.Element {
 
     if (typeof isVoluntary === 'boolean') {
       setValue('isVoluntary', isVoluntary);
-      checkPreviousContactInfo();
+      shouldCheck = true;
     }
 
     const contactInfo = (filing as FilingType).contact_info;
@@ -149,6 +150,10 @@ function FilingDetails(): JSX.Element {
         }
       }
       // eslint-disable-next-line @typescript-eslint/no-floating-promises
+      shouldCheck = true;
+    }
+
+    if (shouldCheck) {
       checkPreviousContactInfo();
     }
   }, [filing, setValue, trigger]);

diff --git a/src/types/formTypes.ts b/src/types/formTypes.ts
@@ -273,13 +273,11 @@ export interface FormattedUserProfileObjectType {
 
 // Voluntary Reporter Status
 export const voluntaryReporterStatusSchema = z.object({
-  isVoluntary: z
-    .boolean({
-      invalid_type_error: 'You must indicate your voluntary reporter status.',
-      required_error: 'You must indicate your voluntary reporter status.',
-      description: 'You must indicate your voluntary reporter status.',
-    })
-    .nullable(),
+  isVoluntary: z.boolean({
+    invalid_type_error: 'You must indicate your voluntary reporter status.',
+    required_error: 'You must indicate your voluntary reporter status.',
+    description: 'You must indicate your voluntary reporter status.',
+  }),
 });
 
 export type VoluntaryReporterStatusSchema = z.infer<