Skip to content

Search: Add Feed filter#65159

Merged
JS00001 merged 38 commits intoExpensify:mainfrom
s77rt:feed-filter
Jul 7, 2025
Merged

Search: Add Feed filter#65159
JS00001 merged 38 commits intoExpensify:mainfrom
s77rt:feed-filter

Conversation

@s77rt
Copy link
Member

@s77rt s77rt commented Jun 30, 2025

Explanation of Change

Fixed Issues

$ #64487
PROPOSAL:

Tests

Preconditions:

  • Be offline
  • Have a workspace with company cards
  • Have a workspace with Expensify cards
  1. Go to Reports > Expenses
  2. In top filters bar, click on Group by and select Card then click Apply
  3. In top filters bar, verify that there is a Feed filter
  4. Click on the Feed filter
  5. Verify all your card feeds are listed
  6. Verify that Expensify Card is listed (if you have any Expensify cards)
  7. In search input type Feed:
  8. Verify you get suggestions for all your card feeds except Expensify Card
  • Verify that no errors appear in the JS console

Offline tests

Same as Tests (NOT for QA)

QA Steps

Test 1:

  1. Go to Reports > Expenses
  2. In the top filters bar, click on Type filter and verify you can change the type.
  3. In the top filters bar, click on the blue Filters button to open advanced filters RHP
  4. Click on Type and verify you can change the type

Test 2:

  1. Go to Reports > Expenses
  2. In search input, type type:
  3. Verify you get suggestions (e.g. type:chat, type:expense, etc)

Test 3:

  1. Go to Reports > Expenses
  2. In the top filters bar, click on the blue Filters button to open advanced filters RHP
  3. Set Type filter to Expense
  4. Set Status filter to Drafts
  5. Set Billable filter to Yes
  6. Verify a Save search button is displayed
  7. Click on `Save search
  8. Verify a new item is added in LHN under Saved section

Test 4:

  1. Go to Reports > Reports
  2. Verify that the search input includes group-by:reports
  3. In the top filters bar, click on Type filter and change the type to Chat
  4. Verify that the search input not longer includes group-by:reports
  • 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 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 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
Android: mWeb Chrome
iOS: Native
Screen.Recording.2025-07-02.at.11.27.44.PM.mov
iOS: mWeb Safari
MacOS: Chrome / Safari
Screen.Recording.2025-07-02.at.10.34.38.PM.mov
MacOS: Desktop

| ValueOf<typeof CONST.SEARCH.SYNTAX_FILTER_KEYS>
| typeof CONST.SEARCH.SYNTAX_ROOT_KEYS.TYPE
| typeof CONST.SEARCH.SYNTAX_ROOT_KEYS.STATUS
| typeof CONST.SEARCH.SYNTAX_FILTER_KEYS.POLICY_ID
Copy link
Member Author

Choose a reason for hiding this comment

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

This is already included in ValueOf<typeof CONST.SEARCH.SYNTAX_FILTER_KEYS>

@JS00001 JS00001 self-requested a review July 1, 2025 11:06
@luacmartins luacmartins self-requested a review July 1, 2025 13:12
Comment on lines +202 to +204
// We don't want to show the "Expensify Card" feed in the autocomplete suggestion list
// Thus passing an empty object to the `allCards` parameter.
return Object.values(getCardFeedsForDisplay(allFeeds, {}));
Copy link
Member Author

Choose a reason for hiding this comment

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

We can also just filter the results but passing an empty object creates less work

Comment on lines +418 to +419
// s77rt check if the value that we should send to the backend is "Expensify Card" (same as displayed text)
// And if so update buildSubstitutionsMap to handle highlighting
Copy link
Contributor

Choose a reason for hiding this comment

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

Do we need to address this comment? Seems like something we wanna fix before merging this PR

Copy link
Member Author

Choose a reason for hiding this comment

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

This depends on the BE and I wanted to avoid raising concerns that are not worked on yet. I will circle back on each of the "s77rt" when removing the dev lock.

Currently we only add the highlights if the value is different than the displayed text. For Expensify Card I don't know what value we will be sending so the comment.

Screenshot 2025-07-02 at 9 37 03 PM Screenshot 2025-07-02 at 9 37 09 PM

Copy link
Contributor

Choose a reason for hiding this comment

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

@s77rt Here's a scenario where I have 3 virtual Expensify Cards added (2 on workspace owner and 1 on a member) and 1 Direct feed Company Card (AMEX) and here's how Feed dropdown looks:

Screenshot 2025-07-02 at 21 25 29

I'd expect to see 3 Expensify Card entries correct ? If so, is this related to the same issue you mentioned above ?

Currently we only add the highlights if the value is different than the displayed text. For Expensify Card I don't know what value we will be sending so the comment.

}

function getFeedOptions(allCardFeeds: OnyxCollection<OnyxTypes.CardFeeds>, allCards: OnyxTypes.CardList) {
// s77rt confirm if the feed value is just the feed key or if it should be prefixed with [fundID]_
Copy link
Contributor

Choose a reason for hiding this comment

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

Same here

Copy link
Member Author

Choose a reason for hiding this comment

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

Same as the highlights concern. This is BE related. Currently for Visa feed I'm sending value vcf but I see some logic (in Advanced Filters -> Card -> All Visa) the value is [fundID]_vcf

// s77rt remove DEV lock
const shouldDisplayGroupByFilter = isDevelopment;
// s77rt remove DEV lock
const shouldDisplayFeedFilter = isDevelopment && feedOptions.length > 1;
Copy link
Contributor

Choose a reason for hiding this comment

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

feedOptions.length > 1 here is preventing the display of the Feed filter dropdown even though I do have 1 valid feed in the feedOptions array (AMEX).

Copy link
Member Author

Choose a reason for hiding this comment

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

If you have only one feed, the filter would be pointless as you will already get results from that feed

Copy link
Contributor

@ikevin127 ikevin127 Jul 2, 2025

Choose a reason for hiding this comment

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

But you also get all other expenses which don't have anything to do with that specific feed (since we're not force-filtering by that 1 Feed by default), which if you have a lot of them, might pose an issue if the user only wants to see expenses related to that specific feed (card), right ?

Edit: I mean if that's what the design doc says, all good - I was just wondering since to me it looks like an issue.

Copy link
Member Author

Choose a reason for hiding this comment

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

Good point. I'm not really sure. Let's follow this on https://expensify.slack.com/archives/C0920G9GJ0N/p1751495500557969

Copy link
Member Author

Choose a reason for hiding this comment

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

But let's not block on that. Changing this condition can be done in a follow (if a change is required)

Copy link
Contributor

Choose a reason for hiding this comment

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

Cool, dropped a comment in that thread - starting work on the checklist.

Copy link
Contributor

Choose a reason for hiding this comment

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

Another thing related to the same topic here, while doing manual testing on the PR I noticed that if I select American Express feed and filter by it, currently the exact same expenses are showing (like the filter doesn't do anything), same if I try with a 2nd feed: Expensify Card.

I'm assuming this is due to BE missing the feed filtering logic, therefore not applying any filter and simply returning the exact same expenses for the type:expense status:all feed:"Expensify Card" filter, omitting the feed part.

Copy link
Member Author

Choose a reason for hiding this comment

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

I guess it's BE related. This will be tested again after removing dev lock

@ikevin127
Copy link
Contributor

ikevin127 commented Jul 3, 2025

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

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.mov
MacOS: Desktop
desktop.mov

@JS00001
Copy link
Contributor

JS00001 commented Jul 3, 2025

We change some logic with buildQueryString, and some other core logic, can we add some more generic QA steps too? I think regression testing will catch most issues, but maybe some key areas that were changed?

@s77rt
Copy link
Member Author

s77rt commented Jul 3, 2025

Done! I have added some more tests

@ikevin127
Copy link
Contributor

Having some issues with running the HybridApps on both platforms, trying rebuild so I can finish-up testing on all devices.

Copy link
Contributor

@ikevin127 ikevin127 left a comment

Choose a reason for hiding this comment

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

Added Android: HybridApp proof, everything looks good. Still working on the iOS: HybridApp build, but I won't block the merge on that.

Good job on this PR 🚀

:shipit:

Edit: Added iOS: HybridApp proof as well, Reviewer Checklist Completed ✅

@melvin-bot melvin-bot bot requested a review from JS00001 July 3, 2025 23:47
@JS00001 JS00001 merged commit 7e330a0 into Expensify:main Jul 7, 2025
21 checks passed
@OSBotify
Copy link
Contributor

OSBotify commented Jul 7, 2025

✋ 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
Contributor

github-actions bot commented Jul 8, 2025

🚀 Deployed to staging by https://github.com/JS00001 in version: 9.1.78-0 🚀

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

@github-actions
Copy link
Contributor

🚀 Deployed to production by https://github.com/mountiny in version: 9.1.78-4 🚀

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

FILTER_KEYS.EXPORTED_AFTER,
FILTER_KEYS.EXPORTED_BEFORE,
FILTER_KEYS.EXPORTED_ON,
FILTER_KEYS.GROUP_BY,
Copy link
Contributor

Choose a reason for hiding this comment

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

Coming from #70894, based on this comment we remove GROUP_BY filter from trip to be matched with BE.

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.

6 participants