Return to the spend rule form after upgrading from a workspace spend rule page by MelvinBot · Pull Request #103365 · Expensify/App

MelvinBot · 2026-10-07T17:27:11Z

Explanation of Change

On a Collect workspace, opening a workspace spend rule form (for example, via Expensify Card details > Edit spend rules) redirects to the Control upgrade page via useControlOnlyRuleUpgradeRedirect. EditSpendRulePage and AddSpendRulePage didn't pass upgradeBackTo, so the hook fell back to the workspace Rules route. After upgrading, the user landed on Rules > General instead of the spend rule form.

This PR passes upgradeBackTo from both pages, the same way WalletExpensifyCardSpendRulesPage already does:

EditSpendRulePage → ROUTES.RULES_SPEND_EDIT.getRoute(policyID, ruleID)
AddSpendRulePage → ROUTES.RULES_SPEND_NEW.getRoute(policyID)

When the user comes back, the policy is already Control, so the hook doesn't redirect again.

Fixed Issues

$ #101699
PROPOSAL: #101699 (comment)

Tests

// TODO: The human co-author must fill out the tests you ran before marking this PR as "ready for review"
// Please describe what tests you performed that validates your changed worked.

Verify that no errors appear in the JS console

Offline tests

QA Steps

Preconditions:

Use an expensifail account
Enable rules
Have a Collect workspace with Expensify Card enabled and issue one Expensify Card

Go to staging.new.expensify.com
Click on the card that's issued
Click on Edit spend rule > Upgrade
Verify that the app navigates to the Spend Rule form page, not Rules > General

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

…rule page Co-authored-by: Situ Chandra Shil <situchan@users.noreply.github.com>

codecov · 2026-10-07T17:32:31Z

Codecov Report

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

Files with missing lines	Coverage Δ
...es/workspace/rules/SpendRules/AddSpendRulePage.tsx	`0.00% <0.00%> (ø)`
...s/workspace/rules/SpendRules/EditSpendRulePage.tsx	`0.00% <0.00%> (ø)`
... and 4 files with indirect coverage changes

MelvinBot · 2026-10-07T17:48:46Z

🤖 Web test steps verification results: ✅ pass

On a Collect workspace with Rules enabled, opening the Add spend rule form redirected to the Control upgrade page. After upgrading, the app returned to the "Restrict card spend" form, not Rules > General. Issuing an Expensify Card was blocked by an email verification code, so the test opened workspaces/<policyID>/rules/spend-rules/new through an in-app chat link. That route uses the same upgrade-redirect code path this PR changes.

Step	Status
A Collect workspace with Rules enabled exists (Expensify Card attempted) Overview shows Plan type: Collect, and Rules is enabled in More features. Issuing an Expensify Card was blocked by a required email verification code, so the spend-rules/new route was used instead.	✅
Opening the spend rule form on the Collect workspace redirects to the Control upgrade page Posted the dev link to `workspaces/<policyID>/rules/spend-rules/new` in a chat and clicked it. The app navigated in-app and redirected to the Upgrade page for Rules.	✅
After upgrading, the app returns to the Spend Rule form, not Rules > General Tapped Upgrade, and the upgrade completed. Tapping "Got it, thanks" returned to the "Restrict card spend" form (Card, Permitted currencies, Max amount, Restrict merchants, Save rule).	✅
No errors appear in the JS console No error banners, toasts, or broken UI appeared during the flow. The web test tool cannot read the console, so this check is visual only.	✅

view run · view recording

MelvinBot · 2026-10-07T18:23:29Z

🤖 Android test steps verification results: ✅ pass

On a Collect workspace with Rules enabled, tapping a chat link to the Add spend rule form redirected to the Control upgrade page. After upgrading, the app returned to the "Restrict card spend" form, not Rules > General. Issuing an Expensify Card was blocked by an email verification code, so the test used the workspaces/<policyID>/rules/spend-rules/new link instead of Edit spend rule on a card.

Step	Status
A Collect workspace with Rules enabled exists (Expensify Card attempted) The workspace was changed to the Collect plan, with Rules and Expensify Card enabled. Issuing a card was blocked by a required email verification code, so no card was issued.	✅
Opening the spend rule form on the Collect workspace redirects to the Control upgrade page Posted the dev link to `workspaces/<policyID>/rules/spend-rules/new` in a chat and tapped it. The app showed the "Unlock this feature" upgrade page for Rules.	✅
After upgrading, the app returns to the Spend Rule form, not Rules > General Tapped Upgrade, and the workspace upgraded to Control. Tapping "Got it, thanks" opened the "Restrict card spend" form (Card, Permitted currencies, Max amount, Restrict merchants, Save rule).	✅
No errors appear in the JS console or UI No RedBox, LogBox, or error banner appeared during the flow, and the app stayed in the foreground.	✅

view run · view recording

situchan · 2026-10-19T09:35:32Z

@MelvinBot pull main

situchan · 2026-10-19T09:35:52Z

@codex review

situchan · 2026-10-19T09:35:56Z

@MelvinBot review

chatgpt-codex-connector · 2026-10-19T09:36:11Z

Codex Review Summary

This comment shows the latest Codex review activity on this pull request.

Review	Status	Commit	Review trigger
📝 Code Review	✅ Completed 2026-10-19T09:58:13.341537Z	`32d06c5`	Draft marked ready

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

Open a pull request for review
Mark a draft as ready
Comment "@codex review" or "@codex security review".

Codex reacts with 👀 while any review is running, comments if it has suggestions, and reacts with 👍 once all reviews finish with no findings.

chatgpt-codex-connector · 2026-10-19T09:39:43Z

Codex Review: Didn't find any major issues. Can't wait for the next one!

Reviewed commit: fc180c98b4

ℹ️ About Codex in GitHub

Codex has been enabled to automatically review pull requests in this repo. Reviews are triggered when you

Open a pull request for review
Mark a draft as ready
Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

When you sign up for Codex through ChatGPT, Codex can also answer questions or update the PR, like "@codex address that feedback".

…gradeBackTo Co-authored-by: Situ Chandra Shil <situchan@users.noreply.github.com>

MelvinBot · 2026-10-19T09:43:38Z

Merged the latest main into this branch with no conflicts and pushed it as commit 32d06c5.

view run

situchan · 2026-10-19T09:47:27Z

@MelvinBot pull main, add QA steps same as OP in the linked issue and mark this PR ready for review

MelvinBot · 2026-10-19T09:49:59Z

Code review

I found no blocking issues. The change is correct and matches the existing pattern in WalletExpensifyCardSpendRulesPage.tsx:24. All CI checks pass except Check independent approval, which only needs a reviewer approval.

What I checked

Return after upgrade: For the rules feature, the upgrade page returns to backTo with compareParams: false (WorkspaceUpgradePage.tsx:187-189). The routes in AddSpendRulePage.tsx:21 and EditSpendRulePage.tsx:22 send the user back to the same form. The policy is now Control, so the hook doesn't redirect again.
No redirect loop when the user backs out without upgrading: In that case, the header Back button calls a plain Navigation.goBack() and ignores backTo (WorkspaceUpgradePage.tsx:417-423). The redirect replaces the form, so Back goes to the screen before the form, such as card details. It does not reopen the form.
Route signatures: RULES_SPEND_NEW.getRoute(policyID) and RULES_SPEND_EDIT.getRoute(policyID, ruleID) match the screen params, and both return Route, so the types line up.
Earlier web and Android runs: Both returned to the "Restrict card spend" form after the upgrade.

Optional (non-blocking):

SpendRuleCategoryPage.tsx:26 and SpendRuleCardPage.tsx:111 still fall back to the Rules page. Users can reach these picker pages on a Collect workspace only through a direct deep link, so I'd leave them out of this PR.
No test covers upgradeBackTo for these pages. A small UI test could assert that the upgrade route carries the form's backTo.

view run

melvin-bot · 2026-10-19T09:54:51Z

@situchan 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]

MelvinBot · 2026-10-19T09:54:51Z

Done:

Pull main: The branch already includes the latest main (0 commits behind), so no new merge was needed.
QA steps: I replaced the QA Steps placeholder with the preconditions and steps from the issue. I also added a final check that the app opens the Spend Rule form page, not Rules > General.
Ready for review: The PR is no longer a draft.

The Tests section still has its TODO placeholder for you to fill in.

view run

situchan · 2026-10-19T09:55:25Z

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 any copy / text that was added to the app 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)
If a new code pattern is added I verified it was agreed to be used by multiple Expensify engineers
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)
If a new component is created I verified that:
- A similar component doesn't exist in the codebase
- All props are defined accurately
- 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
- 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 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 the PR adds or modifies the UI:
- I asked an AI agent to review the changes for accessibility issues and addressed its findings.
- I tested with a screen reader (VoiceOver on macOS) and verified all new/changed elements are reachable with a logical focus order.
- I verified all new/changed elements have meaningful accessible names and roles.
- I verified state changes are announced (e.g. checked/unchecked, expanded/collapsed, selected).
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

Android: HybridApp

Android: mWeb Chrome

iOS: HybridApp

iOS: mWeb Safari

MacOS: Chrome / Safari

web1.mov

web2.mov

melvin-bot · 2026-10-19T09:55:46Z

We did not find an internal engineer to review this PR, trying to assign a random engineer to #101699 as well as to this PR... Please reach out for help on Slack if no one gets assigned!

heyjennahay

Product change LGTM 👍

github-actions · 2026-10-19T18:03:45Z

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

github-actions · 2026-10-19T18:08:08Z

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

Android 🤖	iOS 🍎
https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-android-Adhoc-10372ec-cc6833e-2db88b476e26734f35a2e11132c0c0371538df9a/index.html	https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-ios-device-AdHoc-10372ec-cc6833e-5a6df867c0f17d22b68a0cdab983ffdbc586c4f5/index.html

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

👀 View the workflow run that generated this build 👀

OSBotify · 2026-10-19T18:09:20Z

✋ This PR was not deployed to staging yet because QA is ongoing. It will be automatically deployed to staging after the next production release.

OSBotify · 2026-10-20T19:41:30Z

🚀 Deployed to staging by https://github.com/yuwenmemon in version: 9.5.15-1 🚀

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

MelvinBot · 2026-10-20T19:46:17Z

No help site update needed. This PR is a navigation bug fix: after you upgrade from a spend rule page, the app now returns you to the spend rule form instead of Rules > General, which is what users already expect. No help article describes where you land after upgrading.

view run

OSBotify · 2026-10-21T19:30:20Z

🚀 Deployed to production by https://github.com/grgia in version: 9.5.15-3 🚀

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

Bundle Size Analysis (Sentry):

Android
iOS

Return to the spend rule form after upgrading from a workspace spend …

fc180c9

…rule page Co-authored-by: Situ Chandra Shil <situchan@users.noreply.github.com>

MelvinBot assigned situchan Oct 7, 2026

MelvinBot requested a review from a team October 7, 2026 17:27

melvin-bot Bot added Melvin-Test-Android Melvin-Test-Web Triggers Melvin to run the testing steps of the PR on web labels Oct 7, 2026

MelvinBot mentioned this pull request Oct 7, 2026

[Due for payment 2026-10-28] [$175] [Exploratory] Spend Rules - Clicking Edit spend rule leads to Rules > General page #101699

Closed

2 of 7 tasks

Merge remote-tracking branch 'origin/main' into claude-fixSpendRuleUp…

32d06c5

…gradeBackTo Co-authored-by: Situ Chandra Shil <situchan@users.noreply.github.com>

MelvinBot marked this pull request as ready for review October 19, 2026 09:54

MelvinBot requested a review from a team as a code owner October 19, 2026 09:54

melvin-bot Bot requested review from situchan and removed request for a team October 19, 2026 09:54

melvin-bot Bot requested review from heyjennahay and removed request for a team October 19, 2026 09:54

situchan approved these changes Oct 19, 2026

View reviewed changes

melvin-bot Bot requested a review from yuwenmemon October 19, 2026 09:56

heyjennahay approved these changes Oct 19, 2026

View reviewed changes

yuwenmemon approved these changes Oct 19, 2026

View reviewed changes

yuwenmemon merged commit 10372ec into main Oct 19, 2026
50 of 52 checks passed

yuwenmemon deleted the claude-fixSpendRuleUpgradeBackTo branch October 19, 2026 18:03

OSBotify mentioned this pull request Oct 20, 2026

Deploy Checklist: New Expensify 2026-10-20 #104495

Closed

81 tasks done

applause-bot Bot mentioned this pull request Oct 20, 2026

[$175] Expensify Card - Next button replaced with loading button after enabled then disabled rule #104509

Open

1 of 7 tasks

Conversation

MelvinBot commented Oct 7, 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!

codecov Bot commented Oct 7, 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!

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

Uh oh!

Uh oh!

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

Uh oh!

Uh oh!

situchan commented Oct 19, 2026

Uh oh!

situchan commented Oct 19, 2026

Uh oh!

situchan commented Oct 19, 2026

Uh oh!

chatgpt-codex-connector Bot commented Oct 19, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codex Review Summary

Uh oh!

chatgpt-codex-connector Bot commented Oct 19, 2026

Uh oh!

MelvinBot commented Oct 19, 2026

Uh oh!

situchan commented Oct 19, 2026

Uh oh!

MelvinBot commented Oct 19, 2026

Code review

Uh oh!

melvin-bot Bot commented Oct 19, 2026

Uh oh!

MelvinBot commented Oct 19, 2026

Uh oh!

situchan commented Oct 19, 2026

Reviewer Checklist

Screenshots/Videos

Uh oh!

melvin-bot Bot commented Oct 19, 2026

Uh oh!

heyjennahay left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

github-actions Bot commented Oct 19, 2026

Uh oh!

github-actions Bot commented Oct 19, 2026

Uh oh!

OSBotify commented Oct 19, 2026

Uh oh!

OSBotify commented Oct 20, 2026

Uh oh!

MelvinBot commented Oct 20, 2026

Uh oh!

OSBotify commented Oct 21, 2026

Uh oh!

Reviewers

Uh oh!

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

MelvinBot commented Oct 7, 2026 •

edited

Loading

codecov Bot commented Oct 7, 2026 •

edited by github-actions Bot

Loading

MelvinBot commented Oct 7, 2026 •

edited

Loading

MelvinBot commented Oct 7, 2026 •

edited

Loading

chatgpt-codex-connector Bot commented Oct 19, 2026 •

edited

Loading