Refactor: Deprecate getPersonalPolicy (part 4) #79591

shubham1206agra · 2026-01-14T18:01:54Z

Explanation of Change

Fixed Issues

$ #66397

Tests

Open App.
Go to self DM transaction.
Open description and try to write #lol
Verify that the report style cannot be seen.

Verify that no errors appear in the JS console

Offline tests

Same as Tests

QA Steps

Same as Tests

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

Screen.Recording.2026-01-14.at.11.25.43.PM.mov

melvin-bot · 2026-01-14T18:02:00Z

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

src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersCategoryPage.tsx

codecov · 2026-01-14T18:11:58Z

Codecov Report

✅ Changes either increased or maintained existing code coverage, great job!

Files with missing lines	Coverage Δ
src/pages/home/report/ReportActionItem.tsx	`100.00% <100.00%> (ø)`
...es/iou/request/step/IOURequestEditReportCommon.tsx	`75.86% <100.00%> (+0.28%)`	⬆️
src/pages/home/report/PureReportActionItem.tsx	`52.80% <0.00%> (+0.13%)`	⬆️
...ges/iou/request/step/IOURequestStepDescription.tsx	`0.00% <0.00%> (ø)`
...hAdvancedFiltersPage/SearchFiltersCategoryPage.tsx	`0.00% <0.00%> (ø)`
... and 44 files with indirect coverage changes

ikevin127 · 2026-01-16T00:25:00Z

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
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 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.
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

ikevin127 · 2026-01-16T01:29:36Z

src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersCategoryPage.tsx

+    const availableNonPersonalPolicyCategoriesSelector = useCallback(
+        (policyCategories: OnyxCollection<PolicyCategories>) =>
+            Object.fromEntries(
+                Object.entries(policyCategories ?? {}).filter(([key, categories]) => {
+                    if (key === `${ONYXKEYS.COLLECTION.POLICY_CATEGORIES}${personalPolicyID}`) {
+                        return false;
+                    }
+                    const availableCategories = Object.values(categories ?? {}).filter((category) => category.pendingAction !== CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE);
+                    return availableCategories.length > 0;
+                }),
+            ),
+        [personalPolicyID],
+    );


🟢 Minor: This could be extracted to src/selectors/PolicyCategories.ts - but it's not a blocker for merge.

Reasoning

Consistency with codebase conventions.

Reusability if the same filtering logic is needed elsewhere.

Testing - pure selector functions are easier to unit test.

Two considerations (if moved)

Dependency on personalPolicyID: The selector now depends on personalPolicyID which is passed via the useOnyx hook. Moving it to a pure selector file would require a factory pattern.

Current usage is singular: The selector is only used in SearchFiltersCategoryPage.tsx - if there's no immediate reuse need, keeping it local is acceptable.

ikevin127

✅ Additional manual tests (based on PR changes) that are all passing:

Search → Advanced Filters → Category → Verify all categories from your workspace appear (even disabled ones), but there are no unexpected orphan categories from the personal policy.
Self DM transaction → Description → type #lol → verify that no highlight occurs.
Workspace transaction → Description → type #lol → verify that highlight occurs.
Workspace chat → mention non-member → verify that "Invite to submit expense" and other Concierge action buttons appear.

🟢 LGTM

melvin-bot · 2026-01-16T01:48:49Z

We did not find an internal engineer to review this PR, trying to assign a random engineer to #66397 as well as to this PR... Please reach out for help on Slack if no one gets assigned!

OSBotify · 2026-01-16T17:37:44Z

✋ 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-16T23:37:44Z

🚀 Deployed to staging by https://github.com/justinpersaud in version: 9.3.4-0 🚀

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

OSBotify · 2026-01-20T17:11:01Z

🚀 Deployed to production by https://github.com/Beamanator in version: 9.3.4-6 🚀

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

shubham1206agra added 2 commits January 14, 2026 23:10

Refactor: Deprecate getPersonalPolicy (part 4)

582cf33

Prettier

e6d7707

shubham1206agra requested review from a team as code owners January 14, 2026 18:01

melvin-bot bot assigned shubham1206agra Jan 14, 2026

melvin-bot bot requested review from ikevin127 and removed request for a team January 14, 2026 18:01

melvin-bot bot requested review from heyjennahay and removed request for a team January 14, 2026 18:02

github-actions bot reviewed Jan 14, 2026

View reviewed changes

src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersCategoryPage.tsx Show resolved Hide resolved

Fix ts

950a6b2

ikevin127 reviewed Jan 16, 2026

View reviewed changes

ikevin127 approved these changes Jan 16, 2026

View reviewed changes

melvin-bot bot requested a review from justinpersaud January 16, 2026 01:49

justinpersaud approved these changes Jan 16, 2026

View reviewed changes

justinpersaud merged commit 66666fc into Expensify:main Jan 16, 2026
30 of 31 checks passed

mkhutornyi mentioned this pull request Jan 16, 2026

Allow report name to take up second line #79600

Merged

54 tasks

OSBotify mentioned this pull request Jan 16, 2026

Deploy Checklist: New Expensify 2026-01-16 #79803

Closed

56 tasks

aimane-chnaif mentioned this pull request Jan 18, 2026

Fix report field is enabled when there are no outstanding reports #79415

Merged

53 tasks

melvin-bot bot mentioned this pull request Jan 20, 2026

[Due for payment 2026-01-27] [Due for payment 2026-01-21] [Due for payment 2026-01-14] Remove Onyx.connect() for the key: ONYXKEYS.COLLECTION.POLICY in src/libs/PolicyUtils.ts #66397

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Refactor: Deprecate getPersonalPolicy (part 4) #79591

Refactor: Deprecate getPersonalPolicy (part 4) #79591

Uh oh!

shubham1206agra commented Jan 14, 2026

Uh oh!

melvin-bot bot commented Jan 14, 2026

Uh oh!

Uh oh!

codecov bot commented Jan 14, 2026 •

edited by github-actions bot

Loading

Uh oh!

ikevin127 commented Jan 16, 2026 •

edited

Loading

Uh oh!

ikevin127 Jan 16, 2026

Uh oh!

ikevin127 left a comment

Uh oh!

melvin-bot bot commented Jan 16, 2026

Uh oh!

Uh oh!

OSBotify commented Jan 16, 2026

Uh oh!

OSBotify commented Jan 16, 2026

Uh oh!

OSBotify commented Jan 20, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

Refactor: Deprecate getPersonalPolicy (part 4) #79591

Refactor: Deprecate getPersonalPolicy (part 4) #79591

Uh oh!

Conversation

shubham1206agra commented Jan 14, 2026

Explanation of Change

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

Uh oh!

melvin-bot bot commented Jan 14, 2026

Uh oh!

Uh oh!

codecov bot commented Jan 14, 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!

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

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

ikevin127 Jan 16, 2026

Choose a reason for hiding this comment

Uh oh!

ikevin127 left a comment

Choose a reason for hiding this comment

Uh oh!

melvin-bot bot commented Jan 16, 2026

Uh oh!

Uh oh!

OSBotify commented Jan 16, 2026

Uh oh!

OSBotify commented Jan 16, 2026

Uh oh!

OSBotify commented Jan 20, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

codecov bot commented Jan 14, 2026 •

edited by github-actions bot

Loading

ikevin127 commented Jan 16, 2026 •

edited

Loading