[CP staging] Revert "Fix magic code navigates back on payment (SettlementButton)" by jasperhuangg · Pull Request #96126 · Expensify/App

jasperhuangg · 2026-07-14T19:58:53Z

melvin-bot · 2026-07-14T19:59:24Z

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

codecov · 2026-07-14T20:03:09Z

Codecov Report

❌ Looks like you've decreased code coverage for some files. Please write tests to increase, or at least maintain, the existing level of code coverage. See our documentation here for how to interpret this table.

Files with missing lines	Coverage Δ
...s/WideRHPContextProvider/useShouldRenderOverlay.ts	`0.00% <ø> (ø)`
src/components/SettlementButton/index.tsx	`82.19% <37.93%> (-2.99%)`	⬇️
... and 13 files with indirect coverage changes

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 78129a3057

ℹ️ 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".

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

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

chatgpt-codex-connector · 2026-07-14T20:08:01Z

+            if (!isUserValidated && paymentMethodType !== CONST.IOU.PAYMENT_TYPE.ELSEWHERE) {
+                Navigation.navigate(createDynamicRoute(DYNAMIC_ROUTES.VERIFY_ACCOUNT.path));
+                return true;


Resume payment after magic-code verification

For an unvalidated user who chooses any non-Pay Elsewhere method, this branch only navigates to the verify-account screen and then returns, so the selected payment/KYC action is discarded when the magic-code flow validates and closes. In the inspected SettlementButton flow, callers such as handlePaymentSelection and the payment-method submenu onSelected handlers all stop on this return, leaving the user back on the report with no payment attempted unless they click Pay again.

Useful? React with 👍 / 👎.

chatgpt-codex-connector · 2026-07-14T20:08:01Z

+            }).start(() => {
                setShouldRenderOverlay(false);


Ignore interrupted overlay hide animations

When the overlay condition flips false and then back true before the 300ms hide animation completes, starting the show animation interrupts the hide animation but this callback still runs with finished=false; it now unconditionally sets shouldRenderOverlay to false while the current condition is true. On wide/super-wide RHP flows this unmounts the dim/click-catcher overlay until the condition cycles again, so quick RHP transitions can leave the underlying pane uncovered.

Useful? React with 👍 / 👎.

github-actions · 2026-07-14T21:05:53Z

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

…/magic-code-navigates-back-payment

github-actions · 2026-07-14T23:28:11Z

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

…navigates-back-payment [CP staging] Revert "Fix magic code navigates back on payment (SettlementButton)" (cherry picked from commit 890332b) (cherry-picked to staging by jasperhuangg)

OSBotify · 2026-07-14T23:33:35Z

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

github-actions · 2026-07-14T23:33:46Z

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

Android 🤖	iOS 🍎
https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-android-Adhoc-890332b42e6-783622c-28bd66bdc128c47e46edfea48dd6295601ba677c/index.html	https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-ios-device-AdHoc-890332b-783622c-4c98c30165aa37be8aeddbb75466725a82ab1059/index.html

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

👀 View the workflow run that generated this build 👀

OSBotify · 2026-07-14T23:51:27Z

🚀 Cherry-picked to staging by https://github.com/jasperhuangg in version: 9.4.34-6 🚀

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

MelvinBot · 2026-07-14T23:54:12Z

🤖 Help site review: no documentation changes required.

I reviewed the changes in this PR and confirmed no updates are needed to Expensify's help site files under docs/articles, so no draft PR was created.

Why

This PR reverts #93087 to fix a visual regression (a semi-transparent overlay appearing on the report RHP — #96091). The changes are entirely internal implementation details:

Removes the useVerifyAccountAndResume hook and its test.
Reverts SettlementButton and useShouldRenderOverlay logic that controlled how the magic-code verification modal was presented when an unvalidated user triggers a payment.

None of this alters a documented user-facing feature, setting, label, or workflow. The help articles that mention "magic code" cover login/account verification and 2FA — not the modal-presentation behavior during payment, which is not documented on the help site. There is nothing in docs/articles that describes this flow and would become inaccurate as a result of the revert.

@jasperhuangg, please review the linked help site PR and confirm it reflects the current behavior. Then mark the linked help site PR Ready for review

Note: no help site PR was created because no documentation changes are required. If you believe an article should be updated, let me know which flow to document and I'll draft one.

OSBotify · 2026-07-16T05:17:14Z

🚀 Deployed to production by https://github.com/roryabraham in version: 9.4.34-14 🚀

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

OSBotify · 2026-07-16T06:08:07Z

🚀 Deployed to production by https://github.com/roryabraham in version: 9.4.34-14 🚀

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

Bundle Size Analysis (Sentry):

Android

OSBotify · 2026-07-16T06:51:21Z

🚀 Cherry-picked to staging by https://github.com/jasperhuangg in version: 9.4.35-1 🚀

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

MelvinBot · 2026-07-16T06:53:28Z

🤖 No help site changes required.

This PR reverts #93087, and the diff is entirely internal implementation detail:

src/components/SettlementButton/index.tsx — reverts the payment-flow guard logic back to inline navigation to the verify-account (magic code) screen.
src/hooks/useVerifyAccountAndResume.ts + tests — deleted (the hook introduced by Fix magic code navigates back on payment (SettlementButton) #93087).
src/components/WideRHPContextProvider/useShouldRenderOverlay.ts — reverts an overlay-animation edge-case guard.

None of this changes documented, user-facing behavior. The underlying flows (paying an expense, verifying an account with a magic code) are unchanged from the user's perspective — only the internal navigation/resume mechanics differ. I searched docs/articles for the relevant topics (magic code, verify/validate account, payment) and found no article that documents the specific navigation behavior affected here, so there is nothing to update.

No draft docs PR was created since there are no documentation updates to make. @jasperhuangg, let me know if you'd like me to re-check any specific article.

OSBotify · 2026-07-16T23:52:26Z

🚀 Deployed to production by https://github.com/jasperhuangg in version: 9.4.35-6 🚀

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

Revert "Fix magic code navigates back on payment (SettlementButton)"

78129a3

jasperhuangg requested review from a team as code owners July 14, 2026 19:58

melvin-bot Bot assigned jasperhuangg Jul 14, 2026

melvin-bot Bot requested review from heyjennahay and mollfpr and removed request for a team July 14, 2026 19:58

melvin-bot Bot removed the request for review from a team July 14, 2026 19:59

chatgpt-codex-connector Bot reviewed Jul 14, 2026

View reviewed changes

jasperhuangg added the Ready To Build label Jul 14, 2026

This comment has been minimized.

Sign in to view

jasperhuangg removed request for heyjennahay and mollfpr July 14, 2026 21:24

Merge branch 'main' of github.com:Expensify/App into revert-93087-fix…

40b664d

…/magic-code-navigates-back-payment

jasperhuangg changed the title ~~Revert "Fix magic code navigates back on payment (SettlementButton)"~~ [CP staging] Revert "Fix magic code navigates back on payment (SettlementButton)" Jul 14, 2026

blimpich approved these changes Jul 14, 2026

View reviewed changes

jasperhuangg merged commit 890332b into main Jul 14, 2026
41 of 43 checks passed

jasperhuangg deleted the revert-93087-fix/magic-code-navigates-back-payment branch July 14, 2026 23:26

OSBotify added the CP Staging marks PRs that have been CP'd to staging label Jul 14, 2026

OSBotify mentioned this pull request Jul 14, 2026

Deploy Checklist: New Expensify 2026-07-14 #96044

Closed

MelvinBot mentioned this pull request Jul 15, 2026

[Due for payment 2026-07-23] Web - Account - App crash when open account tab #96158

Closed

7 tasks

Uh oh!

Conversation

jasperhuangg commented Jul 14, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

melvin-bot Bot commented Jul 14, 2026

Uh oh!

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

chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

chatgpt-codex-connector Bot Jul 14, 2026

Choose a reason for hiding this comment

Uh oh!

chatgpt-codex-connector Bot Jul 14, 2026

Choose a reason for hiding this comment

Uh oh!

github-actions Bot commented Jul 14, 2026

Uh oh!

This comment has been minimized.

Uh oh!

github-actions Bot commented Jul 14, 2026

Uh oh!

OSBotify commented Jul 14, 2026

Uh oh!

github-actions Bot commented Jul 14, 2026

Uh oh!

OSBotify commented Jul 14, 2026

Uh oh!

MelvinBot commented Jul 14, 2026

Uh oh!

OSBotify commented Jul 16, 2026

Uh oh!

OSBotify commented Jul 16, 2026

Uh oh!

OSBotify commented Jul 16, 2026

Uh oh!

MelvinBot commented Jul 16, 2026

Uh oh!

OSBotify commented Jul 16, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

jasperhuangg commented Jul 14, 2026 •

edited

Loading

codecov Bot commented Jul 14, 2026 •

edited by github-actions Bot

Loading