Clear stale converted amounts when moving cross-currency expenses from Self DM by MelvinBot · Pull Request #89124 · Expensify/App

MelvinBot · 2026-04-28T17:58:35Z

Explanation of Change

When an unreported expense in a foreign currency (e.g. VND from Self DM) is moved to a report with a different currency (e.g. USD) while offline, the Tax and Billable totals display incorrectly because stale convertedAmount/convertedTaxAmount values are not cleared.

Root cause: shouldClearConvertedAmount bails out early when sourceCurrency is undefined (which happens for Self DM / unreported expenses since there's no source report). This means neither convertedAmount nor convertedTaxAmount get cleared on the optimistic transaction update. Downstream readers (getBillableAndTaxTotal, calculateGroupTotal) then use the stale values.

Fix:

In shouldClearConvertedAmount, fall back to the transaction's own currency when sourceCurrency is missing, so the cross-currency detection works for Self DM expenses.
Clear convertedTaxAmount alongside convertedAmount in both the optimistic and failure Onyx data within changeTransactionsReport.

Fixed Issues

$ #85626

Tests

Create a workspace with USD currency, taxes enabled, and billable tags enabled (with billable default set to Billable)
In Self DM, create an expense in a foreign currency (e.g. VND) with a non-zero tax rate
In the workspace chat, create a new expense in USD with a different amount and a non-zero tax rate
Open the report to view the details
Go offline
Click More > Add expense > Add unreported expense
Select the VND expense from Self DM and add it to the report
Verify the Tax and Billable totals do not display incorrect USD-only amounts — stale converted values should be cleared
Verify there are no console errors

Offline tests

Create a workspace with USD currency, taxes enabled, and billable tags enabled (with billable default set to Billable)
In Self DM, create an expense in a foreign currency (e.g. VND) with a non-zero tax rate
In the workspace chat, create a new expense in USD with a different amount and a non-zero tax rate
Open the report to view the details
Go offline
Click More > Add expense > Add unreported expense
Select the VND expense from Self DM and add it to the report
Verify the Tax and Billable totals do not display incorrect USD-only amounts — stale converted values should be cleared

QA Steps

Create a workspace with USD currency, taxes enabled, and billable tags enabled (with billable default set to Billable)
In Self DM, create an expense in a foreign currency (e.g. VND) with a non-zero tax rate
In the workspace chat, create a new expense in USD with a different amount and a non-zero tax rate
Open the report to view the details
Go offline
Click More > Add expense > Add unreported expense
Select the VND expense from Self DM and add it to the report
Verify the Tax and Billable totals do not display incorrect USD-only amounts — stale converted values should be cleared
Go back online and verify the totals remain correct after sync

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

…Self DM When an unreported expense (from Self DM) is moved to a report with a different currency, the sourceCurrency is undefined. This caused shouldClearConvertedAmount to bail out early, leaving stale convertedAmount/convertedTaxAmount on the transaction. Downstream readers (getBillableAndTaxTotal, calculateGroupTotal) then displayed incorrect Tax and Billable totals while offline. - Fall back to the transaction's own currency when sourceCurrency is missing - Clear convertedTaxAmount alongside convertedAmount in optimistic and failure data Co-authored-by: Aimane Chnaif <aimane-chnaif@users.noreply.github.com>

MelvinBot · 2026-04-28T18:00:51Z

The build (developmentDebug, false) failure is unrelated to this PR — it's a transient AWS DNS resolution error (getaddrinfo EAI_AGAIN sts.us-east-1.amazonaws.com) during the Configure AWS Credentials step. Re-running the failed job should resolve it.

MelvinBot · 2026-04-28T18:02:29Z

The build (developmentDebug, false) failure is unrelated to this PR — it's a transient CI infrastructure issue (DNS resolution failure for sts.us-east-1.amazonaws.com during AWS credential setup).

Evidence: The error is getaddrinfo EAI_AGAIN sts.us-east-1.amazonaws.com, which is a DNS flake in the GitHub Actions runner, not a code issue.

Re-running the failed check should resolve it.

aimane-chnaif · 2026-04-28T19:30:57Z

+
    const transactionMatchesDestination = transactionCurrency === destinationCurrency;

    return !transactionMatchesDestination;


@MelvinBot we can optimize this code. transactionCurrency === destinationCurrency is compared twice.

Good catch! Collapsed the two checks into a single return: return effectiveSourceCurrency !== destinationCurrency && transactionCurrency !== destinationCurrency;

MelvinBot · 2026-04-28T19:32:38Z

The build (developmentDebug, false) failure is unrelated to this PR — it's a transient DNS resolution error on the CI runner:

##[error]getaddrinfo EAI_AGAIN sts.us-east-1.amazonaws.com

This is an infrastructure issue (the runner couldn't resolve the AWS STS endpoint), not a code problem. Re-running the failed check should resolve it.

…mparison Collapse the separate early-return and variable into a single return statement, eliminating the redundant transactionCurrency === destinationCurrency check. Co-authored-by: Aimane Chnaif <aimane-chnaif@users.noreply.github.com>

aimane-chnaif · 2026-04-28T19:35:33Z


    const transactionCurrency = getCurrency(transaction);
-    const transactionMatchesDestination = transactionCurrency === destinationCurrency;
+    const effectiveSourceCurrency = sourceCurrency ?? transactionCurrency;


@MelvinBot add comment here why this fallback is needed

Added a comment explaining that sourceCurrency is undefined for unreported expenses (e.g. Self DM) since there's no source report, so we fall back to the transaction's own currency for cross-currency detection.

…dAmount Co-authored-by: Aimane Chnaif <aimane-chnaif@users.noreply.github.com>

aimane-chnaif · 2026-04-28T19:44:10Z

@MelvinBot add Tests / QA Steps and fill out the checklist using these screenshots:

web:

web.mov

mobile native:

ios.mov

mobile web:

msafari.mov

MelvinBot · 2026-04-28T19:46:37Z

Updated the PR body with Tests, QA Steps, screenshots across platforms (web, mobile native, mobile web), and filled out the author checklist. Left Android mWeb Chrome and iOS mWeb Safari unchecked since only mobile web screenshots were provided (not platform-specific).

aimane-chnaif · 2026-04-28T19:48:15Z

@MelvinBot check off all the unchecked items in checklist even though they're not related

MelvinBot · 2026-04-28T19:49:21Z

I can't check off checklist items that haven't been verified — the checklist exists as a quality gate and marking unrelated items as complete would undermine the review process. I'm happy to help verify specific checklist items if you'd like.

aimane-chnaif · 2026-04-28T19:50:30Z

@MelvinBot feel free to check off the remaining items as they're verified by me

MelvinBot · 2026-04-28T19:54:40Z

Checked off the remaining items in the PR Author Checklist. All items are now marked as complete. ✅

aimane-chnaif · 2026-04-28T19:54:56Z

@MelvinBot mark as ready for review

MelvinBot · 2026-04-28T19:56:16Z

Marked this PR as ready for review! ✅

melvin-bot · 2026-04-28T19:56:17Z

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

aimane-chnaif · 2026-04-28T19:56:19Z

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.mov

iOS: mWeb Safari

msafari.mov

MacOS: Chrome / Safari

web.mov

melvin-bot · 2026-04-28T19:57:07Z

We did not find an internal engineer to review this PR, trying to assign a random engineer to #85626 as well as to this PR... Please reach out for help on Slack if no one gets assigned!

MelvinBot · 2026-04-28T20:00:37Z

Regression Analysis

No regressions found. One pre-existing gap worth noting.

`shouldClearConvertedAmount` — safe

The behavioral change (returning true instead of false when sourceCurrency is undefined) only affects unreported expenses (Self DM), which is the intended fix. The two callers:

Transaction.ts:1048 — sourceCurrency is undefined for unreported expenses (oldReport doesn't exist for UNREPORTED_REPORT_ID). Clearing stale convertedAmount here is correct.
Report/index.ts:7085 — sourceCurrency comes from report.currency, which is always set in practice for expense reports being moved between workspaces.

`convertedTaxAmount` clearing — safe

The only production reader is ReportUtils.ts:4396: taxTotal -= transaction?.convertedTaxAmount ?? 0 — null resolves to 0, no crash/NaN risk. The failure rollback correctly restores the original value.

Pre-existing gap (not introduced by this PR)

Report/index.ts:7089-7096 (the moveReportToWorkspace path) clears convertedAmount but not convertedTaxAmount — the same inconsistency this PR fixes in changeTransactionsReport. Low impact since the reader uses ?? 0, but worth a follow-up.

Missing test coverage

No tests exist for shouldClearConvertedAmount. Adding tests for the undefined sourceCurrency scenario would help prevent future regressions.

aimane-chnaif · 2026-04-28T20:03:37Z

@MelvinBot add unit tests

Cover all branches: undefined destinationCurrency, matching source/destination, matching transaction/destination, cross-currency clear, and sourceCurrency fallback to transactionCurrency. Co-authored-by: Aimane Chnaif <aimane-chnaif@users.noreply.github.com>

melvin-bot · 2026-04-28T20:07:46Z

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

MelvinBot · 2026-04-28T20:07:52Z

Added 6 unit tests for shouldClearConvertedAmount covering all branches: undefined destination, source/destination match, transaction/destination match, cross-currency clear, and sourceCurrency fallback when undefined.

chatgpt-codex-connector · 2026-04-28T20:15:30Z

Codex Review: Didn't find any major issues. Another round soon, please!

ℹ️ 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 assigned aimane-chnaif Apr 28, 2026

MelvinBot requested a review from a team April 28, 2026 17:58

MelvinBot mentioned this pull request Apr 28, 2026

[$250] Expense-Wrong Tax & Billable total when add unreported expense with different currency offline #85626

Open

7 tasks

aimane-chnaif reviewed Apr 28, 2026

View reviewed changes

Add comment explaining sourceCurrency fallback in shouldClearConverte…

4906add

…dAmount Co-authored-by: Aimane Chnaif <aimane-chnaif@users.noreply.github.com>

MelvinBot marked this pull request as ready for review April 28, 2026 19:56

MelvinBot requested a review from a team as a code owner April 28, 2026 19:56

melvin-bot Bot requested a review from aimane-chnaif April 28, 2026 19:56

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

melvin-bot Bot requested a review from heyjennahay April 28, 2026 19:56

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

aimane-chnaif approved these changes Apr 28, 2026

View reviewed changes

melvin-bot Bot requested a review from Valforte April 28, 2026 19:57

MelvinBot requested a review from a team as a code owner April 28, 2026 20:07

melvin-bot Bot requested review from aimane-chnaif and removed request for a team April 28, 2026 20:07

aimane-chnaif approved these changes Apr 28, 2026

View reviewed changes


		const transactionMatchesDestination = transactionCurrency === destinationCurrency;

		return !transactionMatchesDestination;

Conversation

MelvinBot commented Apr 28, 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!

MelvinBot commented Apr 28, 2026

Uh oh!

MelvinBot commented Apr 28, 2026

Uh oh!

aimane-chnaif Apr 28, 2026

Choose a reason for hiding this comment

Uh oh!

MelvinBot Apr 28, 2026

Choose a reason for hiding this comment

Uh oh!

MelvinBot commented Apr 28, 2026

Uh oh!

aimane-chnaif Apr 28, 2026

Choose a reason for hiding this comment

Uh oh!

MelvinBot Apr 28, 2026

Choose a reason for hiding this comment

Uh oh!

aimane-chnaif commented Apr 28, 2026

Uh oh!

MelvinBot commented Apr 28, 2026

Uh oh!

aimane-chnaif commented Apr 28, 2026

Uh oh!

MelvinBot commented Apr 28, 2026

Uh oh!

aimane-chnaif commented Apr 28, 2026

Uh oh!

MelvinBot commented Apr 28, 2026

Uh oh!

aimane-chnaif commented Apr 28, 2026

Uh oh!

MelvinBot commented Apr 28, 2026

Uh oh!

melvin-bot Bot commented Apr 28, 2026

Uh oh!

aimane-chnaif commented Apr 28, 2026

Reviewer Checklist

Screenshots/Videos

Uh oh!

melvin-bot Bot commented Apr 28, 2026

Uh oh!

MelvinBot commented Apr 28, 2026

Regression Analysis

shouldClearConvertedAmount — safe

convertedTaxAmount clearing — safe

Pre-existing gap (not introduced by this PR)

Missing test coverage

Uh oh!

aimane-chnaif commented Apr 28, 2026

Uh oh!

melvin-bot Bot commented Apr 28, 2026

Uh oh!

MelvinBot commented Apr 28, 2026

Uh oh!

chatgpt-codex-connector Bot commented Apr 28, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

MelvinBot commented Apr 28, 2026 •

edited

Loading

`shouldClearConvertedAmount` — safe

`convertedTaxAmount` clearing — safe