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

Guccio163 · 2026-04-28T11:18:13Z

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 requestMoney function from the ONYXKEYS.COLLECTION.POLICY_TAGS Onyx.connect key .

Fixed Issues

$ #72721
PROPOSAL:

Tests

Test Steps

Setup: Sign in to a workspace that has at least one tag list configured (e.g. Department: Engineering, Design) with tags enabled.

Scenario 1 — Submit expense via confirmation page

Code path: useExpenseSubmission.ts → requestMoney

Tap the FAB → Submit expense → select the workspace.
Enter an amount and proceed to the confirmation page.
Verify the Tag field shows tags from the workspace policy (e.g. Tag1, Tag2).
Select a tag and confirm the expense.
Open the created expense and verify the selected tag is visible in the details.

Scenario 2 — Submit expense directly from amount screen (skip confirmation)

Code path: IOURequestStepAmount.tsx → requestMoney (triggered when iouType is SUBMIT or REQUEST and the confirmation screen is skipped)

Open a workspace expense report.
Tap + to add an expense → enter an amount → confirm without going through the confirmation page.
Open the created expense and verify:
- If the workspace has required tags — a violation is shown for the missing tag.
- If tags are optional — the expense is created without errors.

Scenario 3 — Convert tracked expense to submitted expense

Code path: useExpenseSubmission.ts → requestMoney with isMovingTransactionFromTrackExpense = true

Create a Track expense (unreported / self DM).
Open the tracked expense → tap Submit (or Categorize) → select the target workspace.
On the confirmation page, verify the Tag field shows tags from the target workspace (e.g. Tag1, Tag2).
Select a tag and confirm.
Open the expense in the report and verify the tag is saved.

Scenario 4 — Duplicate an expense

Code path: Duplicate.ts → createExpenseByType (default case) → requestMoney

Open any existing expense with a tag selected inside a workspace report.
Open the expense menu → Duplicate.
Open the duplicated expense and verify the tag from the original expense is preserved.

Scenario 5 — Retry a failed receipt upload

Code path: handleFileRetry.ts → requestMoney (MONEY_REQUEST action)

Under poor network conditions, upload a receipt to a workspace expense.
When the upload error appears, tap Retry.
After a successful retry, open the expense and verify that workspace tags are available and any previously selected tag is preserved.

Scenario 6 — Submit expense via native Share extension, f.ex. iOS

Code path: SubmitDetailsPage.tsx → requestMoney

From any iOS app, share an image or PDF via Share → Expensify.
On the Expensify share screen, select the workspace with tags.
Verify the Tag field shows tags from the selected workspace policy (e.g. Tag1, Tag2).
Select a tag and submit the expense.
Open the created expense in the app and verify the tag is visible.

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

Scenario 1

scenario1.mov

Scenario 2a

scenario2a.mov

Scenario 2b

scenario2b.mov

Scenario 3

scenario3.mov

Scenario 4

scenario4.mov

Scenario 5

scenario5.mov

Scenario 6

scenario6.mov

melvin-bot · 2026-04-28T13:33:10Z

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

parasharrajat · 2026-04-28T15:34:03Z

There are no changes except tests here. @Guccio163 is that correct

Guccio163 · 2026-04-29T06:03:10Z

I forgot to push yesterday 😳, already fixed 👍

parasharrajat · 2026-05-01T13:26:47Z

Failing tests...

parasharrajat · 2026-05-02T11:33:37Z

+            const isMoneyRequestReport = isMoneyRequestReportReportUtils(requestMoneyParams.report);
+            const moneyRequestReportID = isMoneyRequestReport ? requestMoneyParams.report?.reportID : undefined;
+            const currentChatReport = isMoneyRequestReport ? getReportOrDraftReport(requestMoneyParams.report?.chatReportID) : requestMoneyParams.report;
+            const isMovingTransactionFromTrackExpense = isMovingTransactionFromTrackExpenseIOUUtils(requestMoneyParams.action);
+            const parentChatReport = isMovingTransactionFromTrackExpense ? undefined : currentChatReport;
+            // eslint-disable-next-line @typescript-eslint/no-deprecated
+            const policyTagList = getMoneyRequestPolicyTags({
+                existingIOUReport: requestMoneyParams.existingIOUReport,
+                moneyRequestReportID,
+                parentChatReport,
+                participant: requestMoneyParams.participantParams.participant,
+            });
+            requestMoneyParams.policyParams = {...(requestMoneyParams.policyParams ?? {}), policyTagList};


Why are we passing these values here? You should set the params in retryParams on respective functions. Those values are passed here internally.

Good idea, I thought we'll be migrating level-by-level with handleRetryPress and DotIndicatorMessage by the way, but I moved it right now; Skipping straight up to component can be tricky sometimes, so please take a look if the code looks good for you too 👀

Actually React Complier check is failing, I'll let you know once it's fixed

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

codecov · 2026-05-04T13:13:52Z

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/components/MoneyRequestConfirmationList.tsx	`94.69% <ø> (ø)`
...ents/MoneyRequestConfirmationList/confirmAction.ts	`100.00% <100.00%> (ø)`
src/hooks/useMoneyRequestPolicyTags.ts	`100.00% <100.00%> (ø)`
src/libs/IOUAmountSubmission.ts	`75.16% <100.00%> (ø)`
src/libs/actions/IOU/Duplicate.ts	`91.89% <100.00%> (+0.12%)`	⬆️
src/libs/actions/IOU/TrackExpense.ts	`81.86% <ø> (-0.04%)`	⬇️
src/pages/Share/SubmitDetailsPage.tsx	`86.98% <100.00%> (+1.77%)`	⬆️
...rc/pages/iou/request/step/IOURequestStepAmount.tsx	`86.48% <100.00%> (+2.44%)`	⬆️
.../request/step/confirmation/useExpenseSubmission.ts	`69.66% <100.00%> (+0.46%)`	⬆️
src/libs/actions/IOU/MoneyRequest.ts	`66.78% <69.23%> (+0.11%)`	⬆️
... and 45 files with indirect coverage changes

parasharrajat · 2026-05-04T17:16:26Z

+            if (receiptError.action === CONST.IOU.ACTION_PARAMS.MONEY_REQUEST) {
+                const requestMoneyParams = receiptError.retryParams as IOU.RequestMoneyInformation;
+                requestMoneyParams.policyParams = {...(requestMoneyParams.policyParams ?? {}), policyTagList};
+            }


I am still not getting this. Why do we need to set the retryparams here?

parasharrajat · 2026-05-04T17:18:23Z

+    const retryParams: IOU.RequestMoneyInformation | undefined = receiptError
+        ? typeof receiptError.retryParams === 'string'
+            ? (JSON.parse(receiptError.retryParams) as IOU.RequestMoneyInformation)
+            : (receiptError.retryParams as IOU.RequestMoneyInformation)
+        : undefined;


Why are you using retryParams here?

Retry params are supposed to use the same params that were sent to the original request, with the values passed during the original call.

So if you pass the params correctly to the `moneyRequest call, those should be available to you to assign to the retryparams in the function.

You should set policTags on line 1624 in retryParams.

Yeah you're right, I didn't address it yesterday as I was already finishing work 🏃‍♂️ I guess that every requestMoney usage (beside handleFileRetry) sets policyTagList in requestMoneyInformation so it will be automatically passed to retryParams and already available on handleFileRetry level, I'll remove this logic from there 🧹 Good catch @parasharrajat, I didn't notice that logic.

Please let me know if I conclude correctly 🤔

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

Guccio163 · 2026-05-07T12:29:58Z

Kindly bump @parasharrajat

Guccio163 · 2026-05-11T18:06:41Z

Also @parasharrajat kindly bump here 👀

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

parasharrajat · 2026-06-26T09:38:13Z

One change needed. Otherwise looks good.

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

github-actions · 2026-07-07T09:42:21Z

This PR adds a new Onyx.connectWithoutView call, so I've requested a review from the Onyx performance reviewers (@tgolen, @mountiny, @luacmartins) — a review from any one of them is enough. Please add a link in your PR description to the Slack discussion where the @frontend-performance team approved using connectWithoutView here.

Guccio163 · 2026-07-07T11:18:27Z

PR reverting the Onyx.connectWithoutView change has just been merged, I already removed it back in here; @parasharrajat it should be ready once the checks pass ✅

mountiny · 2026-07-07T11:31:43Z

@parasharrajat are you available to review this one please

parasharrajat · 2026-07-07T15:04:19Z

yes, we were waiting on this #89084 (comment)

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

07.07.2026_23.36.42_REC.mp4

🎀 👀 🎀 C+ reviewed

OSBotify · 2026-07-07T18:41:57Z

✋ 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 · 2026-07-07T18:51:36Z

🚧 amyevans has triggered a test Expensify/App build. You can view the workflow run here.

github-actions · 2026-07-07T18:58:05Z

🧪🧪 Use the links below to test this adhoc build on Android, iOS, and Web. Happy testing! 🧪🧪
Built from App PR #89084.

Android 🤖	iOS 🍎
https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-android-Adhoc-f71766d8c63-4630706-4ad48d017eb740b24a2e055becb79e41f5cf4593/index.html	https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-ios-device-AdHoc-f71766d-4630706-ee2a69dee3f52bc0ab9379a7091deff8d58e054c/index.html

Web 🕸️
https://89084.pr-testing.expensify.com

👀 View the workflow run that generated this build 👀

OSBotify · 2026-07-09T11:04:35Z

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

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

MelvinBot · 2026-07-09T11:06:08Z

🤖 No help site changes required.

This PR is an internal code refactor — it removes the Onyx.connect() subscription for ONYXKEYS.COLLECTION.POLICY_TAGS in the requestMoney path and replaces it with a useOnyx hook (useMoneyRequestPolicyTags). The changes are limited to internal data-fetching plumbing and function signatures:

New hook src/hooks/useMoneyRequestPolicyTags.ts to read policy tags via useOnyx
Threading policyTags through submitAmount / requestMoney call sites
Internal type/param cleanups (e.g. dropping selectedParticipants from onConfirm)

There are no user-facing behavior changes, no new or renamed features, tabs, settings, or button labels, and no changes to any flow described in App/docs/articles. The existing help site content still accurately reflects the product behavior, so no draft docs PR was created.

m-natarajan · 2026-07-09T19:15:20Z

@parasharrajat @Guccio163 For Scenario 5 — Retry a failed receipt upload
Error doesn't appear, user cant tap retry. Should we report an issue for this?

14-5.mp4

amyevans · 2026-07-10T13:26:40Z

@m-natarajan No need to log an issue for that. It looks like the request just succeeded since the network wasn't poor enough, but not a bug. Thank you for asking though!

grgia · 2026-07-10T13:26:45Z

asked in slack https://expensify.slack.com/archives/C01GTK53T8Q/p1783689986435659

OSBotify · 2026-07-10T13:41:38Z

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

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

Bundle Size Analysis (Sentry):

Android

add requestMoney tests inside createTransaction

aa61920

melvin-bot Bot assigned Guccio163 Apr 28, 2026

Guccio163 changed the title ~~add requestMoney tests inside createTransaction~~ Remove Onyx.connect() usage for ONYXKEYS.COLLECTION.POLICY_TAGS in requestMoney function from src/libs/actions/IOU/TrackExpense.ts Apr 28, 2026

extract policyTags logic one level higher

99e5374

Guccio163 marked this pull request as ready for review April 28, 2026 13:33

Guccio163 requested a review from a team as a code owner April 28, 2026 13:33

melvin-bot Bot requested review from parasharrajat and removed request for a team April 28, 2026 13:33

Guccio163 requested a review from a team as a code owner April 29, 2026 06:02

melvin-bot Bot requested review from JmillsExpensify and removed request for a team April 29, 2026 06:02

parasharrajat reviewed May 2, 2026

View reviewed changes

Guccio163 added 2 commits May 4, 2026 14:43

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

fc49353

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

fix test

a8da2dd

Guccio163 added 2 commits May 4, 2026 19:03

move logic to hook and straight to component

a0fe1a8

unconditional hook

b4b2553

parasharrajat reviewed May 4, 2026

View reviewed changes

Guccio163 added 4 commits May 4, 2026 19:21

fix react compiler

0b92bce

remove logic from retry-associated code

d0a92d6

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

886d448

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

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

5735e1b

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

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

91a1259

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

parasharrajat reviewed Jun 26, 2026

View reviewed changes

Comment thread src/libs/IOUAmountSubmission.ts Outdated

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

ab418d3

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

github-actions Bot requested review from luacmartins and mountiny July 7, 2026 09:42

Guccio163 added 2 commits July 7, 2026 12:26

fmt

caf866a

revert connectWithoutView changes

8abbf34

tgolen approved these changes Jul 7, 2026

View reviewed changes

luacmartins approved these changes Jul 7, 2026

View reviewed changes

parasharrajat approved these changes Jul 7, 2026

View reviewed changes

melvin-bot Bot requested a review from amyevans July 7, 2026 18:09

amyevans approved these changes Jul 7, 2026

View reviewed changes

amyevans merged commit f71766d into Expensify:main Jul 7, 2026
35 of 37 checks passed

OSBotify mentioned this pull request Jul 9, 2026

Deploy Checklist: New Expensify 2026-07-09 #95677

Closed

94 tasks

applause-bot Bot mentioned this pull request Jul 9, 2026

[Exploratory] IOU - Waiting for you to submit message is displayed while there is a violation #95714

Open

7 tasks

applause-bot Bot mentioned this pull request Jul 9, 2026

Expense - Expense remains on the same report after being moved to new one in offline mode. #95753

Closed

7 tasks

melvin-bot Bot mentioned this pull request Jul 10, 2026

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

Open

Uh oh!

Conversation

Guccio163 commented Apr 28, 2026 • edited by josesat94 Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Explanation of Change

Fixed Issues

Tests

Test Steps

Scenario 1 — Submit expense via confirmation page

Scenario 2 — Submit expense directly from amount screen (skip confirmation)

Scenario 3 — Convert tracked expense to submitted expense

Scenario 4 — Duplicate an expense

Scenario 5 — Retry a failed receipt upload

Scenario 6 — Submit expense via native Share extension, f.ex. iOS

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

Uh oh!

melvin-bot Bot commented Apr 28, 2026

Uh oh!

parasharrajat commented Apr 28, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Guccio163 commented Apr 29, 2026

Uh oh!

parasharrajat commented May 1, 2026

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

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

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Guccio163 May 5, 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!

Guccio163 commented May 7, 2026

Uh oh!

Guccio163 commented May 11, 2026

Uh oh!

Uh oh!

parasharrajat commented Jun 26, 2026

Uh oh!

github-actions Bot commented Jul 7, 2026

Uh oh!

Guccio163 commented Jul 7, 2026

Uh oh!

mountiny commented Jul 7, 2026

Uh oh!

parasharrajat commented Jul 7, 2026

Uh oh!

parasharrajat left a comment

Choose a reason for hiding this comment

Reviewer Checklist

Uh oh!

Uh oh!

OSBotify commented Jul 7, 2026

Uh oh!

github-actions Bot commented Jul 7, 2026

Uh oh!

github-actions Bot commented Jul 7, 2026

Uh oh!

OSBotify commented Jul 9, 2026

Uh oh!

Guccio163 commented Apr 28, 2026 •

edited by josesat94

Loading

parasharrajat commented Apr 28, 2026 •

edited

Loading

codecov Bot commented May 4, 2026 •

edited by github-actions Bot

Loading

Guccio163 May 5, 2026 •

edited

Loading