Do not show dualdropzone on approved requests by koko57 · Pull Request #65264 · Expensify/App

koko57 · 2025-07-01T15:54:41Z

Explanation of Change

Fixed Issues

$ #63807
$ #63312
PROPOSAL: -

Tests

PREREQUISITES: all betas / newDotMultiFilesDragAndDrop beta enabled

ONLY ON WEB / DESKTOP

FIX #63807

Create a workspace (optional)
Go to WS chat > Create expense > submit and approve the expense.
Go to the approved expense report > Drag a file on the scan drop zone
Verify that only Add Attachment dropzone appears and you can add a file as an attachment (not replace receipt)

FIX #62650 (comment)

Create new Expense -> Manual (for the workspace expense, do not approve it yet), in a workspace or DM you haven't created an expense in
Go to the money request view
Try to drag a file over the Report Screen
Verify that Dual Dropzone is displayed
Verify that you see Scan Receipts dropzone
Drop a single file
Verify that the receipt is added to the expense
Repeat steps 1-4, but now instead of Manual choose Scan request
Verify that you see Replace Receipts dropzone
Verify that after dropping the file the receipt is replaced

Verify that no errors appear in the JS console

Offline tests

QA Steps

// TODO: These must be filled out, or the issue title must include "[No QA]."

same as above

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

MacOS: Desktop

…eipt on single transaction

melvin-bot · 2025-07-01T15:54:48Z

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

brunovjk · 2025-07-02T16:33:20Z

I've started reviewing, and in web everything seems fine in initial testing:

MacOS: Chrome / Safari

Screen.Recording.2025-07-02.at.13.18.15.mov

But getting deeper it seems like there are several bugs that we're dealing with here. I can continue reviewing, but maybe @getusha has more context. What do you think @getusha? Thanks.

koko57 · 2025-07-02T16:53:04Z

yeah, maybe @getusha or @shubham1206agra could review this PR?

cc @lakchote

…are unavailable

lakchote · 2025-07-03T11:41:24Z

Assigning @getusha as they have the most context on this

lakchote · 2025-07-03T11:58:33Z

@koko57 prettier is failing

koko57 · 2025-07-03T12:45:29Z

fixed

koko57 · 2025-07-03T18:35:02Z

@getusha could you please take this PR if you'll be still waiting on fixes for Stage 5 PR?

koko57 · 2025-07-03T19:09:28Z

I'm afraid that it's still something wrong with this.
Can someone please help me how can I easily differentiate between this views?

Single transaction:

Transactions View

Transaction Thread View

some checks are true for 2 or all the views and I can't single out easily each view

lakchote · 2025-07-04T14:02:33Z

Can someone please help me how can I easily differentiate between this views?

I may be missing something, but couldn't we do for instance:

Single transaction view -> transactions count === 1
Transactions View -> transactions count > 1
Transaction Thread View -> check the route name (ex: /search/view/6092812616199005)

lakchote · 2025-07-07T08:50:14Z

@koko57 typescript checks are failing

koko57 · 2025-07-07T16:02:39Z

@lakchote typecheck fixed

lakchote · 2025-07-08T09:50:33Z

I'll reassign @getusha so you can focus on reviewing the critical PR #65316

koko57 · 2025-07-08T18:35:42Z

@DylanDylann conflicts resolved, comments addressed

DylanDylann · 2025-07-09T01:57:26Z

@koko57 GH actions are failed

koko57 · 2025-07-09T07:43:06Z

@DylanDylann Eslint fixed, I've added the prop to the ReportFooter in MoneyRequestReportView earlier

koko57 · 2025-07-09T12:29:13Z

@DylanDylann I've changed the dropzone title to Replace Receipt for transaction views as per this conversation: https://expensify.slack.com/archives/C049HHMV9SM/p1752000301663539

koko57 · 2025-07-09T14:17:52Z

@DylanDylann could you please proceed with the review? If there are some small improvements or NABs, please leave a comment here #65722 - it'll be fixed in a follow up.

lakchote · 2025-07-09T15:09:55Z

@DylanDylann could you please proceed with the review? If there are some small improvements or NABs, please leave a comment here #65722 - it'll be fixed in a follow up.

Yes, as @koko57 said, @DylanDylann please proceed with the rest of the review. If there any improvements or NABs, we will do them in the follow-up issue. The goal is to have momentum so that we can have it live as soon as possible.

DylanDylann · 2025-07-09T15:13:30Z

Finish on 30 mins

DylanDylann · 2025-07-09T15:29:40Z

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

iOS: HybridApp

iOS: mWeb Safari

MacOS: Chrome / Safari

Uploading Screen Recording 2025-07-09 at 23.38.43.mov…

MacOS: Desktop

Screen.Recording.2025-07-09.at.23.40.02.mov

OSBotify · 2025-07-09T16:13:12Z

✋ 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 · 2025-07-10T07:26:21Z

🚀 Deployed to staging by https://github.com/lakchote in version: 9.1.79-0 🚀

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

github-actions · 2025-07-11T17:38:24Z

🚀 Deployed to production by https://github.com/Julesssss in version: 9.1.79-11 🚀

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

hoangzinh · 2025-09-22T11:21:13Z

src/pages/home/report/ReportActionCompose/ReportActionCompose.tsx

+    const shouldAddOrReplaceReceipt = (isTransactionThreadView || isSingleTransactionView) && !isDistanceRequest(transaction);

-    const isEditingReceipt = isTransactionThreadView && transactionID && hasReceipt;
+    const shouldDisplayDualDropZone = useMemo(() => {


Coming from #66643.
We should exclude isChatRoom and isGroupChat, same as the previous condition. Otherwise, it will display dual zone in group chat and chat room.

fix: do not show dualdropzone on approved requests, handle adding rec…

1b8232f

…eipt on single transaction

koko57 requested a review from a team as a code owner July 1, 2025 15:54

melvin-bot bot requested review from brunovjk and removed request for a team July 1, 2025 15:54

koko57 added 2 commits July 2, 2025 19:33

Merge branch 'main' into fix/63312-multi-files-follow-ups-part1

b5e2967

fix: disable receipt dropzone everywhere where money request actions …

792d423

…are unavailable

lakchote requested review from getusha and removed request for brunovjk July 3, 2025 11:41

koko57 added 2 commits July 3, 2025 14:34

fix: resolve conflicts

b0e22a2

fix: prettier

81407a9

koko57 added 4 commits July 4, 2025 18:00

Merge branch 'main' into fix/63312-multi-files-follow-ups-part1

2c37f2d

fix: display dual dropzone when receipt can be added

1c9a421

fix: eslint

415a8ee

fix: resolve conflicts

1679df4

fix: typecheck

a83118c

lakchote removed the request for review from getusha July 8, 2025 09:53

koko57 added 2 commits July 8, 2025 20:31

fix: apply requested changes

18d6bda

fix: resolve conflicts

4c06027

koko57 requested a review from DylanDylann July 8, 2025 18:35

koko57 added 2 commits July 9, 2025 08:57

Merge branch 'main' into fix/63312-multi-files-follow-ups-part1

890d95e

fix: remove unused imports

b8bad2c

koko57 mentioned this pull request Jul 9, 2025

Dragging a PDF onto an Expense Without a Receipt Does Not Offer "Replace Receipt" Option #65691

Closed

16 tasks

fix: replace receipt title

e224a16

koko57 added 2 commits July 9, 2025 16:00

Merge branch 'main' into fix/63312-multi-files-follow-ups-part1

3a17402

fix: minor fix

42afc60

DylanDylann mentioned this pull request Jul 9, 2025

[Due for payment 2025-08-05] [Due for payment 2025-07-30] [Due for payment 2025-07-25] [Due for payment 2025-07-22] [Multi-Files Drag-and-Drop] Follow-ups and code cleanup #65722

Closed

10 tasks

DylanDylann approved these changes Jul 9, 2025

View reviewed changes

melvin-bot bot requested a review from lakchote July 9, 2025 15:44

lakchote approved these changes Jul 9, 2025

View reviewed changes

lakchote merged commit 4a5e39e into Expensify:main Jul 9, 2025
20 checks passed

github-actions bot mentioned this pull request Jul 10, 2025

Deploy Checklist: New Expensify 2025-07-10 #65809

Closed

77 tasks

nlemma mentioned this pull request Jul 10, 2025

[Due for payment 2025-07-22] [Multi-Files Drag-and-Drop] Replace Receipts dropzone instead of Scan Receipts dropzone #65837

Closed

8 tasks

koko57 mentioned this pull request Jul 10, 2025

Chore: follow ups and cleanup pt 1 #65847

Merged

50 tasks

truph01 mentioned this pull request Jul 12, 2025

[$250] Distance - Replace receipt zone is present when dragging an image over distance expense RHP #65629

Closed

8 tasks

hoangzinh reviewed Sep 22, 2025

View reviewed changes

Conversation

koko57 commented Jul 1, 2025 • 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 Jul 1, 2025

Uh oh!

brunovjk commented Jul 2, 2025

Uh oh!

koko57 commented Jul 2, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

lakchote commented Jul 3, 2025

Uh oh!

lakchote commented Jul 3, 2025

Uh oh!

koko57 commented Jul 3, 2025

Uh oh!

koko57 commented Jul 3, 2025

Uh oh!

koko57 commented Jul 3, 2025

Uh oh!

lakchote commented Jul 4, 2025

Uh oh!

lakchote commented Jul 7, 2025

Uh oh!

koko57 commented Jul 7, 2025

Uh oh!

lakchote commented Jul 8, 2025

Uh oh!

koko57 commented Jul 8, 2025

Uh oh!

DylanDylann commented Jul 9, 2025

Uh oh!

koko57 commented Jul 9, 2025

Uh oh!

koko57 commented Jul 9, 2025

Uh oh!

koko57 commented Jul 9, 2025

Uh oh!

lakchote commented Jul 9, 2025

Uh oh!

DylanDylann commented Jul 9, 2025

Uh oh!

DylanDylann commented Jul 9, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

Uh oh!

OSBotify commented Jul 9, 2025

Uh oh!

github-actions bot commented Jul 10, 2025

Uh oh!

github-actions bot commented Jul 11, 2025

Uh oh!

hoangzinh Sep 22, 2025

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

koko57 commented Jul 1, 2025 •

edited

Loading

koko57 commented Jul 2, 2025 •

edited

Loading

DylanDylann commented Jul 9, 2025 •

edited

Loading