Skip to content

use useSearchSelector hook and remove unused and duplicated code#71427

Merged
NikkiWines merged 26 commits intoExpensify:mainfrom
mkzie2:mkzie2-issue/71061
Nov 4, 2025
Merged

use useSearchSelector hook and remove unused and duplicated code#71427
NikkiWines merged 26 commits intoExpensify:mainfrom
mkzie2:mkzie2-issue/71061

Conversation

@mkzie2
Copy link
Contributor

@mkzie2 mkzie2 commented Sep 27, 2025

Explanation of Change

use useSearchSelector hook and remove unused and duplicated code

Fixed Issues

$ #71061
PROPOSAL:

Tests

  • Case 1
  1. Open Reports
  2. Click on From filter
  3. Select/Deselect the user
  4. Verify that the selected user is displayed with the checkmark
  5. Click on Filters > From
  6. Select/Deselect the user
  7. Verify that the selected user is displayed with the checkmark
  • Case 2
  1. Go FAB > Start chat
  2. Verify that the report and contact options are displayed correctly.
  3. Verify that the selfDM is displayed as the first item if it exists
  4. Type an email to any contact
  5. Verify that the search result matches the search string
  6. Select an option in Recent reports section
  7. Send a message
  8. Open Start chat page again
  9. Verify that the report opened at step 6 is at the top of Recent reports and below the selfDM if it exists
  • Verify that no errors appear in the JS console

Offline tests

Same

QA Steps

  • Case 1
  1. Open Reports
  2. Click on From filter
  3. Select/Deselect the user
  4. Verify that the selected user is displayed with the checkmark
  5. Click on Filters > From
  6. Select/Deselect the user
  7. Verify that the selected user is displayed with the checkmark
  • Case 2
  1. Go FAB > Start chat
  2. Verify that the report and contact options are displayed correctly.
  3. Verify that the selfDM is displayed as the first item if it exists
  4. Type an email to any contact
  5. Verify that the search result matches the search string
  6. Select an option in Recent reports section
  7. Send a message
  8. Open Start chat page again
  9. Verify that the report opened at step 6 is at the top of Recent reports and below the selfDM if it exists
  • 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 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
Screen.Recording.2025-09-28.at.00.12.38.mov
Android: mWeb Chrome
Screen.Recording.2025-09-28.at.00.11.41.mov
iOS: Native
Screen.Recording.2025-09-28.at.00.14.25.mov
iOS: mWeb Safari
Screen.Recording.2025-09-28.at.00.13.23.mov
MacOS: Chrome / Safari
Screen.Recording.2025-09-28.at.00.11.09.mov
Screen.Recording.2025-10-08.at.21.44.38.mp4
MacOS: Desktop
Screen.Recording.2025-09-28.at.00.15.33.mov

@codecov
Copy link

codecov bot commented Sep 27, 2025

Codecov Report

❌ Patch coverage is 56.52174% with 10 lines in your changes missing coverage. Please review.

Files with missing lines Patch % Lines
...ponents/Search/FilterDropdowns/UserSelectPopup.tsx 0.00% 5 Missing ⚠️
...nents/Search/SearchFiltersParticipantsSelector.tsx 0.00% 4 Missing ⚠️
src/hooks/useSearchSelector.base.ts 90.00% 1 Missing ⚠️
Files with missing lines Coverage Δ
src/pages/NewChatPage.tsx 77.50% <100.00%> (-1.39%) ⬇️
src/hooks/useSearchSelector.base.ts 80.00% <90.00%> (+26.55%) ⬆️
...nents/Search/SearchFiltersParticipantsSelector.tsx 0.00% <0.00%> (ø)
...ponents/Search/FilterDropdowns/UserSelectPopup.tsx 0.00% <0.00%> (ø)

... and 7 files with indirect coverage changes

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
  • 📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

@mkzie2 mkzie2 marked this pull request as ready for review September 27, 2025 17:53
@mkzie2 mkzie2 requested a review from a team as a code owner September 27, 2025 17:53
@melvin-bot melvin-bot bot requested review from rushatgabhane and removed request for a team September 27, 2025 17:53
@melvin-bot
Copy link

melvin-bot bot commented Sep 27, 2025

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

@ZhenjaHorbach
Copy link
Contributor

I suppose this is mine 😃

@ZhenjaHorbach
Copy link
Contributor

ZhenjaHorbach commented Sep 27, 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 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
    • 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 there are no new alerts related to the canBeMissing param for useOnyx
  • 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 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.ts 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.
  • 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
2025-10-09.16.38.58.mov
Android: mWeb Chrome
2025-10-09.16.38.58.mov
iOS: HybridApp
2025-10-09.16.30.35.mov
iOS: mWeb Safari
2025-10-09.16.30.35.mov
MacOS: Chrome / Safari
2025-10-09.16.23.46.mov
MacOS: Desktop
2025-10-09.16.23.46.mov

@sosek108
Copy link
Contributor

I'd like to be added as additional reviewer @ZhenjaHorbach @pecanoro

@ZhenjaHorbach
Copy link
Contributor

I'd like to be added as additional reviewer @ZhenjaHorbach @pecanoro

I think you can leave comments without any permission 😅

@sosek108
Copy link
Contributor

That's true 😅 I thought I need to be assigned officialy


function getSelectedOptionData(option: Option) {
return {...option, reportID: `${option.reportID}`, selected: true};
// eslint-disable-next-line rulesdir/no-default-id-values
Copy link
Contributor

Choose a reason for hiding this comment

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

Just checked
Do we really need this rule disable?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yes, I added because it was failed.

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 really still need this function at all?

useSearchSelector returns already selected options that have isSelected set to true. i think, this should be deprecated

@ZhenjaHorbach
Copy link
Contributor

ZhenjaHorbach commented Sep 30, 2025

That's true 😅 I thought I need to be assigned officialy

@sosek108
No worries
You can help with the review !

@sosek108
Copy link
Contributor

Issue mentions 3 components to change:

  1. UserSelectPopup
  2. SearchFiltersParticipantsSelector
  3. NewChatPage

Only Two are changed in current PR

@sosek108
Copy link
Contributor

I also worry that test cases only focuses on selection and not on other important cases like filtering, sorting etc.

@mkzie2
Copy link
Contributor Author

mkzie2 commented Sep 30, 2025

@sosek108 Does we want to keep the behavior on NewChatPage here?

@sosek108
Copy link
Contributor

@mkzie2 yeah, we want. useSearchSelector lacks this currently but I created a proposal for that #66615 (comment) .

@pecanoro pecanoro requested a review from sosek108 October 1, 2025 10:30
@mkzie2
Copy link
Contributor Author

mkzie2 commented Oct 2, 2025

@sosek108 So we don't need to do that here, right?

@sosek108
Copy link
Contributor

sosek108 commented Oct 3, 2025

Let's wait, please. You'll need to add one prop to getValidOptions call.

@mkzie2
Copy link
Contributor Author

mkzie2 commented Oct 3, 2025

Got it.

@sosek108
Copy link
Contributor

sosek108 commented Oct 7, 2025

@mkzie2 PR with changes to that got merged. #71557

This PR introduces property maxRecentReportsToShow which helps you limit number of reports

@mkzie2
Copy link
Contributor Author

mkzie2 commented Oct 7, 2025

I will check and update soon.

@mkzie2
Copy link
Contributor Author

mkzie2 commented Oct 27, 2025

@pecanoro I resolved the conflict.

@mkzie2
Copy link
Contributor Author

mkzie2 commented Oct 27, 2025

Do we need to retest here?

I tested.

Copy link
Contributor

@sosek108 sosek108 left a comment

Choose a reason for hiding this comment

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

LGTM

Copy link
Contributor

@NikkiWines NikkiWines left a comment

Choose a reason for hiding this comment

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

Sorry for the delay, was OOO - this looks good 👍

@NikkiWines
Copy link
Contributor

@mkzie2 could you merge main quick just cause this is a few days out of date?

@ZhenjaHorbach
Copy link
Contributor

@mkzie2
Friendly bump!

@rushatgabhane rushatgabhane removed their request for review November 3, 2025 20:49
@mkzie2 mkzie2 requested a review from a team as a code owner November 4, 2025 14:39
@melvin-bot melvin-bot bot requested review from heyjennahay and removed request for a team November 4, 2025 14:39
@mkzie2
Copy link
Contributor Author

mkzie2 commented Nov 4, 2025

@ZhenjaHorbach @NikkiWines I merged main.

@NikkiWines NikkiWines merged commit 88b525e into Expensify:main Nov 4, 2025
34 of 44 checks passed
@melvin-bot melvin-bot bot added the Emergency label Nov 4, 2025
@melvin-bot
Copy link

melvin-bot bot commented Nov 4, 2025

@NikkiWines looks like this was merged without a test passing. Please add a note explaining why this was done and remove the Emergency label if this is not an emergency.

@NikkiWines
Copy link
Contributor

All the tests passed?? 😕

@OSBotify
Copy link
Contributor

OSBotify commented Nov 4, 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.

@OSBotify
Copy link
Contributor

OSBotify commented Nov 4, 2025

🚀 Deployed to staging by https://github.com/NikkiWines in version: 9.2.44-0 🚀

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

@OSBotify
Copy link
Contributor

OSBotify commented Nov 5, 2025

🚀 Deployed to production by https://github.com/luacmartins in version: 9.2.44-5 🚀

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

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