Remove Onyx.connect() usage for ONYXKEYS.COLLECTION.POLICY_TAGS in convertBulkTrackedExpensesToIOU function from src/libs/actions/IOU/TrackExpense.ts by Guccio163 · Pull Request #89617 · Expensify/App

Guccio163 · 2026-05-05T16:08:05Z

Explanation of Change

This PR is part of a refactor to remove Onyx.connect for the keys: ONYXKEYS.COLLECTION.POLICY_TAGS from the src/libs/actions/IOU/TrackExpense.ts file and replace it with useOnyx.

It isolates the convertBulkTrackedExpensesToIOU function from the ONYXKEYS.COLLECTION.POLICY_TAGS Onyx.connect key .

Fixed Issues

$ #72721
PROPOSAL:

Tests

Steps

As User A, open Self-DM.
Tap + FAB → Track expense and create two tracked expenses
with distinct amounts and merchants so they are easy to identify.
From the LHN, open the DM with User B (1-on-1, outside any
workspace).
In the DM, tap + FAB → Submit expense → Manual, enter details and submit to User B. This creates a P2P IOU report whose
chatReport is the DM (no policyID on either report).
Open the freshly created IOU report.
Tap + Add expense on the IOU report and choose
Add existing expense.
In the picker, tick both tracked expenses from step 2.
Tap Add to report.

Expected

The picker / RHP closes and you return to the IOU report.
Both tracked expenses are now listed on the IOU report
alongside the one from step 4.
The same two transactions disappear from Self-DM.
IOU report total equals all three amounts summed.
Re-opening the IOU report after a reload (or after toggling
offline/online) shows the same four transactions with no duplicates.
Verify that no errors appear in the JS console

Offline tests

QA Steps

Same as tests

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

Screen.Recording.2026-06-04.at.16.08.37.mov

codecov · 2026-05-05T16:19:42Z

Codecov Report

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

Files with missing lines	Coverage Δ
src/libs/actions/IOU/TrackExpense.ts	`80.63% <ø> (ø)`
src/components/AddExistingExpenseFooter.tsx	`0.00% <0.00%> (ø)`
... and 135 files with indirect coverage changes

…-fork into Guccio163/onyx-connect/policy_tags/convertBulkTrackedExpensesToIOU

melvin-bot · 2026-05-12T11:33:56Z

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

flaviadefaria · 2026-05-12T15:13:54Z

No new product considerations - removing my assignment and unsubscribing.

parasharrajat · 2026-05-16T08:42:41Z

    const [betas] = useOnyx(ONYXKEYS.BETAS);
    const [chatReport] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${report?.chatReportID}`);
    const [policyTagList] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY_TAGS}${policy?.id}`);
+    const [reportPolicyTagList] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY_TAGS}${report?.policyID ?? chatReport?.policyID}`);


I think it is the same as policyTagList. Can you reuse that?

we are getting chatreport from report itself and so both report and chatReport must be on same policy. Then policy param is policy of the report.

Good catch on the parent/chat relationship, but they're not equivalent for IOU reports. buildOptimisticIOUReport (ReportUtils.ts:6531) reads policyID from the chat just to grab policy.fieldList, but doesn't actually set policyID on the returned IOU report object (see lines 6555-6577). So for optimistically-created IOU reports, report?.policyID is undefined -> usePolicy(report?.policyID) returns undefined -> policyTagList ends up empty. reportPolicyTagList works because of the ?? chatReport?.policyID fallback, which is exactly the IOU branch we need it for in convertBulkTrackedExpensesToIOU.

I split the extraction logic into policyTagList and chatReportPolicyTagList to not duplicate the code 👀

…-fork into Guccio163/onyx-connect/policy_tags/convertBulkTrackedExpensesToIOU

parasharrajat · 2026-06-01T11:18:58Z

@Guccio163, QA steps are wrong. Can you update the steps to the one that you can take in the app?

parasharrajat

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

01.06.2026_16.46.33_REC.mp4

🎀 👀 🎀 C+ reviewed

amyevans

@Guccio163, QA steps are wrong. Can you update the steps to the one that you can take in the app?

@Guccio163 Lmk once the new QA steps are set, then I'll merge!

…-fork into Guccio163/onyx-connect/policy_tags/convertBulkTrackedExpensesToIOU

Guccio163 · 2026-06-04T14:10:12Z

Test steps and recording updated @amyevans ✅

…-fork into Guccio163/onyx-connect/policy_tags/convertBulkTrackedExpensesToIOU

OSBotify · 2026-06-04T15:06:25Z

✋ 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-06-05T18:14:31Z

🚀 Deployed to staging by https://github.com/amyevans in version: 9.4.0-0 🚀

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

Bundle Size Analysis (Sentry):

Android
iOS

MelvinBot · 2026-06-05T18:16:12Z

🤖 Help site review: No documentation changes required.

This PR is an internal code refactor with no user-facing behavior change. It removes the Onyx.connect() usage for ONYXKEYS.COLLECTION.POLICY_TAGS in the convertBulkTrackedExpensesToIOU function and replaces it with useOnyx, passing policyTagList in as a parameter instead of fetching it inside the function.

Why no help site update is needed

The changes are limited to:

src/components/AddExistingExpenseFooter.tsx — reads the chat report's policy tags via useOnyx and passes them down.
src/libs/actions/IOU/TrackExpense.ts — accepts policyTagList as a parameter rather than calling getMoneyRequestPolicyTags() internally.
tests/actions/IOUTest/TrackExpenseTest.ts — updated to pass the new parameter.

The "Add existing expense" / track-expense → IOU conversion flow behaves identically. There are no new or renamed features, tabs, settings labels, or buttons, and no changes to any user-facing workflow. The help site articles under App/docs/articles document product behavior, which is unchanged here, so no draft docs PR was created.

@Guccio163, please review the linked help site PR and confirm it reflects the current behavior. Then mark the linked help site PR Ready for review

OSBotify · 2026-06-09T04:08:45Z

🚀 Deployed to production by https://github.com/Julesssss in version: 9.4.0-7 🚀

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

Guccio163 added 2 commits May 5, 2026 16:41

move policyTags extraction to component, take logic out of function

7e9dcb3

simplify flow

4d6e254

melvin-bot Bot assigned Guccio163 May 5, 2026

Guccio163 added 3 commits May 6, 2026 20:44

Merge branch 'main' of github.com:software-mansion-labs/expensify-app…

6e4da63

…-fork into Guccio163/onyx-connect/policy_tags/convertBulkTrackedExpensesToIOU

fix tests

2cf7563

Merge branch 'main' of github.com:software-mansion-labs/expensify-app…

5b5fdb9

…-fork into Guccio163/onyx-connect/policy_tags/convertBulkTrackedExpensesToIOU

Guccio163 marked this pull request as ready for review May 12, 2026 11:33

Guccio163 requested review from a team as code owners May 12, 2026 11:33

melvin-bot Bot requested review from flaviadefaria and parasharrajat and removed request for a team May 12, 2026 11:33

melvin-bot Bot removed the request for review from a team May 12, 2026 11:33

flaviadefaria removed their request for review May 12, 2026 15:14

parasharrajat reviewed May 16, 2026

View reviewed changes

parasharrajat suggested changes May 16, 2026

View reviewed changes

Guccio163 added 4 commits May 18, 2026 19:36

Merge branch 'main' of github.com:software-mansion-labs/expensify-app…

4328c49

…-fork into Guccio163/onyx-connect/policy_tags/convertBulkTrackedExpensesToIOU

extract chatReportPolicyTagList

1edea9b

Merge branch 'main' of github.com:software-mansion-labs/expensify-app…

d6fb83e

…-fork into Guccio163/onyx-connect/policy_tags/convertBulkTrackedExpensesToIOU

Merge branch 'main' of github.com:software-mansion-labs/expensify-app…

07418b3

…-fork into Guccio163/onyx-connect/policy_tags/convertBulkTrackedExpensesToIOU

parasharrajat approved these changes Jun 1, 2026

View reviewed changes

melvin-bot Bot requested a review from amyevans June 1, 2026 11:20

amyevans approved these changes Jun 1, 2026

View reviewed changes

Merge branch 'main' of github.com:software-mansion-labs/expensify-app…

2fd3ece

…-fork into Guccio163/onyx-connect/policy_tags/convertBulkTrackedExpensesToIOU

Merge branch 'main' of github.com:software-mansion-labs/expensify-app…

98dc442

…-fork into Guccio163/onyx-connect/policy_tags/convertBulkTrackedExpensesToIOU

amyevans approved these changes Jun 4, 2026

View reviewed changes

amyevans merged commit a79bbe5 into Expensify:main Jun 4, 2026
32 checks passed

OSBotify mentioned this pull request Jun 5, 2026

Deploy Checklist: New Expensify 2026-06-05 #92792

Closed

melvin-bot Bot mentioned this pull request Jun 9, 2026

[Due for payment 2026-08-25] Remove Onyx.connect() for the key: ONYXKEYS.COLLECTION.POLICY_TAGS in src/libs/actions/IOU.ts #72721

Closed

Navigation Menu

Remove Onyx.connect() usage for ONYXKEYS.COLLECTION.POLICY_TAGS in convertBulkTrackedExpensesToIOU function from src/libs/actions/IOU/TrackExpense.ts - #89617

Remove Onyx.connect() usage for ONYXKEYS.COLLECTION.POLICY_TAGS in convertBulkTrackedExpensesToIOU function from src/libs/actions/IOU/TrackExpense.ts#89617
amyevans merged 11 commits into
Expensify:mainfrom
software-mansion-labs:Guccio163/onyx-connect/policy_tags/convertBulkTrackedExpensesToIOU

Guccio163 commented May 5, 2026 •

edited

Loading

Uh oh!

codecov Bot commented May 5, 2026 •

edited by github-actions Bot

Loading

Uh oh!

melvin-bot Bot commented May 12, 2026

Uh oh!

flaviadefaria commented May 12, 2026

Uh oh!

parasharrajat May 16, 2026

Uh oh!

Guccio163 May 18, 2026 •

edited

Loading

Uh oh!

parasharrajat commented Jun 1, 2026

Uh oh!

parasharrajat left a comment

Uh oh!

amyevans left a comment

Uh oh!

Guccio163 commented Jun 4, 2026

Uh oh!

Uh oh!

OSBotify commented Jun 4, 2026

Uh oh!

OSBotify commented Jun 5, 2026

Uh oh!

MelvinBot commented Jun 5, 2026

Uh oh!

OSBotify commented Jun 9, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

Conversation

Guccio163 commented May 5, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Explanation of Change

Fixed Issues

Tests

Steps

Expected

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

Uh oh!

codecov Bot commented May 5, 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!

melvin-bot Bot commented May 12, 2026

Uh oh!

flaviadefaria commented May 12, 2026

Uh oh!

parasharrajat May 16, 2026

Choose a reason for hiding this comment

Uh oh!

Guccio163 May 18, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

parasharrajat commented Jun 1, 2026

Uh oh!

parasharrajat left a comment

Choose a reason for hiding this comment

Reviewer Checklist

Uh oh!

amyevans left a comment

Choose a reason for hiding this comment

Uh oh!

Guccio163 commented Jun 4, 2026

Uh oh!

Uh oh!

OSBotify commented Jun 4, 2026

Uh oh!

OSBotify commented Jun 5, 2026

Uh oh!

MelvinBot commented Jun 5, 2026

Uh oh!

OSBotify commented Jun 9, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

Guccio163 commented May 5, 2026 •

edited

Loading

codecov Bot commented May 5, 2026 •

edited by github-actions Bot

Loading

Guccio163 May 18, 2026 •

edited

Loading