Skip to content

feat: Date Range filter follow up with fixes (#81501)#87055

Open
btkcodedev wants to merge 3 commits intoExpensify:mainfrom
btkcodedev:btkcodedev/81501FollowUp
Open

feat: Date Range filter follow up with fixes (#81501)#87055
btkcodedev wants to merge 3 commits intoExpensify:mainfrom
btkcodedev:btkcodedev/81501FollowUp

Conversation

@btkcodedev
Copy link
Copy Markdown
Contributor

@btkcodedev btkcodedev commented Apr 3, 2026

Explanation of Change

Follow-up PR that addresses all the listed regressions and resolves the issues mentioned here: #85313 (comment)

Fixed Issues

$ #81501
PROPOSAL: #81501 (comment)

Tests

Test Steps

Regression check

  1. Reports- In Custom date range, "To" option is disabled for future dates - Fixed - Ref: Reports- In Custom date range, "To" option is disabled #87017)
  2. Reports - Custom range error message is not visible without scrolling - Fixed - Ref: Reports - Custom range error message is not visible without scrolling #87019
  3. Reports - Custom Range error message persists after selecting valid dates - Fixed - Ref: Reports - Custom Range error message persists after selecting valid dates #87020
  4. Reports - Dates are still applied after being resetted on "Custom Range" filter in MacOS chrome - Advanced filter section - Fixed Via Fix date filter reset not persisting cleared values to Onyx #87079 - Ref: Reports - Dates are still applied after being resetted on "Custom Range" filter. #87026
  5. Reports - Inconsistent behavior of "Range" text on "Date" exposed filter and "Filters" page - Fixed Via Move date filter Range text outside ScrollView for consistent visibility #87099 - Ref: Reports - Inconsistent behavior of "Range" text on "Date" exposed filter and "Filters" page #87028

Range Mode - Desktop Popup

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

Range Mode - Sidebar Filters

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

Two-Date Validation

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

Individual After/Before Editing

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

Mobile/Narrow Layout

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

Android & iOS - Select year when keyboard is opened

  1. Navigate to reports and click on the date filter in the top filter bar
  2. Click on the "Custom Range" option from the menu
  3. Change the year for the From or To calendars
  4. When the keyboard appears, try to select another year from the list (without double-clicking)
  5. Select a "From" date & select a "To" date in the calendars
  6. Verify the range text appears below the calendars, showing "Range: [date] - [date]"
  7. Click "Apply" and verify the filter is applied

Android - Search - Change dates multiple times

  1. Navigate to reports and click on date filter in the top filter bar
  2. Click on the "Custom Range" option from the menu
  3. Select a "From" date and select other date multiple times
  4. Verify that none of the dates disappear after multiple changes
  5. Click "Apply" and verify the filter is applied
  • 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

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

Range Mode - Sidebar Filters

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

Two-Date Validation

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

Individual After/Before Editing

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

Mobile/Narrow Layout

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

Android & iOS - Select year when keyboard is opened

  1. Navigate to reports and click on the date filter in the top filter bar
  2. Click on the "Custom Range" option from the menu
  3. Change the year for the From or To calendars
  4. When the keyboard appears, try to select another year from the list (without double-clicking)
  5. Select a "From" date & select a "To" date in the calendars
  6. Verify the range text appears below the calendars, showing "Range: [date] - [date]"
  7. Click "Apply" and verify the filter is applied

Android - Search - Change dates multiple times

  1. Navigate to reports and click on date filter in the top filter bar
  2. Click on the "Custom Range" option from the menu
  3. Select a "From" date and select other date multiple times
  4. Verify that none of the dates disappear after multiple changes
  5. Click "Apply" and verify the filter is applied
  • Verify that no errors appear in the JS console

PR Author Checklist

  • I linked the correct issue in the ### Fixed Issues section above
  • I wrote clear testing steps that cover the changes made in this PR
    • I added steps for local testing in the Tests section
    • I added steps for the expected offline behavior in the Offline steps section
    • I added steps for Staging and/or Production testing in the QA steps section
    • I added steps to cover 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 tested this PR with a High Traffic account against the staging or production API to ensure there are no regressions (e.g. long loading states that impact usability).
  • I included screenshots or videos for tests on all platforms
  • I ran the tests on all platforms & verified they passed on:
    • Android: Native
    • Android: mWeb Chrome
    • iOS: Native
    • iOS: mWeb Safari
    • MacOS: Chrome / Safari
  • I verified there are no console errors (if there's a console error not related to the PR, report it or open an issue for it to be fixed)
  • I verified there are no new alerts related to the canBeMissing param for useOnyx
  • I followed proper code patterns (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
      • 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. Link to Slack message:
    • 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 followed the guidelines as stated in the Review Guidelines
  • I tested other components that can be impacted by my changes (i.e. if the PR modifies a shared library or component like Avatar, I verified the components using Avatar are working as expected)
  • 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
  • I verified that if a function's arguments changed that all usages have also been updated correctly
  • 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 new assets were added or existing ones were modified, I verified that:
    • The assets are optimized and compressed (for SVG files, run npm run compress-svg)
    • The assets load correctly across all supported platforms.
  • 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.
  • I added unit tests for any new feature or bug fix in this PR to help automatically prevent regressions in this user 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.

Screenshots/Videos

Android: Native
SVID_20260403_122751_1.mp4
Android: mWeb Chrome
SVID_20260403_122950_1.mp4
iOS: Native
Screen.Recording.2026-04-03.at.12.43.54.PM.mov
iOS: mWeb Safari
Screen.Recording.2026-04-03.at.12.47.51.PM.mov
MacOS: Chrome / Safari
Screen.Recording.2026-04-03.at.10.32.59.AM.mov

@btkcodedev btkcodedev requested review from a team as code owners April 3, 2026 07:27
Copilot AI review requested due to automatic review settings April 3, 2026 07:27
@melvin-bot melvin-bot bot requested review from Pujan92 and heyjennahay April 3, 2026 07:27
@melvin-bot
Copy link
Copy Markdown

melvin-bot bot commented Apr 3, 2026

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

Copy link
Copy Markdown
Contributor

Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

Follow-up fixes for the new Search “Custom Range” date filter to address regressions found during QA (year picker constraints, reset behavior, and range validation/error visibility) in the Reports date filters.

Changes:

  • Loosened Range calendar date constraints (notably on the “To” calendar) to avoid disabling future date selection.
  • Improved Range-mode error handling/reset behavior (clear validation error when both dates are selected; clear snapshot on reset).
  • Adjusted layout/scrolling so Range validation errors are brought into view (scroll to bottom on error; range summary moved outside the scroll area).

Reviewed changes

Copilot reviewed 3 out of 3 changed files in this pull request and generated 1 comment.

File Description
src/components/Search/FilterComponents/RangeDatePicker.tsx Adjusts min/max constraints for the dual-calendar Range picker to support selecting future “To” dates.
src/components/Search/FilterComponents/DatePresetFilterBase.tsx Updates Range ephemeral state initialization/reset behavior and clears validation errors when a valid range is selected.
src/components/Search/FilterComponents/DateFilterBase.tsx Adds scroll-to-end behavior when showing Range validation errors and moves the range summary outside the scroll view.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

@codecov
Copy link
Copy Markdown

codecov bot commented Apr 3, 2026

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 Δ
...onents/Search/FilterComponents/RangeDatePicker.tsx 0.00% <0.00%> (ø)
...ponents/Search/FilterComponents/DateFilterBase.tsx 0.00% <0.00%> (ø)
...s/Search/FilterComponents/DatePresetFilterBase.tsx 1.11% <0.00%> (-0.06%) ⬇️
... and 95 files with indirect coverage changes

Copy link
Copy Markdown

@chatgpt-codex-connector chatgpt-codex-connector bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: a1db0b75a5

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants