feat/80393: FE - Add "Top merchants" suggested search with group by filter by btkcodedev · Pull Request #80425 · Expensify/App

btkcodedev · 2026-01-24T15:33:35Z

Explanation of Change

We need to add the ability to Group By Merchant from Reports > Expenses (group-by:merchant) and add a "Top Merchants" suggested search to all accounts with a workspace. This feature should follow the same pattern as "Top Spenders" and other group-by options (from, card, withdrawal-id) to maintain consistency across the application.

Fixed Issues

$ #80393
PROPOSAL: #80393 (comment)

Tests

Go to test branch
Go to Reports > Expenses
Verify - "Top Merchants" is added to the suggested search on left side
Verify group-by: merchant field is present for all the workplace users
Verify no errors are present

Verify that no errors appear in the JS console

Offline tests

Same as above

QA Steps

Go to test branch
Go to Reports > Expenses
Verify - "Top Merchants" is added to the suggested search on left side
Verify group-by: merchant field is present for all the workplace users
Verify no errors are present

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

1000000334.mp4

Android: mWeb Chrome

screen-20260124-205403.mp4

iOS: Native

Screen.Recording.2026-01-24.at.7.50.11.PM.mov

iOS: mWeb Safari

Screen.Recording.2026-01-24.at.9.01.20.PM.mov

MacOS: Chrome / Safari

Screen.Recording.2026-01-24.at.7.06.12.PM.mov

melvin-bot · 2026-01-24T15:33:42Z

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

melvin-bot · 2026-01-24T15:33:43Z

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

src/libs/SearchUIUtils.ts

src/components/SelectionListWithSections/SearchTableHeader.tsx

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 182be118c2

ℹ️ 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".

chatgpt-codex-connector · 2026-01-24T15:42:01Z

src/libs/SearchUIUtils.ts

+            searchQuery: buildQueryStringFromFilterFormValues(
+                {
+                    type: CONST.SEARCH.DATA_TYPES.EXPENSE,
+                    groupBy: CONST.SEARCH.GROUP_BY.MERCHANT,
+                    dateOn: CONST.SEARCH.DATE_PRESETS.LAST_MONTH,


Add merchant grouping handling in section builders

The new Top Merchants suggestion sets groupBy: MERCHANT here, but getSections() / getSortedSections() only handle FROM/CARD/WITHDRAWAL_ID. For groupBy=merchant the switch falls through to getTransactionsSections, while getListItem() still picks TransactionGroupListItem because groupBy is truthy, so each item lacks transactions and groupItem.transactions becomes undefined at render time. That means opening the Top merchants suggestion or using group-by:merchant will either show ungrouped results with grouped columns or crash the grouped list item. Add a merchant grouping path (and sorting) similar to the existing group-by cases.

Useful? React with 👍 / 👎.

…tton

codecov · 2026-01-24T17:50:49Z

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	`83.76% <ø> (ø)`
...stWithSections/Search/TransactionGroupListItem.tsx	`78.50% <100.00%> (+6.80%)`	⬆️
...ListWithSections/Search/MerchantListItemHeader.tsx	`96.00% <96.00%> (ø)`
...ts/SelectionListWithSections/SearchTableHeader.tsx	`6.34% <0.00%> (-0.44%)`	⬇️
src/pages/Search/SearchColumnsPage.tsx	`0.00% <0.00%> (ø)`
src/libs/SearchUIUtils.ts	`63.51% <46.15%> (+3.82%)`	⬆️
... and 104 files with indirect coverage changes

btkcodedev · 2026-01-24T19:13:05Z

Feature tested and verified after resolving automated comments:

Screen.Recording.2026-01-24.at.11.14.10.PM.mov

shubham1206agra · 2026-01-25T06:01:45Z

tests/unit/SearchUIUtilsTest.ts

@btkcodedev Please update tests inside tests/unit/Search/SearchUIUtilsTest

shubham1206agra · 2026-01-25T06:02:18Z

tests/unit/Search/MerchantListItemHeaderTest.tsx

@btkcodedev Please fix the tests here

@btkcodedev It's still not fixed. Please look at other files for correct tests.

Yep, fixed now. I'll update again after the GH action run

GH actions passed. Reviewer checklist pending

@btkcodedev Again, this is not correct. Please see similar files for correct tests. You cannot suppress all ESLint errors without comments on why. And the reason must be valid too.

Corrected that, but still has ESLint suppressions for unavoidable any types in Jest mocks

shubham1206agra · 2026-01-25T06:04:50Z

src/languages/es.ts

        unapprovedCard: 'Tarjeta no aprobada',
        reconciliation: 'Conciliación',
        topSpenders: 'Mayores gastadores',
+        topMerchants: 'Principales comerciantes',


@btkcodedev Please confirm the translations

Yes, i've used claude for it, all translations looks good and professional

Read the contributor doc and checklist for how to confirm translation.

I verified any copy/text shown in the product is localized by adding it to src/languages/* files

Read

If any non-english text was added/modified, I used JaimeGPT to get English > Spanish translation. I then posted it in #expensify-open-source and it was approved by an internal Expensify engineer.

Posted - link
Awaiting approval

@shubham1206agra shouldn't the generateTranslations script be run on this PR. Only Spanish needs internal approval?

@trjExpensify, it should have triggered. Not sure how to do this manually.

shubham1206agra · 2026-01-25T06:22:01Z

src/components/Search/index.tsx

+            // Trigger searches for all groups to load their transactions (only for merchant grouping)
+            if (validGroupBy === CONST.SEARCH.GROUP_BY.MERCHANT) {
+                for (const item of filteredData as TransactionGroupListItemType[]) {
+                    if (!item.transactionsQueryJSON || isExpenseReportType) {
+                        continue;
+                    }
+                    handleSearch({
+                        queryJSON: item.transactionsQueryJSON,
+                        searchKey: undefined,
+                        offset: 0,
+                        shouldCalculateTotals: false,
+                        isLoading: false,
+                    });
+                }
+            }


@btkcodedev Why do we need this?

"Select All" must first load all expenses. Otherwise, it selects only the currently expanded merchant expenses.

@btkcodedev This bug is present for Top Spenders too. So, can you please report it so it can be handled separately? Also, remove this workaround.

mountiny · 2026-01-25T22:59:34Z

@codex review

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: ce85b06f25

ℹ️ 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".

chatgpt-codex-connector · 2026-01-25T23:16:39Z

src/libs/SearchUIUtils.ts

        const isAuditor = policy.role === CONST.POLICY.ROLE.AUDITOR;
        const isEligibleForTopSpendersSuggestion = isPaidPolicy && (isAdmin || isAuditor || isApprover);
+        const isEligibleForTopMerchantsSuggestion = isPaidPolicy && (isAdmin || isAuditor || isApprover);


Broaden Top merchants suggestion visibility

The new visibility gate for Top merchants is isPaidPolicy && (isAdmin || isAuditor || isApprover), which means regular workspace members (e.g., submitters) will never see the suggested search even though they belong to a workspace and can use group-by merchant. This hides the feature for a large portion of workspace users and contradicts the “all accounts with a workspace” intent. Consider removing the role check or aligning it with the actual availability expectations so non-admin members still get the suggestion.

Useful? React with 👍 / 👎.

That is expected I believe

The issue suggested following the same pattern as Top Spenders, so Top Merchants was also allowed within the same scope.

Frontend Release 2: Add "Top Merchants" suggested search
Follow the same pattern as "Top Spenders" and "Top Categories"

The doc is expecting all workspace members for Top Merchants, same as Top Categories:

Add a Top Merchants suggested search to all accounts with a workspace

Done. Scope changed to all workspace members

neil-marcellini

Partial review; we need the limit filter first.

neil-marcellini · 2026-01-26T17:05:50Z

src/libs/SearchUIUtils.ts

+            key: CONST.SEARCH.SEARCH_KEYS.TOP_MERCHANTS,
+            translationPath: 'search.topMerchants',
+            type: CONST.SEARCH.DATA_TYPES.EXPENSE,
+            icon: Expensicons.Receipt,


NAB: We should have a basket icon here.

There seems to be no basket icon in @assets.
~/src/components/Icon

import Bank from '@assets/images/bank.svg';
import Bell from '@assets/images/bell.svg';
import Bill from '@assets/images/bill.svg';
import boltSlash from '@assets/images/bolt-slash.svg';
import Bolt from '@assets/images/bolt.svg';
import Bookmark from '@assets/images/bookmark.svg';
import Bug from '@assets/images/bug.svg';
import Building from '@assets/images/building.svg';
import Buildings from '@assets/images/buildings.svg';

Closest fit is a building icon, or we can keep the current receipt icon.

neil-marcellini · 2026-01-26T17:08:12Z

src/libs/SearchUIUtils.ts

+                },
+                {
+                    sortBy: CONST.SEARCH.TABLE_COLUMNS.GROUP_TOTAL,
+                    sortOrder: CONST.SEARCH.SORT_ORDER.DESC,


We need to add a limit:10 here somewhere.

neil-marcellini · 2026-01-26T17:16:44Z

HOLDing until this is merged

[Due for payment 2026-02-04] [$250] [Insights] [Release 1] Top Categories - Add a limit filter to search #80035

neil-marcellini · 2026-01-27T16:52:23Z

Hi @btkcodedev we are going to have @TaduJR take this over because he recently worked on a related PR and has agreed to work in our timezone.

We will work with you to come to an agreement on compensation for your work so far.

btkcodedev · 2026-01-27T16:56:56Z

As you say @neil-marcellini
It's almost finished, all that left was just clearing your comments.

btkcodedev · 2026-01-29T03:43:20Z

@neil-marcellini The PR for this feature is merged - #80672
May I go ahead and close this PR?
Also, I would appreciate it if a courtesy payment could be provided. 🙇

shubham1206agra · 2026-01-29T03:50:48Z

@btkcodedev Please close this PR. And please request this in main issue.

feat: Top merchants

182be11

btkcodedev requested review from a team as code owners January 24, 2026 15:33

melvin-bot bot assigned btkcodedev Jan 24, 2026

melvin-bot bot requested review from joekaufmanexpensify and shubham1206agra and removed request for joekaufmanexpensify January 24, 2026 15:33

melvin-bot bot requested review from a team and removed request for a team January 24, 2026 15:33

melvin-bot bot requested review from JmillsExpensify and removed request for a team January 24, 2026 15:33

format: prettify

68b64ce

github-actions bot reviewed Jan 24, 2026

View reviewed changes

src/libs/SearchUIUtils.ts Show resolved Hide resolved

github-actions bot reviewed Jan 24, 2026

View reviewed changes

src/components/SelectionListWithSections/SearchTableHeader.tsx Show resolved Hide resolved

fix: resolve consistency problems

eacf2b8

chatgpt-codex-connector bot reviewed Jan 24, 2026

View reviewed changes

btkcodedev added 5 commits January 24, 2026 21:41

fix: Add merchant grouping handling in section builders

93606f1

fix: translations, list merchants

3af49a0

fix: sort merchant arrows, load and then select all for All select bu…

e52240f

…tton

fix eslint

abf17ea

fix tslint

740eca5

btkcodedev added 2 commits January 25, 2026 00:41

test: add test files

ab2d0ac

format: prettify

a1af157

btkcodedev mentioned this pull request Jan 24, 2026

[Due for Payment 2026-02-04] [$250] [Insights] [Release 2] Top Merchants - Add group-by:merchant and suggested search #80393

Closed

shubham1206agra reviewed Jan 25, 2026

View reviewed changes

btkcodedev added 8 commits January 25, 2026 11:52

fix all comments

306e78c

fix eslint, prettify

923daad

fix eslint

c293ebd

fix eslint

f782b0a

fix eslint

251db63

remove work around for grouping, fix eslint

2c359b3

fix eslint

74c724f

fix: remove file suppresion and suppress mocks

ce85b06

chatgpt-codex-connector bot reviewed Jan 25, 2026

View reviewed changes

neil-marcellini requested changes Jan 26, 2026

View reviewed changes

neil-marcellini changed the title ~~feat/80393: FE - Add "Top merchants" suggested search with group by filter~~ [HOLD 80262] feat/80393: FE - Add "Top merchants" suggested search with group by filter Jan 26, 2026

fix: scope to all workspace members for Top Merchant

c176b04

puneetlath changed the title ~~[HOLD 80262] feat/80393: FE - Add "Top merchants" suggested search with group by filter~~ feat/80393: FE - Add "Top merchants" suggested search with group by filter Jan 27, 2026

neil-marcellini unassigned btkcodedev Jan 27, 2026

btkcodedev closed this Jan 29, 2026

btkcodedev deleted the btkcodedev/80393TopMerchants branch March 13, 2026 07:10

Conversation

btkcodedev commented Jan 24, 2026

Explanation of Change

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

Uh oh!

melvin-bot bot commented Jan 24, 2026

Uh oh!

melvin-bot bot commented Jan 24, 2026

Uh oh!

Uh oh!

Uh oh!

chatgpt-codex-connector bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

chatgpt-codex-connector bot Jan 24, 2026

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

codecov bot commented Jan 24, 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!

btkcodedev commented Jan 24, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

mountiny commented Jan 25, 2026

Uh oh!

chatgpt-codex-connector bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

codecov bot commented Jan 24, 2026 •

edited by github-actions bot

Loading

btkcodedev commented Jan 24, 2026 •

edited

Loading

neil-marcellini commented Jan 27, 2026 •

edited

Loading

btkcodedev commented Jan 29, 2026 •

edited

Loading