Fix merge transaction receipt preview showing incorrect eReceipt by hoangzinh · Pull Request #73274 · Expensify/App

hoangzinh · 2025-10-23T02:00:24Z

Explanation of Change

When displaying receipts in merge transaction flow, TransactionReceiptPage calculates a merged transaction with the correct receipt data, but this wasn't being passed down to AttachmentModal and AttachmentView. Both components were fetching fresh transactions from Onyx, which don't have the merged receipt data yet, causing incorrect receipt display.

Fixed Issues

$ #70415
PROPOSAL:

Tests

Same as QA

Verify that no errors appear in the JS console

Offline tests

Same as QA

QA Steps

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

Precondition:

Workspace has imported card transactions (add a direct feed and assign card with transactions to yourself).
Have a card transaction with eReceipt.

Go to staging.new.expensify.com
Go to workspace chat.
Open the expense report with card transaction that has eReceipt.
Create a manual expense with receipt.
Select the manual expense via checkbox.
Click More > Merge.
Select the card transaction with eReceipt.
Click Continue.
Select any details > Continue.
On Confirm page, click on the receipt.
Verify that Receipt preview on the confirm page should match the receipt when viewed in full screen.

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

Screen.Recording.2025-10-23.at.17.55.52.android.mov

Android: mWeb Chrome

Screen.Recording.2025-10-23.at.17.52.44.android.chrome.mov

iOS: Native

Screen.Recording.2025-10-23.at.18.08.33.mov

iOS: mWeb Safari

Screen.Recording.2025-10-23.at.17.59.32.ios.safari.mov

MacOS: Chrome / Safari

Screen.Recording.2025-10-23.at.09.03.22.web.mov

MacOS: Desktop

Screen.Recording.2025-10-23.at.17.47.58.desktop.mov

- Add !isImageSource check to prevent eReceipt rendering when source transaction receipt is selected - During merge flow, target transaction data hasn't been merged yet, causing incorrect eReceipt display - Add explanatory comment for the logic and reference GitHub issue Expensify#70415 - Fixes issue where receipt preview on merge confirm page shows wrong receipt

melvin-bot · 2025-10-23T11:10:08Z

@dominictb 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 · 2025-10-27T14:45:48Z

@dominictb any ETA on reviewing this?

dominictb · 2025-10-27T16:12:28Z

I'm a bit skeptical about the expected behavior here. From the design doc:

If an imported card expense is being merged, we’ll be keeping card details that cannot be edited by the user normally:

Amount

Currency

Reimbursable/Non-reimbursable

It's been working that way when merging card and cash expenses. So logically, we should keep the eReceipt and discard the image receipt because the eReceipt reflects the correct amount and currency of the kept card expense and is IRS-compliant. Alternatively, we can show the receipt select step to toggle between the eReceipt and custom receipt. @garrettmknight @youssef-lr What do you think should be the expected behavior here?

I also see in your screenshot, it's showing Amount field here which should not be there. I cannot reproduce this but you can debug on your side:

garrettmknight · 2025-10-27T17:51:34Z

If one expense has a receipt and the other doesn’t, we’ll automatically choose the receipt and skip the ‘Select receipt’ RHP.

According to the design document, I believe the intention is to treat the eReceipt as 'no receipt' and automatically select the uploaded receipt.

dominictb · 2025-10-29T11:01:18Z

BUG: eReceipts show for card transactions when offline but not when online in eligible transactions page

Root cause is GetTransactionsForMerging does not return hasEReceipt field for eligibleTransactions list. cc @youssef-lr

dominictb · 2025-10-29T11:03:03Z

BUG: Original bug is resolved for image receipts, not for non-image ones (PDF, DOCX,....)

Screen.Recording.2025-10-29.at.18.02.20.mov

The source transaction in the above recording has a PDF receipt.

dominictb · 2025-10-29T11:12:19Z

BUG: Amount field shows if the target transaction was imported from a personal bank account/card:

When merging a card transaction, amount and currency must be retained.

Root cause is a personal card transaction is not a managed card transaction (transaction.managedCard = false), but we're relying on that to detect a card transaction:

App/src/libs/MergeTransactionUtils.ts

Line 199 in 809575d

if (isManagedCardTransaction(targetTransaction)) {

I think we should reuse this check instead (check by transaction.cardName):

App/src/components/TransactionItemRow/DataCells/TypeCell.tsx

Line 51 in 767000b

    
           const type = transactionItem.transactionType ?? getType(transactionItem.cardName);

Can you check for other places in the merge flow where we're using isManagedCardTransaction and update accordingly?

dominictb · 2025-10-29T11:21:36Z

    const isVideo = (typeof source === 'string' && Str.isVideo(source)) || (file?.name && Str.isVideo(file.name));
    const firstRenderRoute = useFirstRenderRoute();
    const isInFocusedModal = firstRenderRoute.isFocused && isFocused === undefined;
+    const isImageSource = typeof source !== 'function' && !!checkIsFileImage(source, file?.name);


This feels like a workaround to me. I suggested to compute the imageSource here instead:

App/src/pages/media/AttachmentModalScreen/routes/TransactionReceiptModalContent.tsx

Line 35 in e08f406

const imageSource = isDraftTransaction ? transactionDraft?.receipt?.source : tryResolveUrlFromApiRoot(receiptURIs.image ?? '');

Where you check if there's mergeTransactionID URL param, use the receipt from mergeTransaction_ Onyx instead.

We already used a receipt from mergeTransaction here

App/src/pages/TransactionReceiptPage.tsx

Lines 44 to 49 in 9c9932b

// If we have a merge transaction, we need to use the receipt from the merge transaction

transaction = {

...transactionMain,

receipt: mergeTransaction.receipt,

filename: getReceiptFileName(mergeTransaction.receipt),

};

The root cause is that we fetch transaction from Onyx again here, it hasn't contain the receipt from mergeTransaction yet.

I think about another solution that we will pass transaction object here down to AttachmentView component. Wdyt?

Let's try it

…ipt" This reverts commit 4d9a2c0.

…r merge flow When displaying receipts in merge transaction flow, TransactionReceiptPage calculates a merged transaction with the correct receipt data, but this wasn't being passed down to AttachmentModal and AttachmentView. Both components were fetching fresh transactions from Onyx, which don't have the merged receipt data yet, causing incorrect receipt display. Changes: - Add optional transaction prop to AttachmentModal and AttachmentView - Use passed transaction if provided, otherwise fall back to Onyx fetch - Pass merged transaction from TransactionReceiptPage through component tree

hoangzinh · 2025-11-02T16:42:38Z

@dominictb I fixed this bug. Please feel free to take a look at this PR again.

Screen.Recording.2025-11-02.at.23.40.33.mov

codecov · 2025-11-02T16:50:14Z

Codecov Report

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

Files with missing lines	Coverage Δ
...rc/components/Attachments/AttachmentView/index.tsx	`50.00% <100.00%> (+0.57%)`	⬆️
src/libs/actions/MergeTransaction.ts	`57.69% <100.00%> (+1.25%)`	⬆️
...ntModalScreen/AttachmentModalBaseContent/index.tsx	`87.50% <100.00%> (+0.15%)`	⬆️
...alScreen/routes/TransactionReceiptModalContent.tsx	`1.14% <ø> (ø)`
... and 43 files with indirect coverage changes

trjExpensify · 2025-11-03T14:50:48Z

@dominictb can you re-review, please?

dominictb · 2025-11-03T15:27:01Z

I'm not sure why all the eReceipts didn't show for me. transaction.hasEReceipt is all false even though they are card expenses. They still show last Wednesday.

Second weird thing is they show in receipt preview in search page but not in report RHP:

Screen.Recording.2025-11-03.at.22.23.33.mov

Asking here

dominictb · 2025-11-03T15:31:52Z

cc @youssef-lr again on this bug #73274 (comment). Not a priority/blocker but can be in your backlog.

trjExpensify · 2025-11-05T14:09:57Z

Are we blocked on that, or can this PR be reviewed?

dominictb · 2025-11-05T20:54:01Z

The approach seems good but I need eReceipts visibility to test it and edge cases. So we're blocked.

trjExpensify · 2025-11-05T21:08:16Z

Cool, seems like @rayane-d is getting close!

trjExpensify · 2025-11-10T13:49:40Z

Conflicts here!

When displaying receipts in merge transaction flow, TransactionReceiptPage calculates a merged transaction with the correct receipt data, but this wasn't being passed down to AttachmentModal and AttachmentView. Both components were fetching fresh transactions from Onyx, which don't have the merged receipt data yet, causing incorrect receipt display.

hoangzinh · 2025-11-11T11:37:06Z

Resolved conflict. TypeScript check is also failing on the main branch https://expensify.slack.com/archives/C01GTK53T8Q/p1762834499865619

PR is ready to review @dominictb

dominictb · 2025-11-11T16:20:30Z

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

Screen.Recording.2025-11-12.at.22.43.56-compressed.mov

Android: mWeb Chrome

iOS: HybridApp

Screen.Recording.2025-11-12.at.22.16.05-compressed.mov

iOS: mWeb Safari

Screen.Recording.2025-11-12.at.22.22.27-compressed.mov

MacOS: Chrome / Safari

Screen.Recording.2025-11-11.at.23.21.00-compressed.mov

MacOS: Desktop

joekaufmanexpensify

Good from a product perspective 👍

dominictb · 2025-11-11T16:27:30Z

BUG: After merging a card expense with eReceipt (target) and an expense with photo receipt (source) while offline, it still shows the eReceipt until back online:

Screen.Recording.2025-11-11.at.23.25.13-compressed.mov

After getting back online:

dominictb · 2025-11-11T16:27:57Z

Also bump @youssef-lr on this BE bug #73274 (comment)

youssef-lr · 2025-11-11T21:21:58Z

Also bump @youssef-lr on this BE bug #73274 (comment)

Will work on a quick fix today

youssef-lr · 2025-11-11T23:49:03Z

I have a PR in review that adds the hasEReceipt field

…e with photo receipt (source) while offline, it still shows the eReceipt until back online

hoangzinh · 2025-11-12T01:30:39Z

@dominictb I fixed this bug in this commit

dominictb · 2025-11-12T14:55:12Z

-    return data.onyxData;
+    const onyxData = data.onyxData;
+
+    onyxData.optimisticData?.push({


NAB: Can't we just do this?

Suggested change

onyxData.optimisticData?.push({

data.onyxData.optimisticData?.push({

I prefer keep current implementation because we gonna add more in "Merge distance" PR

dominictb

🎀

OSBotify · 2025-11-13T17:29:26Z

🚀 Deployed to staging by https://github.com/youssef-lr in version: 9.2.58-0 🚀

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

OSBotify · 2025-11-14T18:25:08Z

🚀 Deployed to production by https://github.com/cristipaval in version: 9.2.58-3 🚀

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

melvin-bot Bot assigned hoangzinh Oct 23, 2025

hoangzinh marked this pull request as ready for review October 23, 2025 11:10

hoangzinh requested a review from a team as a code owner October 23, 2025 11:10

melvin-bot Bot requested review from dominictb and removed request for a team October 23, 2025 11:10

hoangzinh mentioned this pull request Oct 23, 2025

[Due for payment 2025-11-21] [Merge] Expense - different receipt preview on merge confirm page #70415

Closed

8 tasks

dominictb mentioned this pull request Oct 29, 2025

[Merge] Users shouldn't be able to merge per diem transactions with card transactions #69755

Closed

dominictb suggested changes Oct 29, 2025

View reviewed changes

hoangzinh added 4 commits November 2, 2025 23:05

Merge branch 'main' into fix-merge-receipt-preview-comment

3759cd2

Revert "Fix merge transaction receipt preview showing incorrect eRece…

b9c80ef

…ipt" This reverts commit 4d9a2c0.

Rename variable

11aeeb8

Merge branch 'main' into fix-merge-receipt-preview-comment

966b630

hoangzinh added 2 commits November 11, 2025 17:51

Revert changes

a4bd15d

hoangzinh requested a review from a team as a code owner November 11, 2025 10:53

melvin-bot Bot requested review from joekaufmanexpensify and removed request for a team November 11, 2025 10:53

joekaufmanexpensify previously approved these changes Nov 11, 2025

View reviewed changes

youssef-lr self-requested a review November 11, 2025 21:22

Fix after merging a card expense with eReceipt (target) and an expens…

0a6e886

…e with photo receipt (source) while offline, it still shows the eReceipt until back online

hoangzinh dismissed joekaufmanexpensify’s stale review via 0a6e886 November 12, 2025 01:30

dominictb reviewed Nov 12, 2025

View reviewed changes

dominictb approved these changes Nov 12, 2025

View reviewed changes

youssef-lr approved these changes Nov 12, 2025

View reviewed changes

youssef-lr merged commit c8cd589 into Expensify:main Nov 12, 2025
31 checks passed

github-actions Bot mentioned this pull request Nov 12, 2025

Investigate workflow job failing on main: test / test (job 3) #74997

Closed

OSBotify mentioned this pull request Nov 13, 2025

Deploy Checklist: New Expensify 2025-11-13 #75063

Closed

52 tasks

	// If we have a merge transaction, we need to use the receipt from the merge transaction
	transaction = {
	...transactionMain,
	receipt: mergeTransaction.receipt,
	filename: getReceiptFileName(mergeTransaction.receipt),
	};

	onyxData.optimisticData?.push({
	data.onyxData.optimisticData?.push({

Uh oh!

Conversation

hoangzinh commented Oct 23, 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 Oct 23, 2025

Uh oh!

trjExpensify commented Oct 27, 2025

Uh oh!

dominictb commented Oct 27, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

garrettmknight commented Oct 27, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

dominictb commented Oct 29, 2025

Uh oh!

dominictb commented Oct 29, 2025

Uh oh!

dominictb commented Oct 29, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

dominictb Oct 29, 2025

Choose a reason for hiding this comment

Uh oh!

hoangzinh Oct 29, 2025

Choose a reason for hiding this comment

Uh oh!

hoangzinh Oct 29, 2025

Choose a reason for hiding this comment

Uh oh!

dominictb Oct 30, 2025

Choose a reason for hiding this comment

Uh oh!

hoangzinh commented Nov 2, 2025

Uh oh!

codecov Bot commented Nov 2, 2025 • edited by github-actions Bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

trjExpensify commented Nov 3, 2025

Uh oh!

dominictb commented Nov 3, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

dominictb commented Nov 3, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

trjExpensify commented Nov 5, 2025

Uh oh!

dominictb commented Nov 5, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

trjExpensify commented Nov 5, 2025

Uh oh!

trjExpensify commented Nov 10, 2025

Uh oh!

hoangzinh commented Nov 11, 2025

Uh oh!

dominictb commented Nov 11, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

joekaufmanexpensify left a comment

Choose a reason for hiding this comment

Uh oh!

dominictb commented Nov 11, 2025

Uh oh!

dominictb commented Nov 11, 2025

Uh oh!

youssef-lr commented Nov 11, 2025

Uh oh!

hoangzinh commented Oct 23, 2025 •

edited

Loading

dominictb commented Oct 27, 2025 •

edited

Loading

garrettmknight commented Oct 27, 2025 •

edited

Loading

dominictb commented Oct 29, 2025 •

edited

Loading

codecov Bot commented Nov 2, 2025 •

edited by github-actions Bot

Loading

dominictb commented Nov 3, 2025 •

edited

Loading

dominictb commented Nov 3, 2025 •

edited

Loading

dominictb commented Nov 5, 2025 •

edited

Loading

dominictb commented Nov 11, 2025 •

edited

Loading

dominictb Nov 12, 2025 •

edited

Loading