Merge branch 'main' into 93001-staging-review-finding-incorrect-title…

…-tag

src/applications/check-in/locales/en/translation.json

@@ -365,10 +365,7 @@
   "sign-in-to-find-appointment": "Sign in to VA.gov to find your appointment",
   "phone-appointment": "Phone appointment",
   "phone-error-help-text": "Your provider will call you at the appointment time. You may need to wait 15 minutes for their call.",
-  "pre-check-in-no-longer-available": "Pre-check-in is no longer available for your appointment time.",
   "something-went-wrong-please-try-again": "Something went wrong on our end. Please try again.",
-  "if-you-have-questions-call": "If you have questions about your appointments, call your VA health facility.",
-  "something-went-wrong": "Something went wrong. If you have questions about your appointments, call your VA health facility.",
   "clinic-phone": "Clinic phone",
   "need-to-make-changes": "Need to make changes?",
   "contact-this-facility": "Contact this facility if you need to reschedule or cancel your appointment.",
@@ -384,12 +381,9 @@
   "review-your-information-now": "Review your information now",
   "your-information-is-up-to-date": "Your information is up to date",
   "day-of-week-month-day-time": "{{ date, day }}, {{ date, monthDay }}, {{ date, time }}",
-  "in-person-appointments": "In-person appointments",
   "phone-appointments": "Phone appointments",
   "check-in-now-for-your-date-time-appointment": "Check in now for appointment on {{ date, day }}, {{ date, monthDay }} at {{ date, time }}",
   "details-for-appointment-on-date-at-time": "Details for {{ type }} appointment on {{ dateTime, date }} at {{ dateTime, time }}",
-  "appointment-on-date-at-time": "Appointment on {{dateTime, date}} at {{ dateTime, time}}",
-  "submit-claim": "Submit claim",
   "review-body-text-unified": "You can submit your claim now or choose to file later. Either way, you can still complete the check-in process.",
   "we-cant-find-any-upcoming-appointments": "We can’t find any upcoming VA medical appointments for you",
   "canceled": "Canceled",
@@ -399,7 +393,6 @@
   "video": "Video",
   "we-cant-access-appointments": "We can’t access your appointments right now",
   "were-sorry-theres-a-problem-with-system": "We’re sorry. There’s a problem with our system.",
-  "when-time-to-check-in-for-appointment-well-send-another-text": "When it’s time to check in for your appointment, we’ll send you another text.",
   "what-if-cant-find-appointments-in-list": "What if I can’t find my appointments in this list?",
   "youve-successfully-reviewed-your-contact-information": "You’ve successfully reviewed your contact information",
   "todays-appointments-at-this-facility": "Today’s appointments at this facility",
@@ -430,7 +423,6 @@
   "review-todays-appointments": "Review today’s appointments",
   "were-sorry-weve-run-into-a-problem": "We’re sorry. We’ve run into a problem.",
   "were-having-trouble-getting-your-upcoming-appointments": "We’re having trouble getting your upcoming appointments. Please try again later.",
-  "to-file-another-claim-for-different-date": "To file another claim for a different date, you can visit the Beneficiary Travel Self-Service System (BTSSS). You must file within 30 days of the appointment.",
   "find-a-full-list-of-things-to-bring": "Find a full list of things to bring to your appointment",
   "find-out-how-to-check-in-opens-in-new-tab": "Find out how to check in (opens in new tab)",
   "we-cant-show-all-information": "We can’t show all your information right now",

src/applications/discharge-wizard/components/v2/RequestDD214.jsx

@@ -6,6 +6,7 @@ import {
   determineBoardObj,
   determineVenueAddress,
   determineBranchOfService,
+  determineBoardName,
 } from '../../helpers';
 import { SHORT_NAME_MAP } from '../../constants/question-data-map';
 import { pageSetup } from '../../utilities/page-setup';
@@ -93,14 +94,14 @@ const RequestDD214v2 = ({ router, formResponses, viewedIntroPage }) => {
               There are a number of different boards that handle discharge
               upgrades and corrections. Because you want a new DD214, which is
               seen as a correction of your military record, you’ll need to apply
-              to the {abbr} for the {branchOfService}.
+              to the {determineBoardName(formResponses.SERVICE_BRANCH)}.
             </p>
-            <p>At this time, there isn’t a way to submit this form online.</p>
             <p>
               Mail your completed form and all supporting documents to the{' '}
               {abbr} at:
             </p>
             <p>{determineVenueAddress(formResponses, true)}</p>
+            <p>At this time, there isn’t a way to submit this form online.</p>
           </va-process-list-item>
         </va-process-list>
         <va-button

src/applications/discharge-wizard/components/v2/questions/PrevApplicationType.jsx

@@ -26,6 +26,7 @@ const PrevApplicationType = ({
     PREV_APPLICATION_DRB_PERSONAL,
     PREV_APPLICATION_BCMR,
     PREV_APPLICATION_BCNR,
+    PREV_APPLICATION_DADT,
     NOT_SURE,
   } = RESPONSES;
 
@@ -34,8 +35,12 @@ const PrevApplicationType = ({
     PREV_APPLICATION_DRB_PERSONAL,
     PREV_APPLICATION_BCMR,
     PREV_APPLICATION_BCNR,
+    PREV_APPLICATION_DADT,
     NOT_SURE,
   ].filter(option => {
+    if (option === PREV_APPLICATION_DADT) {
+      return formResponses.REASON === RESPONSES.REASON_DD215_UPDATE_TO_DD214;
+    }
     if (
       [RESPONSES.NAVY, RESPONSES.MARINE_CORPS].includes(
         formResponses.SERVICE_BRANCH,

src/applications/discharge-wizard/components/v2/resultsComponents/StepThree.jsx

@@ -7,16 +7,16 @@ import {
 } from '../../../constants/question-data-map';
 import { BCNR, BCMR, DRB, AFDRB } from '../../../constants';
 import {
+  determineBoardName,
   determineBoardObj,
   determineVenueAddress,
-  getBoardExplanation,
   isPreviousApplicationYear,
 } from '../../../helpers';
 
 const StepThree = ({ formResponses }) => {
   let onlineSubmissionMsg;
   const boardToSubmit = determineBoardObj(formResponses);
-  const boardExplanation = getBoardExplanation(formResponses);
+  const boardName = determineBoardName(formResponses.SERVICE_BRANCH);
 
   if (
     boardToSubmit.abbr === DRB &&
@@ -54,10 +54,19 @@ const StepThree = ({ formResponses }) => {
 
   return (
     <va-process-list-item header={headerText} level="2">
+      {formResponses.SERVICE_BRANCH === RESPONSES.AIR_FORCE ? (
+        <p>
+          Based on your answers, you need to complete an Application for
+          Correction of Military Record (DD 149). You can download this form
+          from the Air Force Review Boards Agency Website and Portal.
+        </p>
+      ) : (
+        ''
+      )}
       <p>
         There are a number of different boards that handle discharge upgrades
         and corrections. Based on your answers on the previous page, you need to
-        apply to {boardExplanation}
+        apply to the {boardName}.
       </p>
       {boardToSubmit.abbr === AFDRB ? (
         <>

src/applications/discharge-wizard/constants/question-data-map.js

@@ -10,7 +10,8 @@ export const QUESTION_MAP = Object.freeze({
   COURT_MARTIAL: 'Was your discharge the outcome of a general court-martial?',
   PREV_APPLICATION:
     'Have you previously applied for and been denied a discharge upgrade for this period of service?',
-  PREV_APPLICATION_TYPE: 'How did you apply for a discharge upgrade last time?',
+  PREV_APPLICATION_TYPE:
+    'How did you previously apply for a discharge upgrade?',
   PREV_APPLICATION_YEAR: 'What year did you apply for a discharge upgrade?',
   PRIOR_SERVICE:
     'Did you complete a period of service in which your character of service was Honorable or General Under Honorable Conditions?',
@@ -75,6 +76,8 @@ export const RESPONSES = Object.freeze({
     'I applied to a Board for Correction of Military Records (BCMR).',
   PREV_APPLICATION_BCNR:
     'I applied to the Board for Correction of Naval Records (BCNR).',
+  PREV_APPLICATION_DADT:
+    'I haven’t previously applied for a discharge upgrade, but I received an upgrade from the Defense Department (DOD) due to the Don’t Ask, Don’t Tell policy.',
   YES: 'Yes',
   NO: 'No',
   PREV_APPLICATION_BEFORE_2014: '2014 or earlier',

src/applications/discharge-wizard/helpers/index.jsx

@@ -797,3 +797,25 @@ export const renderMedicalRecordInfo = formResponses => {
   }
   return null;
 };
+
+export const determineBoardName = branch => {
+  let boardName;
+
+  switch (branch) {
+    case RESPONSES.AIR_FORCE:
+      boardName = 'Air Force Board for Correction of Military Records';
+      break;
+    case RESPONSES.ARMY:
+    case RESPONSES.COAST_GUARD:
+      boardName = 'Board for Correction of Military Records (BCMR)';
+      break;
+    case RESPONSES.NAVY:
+    case RESPONSES.MARINE_CORPS:
+      boardName = 'Board for Correction of Naval Records (BCNR)';
+      break;
+    default:
+      boardName = '';
+      break;
+  }
+  return boardName;
+};

src/applications/edu-benefits/10282/containers/ConfirmationPage.jsx

@@ -56,10 +56,7 @@ export class ConfirmationPage extends React.Component {
           <p>
             <strong>Confirmation for your records </strong>
             <br />
-            <span>
-              You can print this confirmation page for your records. You can
-              also download your completed application as a PDF.
-            </span>
+            <span>You can print this confirmation page for your records.</span>
           </p>
           {/* eslint-disable-next-line @department-of-veterans-affairs/prefer-button-component */}
           <button
@@ -69,20 +66,13 @@ export class ConfirmationPage extends React.Component {
           >
             Print this page
           </button>
-          <va-link
-            download
-            class="vads-u-display--block"
-            filetype="PDF"
-            href="/education/apply-for-education-benefits/10282/confirmation"
-            text="Download your completed application"
-          />
         </div>
         <div className="vads-u-margin-top--0">
           <h2>What to expect next</h2>
           <p>
             If you're accepted into the SkillsBuild program, you'll receive an
             email from <a href="mailto:[email protected]">[email protected]</a>{' '}
-            with your login informatia. If you don't receive an email, check
+            with your login information. If you don't receive an email, check
             your spam folder.
           </p>
           <p>

src/applications/edu-benefits/10282/containers/IntroductionPage.jsx

@@ -39,8 +39,7 @@ const IntroductionPage = ({ router }) => {
         </li>
         <li>
           After you submit your form, you can print the confirmation page for
-          your records. You can also download a copy of your completed form as a
-          PDF.
+          your records.
         </li>
         <li>
           After we review your form, we’ll email you a decision. If we need more

src/applications/edu-benefits/10282/pages/applicantInformation/applicantGender.js

@@ -29,7 +29,7 @@ export const genderInfoHelpText = (
         <li>
           Sharing your gender identity in your VA.gov profile is optional. If
           you get healthcare at VA, this information can help your care team
-          better better assess your health needs and risks.
+          better assess your health needs and risks.
         </li>
         <li>
           But you should know that any information you share in your VA.gov

src/applications/gi/components/profile/InstitutionProfile.jsx

@@ -141,6 +141,13 @@ export default function InstitutionProfile({
                 jumpToId="calculate-your-benefits"
               />
             )}
+          {institution.yr === true &&
+            toggleValue && (
+              <JumpLink
+                label="Yellow Ribbon Program information"
+                jumpToId="yellow-ribbon-program-information"
+              />
+            )}
           <JumpLink
             label="Getting started with benefits"
             jumpToId="getting-started-with-benefits"
@@ -167,13 +174,6 @@ export default function InstitutionProfile({
             label="Contact information"
             jumpToId="contact-information"
           />
-          {institution.yr === true &&
-            toggleValue && (
-              <JumpLink
-                label="Yellow Ribbon Program information"
-                jumpToId="yellow-ribbon-program-information"
-              />
-            )}
         </div>
       </div>
       {showSchoolContentBasedOnType(type) &&
@@ -214,7 +214,7 @@ export default function InstitutionProfile({
               of higher learning (IHL). Schools that choose to participate in
               the Yellow Ribbon program will contribute up to a certain dollar
               amount toward the extra tuition. VA will match the participating
-              school’s contribution{' '}
+              school’s contribution
               {type === 'FOREIGN' && `${` `}in United States Dollars (USD)`}, up
               to the total cost of the tuition and fees. To confirm the number
               of students eligible for funding, contact the individual school.

src/applications/gi/sass/gi.scss

@@ -429,6 +429,7 @@
       height: auto;
       display: flex;
       width: 100%;
+      max-width: 305px;
       .degree-level-card {
         flex: 1;
         width: 100%;
@@ -441,6 +442,10 @@
   @media screen and (max-width: $medium-screen) {
     .degree-level-results {
       flex-direction: column;
+      .degree-item {
+        width: 100%;
+        max-width: 100%;
+      }
     }
   }
 }

src/applications/ivc-champva/10-10D/containers/App.jsx

@@ -25,6 +25,10 @@ const breadcrumbList = [
     href: `/family-and-caregiver-benefits/health-and-disability/champva`,
     label: `CHAMPVA benefits`,
   },
+  {
+    href: `#content`,
+    label: `Apply for CHAMPVA benefits`,
+  },
 ];
 
 export default function App({ location, children }) {

src/applications/representative-appoint/components/ProfileNotUpdatedNote.jsx

@@ -5,16 +5,17 @@ import PropTypes from 'prop-types';
 
 import { CONTACTS } from '@department-of-veterans-affairs/component-library/contacts';
 import { isLoggedIn } from 'platform/user/selectors';
+import { preparerIsVeteran } from '../utilities/helpers';
 
 function ProfileNotUpdatedNote(props) {
   const {
+    formData,
     includeLink,
     includePhone,
     includePrefix,
     loggedIn,
-    preparerIsVeteran,
   } = props;
-  const isLoggedInVeteran = loggedIn && preparerIsVeteran;
+  const isLoggedInVeteran = loggedIn && preparerIsVeteran({ formData });
 
   return (
     <>
@@ -52,16 +53,17 @@ function ProfileNotUpdatedNote(props) {
 }
 
 ProfileNotUpdatedNote.propTypes = {
+  formData: PropTypes.object,
   includeLink: PropTypes.bool,
   includePhone: PropTypes.bool,
   includePrefix: PropTypes.bool,
   loggedIn: PropTypes.bool,
-  preparerIsVeteran: PropTypes.bool,
 };
 
 function mapStateToProps(state) {
   return {
     loggedIn: isLoggedIn(state),
+    formData: state.form.data,
   };
 }
 

src/applications/representative-appoint/pages/veteran/veteranContactMailing.js

@@ -7,21 +7,14 @@ import {
   titleSchema,
 } from 'platform/forms-system/src/js/web-component-patterns';
 import ProfileNotUpdatedNote from '../../components/ProfileNotUpdatedNote';
-import { preparerIsVeteran } from '../../utilities/helpers';
 
 export const uiSchema = {
   ...titleUI(
     'Your mailing address',
     'We’ll send any important information about your form to this address.',
   ),
   profileNotUpdatedNote: {
-    'ui:description': formData => (
-      <ProfileNotUpdatedNote
-        includeLink
-        includePrefix
-        preparerIsVeteran={preparerIsVeteran({ formData })}
-      />
-    ),
+    'ui:description': () => <ProfileNotUpdatedNote includeLink includePrefix />,
   },
   veteranHomeAddress: addressUI({
     labels: {

src/applications/representative-appoint/pages/veteran/veteranContactPhoneEmail.js

@@ -10,17 +10,12 @@ import {
 } from 'platform/forms-system/src/js/web-component-patterns';
 
 import ProfileNotUpdatedNote from '../../components/ProfileNotUpdatedNote';
-import { preparerIsVeteran } from '../../utilities/helpers';
+// import { preparerIsVeteran } from '../../utilities/helpers';
 
 export const uiSchema = {
   ...titleUI(() => 'Your phone number and email address'),
   profileNotUpdatedNote: {
-    'ui:description': formData => (
-      <ProfileNotUpdatedNote
-        includePhone
-        preparerIsVeteran={preparerIsVeteran({ formData })}
-      />
-    ),
+    'ui:description': () => <ProfileNotUpdatedNote includePhone />,
   },
   'Primary phone': phoneUI({
     required: true,

src/applications/representative-appoint/pages/veteran/veteranIdentification.js

@@ -32,12 +32,8 @@ export const uiSchema = {
       } Social Security and VA file numbers are the same. `,
   ),
   profileNotUpdatedNote: {
-    'ui:description': formData => (
-      <ProfileNotUpdatedNote
-        includePhone
-        includePrefix
-        preparerIsVeteran={preparerIsVeteran({ formData })}
-      />
+    'ui:description': () => (
+      <ProfileNotUpdatedNote includePhone includePrefix />
     ),
   },
   veteranSocialSecurityNumber: ssnUI('Social Security number'),