Refactor getValidOptions by dukenv0307 · Pull Request #79329 · Expensify/App

dukenv0307 · 2026-01-12T09:15:47Z

Explanation of Change

Fixed Issues

$ #66377
PROPOSAL:

Tests

Test 1:

Click FAB
Start chat
Select any chat
Send any message
Verify there's no error

Test 2:

Click FAB
Start chat
Select some members to create the group chat
Send any message
Verify there's no error

Test 3:

Click FAB
Start chat
Select Room
Enter room name and workspace
Send any message to ws room
Verify there's no error

Verify that no errors appear in the JS console

Offline tests

QA Steps

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

Screen.Recording.2026-01-12.at.16.05.13.mov

Android: mWeb Chrome

Screen.Recording.2026-01-12.at.16.01.07.mov

iOS: Native

Screen.Recording.2026-01-12.at.16.11.05.mov

iOS: mWeb Safari

Screen.Recording.2026-01-12.at.16.00.41.mov

MacOS: Chrome / Safari

Screen.Recording.2026-01-12.at.15.55.24.mov

Screen.Recording.2026-01-12.at.15.54.47.mov

melvin-bot · 2026-01-12T09:16:19Z

@bernhardoj 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 · 2026-01-12T09:16:25Z

@abzokhattab @danieldoglas One of you needs to 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]

dukenv0307 · 2026-01-12T09:16:40Z

@DylanDylann Please review this PR

codecov · 2026-01-12T09:24:04Z

Codecov Report

❌ Looks like you've decreased code coverage for some files. Please write tests to increase, or at least maintain, the existing level of code coverage. See our documentation here for how to interpret this table.

Files with missing lines	Coverage Δ
src/pages/NewChatPage.tsx	`64.33% <100.00%> (+0.25%)`	⬆️
...ponents/Search/FilterDropdowns/UserSelectPopup.tsx	`4.16% <0.00%> (-0.09%)`	⬇️
...nents/Search/SearchFiltersParticipantsSelector.tsx	`0.00% <0.00%> (ø)`
src/libs/ReportUtils.ts	`71.71% <83.33%> (-0.03%)`	⬇️
...ges/iou/request/MoneyRequestAccountantSelector.tsx	`0.00% <0.00%> (ø)`
src/pages/workspace/WorkspaceNewRoomPage.tsx	`0.00% <0.00%> (ø)`
src/libs/OptionsListUtils/index.ts	`73.66% <70.00%> (+0.08%)`	⬆️
src/hooks/useSearchSelector.base.ts	`0.00% <0.00%> (-20.64%)`	⬇️
... and 8 files with indirect coverage changes

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 474b105f67

ℹ️ About Codex in GitHub

Codex has been enabled to automatically review pull requests in this repo. Reviews are triggered when you

Open a pull request for review
Mark a draft as ready
Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

When you sign up for Codex through ChatGPT, Codex can also answer questions or update the PR, like "@codex address that feedback".

chatgpt-codex-connector · 2026-01-12T09:25:06Z

            case CONST.SEARCH_SELECTOR.SEARCH_CONTEXT_MEMBER_INVITE:
-                return getValidOptions(optionsWithContacts, draftComments, nvpDismissedProductTraining, loginList, {
+                return getValidOptions(optionsWithContacts, allPolicies, draftComments, nvpDismissedProductTraining, loginList, {
                    betas: betas ?? [],
                    includeP2P: true,
                    includeSelectedOptions: false,


Add policies to memo dependencies

The baseOptions useMemo now calls getValidOptions with allPolicies, but allPolicies is not listed in the dependency array, so when policy data loads or changes (e.g., admin role updates, invoice-room eligibility, category settings) the options list will stay stale until another dependency changes. This can hide or show the wrong reports in search until the user types or navigates, which is a regression introduced by adding allPolicies as an input.

Useful? React with 👍 / 👎.

heyjennahay · 2026-01-12T13:18:54Z

Product review not required. Removing myself and unsubscribing

DylanDylann · 2026-01-12T17:09:11Z

    const [isSearchingForReports] = useOnyx(ONYXKEYS.IS_SEARCHING_FOR_REPORTS, {initWithStoredValues: false, canBeMissing: true});
    const [draftComments] = useOnyx(ONYXKEYS.COLLECTION.REPORT_DRAFT_COMMENT, {canBeMissing: true});
    const [nvpDismissedProductTraining] = useOnyx(ONYXKEYS.NVP_DISMISSED_PRODUCT_TRAINING, {canBeMissing: true});
+    const [allPolicies] = useOnyx(ONYXKEYS.COLLECTION.POLICY, {canBeMissing: true});


comment to add this PR to k2s list

DylanDylann · 2026-01-14T09:33:53Z

    const accountIDs = getParticipantsAccountIDsForDisplay(option.item);

-    if (excludeNonAdminWorkspaces && !isPolicyAdmin(option.policyID, policies)) {
+    if (excludeNonAdminWorkspaces && policy && !isPolicyAdmin(option.policyID, policy)) {


Could we move policy check inside isPolicyAdmin?

DylanDylann · 2026-01-14T09:34:56Z

+        return isPolicyAdmin(policyID, policies?.[`${ONYXKEYS.COLLECTION.POLICY}${policyID}`]);
+    }, [policyID, policies?.[`${ONYXKEYS.COLLECTION.POLICY}${policyID}`]]);


missing dependency:

DylanDylann · 2026-01-14T09:37:12Z

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.2026-01-14.at.16.37.51.mov

Android: HybridApp

Android: mWeb Chrome

iOS: HybridApp

iOS: mWeb Safari

MacOS: Chrome / Safari

DylanDylann · 2026-01-14T09:37:36Z

Waiting for @dukenv0307 to solve above comments. The rest looks fine

Co-authored-by: DylanDylann <141406735+DylanDylann@users.noreply.github.com>

danieldoglas · 2026-01-14T23:59:27Z

@dukenv0307 please solve the conflict here so we can merge

dukenv0307 · 2026-01-15T03:12:07Z

@danieldoglas We're good to merge

dukenv0307 · 2026-01-19T04:32:39Z

Kindly bump @danieldoglas

OSBotify · 2026-01-19T16:37:26Z

✋ 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 · 2026-01-20T17:42:26Z

🚀 Deployed to staging by https://github.com/danieldoglas in version: 9.3.5-0 🚀

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

OSBotify · 2026-01-21T23:06:55Z

🚀 Deployed to production by https://github.com/Beamanator in version: 9.3.5-7 🚀

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

Refactor getValidOptions

474b105

melvin-bot Bot assigned dukenv0307 Jan 12, 2026

dukenv0307 marked this pull request as ready for review January 12, 2026 09:16

dukenv0307 requested review from a team as code owners January 12, 2026 09:16

melvin-bot Bot requested review from a team, bernhardoj and heyjennahay and removed request for a team January 12, 2026 09:16

melvin-bot Bot requested review from abzokhattab and danieldoglas and removed request for a team January 12, 2026 09:16

chatgpt-codex-connector Bot reviewed Jan 12, 2026

View reviewed changes

refactor prepareReportOptionsForDisplay

02f17e2

heyjennahay removed their request for review January 12, 2026 13:19

DylanDylann reviewed Jan 12, 2026

View reviewed changes

dukenv0307 added 2 commits January 13, 2026 09:49

lint fix

0792613

merge main

29f7f87

DylanDylann reviewed Jan 14, 2026

View reviewed changes

refactor isPolicyAdmin

960b104

DylanDylann reviewed Jan 14, 2026

View reviewed changes

Comment thread src/libs/ReportUtils.ts Outdated

DylanDylann approved these changes Jan 14, 2026

View reviewed changes

dukenv0307 and others added 2 commits January 14, 2026 16:58

Update src/libs/ReportUtils.ts

cf24a56

Co-authored-by: DylanDylann <141406735+DylanDylann@users.noreply.github.com>

update policyID

85dceb0

merge main

c26aa09

danieldoglas approved these changes Jan 19, 2026

View reviewed changes

danieldoglas merged commit 59ed86e into Expensify:main Jan 19, 2026
29 checks passed

OSBotify mentioned this pull request Jan 20, 2026

Deploy Checklist: New Expensify 2026-01-20 #80009

Closed

85 tasks

melvin-bot Bot mentioned this pull request Jan 21, 2026

Remove Onyx.connect() for the key: ONYXKEYS.COLLECTION.POLICY in src/libs/OptionsListUtils.ts #66377

Closed

		return isPolicyAdmin(policyID, policies?.[`${ONYXKEYS.COLLECTION.POLICY}${policyID}`]);
		}, [policyID, policies?.[`${ONYXKEYS.COLLECTION.POLICY}${policyID}`]]);

Uh oh!

Conversation

dukenv0307 commented Jan 12, 2026

Explanation of Change

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

Uh oh!

melvin-bot Bot commented Jan 12, 2026

Uh oh!

melvin-bot Bot commented Jan 12, 2026

Uh oh!

dukenv0307 commented Jan 12, 2026

Uh oh!

codecov Bot commented Jan 12, 2026 • edited by github-actions Bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

chatgpt-codex-connector Bot Jan 12, 2026

Choose a reason for hiding this comment

Uh oh!

heyjennahay commented Jan 12, 2026

Uh oh!

DylanDylann Jan 12, 2026

Choose a reason for hiding this comment

Uh oh!

DylanDylann Jan 14, 2026

Choose a reason for hiding this comment

Uh oh!

DylanDylann Jan 14, 2026

Choose a reason for hiding this comment

Uh oh!

DylanDylann commented Jan 14, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

DylanDylann commented Jan 14, 2026

Uh oh!

Uh oh!

danieldoglas commented Jan 14, 2026

Uh oh!

dukenv0307 commented Jan 15, 2026

Uh oh!

dukenv0307 commented Jan 19, 2026

Uh oh!

Uh oh!

OSBotify commented Jan 19, 2026

Uh oh!

OSBotify commented Jan 20, 2026

Uh oh!

OSBotify commented Jan 21, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

codecov Bot commented Jan 12, 2026 •

edited by github-actions Bot

Loading

DylanDylann commented Jan 14, 2026 •

edited

Loading