diff --git a/app/components/Form/ApplicationForm.tsx b/app/components/Form/ApplicationForm.tsx index 2b53ef4a36..e8ff92a971 100644 --- a/app/components/Form/ApplicationForm.tsx +++ b/app/components/Form/ApplicationForm.tsx @@ -250,18 +250,13 @@ const ApplicationForm: React.FC = ({ ...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, },