Skip to content

Add selection mode Submit/Approve/Pay actions for mobile layout.#85796

Merged
puneetlath merged 40 commits intoExpensify:mainfrom
Krishna2323:krishna2323/issue/72502-3
Apr 9, 2026
Merged

Add selection mode Submit/Approve/Pay actions for mobile layout.#85796
puneetlath merged 40 commits intoExpensify:mainfrom
Krishna2323:krishna2323/issue/72502-3

Conversation

@Krishna2323
Copy link
Copy Markdown
Contributor

@Krishna2323 Krishna2323 commented Mar 19, 2026

Explanation of Change

Fixed Issues

$ #72502
PROPOSAL:

Tests

  • Same as QA Steps

  • Verify that no errors appear in the JS console

Offline tests

  • Same as QA Steps

QA Steps

1. Submit action via selection mode (Mobile)

  1. Open the app in a narrow/mobile viewport (or on a mobile device)
  2. Open an expense report where the primary action is "Submit"
  3. Long-press an expense to enter selection mode
  4. Select all expenses using the checkboxes
  5. Verify the "X selected" dropdown appears at the top of the expense list (inside MoneyRequestReportActionsList)
  6. Open the dropdown — verify "Submit" appears at the top
  7. Click "Submit"
  8. Verify the report is submitted, selections are cleared, and selection mode exits

2. Approve action via selection mode (Mobile)

  1. Open the app in a narrow/mobile viewport
  2. Open a submitted expense report as an approver
  3. Long-press an expense to enter selection mode, then select all expenses
  4. Open the "X selected" dropdown — verify "Approve" appears at the top
  5. Click "Approve"
  6. Verify the report is approved and selections are cleared

3. Pay action via selection mode (Mobile)

  1. Open the app in a narrow/mobile viewport
  2. Open an approved expense report ready to be paid
  3. Long-press an expense to enter selection mode, then select all expenses
  4. Verify the "X selected" dropdown renders as a KYC-integrated dropdown (not a plain button)
  5. Open the dropdown — verify "Pay $X.XX" appears with a right arrow and payment method submenu items
  6. Click "Pay $X.XX" — verify a submenu opens with payment methods
  7. Select "Pay elsewhere"
  8. Verify payment processes, selections are cleared, and "You're all set!" RHP does not open
  9. Verify Pay is no longer shown in the dropdown

4. Approve with delegate restriction (Mobile)

  1. Open the app in a narrow/mobile viewport
  2. Log in as a delegate with restricted access
  3. Open a submitted expense report
  4. Long-press to enter selection mode, select all expenses
  5. Open the "X selected" dropdown and click "Approve"
  6. Verify the "no access" modal appears
  7. Dismiss the modal
  8. Verify selections are still active (not cleared)

5. Approve with held expenses (Mobile)

  1. Open the app in a narrow/mobile viewport
  2. Open a submitted expense report where some expenses are on hold
  3. Long-press to enter selection mode, select all expenses
  4. Open the "X selected" dropdown and click "Approve"
  5. Verify the hold menu appears
  6. Verify selections are cleared after confirming

6. Pay as business (Mobile)

  1. Open the app in a narrow/mobile viewport
  2. Open an approved expense report, long-press to enter selection mode, select all expenses
  3. Open Pay submenu, select "Pay as business" (if available)
  4. Verify payment processes without the "You're all set!" RHP opening
  5. Verify selections are cleared

7. Partial selection — no report-level actions (Mobile)

  1. Open the app in a narrow/mobile viewport
  2. Open an expense report with 3+ expenses
  3. Long-press to enter selection mode, select only some (not all) expenses
  4. Open the "X selected" dropdown
  5. Verify Submit/Approve/Pay do not appear — only transaction-level actions
  6. Verify the dropdown renders as a plain ButtonWithDropdownMenu (not the KYC dropdown)

8. KYC dropdown vs plain dropdown rendering (Mobile-specific)

  1. Open the app in a narrow/mobile viewport
  2. Open an approved expense report (Pay action available)
  3. Long-press to enter selection mode, select all expenses
  4. Verify the dropdown renders as MoneyReportHeaderKYCDropdown (KYC-integrated)
  5. Deselect one expense so not all are selected
  6. Verify the dropdown switches back to a plain ButtonWithDropdownMenu
  7. Re-select all expenses — verify it switches back to the KYC dropdown

9. Offline behavior (Mobile)

  1. Open the app in a narrow/mobile viewport
  2. Go offline
  3. Open an expense report, long-press to enter selection mode, select all expenses
  4. Verify Submit/Approve appear and can be clicked
  5. Verify Pay does appear

10. Submit blocked by policy rules (Mobile)

  1. Open the app in a narrow/mobile viewport
  2. Open an expense report where preventSelfApproval is enabled and the submitter is the next approver
  3. Enter selection mode, select all expenses
  4. Open the "X selected" dropdown
  5. Verify Submit does not appear in the dropdown
  • Verify that no errors appear in the JS console

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
    • MacOS: Desktop
  • 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 verified there are no new alerts related to the canBeMissing param for useOnyx
  • I followed proper code patterns (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
      • If any non-english text was added/modified, I used JaimeGPT to get English > Spanish translation. I then posted it in #expensify-open-source and it was approved by an internal Expensify engineer. Link to Slack message:
    • 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 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)
  • 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
  • I verified that if a function's arguments changed that all usages have also been updated correctly
  • 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 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.
  • 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.
  • 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
android_native.mp4
Android: mWeb Chrome
test_1-2-3.mp4
test_4.1.mp4
test_4.mp4
test_5.mp4
test_6.mp4
test_8.mp4
test_9.mp4
test_10.mp4
iOS: Native
ios_native.mp4
iOS: mWeb Safari
ios_safari.mp4
MacOS: Chrome / Safari
web_chrome.mp4

@codecov
Copy link
Copy Markdown

codecov bot commented Mar 19, 2026

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 Δ
src/components/MoneyReportHeaderKYCDropdown.tsx 0.00% <ø> (ø)
src/components/MoneyReportHeader.tsx 0.00% <0.00%> (ø)
...equestReportView/MoneyRequestReportActionsList.tsx 59.45% <46.15%> (-0.44%) ⬇️
src/hooks/useSelectionModeReportActions.ts 82.10% <82.10%> (ø)
... and 13 files with indirect coverage changes

…2502-3

Made-with: Cursor

# Conflicts:
#	src/components/MoneyRequestReportView/MoneyRequestReportActionsList.tsx
Signed-off-by: krishna2323 <[email protected]>
@Krishna2323 Krishna2323 marked this pull request as ready for review March 23, 2026 19:32
@Krishna2323 Krishna2323 requested review from a team as code owners March 23, 2026 19:32
@melvin-bot melvin-bot bot requested review from situchan and removed request for a team March 23, 2026 19:32
@melvin-bot
Copy link
Copy Markdown

melvin-bot bot commented Mar 23, 2026

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

@melvin-bot melvin-bot bot requested review from JmillsExpensify and removed request for a team March 23, 2026 19:32
Copy link
Copy Markdown

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

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: b74539f3f8

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

@MelvinBot
Copy link
Copy Markdown
Contributor

Code Review

CI Status

  • checklist: Failing (ignorable — PR Author/Reviewer Checklist)
  • test (job 2): Failing — related to this PR (see below)
  • All other checks pass (ESLint, TypeScript, Prettier, perf-tests, etc.)

Failing Test

The test useSelectionModeReportActions > hasPayInSelectionMode > returns true when all expenses selected and pay action exists fails because usePaymentOptions is mocked to return [], but the hook now additionally checks hasActualPaymentOptions:

const hasActualPaymentOptions = paymentButtonOptions.some((opt) =>
    Object.values(CONST.IOU.PAYMENT_TYPE).some((type) => type === opt.value)
);
const hasPayInSelectionMode = allExpensesSelected && hasPayAction && hasActualPaymentOptions;

Since the mock returns an empty array, hasActualPaymentOptions is always false, causing the assertion to fail. The usePaymentOptions mock in the test needs to return at least one option with a valid CONST.IOU.PAYMENT_TYPE value (e.g., ELSEWHERE) when testing the pay scenario.

Code Observations

1. Logic duplication between useSelectionModeReportActions and MoneyReportHeader

The new hook (src/hooks/useSelectionModeReportActions.ts, 720 lines) duplicates substantial logic already present in MoneyReportHeader.tsx — including selectionModeReportLevelActions, confirmPayment, confirmApproval, handleSubmitReport, buildPaymentSubMenuItems, and all the associated state/guards. Both MoneyReportHeader and MoneyRequestReportActionsList now independently compute these actions with their own Onyx subscriptions.

Ideally, MoneyReportHeader should also consume the extracted hook to avoid drift between two parallel implementations. As-is, any future changes to Submit/Approve/Pay selection mode logic need to be updated in two places.

2. Heavy Onyx subscription load

The hook creates ~20 useOnyx subscriptions (session, account, transaction violations, next step, amount owed, billing grace periods, bank accounts, policies, outstanding reports, betas, intro, onboarding tour, network status, active policy, invoice receiver policy). All of these become active whenever MoneyRequestReportActionsList mounts. Consider whether some of these could be passed as parameters from the parent (which already has some of these values) instead of subscribing independently.

3. hasActualPaymentOptions is computed in two places

The same check paymentButtonOptions.some((opt) => Object.values(CONST.IOU.PAYMENT_TYPE).some((type) => type === opt.value)) now appears in both MoneyReportHeader.tsx:2329 and useSelectionModeReportActions.ts:604. This is another duplication point that could drift.

4. Minor: shouldPopoverUseScrollView change in MoneyReportHeaderKYCDropdown.tsx

The change from applicableSecondaryActions.length >= CONST.DROPDOWN_SCROLL_THRESHOLD to shouldPopoverUseScrollView(applicableSecondaryActions) is a good consistency improvement — the utility function also checks for large subMenuItems arrays, which the inline check missed.

Summary

The overall approach of extracting selection mode logic into a reusable hook for mobile narrow layout is sound. The main concerns are:

  1. Fix the failing test by updating the usePaymentOptions mock to return payment options with valid payment types
  2. Consider having MoneyReportHeader consume the hook to eliminate the duplication
  3. Consider reducing Onyx subscriptions by passing shared data from the parent component

@situchan
Copy link
Copy Markdown
Contributor

Please address AI reviews and still add production gate (both web and mobile) to avoid revert.

Copy link
Copy Markdown

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

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: 7ede93d634

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

@JmillsExpensify
Copy link
Copy Markdown
Contributor

Kicked off an adhoc. I'll have to come back to this one.

@github-actions
Copy link
Copy Markdown
Contributor

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

@github-actions

This comment has been minimized.

@Krishna2323
Copy link
Copy Markdown
Contributor Author

  • Completely remove beta check
  • If deploy blockers found, patch quickly. If not quick fix, just CP production gate or beta (not needing to revert entire code)

I think it's better. Removed the beta gate.

@puneetlath
Copy link
Copy Markdown
Contributor

@puneetlath friendly bump!

Sorry, what am I being bumped on? Is this ready for me to review?

@puneetlath Please note that the isProduction gate has been removed from the desktop version, and on mobile, we have a beta check. I hope that's fine? Or should we also add a beta check on desktop, or completely remove the beta check from mobile and handle regressions if any?

I think no beta is ideal. Any particular reason why we need it here?

@Krishna2323
Copy link
Copy Markdown
Contributor Author

@MelvinBot check the last commit and confirm that the conflict was resolved correctly—it was a bit complex.

@Krishna2323
Copy link
Copy Markdown
Contributor Author

Is this ready for me to review?

yes

@MelvinBot
Copy link
Copy Markdown
Contributor

The merge conflict resolution in the last commit (58d51b6) looks correct. Here's a summary:

Files with conflicts: MoneyReportHeader.tsx and MoneyRequestReportActionsList.tsx

What was merged:

  • From main: BulkDuplicateHandler component, duplicate-related fields (isDuplicateOptionVisible, setDuplicateHandler, allTransactions, allReports) in useSelectedTransactionsActions
  • From this PR: Selection mode Submit/Approve/Pay actions, MoneyReportHeaderKYCDropdown, ProcessMoneyReportHoldMenu, useSelectionModeReportActions hook, handleDeleteTransactions

Verified:

  • No leftover conflict markers (<<<<<<, >>>>>>, =======)
  • No duplicate imports (apparent duplicates are standard type vs value imports)
  • useSelectedTransactionsActions hook destructuring correctly includes all fields from both sides
  • JSX nesting is correct — Fragment wraps BulkDuplicateHandler + View with selection mode changes
  • BulkDuplicateHandler receives all required props in both files
  • All variables referenced in merged code are properly sourced from their hooks

No issues found — the resolution correctly preserves both the PR's selection mode payment actions and main's bulk duplicate handling.

puneetlath
puneetlath previously approved these changes Apr 9, 2026
@puneetlath puneetlath merged commit c50c2fd into Expensify:main Apr 9, 2026
32 checks passed
@github-actions
Copy link
Copy Markdown
Contributor

github-actions bot commented Apr 9, 2026

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

@OSBotify
Copy link
Copy Markdown
Contributor

OSBotify commented Apr 9, 2026

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

Comment on lines +269 to +271
if (!isUserValidated) {
handleUnvalidatedAccount(report);
return true;
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

@MelvinBot This should return true only when payment type is NOT Elsewhere.
The behavior recently changed in #86714 which was merged 3 hrs ago.
As our PR was merged later, can you create followup PR?

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Created followup PR: #87536

The fix adds an optional paymentMethodType parameter to shouldBlockAction and skips the isUserValidated check when the payment type is ELSEWHERE, matching the behavior from #86714. Also added unit tests for both cases.

Please mark it as "Ready for review" when it is ready.

@OSBotify
Copy link
Copy Markdown
Contributor

🚀 Deployed to staging by https://github.com/puneetlath in version: 9.3.58-0 🚀

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

Bundle Size Analysis (Sentry):

@MelvinBot
Copy link
Copy Markdown
Contributor

I reviewed the changes in this PR against the help site articles under App/docs/articles.

Finding: The article Getting-Started-with-the-Reports-Page.md lists bulk actions available when selecting expenses (Move, Download, Hold, Delete) but does not mention Submit, Approve, or Pay — which this PR now ships to production via the mobile selection mode dropdown.

Help site PR created: #87570

The update adds a note explaining that when all expenses are selected on mobile, the bulk action menu also includes report-level actions (Submit, Approve, Pay) depending on report status and role.

@jponikarchuk
Copy link
Copy Markdown

Deploy Blocker #87644 was identified to be related to this PR.

@jponikarchuk
Copy link
Copy Markdown

This PR failing because of the issue #87644
This issue is reproducible in: Android

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.

8 participants