Refactor useSelectionMode report actions to use dynamic verify account by jmusial · Pull Request #93715 · Expensify/App

jmusial · 2026-06-16T14:49:34Z

Explanation of Change

Second out fo 4 PR that are originating from #90171. Depends on #93701

This PR migrates MoneyReportHeaderSelectionDropdown to use dynamic verify path.

Fixed Issues

$ #72980
PROPOSAL:

Tests

Repro step:

Create multiple expenses in a report
Go to expense report
Submit and approve
Long press on any expense to enter selection mode
Select all expenses
Tap "x selected" dropdown > Pay > Pay x as a business
Validate your account

Offline tests

QA Steps

Same as tests

PR Author Checklist

Screenshots/Videos

Only affects narrow screens

Android: Native

Screen.Recording.2026-06-16.at.16.28.34.mov

Android: mWeb Chrome

Screen.Recording.2026-06-16.at.16.31.22.mov

iOS: Native

Screen.Recording.2026-06-16.at.16.17.33.mov

iOS: mWeb Safari

Screen.Recording.2026-06-16.at.16.20.18.mov

…ions-to-use-dynamic-verify-account

melvin-bot · 2026-06-22T08:30:35Z

@aimane-chnaif 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]

github-actions · 2026-06-22T08:33:07Z

@@ -292,7 +295,7 @@ function useSelectionModeReportActions({
            return true;


❌ CONSISTENCY-3 (docs)

This replaces the shared handleUnvalidatedAccount(report) utility with an inline Navigation.navigate(createDynamicRoute(DYNAMIC_ROUTES.VERIFY_ACCOUNT.path)) call. That exact line already exists as the fallback branch inside handleUnvalidatedAccount (src/libs/PaymentUtils.ts:210), so the navigation logic is now duplicated in two places. The utility also adds route-context-aware behavior (navigating to SEARCH_MONEY_REQUEST_REPORT_VERIFY_ACCOUNT, SEARCH_REPORT_VERIFY_ACCOUNT, EXPENSE_REPORT_VERIFY_ACCOUNT, or REPORT_VERIFY_ACCOUNT based on the active route) that is lost by inlining only the generic case.

Prefer reusing the existing utility so the verify-account navigation stays in one place and keeps its context-aware routing:

if (!isUserValidated && paymentMethodType !== CONST.IOU.PAYMENT_TYPE.ELSEWHERE) { handleUnvalidatedAccount(report); return true; }

If the intent is specifically to always navigate to the generic verify-account page here, consider exposing that variant from PaymentUtils (e.g. a small helper) rather than re-implementing the Navigation.navigate(createDynamicRoute(...)) call inline.

Reviewed at: c8497c3 | Please rate this suggestion with 👍 or 👎 to help us improve! Reactions are used to monitor reviewer efficiency.

Same as previously : This is 2. out of 4 PRs to get rid of handleUnvalidatedAccount. Cannot get rid of helper logic branches yet as they are reused by other call places. This will happen in following PRs

aimane-chnaif · 2026-06-22T15:05:47Z

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 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 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 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)
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
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 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.
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.mov

Android: mWeb Chrome

iOS: HybridApp

ios.mov

iOS: mWeb Safari

MacOS: Chrome / Safari

web.mov

aimane-chnaif · 2026-06-22T18:56:19Z

        }
        if (!isUserValidated && paymentMethodType !== CONST.IOU.PAYMENT_TYPE.ELSEWHERE) {
-            handleUnvalidatedAccount(report);
+            Navigation.navigate(createDynamicRoute(DYNAMIC_ROUTES.VERIFY_ACCOUNT.path));


ok so as reported before, app freezes on iOS.

ios.mov

Production also has bug but not freezes.

ios-production.mov

@aimane-chnaif can you provide details @ ios version ? I wen't though the same scenario and no freeze on Phone 17 Pro (iOS 26.5) ?

Phone 17 Pro (iOS 26.3)

Is it possible to fix navigation issue happening on production?

Will look into this today

I tested on real iPhone device. App freezes on magic code input page.
Confirmed no happening on main.

Aslo the prod bug only appears if you get there from Inbox. The spend path is ok

@mountiny could we get ios ad hoc build here please ?

I see you tested on Spend tab. Can you try on Inbox tab?

Screen.Recording.2026-06-23.at.15.44.09.mov

I see the "back" bug (looking into it now) but no crash

ok @aimane-chnaif I think I found the back bug culprit. Could you test w/ last commit ?

joekaufmanexpensify · 2026-06-22T21:30:53Z

No product review needed

aimane-chnaif · 2026-06-23T13:23:38Z

@mountiny Can we ask QA team to test adhoc build on iPhone?

Tests steps:

Create new account
Create new workspace
Go to Inbox > workspace chat
Create multiple expenses in a report
Go to expense report
Submit and approve
Long press on any expense to enter selection mode
Select all expenses
Tap "x selected" dropdown > Pay > Pay x as a business
Validate your account
Verify that app doesn't freeze

codecov · 2026-06-23T14:12:41Z

Codecov Report

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

Files with missing lines	Coverage Δ
src/hooks/useSelectionModeReportActions.ts	`85.96% <ø> (ø)`
src/pages/settings/DynamicVerifyAccountPage.tsx	`0.00% <ø> (ø)`
... and 88 files with indirect coverage changes

aimane-chnaif · 2026-06-23T16:01:33Z

+    // else if (!forwardPath) {
+    //     forwardPath = backPath;
+    // }


This seems to fix both issues (freeze and back button loop).
We should understand why this fallback was added in the first place and make sure removing it doesn't cause any regressions.
Originally added in #89608.
@collectioneur was this added on purpose?

We can remove this part, since it defaults to backPath anyway. Navigation.navigate(forwardPath) with forceReplace: true used to behave differently before we introduced TabNavigator and my changes to the dynamic routing logic, but it looks like it's just dead code that introduces bugs now, so it’s safe to remove 🙂

Thanks. @jmusial let's remove it and fix conflict

Thx @collectioneur

all yours @aimane-chnaif

…ions-to-use-dynamic-verify-account

github-actions · 2026-06-24T14:29:44Z

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

OSBotify · 2026-06-24T14:31: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-06-24T14:35:22Z

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

Android 🤖	iOS 🍎
https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-android-Adhoc-abb2cfcaed6-57159c0-5a9e76122b95d83b8b99ace3a4818f116865c2e5/index.html	https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-ios-device-AdHoc-abb2cfc-57159c0-073d51066a054ca58ac09171829a6115cf40bdc0/index.html

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

👀 View the workflow run that generated this build 👀

OSBotify · 2026-06-24T19:39:36Z

🚀 Deployed to staging by https://github.com/mountiny in version: 9.4.19-1 🚀

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

Bundle Size Analysis (Sentry):

Android
iOS

MelvinBot · 2026-06-24T19:41:29Z

🤖 No help site changes required.

This PR is an internal code refactor with no user-facing impact, so no updates are needed to the help site files under docs/articles.

Why

The diff touches two files and makes no behavioral, label, or copy changes:

src/hooks/useSelectionModeReportActions.ts — swaps handleUnvalidatedAccount(report) for Navigation.navigate(createDynamicRoute(DYNAMIC_ROUTES.VERIFY_ACCOUNT.path)), migrating the unvalidated-account flow to the dynamic verify-account route.
src/pages/settings/DynamicVerifyAccountPage.tsx — removes a forwardPath = backPath fallback branch.

There are no new features, no changed UI labels/tabs/settings, and no src/languages/* edits. The account-verification flow looks identical to users — only the internal navigation mechanism changed. Help site articles document user-facing product behavior, so there's nothing to document here.

Since no documentation changes are needed, I have not created a draft PR. If you believe a help site update is warranted, let me know what behavior changed and I'll create one.

@jmusial, please confirm you agree no help site changes are required here.

OSBotify · 2026-06-25T21:30:07Z

🚀 Deployed to production by https://github.com/blimpich in version: 9.4.19-5 🚀

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

Refactor useSelectionModeReportActions to use dynamic verify path

5ea9274

melvin-bot Bot assigned jmusial Jun 16, 2026

jmusial mentioned this pull request Jun 16, 2026

[HOLD] Refactor payment util to use dynamic verify account #90171

Closed

50 tasks done

jmusial changed the title ~~Chore/refactor use selection mode report actions to use dynamic verify account~~ Refactor use selection mode report actions to use dynamic verify account Jun 22, 2026

Merge branch 'main' into chore/refactor-use-selection-mode-report-act…

c8497c3

…ions-to-use-dynamic-verify-account

jmusial marked this pull request as ready for review June 22, 2026 08:30

jmusial requested review from a team as code owners June 22, 2026 08:30

melvin-bot Bot requested review from aimane-chnaif and joekaufmanexpensify and removed request for a team June 22, 2026 08:30

melvin-bot Bot removed the request for review from a team June 22, 2026 08:30

github-actions Bot reviewed Jun 22, 2026

View reviewed changes

jmusial changed the title ~~Refactor use selection mode report actions to use dynamic verify account~~ Refactor useSelectionMode report actions to use dynamic verify account Jun 22, 2026

jmusial mentioned this pull request Jun 22, 2026

Refactor settlement button to use dynamic verify account #94177

Merged

41 tasks done

aimane-chnaif reviewed Jun 22, 2026

View reviewed changes

joekaufmanexpensify removed their request for review June 22, 2026 21:31

test fix backto bug

57743e5

aimane-chnaif reviewed Jun 23, 2026

View reviewed changes

jmusial added 2 commits June 24, 2026 16:05

remove forwardPath=backPath fallback

88f4f5c

Merge branch 'main' into chore/refactor-use-selection-mode-report-act…

229213f

…ions-to-use-dynamic-verify-account

aimane-chnaif approved these changes Jun 24, 2026

View reviewed changes

melvin-bot Bot requested a review from mountiny June 24, 2026 14:08

mountiny approved these changes Jun 24, 2026

View reviewed changes

mountiny merged commit abb2cfc into Expensify:main Jun 24, 2026
35 checks passed

OSBotify mentioned this pull request Jun 24, 2026

Deploy Checklist: New Expensify 2026-06-24 #94490

Closed

69 tasks done

jmusial mentioned this pull request Jun 25, 2026

Refactor money report header secondary actions to use dynamic verify account #94594

Merged

41 tasks done

melvin-bot Bot mentioned this pull request Jun 25, 2026

[Due for payment 2026-08-12] Providing magic code during verification navigates back instead of continuing forward in flow #72980

Closed

3 of 16 tasks

		@@ -292,7 +295,7 @@ function useSelectionModeReportActions({
		return true;

Conversation

jmusial commented Jun 16, 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!

melvin-bot Bot commented Jun 22, 2026

Uh oh!

github-actions Bot Jun 22, 2026

Choose a reason for hiding this comment

❌ CONSISTENCY-3 (docs)

Uh oh!

Choose a reason for hiding this comment

Uh oh!

aimane-chnaif commented Jun 22, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

joekaufmanexpensify commented Jun 22, 2026

Uh oh!

aimane-chnaif commented Jun 23, 2026

Uh oh!

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

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

github-actions Bot commented Jun 24, 2026

Uh oh!

OSBotify commented Jun 24, 2026

Uh oh!

github-actions Bot commented Jun 24, 2026

Uh oh!

OSBotify commented Jun 24, 2026

Uh oh!

MelvinBot commented Jun 24, 2026

Uh oh!

OSBotify commented Jun 25, 2026

Uh oh!

Reviewers

Uh oh!

Assignees

Labels

Projects

jmusial commented Jun 16, 2026 •

edited

Loading

aimane-chnaif commented Jun 22, 2026 •

edited

Loading

codecov Bot commented Jun 23, 2026 •

edited by github-actions Bot

Loading