Skip to content

Fix magic code navigates back on payment (useSelectionMode & MoneyReportHeaderSelectionDropdown)#96986

Draft
jmusial wants to merge 1 commit into
Expensify:mainfrom
software-mansion-labs:chore/verify-resume-money-selection
Draft

Fix magic code navigates back on payment (useSelectionMode & MoneyReportHeaderSelectionDropdown)#96986
jmusial wants to merge 1 commit into
Expensify:mainfrom
software-mansion-labs:chore/verify-resume-money-selection

Conversation

@jmusial

@jmusial jmusial commented Jul 24, 2026

Copy link
Copy Markdown
Contributor

Explanation of Change

Reuse the useVerifyAccountAndResume hook across the MoneyReportHeader pay flows so an unvalidated user's payment action is stored and resumed after they enter their magic code.

Fixed Issues

$ #72980
PROPOSAL:

Tests

Pre requisite:

  1. Log in with a new account and don't verify it with a magic code

Test steps:
2. Create a workspace as admin (via green "+" button)
3. Navigate to the Inbox tab and create an expense
4. Submit 2 expenses under one report
5. Click on the Report
6. Select expenses
7. Click on the 2 selected > Pay [Amount] > Pay with business account
8. Verify that the magic code verification modal slides out.
9. Input the magic code
10. Verify that Add bank account RHP shows after successful verification.

Offline tests

Same as tests

QA Steps

Same as tests

PR Author Checklist

  • I linked the correct issue in the ### Fixed Issues section above
  • I wrote clear testing steps that cover the changes made in this PR
    • I added steps for local testing in the Tests section
    • I added steps for the expected offline behavior in the Offline steps section
    • I added steps for Staging and/or Production testing in the QA steps section
    • I added steps to cover 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 tested this PR with a High Traffic account against the staging or production API to ensure there are no regressions (e.g. long loading states that impact usability).
  • I included screenshots or videos for tests on all platforms
  • I ran the tests on all platforms & verified they passed on:
    • Android: Native
    • Android: mWeb Chrome
    • iOS: Native
    • iOS: mWeb Safari
    • MacOS: Chrome / Safari
  • I verified there are no console errors (if there's a console error not related to the PR, report it or open an issue for it to be fixed)
  • I followed proper code patterns (see Reviewing the code)
    • 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 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)
  • If a new code pattern is added I verified it was agreed to be used by multiple Expensify engineers
  • I followed the guidelines as stated in the Review Guidelines
  • I tested other components that can be impacted by my changes (i.e. if the PR modifies a shared library or component like Avatar, I verified the components using Avatar are working as expected)
  • If 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 new assets were added or existing ones were modified, I verified that:
    • The assets are optimized and compressed (for SVG files, run npm run compress-svg)
    • The assets load correctly across all supported platforms.
  • 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.
  • I added unit tests for any new feature or bug fix in this PR to help automatically prevent regressions in this user 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.

Screenshots/Videos

Android: Native
Screen.Recording.2026-07-23.at.15.06.41.mov
Android: mWeb Chrome
Screen.Recording.2026-07-23.at.15.07.46.mov
iOS: Native
Screen.Recording.2026-07-23.at.15.01.27.mov
iOS: mWeb Safari
Screen.Recording.2026-07-23.at.15.03.08.mov
MacOS: Chrome / Safari
Screen.Recording.2026-07-23.at.14.49.33.mov

@jmusial

jmusial commented Jul 24, 2026

Copy link
Copy Markdown
Contributor Author

@codex review

@chatgpt-codex-connector chatgpt-codex-connector Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 995005a4bb

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

const kycWallRef = useContext(KYCWallContext);

// Store the pending payment and resume it after the user validates, instead of dropping it on the way to the magic-code screen.
const {isUserValidated, verifyAccountAndResume} = useVerifyAccountAndResume((retry) => retry?.());

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

P2 Badge Re-check locks before resuming selection payments

When an unvalidated user starts a selection-mode payment, this resume handler invokes the stored retry directly after magic-code validation. That retry is the press-time closure, so if NVP_PRIVATE_LOCK_ACCOUNT_DETAILS loads late or the account becomes locked while the verify-account screen is open, the resumed flow bypasses shouldBlockAction and confirmPayment does not re-check isAccountLocked, allowing the payment/KYC flow to continue instead of showing the locked-account modal. Please re-run the current non-validation blockers before executing the stored retry.

Useful? React with 👍 / 👎.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Is getting account locked while typing the verification code a realistic scenario ? I'd say no

@codecov

codecov Bot commented Jul 24, 2026

Copy link
Copy Markdown

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 Δ
...aderActions/MoneyReportHeaderSelectionDropdown.tsx 0.89% <0.00%> (-0.01%) ⬇️
.../MoneyRequestReportView/SelectionToolbar/index.tsx 72.27% <0.00%> (-0.73%) ⬇️
src/hooks/useSelectionModeReportActions.ts 92.95% <0.00%> (-1.33%) ⬇️
...eaderActions/MoneyReportHeaderSecondaryActions.tsx 0.66% <0.00%> (-0.01%) ⬇️
src/hooks/useSelectionModePayment.ts 61.11% <28.57%> (-1.75%) ⬇️
... and 353 files with indirect coverage changes

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.

1 participant