Merge branch 'main' into 96099-Remove-request-by

.github/workflows/continuous-integration.yml

@@ -266,7 +266,7 @@ jobs:
     name: Unit Tests
     needs: [fetch-allow-lists, tests-prep]
     timeout-minutes: 30
-    runs-on: ubuntu-16-cores-latest
+    runs-on: ubuntu-16-cores-22.04
     outputs:
       app_folders: ${{ steps.get-changed-apps.outputs.folders }}
       changed-files: ${{ steps.get-changed-apps.outputs.changed_files }}

src/applications/post-911-gib-status/components/UserInfoSection.jsx

@@ -101,7 +101,11 @@ function UserInfoSection({ enrollmentData = {}, showCurrentAsOfAlert }) {
         <InfoPair
           label="Date of birth"
           name="dateOfBirth"
-          value={formatDateParsedZoneLong(enrollmentData.dateOfBirth)}
+          value={
+            enrollmentData?.dateOfBirth
+              ? formatDateParsedZoneLong(enrollmentData.dateOfBirth)
+              : 'Unavailable'
+          }
           additionalClass="section-line"
         />
         <InfoPair

src/applications/post-911-gib-status/containers/StatusPage.jsx

@@ -31,13 +31,24 @@ class StatusPage extends React.Component {
           <p>
             You can print your statement and use it as a replacement for a
             Certificate of Eligibility (COE) to show that you qualify for
-            benefits.
+            benefits. This statement only includes entitlement earned through
+            your own military service. If you recently transferred entitlement,
+            it may not be reflected here.
           </p>
+          <p>
+            The Supreme Court’s Rudisill decision may increase your months of
+            entitlement if you have two or more qualifying periods of active
+            duty.
+          </p>
+          <va-link
+            href="https://benefits.va.gov/gibill/rudisill.asp"
+            text="Learn more about requesting a Rudisill review"
+          />
         </div>
       );
 
       printButton = (
-        <div className="section">
+        <div className="section vads-u-margin-top--4">
           <VaButton
             text="Get printable statement of benefits"
             onClick={this.navigateToPrint}
@@ -56,7 +67,7 @@ class StatusPage extends React.Component {
             {printButton}
             <UserInfoSection enrollmentData={enrollmentData} />
             <h3>How can I see my Post-9/11 GI Bill benefit payments?</h3>
-            <div>
+            <div className="vads-u-margin-bottom--4">
               If you've received education benefit payments through this
               program,{' '}
               <a href="/va-payment-history/payments/">
@@ -66,10 +77,11 @@ class StatusPage extends React.Component {
             </div>
             <VaNeedHelp>
               <div slot="content">
-                <p>
-                  Call us at <VaTelephone contact="8008271000" />. We're here
-                  Monday through Friday, 8:00 a.m to 9:00 p.m ET. If you have
-                  hearing loss, call <VaTelephone contact="711" tty="true" />.
+                <p className="vads-u-margin-top--0">
+                  Call 888-GI-BILL-1 (<VaTelephone contact="8884424551" />
+                  ). We're here from Monday through Friday, 8:00 a.m to 7:00 p.m
+                  ET. If you have hearing loss, call{' '}
+                  <VaTelephone contact="711" tty="true" />.
                 </p>
               </div>
             </VaNeedHelp>

src/applications/post-911-gib-status/sass/post-911-gib-status.scss

@@ -5,8 +5,8 @@
   margin-bottom: 5em;
 
   h3 {
-    margin: 1em 0 .5em 0;
-    padding: 0 0 .25em 0;
+    margin-bottom: 8.5px;
+    padding: 0;
   }
 
   hr {
@@ -16,18 +16,20 @@
     margin-top: 1em;
     margin-bottom: 1em;
   }
+  h2 {
+    margin-top: 0;
+  }
 
   .section {
     margin-bottom: 2em;
   }
 
   .section-line {
-    margin-bottom: .25em;
+    margin-bottom: 0.25em;
+  }
+  #benefit-level {
+    margin-top: 2em;
   }
-
-  /*.usa-alert {
-    margin: 1em 0 1em 0;
-  }*/
 
   .not-qualified h5 {
     margin-top: 1em;

src/applications/post-911-gib-status/tests/components/UserInfoSection.unit.spec.jsx

@@ -136,4 +136,29 @@ describe('<UserInfoSection>', () => {
       expect(benefitEndDate.text()).to.contain('Since you’re on active duty');
     });
   });
+  describe('date of birth InfoPair', () => {
+    it('should display the formatted date of birth if present', () => {
+      const tree = SkinDeep.shallowRender(<UserInfoSection {...props} />);
+      const dobInfoPair = tree
+        .everySubTree('InfoPair')
+        .find(pair => pair.props.label === 'Date of birth');
+      expect(dobInfoPair).to.exist;
+      expect(dobInfoPair.props.value).to.equal('November 12, 1995');
+    });
+
+    it('should display "Unavailable" if dateOfBirth is missing', () => {
+      // Create a copy of props but remove dateOfBirth
+      const noDobProps = _.merge({}, props, {
+        enrollmentData: {
+          dateOfBirth: null,
+        },
+      });
+      const tree = SkinDeep.shallowRender(<UserInfoSection {...noDobProps} />);
+      const dobInfoPair = tree
+        .everySubTree('InfoPair')
+        .find(pair => pair.props.label === 'Date of birth');
+      expect(dobInfoPair).to.exist;
+      expect(dobInfoPair.props.value).to.equal('Unavailable');
+    });
+  });
 });

src/applications/vaos/new-appointment/components/DateTimeSelectPage/index.jsx

@@ -178,7 +178,12 @@ export default function DateTimeSelectPage() {
 
   return (
     <div>
-      <h1 className="vaos__dynamic-font-size--h2">{pageTitle}</h1>
+      <h1 className="vaos__dynamic-font-size--h2">
+        {pageTitle}
+        <span className="schemaform-required-span vaos-calendar__page_header vads-u-font-family--sans vads-u-font-weight--normal">
+          (*Required)
+        </span>
+      </h1>
       {!loadingSlots && (
         <WaitTimeAlert
           eligibleForRequests={eligibleForRequests}

src/applications/vaos/new-appointment/components/DateTimeSelectPage/index.unit.spec.js

@@ -1000,4 +1000,31 @@ describe('VAOS Page: DateTimeSelectPage', () => {
     });
     expect(screen.history.push.called).to.be.false;
   });
+  it('should show required text next to page heading', async () => {
+    const preferredDate = moment();
+    const slot308Date = moment().add(6, 'days');
+
+    setDateTimeSelectMockFetches({
+      typeOfCareId: 'outpatientMentalHealth',
+      slotDatesByClinicId: {
+        '308': [slot308Date],
+      },
+    });
+
+    const store = createTestStore(initialState);
+
+    await setTypeOfCare(store, /mental health/i);
+    await setVAFacility(store, '983', 'outpatientMentalHealth');
+    await setClinic(store, '983_308');
+    await setPreferredDate(store, preferredDate);
+
+    const screen = renderWithStoreAndRouter(
+      <Route component={DateTimeSelectPage} />,
+      {
+        store,
+      },
+    );
+
+    expect(await screen.findByText(/Required/i)).to.exist;
+  });
 });

src/applications/vaos/referral-appointments/ChooseDateAndTime.jsx

@@ -3,8 +3,10 @@ import PropTypes from 'prop-types';
 import { useDispatch, useSelector, shallowEqual } from 'react-redux';
 import { useLocation } from 'react-router-dom';
 import ReferralLayout from './components/ReferralLayout';
+// eslint-disable-next-line import/no-restricted-paths
 import { getUpcomingAppointmentListInfo } from '../appointment-list/redux/selectors';
 import { setFormCurrentPage, fetchProviderDetails } from './redux/actions';
+// eslint-disable-next-line import/no-restricted-paths
 import { fetchFutureAppointments } from '../appointment-list/redux/actions';
 import { getProviderInfo } from './redux/selectors';
 import { FETCH_STATUS } from '../utils/constants';

src/applications/vaos/referral-appointments/components/RequestsList.jsx

@@ -3,6 +3,7 @@ import PropTypes from 'prop-types';
 import RequestAppointmentLayout from '../../components/RequestAppointmentLayout';
 import { APPOINTMENT_STATUS } from '../../utils/constants';
 import InfoAlert from '../../components/InfoAlert';
+// eslint-disable-next-line import/no-restricted-paths
 import ScheduleAppointmentLink from '../../appointment-list/components/ScheduleAppointmentLink';
 
 const RequestList = ({ appointments, requestsError }) => {

src/applications/verify/components/UnifiedVerify.jsx

@@ -19,10 +19,12 @@ const Verify = () => {
   let buttonContent;
 
   if (isAuthenticated) {
-    <>
-      <VerifyLogingovButton />
-      <VerifyIdmeButton />
-    </>;
+    buttonContent = (
+      <>
+        <VerifyLogingovButton />
+        <VerifyIdmeButton />
+      </>
+    );
   } else if (isAuthenticatedOAuth) {
     // Use the loginServiceName to determine which button to show
     if (loginServiceName === 'idme') {