Merge branch 'main' into art/96895/isolate-21a-app

department-of-veterans-affairs · Nov 27, 2024 · 54b2b98 · 54b2b98
2 parents 0b9610c + cec0e38
commit 54b2b98
Show file tree

Hide file tree

Showing 56 changed files with 12,827 additions and 1,176 deletions.
diff --git a/src/applications/_mock-form-ae-design-patterns/mocks/endpoints/feature-toggles/index.js b/src/applications/_mock-form-ae-design-patterns/mocks/endpoints/feature-toggles/index.js
@@ -4,6 +4,7 @@ const { snakeCase } = require('lodash');
 // instead use generateFeatureToggles in server.js to set the toggle values
 const profileToggles = {
   profileUseExperimental: false,
+  aedpVADX: false,
   coeAccess: true,
   showEduBenefits1990Wizard: true,
   showEduBenefits0994Wizard: true,

diff --git a/src/applications/_mock-form-ae-design-patterns/mocks/server.js b/src/applications/_mock-form-ae-design-patterns/mocks/server.js
@@ -48,6 +48,7 @@ const responses = {
           generateFeatureToggles({
             profileUseExperimental: true,
             coeAccess: true,
+            aedpVADX: true,
           }),
         ),
       secondsOfDelay,

diff --git a/...y-benefits/686c-674-v2/config/chapters/veteran-information/veteran-contact-information.js b/...y-benefits/686c-674-v2/config/chapters/veteran-information/veteran-contact-information.js
@@ -55,6 +55,7 @@ export const uiSchema = {
       },
       emailAddress: {
         ...emailUI('Email address'),
+        'ui:required': () => true,
         'ui:options': {
           classNames: 'vads-u-margin-bottom--3',
         },

diff --git a/src/applications/disability-benefits/686c-674-v2/tests/e2e/fixtures/add-child-add-674.json b/src/applications/disability-benefits/686c-674-v2/tests/e2e/fixtures/add-child-add-674.json
@@ -97,7 +97,8 @@
         "postalCode": "20500"
       },
       "veteranContactInformation": {
-        "phoneNumber": "1231231234"
+        "phoneNumber": "1231231234",
+        "emailAddress": "[email protected]"
       }
     },
     "view:686Information": {},

diff --git a/...ications/disability-benefits/686c-674-v2/tests/e2e/fixtures/add-child-report-divorce.json b/...ications/disability-benefits/686c-674-v2/tests/e2e/fixtures/add-child-report-divorce.json
@@ -64,7 +64,8 @@
         "postalCode": "20500"
       },
       "veteranContactInformation": {
-        "phoneNumber": "1231231234"
+        "phoneNumber": "1231231234",
+        "emailAddress": "[email protected]"
       }
     },
     "view:686Information": {},

diff --git a/src/applications/disability-benefits/686c-674-v2/tests/e2e/fixtures/ancilliary-flows.json b/src/applications/disability-benefits/686c-674-v2/tests/e2e/fixtures/ancilliary-flows.json
@@ -85,7 +85,8 @@
         "postalCode": "20500"
       },
       "veteranContactInformation": {
-        "phoneNumber": "1231231234"
+        "phoneNumber": "1231231234",
+        "emailAddress": "[email protected]"
       }
     },
     "view:686Information": {},

diff --git a/...lications/disability-benefits/686c-674-v2/tests/e2e/fixtures/spouse-child-all-fields.json b/...lications/disability-benefits/686c-674-v2/tests/e2e/fixtures/spouse-child-all-fields.json
@@ -148,7 +148,8 @@
         "postalCode": "20500"
       },
       "veteranContactInformation": {
-        "phoneNumber": "1231231234"
+        "phoneNumber": "1231231234",
+        "emailAddress": "[email protected]"
       }
     },
     "view:686Information": {},

diff --git a/...pplications/disability-benefits/686c-674-v2/tests/e2e/fixtures/spouse-report-divorce.json b/...pplications/disability-benefits/686c-674-v2/tests/e2e/fixtures/spouse-report-divorce.json
@@ -99,7 +99,8 @@
         "postalCode": "20500"
       },
       "veteranContactInformation": {
-        "phoneNumber": "1231231234"
+        "phoneNumber": "1231231234",
+        "emailAddress": "[email protected]"
       }
     },
     "view:686Information": {},

diff --git a/src/applications/hca/components/FormPages/FinancialInformation.jsx b/src/applications/hca/components/FormPages/FinancialInformation.jsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import FormNavButtons from '~/platform/forms-system/src/js/components/FormNavButtons';
+import FormNavButtons from 'platform/forms-system/src/js/components/FormNavButtons';
 import { LAST_YEAR } from '../../utils/constants';
 
 const HouseholdFinancialOnboarding = props => {

diff --git a/src/applications/hca/components/FormPages/FinancialOnboarding.jsx b/src/applications/hca/components/FormPages/FinancialOnboarding.jsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import FormNavButtons from '~/platform/forms-system/src/js/components/FormNavButtons';
+import FormNavButtons from 'platform/forms-system/src/js/components/FormNavButtons';
 import EnhancedEligibilityDescription from '../FormDescriptions/EnhancedEligibilityDescription';
 import { LAST_YEAR } from '../../utils/constants';
 

diff --git a/src/applications/hca/components/FormPages/InsuranceInformation.jsx b/src/applications/hca/components/FormPages/InsuranceInformation.jsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import FormNavButtons from '~/platform/forms-system/src/js/components/FormNavButtons';
+import FormNavButtons from 'platform/forms-system/src/js/components/FormNavButtons';
 
 const InsuranceInformation = props => {
   const {