[Payment due @huult][NO QA] Show the debited and reimbursed amounts on the reconciliation dashboard by ishpaul777 · Pull Request #97167 · Expensify/App

ishpaul777 · 2026-07-27T23:16:30Z

Explanation of Change

Grouped by Withdrawal ID, the dashboard only showed the report total. A cross-border settlement debits the company and credits the employee in different currencies, so one number cannot describe it.

Adds Amount debited and Amount reimbursed between Expenses and Total, each in its own currency, from Auth #23263.

Visibility. The columns appear once a group in the results has an amount and its currency, the way the report list already handles the submitter columns. The issue asked to gate on being an admin of a workspace with a global reimbursement bank account, which the client cannot tell: the policy payload only carries achAccount, while Auth derives global reimbursement from the policy's reimbursement countries. Gating on the data lands in the same place.
Sorting. Both columns sort. Neither side converts between currencies: the server ranks the amounts as stored to pick the page, and the client then orders that page the same way, so a group can outrank one worth more in another currency. The client sort is the one you see - Search never reads the ordering the backend sends, so a column with no local sort key never reorders at all.
Translations. Hand-written because generateTranslations skips pull requests from forks.

Fixed Issues

$ https://github.com/Expensify/Expensify/issues/655931
PROPOSAL: N/A - internal issue

Tests

Sign in as an admin of a workspace with global reimbursements enabled and at least one cross-border reimbursement that has settled.
Go to Reports, then the Reconciliation tab (Search grouped by Withdrawal ID).
On an account that has never customized the reconciliation columns, verify the table shows Amount debited and Amount reimbursed between Expenses and Total.
Verify the cross-border settlement row shows the debited amount in the company's settlement currency and the reimbursed amount in the employee's deposit currency, and that they differ.
Verify a domestic settlement row leaves both cells blank.
Open the column picker, uncheck Amount debited, and verify the column and its header disappear and the rest of the table stays aligned.
On an account that had already saved a custom set of reconciliation columns, verify neither column shows up until it is checked in the column picker. Saved preferences replace the defaults rather than being merged with them, so the two new columns start off for these accounts.
Sign in as an admin whose settlements are all domestic and verify neither column appears at all.
Click the Amount debited header and verify the rows reorder by that amount, and that clicking it again flips the order. Repeat for Amount reimbursed.
Verify sorting by Withdrawn, Expenses and Total still works.

Verify that no errors appear in the JS console

Offline tests

Load the Reconciliation tab while online, then turn off the network connection.
Verify the previously loaded groups still render both amounts from the cached snapshot.
Verify no error or blank state appears for the two columns while offline.

QA Steps

Same as tests, using a staging account that is an admin of a workspace with global reimbursements enabled and a settled cross-border reimbursement.

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Screen.Recording.2026-08-04.at.6.09.34.PM.mov

Screen.Recording.2026-08-04.at.6.11.02.PM.mov

Screen.Recording.2026-08-04.at.6.08.36.PM.mov

Screen.Recording.2026-08-04.at.6.13.06.PM.mov

…roups

…s until a settlement converts

melvin-bot · 2026-07-27T23:16:34Z

Hey, I noticed you changed src/languages/en.ts in a PR from a fork. For security reasons, translations are not generated automatically for PRs from forks.

If you want to automatically generate translations for other locales, an Expensify employee will have to:

Look at the code and make sure there are no malicious changes.
Run the Generate static translations GitHub workflow. If you have write access and the K2 extension, you can simply click: [this button]

Alternatively, if you are an external contributor, you can run the translation script locally with your own OpenAI API key. To learn more, try running:

npx ts-node ./scripts/generateTranslations.ts --help

Typically, you'd want to translate only what you changed by running npx ts-node ./scripts/generateTranslations.ts --compare-ref main

ishpaul777 · 2026-07-28T00:55:49Z

@MelvinBot review

ishpaul777 · 2026-07-28T00:55:55Z

@codex review

SortableTableHeader only makes a header pressable when isColumnSortable is set, so without it the columns rendered as plain labels and the sort Auth supports could not be reached. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>

getSortedData re-sorts the page by the mapped property, which for these two columns is a raw amount in whichever currency that settlement used. Ranking GBP 10250 against USD 12000 that way puts them in the wrong order. Unmapped columns fall through with the data untouched, which is the order Auth already computed from a common-currency sort key. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>

typecheck and TranslateTest both fail on a key that only exists in en.ts. The generateTranslations bot skips pull requests from forks, so these are written by hand. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>

MelvinBot · 2026-07-28T01:03:42Z

🤖 Reviewed the diff. The visibility gating, types, styles, parser regen, and the two column-availability tests all look clean and match the existing patterns. One blocker on the sorting behavior, plus a design question and a minor nit.

🔴 The two new columns aren't actually sortable

The PR description says "Both columns are sortable" and Test step 8 asks to click the Amount debited / Amount reimbursed headers to reorder — but the new header configs are missing isColumnSortable: true:

SearchTableHeader.tsx:411-418 — unlike groupExpensesHeader and groupTotalHeader (which set isColumnSortable: true), the two new entries set neither true nor false, so the flag is undefined.

In SortableTableHeader.tsx:79 sortability is shouldShowSorting && isColumnSortable, so undefined → the header renders non-clickable and never fires onSortPress. The sort mapping you added at SearchUIUtils.ts:370-371 is therefore dead code today. Add isColumnSortable: true to both header entries.

🟡 Once sortable, the client sorts by the raw per-currency amount

The description argues raw amounts can't be ranked across currencies and that the server ranks via a hidden converted key. But grouped results are re-sorted client-side — getSortedSections → groupBySortFunction[WITHDRAWAL_ID] → getSortedData always runs in useSearchSnapshot/SearchStaticList — and your mapping points at the raw debitedAmount / creditedAmount fields, so the displayed order will be by raw magnitude, not the server's converted key. (This mirrors the existing groupTotal → 'total' mapping, so it may be acceptable, but it contradicts the reasoning in the description.) Worth confirming once you flip the sortable flag that the resulting order is what you intend — there's no converted key on the client SearchWithdrawalIDGroup type to sort by.

🟢 Minor: falsy guard hides a zero amount

WithdrawalIDListItemHeader.tsx:189 (and L202) gate on !!debitedAmount && !!debitedCurrency. A legitimate 0 amount would be treated as absent and the cell left blank. Almost certainly a non-issue for a real settlement, and negatives (the test uses -10000) are fine — just flagging in case a zeroed conversion is possible.

Everything else looks good — nice touch adding the ColumnAvailability guard entries so the new columns force a deliberate picker decision, and the visibility tests cover both the domestic-hidden and missing-currency cases.

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 3d7bcaccf9

ℹ️ About Codex in GitHub

Your team has set up Codex to 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 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

codecov · 2026-07-28T01:09:59Z

Codecov Report

❌ Looks like you've decreased code coverage for some files. Please write tests to increase, or at least maintain, the existing level of code coverage. See our documentation here for how to interpret this table.

Files with missing lines	Coverage Δ
src/CONST/index.ts	`94.81% <ø> (ø)`
.../components/Search/FilterDropdowns/SortByPopup.tsx	`3.03% <ø> (ø)`
src/components/Search/hooks/useSearchSnapshot.ts	`87.64% <ø> (ø)`
src/hooks/useSearchOverlay.tsx	`55.88% <ø> (ø)`
src/components/Search/SortableTableHeader.tsx	`43.47% <0.00%> (-1.98%)`	⬇️
src/components/Search/SearchTableHeader.tsx	`49.43% <0.00%> (-1.14%)`	⬇️
src/styles/utils/index.ts	`55.87% <0.00%> (-0.27%)`	⬇️
src/libs/SearchUIUtils.ts	`65.15% <70.58%> (+0.02%)`	⬆️
...SearchList/ListItem/WithdrawalIDListItemHeader.tsx	`0.00% <0.00%> (ø)`
src/libs/SearchParser/searchParser.js	`84.76% <90.63%> (-0.62%)`	⬇️
... and 1 more
... and 6 files with indirect coverage changes

The list is built at module scope, so the name resolves the moment the file loads and grouping by category throws instead of rendering.

The helper answered "does this column have data" for every column, which read as a double negative for the ones it knows nothing about. Bail out on a transaction array first, then ask the question only of the two conversion columns, matching the expense report branch above.

The server communicates its order through orderedKeys, which the client never reads, so a column with no sorting property leaves the rows in the order the response object happened to be keyed in and clicking the header does nothing. Point both columns at their amount, the way the total column already works.

ishpaul777 · 2026-07-28T10:57:21Z

@MelvinBot final review this

MelvinBot · 2026-07-28T11:02:46Z

Final review

LGTM — the change is well-scoped and complete. The two currency-aware columns are wired through the whole stack consistently, and the edge cases you'd worry about are covered. A couple of non-blocking observations below.

What I verified

Both parsers regenerated. group-amount-debited / group-amount-reimbursed are present in both searchParser.js and autocompleteParser.js, matching the new baseRules.peggy rules — so the generated files aren't stale.
All 10 locales updated with both amountDebited / amountReimbursed keys (en, es, fr, it, de, nl, pl, ja, zh-hans, pt-BR).
Completeness guard is satisfied. Both new columns are added to the COLUMN_AVAILABILITY single-source-of-truth set in ColumnAvailabilityTest.ts, so the "every TABLE_COLUMNS value is classified" test won't fail.
Visibility gating is sound. hasGroupWithConversionAmount requires both amount and currency, and the filter only applies to conversion columns — other groupBy paths pass through untouched. The Array.isArray(data) early-return keeps the non-Onyx-map callers safe. Unit tests cover the domestic-only, cross-border, and missing-currency cases.
Per-row blanking matches the gating — the header cells only render a TotalCell when the row itself has amount + currency, so a domestic row inside a mixed page stays blank.

Observations (non-blocking)

The PR description's "Sorting" bullet contradicts the final code. It says "The client deliberately does not sort these two locally", but the sorting map adds debitedAmount / creditedAmount as local sort keys, and both a unit test and the last commit ("Order the page by the conversion amounts the row shows") confirm the client does sort locally. This is fine as implemented — it's the same raw-number behavior GROUP_TOTAL already uses — but the description prose is stale and could mislead QA. Worth updating so it matches steps 8 and the code comment.
Zero-amount edge. Gating on !!amount (both in the row cell and hasGroupWithConversionAmount) treats a genuine converted amount of 0 as absent. Almost certainly irrelevant for real cross-border settlements, just flagging it since it's a truthiness check rather than a !== undefined.

Neither blocks merge — nice, clean PR.

melvin-bot · 2026-07-31T14:56:52Z

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

huult · 2026-08-04T06:20:59Z

Screen.Recording.2026-08-04.at.13.09.38.mov

Screen.Recording.2026-08-04.at.13.14.44.mov

Screen.Recording.2026-08-04.at.13.15.37.mov

Screen.Recording.2026-08-04.at.13.17.16.mov

Screen.Recording.2026-08-04.at.13.17.59.mov

I can't enable Global Reimbursements with my test account. I mocked the data to verify the UI, but I couldn't test the sorting because I don't have the required permissions.

@ishpaul777, could you please record the behavior on all platforms and share the videos with @shawnborton? Thanks!

ishpaul777 · 2026-08-04T07:23:16Z

@ishpaul777 How did you enable Global Reimbursements? I tried using a test account, but I couldn't get it working.

we dont have any setup on prod to test this yet, mock data in onyx works for now! i'll add videos for other platforms as well 👍

huult · 2026-08-04T07:26:48Z

@ishpaul777 could you run this translation? thanks

huult · 2026-08-04T13:35:53Z

Let us know when there are screenshots to review.

@shawnborton We have the screenshot. Could you review it?

shawnborton · 2026-08-04T15:50:05Z

Sweet, looks fine to me 👍

huult

LGTM.

melvin-bot · 2026-08-05T03:34:55Z

🎯 @huult, thanks for reviewing and testing this PR! 🎉

A payment issue will be created for your review once this PR is deployed to production.
E/E issue linked to the PR - https://www.github.com/Expensify/Expensify/issues/655931.

If payment is not needed (e.g., regression PR review fix etc), react with 👎 to this comment to prevent the payment issue from being created.

huult · 2026-08-05T03:36:15Z

@ishpaul777 If the QA team has any questions about the test steps, please help them.

ishpaul777 · 2026-08-05T07:56:19Z

This will be No QA, we will internal QA when we have setup for it on prod

github-actions · 2026-08-05T12:16:01Z

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

OSBotify · 2026-08-05T12:17:57Z

✋ 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 · 2026-08-05T12:22:09Z

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

Android 🤖	iOS 🍎
https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-android-Adhoc-7c8b3288f7a-0ad880f-7cd8bb6a4aec8f560a777c565e7619a937eaee5b/index.html	https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-ios-device-AdHoc-7c8b328-0ad880f-7ededec42ec5bb4fd143d754431ae0aaa539bb5d/index.html

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

👀 View the workflow run that generated this build 👀

OSBotify · 2026-08-05T23:02:28Z

🚀 Deployed to staging by https://github.com/madmax330 in version: 9.4.51-0 🚀

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

MelvinBot · 2026-08-05T23:21:49Z

Help site review — docs update needed ✅

This PR adds two columns — Amount debited and Amount reimbursed — to the reimbursement reconciliation view (Search grouped by Withdrawal ID), showing each side of a cross-border settlement in its own currency. That view is documented on the help site in Reconcile-Reimbursements.md, which currently says each row only "shows the total amount" and makes no mention of the new per-currency columns — so a docs update is required.

Draft PR: #97920

What it changes:

Notes that a cross-border row also shows Amount debited and Amount reimbursed in their own currencies.
Adds a How to Read the Amount Debited and Amount Reimbursed Columns section explaining what each shows and that domestic reimbursements leave them blank.
Adds an FAQ entry and retrieval keywords.

The exact column labels (Amount debited, Amount reimbursed) and their placement between Expenses and Total were verified against the current App UI and the src/languages/en.ts strings.

@ishpaul777, please review the linked help site PR and confirm it reflects the current behavior. Then mark the linked help site PR Ready for review

melvin-bot · 2026-08-10T20:10:37Z

🤖 Payment issue created: #98186

OSBotify · 2026-08-10T20:12:24Z

🚀 Deployed to production by https://github.com/roryabraham in version: 9.4.51-1 🚀

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

Bundle Size Analysis (Sentry):

Android

ishpaul777 added 2 commits July 28, 2026 04:44

Add the amount debited and amount reimbursed columns for withdrawal g…

e179095

…roups

Render each conversion amount in its own currency and hide the column…

1174e9d

…s until a settlement converts

melvin-bot Bot assigned ishpaul777 Jul 27, 2026

ishpaul777 added 2 commits July 28, 2026 05:12

Allow sorting the reconciliation dashboard by either conversion amount

b679269

Keep the conversion amount headers inside their own columns

3d7bcac

ishpaul777 and others added 3 commits July 28, 2026 06:26

Translate the two new column headers

4754bb4

typecheck and TranslateTest both fail on a key that only exists in en.ts. The generateTranslations bot skips pull requests from forks, so these are written by hand. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>

chatgpt-codex-connector Bot reviewed Jul 28, 2026

View reviewed changes

Comment thread src/libs/SearchUIUtils.ts

Comment thread src/components/Search/SearchTableHeader.tsx

ishpaul777 added 3 commits July 28, 2026 06:49

Drop a stray token from the category headers

ad783d4

The list is built at module scope, so the name resolves the moment the file loads and grouping by category throws instead of rendering.

ishpaul777 added 4 commits July 31, 2026 19:39

Merge branch 'main' into ishpaul/655931-reconciliation-fx-columns

1e8c428

Say that neither side of the conversion amount sort converts currencies

529a9f7

Hide a conversion amount column when no rendered group carries it

7db27a0

Drop a ts-expect-error the assignment does not need

d6f2622

ishpaul777 marked this pull request as ready for review July 31, 2026 14:56

ishpaul777 requested review from a team as code owners July 31, 2026 14:56

melvin-bot Bot requested review from huult and removed request for a team July 31, 2026 14:56

Merge branch 'main' into ishpaul/655931-reconciliation-fx-columns

8a0bd42

Add the Greek strings for the two conversion amount columns

9a7841b

Regenerate the two conversion amount strings with the translation script

baf9b30

huult approved these changes Aug 5, 2026

View reviewed changes

melvin-bot Bot changed the title ~~Show the debited and reimbursed amounts on the reconciliation dashboard~~ [Payment due @huult] Show the debited and reimbursed amounts on the reconciliation dashboard Aug 5, 2026

ishpaul777 changed the title ~~[Payment due @huult] Show the debited and reimbursed amounts on the reconciliation dashboard~~ [Payment due @huult][NO QA] Show the debited and reimbursed amounts on the reconciliation dashboard Aug 5, 2026

ishpaul777 requested a review from madmax330 August 5, 2026 07:56

madmax330 approved these changes Aug 5, 2026

View reviewed changes

madmax330 closed this Aug 5, 2026

madmax330 reopened this Aug 5, 2026

madmax330 merged commit 7c8b328 into Expensify:main Aug 5, 2026
47 checks passed

OSBotify mentioned this pull request Aug 5, 2026

Deploy Checklist: New Expensify 2026-08-05 #97910

Closed

46 tasks

MelvinBot mentioned this pull request Aug 5, 2026

[No QA] Docs updates for E/A#97167 Reconciliation debited and reimbursed amount columns #97920

Open

melvin-bot Bot mentioned this pull request Aug 10, 2026

[Due for payment 2026-08-17] Payment issue for E/App PR#97167 #98186

Closed

quinthar added the #convert label Aug 11, 2026

Uh oh!

Conversation

ishpaul777 commented Jul 27, 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 Jul 27, 2026

Uh oh!

ishpaul777 commented Jul 28, 2026

Uh oh!

ishpaul777 commented Jul 28, 2026

Uh oh!

MelvinBot commented Jul 28, 2026

🔴 The two new columns aren't actually sortable

🟡 Once sortable, the client sorts by the raw per-currency amount

🟢 Minor: falsy guard hides a zero amount

Uh oh!

chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

Uh oh!

Uh oh!

codecov Bot commented Jul 28, 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!

ishpaul777 commented Jul 28, 2026

Uh oh!

MelvinBot commented Jul 28, 2026

Final review

Observations (non-blocking)

Uh oh!

melvin-bot Bot commented Jul 31, 2026

Uh oh!

huult commented Aug 4, 2026

Uh oh!

ishpaul777 commented Aug 4, 2026

Uh oh!

huult commented Aug 4, 2026

Uh oh!

huult commented Aug 4, 2026

Uh oh!

shawnborton commented Aug 4, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

huult left a comment

Choose a reason for hiding this comment

Uh oh!

melvin-bot Bot commented Aug 5, 2026

Uh oh!

huult commented Aug 5, 2026

Uh oh!

ishpaul777 commented Aug 5, 2026

Uh oh!

Uh oh!

github-actions Bot commented Aug 5, 2026

Uh oh!

OSBotify commented Aug 5, 2026

Uh oh!

github-actions Bot commented Aug 5, 2026

Uh oh!

OSBotify commented Aug 5, 2026

Uh oh!

MelvinBot commented Aug 5, 2026

Help site review — docs update needed ✅

Uh oh!

melvin-bot Bot commented Aug 10, 2026

Uh oh!

OSBotify commented Aug 10, 2026

Uh oh!

Reviewers

Assignees

Labels

ishpaul777 commented Jul 27, 2026 •

edited

Loading

codecov Bot commented Jul 28, 2026 •

edited by github-actions Bot

Loading

shawnborton commented Aug 4, 2026 •

edited

Loading