[No QA] Cleanup advanced filters code for a ton of filters by JS00001 · Pull Request #69800 · Expensify/App

JS00001 · 2025-09-03T16:53:25Z

Explanation of Change

No feature changes, code cleanup of advanced filters to better reuse methods, match existing patterns, and make adding new filters easier

Fixed Issues

N/A

Tests

N/A

Verify that no errors appear in the JS console

Offline tests

N/A

QA Steps

N/A

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
- MacOS: Desktop
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 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

N/A

melvin-bot · 2025-09-03T16:54:01Z

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

JS00001 · 2025-09-03T16:56:02Z

Adding carlos as a reviewer so he can track changes that were made when he gets back from OOO, but could you please review this @justinpersaud ? Thanks!

ikevin127 · 2025-09-03T19:58:35Z

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: Native
- Android: mWeb Chrome
- iOS: Native
- iOS: mWeb Safari
- MacOS: Chrome / Safari
- MacOS: Desktop
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

N/A

trjExpensify · 2025-09-03T20:10:46Z

Code clean up PR, doesn’t have any new product considerations. Removing the tag and unsubscribing myself.

ikevin127 · 2025-09-03T23:02:17Z

src/libs/SearchQueryUtils.ts

+    if (AMOUNT_FILTER_KEYS.includes(filterName as SearchAmountFilterKeys)) {
+        if (typeof filterValue === 'string') {
+            const backendAmount = convertToBackendAmount(Number(filterValue));
+            return Number.isNaN(backendAmount) ? filterValue : backendAmount.toString();
+        }
+        return filterValue.map((amount) => {
+            const backendAmount = convertToBackendAmount(Number(amount));
+            return Number.isNaN(backendAmount) ? amount : backendAmount.toString();
+        });


NAB: Potential issue, if users paste values with thousand separators (e.g., "1,234.56") or spaces, Number() becomes NaN and the value will skip conversion. If this is expected, ✅; otherwise, consider normalizing input (e.g., stripping commas/spaces) before conversion to better align with real-world user input.

Why it matters: If a user types “1,000”, it won’t match any results because it remains as “1,000” in the backend query (string), instead of converting to “100000” (number).

🧪 Test coverage - Consider unit tests for (if we decide to implement the logic mentioned above):

Conversion of single and array amount values for each key in AMOUNT_FILTER_KEYS

Ensuring non-numeric strings remain unchanged

Verifying buildFilterFormValuesFromQuery picks up < and > operators and respects IOU.AMOUNT_MAX_LENGTH + 2

This is the same logic from before, just using AMOUNT_FILTER_KEYS, so lets keep it the same for now, if this is a bug that exists on prod, could you create a bug report for it?

This was causing #72391 so we added a param to skip conversion in #73741

src/pages/Search/AdvancedSearchFilters.tsx

ikevin127

Besides the ☝️ two comments (1 NAB, 1 potential blocker), LGTM 🟢

melvin-bot · 2025-09-03T23:13:50Z

@Gonals 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 · 2025-09-03T23:13:53Z

🎯 @ikevin127, thanks for reviewing and testing this PR! 🎉

An E/App issue has been created to issue payment here: #69832.

JS00001 · 2025-09-04T11:41:24Z

@Gonals I assigned carlos so he can track progress when hes back from OOO, would you mind reviewing this? Thanks!

…p-advanced-filters-code

OSBotify · 2025-09-04T12:43:10Z

✋ This PR was not deployed to staging yet because QA is ongoing. It will be automatically deployed to staging after the next production release.

JS00001 · 2025-09-04T12:46:09Z

Oh, melvin assigned two people, sorry Alberto, thanks Justin!

OSBotify · 2025-09-05T20:05:54Z

🚀 Deployed to staging by https://github.com/justinpersaud in version: 9.2.2-0 🚀

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

OSBotify · 2025-09-09T03:08:22Z

🚀 Deployed to production by https://github.com/francoisl in version: 9.2.2-8 🚀

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

JS00001 added 5 commits September 3, 2025 12:33

remove excess if statements

b7d709e

add AMOUNT_KEY

9ef1deb

use amount keys where we can

247a661

more changes for amount filter keys

0a6dc54

cleanup more advanced filters

dfa4be6

JS00001 requested a review from ikevin127 September 3, 2025 16:53

JS00001 requested review from a team as code owners September 3, 2025 16:53

melvin-bot bot assigned JS00001 Sep 3, 2025

melvin-bot bot requested a review from justinpersaud September 3, 2025 16:54

melvin-bot bot removed the request for review from a team September 3, 2025 16:54

JS00001 requested a review from luacmartins September 3, 2025 16:55

trjExpensify removed the request for review from a team September 3, 2025 20:10

ikevin127 reviewed Sep 3, 2025

View reviewed changes

src/pages/Search/AdvancedSearchFilters.tsx Outdated Show resolved Hide resolved

ikevin127 approved these changes Sep 3, 2025

View reviewed changes

melvin-bot bot requested a review from Gonals September 3, 2025 23:13

melvin-bot bot mentioned this pull request Sep 3, 2025

[Due for payment 2025-09-15] Payment issue for E/App PR#69800 #69832

Closed

add better chaninig

313890c

Merge branch 'main' of github.com:Expensify/App into jsenyitko-cleanu…

e4f899f

…p-advanced-filters-code

justinpersaud approved these changes Sep 4, 2025

View reviewed changes

justinpersaud merged commit 5cd6678 into main Sep 4, 2025
24 checks passed

justinpersaud deleted the jsenyitko-cleanup-advanced-filters-code branch September 4, 2025 12:32

OSBotify mentioned this pull request Sep 5, 2025

Deploy Checklist: New Expensify 2025-09-05 #69979

Closed

Conversation

JS00001 commented Sep 3, 2025 • 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 Sep 3, 2025

Uh oh!

JS00001 commented Sep 3, 2025

Uh oh!

ikevin127 commented Sep 3, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

trjExpensify commented Sep 3, 2025

Uh oh!

ikevin127 Sep 3, 2025

Choose a reason for hiding this comment

Uh oh!

JS00001 Sep 4, 2025

Choose a reason for hiding this comment

Uh oh!

Ollyws Nov 13, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

ikevin127 left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

melvin-bot bot commented Sep 3, 2025

Uh oh!

melvin-bot bot commented Sep 3, 2025

Uh oh!

JS00001 commented Sep 4, 2025

Uh oh!

Uh oh!

OSBotify commented Sep 4, 2025

Uh oh!

JS00001 commented Sep 4, 2025

Uh oh!

OSBotify commented Sep 5, 2025

Uh oh!

OSBotify commented Sep 9, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

JS00001 commented Sep 3, 2025 •

edited

Loading

ikevin127 commented Sep 3, 2025 •

edited

Loading

ikevin127 left a comment •

edited

Loading