feat/81501: Add Range filter for all date type filters by btkcodedev · Pull Request #81897 · Expensify/App

btkcodedev · 2026-02-09T18:50:54Z

Explanation of Change

Added a new Range date filter option with dual side-by-side calendars for easier date range selection across all search date filters (Date, Approved, Paid, Submitted, Withdrawn, Posted, Exported).

Key Improvements

New Range Mode: Users can now select date ranges using two calendars displayed side-by-side (desktop) or stacked (mobile/sidebar)
Two-Date Validation: Enforces that both From and To dates must be selected when using Range mode, preventing incomplete date ranges
Consistent Display: Date ranges are now displayed as "Range: Jan 1, 2024 - Jan 31, 2024" entries in filter lists and titles
Auto-Detection: When both After and Before dates exist on page load, it automatically switches to Range mode for better UX
Responsive Layouts:
- Desktop popup: Side-by-side calendars with 660px popover width
- Sidebar filters: Vertically stacked calendars
- Mobile: Vertically stacked with full-screen view
Updated workflow: Custom Date and Custom Range are added for splitting one filter at a time

Technical Changes

Added CONST.SEARCH.DATE_MODIFIERS.RANGE
Created new RangeDatePicker component with dual calendars
Enhanced DateFilterBase, DatePresetFilterBase, and DateSelectPopup to support Range mode
Updated display logic in AdvancedSearchFilters and SearchFiltersReportFieldPage
Added dynamic popover width support in DropdownButton

Fixed Issues

$ #81501
PROPOSAL: #81501 (comment)

Tests

Test Steps

Range Mode - Desktop Popup

Navigate to reports and click on any date filter in the top filter bar
Click on the "Custom Range" option from the menu
Verify two calendars appear side-by-side in the popover (width ~660px)
Select a "From" date in the left calendar
Select a "To" date in the right calendar
Verify the range text appears below the calendars showing "Range: [date] - [date]"
Click "Apply" and verify the filter bar shows "Range: [date] - [date]"

Range Mode - Sidebar Filters

Navigate to Reports > Filters options from top bar
Click on any date filter (Date, Approved, Paid, Submitted, Withdrawn, Posted, Exported)
Click on the "Custom Range" option from the menu
Verify two calendars are stacked vertically and responsive (one above the other)
Select dates in both calendars
Verify the range text appears showing "Range: [date] - [date]"
Click "Save" and "Apply results", verify with the range displayed matches the resulted items

Two-Date Validation

Open any date filter and select "Custom Range" mode
Select only a "From" date (leave "To" empty)
Click "Apply" or "Save"
Verify an error message appears: "Please select dates for both From and To"
Select a "To" date to complete the range
Click "Apply" or "Save" and verify it saves successfully

Individual After/Before Editing

Open Custom Date filter
Click "After" (not Range) and select a date
Click "Save"
Verify the filter displays as "After [date]"
Re-open the filter and click "Before"
Select a date and verify "Before" option is still accessible
Verify individual After/Before can still be set and edited separately
If range is applied the custom date filter is automatically discarded

Mobile/Narrow Layout

Resize browser to mobile width (<= 768px) or test on mobile device
Click on any date filter
Select "Custom Range" option
Verify calendars are stacked vertically in full-screen modal
Verify range text appears at bottom center of modal
Verify "Reset" and "Apply" buttons span full width at bottom

Verify that no errors appear in the JS console

Offline tests

Same as above

QA Steps

Design verification

Verify that the designs are as given in the issue section

Range Mode - Desktop Popup

Navigate to reports and click on any date filter in the top filter bar
Click on the "Custom Range" option from the menu
Verify two calendars appear side-by-side in the popover (width ~660px)
Select a "From" date in the left calendar
Select a "To" date in the right calendar
Verify the range text appears below the calendars showing "Range: [date] - [date]"
Click "Apply" and verify the filter bar shows "Range: [date] - [date]"

Range Mode - Sidebar Filters

Navigate to Reports > Filters options from top bar
Click on any date filter (Date, Approved, Paid, Submitted, Withdrawn, Posted, Exported)
Click on the "Custom Range" option from the menu
Verify two calendars are stacked vertically and responsive (one above the other)
Select dates in both calendars
Verify the range text appears showing "Range: [date] - [date]"
Click "Save" and "Apply results", verify with the range displayed matches the resulted items

Two-Date Validation

Open any date filter and select "Custom Range" mode
Select only a "From" date (leave "To" empty)
Click "Apply" or "Save"
Verify an error message appears: "Please select dates for both From and To"
Select a "To" date to complete the range
Click "Apply" or "Save" and verify it saves successfully

Individual After/Before Editing

Open Custom Date filter
Click "After" (not Range) and select a date
Click "Save"
Verify the filter displays as "After [date]"
Re-open the filter and click "Before"
Select a date and verify "Before" option is still accessible
Verify individual After/Before can still be set and edited separately
If range is applied the custom date filter is automatically discarded

Mobile/Narrow Layout

Resize browser to mobile width (<= 768px) or test on mobile device
Click on any date filter
Select "Custom Range" option
Verify calendars are stacked vertically in full-screen modal
Verify range text appears at bottom center of modal
Verify "Reset" and "Apply" buttons span full width at bottom

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

Screen_Recording_20260209_234831_New.Expensify.Dev.mp4

Android: mWeb Chrome

Screen_Recording_20260209_234141_Brave.mp4

iOS: Native

Screen.Recording.2026-02-09.at.11.30.23.PM.mov

iOS: mWeb Safari

Screen.Recording.2026-02-09.at.11.34.04.PM.mov

MacOS: Chrome / Safari

Screen.Recording.2026-02-10.at.12.04.47.AM.mov

melvin-bot · 2026-02-09T18:51:01Z

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-02-09T18:51:02Z

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

melvin-bot · 2026-02-09T18:51:03Z

Hey! I see that you made changes to our Form component. Make sure to update the docs in FORMS.md accordingly. Cheers!

github-actions · 2026-02-09T18:54:59Z

src/components/Search/FilterComponents/DatePresetFilterBase.tsx

        // eslint-disable-next-line react-hooks/exhaustive-deps
    }, [isSearchAdvancedFiltersFormLoading]);

+    useEffect(() => {


❌ PERF-10

Reasoning: Parent-child communication should not use useEffect. Instead, lift the state up to the parent component and pass it down as props. This follows React unidirectional data flow pattern, eliminates synchronization issues, reduces unnecessary renders, and makes the data flow clearer.

Suggested fix: Instead of calling onDateValuesChange in useEffect, call it directly when setDateValues is called in setDateValue:

const setDateValue = useCallback((dateModifier: SearchDateModifier, value: string | undefined) => { setDateValues((prevDateValues) => { const newDateValues = {...prevDateValues, [dateModifier]: value}; // Update parent immediately with new values onDateValuesChange?.(newDateValues); return newDateValues; }); }, [onDateValuesChange]);

Then remove the useEffect entirely.

Please rate this suggestion with 👍 or 👎 to help us improve! Reactions are used to monitor reviewer efficiency.

Working on it.

trjExpensify

Looks pretty good to me. CC: @Expensify/design @JmillsExpensify

Pujan92 · 2026-02-10T16:06:33Z

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

iOS: HybridApp

iOS: mWeb Safari

MacOS: Chrome / Safari

dannymcclain · 2026-02-10T16:08:56Z

Good to run a test build to check it out?

btkcodedev · 2026-02-10T18:53:06Z

Approval for Spanish translation commented on Slack:
https://expensify.enterprise.slack.com/archives/C01GTK53T8Q/p1770749508840719

codecov · 2026-02-10T19:07:12Z

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/components/DatePicker/CalendarPicker/Day.tsx	`100.00% <100.00%> (ø)`
src/components/DatePicker/CalendarPicker/index.tsx	`82.47% <100.00%> (+0.18%)`	⬆️
.../Search/SearchPageHeader/DatePickerFilterPopup.tsx	`0.00% <ø> (ø)`
src/types/form/SearchAdvancedFiltersForm.ts	`100.00% <ø> (ø)`
...mponents/Search/FilterDropdowns/DropdownButton.tsx	`92.85% <66.66%> (+0.26%)`	⬆️
src/libs/DateUtils.ts	`67.95% <83.33%> (+0.68%)`	⬆️
src/CONST/index.ts	`92.06% <0.00%> (-2.25%)`	⬇️
...mponents/Search/SearchDatePresetFilterBasePage.tsx	`0.00% <0.00%> (ø)`
...ts/Search/SearchPageHeader/useSearchFiltersBar.tsx	`73.73% <66.66%> (-1.27%)`	⬇️
...e/SearchFiltersReportFieldPage/ReportFieldDate.tsx	`0.00% <0.00%> (ø)`
... and 8 more
... and 220 files with indirect coverage changes

Pujan92 · 2026-03-10T18:01:24Z

@btkcodedev We need to update the test steps now to consider the Custom date and Custom range option for the flow.

neil-marcellini · 2026-03-10T22:42:36Z

@btkcodedev We need to update the test steps now to consider the Custom date and Custom range option for the flow.

What do you mean by this? I already see tests for date and range.

neil-marcellini

Looking pretty good. There are still two changes I would like to see from my last review. We need to get translations verified and refactor into smaller components. The former change can be done in a follow up.

Pujan92 · 2026-03-11T12:39:49Z

@btkcodedev We need to update the test steps now to consider the Custom date and Custom range option for the flow.

What do you mean by this? I already see tests for date and range.

I was just referring to QA test steps in the PR description to update with Custom Date and Custom Range(as design updated)

btkcodedev · 2026-03-11T17:38:02Z

Done

neil-marcellini

Thank you for the updates. It looks pretty good now. We can merge it after C+ does a final round of testing. @Pujan92 pls DM me when it's complete.

Pujan92 · 2026-03-11T19:21:21Z

I found an issue but I think it can be taken in the follow-up.

Issue - On the date filter after or before is applied, the respective date(+/-1) is auto-selected when you open the range picker. Some issue with the default selection value logic.

Screen.Recording.2026-03-12.at.00.42.22.mov

neil-marcellini · 2026-03-11T19:25:09Z

I found an issue but I think it can be taken in the follow-up.

Issue - On the date filter after or before is applied, the respective date(+/-1) is auto-selected when you open the range picker. Some issue with the default selection value logic.

Cool, I agree. That's a fairly minor problem.

github-actions · 2026-03-11T19:50:39Z

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

github-actions · 2026-03-11T19:55:46Z

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

Android 🤖	iOS 🍎
https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-android-Adhoc-0173c04-47a1081-f435c44e450bd36b0041a0df043d01e3ee044215/index.html	https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-ios-device-AdHoc-0173c04-47a1081-4ce67aad99cbbbe7b3f252186ee4456a0557656b/index.html

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

👀 View the workflow run that generated this build 👀

OSBotify · 2026-03-11T20:04:00Z

🚀 Deployed to staging by https://github.com/neil-marcellini in version: 9.3.36-0 🚀

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

jponikarchuk · 2026-03-11T21:20:58Z

Deploy Blocker #84959 was identified to be related to this PR.

mitarachim · 2026-03-11T22:45:17Z

Deploy Blocker #84987 was identified to be related to this PR.

mitarachim · 2026-03-11T22:46:58Z

Deploy Blocker #84988 was identified to be related to this PR.

jponikarchuk · 2026-03-12T05:30:13Z

Deploy Blocker #85027 was identified to be related to this PR.

jponikarchuk · 2026-03-12T08:52:29Z

Deploy Blocker #85037 was identified to be related to this PR.

nlemma · 2026-03-12T11:20:38Z

Deploy Blocker #85051 was identified to be related to this PR.

OSBotify · 2026-03-12T22:48:41Z

🚀 Deployed to production by https://github.com/luacmartins in version: 9.3.36-10 🚀

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

btkcodedev added 3 commits February 9, 2026 23:49

feat: Range UI filter

c4f6eff

fix: button style side margin

24001a6

fix: exclusivity of after and before individual filters

310b129

btkcodedev requested review from a team as code owners February 9, 2026 18:50

melvin-bot bot assigned btkcodedev Feb 9, 2026

melvin-bot bot requested review from Pujan92 and trjExpensify February 9, 2026 18:51

melvin-bot bot removed request for a team February 9, 2026 18:51

github-actions bot reviewed Feb 9, 2026

View reviewed changes

chore: prettify

9bef859

trjExpensify previously approved these changes Feb 10, 2026

View reviewed changes

btkcodedev added 3 commits February 10, 2026 23:39

fix: useEffect perf-10

c355bd7

fix: guard rail after > before for range

5d3b2ef

prettify

5c12297

btkcodedev dismissed trjExpensify’s stale review via 5c12297 February 10, 2026 18:09

btkcodedev added 2 commits February 10, 2026 23:50

fix ESlints, prettify

54a357e

fix: translations

52d75dd

fix: ESLint, non null assertions, prettify

7a9d860

btkcodedev added 3 commits February 11, 2026 00:53

test: increase code coverage

c5ff6e7

chore: prettify

aa0b6c8

fix: ESLint

8efa220

neil-marcellini requested changes Mar 10, 2026

View reviewed changes

refactor to simpler rendering logic

34008ff

update spanish translation

213469d

neil-marcellini approved these changes Mar 11, 2026

View reviewed changes

neil-marcellini merged commit 0173c04 into Expensify:main Mar 11, 2026
32 checks passed

OSBotify mentioned this pull request Mar 11, 2026

Deploy Checklist: New Expensify 2026-03-11 #84953

Closed

jponikarchuk mentioned this pull request Mar 11, 2026

Android - Search - Previous date disappears on custom range calendar #84959

Closed

7 tasks

neil-marcellini mentioned this pull request Mar 11, 2026

[CP staging] Revert "feat/81501: Add Range filter for all date type filters" #84979

Merged

mitarachim mentioned this pull request Mar 11, 2026

Report- Custom range trigger a date when setting custom date as before and After #84987

Closed

7 tasks

mitarachim mentioned this pull request Mar 11, 2026

Reports - "Please select dates for both From and To" persists after selecting dates #84988

Closed

7 tasks

jponikarchuk mentioned this pull request Mar 12, 2026

Reports - Report remains displayed on "Range Filter" results after expense date is changed #85027

Closed

7 tasks

jponikarchuk mentioned this pull request Mar 12, 2026

Report - Custom Range Information Is Not Consistent with Fixation #85037

Closed

7 tasks

nlemma mentioned this pull request Mar 12, 2026

Android & iOS - Reports - Unable to select year when keyboard is opened #85051

Closed

7 tasks

melvin-bot bot mentioned this pull request Mar 12, 2026

[$250] Add Range UI filter for all date-type filters #81501

Open

Conversation

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

Uh oh!

Explanation of Change

Key Improvements

Technical Changes

Fixed Issues

Tests

Test Steps

Range Mode - Desktop Popup

Range Mode - Sidebar Filters

Two-Date Validation

Individual After/Before Editing

Mobile/Narrow Layout

Offline tests

QA Steps

Design verification

Range Mode - Desktop Popup

Range Mode - Sidebar Filters

Two-Date Validation

Individual After/Before Editing

Mobile/Narrow Layout

PR Author Checklist

Screenshots/Videos

Uh oh!

melvin-bot bot commented Feb 9, 2026

Uh oh!

melvin-bot bot commented Feb 9, 2026

Uh oh!

melvin-bot bot commented Feb 9, 2026

Uh oh!

github-actions bot Feb 9, 2026

Choose a reason for hiding this comment

❌ PERF-10

Uh oh!

btkcodedev Feb 9, 2026

Choose a reason for hiding this comment

Uh oh!

btkcodedev Feb 10, 2026

Choose a reason for hiding this comment

Uh oh!

trjExpensify left a comment

Choose a reason for hiding this comment

Uh oh!

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

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

dannymcclain commented Feb 10, 2026

Uh oh!

btkcodedev commented Feb 10, 2026

Uh oh!

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

Pujan92 commented Mar 10, 2026

Uh oh!

neil-marcellini commented Mar 10, 2026

Uh oh!

neil-marcellini left a comment

Choose a reason for hiding this comment

Uh oh!

Pujan92 commented Mar 11, 2026

Uh oh!

btkcodedev commented Mar 11, 2026

Uh oh!

neil-marcellini left a comment

Choose a reason for hiding this comment

Uh oh!

Pujan92 commented Mar 11, 2026

Uh oh!

neil-marcellini commented Mar 11, 2026

Uh oh!

Uh oh!

github-actions bot commented Mar 11, 2026

Uh oh!

github-actions bot commented Mar 11, 2026

Uh oh!

btkcodedev commented Feb 9, 2026 •

edited

Loading

Pujan92 commented Feb 10, 2026 •

edited

Loading

codecov bot commented Feb 10, 2026 •

edited by github-actions bot

Loading