decompose MoneyReportHeader secondary actions by TMisiukiewicz · Pull Request #88304 · Expensify/App

TMisiukiewicz · 2026-04-20T07:27:51Z

Explanation of Change

MoneyReportHeader had grown to ~2448 lines, mixing rendering logic with business logic for hold menus, primary actions, expense actions, and selection mode. This PR extracts that logic into focused hooks and components:

useReportPrimaryAction — replaces the inline primary action derivation; removes animation knowledge from getReportPrimaryAction which now returns a plain value
useExpenseActions — owns all secondary expense action callbacks (hold, unhold, etc.); receives isReportInSearch as a prop instead of hardcoding false
useTransactionThreadReport — fetches the transaction thread report internally via useOnyx instead of requiring callers to pass it down
ActionsBar — renders sub-components directly; no longer accepts ReactNode props, eliminating the pattern that forced parent re-renders
MoneyReportHeaderHoldMenu — extracted with an early-return guard so the heavy hold menu tree is never evaluated unless needed
Dead code removed: isSelectionModePaymentRef, unused selectedTransactionIDs, and the clearSelectedTransactions callback that was duplicated in the wrong scope

The net result is MoneyReportHeader going from ~2448 lines to ~298 lines, with action logic owned by the hooks that have the right data access.

Fixed Issues

$ #87937
PROPOSAL:

Tests

Open expense report with single transaction
Press "More" dropdown
Verify the dropdown opened
Tap each action and verify it works, including:

Export sub-menu opens
Download PDF - modal opens

Go to Search
Select multiple expenses from same report
Verify selection dropdown appears with correct actions

Precondition:
Disable Approvals and Payments in Workflows settings.

Go to workspace chat.
Create an expense.
Click Submit.
Open the report.
In the console, run Onyx.merge("report_{reportID}", {isExportedToIntegration: true})
Click More > Retract.
Verify the retraction modal appeared

Verify that no errors appear in the JS console

Offline tests

N/A

QA Steps

Open expense report with single transaction
Press "More" dropdown
Verify the dropdown opened
Tap each action and verify it works, including:

Export sub-menu opens
Download PDF - modal opens

Go to Search
Select multiple expenses from same report
Verify selection dropdown appears with correct actions

Precondition:

Workspace is connected to Sage Intacct.
Disable Approvals and Payments in Workflows settings.

Go to workspace chat.
Create an expense.
Click Submit.
Open the report.
Click More > Export > Mark as exported.
Click More > Retract.

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

Android: mWeb Chrome

iOS: Native

ios.mov

iOS: mWeb Safari

MacOS: Chrome / Safari

web.mov

…1-perf/extract-money-report-header-actions" This reverts commit 06e4e74, reversing changes made to 19d70c2.

melvin-bot · 2026-04-20T07:27:58Z

@abzokhattab 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 · 2026-04-20T07:28:03Z

@rlinoz 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-04-20T07:36:02Z

Codecov Report

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

Files with missing lines	Coverage Δ
...ReportHeaderPrimaryAction/ApprovePrimaryAction.tsx	`0.00% <ø> (ø)`
...oneyReportHeaderPrimaryAction/PayPrimaryAction.tsx	`0.00% <ø> (ø)`
...yReportHeaderPrimaryAction/SubmitPrimaryAction.tsx	`0.00% <ø> (ø)`
src/libs/PaymentUtils.ts	`79.64% <100.00%> (+0.18%)`	⬆️
src/libs/ReportPrimaryActionUtils.ts	`92.69% <ø> (+0.76%)`	⬆️
src/components/MoneyReportHeaderKYCDropdown.tsx	`0.00% <0.00%> (ø)`
...omponents/MoneyReportHeaderPrimaryAction/index.tsx	`5.55% <0.00%> (ø)`
src/components/PaymentAnimationsContext.tsx	`25.00% <25.00%> (ø)`
src/hooks/useTransactionThreadReport.ts	`0.00% <0.00%> (ø)`
src/components/MoneyReportHeader.tsx	`0.00% <0.00%> (ø)`
... and 8 more
... and 55 files with indirect coverage changes

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: e92c41b8e1

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

abzokhattab · 2026-04-20T10:08:54Z

+                ownerBillingGracePeriodEnd,
+                methodID: type === CONST.IOU.PAYMENT_TYPE.VBBA ? methodID : undefined,
+                onPaid: () => {
+                    startAnimation();


I think we might have discussed it before, but I see that the guard on animation was removed

Should we bring it back?

onPaid: () => { if (isFromSelectionMode) { return; } // ← guard removed in new code startAnimation(); },

this is the selection-mode path only, so isFromSelectionMode would always be true here

abzokhattab · 2026-04-20T10:10:50Z

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 there are no new alerts related to the canBeMissing param for useOnyx
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 shown in the product is localized by adding it to src/languages/* files and using the translation method
- 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 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)
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
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.
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.
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

Screen.Recording.2026-04-13.at.23.23.09.mov

Android: mWeb Chrome

Screen.Recording.2026-04-13.at.23.29.37.mov

iOS: HybridApp

Screen.Recording.2026-04-13.at.23.25.50.mov

iOS: mWeb Safari

Screen.Recording.2026-04-13.at.23.28.05.mov

MacOS: Chrome / Safari

Screen.Recording.2026-04-13.at.23.17.58.mov

abzokhattab

Added a small comment but overall it looks good to me

This reverts commit d7c15ac.

github-actions · 2026-04-20T11:52:05Z

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

github-actions · 2026-04-20T11:57:18Z

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

Android 🤖	iOS 🍎
https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-android-Adhoc-88432c3-f81070b-c987c6d8e7fb23dbb3722fd169fbefb4274c18c9/index.html	https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-ios-device-AdHoc-88432c3-f81070b-c02656508e2c181dd12c2832109c557a9e790d7c/index.html

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

👀 View the workflow run that generated this build 👀

OSBotify · 2026-04-20T12:00:28Z

✋ 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-04-21T11:43:56Z

🚀 Deployed to staging by https://github.com/rlinoz in version: 9.3.61-0 🚀

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

Bundle Size Analysis (Sentry):

Android
iOS

MelvinBot · 2026-04-21T11:45:13Z

No help site changes are required for this PR.

This is a purely internal refactor that decomposes MoneyReportHeader into smaller hooks and components. No user-facing behavior, UI labels, or workflows were changed. The existing help site articles that reference primary/secondary actions (e.g., Expense-and-Report-Actions.md) describe user-facing concepts that remain unchanged.

OSBotify · 2026-04-23T20:02:33Z

🚀 Deployed to production by https://github.com/marcaaron in version: 9.3.61-4 🚀

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

TMisiukiewicz added 2 commits April 20, 2026 08:50

Revert "Merge pull request Expensify#88105 from Expensify/revert-8736…

99b876a

…1-perf/extract-money-report-header-actions" This reverts commit 06e4e74, reversing changes made to 19d70c2.

fix retracting the expense

e92c41b

TMisiukiewicz requested review from a team as code owners April 20, 2026 07:27

melvin-bot Bot assigned TMisiukiewicz Apr 20, 2026

melvin-bot Bot requested review from JmillsExpensify and abzokhattab and removed request for a team April 20, 2026 07:27

melvin-bot Bot requested review from a team and rlinoz and removed request for a team April 20, 2026 07:27

melvin-bot Bot removed the request for review from a team April 20, 2026 07:28

chatgpt-codex-connector Bot reviewed Apr 20, 2026

View reviewed changes

Comment thread src/hooks/useReportPrimaryAction.ts

TMisiukiewicz added 2 commits April 20, 2026 10:24

fix(react-compiler): tag workspace-policy PAY sub-items with policy data

0e531e7

fix(react-compiler): expose triggerKYCFlow via onWorkspacePolicySelect

a233517

TMisiukiewicz force-pushed the perf/secondary-actions-v2 branch from 820676c to a233517 Compare April 20, 2026 09:18

fix: guard personal-policy expense reports before animation override

832dcdb

abzokhattab reviewed Apr 20, 2026

View reviewed changes

abzokhattab approved these changes Apr 20, 2026

View reviewed changes

TMisiukiewicz added 2 commits April 20, 2026 13:04

skip paid animation in selection mode

d7c15ac

Revert "skip paid animation in selection mode"

8745116

This reverts commit d7c15ac.

rlinoz approved these changes Apr 20, 2026

View reviewed changes

rlinoz merged commit 88432c3 into Expensify:main Apr 20, 2026
33 checks passed

OSBotify mentioned this pull request Apr 21, 2026

Deploy Checklist: New Expensify 2026-04-21 #88394

Closed

melvin-bot Bot mentioned this pull request Apr 23, 2026

[Due for payment 2026-04-30] [Due for payment 2026-04-28] [$250] Refactor: extract MoneyReportHeader actions into hooks and components #87937

Closed

Uh oh!

Conversation

TMisiukiewicz commented Apr 20, 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 Apr 20, 2026

Uh oh!

melvin-bot Bot commented Apr 20, 2026

Uh oh!

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

Uh oh!

abzokhattab Apr 20, 2026

Choose a reason for hiding this comment

Uh oh!

TMisiukiewicz Apr 20, 2026

Choose a reason for hiding this comment

Uh oh!

abzokhattab commented Apr 20, 2026

Reviewer Checklist

Screenshots/Videos

Uh oh!

abzokhattab left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

github-actions Bot commented Apr 20, 2026

Uh oh!

github-actions Bot commented Apr 20, 2026

Uh oh!

OSBotify commented Apr 20, 2026

Uh oh!

OSBotify commented Apr 21, 2026

Uh oh!

MelvinBot commented Apr 21, 2026

Uh oh!

OSBotify commented Apr 23, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

TMisiukiewicz commented Apr 20, 2026 •

edited

Loading

codecov Bot commented Apr 20, 2026 •

edited by github-actions Bot

Loading