Merge branch 'main' into VYE-226

README.md

@@ -303,3 +303,7 @@ Create a .env file in the root of vets-website, and assign the above token to a
 1. [Frontend developer documentation home](https://depo-platform-documentation.scrollhelp.site/developer-docs/frontend-developer-documentation)
 1. [Manual](https://github.com/department-of-veterans-affairs/va.gov-team/blob/master/platform/accessibility/testing/508-manual-testing.md) and [Automated](https://github.com/department-of-veterans-affairs/va.gov-team/blob/master/platform/accessibility/testing/508-automated-testing.md) 508 Testing
 1. [Using yarn Workspaces](https://depo-platform-documentation.scrollhelp.site/developer-docs/yarn-workspaces)
+
+## Not a member of the repository and want to be added?
+- If you're on a VA.gov Platform team, contact your Program Manager.
+- If you're on a VFS team, you must complete [Platform Orientation](https://depo-platform-documentation.scrollhelp.site/getting-started/platform-orientation) to be added to this repository. This includes completing your Platform Orientation ticket(s) in GitHub.

src/applications/financial-status-report/config/chapters/veteranInformationChapter.js

@@ -1,7 +1,6 @@
 import {
   veteranInfo,
   combinedDebts,
-  contactInfo,
   contactInformation,
   spouseInformation,
   spouseName,
@@ -59,34 +58,13 @@ export default {
         schema: combinedDebts.schema,
         depends: formData => !formData.reviewNavigation,
       },
-      contactInfo: {
-        initialData: {
-          personalData: {
-            address: {
-              street: '',
-              city: '',
-              state: '',
-              country: '',
-              postalCode: '',
-            },
-            telephoneNumber: '',
-            emailAddress: '',
-          },
-        },
-        path: 'contact-information',
-        title: 'Contact Information',
-        uiSchema: contactInfo.uiSchema,
-        schema: contactInfo.schema,
-        depends: formData => !formData['view:enhancedFinancialStatusReport'],
-      },
       currentContactInformation: {
         title: 'Contact information',
         path: 'current-contact-information',
         CustomPage: ContactInfo,
         CustomPageReview: ContactInfoReview,
         uiSchema: contactInformation.uiSchema,
         schema: contactInformation.schema,
-        depends: formData => formData['view:enhancedFinancialStatusReport'],
       },
       editMobilePhone: {
         title: 'Edit mobile phone number',
@@ -120,15 +98,13 @@ export default {
         title: 'Spouse information',
         uiSchema: spouseInformation.uiSchema,
         schema: spouseInformation.schema,
-        depends: formData => formData['view:streamlinedWaiver'],
       },
       spouseName: {
         path: 'spouse-name',
         title: 'Spouse name',
         uiSchema: spouseName.uiSchema,
         schema: spouseName.schema,
-        depends: formData =>
-          formData.questions.isMarried && formData['view:streamlinedWaiver'],
+        depends: formData => formData.questions.isMarried,
       },
       spouseTransition: {
         path: 'spouse-transition',
@@ -142,8 +118,7 @@ export default {
           return (
             formData.questions.isMarried &&
             !formData.reviewNavigation &&
-            globalState.spouseChanged &&
-            formData['view:streamlinedWaiver']
+            globalState.spouseChanged
           );
         },
       },
@@ -154,7 +129,6 @@ export default {
         schema: dependents.schemaEnhanced,
         CustomPage: DependentCount,
         CustomPageReview: null,
-        depends: formData => formData['view:streamlinedWaiver'],
       },
       dependentAges: {
         path: 'dependent-ages',

src/applications/financial-status-report/pages/index.js

@@ -1,5 +1,4 @@
 import * as veteranInfo from './veteran/veteranInfo';
-import * as contactInfo from './veteran/contact';
 import contactInformation from './veteran/contactInformation';
 import * as combinedDebts from './veteran/combinedDebts';
 import * as employment from './income/employment';
@@ -127,7 +126,6 @@ export {
   resolutionWaiverAgreement,
   bankruptcyHistory,
   bankruptcyHistoryRecords,
-  contactInfo,
   contactInformation,
   addIssue,
   employmentHistory,

src/applications/mhv/medications/tests/e2e/fixtures/refill-page-prescription-requests.json

@@ -16,6 +16,7 @@
                 "quantity": 30,
                 "expirationDate": "2024-04-15T04:00:00.000Z",
                 "dispensedDate": null,
+                "dispStatus": "Active",
                 "stationNumber": "979",
                 "isRefillable": true,
                 "isTrackable": false

src/applications/mhv/medications/tests/e2e/medications-refill-page-go-to-medications-list-page-link.cypress.spec.js

@@ -0,0 +1,18 @@
+import MedicationsSite from './med_site/MedicationsSite';
+import refillPrescriptions from './fixtures/refill-page-prescription-requests.json';
+import MedicationsRefillPage from './pages/MedicationsRefillPage';
+import MedicationsListPage from './pages/MedicationsListPage';
+
+describe('Medications Nav to List Page from Refill Page', () => {
+  it('visits Medications List Page Link On Refills Page', () => {
+    const site = new MedicationsSite();
+    const refillPage = new MedicationsRefillPage();
+    const listPage = new MedicationsListPage();
+    site.login();
+    refillPage.loadRefillPage(refillPrescriptions);
+    cy.injectAxe();
+    cy.axeCheck('main');
+    refillPage.clickGoToMedicationsListPage();
+    listPage.verifyMedicationsListPageTitle();
+  });
+});