Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

VACMS-19834 DUW content changes #33765

Draft
wants to merge 4 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 16 additions & 16 deletions src/applications/discharge-wizard/components/v2/Homepage.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@ const HomePage = ({ router, setIntroPageViewed }) => {
<p itemProp="description">
Answer a series of questions to get customized step-by-step
instructions on how to apply for a discharge upgrade or correction.
If your application goes through and your discharge is upgraded,
you’ll be eligible for the VA benefits you earned during your period
of service.
If we accept your application and upgrade your discharge, you’ll be
eligible for the VA benefits you earned during your period of
service.
</p>
</div>
<p>
Expand Down Expand Up @@ -77,19 +77,19 @@ const HomePage = ({ router, setIntroPageViewed }) => {
application to upgrade your discharge.
</p>
<p>
You may want to consider finding someone to advocate on your
behalf, depending on the complexity of your case. A lawyer or
Veterans Service Organization (VSO) can collect and submit
supporting documents for you.{' '}
An accredited attorney, claims agent, or Veterans Service
Organization (VSO) representative can help you gather your
evidence and submit your application.{' '}
<va-link
href="https://www.benefits.va.gov/vso/varo.asp"
text="Find a VSO near you."
href="https://www.va.gov/get-help-from-accredited-representative/find-rep"
text="Get help from an accredited representative"
/>
.
</p>
<p>
<strong>Note:</strong> You can ask for a VA Character of Discharge
review while at the same time applying for a discharge upgrade
from the Department of Defense (DoD) or the Coast Guard.
from the Department of Defense (DOD) or the Coast Guard.
</p>
<p>
If you need mental health services related to PTSD or other mental
Expand Down Expand Up @@ -133,16 +133,16 @@ const HomePage = ({ router, setIntroPageViewed }) => {
Applying again is most likely to be successful if your application
is significantly different from when you last applied. For
example, you may have additional evidence that wasn’t available to
you when you last applied, or the Department of Defense (DoD) may
have issued new rules regarding discharges. DoD rules changed for
you when you last applied, or the Department of Defense (DOD) may
have issued new rules regarding discharges. DOD rules changed for
discharges related to PTSD, TBI, and mental health in 2014,
military sexual harassment and assault in 2017, and sexual
orientation in 2011.
</p>
</va-accordion-item>
<va-accordion-item header="What if I have discharges for more than one period of service?">
<p>
If the Department of Defense (DoD) or the Coast Guard determined
If the Department of Defense (DOD) or the Coast Guard determined
you served honorably in one period of service, you may use that
honorable characterization to establish eligibility for VA
benefits, even if you later received a less than honorable
Expand Down Expand Up @@ -174,7 +174,7 @@ const HomePage = ({ router, setIntroPageViewed }) => {
to confirm your eligibility.
</p>
<p>
You can also apply to the Department of Defense (DoD) or the Coast
You can also apply to the Department of Defense (DOD) or the Coast
Guard for a second DD214 only for that honorable period of
service. Select the <strong>Get Started</strong> link above and
answer the questions based on your most recent discharge. When
Expand All @@ -186,9 +186,9 @@ const HomePage = ({ router, setIntroPageViewed }) => {
</va-accordion-item>
<va-accordion-item header="What if I have a DD215 showing an upgraded discharge, but my DD214 still isn’t correct?">
<p>
When the Department of Defense (DoD) or the Coast Guard upgrades a
When the Department of Defense (DOD) or the Coast Guard upgrades a
Veteran’s discharge, it usually issues a DD215 showing corrections
to the DD214. The DoD or the Coast Guard attaches the DD215 to the
to the DD214. The DOD or the Coast Guard attaches the DD215 to the
old DD214—which still shows the outdated discharge and related
information. While the discharge on the DD215 is the correct
discharge, a Veteran may still want a new DD214 that shows no
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,14 +40,14 @@ const RequestDD214v2 = ({ router, formResponses, viewedIntroPage }) => {
<p>
To receive a second DD214 reflecting <strong>only</strong> your
period of honorable service, you’ll need to complete Department of
Defense (DoD) Form 149 and send it to the {name}—
Defense (DOD) Form 149 and send it to the {name}—
<strong>do not</strong> send it to the Discharge Review Board (DRB)
for the {branchOfService}.
</p>
</div>
<va-process-list>
<va-process-list-item
header="Download and fill out DoD Form 149"
header="Download and fill out DOD Form 149"
level="2"
>
<ul>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ import { ROUTES } from '../../constants';
import ResultsSummary from './resultsComponents/ResultsSummary';
import CarefulConsiderationStatement from './resultsComponents/CarefulConsiderationStatement';
import Warnings from './resultsComponents/Warnings';
import OptionalStep from './resultsComponents/OptionalStep';
import StepOne from './resultsComponents/StepOne';
import AdditionalInstructions from './resultsComponents/AdditionalInstructions';
import StepTwo from './resultsComponents/StepTwo';
Expand Down Expand Up @@ -43,7 +42,6 @@ const ResultsPage = ({ formResponses, router, viewedIntroPage }) => {
router={router}
/>
<Warnings formResponses={formResponses} />
<OptionalStep formResponses={formResponses} />
<section>
<va-process-list>
<StepOne formResponses={formResponses} />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -60,22 +60,21 @@ const AdditionalInstructions = ({ formResponses }) => {
application to upgrade your discharge.
</p>
<p>
You may want to consider finding someone to advocate on your behalf,
depending on the complexity of your case. A lawyer or Veterans
Service Organization (VSO) can collect and submit supporting
documents for you.{' '}
An accredited attorney, claims agent, or Veterans Service
Organization (VSO) representative can help you gather your evidence
and submit your application.{' '}
<a
href="https://www.benefits.va.gov/vso/varo.asp"
href="https://www.va.gov/get-help-from-accredited-representative/find-rep"
rel="noopener noreferrer"
target="_blank"
>
Find a VSO near you (opens in a new tab).
Get help from an accredited representative (opens in a new tab).
</a>
</p>
<p>
<strong>Note:</strong> You can ask for a VA Character of Discharge
review while at the same time applying for a discharge upgrade from
the Department of Defense (DoD) or the Coast Guard.
the Department of Defense (DOD) or the Coast Guard.
</p>
<p>
If you experienced sexual assault or harassment while in the
Expand Down Expand Up @@ -246,9 +245,9 @@ const AdditionalInstructions = ({ formResponses }) => {
)}
</ul>
<p>
<strong>Please note:</strong> This information was created based on how
you answered the questions on the previous page. This information will
not be specific to someone with different answers to the questions.
<strong>Note:</strong> This information was created based on how you
answered the questions on the previous page. This information will not
be specific to someone with different answers to the questions.
</p>
</section>
);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
<p>
Because you answered that your discharge was related to
posttraumatic stress disorder (PTSD) or other mental health
conditions, the DoD will apply “liberal consideration” to your case.
In 2014, the DoD recognized that many Veterans had received
conditions, the DOD will apply “liberal consideration” to your case.
In 2014, the DOD recognized that many Veterans had received
discharges due to behavior connected to their previously undiagnosed
or undocumented PTSD or mental health condition.
</p>
Expand All @@ -28,8 +28,8 @@
return (
<p>
Because you answered that your discharge was related to a traumatic
brain injury (TBI), the DoD will apply “liberal consideration” to
your case. In 2014, the DoD recognized that many Veterans had
brain injury (TBI), the DOD will apply “liberal consideration” to
your case. In 2014, the DOD recognized that many Veterans had
received discharges due to behavior connected to their previously
undiagnosed or undocumented TBI.
</p>
Expand All @@ -39,8 +39,8 @@
return (
<p>
Because you answered that your discharge was due to your sexual
orientation, the DoD encourages you to apply for an upgrade. In
2011, the DoD recognized that many Veterans received discharges
orientation, the DOD encourages you to apply for an upgrade. In
2011, the DOD recognized that many Veterans received discharges
only because of their sexual orientation. <br />{' '}
<strong>Note:</strong> You must prove that your discharge was
solely due to your sexual orientation and events specifically
Expand All @@ -65,8 +65,8 @@
return (
<p>
Because you answered that your discharge was related to sexual
assault or harassment, the DoD will apply “liberal consideration” to
your case. In 2017, the DoD recognized that many Veterans had
assault or harassment, the DOD will apply “liberal consideration” to
your case. In 2017, the DOD recognized that many Veterans had
received discharges due to sexual assault or harassment, and had
unfairly received less than honorable discharges.{' '}
<strong>Note:</strong> You must prove that your discharge was solely
Expand Down Expand Up @@ -100,7 +100,7 @@
isVisible
status="info"
content={
<>

Check warning on line 103 in src/applications/discharge-wizard/components/v2/resultsComponents/CarefulConsiderationStatement.jsx

View workflow job for this annotation

GitHub Actions / Linting (Files Changed)

src/applications/discharge-wizard/components/v2/resultsComponents/CarefulConsiderationStatement.jsx:103:15:Missing parentheses around multilines JSX
<h2 className="usa-alert-heading">
You can apply for VA benefits using your honorable
characterization.
Expand All @@ -127,7 +127,7 @@
isVisible
status="info"
content={
<>

Check warning on line 130 in src/applications/discharge-wizard/components/v2/resultsComponents/CarefulConsiderationStatement.jsx

View workflow job for this annotation

GitHub Actions / Linting (Files Changed)

src/applications/discharge-wizard/components/v2/resultsComponents/CarefulConsiderationStatement.jsx:130:15:Missing parentheses around multilines JSX
<h2 className="usa-alert-heading">
You can apply for VA benefits using your honorable
characterization.
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -24,22 +24,28 @@ const ResultsSummary = ({ formResponses }) => {

const airForceAFRBAPortal = determineAirForceAFRBAPortal(formResponses);

const formNumber = determineFormData(formResponses).num;
const formData = determineFormData(formResponses);
Copy link
Contributor Author

@randimays randimays Dec 26, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Updated this whole section because now there is specific text to describe forms 149 and 293. Broke out sendInstructions and the common intro text ("Based on your answers...") to keep it DRY, though.

const dischargeBoard = determineBoardObj(formResponses).name;
const serviceBranch = formResponses[SHORT_NAME_MAP.SERVICE_BRANCH];
const isReconsideration = forReconsideration ? ' for reconsideration' : '';
let summary = `Based on your answers, you need to complete Department of Defense (DoD) Form ${formNumber} and send it to the ${dischargeBoard} for the ${determineBranchOfService(
const sendInstructions = `send it to the ${dischargeBoard} for the ${determineBranchOfService(
serviceBranch,
)}${isReconsideration}.`;

let summary = '';

if (airForceAFRBAPortal) {
summary =
'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.';
summary = `Correction of Military Record (DD 149). You can download this form from the Air Force Review Boards Agency Website and Portal.`;
} else {
summary = `${formData?.formDescription} and ${sendInstructions}`;
}

return (
<section className="va-introtext">
<p>{summary}</p>
<p>
Based on your answers, you’ll need to complete an Application for{' '}
{summary}
</p>
</section>
);
};
Expand Down
Loading
Loading