Add reconciliation #67970

luacmartins · 2025-08-05T22:32:22Z

Explanation of Change

Adds the Reconciliation option to the Reports page menu

Fixed Issues

$ #64576
$ #66974

Tests

Pre-requisite:

an account with a paid policy that has either payments enabled, an open VBBA and a reimburser set OR expensify cards assigned
an account with withdrawals from the bank accounts or ECard statement payments

Navigate to the Reports page
Verify that you see Reconciliation on the LHN
Press it and verify that the search bar is populated with type:expense withdrawal-type:reimbursement withdrawn:last-month
Verify that you see the bank settlements
Change withdrawal-type to expensify-card
Verify that you see the expensify card statement payments
Open the Filters RHP
Verify that you see the withdrawal-type filter

Verify that no errors appear in the JS console

Offline tests

N/A

QA Steps

N/A

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Screen.Recording.2025-08-21.at.1.53.51.PM.mov

Android: Native

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

MacOS: Desktop

melvin-bot · 2025-08-21T19:42:17Z

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

github-actions · 2025-08-21T19:55:57Z

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

luacmartins · 2025-08-21T20:07:06Z

1P rate limited the builds 😞

src/libs/SearchUIUtils.ts

ikevin127 · 2025-08-21T23:01:16Z

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 tests pass on all platforms & I tested again on:
- Android: Native
- Android: mWeb Chrome
- iOS: Native
- 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 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 the left part of a conditional rendering a React component is a boolean and NOT a string, e.g. myBool && <MyComponent />.
- 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.js 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.
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-hybrid.mp4

Android: mWeb Chrome

android-mweb.mp4

iOS: HybridApp

ios-hybrid.mp4

iOS: mWeb Safari

ios-mweb.mp4

MacOS: Chrome / Safari

web.mov

MacOS: Desktop

desktop.mov

ikevin127 · 2025-08-21T23:55:37Z

🟡 Several languages use a reconciliation term for human relationships rather than the accounting concept, which can confuse users. Recommended corrections (accounting domain):

de: Use “Abgleich” (or “Kontenabstimmung”, but “Abgleich” is concise and standard)
fr: Use “Rapprochement” (as in “Rapprochement bancaire”)
it: “Riconciliazione”
nl: Use “Afstemming” (or “Reconciliatie”, but “Afstemming” is more common NL)
pl: Use “Uzgodnienie” (as in “uzgodnienie bankowe”)
pt-BR: Use “Conciliação” (as in “Conciliação bancária”)
es: Prefer “Conciliación” over “Reconciliación” in banking/accounting contexts
ja: Use “照合” (or “消込”). “調整” means adjustment, not reconciliation
zh-hans: “对账” is correct ✅

Why this matters: Inaccurate translations directly harm UX and trust (users think we’re referring to personal “reconciliation” instead of accounting reconciliation), it can also negatively impact search discoverability in non-English locales.

// de.ts
reconciliation: 'Abgleich',

// fr.ts
reconciliation: 'Rapprochement',

// it.ts
reconciliation: 'Riconciliazione',

// nl.ts
reconciliation: 'Afstemming',

// pl.ts
reconciliation: 'Uzgodnienie',

// pt-BR.ts
reconciliation: 'Conciliação',

// es.ts
reconciliation: 'Conciliación',

// ja.ts
reconciliation: '照合',

// zh-hans.ts
reconciliation: '对账', // already correct

src/libs/SearchUIUtils.ts

luacmartins · 2025-08-22T00:09:28Z

Updated!

tests/unit/Search/SearchUIUtilsTest.ts

github-actions · 2025-08-22T17:17:50Z

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

Android 🤖	iOS 🍎
https://ad-hoc-expensify-cash.s3.amazonaws.com/android/67970/index.html	https://ad-hoc-expensify-cash.s3.amazonaws.com/ios/67970/index.html

Desktop 💻	Web 🕸️
https://ad-hoc-expensify-cash.s3.amazonaws.com/desktop/67970/NewExpensify.dmg	https://67970.pr-testing.expensify.com

👀 View the workflow run that generated this build 👀

JmillsExpensify · 2025-08-22T19:58:11Z

A couple of questions from me, some NAB:

If you set a withdrawal date far back in the past, then you immediately see the "Nothing to show" empty state, even though the search call is still running.
We're missing an exposed filter for Withdrawal type. That needs to be exposed because otherwise we'd need to show two Reconciliation searches in the LHN.

luacmartins · 2025-08-22T20:07:31Z

We're missing an exposed filter for Withdrawal type. That needs to be exposed because otherwise we'd need to show two Reconciliation searches in the LHN.

I addressed this one.

If you set a withdrawal date far back in the past, then you immediately see the "Nothing to show" empty state, even though the search call is still running.

Do you have a video for this? My impression is that this would happen with other filters too, so maybe NAB here

ikevin127 · 2025-08-22T20:43:46Z

@luacmartins @JmillsExpensify Following the manual testing steps, while on the https://expensify-cmartins.ngrok.io tunnel using the feed@feed.com account I'm noticing a few potential issues which I'd like addressed before completing the checklist:

Testing step 4 is mentioning 4. Verify that you see the bank settlements and I'm not sure those are showing as expected, meaning this test step seems to be failing.
The LHN Reconciliation tab loses hightlight when withdrawn date is changed to a range (before / after), it only remains highlighted if withdrawn date is last-month or this-month or On date.
Similar to the one above, same thing happens while Withdrawal type: Reimbursement and Withdrawn: Last month are selected, if I add any other filter like Status: Paid -> LHN Reconciliation tab loses hightlight.
With the ngrok tunnel / account I only get results for withdrawn-type: Expensify Card and only if I set After date to sometime in 202 (eg. August 1st, 2020) and Before date to end of current month (eg. August 31st, 2025), but nothing for withdrawn-type: Reimbursement - does this mean the test account doesn't have any such data in DB or it has but we're having an implementation issue ?
I know we discussed here during code review about the empty state copy / images, and noticed that Withdrawal type: Reimbursement and Withdrawal type: Expensify Card have different copy / images:

See discrepancy screenshots

Reimbursement	Expensify Card

Here's a video:

Screen.Recording.2025-08-22.at.13.41.38.mov

Let me know if all these are expected, then I'll add the same video to the reviewer checklist, finish testing and Approve.

luacmartins · 2025-08-22T21:46:51Z

Testing step 4 is mentioning 4. Verify that you see the bank settlements and I'm not sure those are showing as expected, meaning this test step seems to be failing.

With the ngrok tunnel / account I only get results for withdrawn-type: Expensify Card and only if I set After date to sometime in 202 (eg. August 1st, 2020) and Before date to end of current month (eg. August 31st, 2025), but nothing for withdrawn-type: Reimbursement - does this mean the test account doesn't have any such data in DB or it has but we're having an implementation issue ?

Ah yea, that account doesn't have bank withdrawals, only Ecard ones. My bad!

The LHN Reconciliation tab loses hightlight when withdrawn date is changed to a range (before / after), it only remains highlighted if withdrawn date is last-month or this-month or On date.

Nice catch. This seems to happen for the Statements item too if we change posted. I pushed a fix.

Similar to the one above, same thing happens while Withdrawal type: Reimbursement and Withdrawn: Last month are selected, if I add any other filter like Status: Paid -> LHN Reconciliation tab loses hightlight.

I think this is expected. Those LHN should only be highlighted if the query is similar, which adding paid would make it a different query.

I know we #67970 (comment) during code review about the empty state copy / images, and noticed that Withdrawal type: Reimbursement and Withdrawal type: Expensify Card have different copy / images:

I pushed a fix for all of them. Now we check the similarSearchHash, instead of the hash.

ikevin127 · 2025-08-22T22:49:18Z

Thanks for the fixes, I confirm that all the points from my previous comment were fixed / addressed ✅
♻️ Proceeding with the checklist completion...

ikevin127

I tested on my own account since the ngrok seems to be down, the only thing is that on my account there were no results for either types, but other than that LGTM.

melvin-bot · 2025-08-22T23:17:12Z

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

s77rt · 2025-08-22T21:42:11Z

src/libs/SearchQueryUtils.ts

+    const filterSet = new Set<string>(orderedQuery);

    query.flatFilters
        .map((filter) => {
-            similarSearchHashInput += filter.key;
+            filterSet.add(filter.key);


NAB. Should we exclude dates so that their presence does not affect the similar hash value? Currently if you remove the withdrawn filter, the reconciliation LHN item is no longer highlighted (same for statements with posted filter)

I'm not sure that we want to completely remove those, since those filters are still part of the suggested search. I think we leave it as is for now and maybe reconsider if we think this is disruptive to users.

src/libs/SearchUIUtils.ts

JS00001

Looking good, grouping will get added in a follow up, right?

luacmartins · 2025-08-25T15:59:22Z

Looking good, grouping will get added in a follow up, right?

Yes

Addressed

OSBotify · 2025-08-25T16:59:24Z

✋ 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 · 2025-08-26T11:19:41Z

🚀 Deployed to staging by https://github.com/luacmartins in version: 9.1.99-0 🚀

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

OSBotify · 2025-08-28T01:17:26Z

🚀 Deployed to production by https://github.com/thienlnam in version: 9.1.99-11 🚀

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

luacmartins added 3 commits August 5, 2025 16:15

add reconciliation

5d29082

add conditional

1822f4a

add filters

e4601f9

luacmartins self-assigned this Aug 5, 2025

luacmartins added 3 commits August 21, 2025 12:44

resolve conflicts

b12807a

reoder logic

9a83b84

add tests

80c52ec

luacmartins requested review from JS00001 and ikevin127 August 21, 2025 19:42

luacmartins marked this pull request as ready for review August 21, 2025 19:42

luacmartins requested a review from a team as a code owner August 21, 2025 19:42

melvin-bot bot requested review from ZhenjaHorbach and removed request for a team August 21, 2025 19:42

luacmartins removed the request for review from ZhenjaHorbach August 21, 2025 19:43

rm group by

64509b1

This comment has been minimized.

Sign in to view

s77rt previously requested changes Aug 21, 2025

View reviewed changes

src/libs/SearchUIUtils.ts Show resolved Hide resolved

src/libs/SearchUIUtils.ts Show resolved Hide resolved

add withdrawn filter

40bbcab

luacmartins requested a review from s77rt August 21, 2025 22:21

ikevin127 reviewed Aug 22, 2025

View reviewed changes

src/libs/SearchUIUtils.ts Outdated Show resolved Hide resolved

address comments

6628a0c

luacmartins requested a review from ikevin127 August 22, 2025 00:09

ikevin127 reviewed Aug 22, 2025

View reviewed changes

tests/unit/Search/SearchUIUtilsTest.ts Show resolved Hide resolved

add tests

81c8b57

show withdrawal-type

81ec9a8

luacmartins added 2 commits August 22, 2025 15:17

fix lhn

62add1a

fix empty views

8249b4c

luacmartins added 2 commits August 22, 2025 15:48

add test

707e85c

update tests

832aa92

ikevin127 approved these changes Aug 22, 2025

View reviewed changes

melvin-bot bot requested a review from Gonals August 22, 2025 23:17

s77rt reviewed Aug 23, 2025

View reviewed changes

s77rt mentioned this pull request Aug 24, 2025

Search: Update animation for statements empty view #69126

Merged

51 tasks

JS00001 removed the request for review from Gonals August 25, 2025 10:16

JS00001 approved these changes Aug 25, 2025

View reviewed changes

Merge branch 'main' into cmartins-addReconciliation

afe2587

luacmartins requested a review from s77rt August 25, 2025 16:47

luacmartins merged commit 8c3b8be into main Aug 25, 2025
28 of 29 checks passed

luacmartins deleted the cmartins-addReconciliation branch August 25, 2025 16:49

OSBotify mentioned this pull request Aug 26, 2025

Deploy Checklist: New Expensify 2025-08-26 #69233

Closed

Add reconciliation #67970

Add reconciliation #67970

Uh oh!

Conversation

luacmartins commented Aug 5, 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 Aug 21, 2025

Uh oh!

github-actions bot commented Aug 21, 2025

Uh oh!

This comment has been minimized.

luacmartins commented Aug 21, 2025

Uh oh!

Uh oh!

Uh oh!

ikevin127 commented Aug 21, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

ikevin127 commented Aug 21, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

luacmartins commented Aug 22, 2025

Uh oh!

Uh oh!

github-actions bot commented Aug 22, 2025

Uh oh!

JmillsExpensify commented Aug 22, 2025

Uh oh!

luacmartins commented Aug 22, 2025

Uh oh!

ikevin127 commented Aug 22, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

luacmartins commented Aug 22, 2025

Uh oh!

ikevin127 commented Aug 22, 2025

Uh oh!

ikevin127 left a comment

Choose a reason for hiding this comment

Uh oh!

melvin-bot bot commented Aug 22, 2025

Uh oh!

s77rt Aug 22, 2025

Choose a reason for hiding this comment

Uh oh!

luacmartins Aug 25, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

JS00001 left a comment

Choose a reason for hiding this comment

Uh oh!

luacmartins commented Aug 25, 2025

Uh oh!

Uh oh!

OSBotify commented Aug 25, 2025

Uh oh!

OSBotify commented Aug 26, 2025

Uh oh!

OSBotify commented Aug 28, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants

luacmartins commented Aug 5, 2025 •

edited

Loading

ikevin127 commented Aug 21, 2025 •

edited

Loading

ikevin127 commented Aug 21, 2025 •

edited

Loading

ikevin127 commented Aug 22, 2025 •

edited

Loading