Skip to content

Show only Custom range (not Custom date) in Consolidated Travel Billing export - #97461

Open
rlinoz wants to merge 1 commit into
mainfrom
rodrigo-travel-invoicing-custom-range-only
Open

Show only Custom range (not Custom date) in Consolidated Travel Billing export#97461
rlinoz wants to merge 1 commit into
mainfrom
rodrigo-travel-invoicing-custom-range-only

Conversation

@rlinoz

@rlinoz rlinoz commented Jul 30, 2026

Copy link
Copy Markdown
Contributor

Explanation of Change

The Consolidated Travel Billing export requires a closed date range (a concrete start and end date the backend can bound the statement to). The date picker, however, offered a single-select Custom date option (On / After / Before), where After and Before are mutually exclusive.

This changed recently when we added the "Custom range" option, so this PR adds a flag that hides the "Custom date"

Fixed Issues

$
PROPOSAL:

Tests

  1. Open a workspace with travel invoicing enabled.
  2. Navigate to the Consolidated Travel Billing export page.
  3. Verify the date options shown are only: This month, Last month, and Custom range — there is no Custom date option.
  4. Tap Custom range, pick a from and a to date, and save.
  5. Tap Export to PDF and verify the export succeeds with no Please select a date range to export error.
  6. Repeat step 5 with Export to CSV.
  7. Select a preset (e.g. This month) instead of a custom range and verify export still succeeds.
  • 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

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

Screenshot 2026-07-30 at 09 16 34 Screenshot 2026-07-30 at 09 16 42

…ng export

The export requires a closed date range, but the picker offered a single-select
Custom date (On/After/Before). A lone After or Before could never satisfy the
completion check, producing a 'Please select a date range to export' error.

Add shouldShowCustomDate (default true) to DatePresetFilterBase/DateFilterBase
and set it false on the travel invoicing export so only presets + Custom range
are offered. Remove the now-unreachable After/Before validation paths.
@codecov

codecov Bot commented Jul 30, 2026

Copy link
Copy Markdown

Codecov Report

✅ Changes either increased or maintained existing code coverage, great job!

Files with missing lines Coverage Δ
...ponents/Search/FilterComponents/DateFilterBase.tsx 69.84% <ø> (ø)
...s/Search/FilterComponents/DatePresetFilterBase.tsx 61.26% <100.00%> (+0.27%) ⬆️
...pace/travel/WorkspaceTravelInvoicingExportPage.tsx 0.00% <0.00%> (ø)
... and 7 files with indirect coverage changes

@rlinoz
rlinoz requested a review from blimpich July 30, 2026 12:18
@rlinoz
rlinoz marked this pull request as ready for review July 30, 2026 12:18
@rlinoz
rlinoz requested review from a team as code owners July 30, 2026 12:18
@melvin-bot
melvin-bot Bot requested review from JmillsExpensify and carlosmiceli and removed request for a team July 30, 2026 12:19
@melvin-bot

melvin-bot Bot commented Jul 30, 2026

Copy link
Copy Markdown

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

@rlinoz
rlinoz removed the request for review from carlosmiceli July 30, 2026 12:20
description={customDateDescription}
onPress={selectCustomDateMode}
/>
{shouldShowCustomDate && (

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

❌ CLEAN-REACT-PATTERNS-1 (docs)

The new shouldShowCustomDate boolean prop is a configuration flag whose sole purpose is to conditionally render the "Custom date" MenuItem ({shouldShowCustomDate && (<MenuItem ... />)}). This is the composition-over-configuration anti-pattern (Case 1/Case 2): a shouldShow* flag that toggles element visibility is a behavioral flag, and every new consumer cements the config-driven API. Adding more visibility toggles to this component grows its surface area and coupling over time.

Prefer expressing this as composition so consumers include/omit the element rather than toggling it via a prop. For example, let the caller decide whether the custom-date option is present by composing it in, instead of the component branching on a flag:

// Consumer that wants the option composes it in; consumer that doesn't simply omits it.
// The component renders its children/slots and never needs a shouldShowCustomDate branch.

If a compositional refactor is out of scope here, at minimum keep this flag from proliferating — the presence/absence of the custom-date option should be driven by composition rather than an ever-growing set of shouldShow* booleans.


Reviewed at: 68b53d6 | Please rate this suggestion with 👍 or 👎 to help us improve! Reactions are used to monitor reviewer efficiency.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

I think this is not worth a refactor, let me know if you disagree.

@JmillsExpensify JmillsExpensify left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

LGTM

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