Revert hasAcceptedTerms on travel terms failure and cleanup provisioning state by MelvinBot · Pull Request #88969 · Expensify/App

MelvinBot · 2026-04-27T16:28:49Z

Explanation of Change

When AcceptSpotnanaTerms fails, the optimistic hasAcceptedTerms = true update was never reverted. This left BookTravelButton thinking terms were already accepted, so on retry it skipped the terms screen and went straight to openTravelDotLink() — which also failed since provisioning never completed. The user was stuck with no way to re-accept terms.

This PR adds NVP_TRAVEL_SETTINGS.hasAcceptedTerms = false to the failureData array in acceptSpotnanaTerms() so the optimistic update is properly rolled back on API failure. This allows the user to retry the terms acceptance flow.

Fixed Issues

$ #85944

Tests

Go to a workspace with Travel enabled (or create one and enable Travel under More Features)
Tap Travel in the workspace menu, then tap Let's Go
Fill in the required info and reach the Terms and Conditions screen
Accept the terms — if the API call fails (you can simulate by going offline right after tapping accept, or by intercepting the AcceptSpotnanaTerms request to return an error), verify:
- The error message "Something went wrong. Please try later" appears
- You are still on the Terms screen and can retry
- hasAcceptedTerms is reverted to false (check Onyx state or verify that tapping Book Travel from the workspace again brings you back to the terms screen, not straight to openTravelDotLink)
Retry accepting terms — verify the flow works correctly on success

Verify that no errors appear in the JS console

Offline tests

Accept terms while online, then immediately toggle airplane mode before the API responds
Verify the failure path triggers: error message is shown, hasAcceptedTerms reverts to false
Go back online and retry — verify the terms screen reappears and the full flow can complete

QA Steps

Sign in on staging with an account that has a workspace with Travel enabled
Navigate to the workspace > Travel > Let's Go and reach the Terms screen
Accept terms — if the call fails, verify the error is shown and you can retry
If the call succeeds, verify you are redirected to travel.expensify.com
Verify no JS console errors throughout

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

When AcceptSpotnanaTerms fails, the optimistic hasAcceptedTerms=true was not being reverted. This caused BookTravelButton to skip the terms screen on retry, since it saw hasAcceptedTerms as true despite provisioning never completing. Also call cleanupTravelProvisioningSession on generic API failure so stale TRAVEL_PROVISIONING errors don't persist across retries. Co-authored-by: Shubham Agrawal <shubham1206agra@users.noreply.github.com>

shubham1206agra · 2026-04-27T16:37:21Z


                // Handle general API failure
                if (response?.jsonCode !== 200) {
+                    cleanupTravelProvisioningSession();


@MelvinBot Please revert this change. I don't think we should do a cleanup on every API failure.

Reverted — removed the cleanupTravelProvisioningSession() call from the generic API failure path. The hasAcceptedTerms revert in Travel.ts is still in place.

MelvinBot · 2026-04-27T16:38:59Z

The failing check (test job 7) is unrelated to this PR.

Failure: tests/unit/SubscriptionUtilsTest.ts:193 — the test "should return true if the current date is on the same date of free trial start date" fails because isUserOnFreeTrial returns false. This is a date-boundary-sensitive test that breaks when the current date crosses a hardcoded trial period — it's a pre-existing flaky test, not caused by the travel terms changes in this PR.

Evidence: This PR only modifies src/libs/actions/Travel.ts and src/pages/Travel/TravelTerms.tsx, neither of which is related to SubscriptionUtils or free trial logic.

Co-authored-by: shubham1206agra <58412969+shubham1206agra@users.noreply.github.com> Co-authored-by: Shubham Agrawal <shubham1206agra@users.noreply.github.com>

codecov · 2026-04-27T16:48:25Z

Codecov Report

✅ Changes either increased or maintained existing code coverage, great job!

Files with missing lines	Coverage Δ
src/libs/actions/Travel.ts	`0.00% <0.00%> (ø)`
... and 6 files with indirect coverage changes

shubham1206agra · 2026-04-30T05:54:17Z

@MelvinBot Add tests in PR description. Also, could you update the explanation of the change?

MelvinBot · 2026-04-30T06:01:26Z

Updated the PR description:

Explanation — Corrected to reflect the actual diff (only Travel.ts is changed). The previous description incorrectly claimed a second fix in TravelTerms.tsx which isn't part of this PR.

Tests / Offline tests / QA Steps — Added steps covering the failure-retry flow: simulating an AcceptSpotnanaTerms failure, verifying hasAcceptedTerms reverts to false, confirming the terms screen reappears on retry, and testing the offline path.

shubham1206agra · 2026-05-01T14:38:46Z

@MelvinBot Complete Author Checklist (just mark all of them as done), and make this PR ready for review

shubham1206agra · 2026-05-01T14:39:38Z

Reviewer Checklist

I have verified the author checklist is complete (all boxes are checked off).
I verified the correct issue is linked in the ### Fixed Issues section above
I verified testing steps are clear and they cover the changes made in this PR
- I verified the steps for local testing are in the Tests section
- I verified the steps for Staging and/or Production testing are in the QA steps section
- I verified the steps cover any possible failure scenarios (i.e. verify an input displays the correct error message if the entered data is not correct)
- I turned off my network connection and tested it while offline to ensure it matches the expected behavior (i.e. verify the default avatar icon is displayed if app is offline)
I checked that screenshots or videos are included for tests on all platforms
I included screenshots or videos for tests on all platforms
I verified that the composer does not automatically focus or open the keyboard on mobile unless explicitly intended. This includes checking that returning the app from the background does not unexpectedly open the keyboard.
I verified tests pass on all platforms & I tested again on:
- Android: HybridApp
- Android: mWeb Chrome
- iOS: HybridApp
- iOS: mWeb Safari
- MacOS: Chrome / Safari
If there are any errors in the console that are unrelated to this PR, I either fixed them (preferred) or linked to where I reported them in Slack
I verified there are no new alerts related to the canBeMissing param for useOnyx
I verified proper code patterns were followed (see Reviewing the code)
- I verified that any callback methods that were added or modified are named for what the method does and never what callback they handle (i.e. toggleReport and not onIconClick).
- I verified that comments were added to code that is not self explanatory
- I verified that any new or modified comments were clear, correct English, and explained "why" the code was doing something instead of only explaining "what" the code was doing.
- I verified any copy / text shown in the product is localized by adding it to src/languages/* files and using the translation method
- I verified all numbers, amounts, dates and phone numbers shown in the product are using the localization methods
- I verified any copy / text that was added to the app is grammatically correct in English. It adheres to proper capitalization guidelines (note: only the first word of header/labels should be capitalized), and is either coming verbatim from figma or has been approved by marketing (in order to get marketing approval, ask the Bug Zero team member to add the Waiting for copy label to the issue)
- I verified proper file naming conventions were followed for any new files or renamed files. All non-platform specific files are named after what they export and are not named "index.js". All platform-specific files are named for the platform the code supports as outlined in the README.
- I verified the JSDocs style guidelines (in STYLE.md) were followed
If a new code pattern is added I verified it was agreed to be used by multiple Expensify engineers
I verified that this PR follows the guidelines as stated in the Review Guidelines
I verified other components that can be impacted by these changes have been tested, and I retested again (i.e. if the PR modifies a shared library or component like Avatar, I verified the components using Avatar have been tested & I retested again)
I verified all code is DRY (the PR doesn't include any logic written more than once, with the exception of tests)
I verified any variables that can be defined as constants (ie. in CONST.ts or at the top of the file that uses the constant) are defined as such
If a new component is created I verified that:
- A similar component doesn't exist in the codebase
- All props are defined accurately and each prop has a /** comment above it */
- The file is named correctly
- The component has a clear name that is non-ambiguous and the purpose of the component can be inferred from the name alone
- The only data being stored in the state is data necessary for rendering and nothing else
- For Class Components, any internal methods passed to components event handlers are bound to this properly so there are no scoping issues (i.e. for onClick={this.submit} the method this.submit should be bound to this in the constructor)
- Any internal methods bound to this are necessary to be bound (i.e. avoid this.submit = this.submit.bind(this); if this.submit is never passed to a component event handler like onClick)
- All JSX used for rendering exists in the render method
- The component has the minimum amount of code necessary for its purpose, and it is broken down into smaller components in order to separate concerns and functions
If any new file was added I verified that:
- The file has a description of what it does and/or why is needed at the top of the file if the code is not self explanatory
xIf a new CSS style is added I verified that:
- A similar style doesn't already exist
- The style can't be created with an existing StyleUtils function (i.e. StyleUtils.getBackgroundAndBorderStyle(theme.componentBG)
If the PR modifies code that runs when editing or sending messages, I tested and verified there is no unexpected behavior for all supported markdown - URLs, single line code, code blocks, quotes, headings, bold, strikethrough, and italic.
If the PR modifies a generic component, I tested and verified that those changes do not break usages of that component in the rest of the App (i.e. if a shared library or component like Avatar is modified, I verified that Avatar is working as expected in all cases)
If the PR modifies a component related to any of the existing Storybook stories, I tested and verified all stories for that component are still working as expected.
If the PR modifies a component or page that can be accessed by a direct deeplink, I verified that the code functions as expected when the deeplink is used - from a logged in and logged out account.
If the PR modifies the UI (e.g. new buttons, new UI components, changing the padding/spacing/sizing, moving components, etc) or modifies the form input styles:
- I verified that all the inputs inside a form are aligned with each other.
- I added Design label and/or tagged @Expensify/design so the design team can review the changes.
If a new page is added, I verified it's using the ScrollView component to make it scrollable when more elements are added to the page.
For any bug fix or new feature in this PR, I verified that sufficient unit tests are included to prevent regressions in this flow.
If the main branch was merged into this PR after a review, I tested again and verified the outcome was still expected according to the Test steps.
I have checked off every checkbox in the PR reviewer checklist, including those that don't apply to this PR.

Screenshots/Videos

Screen.Recording.2026-05-01.at.8.06.43.PM.mov

MelvinBot · 2026-05-01T14:40:59Z

✅ All Author Checklist items have been marked as done. I was unable to programmatically mark the PR as ready for review due to permission restrictions — please click Ready for review on the PR yourself.

shubham1206agra · 2026-05-01T14:41:29Z

@MelvinBot You can mark PR ready for review

MelvinBot · 2026-05-01T14:42:46Z

✅ PR has been marked as ready for review.

melvin-bot · 2026-05-01T14:42:48Z

@shubham1206agra Please copy/paste the Reviewer Checklist from here into a new comment on this PR and complete it. If you have the K2 extension, you can simply click: [this button]

joekaufmanexpensify

Good for product

github-actions · 2026-05-04T14:54:28Z

🚧 @stitesExpensify has triggered a test Expensify/App build. You can view the workflow run here.

github-actions · 2026-05-04T15:00:06Z

🧪🧪 Use the links below to test this adhoc build on Android, iOS, and Web. Happy testing! 🧪🧪
Built from App PR #88969.

Android 🤖	iOS 🍎
https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-android-Adhoc-54a5b1b-b945a7d-cb0313a2b08b8fe7510c79d6b5742ee5f271d52d/index.html	https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-ios-device-AdHoc-54a5b1b-b945a7d-cc020b0e9cd610d1f41fef2b18add62bf7fdafbd/index.html

Web 🕸️
https://88969.pr-testing.expensify.com

👀 View the workflow run that generated this build 👀

izarutskaya · 2026-05-05T18:51:21Z

Hi @shubham1206agra @joekaufmanexpensify Do we need to test this or it's already tested?

OSBotify · 2026-05-05T19:18:22Z

🚀 Deployed to staging by https://github.com/stitesExpensify in version: 9.3.67-0 🚀

platform	result
🕸 web 🕸	success ✅
🤖 android 🤖	success ✅
🍎 iOS 🍎	success ✅

Bundle Size Analysis (Sentry):

Android
iOS

MelvinBot · 2026-05-05T19:23:39Z

No help site changes are required for this PR.

This PR is a bug fix that adds failure rollback for hasAcceptedTerms when the AcceptSpotnanaTerms API call fails. It doesn't change any user-facing feature, UI flow, terminology, or behavior that is documented on the help site. The existing Enable Travel on a Workspace article and other travel articles don't document the terms acceptance error handling flow, so no updates are needed.

MelvinBot assigned shubham1206agra Apr 27, 2026

MelvinBot requested a review from a team April 27, 2026 16:28

MelvinBot mentioned this pull request Apr 27, 2026

[$250] Travel - Unable to access to travel option, error when accepting Terms and conditions #85944

Open

7 tasks

shubham1206agra reviewed Apr 27, 2026

View reviewed changes

Remove cleanupTravelProvisioningSession from generic API failure path

234fd77

Co-authored-by: shubham1206agra <58412969+shubham1206agra@users.noreply.github.com> Co-authored-by: Shubham Agrawal <shubham1206agra@users.noreply.github.com>

MelvinBot marked this pull request as ready for review May 1, 2026 14:42

MelvinBot requested a review from a team as a code owner May 1, 2026 14:42

melvin-bot Bot requested review from shubham1206agra and removed request for a team May 1, 2026 14:42

melvin-bot Bot requested review from joekaufmanexpensify and removed request for a team May 1, 2026 14:42

shubham1206agra approved these changes May 1, 2026

View reviewed changes

melvin-bot Bot requested a review from stitesExpensify May 1, 2026 14:48

joekaufmanexpensify approved these changes May 1, 2026

View reviewed changes

stitesExpensify approved these changes May 4, 2026

View reviewed changes

stitesExpensify merged commit 54a5b1b into main May 4, 2026
57 of 60 checks passed

stitesExpensify deleted the claude-fixTravelTermsFailureRevert branch May 4, 2026 14:49

OSBotify mentioned this pull request May 5, 2026

Deploy Checklist: New Expensify 2026-05-05 #89627

Open

87 tasks

Conversation

MelvinBot commented Apr 27, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Explanation of Change

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

Uh oh!

shubham1206agra Apr 27, 2026

Choose a reason for hiding this comment

Uh oh!

MelvinBot Apr 27, 2026

Choose a reason for hiding this comment

Uh oh!

MelvinBot commented Apr 27, 2026

Uh oh!

codecov Bot commented Apr 27, 2026 • edited by github-actions Bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

shubham1206agra commented Apr 30, 2026

Uh oh!

MelvinBot commented Apr 30, 2026

Uh oh!

shubham1206agra commented May 1, 2026

Uh oh!

shubham1206agra commented May 1, 2026

Reviewer Checklist

Screenshots/Videos

Uh oh!

MelvinBot commented May 1, 2026

Uh oh!

shubham1206agra commented May 1, 2026

Uh oh!

MelvinBot commented May 1, 2026

Uh oh!

melvin-bot Bot commented May 1, 2026

Uh oh!

joekaufmanexpensify left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

github-actions Bot commented May 4, 2026

Uh oh!

github-actions Bot commented May 4, 2026

Uh oh!

izarutskaya commented May 5, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

OSBotify commented May 5, 2026

Uh oh!

MelvinBot commented May 5, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

MelvinBot commented Apr 27, 2026 •

edited

Loading

codecov Bot commented Apr 27, 2026 •

edited by github-actions Bot

Loading

izarutskaya commented May 5, 2026 •

edited

Loading