fix: Restrict sticky group headers to explicit groupBy queries only by Krishna2323 · Pull Request #93507 · Expensify/App

Krishna2323 · 2026-06-13T01:02:54Z

Explanation of Change

This PR accidentally included type === EXPENSE_REPORT in the condition that activates the new GroupHeader/GroupChildrenContainer split-rendering path. This bypassed ExpenseReportListItem on large screens, causing 10+ regressions (Pay, Approve, selection, violations, etc.).

The rendering pipeline was never designed for this — getListItem() always returns ExpenseReportListItem for EXPENSE_REPORT type, and TransactionGroupListItem only for explicit groupBy queries. The split path should follow the same logic.

App/src/libs/SearchUIUtils.ts

Lines 3563 to 3580 in f568f8b

    
           /** 
        
            * Returns the appropriate list item component based on the type and status of the search data. 
        
            */ 
        
           function getListItem(type: SearchDataTypes, status: SearchStatus, groupBy?: SearchGroupBy): ListItemType<typeof type, typeof status> { 
        
               if (type === CONST.SEARCH.DATA_TYPES.CHAT) { 
        
                   return ChatListItem; 
        
               } 
        
               if (type === CONST.SEARCH.DATA_TYPES.TASK) { 
        
                   return TaskListItem; 
        
               } 
        
               if (type === CONST.SEARCH.DATA_TYPES.EXPENSE_REPORT) { 
        
                   return ExpenseReportListItem; 
        
               } 
        
               if (groupBy) { 
        
                   return TransactionGroupListItem; 
        
               } 
        
               return TransactionListItem; 
        
           }

The fix removes that condition so the split only activates for explicit groupBy, restoring the Reports tab to ExpenseReportListItem.

Fixed Issues

$ #88926
$ #93485
$ #93486
$ #93488
$ #93489
$ #93491
$ #93492
$ #93494
$ #93495
$ #93496
$ #93493
PROPOSAL:

Tests

Go to Spend > Reports on a large screen (desktop/web).
Verify reports render as before (single row per report, expand/collapse works).
Verify all the linked issues are fixed

Verify that no errors appear in the JS console

Offline tests

Same as tests

QA Steps

Same as tests
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

Monosnap.screencast.2026-06-13.06-36-33.mp4

Signed-off-by: krishna2323 <belivethatkg@gmail.com>

melvin-bot · 2026-06-13T01:07:59Z

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

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 8d12f72e61

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

yuwenmemon · 2026-06-13T01:42:32Z

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
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 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: mWeb Safari

MacOS: Chrome / Safari

github-actions · 2026-06-13T01:45:37Z

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

OSBotify · 2026-06-13T01:50:56Z

✋ 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-06-13T01:50:59Z

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

Android 🤖	iOS 🍎
https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-android-Adhoc-ad49528bb9f-c74839b-7c4b4853fa39cdfd5e19c07fe68462efd4cdd57b/index.html	https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-ios-device-AdHoc-ad49528-c74839b-bde7ea791442fb07e88f620f4954ebf6c8e66762/index.html

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

👀 View the workflow run that generated this build 👀

…gression fix: Restrict sticky group headers to explicit groupBy queries only (cherry picked from commit ad49528) (cherry-picked to staging by yuwenmemon)

OSBotify · 2026-06-13T02:30:34Z

🚀 Cherry-picked to staging by https://github.com/yuwenmemon in version: 9.4.7-1 🚀

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

Bundle Size Analysis (Sentry):

Android
iOS

MelvinBot · 2026-06-13T02:33:22Z

🤖 No help site changes required.

This PR is an internal regression fix. It removes a single condition so the sticky group-header / split-rendering path only activates for explicit groupBy search queries, restoring the Spend > Reports tab to its prior ExpenseReportListItem rendering.

Why no docs update is needed:

No user-facing feature, UI element, label, tab name, or workflow was added or changed — the change restores previously-correct behavior.
The only related help content describes the Group by feature (Search-and-Download-Expenses.md), and that feature is unaffected: explicit groupBy queries still render grouped with group headers exactly as documented.

No draft PR was created since there is nothing to update. If you believe a docs update is warranted, let me know what behavior should be documented and I'll create a draft PR.

IuliiaHerets · 2026-06-13T13:34:48Z

@Krishna2323
#93493 - passed, comment
#93496 - comment
#93495 - passed, comment
#93494 - passed, comment
#93492 - passed, comment
#93491 - passed, comment
#93489 - passed, comment
#93488 - passed, comment
#93486 - passed, comment
#93485 - passed, comment

OSBotify · 2026-06-15T17:54:03Z

🚀 Deployed to production by https://github.com/puneetlath in version: 9.4.7-4 🚀

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

OSBotify · 2026-06-15T18:13:46Z

🚀 Cherry-picked to staging by https://github.com/yuwenmemon in version: 9.4.8-0 🚀

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

Bundle Size Analysis (Sentry):

iOS

MelvinBot · 2026-06-15T18:15:29Z

Help site review — no changes required

I reviewed the changes in this PR against the help site articles under App/docs/articles.

Conclusion: No help site updates are required.

Why: This PR is an internal rendering fix. It removes a single condition (type === EXPENSE_REPORT) that had accidentally activated the new GroupHeader/GroupChildrenContainer split-rendering path for the Reports tab, which had caused 10+ regressions. The fix restricts that split path to explicit groupBy queries only, restoring the Reports tab to its prior ExpenseReportListItem rendering.

The diff touches one line in src/components/Search/SearchList/index.tsx and:

Introduces no new feature, workflow, or user-facing capability
Changes no UI labels, tab names, settings, or button text
Only restores previously documented behavior that a regression had broken

Since nothing user-facing changed and no documented behavior was altered (only restored), there is no draft help site PR to create.

OSBotify · 2026-06-15T19:04:52Z

🚀 Cherry-picked to staging by https://github.com/yuwenmemon in version: 9.4.8-0 🚀

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

Bundle Size Analysis (Sentry):

Android
iOS

MelvinBot · 2026-06-15T19:06:33Z

🤖 No help site changes required.

This PR is an internal rendering bug fix. It removes the type === EXPENSE_REPORT condition that was accidentally activating the GroupHeader/GroupChildrenContainer split-rendering path in src/components/Search/SearchList/index.tsx, restoring the Reports tab to use ExpenseReportListItem as before.

It restores previously-existing behavior (no new feature, no UI/label/setting change, no change to documented user-facing workflows), so nothing under docs/articles needs updating. No draft docs PR was created.

@Krishna2323, if you believe a user-facing behavior here is documented and worth updating, reply with the specific article and I'll take another look.

OSBotify · 2026-06-16T19:45:56Z

🚀 Deployed to production by https://github.com/puneetlath in version: 9.4.8-3 🚀

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

fix: Restrict sticky group headers to explicit groupBy queries only

8d12f72

Signed-off-by: krishna2323 <belivethatkg@gmail.com>

melvin-bot Bot assigned Krishna2323 Jun 13, 2026

Krishna2323 marked this pull request as ready for review June 13, 2026 01:07

Krishna2323 requested review from a team as code owners June 13, 2026 01:07

melvin-bot Bot requested review from JmillsExpensify and eh2077 and removed request for a team June 13, 2026 01:07

chatgpt-codex-connector Bot reviewed Jun 13, 2026

View reviewed changes

Comment thread src/components/Search/SearchList/index.tsx

yuwenmemon approved these changes Jun 13, 2026

View reviewed changes

yuwenmemon merged commit ad49528 into Expensify:main Jun 13, 2026
37 of 42 checks passed

OSBotify added the CP Staging marks PRs that have been CP'd to staging label Jun 13, 2026

OSBotify mentioned this pull request Jun 13, 2026

Deploy Checklist: New Expensify 2026-06-12 #93470

Closed

62 tasks

This was referenced Jun 13, 2026

[Due for payment 2026-06-23] [Due for payment 2026-06-22] Spend - Unable to pay report on Spend #93485

Closed

[Due for payment 2026-06-23] [Due for payment 2026-06-22] [$250] Make the group headers appear sticky when scrolling down the Spend table #88926

Closed

Krishna2323 mentioned this pull request Jun 13, 2026

Spend - "From" field is displayed empty when expense is moved to another report offline. #93518

Closed

7 tasks

	/**
	* Returns the appropriate list item component based on the type and status of the search data.
	*/
	function getListItem(type: SearchDataTypes, status: SearchStatus, groupBy?: SearchGroupBy): ListItemType<typeof type, typeof status> {
	if (type === CONST.SEARCH.DATA_TYPES.CHAT) {
	return ChatListItem;
	}
	if (type === CONST.SEARCH.DATA_TYPES.TASK) {
	return TaskListItem;
	}
	if (type === CONST.SEARCH.DATA_TYPES.EXPENSE_REPORT) {
	return ExpenseReportListItem;
	}
	if (groupBy) {
	return TransactionGroupListItem;
	}
	return TransactionListItem;
	}

Uh oh!

Conversation

Krishna2323 commented Jun 13, 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 Jun 13, 2026

Uh oh!

chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

Uh oh!

yuwenmemon commented Jun 13, 2026

Reviewer Checklist

Screenshots/Videos

Uh oh!

Uh oh!

github-actions Bot commented Jun 13, 2026

Uh oh!

OSBotify commented Jun 13, 2026

Uh oh!

github-actions Bot commented Jun 13, 2026

Uh oh!

OSBotify commented Jun 13, 2026

Uh oh!

MelvinBot commented Jun 13, 2026

Uh oh!

IuliiaHerets commented Jun 13, 2026

Uh oh!

OSBotify commented Jun 15, 2026

Uh oh!

OSBotify commented Jun 15, 2026

Uh oh!

MelvinBot commented Jun 15, 2026

Help site review — no changes required

Uh oh!

OSBotify commented Jun 15, 2026

Uh oh!

MelvinBot commented Jun 15, 2026

Uh oh!

OSBotify commented Jun 16, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

Krishna2323 commented Jun 13, 2026 •

edited

Loading