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/DotIndicatorMessage.tsx	`64.70% <ø> (ø)`
src/hooks/useMoneyRequestPolicyTags.ts	`100.00% <100.00%> (ø)`
src/libs/actions/IOU/Duplicate.ts	`91.71% <100.00%> (+0.12%)`	⬆️
src/libs/actions/IOU/MoneyRequest.ts	`77.49% <100.00%> (+0.23%)`	⬆️
src/libs/actions/IOU/TrackExpense.ts	`80.83% <ø> (-0.04%)`	⬇️
...rc/pages/iou/request/step/IOURequestStepAmount.tsx	`67.82% <100.00%> (+0.81%)`	⬆️
.../request/step/confirmation/useExpenseSubmission.ts	`53.74% <100.00%> (+1.04%)`	⬆️
src/pages/Share/SubmitDetailsPage.tsx	`0.00% <0.00%> (ø)`
... and 27 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-05-17T09:37:51Z

+    const policyTagsForRequestMoney = useMoneyRequestPolicyTags({
+        moneyRequestReportID: isIouReport ? report?.reportID : undefined,
+        parentChatReportPolicyID: isMovingTransactionFromTrackExpense ? undefined : report?.policyID,
+        participantReportID: participants?.at(0)?.reportID,


Are we sure if this is the correct participant? In the RequestMoney function below, we are passing the participant as a parameter.

Looks like this is a similar case as in #90353, so I'll wait with this for that one

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

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

Guccio163 added 2 commits May 12, 2026 08:16

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

a5eead8

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

prettier

d7ba6d8

parasharrajat reviewed May 17, 2026

View reviewed changes

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

2d0eb3f

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

Guccio163 mentioned this pull request May 19, 2026

Remove Onyx.connect() usage for ONYXKEYS.COLLECTION.POLICY_TAGS in createDistanceRequest function from src/libs/actions/IOU/Split.ts #90353

Open

52 tasks

Conversation

Guccio163 commented Apr 28, 2026 • edited 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!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

Guccio163 commented Apr 28, 2026 •

edited

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