Refactored localeCompare in SearchQueryUtils by shubham1206agra · Pull Request #66990 · Expensify/App

shubham1206agra · 2025-07-23T17:52:07Z

Explanation of Change

Fixed Issues

$ #66325

Tests

Open App
Go to Reports tab
Try to use different filters.
Verify that the order of selection does not change the query.

Verify that no errors appear in the JS console

Offline tests

Same as Tests

QA Steps

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

Same as Tests

PR Author Checklist

Screenshots/Videos

Android: Native

Screen.Recording.2025-07-29.at.9.52.58.PM.mov

Android: mWeb Chrome

Screen.Recording.2025-07-29.at.8.47.00.PM.mov

iOS: Native

Screen.Recording.2025-07-29.at.9.00.29.PM.mov

iOS: mWeb Safari

Screen.Recording.2025-07-29.at.8.37.02.PM.mov

MacOS: Chrome / Safari

Screen.Recording.2025-07-29.at.8.29.38.PM.mov

MacOS: Desktop

Screen.Recording.2025-07-29.at.8.52.43.PM.mov

melvin-bot · 2025-07-29T16:27:11Z

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

DylanDylann · 2025-07-30T09:37:40Z

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

Screen.Recording.2025-07-30.at.16.37.05.mov

Android: HybridApp

Android: mWeb Chrome

iOS: HybridApp

iOS: mWeb Safari

MacOS: Chrome / Safari

MacOS: Desktop

DylanDylann

LGTM

tgolen · 2025-07-30T14:23:53Z

+            expect(sortedOptions).toEqual([CONST.SEARCH.CATEGORY_EMPTY_VALUE, 'A', 'B', 'C']);
+        });
+
+        it('should not change order of non-empty values', () => {


This reads a little misleading to me, or maybe I'm not quite understanding what you mean. The order of the non-empty values does change (from BAC to ABC). Maybe this should be called "should sort non-empty values properly" or something like that?

tgolen · 2025-07-30T14:26:47Z

+ * @private
+ * This is a custom collator only for testing purposes.
+ */
+const customCollator = new Intl.Collator('en', {usage: 'sort', sensitivity: 'variant', numeric: true, caseFirst: 'upper'});


Since this is duplicated, I have a couple of suggestions:

Define it in CONST (which isn't great because @private designation won't be as effective

Export it from src/libs/SearchQueryUtils.ts with an explicit comment saying it's only being exported so that tests can access it and it shouldn't be used otherwise

Define it in its own file somewhere and then import it into this test and SearchQueryUtils.ts

Let's keep these declaration different. As otherwise, I would have to break private assumption of the variable. And I don't want to do that as I don't trust any contributor of not mishandling the variable given I saw way too many people doing anti-patterns.

OK, sounds good. I agree with that argument.

OSBotify · 2025-07-30T15:53:06Z

✋ 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-07-31T12:17:29Z

🚀 Deployed to staging by https://github.com/tgolen in version: 9.1.88-0 🚀

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

github-actions · 2025-08-04T19:24:24Z

🚀 Deployed to production by https://github.com/grgia in version: 9.1.88-3 🚀

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

shubham1206agra and others added 2 commits July 23, 2025 23:17

Refactored localeCompare in SearchQueryUtils

e410acf

Merge branch 'Expensify:main' into refactor-onyx-3

8e15821

shubham1206agra marked this pull request as ready for review July 29, 2025 16:27

shubham1206agra requested a review from a team as a code owner July 29, 2025 16:27

melvin-bot Bot requested review from DylanDylann and removed request for a team July 29, 2025 16:27

DylanDylann approved these changes Jul 30, 2025

View reviewed changes

melvin-bot Bot requested a review from tgolen July 30, 2025 09:37

tgolen requested changes Jul 30, 2025

View reviewed changes

shubham1206agra commented Jul 30, 2025

View reviewed changes

Comment thread tests/unit/Search/SearchQueryUtilsTest.ts Outdated

Update tests/unit/Search/SearchQueryUtilsTest.ts

be83bc7

tgolen approved these changes Jul 30, 2025

View reviewed changes

tgolen merged commit a86b485 into Expensify:main Jul 30, 2025

github-actions Bot mentioned this pull request Jul 31, 2025

Deploy Checklist: New Expensify 2025-07-31 #67499

Closed

90 tasks

BlameGPT mentioned this pull request Aug 1, 2025

[$250] [RCA #67117] Reports - "Feed" filter pill shows only 1 card feed when 2 card feeds are selected #67645

Closed

8 tasks

melvin-bot Bot mentioned this pull request Aug 4, 2025

[Due for payment 2025-10-15] [Due for payment 2025-10-07] $2500 Remove Onyx.connect() for the key: ONYXKEYS.ARE_TRANSLATIONS_LOADING in src/libs/LocaleCompare.ts #66325

Closed

shubham1206agra deleted the refactor-onyx-3 branch January 24, 2026 13:49

Navigation Menu

Uh oh!

Refactored localeCompare in SearchQueryUtils - #66990

Refactored localeCompare in SearchQueryUtils#66990
tgolen merged 3 commits into
Expensify:mainfrom
shubham1206agra:refactor-onyx-3

shubham1206agra commented Jul 23, 2025 •

edited

Loading

Uh oh!

melvin-bot Bot commented Jul 29, 2025

Uh oh!

DylanDylann commented Jul 30, 2025

Uh oh!

DylanDylann left a comment

Uh oh!

Uh oh!

tgolen Jul 30, 2025

Uh oh!

tgolen Jul 30, 2025

Uh oh!

shubham1206agra Jul 30, 2025

Uh oh!

tgolen Jul 30, 2025

Uh oh!

Uh oh!

OSBotify commented Jul 30, 2025

Uh oh!

github-actions Bot commented Jul 31, 2025

Uh oh!

github-actions Bot commented Aug 4, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

Uh oh!

Conversation

shubham1206agra commented Jul 23, 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 29, 2025

Uh oh!

DylanDylann commented Jul 30, 2025

Reviewer Checklist

Screenshots/Videos

Uh oh!

DylanDylann left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

tgolen Jul 30, 2025

Choose a reason for hiding this comment

Uh oh!

tgolen Jul 30, 2025

Choose a reason for hiding this comment

Uh oh!

shubham1206agra Jul 30, 2025

Choose a reason for hiding this comment

Uh oh!

tgolen Jul 30, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

OSBotify commented Jul 30, 2025

Uh oh!

github-actions Bot commented Jul 31, 2025

Uh oh!

github-actions Bot commented Aug 4, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

shubham1206agra commented Jul 23, 2025 •

edited

Loading