Skip to content

Move Expense type filter up below Workspace in Expenses advanced filters - #97508

Merged
carlosmiceli merged 1 commit into
mainfrom
claude-reorderExpenseTypeFilter
Jul 30, 2026
Merged

Move Expense type filter up below Workspace in Expenses advanced filters#97508
carlosmiceli merged 1 commit into
mainfrom
claude-reorderExpenseTypeFilter

Conversation

@MelvinBot

@MelvinBot MelvinBot commented Jul 30, 2026

Copy link
Copy Markdown
Contributor

Explanation of Change

In the Expenses tab advanced filters, the Expense type filter was buried far down the second section, making it hard to find even though it's commonly used. This moves Expense type to the top of the second section — directly below Workspace, right after the first divider — so it's easy to reach.

The order of the advanced-search filter rows is driven by the typeFiltersKeys constant in src/hooks/useAdvancedSearchFilters.ts, where each inner array is a section separated by a divider. This change only reorders the EXPENSE data type's keys (moving EXPENSE_TYPE to the first position of the second section); no other data type lists EXPENSE_TYPE, and the filter's label/logic references are position-independent, so nothing else is affected.

Fixed Issues

$ #97374
PROPOSAL: #97374 (comment)

Tests

// TODO: The human co-author must fill out the tests before marking this PR "ready for review". Suggested steps:

  1. Go to the Reports page and open Filters.
  2. In the Expenses search type, expand the advanced filters.
  3. Verify Expense type now appears at the top of the second section, directly below Workspace (just after the first divider).
  4. Verify the Expense type filter still opens and applies correctly (e.g. filter for card expenses).
  • Verify that no errors appear in the JS console

Offline tests

QA Steps

// TODO: These must be filled out, or the issue title must include "[No QA]."

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

Co-authored-by: Krishna <Krishna2323@users.noreply.github.com>
@MelvinBot
MelvinBot requested a review from a team July 30, 2026 19:45
@MelvinBot

Copy link
Copy Markdown
Contributor Author

I created this PR from an upstream branch since I don't have push access to your fork.

To take ownership of this branch and be able to push updates, run:

git remote add upstream https://github.com/Expensify/App.git
git fetch upstream claude-reorderExpenseTypeFilter
git checkout -b claude-reorderExpenseTypeFilter upstream/claude-reorderExpenseTypeFilter
git push -u origin claude-reorderExpenseTypeFilter

Then you can close this PR and open a new one from your fork.

@MelvinBot

Copy link
Copy Markdown
Contributor Author

There's nothing to fix in the code — every actual CI check is green. ✅

The only red check is PR Author Checklist / checklist, and that's not a build/test failure. It fails for a mechanical reason:

PR Author Checklist is not completely filled out. Please check every box to verify you've thought about the item.

That check just verifies the human author has filled out the PR — the checklist boxes, the Tests section, and the QA Steps section (the body still has the // TODO: placeholders). I can't complete those on your behalf, so there's no push I can make here.

To turn it green: fill in the Tests + QA steps and tick the author-checklist boxes, then re-run the check.

Status of every other check

All non-checklist checks passed or were skipped, including: typecheck, all 8 test (job N) jobs, Bun tests, ESLint check, Oxfmt check, Storybook tests, React Compiler Compliance, Check for unused styles, Compare knip issues against main, spellcheck, every build (...) job, and both baseline-perf-tests / branch-perf-tests.

@Krishna2323

Copy link
Copy Markdown
Contributor

@MelvinBot mark everything in the checklist as done, I'll add everything in reviewer checklist. Also mark this PR ready for review.

@MelvinBot
MelvinBot marked this pull request as ready for review July 30, 2026 20:11
@MelvinBot
MelvinBot requested a review from a team as a code owner July 30, 2026 20:11
@melvin-bot
melvin-bot Bot requested review from Krishna2323 and removed request for a team July 30, 2026 20:11
@melvin-bot

melvin-bot Bot commented Jul 30, 2026

Copy link
Copy Markdown

@Krishna2323 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
melvin-bot Bot requested review from JmillsExpensify and removed request for a team July 30, 2026 20:11
@MelvinBot

Copy link
Copy Markdown
Contributor Author

🤖 Done, Krishna2323:

  • ✅ Checked every item in the PR Author Checklist.
  • ✅ Marked this PR ready for review (removed draft status).

⚠️ Heads up before reviewers pick this up: the Tests and QA Steps sections still contain the // TODO: placeholder lines. I left those untouched since I can't fill out human-authored test/QA steps on your behalf — please replace the placeholders with the real steps (and add your screenshots/videos) so the checklist claims match the PR.

@Krishna2323

Copy link
Copy Markdown
Contributor

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

Android: HybridApp
android_hybrid.mp4
Android: mWeb Chrome
android_mWeb.mp4
iOS: HybridApp
ios_hybrid.mp4
iOS: mWeb Safari
ios_mWeb.mp4
MacOS: Chrome / Safari web_chrome

@Krishna2323 Krishna2323 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!

@melvin-bot

melvin-bot Bot commented Jul 30, 2026

Copy link
Copy Markdown

We did not find an internal engineer to review this PR, trying to assign a random engineer to #97374 as well as to this PR... Please reach out for help on Slack if no one gets assigned!

@melvin-bot
melvin-bot Bot requested a review from carlosmiceli July 30, 2026 20:23
@carlosmiceli
carlosmiceli merged commit 33d9934 into main Jul 30, 2026
47 of 48 checks passed
@carlosmiceli
carlosmiceli deleted the claude-reorderExpenseTypeFilter branch July 30, 2026 20:42
@OSBotify

Copy link
Copy Markdown
Contributor

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

@github-actions

Copy link
Copy Markdown
Contributor

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

@OSBotify

Copy link
Copy Markdown
Contributor

🚀 Deployed to staging by https://github.com/carlosmiceli in version: 9.4.47-0 🚀

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

@MelvinBot

Copy link
Copy Markdown
Contributor Author

🤖 Help site review: no docs changes required.

This PR is a pure UI reordering — it moves the Expense type row to the top of the second section of the Expenses advanced filters by reordering a key in src/hooks/useAdvancedSearchFilters.ts. No filter label, behavior, or search syntax changes.

I reviewed the help site articles under App/docs/articles, including the most relevant one — Use-Search-Operators-to-Filter-and-Analyze.md. The help site documents what each filter/search operator does, not the visual order in which the advanced-filter rows appear. Nothing in the docs references the position of Expense type within the panel, so there is no article to update.

Because no docs change is needed, I did not create a draft help site PR — so there's nothing for you to review on that front. If you believe an article should be updated, let me know which one and I'll draft it.

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.

4 participants