Skip to content

Conversation

@RKohler21
Copy link
Collaborator

@RKohler21 RKohler21 commented Oct 20, 2025

🗣 Description

This is a multi Purpose PR that closes both CRASM-3304 and CRASM-3290. For CRASM-3304, this PR contains a full refactor for our Terms Of Use page as well as the deletion of deprecated code from AuthForm and the removal of the /terms URL from our Route file. For CRASM-3290, this PR includes an fix that will resolve the issue of the First Login popup not appearing after accepting the terms of use but later appearing on the second login.

💭 Motivation and context

This PR includes updates/fixes for both PR's since they are heavily related to one another and will improve the flow of our code and UI experience going forward.

🧪 Testing

In order to test, the user will need to follow these steps when logging in for the first time on a new account.

  1. Login > Select State > Logout.
  2. Login again > View and agree to Terms Of Use > First Login popup will appear > Logout
  3. Login one final time > First Login popup will no longer appear

📷 Screenshots (if appropriate)

Before refactor:
Screenshot 2025-10-21 at 4 21 22 PM
Screenshot 2025-10-21 at 4 21 36 PM

After refactor:
Screenshot 2025-10-21 at 4 44 35 PM
Screenshot 2025-10-21 at 4 44 50 PM

Warning Label Addition:
Screenshot 2025-10-22 at 10 06 19 AM

✅ Pre-approval checklist

  • This PR has an informative and human-readable title.
  • Changes are limited to a single goal - eschew scope creep!
  • All future TODOs are captured in issues, which are referenced in code comments.
  • All relevant type-of-change labels have been added.
  • I have read the CONTRIBUTING document.
  • These code changes follow cisagov code standards.
  • All relevant repo and/or project documentation has been updated to reflect the changes in this PR.
  • Tests have been added and/or modified to cover the changes in this PR.
  • All new and existing tests pass.
  • Bump major, minor, patch, pre-release, and/or build versions as appropriate via the bump_version script if this repository is versioned and the changes in this PR warrant a version bump.
  • Create a pre-release (necessary if and only if the pre-release version was bumped).

✅ Pre-merge checklist

  • Revert dependencies to default branches.
  • Finalize version.

✅ Post-merge checklist

  • Create a release (necessary if and only if the version was bumped).

@RKohler21 RKohler21 changed the title Terms of use refactor 3304 Terms Of Use Refactor CRASM-3304 Oct 20, 2025
@ameliav ameliav self-requested a review October 20, 2025 20:38
Copy link
Contributor

@ameliav ameliav left a comment

Choose a reason for hiding this comment

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

I'd suggest moving the TermsOfUse.tsx file to the components/Dialog folder since it's not really a page anymore and removing the TermsOfUse folder under pages.

@jsalinasnttdata jsalinasnttdata self-requested a review October 20, 2025 21:54
Copy link
Collaborator

@jsalinasnttdata jsalinasnttdata left a comment

Choose a reason for hiding this comment

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

A few things to address

@jsalinasnttdata
Copy link
Collaborator

@RKohler21 We need to add a warning when a user tries to submit without checking the acknowledgment checkbox. See the example below. We’ll likely want to adjust the design since the current alert appears off to the side.
Screenshot 2025-10-21 at 2 41 50 PM

@RKohler21 was this addressed?

Copy link
Collaborator

@rapidray12 rapidray12 left a comment

Choose a reason for hiding this comment

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

Was this tested for 508 compliance

@cduhn17 cduhn17 requested review from ameliav and rapidray12 October 22, 2025 19:53
ameliav
ameliav previously approved these changes Oct 22, 2025
Copy link
Contributor

@ameliav ameliav left a comment

Choose a reason for hiding this comment

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

Looks 508 compliant to me

@ameliav ameliav self-requested a review October 22, 2025 20:50
Copy link
Contributor

@ameliav ameliav left a comment

Choose a reason for hiding this comment

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

LGTM

Copy link
Collaborator

@rapidray12 rapidray12 left a comment

Choose a reason for hiding this comment

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

Second time around. Looks good

@schmelz21 schmelz21 merged commit d123955 into develop Oct 24, 2025
18 checks passed
@schmelz21 schmelz21 deleted the TermsOfUse_Refactor-3304 branch October 24, 2025 19:11
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.

5 participants