Merge pull request #3372 from bcgov/NDT-388-Bug-Benefits-page-shows-i…

…con-for-missing-info-even-though-it-s-filled-in fix: benefit schema validation issue
bcgov · Jun 18, 2024 · bf55671 · bf55671
2 parents 289be20 + 1888584
commit bf55671
Showing 1 changed file with 5 additions and 10 deletions.
diff --git a/app/components/Form/ApplicationForm.tsx b/app/components/Form/ApplicationForm.tsx
@@ -250,18 +250,13 @@ const ApplicationForm: React.FC<Props> = ({
       ...uiSchema,
       'ui:order': filteredUiSchemaOrder,
     };
-    // if it is intake 4, use v3 of UIschema
-  } else if (
-    latestIntakeNumber === 4 &&
-    (ccbcIntakeNumber === null || ccbcIntakeNumber === 4)
-  ) {
-    finalUiSchema = {
-      ...uiSchemaV3,
-      'ui:order': filteredUiSchemaOrder,
-    };
   } else {
+    // if it is intake 4, use v3 of UIschema
+    const isIntake4 =
+      latestIntakeNumber === 4 &&
+      (ccbcIntakeNumber === null || ccbcIntakeNumber === 4);
     finalUiSchema = {
-      ...uiSchema,
+      ...(isIntake4 ? uiSchemaV3 : uiSchema),
       benefits: {
         ...applicantBenefits,
       },