ReportActionCompose 5/6: extract attachment hooks by adhorodyski · Pull Request #88391 · Expensify/App

adhorodyski · 2026-04-21T10:49:31Z

Explanation of Change

PR 5/6 in the ReportActionCompose decomposition series (issue #87097).

Extracts the entire attachment + DropZone subsystem from the orchestrator into 3 self-contained hooks and 1 compound component. Replaces the monolithic 220-LOC useAttachmentUploadValidation with:

useShouldAddOrReplaceReceipt (42 LOC) — pure derivation; resolves {shouldAddOrReplaceReceipt, transactionID} for receipt edit gating.
useAttachmentPicker (100 LOC) — file pick / clean / validate / preview modal lifecycle. Calls clearComposer() from ComposerActions context after the user confirms.
useReceiptDrop (120 LOC) — receipt drop → replaceReceipt or initMoneyRequest + draft transactions + navigation. Owns ~10 Onyx subscriptions that only fire for receipt drops.
ComposerDropZone (164 LOC) — two-level drop UI. Rooms/groups/invoices hit SimpleDropZone (cheap, no extra subs); everything else hits RichDropZone which derives shouldDisplayDualDropZone and mounts DualDropZone vs DragAndDropConsumer+DropZoneUI.

Each of the three callsites (ComposerActionMenu, ComposerInput, ComposerDropZone) now calls useAttachmentPicker(reportID) directly — no more onAttachmentPicked / onPasteFile prop threading. Each callsite gets its own useFilesValidation instance; only the active flow fires validation UI, inactive instances render null.

Orchestrator: 220 → 69 LOC. The attachment derivation block, all related Onyx subscriptions, the DropZone render, and the validation plumbing are gone. ReportActionCompose.tsx is now pure composition: <ComposerLocalTime>, <ComposerDropZone> wrapping <ComposerBox> with its 4 children (ActionMenu, Input, EmojiPicker, SendButton), and <ComposerFooter>.

Deleted: useAttachmentUploadValidation.ts (-220 LOC) — fully replaced.

After this PR, only PR 6 remains (Suggestions self-subscribe + manual memo cleanup — independent of this PR).

💡 Review with Hide whitespace.

Fixed Issues

$ #87097
PROPOSAL:

Tests

Critical — attachment picker

+ menu → pick image → caption → send → message posts with attachment + caption. Composer clears.
+ menu → pick PDF → PDF validation preview appears → confirm → attachment modal shows → send.
+ menu → pick invalid file (e.g. too large) → ErrorModal appears with correct copy.
Paste image into composer → attachment preview modal opens → add caption → send.
Paste PDF → PDF validation preview → confirm → modal opens.
Open attachment preview modal → dismiss without sending → composer refocuses, no attachment sent, no stale state.
With message being composed, open + menu → pick file → preview modal opens; message text preserved until send.

Critical — drop zone

Drop image on a DM composer → attachment preview modal opens.
Drop image on a workspace chat composer (not transaction thread) → dual drop zone appears with "Add attachment" + "Create expense" → drop in attachment half → attachment preview.
Drop image on same workspace chat → drop in "Create expense" half → navigates to money request confirmation flow.
Drop receipt on a single transaction thread (has receipt) → replace receipt flow (dual zone shows "Replace receipt"); confirm.
Drop receipt on a single transaction thread (no receipt) → dual zone "Add receipt"; drop → receipt attached.
Drop file on a public room / group chat / invoice chat → simple drop zone only (no "Create expense" half); file pick modal opens.

Regression — behavior preservation

Type + Enter to send → works (PR 4 territory, smoke check).
Arrow-up edit shortcut → still works.
Emoji picker → opens from composer, selection inserts.
Composer full-size toggle → opens and collapses cleanly.
Navigate between chats → attachment state resets per room; no stale preview or error modal.
Send button disabled state → disabled when empty, blocked-from-concierge, or exceeded max length.

Smoke

No JS console errors throughout.
Verify no visual regressions on the composer layout (DropZone overlay positions correctly, + menu placement unchanged).

Verify that no errors appear in the JS console

Offline tests

Offline → + menu pick file → send → message queues with attachment, reconnect → syncs.
Offline → drop receipt on transaction thread → replace → replacement queues, reconnect → syncs.

QA Steps

Same as tests

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

codecov · 2026-04-21T10:57:50Z

Codecov Report

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

Files with missing lines	Coverage Δ
...ox/report/ReportActionCompose/ComposerDropZone.tsx	`100.00% <100.00%> (ø)`
...inbox/report/ReportActionCompose/ComposerInput.tsx	`95.23% <100.00%> (+0.50%)`	⬆️
...ox/report/ReportActionCompose/ComposerProvider.tsx	`80.95% <ø> (ø)`
...report/ReportActionCompose/ReportActionCompose.tsx	`100.00% <100.00%> (+10.20%)`	⬆️
...eportActionCompose/useShouldAddOrReplaceReceipt.ts	`100.00% <100.00%> (ø)`
.../report/ReportActionCompose/ComposerActionMenu.tsx	`90.00% <80.00%> (+2.50%)`	⬆️
...inbox/report/ReportActionCompose/useReceiptDrop.ts	`31.25% <31.25%> (ø)`
.../report/ReportActionCompose/useAttachmentPicker.ts	`27.77% <27.77%> (ø)`
... and 9 files with indirect coverage changes

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

adhorodyski · 2026-04-21T11:35:49Z

@codex review

chatgpt-codex-connector · 2026-04-21T11:49:11Z

Codex Review: Didn't find any major issues. Chef's kiss.

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

melvin-bot · 2026-04-21T12:24:36Z

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

trjExpensify · 2026-04-22T01:35:57Z

PR doesn’t need product input as a refactor PR. Unassigning and unsubscribing myself.

…attachment-hooks

…hooks

DylanDylann · 2026-04-23T09:20:57Z

+                {ReceiptPDFValidation}
+                {ReceiptErrorModal}


This looks unnecesary,

valid, removing

DylanDylann · 2026-04-23T09:34:26Z

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
- MacOS: Desktop
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

Android: mWeb Chrome

Screen.Recording.2026-04-23.at.16.38.33.mov

iOS: HybridApp

Screen.Recording.2026-04-24.at.21.22.41.mov

iOS: mWeb Safari

Screen.Recording.2026-04-23.at.16.37.34.mov

MacOS: Chrome / Safari

Screen.Recording.2026-04-23.at.16.31.11.mov

Screen.Recording.2026-04-23.at.16.32.53.mov

DylanDylann · 2026-04-23T09:36:02Z

@adhorodyski One comment, the rest looks great.

DylanDylann · 2026-04-23T09:57:18Z

@adhorodyski I got a crash on both IOS and Android (doesn't happen on main)

Screen.Recording.2026-04-23.at.16.51.16.mov

…hooks

adhorodyski · 2026-04-24T11:34:40Z

Screen.Recording.2026-04-24.at.13.33.42.mp4

I was able to reproduce it, the latest commit fixes it :)

…attachment-hooks # Conflicts: # src/pages/inbox/report/ReportActionCompose/ReportActionCompose.tsx

DylanDylann

LGTM

github-actions · 2026-04-27T08:59:19Z

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

github-actions · 2026-04-27T09:03:28Z

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

Android 🤖	iOS 🍎
https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-android-Adhoc-a8f2a22-7639cf7-526e6a8ce2c4ffc75bde072f0e5b9d6c0af9bd97/index.html	https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-ios-device-AdHoc-a8f2a22-7639cf7-d2b0acbb711634a0df9bbec91a77b0ccd204a81d/index.html

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

👀 View the workflow run that generated this build 👀

OSBotify · 2026-04-27T09:06:49Z

✋ 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-27T12:47:12Z

🚀 Deployed to staging by https://github.com/cristipaval in version: 9.3.62-5 🚀

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

Bundle Size Analysis (Sentry):

Android
iOS

MelvinBot · 2026-04-27T12:48:30Z

No help site changes required.

This PR is a purely internal refactoring of ReportActionCompose — it decomposes the attachment/dropzone subsystem into smaller hooks (useAttachmentPicker, useReceiptDrop, useShouldAddOrReplaceReceipt) and a ComposerDropZone component. No user-facing behavior, feature names, UI labels, or workflows are changed, so no updates to App/docs/articles are needed.

OSBotify · 2026-04-28T01:40:30Z

🚀 Deployed to staging by https://github.com/cristipaval in version: 9.3.64-0 🚀

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

Bundle Size Analysis (Sentry):

Android
iOS

ReportActionCompose 5/6: extract attachment hooks

6952c27

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

melvin-bot Bot assigned adhorodyski Apr 21, 2026

self-subscribe useNetwork inside useShouldAddOrReplaceReceipt

5742203

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

adhorodyski marked this pull request as ready for review April 21, 2026 12:24

adhorodyski requested review from a team as code owners April 21, 2026 12:24

melvin-bot Bot requested review from DylanDylann and removed request for a team April 21, 2026 12:24

melvin-bot Bot requested review from trjExpensify and removed request for a team April 21, 2026 12:24

trjExpensify removed their request for review April 22, 2026 01:36

DylanDylann reviewed Apr 22, 2026

View reviewed changes

Comment thread src/pages/inbox/report/ReportActionCompose/ComposerDropZone.tsx Outdated

Comment thread src/pages/inbox/report/ReportActionCompose/ComposerDropZone.tsx

Comment thread src/pages/inbox/report/ReportActionCompose/useReceiptDrop.ts Outdated

adhorodyski added 2 commits April 22, 2026 16:30

address review: drop stale comment + isReceiptReplace ref

c00e533

Merge remote-tracking branch 'exfy/main' into decompose/composer-pr5-…

8469bd1

…attachment-hooks

adhorodyski requested a review from DylanDylann April 22, 2026 14:33

Merge branch 'Expensify:main' into decompose/composer-pr5-attachment-…

a1534fa

…hooks

DylanDylann reviewed Apr 23, 2026

View reviewed changes

adhorodyski and others added 3 commits April 24, 2026 11:16

Merge branch 'Expensify:main' into decompose/composer-pr5-attachment-…

4b25599

…hooks

drop unused receipt modals in SimpleDropZone branch

cdc6f7e

fix clearComposer worklet crash on native

85511c5

Merge remote-tracking branch 'exfy/main' into decompose/composer-pr5-…

acb32e8

…attachment-hooks # Conflicts: # src/pages/inbox/report/ReportActionCompose/ReportActionCompose.tsx

adhorodyski requested a review from DylanDylann April 24, 2026 14:13

DylanDylann approved these changes Apr 24, 2026

View reviewed changes

melvin-bot Bot requested a review from cristipaval April 24, 2026 15:02

cristipaval approved these changes Apr 27, 2026

View reviewed changes

cristipaval merged commit a8f2a22 into Expensify:main Apr 27, 2026
39 checks passed

OSBotify mentioned this pull request Apr 27, 2026

Deploy Checklist: New Expensify 2026-04-23 #88633

Open

arosiclair mentioned this pull request Apr 29, 2026

PR checklist #89226

Open

Conversation

adhorodyski commented Apr 21, 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!

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

adhorodyski commented Apr 21, 2026

Uh oh!

chatgpt-codex-connector Bot commented Apr 21, 2026

Uh oh!

melvin-bot Bot commented Apr 21, 2026

Uh oh!

trjExpensify commented Apr 22, 2026

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

DylanDylann Apr 23, 2026

Choose a reason for hiding this comment

Uh oh!

adhorodyski Apr 24, 2026

Choose a reason for hiding this comment

Uh oh!

DylanDylann commented Apr 23, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

DylanDylann commented Apr 23, 2026

Uh oh!

DylanDylann commented Apr 23, 2026

Uh oh!

adhorodyski commented Apr 24, 2026

Uh oh!

DylanDylann left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

github-actions Bot commented Apr 27, 2026

Uh oh!

github-actions Bot commented Apr 27, 2026

Uh oh!

OSBotify commented Apr 27, 2026

Uh oh!

OSBotify commented Apr 27, 2026

Uh oh!

MelvinBot commented Apr 27, 2026

Uh oh!

OSBotify commented Apr 28, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

adhorodyski commented Apr 21, 2026 •

edited

Loading

codecov Bot commented Apr 21, 2026 •

edited by github-actions Bot

Loading

DylanDylann commented Apr 23, 2026 •

edited

Loading