Fix time based group expansion in Reports/Search by cristipaval · Pull Request #81418 · Expensify/App

cristipaval · 2026-02-04T15:42:17Z

Explanation of Change

Fixed Issues

$ #81402
PROPOSAL:

Tests

Have some expenses in December 2025. Some before December 15th, some after.

Date filter respected when expanding year groups

Go to Reports tab
Search with: type:expense group-by:year date:>=2025-12-15
Click on the 2025 year group
Expected: Only expenses from December 15th, 2025 onwards are shown (not all 2025 expenses)
Verify the count in the group header matches the filtered results

Date filter respected when expanding month groups

Go to Reports tab
Search with: type:expense group-by:month date:>=2025-12-15
Click on the December 2025 month group
Expected: Only expenses from December 15th, 2025 onwards are shown (not all December expenses)
Verify the count in the group header matches the filtered results

Date filter respected when expanding quarter groups

Go to Reports tab
Search with: type:expense group-by:quarter date:>=2025-12-15
Click on the Q3 2025 quarter group
Expected: Only expenses from December 15th, 2025 onwards are shown (not all Q3 expenses)
Verify the count in the group header matches the filtered results

Date filter with both start and end limits

Go to Reports tab
Search with: type:expense group-by:month date:>=2025-12-01 date:<=2025-12-15
Click on the December 2025 month group
Expected: Only expenses from December 01-15, 2025 are shown
Verify the count in the group header matches the filtered results

Verify that no errors appear in the JS console

Offline 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

Screen.Recording.2026-02-04.at.19.39.34.mov

codecov · 2026-02-04T15:52:54Z

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/libs/SearchUIUtils.ts	`62.41% <93.18%> (+2.79%)`	⬆️
src/components/Search/index.tsx	`26.92% <0.00%> (-0.14%)`	⬇️
... and 8 files with indirect coverage changes

melvin-bot · 2026-02-04T17:47:13Z

@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

cristipaval · 2026-02-04T17:50:59Z

@shubham1206agra, this is ready for review 🙏

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 10e3cdfaaf

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

src/libs/SearchUIUtils.ts

…ters

cristipaval · 2026-02-04T18:05:34Z

@codex review

chatgpt-codex-connector · 2026-02-04T18:17:38Z

Codex Review: Didn't find any major issues. 🎉

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

trjExpensify

Clean up for Insights 👍

trjExpensify · 2026-02-05T15:28:17Z

@shubham1206agra where are you at with the review?

shubham1206agra · 2026-02-05T15:30:42Z

@trjExpensify See https://expensify.slack.com/archives/C07HPDRELLD/p1770301249232079?thread_ts=1769470158.876099&cid=C07HPDRELLD

…-group-expand

shubham1206agra · 2026-02-10T14:59:23Z

@cristipaval Steps for repro the bug:

Type type:expense sortBy:groupquarter sortOrder:desc groupBy:quarter date>2025-12-02 date<2026-02-02 in the search.
Expand groups close to both the date bounds.
Observe that the only the first date bound is followed.

Expected behavior

Both date bounds are expected to be followed

cristipaval · 2026-02-10T18:40:54Z

you're right @shubham1206agra! great catch! I fixed it now, could you please review and test again? 🙏

shubham1206agra · 2026-02-11T05:29:30Z

@cristipaval The TS is failing

…-group-expand

shubham1206agra · 2026-02-11T13:43:46Z

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 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
xIf 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

Screen.Recording.2026-02-11.at.7.11.50.PM.mov

melvin-bot · 2026-02-11T13:45:00Z

@marcochavezf 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 · 2026-02-12T13:05:36Z

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

github-actions · 2026-02-12T13:09:23Z

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

Android 🤖	iOS 🍎
https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-android-Adhoc-e33ae76-d240a1dca758491d5f0866e26e89d9a4c6e0ec54/index.html	https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-ios-device-AdHoc-e33ae76-d72fd61ce622256d8b4a7d47d80f04a039d914a6/index.html

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

👀 View the workflow run that generated this build 👀

OSBotify · 2026-02-12T13:12:40Z

✋ 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 · 2026-02-12T15:47:41Z

🚀 Deployed to staging by https://github.com/marcochavezf in version: 9.3.18-0 🚀

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

OSBotify · 2026-02-13T18:48:31Z

🚀 Deployed to production by https://github.com/lakchote in version: 9.3.18-8 🚀

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

aimane-chnaif · 2026-03-01T06:33:33Z

tests/unit/Search/SearchUIUtilsTest.ts

+                filters: [
+                    {
+                        operator: CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO,
+                        value: CONST.SEARCH.DATE_PRESETS.LAST_MONTH, // e.g., January 2026: 2026-01-01 to 2026-01-31
+                    },
+                    {
+                        operator: CONST.SEARCH.SYNTAX_OPERATORS.GREATER_THAN_OR_EQUAL_TO,
+                        value: '2025-04-01', // Earlier than preset start
+                    },
+                ],
+            };
+
+            const result = SearchUIUtils.adjustTimeRangeToDateFilters(yearDateRange, [dateFilter]);
+
+            // Should intersect: max(preset start, constraint start) = max(2026-01-01, 2025-04-01) = 2026-01-01
+            // The preset start should be preserved, not overwritten by the earlier constraint
+            expect(result.start).toBe('2026-01-01');


Starting today (Mar 1), tests failing on main, caused by these tests.
Can someone please fix as priority?

RCA: #83301 (comment)

+1 - commented here

Fix was merged in #83809

cristipaval added 8 commits February 4, 2026 17:04

Fix adjustTimeRangeToDateFilters

7047fc6

remove logging to console

4a20fb2

Adjust year to date filters

d97d75e

Add a test for year range adjustments to date filters

441f6dd

Adjust month group expanding to date filters

0d6a33b

Test month group adjustment to date filters

007941b

Adjust quarter date range to date filters

475e61a

Test quarter date range adjustments to date filters

10e3cdf

cristipaval self-assigned this Feb 4, 2026

cristipaval marked this pull request as ready for review February 4, 2026 17:47

cristipaval requested review from a team as code owners February 4, 2026 17:47

melvin-bot bot requested review from shubham1206agra and trjExpensify and removed request for a team February 4, 2026 17:47

melvin-bot bot removed the request for review from a team February 4, 2026 17:47

github-actions bot reviewed Feb 4, 2026

View reviewed changes

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

github-actions bot reviewed Feb 4, 2026

View reviewed changes

src/libs/SearchUIUtils.ts Show resolved Hide resolved

github-actions bot reviewed Feb 4, 2026

View reviewed changes

src/libs/SearchUIUtils.ts Show resolved Hide resolved

chatgpt-codex-connector bot reviewed Feb 4, 2026

View reviewed changes

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

cristipaval added 4 commits February 4, 2026 19:55

Performance improvement

c4fb227

Update adjustTimeRangeToDateFilters to intersect if multiple date fil…

fe9b0a9

…ters

Test that multiple date filters take the time range intersection

3f276fb

Add function doc.

5183a60

trjExpensify previously approved these changes Feb 4, 2026

View reviewed changes

Merge remote-tracking branch 'origin/main' into cristi_fix-time-based…

47d389d

…-group-expand

cristipaval added 4 commits February 10, 2026 17:00

Add test to ensure correct multiple date filters intersection

2edcef7

Fix multiple date filter intersection

ee33c15

Prettier

50f9694

Update tests

208b679

cristipaval dismissed trjExpensify’s stale review via 208b679 February 10, 2026 18:40

cristipaval added 2 commits February 11, 2026 12:13

Merge remote-tracking branch 'origin/main' into cristi_fix-time-based…

d59236c

…-group-expand

Fix ts error

dee74c4

shubham1206agra approved these changes Feb 11, 2026

View reviewed changes

melvin-bot bot requested a review from marcochavezf February 11, 2026 13:44

marcochavezf approved these changes Feb 12, 2026

View reviewed changes

marcochavezf merged commit e33ae76 into main Feb 12, 2026
34 checks passed

marcochavezf deleted the cristi_fix-time-based-group-expand branch February 12, 2026 13:05

OSBotify mentioned this pull request Feb 12, 2026

Deploy Checklist: New Expensify 2026-02-12 #82262

Closed

aimane-chnaif reviewed Mar 1, 2026

View reviewed changes

Krishna2323 mentioned this pull request Mar 1, 2026

[Due for payment 2026-03-11] [$125] Investigate workflow job failing on main: test / test (job 1) #83808

Closed

Conversation

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

Uh oh!

Explanation of Change

Fixed Issues

Tests

Date filter respected when expanding year groups

Date filter respected when expanding month groups

Date filter respected when expanding quarter groups

Date filter with both start and end limits

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

Uh oh!

codecov bot commented Feb 4, 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!

melvin-bot bot commented Feb 4, 2026

Uh oh!

Uh oh!

Uh oh!

Uh oh!

cristipaval commented Feb 4, 2026

Uh oh!

chatgpt-codex-connector bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

Uh oh!

cristipaval commented Feb 4, 2026

Uh oh!

chatgpt-codex-connector bot commented Feb 4, 2026

Uh oh!

trjExpensify left a comment

Choose a reason for hiding this comment

Uh oh!

trjExpensify commented Feb 5, 2026

Uh oh!

shubham1206agra commented Feb 5, 2026

Uh oh!

shubham1206agra commented Feb 10, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

cristipaval commented Feb 10, 2026

Uh oh!

shubham1206agra commented Feb 11, 2026

Uh oh!

shubham1206agra commented Feb 11, 2026

Reviewer Checklist

Screenshots/Videos

Uh oh!

melvin-bot bot commented Feb 11, 2026

Uh oh!

Uh oh!

github-actions bot commented Feb 12, 2026

Uh oh!

github-actions bot commented Feb 12, 2026

Uh oh!

OSBotify commented Feb 12, 2026

Uh oh!

OSBotify commented Feb 12, 2026

Uh oh!

OSBotify commented Feb 13, 2026

Uh oh!

aimane-chnaif Mar 1, 2026

Choose a reason for hiding this comment

Uh oh!

rafecolton Mar 1, 2026

Choose a reason for hiding this comment

Uh oh!

rafecolton Mar 1, 2026

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

cristipaval commented Feb 4, 2026 •

edited

Loading

codecov bot commented Feb 4, 2026 •

edited by github-actions bot

Loading

shubham1206agra commented Feb 10, 2026 •

edited

Loading