fix: incorrect selected state search term #67071

daledah · 2025-07-24T14:25:17Z

Explanation of Change

Fixed Issues

$ #63856
PROPOSAL: #63856 (comment)

Tests

Go to reports
Select "From" Filter
Verify that: There's no (you) postfix in current user option
Try search you or me
Verify that: current user option appears as a search result.
Select current user
Try search you or me
Verify that: current user remains selected

Verify that no errors appear in the JS console

Offline tests

QA Steps

Go to reports
Select "From" Filter
Verify that: There's no (you) postfix in current user option
Try search you or me
Verify that: current user option appears as a search result.
Select current user
Try search you or me
Verify that: current user remains selected

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

Screen.Recording.2025-06-23.at.15.25.07.mov

Android: mWeb Chrome

Screen.Recording.2025-06-23.at.15.25.35.mov

iOS: Native

Screen.Recording.2025-06-23.at.15.27.08.mov

iOS: mWeb Safari

Screen.Recording.2025-06-23.at.15.41.54.mov

MacOS: Chrome / Safari

Screen.Recording.2025-06-23.at.15.42.15.mov

MacOS: Desktop

Screen.Recording.2025-06-23.at.15.42.44.mov

melvin-bot · 2025-07-27T20:17:04Z

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

s77rt · 2025-07-27T23:24:27Z

src/libs/OptionsListUtils.ts


-function getPersonalDetailSearchTerms(item: Partial<OptionData>) {
-    return [item.participantsList?.[0]?.displayName ?? '', item.login ?? '', item.login?.replace(CONST.EMAIL_SEARCH_REGEX, '') ?? ''];
+function getPersonalDetailSearchTerms(item: Partial<OptionData>, shouldIncludeCurrentUser = false) {


Why are we adding shouldIncludeCurrentUser param here? Shouldn't we use getCurrentUserSearchTerms for the "current user" option

The function formatSectionsFromSearchTerm uses getPersonalDetailSearchTerms here:

App/src/libs/OptionsListUtils.ts

Line 2388 in 894ea88

const isPartOfSearchTerm = getPersonalDetailSearchTerms(participant).join(' ').toLowerCase().includes(cleanSearchTerm);

And there's a little bit different between getPersonalDetailSearchTerms and getCurrentUserSearchTerms, so I think it's best to avoid using getCurrentUserSearchTerms in formatSectionsFromSearchTerm to prevent possible regressions.

I still think calling getCurrentUserSearchTerms is what we should do if the option item is a current user option. It does not make sense to me to pass shouldIncludeCurrentUser to getPersonalDetailSearchTerms because that would make getCurrentUserSearchTerms redundant

daledah · 2025-08-05T02:24:15Z

@s77rt Sorry for the delay, there has been some new changes in latest main that conflicts with current PR so I had to make some updates.

src/libs/OptionsListUtils.ts

src/components/Search/FilterDropdowns/UserSelectPopup.tsx

daledah · 2025-08-06T16:54:12Z

@s77rt I updated.
To explain the changes, in latest main, if we set includeCurrentUser as false, personalDetailsOptions will not include current user:

App/src/libs/OptionsListUtils.ts

Lines 2000 to 2006 in 0020ebc

    
           let personalDetailLoginsToExclude = loginsToExclude; 
        
           if (currentUserLogin) { 
        
               personalDetailLoginsToExclude = { 
        
                   ...loginsToExclude, 
        
                   [currentUserLogin]: !config.includeCurrentUser, 
        
               }; 
        
           }

App/src/libs/OptionsListUtils.ts

Lines 2023 to 2025 in 0020ebc

    
           if (personalDetailLoginsToExclude[personalDetail.login]) { 
        
               return false; 
        
           }

App/src/libs/OptionsListUtils.ts

Line 2031 in 0020ebc

    
           personalDetailsOptions = optionsOrderBy(options.personalDetails, personalDetailsComparator, maxElements, filteringFunction, true);

And the currentUserOption is calculated based on personalDetailsOptions, it will be undefined:

App/src/libs/OptionsListUtils.ts

Lines 2038 to 2040 in 0020ebc

    
           if (!!currentUserLogin && personalDetail?.login === currentUserLogin) { 
        
               currentUserRef.current = personalDetail; 
        
           }

So we need to set includeCurrentUser as true only in this PR changes and add some filtering to prevent 2 items of current user appears on screen.

s77rt · 2025-08-06T23:42:04Z

@daledah Given that the current user is included in the personal details list, let's just use that and remove the added userOptions. All what we would have to do is to update getPersonalDetailSearchTerms

if (item.accountID === currentUserAccountID) {
    return getCurrentUserSearchTerms(item);
}

daledah · 2025-08-07T20:36:17Z

@s77rt I updated.

s77rt

Code looks good. Just left a NAB comment. Will complete checklist asap

src/libs/OptionsListUtils.ts

s77rt · 2025-08-08T17:28: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 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

Build issue. NAB.

Android: mWeb Chrome

iOS: HybridApp

iOS: mWeb Safari

MacOS: Chrome / Safari

MacOS: Desktop

OSBotify · 2025-08-11T13:49:34Z

✋ 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 · 2025-08-12T04:27:27Z

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

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

github-actions · 2025-08-13T21:31:28Z

🚀 Deployed to production by https://github.com/marcaaron in version: 9.1.93-7 🚀

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

daledah added 4 commits July 24, 2025 21:24

fix: incorrect selected state search term

5d989c9

Merge branch 'main' into fix/66978

3b2764a

fix: remove 'you' postfix, add search term

0beefac

fix: reapply regression fix

5feab16

daledah marked this pull request as ready for review July 27, 2025 20:16

daledah requested a review from a team as a code owner July 27, 2025 20:17

melvin-bot bot requested a review from s77rt July 27, 2025 20:17

melvin-bot bot removed the request for review from a team July 27, 2025 20:17

daledah mentioned this pull request Jul 27, 2025

[Due for payment 2025-08-20] [$125] Reports - "you" returns current account in Filters > From page, but no results in From button #63856

Closed

16 tasks

s77rt suggested changes Jul 27, 2025

View reviewed changes

daledah added 3 commits July 29, 2025 21:27

Merge branch 'main' into fix/66978

91a04ad

Merge branch 'main' into fix/66978

0bda27f

fix: use current user search term

2e3aee3

s77rt suggested changes Aug 5, 2025

View reviewed changes

daledah added 3 commits August 6, 2025 23:33

Merge branch 'main' into fix/66978

cbf4b42

fix: refactor logics

4c682ff

fix: remove redundant param

bd8d4a9

daledah added 2 commits August 8, 2025 03:19

Merge branch 'main' into fix/66978

ece90a5

refactor logics

916a169

s77rt reviewed Aug 8, 2025

View reviewed changes

src/libs/OptionsListUtils.ts Show resolved Hide resolved

daledah added 2 commits August 8, 2025 14:43

Merge branch 'main' into fix/66978

c0ab3be

fix: suggestions

2612505

s77rt approved these changes Aug 8, 2025

View reviewed changes

melvin-bot bot requested a review from JS00001 August 8, 2025 17:28

JS00001 approved these changes Aug 11, 2025

View reviewed changes

JS00001 merged commit 0b868b6 into Expensify:main Aug 11, 2025
21 checks passed

OSBotify mentioned this pull request Aug 12, 2025

Deploy Checklist: New Expensify 2025-08-12 #68324

Closed

93 tasks

s77rt mentioned this pull request Aug 15, 2025

Suggested Search #62851

Merged

60 tasks

fix: incorrect selected state search term #67071

fix: incorrect selected state search term #67071

Uh oh!

Conversation

daledah commented Jul 24, 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 Jul 27, 2025

Uh oh!

s77rt Jul 27, 2025

Choose a reason for hiding this comment

Uh oh!

daledah Jul 29, 2025

Choose a reason for hiding this comment

Uh oh!

s77rt Jul 29, 2025

Choose a reason for hiding this comment

Uh oh!

daledah commented Aug 5, 2025

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

daledah commented Aug 6, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

s77rt commented Aug 6, 2025

Uh oh!

daledah commented Aug 7, 2025

Uh oh!

s77rt left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

s77rt commented Aug 8, 2025

Reviewer Checklist

Screenshots/Videos

Uh oh!

Uh oh!

OSBotify commented Aug 11, 2025

Uh oh!

github-actions bot commented Aug 12, 2025

Uh oh!

github-actions bot commented Aug 13, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

daledah commented Jul 24, 2025 •

edited

Loading

daledah commented Aug 6, 2025 •

edited

Loading