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

NJ 293 - move retirement screen to income section #5614

Open
wants to merge 4 commits into
base: main
Choose a base branch
from

Conversation

jachan
Copy link
Contributor

@jachan jachan commented Feb 20, 2025

Link to pivotal/JIRA issue

Is PM acceptance required? (delete one)

  • Yes - don't merge until JIRA issue is accepted!

Reminder: merge main into this branch and get green tests before merging to main

What was done?

  • Move retirement screen in navigation order
  • Move retirement section on review page

How to test?

  • Ensure that Flipper is active to enable Retirement screens
  • Run through retirement income flow, verify that retirement screen is in Income section and that it shows up in the Income section of the review screen

Screenshots (for visual changes)

  • Before
  • After
image image

Copy link

Heroku app: https://gyr-review-app-5614-b3d138cb6680.herokuapp.com/
View logs: heroku logs --app gyr-review-app-5614 (optionally add --tail)

@jachan jachan force-pushed the nj-293-move-retirement-screen branch from 9c2fe59 to aa106d3 Compare February 21, 2025 19:13
@jachan jachan marked this pull request as ready for review February 25, 2025 14:58
Navigation::NavigationSection.new("state_file.navigation.nj.section_5", [
Navigation::NavigationStep.new(StateFile::Questions::PrimaryStateIdController), # Footer
Navigation::NavigationStep.new(StateFile::Questions::SpouseStateIdController), # Footer
Navigation::NavigationStep.new(StateFile::Questions::NjReviewController), # review controller should come before taxes owed / refund due screens
Navigation::NavigationStep.new(StateFile::Questions::NjReviewController), # REVIEW: controller should come before taxes owed / refund due screens
Copy link
Contributor

Choose a reason for hiding this comment

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

[dust] this change to this comment seems like it changes the meaning here in a way I wouldn't expect - makes it sound like a TODO command instead of a note. Is this intentional?

Copy link
Contributor

@aloverso aloverso Feb 25, 2025

Choose a reason for hiding this comment

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

tbh is this comment even necessary at all, even in its original form

Copy link
Contributor Author

Choose a reason for hiding this comment

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

No, I think it should be removed. This was an auto-rubocop fix.

@@ -3681,7 +3681,7 @@ en:
retirement_income_source_label: 'Source:'
retirement_income_source_military_pension: U.S. military pension
retirement_income_source_military_survivor_benefit: U.S. military survivor's benefits
retirement_income_source_other: Neither U.S. military pension nor U.S. military survivor's benefits
retirement_income_source_none: Neither U.S. military pension nor U.S. military survivor's benefits
Copy link
Contributor

Choose a reason for hiding this comment

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

[pebble] This looks like a merge issue. This should be "other" not "none" given Matt's refactor. Same in the es.yml foile

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Thanks for the callout! Will fix.

@@ -27,11 +27,12 @@ def self.show_progress?(controller_class)
# Federal info does not show to users
Navigation::NavigationStep.new(StateFile::Questions::FederalInfoController),
Navigation::NavigationStep.new(StateFile::Questions::DataTransferOffboardingController, false),
], false),
], false),
Copy link
Contributor

Choose a reason for hiding this comment

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

[dust] spacing added in this file? should be removed, or is it rubocop?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Rubocop auto indent

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants