diff --git a/src/applications/discharge-wizard/components/v2/ResultsPage.jsx b/src/applications/discharge-wizard/components/v2/ResultsPage.jsx index 10fb1a14c642..50d204c60049 100644 --- a/src/applications/discharge-wizard/components/v2/ResultsPage.jsx +++ b/src/applications/discharge-wizard/components/v2/ResultsPage.jsx @@ -13,13 +13,9 @@ import StepOne from './resultsComponents/StepOne'; import AdditionalInstructions from './resultsComponents/AdditionalInstructions'; import StepTwo from './resultsComponents/StepTwo'; import StepThree from './resultsComponents/StepThree'; -import AirForcePortalLink from './resultsComponents/AirForcePortalLink'; - -import { determineIsAirForceAFRBAPortal } from '../../helpers'; const ResultsPage = ({ formResponses, router, viewedIntroPage }) => { const H1 = 'Your Steps for Upgrading Your Discharge'; - const airForceAFRBAPortal = determineIsAirForceAFRBAPortal(formResponses); useEffect( () => { @@ -41,25 +37,19 @@ const ResultsPage = ({ formResponses, router, viewedIntroPage }) => {

{H1}

- {airForceAFRBAPortal ? ( - - ) : ( - <> - - - -
- - - - - -
- - )} + + + +
+ + + + + +
( -
- -
-); - -export default AirForcePortalLink; diff --git a/src/applications/discharge-wizard/components/v2/resultsComponents/StepOne.jsx b/src/applications/discharge-wizard/components/v2/resultsComponents/StepOne.jsx index 4a2bd7d0a7aa..efbcd5261486 100644 --- a/src/applications/discharge-wizard/components/v2/resultsComponents/StepOne.jsx +++ b/src/applications/discharge-wizard/components/v2/resultsComponents/StepOne.jsx @@ -88,13 +88,12 @@ const StepOne = ({ formResponses }) => { const nonDd2014Tips = (
    - {formResponses[SHORT_NAME_MAP.SERVICE_BRANCH] !== RESPONSES.AIR_FORCE && ( -
  • - Pay special attention to item 6, which asks for the reason for your - change. Most Veterans attach additional pages to answer this question.{' '} - {strongCaseTips()} -
  • - )} +
  • + Pay special attention to item 6, which asks for the reason for your + change. Most Veterans attach additional pages to answer this question.{' '} + {strongCaseTips()} +
  • + {[ RESPONSES.PREV_APPLICATION_BCMR, RESPONSES.PREV_APPLICATION_BCNR, @@ -122,22 +121,20 @@ const StepOne = ({ formResponses }) => { the reason for PTSD. )} - {boardToSubmit.abbr !== DRB && - formResponses[SHORT_NAME_MAP.SERVICE_BRANCH] !== - RESPONSES.AIR_FORCE && ( -
  • - Item 8 asks for the date when you discovered the error or injustice - you’re asking the Board to address. If it’s been more than 3 years - since you found this error or injustice, you’ll need to include a - reason why the Board should consider your application. Examples of - good reasons include new evidence you’ve found to support your - claim, or recent changes in policy (like liberal consideration for - PTSD, TBI, or military sexual assault or harassment). These kinds of - reasons will make it more likely for the Board to decide in your - favor. The 3-year time limit isn’t a strict rule, so don’t let it - keep you from applying if you think you have a strong case. -
  • - )} + {boardToSubmit.abbr !== DRB && ( +
  • + Item 8 asks for the date when you discovered the error or injustice + you’re asking the Board to address. If it’s been more than 3 years + since you found this error or injustice, you’ll need to include a + reason why the Board should consider your application. Examples of + good reasons include new evidence you’ve found to support your claim, + or recent changes in policy (like liberal consideration for PTSD, TBI, + or military sexual assault or harassment). These kinds of reasons will + make it more likely for the Board to decide in your favor. The 3-year + time limit isn’t a strict rule, so don’t let it keep you from applying + if you think you have a strong case. +
  • + )} {boardToSubmit.abbr !== DRB && (
  • Item 17 asks if you’re willing to appear in person before the Board in diff --git a/src/applications/discharge-wizard/helpers/index.jsx b/src/applications/discharge-wizard/helpers/index.jsx index 3c8df39cd26a..df77e1b58ae1 100644 --- a/src/applications/discharge-wizard/helpers/index.jsx +++ b/src/applications/discharge-wizard/helpers/index.jsx @@ -561,11 +561,6 @@ export const stepHeaderLevel = formResponses => { return 2; }; -export const determineIsAirForceAFRBAPortal = formResponses => - formResponses[SHORT_NAME_MAP.SERVICE_BRANCH] === RESPONSES.AIR_FORCE && - determineBoardObj(formResponses).abbr === BCMR && - determineFormData(formResponses).num === 149; - const handleDD215Update = (boardToSubmit, prevAppType, oldDischarge) => { if ( ![