diff --git a/src/applications/pensions/components/FormAlerts/index.jsx b/src/applications/pensions/components/FormAlerts/index.jsx index 285220720bd6..dad131612e63 100644 --- a/src/applications/pensions/components/FormAlerts/index.jsx +++ b/src/applications/pensions/components/FormAlerts/index.jsx @@ -323,14 +323,3 @@ export const AdoptionEvidenceAlert = () => (

); - -export const SubmissionConfirmationAlert = () => ( - -

Thank you for submitting your Veterans Pension application

-

- We’ve received your Veterans Pension application (VA Form 21P-527EZ). - After we complete our review, we’ll mail you a decision letter with the - details of our decision. -

-
-); diff --git a/src/applications/pensions/containers/ConfirmationPage.jsx b/src/applications/pensions/containers/ConfirmationPage.jsx index e2047df87f71..ff3c80f3851c 100644 --- a/src/applications/pensions/containers/ConfirmationPage.jsx +++ b/src/applications/pensions/containers/ConfirmationPage.jsx @@ -3,12 +3,10 @@ import PropTypes from 'prop-types'; import { utcToZonedTime, format } from 'date-fns-tz'; import { useSelector } from 'react-redux'; -import { useFeatureToggle } from 'platform/utilities/feature-toggles'; import { isLoggedIn } from 'platform/user/selectors'; import { focusElement } from 'platform/utilities/ui'; import { ConfirmationView } from 'platform/forms-system/src/js/components/ConfirmationView'; -import { SubmissionConfirmationAlert } from '../components/FormAlerts'; import { formatFullName, obfuscateAccountNumber, @@ -21,10 +19,6 @@ const ConfirmationPage = ({ route }) => { const form = useSelector(state => state.form); const loggedIn = useSelector(isLoggedIn); const { formConfig } = route; - const { useToggleValue, TOGGLE_NAMES } = useFeatureToggle(); - const showUpdatedConfirmation = useToggleValue( - TOGGLE_NAMES.pensionConfirmationUpdate, - ); const { submission, data } = form; const response = submission?.response ?? {}; const fullName = formatFullName(data?.veteranFullName ?? {}); @@ -63,20 +57,10 @@ const ConfirmationPage = ({ route }) => { confirmationNumber={confirmationNumber} formConfig={formConfig} > - {showUpdatedConfirmation ? ( - } - /> - ) : ( - <> -

- Your Veterans Pension application -

- -
- - )} + } + />

Your information for this application @@ -95,171 +79,82 @@ const ConfirmationPage = ({ route }) => {

{confirmationNumber}

)} - {!showUpdatedConfirmation && ( - { - window.print(); - }} - /> - )} - {showUpdatedConfirmation ? ( - <> - - } - item2Content="If we have questions or need more information after reviewing your form, we'll contact you by phone, email, or mail." + + } + item2Content="If we have questions or need more information after reviewing your form, we'll contact you by phone, email, or mail." + /> +

+ If we send you a request for more information, you’ll need to respond + within 30 days of our request. If you don’t respond within 30 days, we + may decide your claim with the evidence thats available to us. +

+ {loggedIn ? ( +
+

If you need to submit supporting documents

+

+ If you didn’t already submit your supporting documents and + additional evidence, you can submit them in one of these 2 ways: +

+

Option 1: Upload your documents using the Claim Status Tool

+

+ It may take 7-10 days for your pension claim to appear in the + Claim Status Tool. After your pension claim appears, you can + upload your documents in the Files tab. +

+ -

- If we send you a request for more information, you’ll need to - respond within 30 days of our request. If you don’t respond within - 30 days, we may decide your claim with the evidence thats - available to us. +

Option 2: Mail us copies of your documents

+

+ Don’t send us a printed copy of your pension claim. We already + have it. And don’t send us your original documents. We can’t + return them.

- {loggedIn ? ( -
-

If you need to submit supporting documents

-

- If you didn’t already submit your supporting documents and - additional evidence, you can submit them in one of these 2 - ways: -

-

- Option 1: Upload your documents using the Claim Status Tool -

-

- It may take 7-10 days for your pension claim to appear in the - Claim Status Tool. After your pension claim appears, you can - upload your documents in the Files tab. -

- -

Option 2: Mail us copies of your documents

-

- Don’t send us a printed copy of your pension claim. We already - have it. And don’t send us your original documents. We can’t - return them. -

-

Mail us copies of your documents to this address:

-

- Department of Veterans Affairs -
- Pension Intake Center -
- PO Box 5365 -
- Janesville, WI 53547-5365 -

-

- Note: If we asked you to submit any - supporting documents, you should keep a copy of them for your - records. -

-
- ) : ( -
-

If you need to submit supporting documents

-

- If you didn’t already submit your supporting documents and - additional evidence, you can submit copies of your documents - by mail. -

-

Mail any supporting documents to this address:

-

- Department of Veterans Affairs -
- Pension Intake Center -
- PO Box 5365 -
- Janesville, WI 53547-5365 -

-

- Note: Mail us copies of your documents only. - Don’t send us your original documents. We can’t return them. -

-
- )} - +

Mail us copies of your documents to this address:

+

+ Department of Veterans Affairs +
+ Pension Intake Center +
+ PO Box 5365 +
+ Janesville, WI 53547-5365 +

+

+ Note: If we asked you to submit any supporting + documents, you should keep a copy of them for your records. +

+
) : ( - <> -
-

If you need to submit supporting documents

- You can submit supporting documents in one of 2 ways: -

Submit your documents online through AccessVA

-
-

- You can use the QuickSubmit tool through AccessVA to submit - your documents online. -

- -
-

Mail copies of your documents

-
-

- Don’t mail us a printed copy of your pension application. We - already have your application. If you need to submit - supporting documents, you can mail copies of your documents to - us at this address: -

-

- Department of Veterans Affairs -
- Pension Intake Center -
- PO Box 5365 -
- Janesville, WI 53547-5365 -

-

- Note: Don’t send us your original documents. - We can’t return them. Mail us copies of your documents only. -

-

- If we asked you to complete and submit additional forms, be - sure to make copies of the forms for your records before you - mail them to us. -

-
-
-
-

What to expect next

-

- You don’t need to do anything while you wait for a decision - unless we send you a letter to ask you for more information. If - we send you a request for more information, you’ll need to - respond within 30 days of our request. If you don’t respond - within 30 days, we may decide your claim with the evidence - that’s available to us. -

-

- If you’ve opted to receive VA emails or texts, we’ll send you - updates about the status of your application. You can manage - your notification settings within your Va.gov profile. -

-

- You can also{' '} - -

-

- Note: It may take 7 to 10 days after you apply - for your pension claim to appear online. -

-
- +
+

If you need to submit supporting documents

+

+ If you didn’t already submit your supporting documents and + additional evidence, you can submit copies of your documents by + mail. +

+

Mail any supporting documents to this address:

+

+ Department of Veterans Affairs +
+ Pension Intake Center +
+ PO Box 5365 +
+ Janesville, WI 53547-5365 +

+

+ Note: Mail us copies of your documents only. + Don’t send us your original documents. We can’t return them. +

+
)} + {usingDirectDeposit && (

Direct deposit account information

@@ -311,57 +206,34 @@ const ConfirmationPage = ({ route }) => { />
)} - {showUpdatedConfirmation ? ( - <> -
-

When to tell us if your information changes

-

- If you receive Veterans Pension benefits, you’ll need to tell us - if certain information changes. Tell us right away if any of - these are true for you: -

-
    -
  • - Your income or the income of your dependents changes - (including earnings, Social Security benefits, or lottery and - gambling winnings) -
  • -
  • - Your net worth increases (including bank accounts, - investments, or real estate) -
  • -
  • Your medical expenses decrease
  • -
  • - You add or remove a dependent (including children, parents, or - spouses) -
  • -
  • Your address or phone number changes
  • -
-
- - - ) : ( -
-

How to contact us if you have questions

-

- You can ask us a question{' '} - -

-

- Or call us at {' '} - -

-
- )} - - {showUpdatedConfirmation && } +
+

When to tell us if your information changes

+

+ If you receive Veterans Pension benefits, you’ll need to tell us if + certain information changes. Tell us right away if any of these are + true for you: +

+
    +
  • + Your income or the income of your dependents changes (including + earnings, Social Security benefits, or lottery and gambling + winnings) +
  • +
  • + Your net worth increases (including bank accounts, investments, or + real estate) +
  • +
  • Your medical expenses decrease
  • +
  • + You add or remove a dependent (including children, parents, or + spouses) +
  • +
  • Your address or phone number changes
  • +
+
+ + + ); diff --git a/src/applications/pensions/tests/unit/containers/ConfirmationPage.unit.spec.jsx b/src/applications/pensions/tests/unit/containers/ConfirmationPage.unit.spec.jsx index d66069db9f12..f6af84e15eb7 100644 --- a/src/applications/pensions/tests/unit/containers/ConfirmationPage.unit.spec.jsx +++ b/src/applications/pensions/tests/unit/containers/ConfirmationPage.unit.spec.jsx @@ -14,8 +14,7 @@ const getData = ({ hasResponse = true, hasRegionalOffice = true, hasBankAccount = true, - timestamp = new Date('09/07/2024'), - pensionConfirmationUpdate = false, + timestamp = new Date('09/07/2025'), } = {}) => ({ mockStore: { getState: () => ({ @@ -58,10 +57,6 @@ const getData = ({ }), }, }, - featureToggles: { - loading: false, - [`pension_confirmation_update`]: pensionConfirmationUpdate, - }, }), subscribe: () => {}, dispatch: () => {}, @@ -91,7 +86,7 @@ describe('scrollToTop function', () => { }); describe('Pension benefits confirmation page', () => { - it('should render', () => { + it('should render with correct content', () => { const { mockStore } = getData(); const { container } = render( @@ -101,33 +96,47 @@ describe('Pension benefits confirmation page', () => { expect($('h2', container)).to.exist; expect($('h2', container).textContent).to.eql( - 'Your Veterans Pension application', - ); - expect($$('va-alert[status="success', container).length).to.equal(1); - expect($('va-button', container).getAttribute('text')).to.eq( - 'Print this page', + 'Form submission started on September 7, 2025', ); - + expect($('.confirmation-submission-alert-section', container)).to.exist; + expect($('.confirmation-print-this-page-section', container)).to.exist; + expect($('.confirmation-whats-next-process-list-section', container)).to + .exist; const sections = $$('section'); - expect(sections.length).to.eq(4); + expect(sections.length).to.eq(3); expect($('h2', sections[0]).textContent).to.eql( 'If you need to submit supporting documents', ); - expect($('h2', sections[1]).textContent).to.eql('What to expect next'); - expect($('h2', sections[2]).textContent).to.eql( + expect($('va-link', sections[0])).to.have.attr( + 'text', + 'Use the Claim Status Tool to upload your documents', + ); + expect($('.va-address-block', sections[0])).to.exist; + + expect($('h2', sections[1]).textContent).to.eql( 'Direct deposit account information', ); - expect($('h2', sections[3]).textContent).to.eql( - 'How to contact us if you have questions', + expect($('va-link', sections[1])).to.have.attr( + 'text', + 'Review your direct deposit information', + ); + expect($('.va-address-block', sections[1])).to.exist; + expect($('h2', sections[2]).textContent).to.eql( + 'When to tell us if your information changes', + ); + const howToContactSection = $( + '.confirmation-how-to-contact-section', + container, + ); + expect(howToContactSection).to.exist; + expect($('va-telephone', howToContactSection)).to.exist; + expect($('va-link', howToContactSection)).to.exist; + expect($('va-link', howToContactSection)).to.have.attr( + 'text', + 'Contact us online through Ask VA', ); - expect($$('.va-address-block', container).length).to.eq(2); - expect($$('va-telephone', container).length).to.eq(2); expect($('#pension_527ez_submission_confirmation', container)).to.exist; - expect($('.confirmation-submission-alert-section', container)).to.not.exist; - expect($('.confirmation-print-this-page-section', container)).to.not.exist; - expect($('.confirmation-whats-next-process-list-section', container)).to.not - .exist; }); it('should render if no submission response', () => { @@ -140,21 +149,8 @@ describe('Pension benefits confirmation page', () => { expect($('#pension_527ez_submission_confirmation', container)).not.to.exist; }); - it('should not include bank account section', () => { - const { mockStore } = getData({ hasBankAccount: false }); - render( - - - , - ); - const sections = $$('section'); - expect(sections.length).to.eq(3); - }); - - it('should render updated content', () => { - const { mockStore } = getData({ - pensionConfirmationUpdate: true, - }); + it('should render correct content when user is not logged in', () => { + const { mockStore } = getData({ loggedIn: false }); const { container } = render( @@ -163,7 +159,7 @@ describe('Pension benefits confirmation page', () => { expect($('h2', container)).to.exist; expect($('h2', container).textContent).to.eql( - 'Form submission started on September 7, 2024', + 'Form submission started on September 7, 2025', ); expect($('.confirmation-submission-alert-section', container)).to.exist; expect($('.confirmation-print-this-page-section', container)).to.exist; @@ -174,12 +170,38 @@ describe('Pension benefits confirmation page', () => { expect($('h2', sections[0]).textContent).to.eql( 'If you need to submit supporting documents', ); + expect($('va-link', sections[0])).to.not.exist; expect($('h2', sections[1]).textContent).to.eql( 'Direct deposit account information', ); + expect($('va-link', sections[1])).to.have.attr( + 'text', + 'Review your direct deposit information', + ); + expect($('.va-address-block', sections[1])).to.exist; expect($('h2', sections[2]).textContent).to.eql( 'When to tell us if your information changes', ); expect($('.confirmation-how-to-contact-section', container)).to.exist; + expect($$('.va-address-block', container).length).to.eq(2); + expect($('#pension_527ez_submission_confirmation', container)).to.exist; + }); + + it('should not include bank account section', () => { + const { mockStore } = getData({ hasBankAccount: false }); + const { container } = render( + + + , + ); + const sections = $$('section'); + expect(sections.length).to.eq(2); + expect($('h2', sections[0]).textContent).to.eql( + 'If you need to submit supporting documents', + ); + expect($('h2', sections[1]).textContent).to.eql( + 'When to tell us if your information changes', + ); + expect($$('.va-address-block', container).length).to.eq(1); }); });