wave of fixes

department-of-veterans-affairs · Jan 17, 2025 · 0900cd0 · 0900cd0
1 parent 3bb33e7
commit 0900cd0
Show file tree

Hide file tree

Showing 5 changed files with 44 additions and 13 deletions.
diff --git a/src/applications/686c-674/config/chapters/674/addStudentsArrayPages.js b/src/applications/686c-674/config/chapters/674/addStudentsArrayPages.js
@@ -714,7 +714,7 @@ export const studentAssetsPage = {
         ),
       },
       otherAssets: textUI('All other assets'),
-      totalValue: textUI('All other assets'),
+      totalValue: textUI('Total value'),
     },
   },
   schema: {

diff --git a/...rs/report-add-a-spouse/current-marriage-information/currentMarriageInformationPartFive.js b/...rs/report-add-a-spouse/current-marriage-information/currentMarriageInformationPartFive.js
@@ -31,7 +31,7 @@ export const uiSchema = {
       classNames: 'vads-u-margin-top--4',
     }),
     other: textUI({
-      title: 'Briefly describe why you live separately',
+      title: 'Briefly describe why you live separately from your spouse',
       required: formData =>
         formData?.doesLiveWithSpouse?.currentSpouseReasonForSeparation ===
         'OTHER',

diff --git a/...lications/686c-674/config/chapters/report-add-a-spouse/spouseMarriageHistoryArrayPages.js b/...lications/686c-674/config/chapters/report-add-a-spouse/spouseMarriageHistoryArrayPages.js
@@ -132,7 +132,6 @@ export const formerMarriageEndReasonPage = {
     reasonMarriageEndedOther: {
       ...textUI('Briefly describe how their marriage ended'),
       'ui:required': (formData, index) => {
-        // See above comment
         const isEditMode = formData?.reasonMarriageEnded === 'Other';
         const isAddMode =
           formData?.spouseMarriageHistory?.[index]?.reasonMarriageEnded ===
@@ -183,6 +182,24 @@ export const formerMarriageEndDatePage = {
     endDate: {
       ...currentOrPastDateUI('When did their marriage end?'),
       'ui:required': () => true,
+      'ui:validations': [
+        {
+          validator: (errors, _field, formData) => {
+            const { startDate, endDate } = formData;
+
+            if (!startDate || !endDate) return;
+
+            const start = new Date(startDate);
+            const end = new Date(endDate);
+
+            if (end < start) {
+              errors.addError(
+                'Marriage end date must be the on or after the marriage start date',
+              );
+            }
+          },
+        },
+      ],
     },
   },
   schema: {
@@ -221,7 +238,6 @@ export const formerMarriageStartLocationPage = {
           'ui:title': 'State',
           'ui:webComponentField': VaSelectField,
           'ui:required': (formData, index) => {
-            // See above comment
             const isEditMode = formData?.startLocation?.outsideUsa;
             const isAddMode =
               formData?.spouseMarriageHistory?.[index]?.startLocation
@@ -231,7 +247,6 @@ export const formerMarriageStartLocationPage = {
           },
           'ui:options': {
             hideIf: (formData, index) =>
-              // See above comment
               formData?.startLocation?.outsideUsa ||
               formData?.spouseMarriageHistory?.[index]?.startLocation
                 ?.outsideUsa,
@@ -282,7 +297,6 @@ export const formerMarriageEndLocationPage = {
           'ui:title': 'State',
           'ui:webComponentField': VaSelectField,
           'ui:required': (formData, index) => {
-            // See above comment
             const isEditMode = formData?.endLocation?.outsideUsa;
             const isAddMode =
               formData?.spouseMarriageHistory?.[index]?.endLocation?.outsideUsa;
@@ -291,7 +305,6 @@ export const formerMarriageEndLocationPage = {
           },
           'ui:options': {
             hideIf: (formData, index) =>
-              // See above comment
               formData?.endLocation?.outsideUsa ||
               formData?.spouseMarriageHistory?.[index]?.endLocation?.outsideUsa,
           },

diff --git a/...ications/686c-674/config/chapters/report-add-a-spouse/veteranMarriageHistoryArrayPages.js b/...ications/686c-674/config/chapters/report-add-a-spouse/veteranMarriageHistoryArrayPages.js
@@ -19,7 +19,7 @@ import VaSelectField from 'platform/forms-system/src/js/web-component-fields/VaS
 import VaCheckboxField from 'platform/forms-system/src/js/web-component-fields/VaCheckboxField';
 import {
   marriageEnums,
-  spouseFormerMarriageLabels,
+  veteranFormerMarriageLabels,
   customLocationSchema,
   generateHelpText,
 } from '../../helpers';
@@ -125,7 +125,7 @@ export const vetFormerMarriageEndReasonPage = {
       ...radioUI({
         title: 'How did your marriage end?',
         required: () => true,
-        labels: spouseFormerMarriageLabels,
+        labels: veteranFormerMarriageLabels,
       }),
     },
     reasonMarriageEndedOther: {
@@ -162,7 +162,7 @@ export const vetFormerMarriageStartDatePage = {
       return 'Your former marriage';
     }),
     startDate: {
-      ...currentOrPastDateUI('When did they get married?'),
+      ...currentOrPastDateUI('When did you get married?'),
       'ui:required': () => true,
     },
   },
@@ -180,8 +180,26 @@ export const vetFormerMarriageEndDatePage = {
       return 'Your former marriage';
     }),
     endDate: {
-      ...currentOrPastDateUI('When did their marriage end?'),
+      ...currentOrPastDateUI('When did your marriage end?'),
       'ui:required': () => true,
+      'ui:validations': [
+        {
+          validator: (errors, _field, formData) => {
+            const { startDate, endDate } = formData;
+
+            if (!startDate || !endDate) return;
+
+            const start = new Date(startDate);
+            const end = new Date(endDate);
+
+            if (end < start) {
+              errors.addError(
+                'Marriage end date must be the on or after the marriage start date',
+              );
+            }
+          },
+        },
+      ],
     },
   },
   schema: {
@@ -198,7 +216,7 @@ export const vetFormerMarriageStartLocationPage = {
       return 'Your former marriage';
     }),
     startLocation: {
-      'ui:title': 'Where did they get married?',
+      'ui:title': 'Where did you get married?',
       'ui:options': {
         labelHeaderLevel: '4',
       },

diff --git a/...4/config/chapters/stepchild-no-longer-part-of-household/removeChildHouseholdArrayPages.js b/...4/config/chapters/stepchild-no-longer-part-of-household/removeChildHouseholdArrayPages.js
@@ -91,7 +91,7 @@ export const householdChildInfoPage = {
       title: 'Remove a stepchild who has left your household',
       nounSingular: removeChildHouseholdOptions.nounSingular,
     }),
-    fullName: fullNameNoSuffixUI(),
+    fullName: fullNameNoSuffixUI(title => `Child’s ${title}`),
     ssn: {
       ...ssnUI('Child’s Social Security number'),
       'ui:required': () => true,