Skip to content

Remove Onyx.connect() usage for ONYXKEYS.COLLECTION.POLICY_TAGS in createExpenseByType function from src/libs/actions/IOU/Duplicate.ts#94297

Merged
amyevans merged 15 commits into
Expensify:mainfrom
software-mansion-labs:Guccio163/onyx-connect/policy_tags/createExpenseByType
Jul 9, 2026
Merged

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

Conversation

@Guccio163

@Guccio163 Guccio163 commented Jun 23, 2026

Copy link
Copy Markdown
Contributor

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/Duplicate.ts file and replace it with useOnyx.

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

Fixed Issues

$ #72721
PROPOSAL:

Tests

Preconditions

  1. An account that is a member of a Collect/Control workspace.
  2. On that workspace: Distance rate enabled, and Tags enabled with at least one tag list containing a few tags.
  3. Create a distance expense in that workspace's policy expense chat (enter waypoints/distance, pick a tag, and submit).

Steps

  1. Open the distance expense you just created (open its transaction thread / details).
  2. Open the expense's more actions menu (the / secondary-actions button in the header).
  3. Tap Duplicate.

Expected result

  • The app does not crash and the duplicate is created without errors.

  • The duplicated expense is a distance expense (route/distance preserved, same amount and merchant) — confirming createExpenseByType dispatched to the distance branch.

  • The duplicated expense carries tags from the same workspace (the original tag is retained / the Tag field offers this workspace's tags) — confirming policyTagList resolved
    correctly for the target report.

  • The duplicate lands in the correct report on the same workspace.

  • 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

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

Android: Native
Android: mWeb Chrome
iOS: Native
iOS: mWeb Safari
MacOS: Chrome / Safari
createExpenseByType.mov

@codecov

codecov Bot commented Jun 23, 2026

Copy link
Copy Markdown

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/hooks/useBulkDuplicateAction.ts 100.00% <100.00%> (ø)
src/hooks/useMoneyRequestPolicyTagsForReport.ts 100.00% <ø> (ø)
src/libs/actions/IOU/Duplicate.ts 91.79% <100.00%> (-0.10%) ⬇️
.../components/MoneyRequestHeaderSecondaryActions.tsx 0.50% <0.00%> (-0.01%) ⬇️
src/hooks/useExpenseActions.ts 0.00% <0.00%> (ø)
... and 20 files with indirect coverage changes

…-fork into Guccio163/onyx-connect/policy_tags/createExpenseByType
…-fork into Guccio163/onyx-connect/policy_tags/createExpenseByType
@Guccio163 Guccio163 marked this pull request as ready for review June 24, 2026 10:10
@Guccio163 Guccio163 requested review from a team as code owners June 24, 2026 10:10
@melvin-bot melvin-bot Bot requested review from parasharrajat and trjExpensify and removed request for a team June 24, 2026 10:10
@melvin-bot

melvin-bot Bot commented Jun 24, 2026

Copy link
Copy Markdown

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

@melvin-bot melvin-bot Bot removed the request for review from a team June 24, 2026 10:10
@Guccio163 Guccio163 changed the title Guccio163/onyx connect/policy tags/create expense by type [Blocked by #89084] Remove Onyx.connect() usage for ONYXKEYS.COLLECTION.POLICY_TAGS in createExpenseByType function from src/libs/actions/IOU/Duplicate.ts Jun 24, 2026
Comment thread src/hooks/useMoneyRequestPolicyTags.tsx Outdated
Comment thread src/libs/actions/IOU/Duplicate.ts Outdated
Comment thread src/libs/actions/IOU/Duplicate.ts

@chatgpt-codex-connector chatgpt-codex-connector Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 7290304de9

ℹ️ 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".

Comment thread src/hooks/useMoneyRequestPolicyTags.tsx Outdated
@Guccio163

Copy link
Copy Markdown
Contributor Author

@codex review

@chatgpt-codex-connector

Copy link
Copy Markdown

Codex Review: Didn't find any major issues. Already looking forward to the next diff.

Reviewed commit: 064477a034

ℹ️ 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".

@trjExpensify

Copy link
Copy Markdown
Contributor

PR doesn’t need product input as a refactor PR. Unassigning and unsubscribing myself.

@trjExpensify trjExpensify removed their request for review June 24, 2026 14:29
@parasharrajat

Copy link
Copy Markdown
Member

Checking....

Guccio163 added 2 commits July 8, 2026 11:39
…-fork into Guccio163/onyx-connect/policy_tags/createExpenseByType
@Guccio163

Copy link
Copy Markdown
Contributor Author

@codex review

@chatgpt-codex-connector

Copy link
Copy Markdown

Codex Review: Didn't find any major issues. What shall we delve into next?

Reviewed commit: 276972e03b

ℹ️ 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".

@Guccio163

Copy link
Copy Markdown
Contributor Author

@parasharrajat bump here since it just got unblocked 👀

@chatgpt-codex-connector

Copy link
Copy Markdown

Codex Review: Didn't find any major issues. Nice work!

Reviewed commit: ac13b40195

ℹ️ 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".

@Guccio163 Guccio163 changed the title [Blocked by #89084] Remove Onyx.connect() usage for ONYXKEYS.COLLECTION.POLICY_TAGS in createExpenseByType function from src/libs/actions/IOU/Duplicate.ts Remove Onyx.connect() usage for ONYXKEYS.COLLECTION.POLICY_TAGS in createExpenseByType function from src/libs/actions/IOU/Duplicate.ts Jul 9, 2026
Guccio163 added 3 commits July 9, 2026 11:12
…-fork into Guccio163/onyx-connect/policy_tags/createExpenseByType
…-fork into Guccio163/onyx-connect/policy_tags/createExpenseByType
…-fork into Guccio163/onyx-connect/policy_tags/createExpenseByType
@parasharrajat

Copy link
Copy Markdown
Member

@MelvinBot Review this.

@MelvinBot

Copy link
Copy Markdown
Contributor

🤖 Review — LGTM. This is a behavior-preserving refactor: it lifts policyTagList out of createExpenseByType and passes it in, replacing the deprecated Onyx.connect-based getMoneyRequestPolicyTags with the reactive useMoneyRequestPolicyTagsForReport hook at the call sites. I traced every path and the resolved tags are equivalent. No blocking issues.

Why it's equivalent (the parts worth double-checking)

The two old inline branches were already equivalent, so unifying them is safe. Old createExpenseByType computed policyTagList twice — the DISTANCE and default branches differed only in:

  • moneyRequestReportID: '' (distance) vs undefined (default) when not a money-request report — both are falsy, and getMoneyRequestPolicyTags only does moneyRequestReportID ? … : undefined, so no difference.
  • participant: participants.at(0) (distance) vs params.participantParams.participant (default). But in both callers, params.participantParams.participant is literally set to participants.at(0) ?? {} — see duplicateExpenseTransaction:803 and duplicateReport:1002. So the two branches always produced the same list.

The hook resolves to the same policy. In the three hook call sites, targetReport === activePolicyExpenseChat and the hook is called with that same report. Since activePolicyExpenseChat is a policy-expense chat (not a money-request report), both the old getMoneyRequestPolicyTags and the new useMoneyRequestPolicyTags land on the same precedence rung — parentChatReport.policyID — and read the same POLICY_TAGS collection. The precedence order (existingIOU → moneyRequestReport → parentChat → participant) is identical between the two.

duplicateReport correctly stays on the deprecated path. It still calls getMoneyRequestPolicyTags per-iteration inside the loop (Duplicate.ts:1032-1042) because it needs the per-iteration existingIOUReport: currentIOUReport and isn't in a React context. Sensible scoping — matches the PR's "isolate createExpenseByType" goal.

Rules-of-Hooks fix looks right. In useBulkDuplicateAction, getPolicyExpenseChat(...) and the new hook were moved out of the handleDuplicate callback up to the top level (useBulkDuplicateAction.ts:63-64) — unconditional, no early return before it.

Minor, non-blocking
  • bulkDuplicateExpenses + existingIOUReport: the single hook-computed policyTagList doesn't factor in existingIOUReport: optimisticIOUReport the way the old inline resolution did (Duplicate.ts:1202-1206). In practice these are equal — bulk duplicate targets a single workspace and the optimistic IOU report is created on that same defaultExpensePolicy, so optimisticIOUReport.policyID === activePolicyExpenseChat.policyID. Worth a mental sanity-check but not a bug.
  • Coverage: the codecov dip is because DuplicateTest now passes policyTagList explicitly rather than exercising the internal resolution. The resolution now lives in useMoneyRequestPolicyTags / useMoneyRequestPolicyTagsForReport — a small hook test there would recover the lost coverage if it isn't covered elsewhere.

Note: I verified this by static tracing; I couldn't run the Jest suite in this environment, so I'm relying on CI for the test run.

@parasharrajat parasharrajat left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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.
09.07.2026_18.55.31_REC.mp4

🎀 👀 🎀 C+ reviewed

@melvin-bot melvin-bot Bot requested a review from amyevans July 9, 2026 13:34
@amyevans amyevans merged commit 89a5c2d into Expensify:main Jul 9, 2026
35 checks passed
@OSBotify

OSBotify commented Jul 9, 2026

Copy link
Copy Markdown
Contributor

✋ 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

github-actions Bot commented Jul 9, 2026

Copy link
Copy Markdown
Contributor

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

@OSBotify

Copy link
Copy Markdown
Contributor

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

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

@MelvinBot

Copy link
Copy Markdown
Contributor

Help site review: no changes required ✅

I reviewed the changes in this PR and no updates to the help site (docs/articles) are needed.

Why: This is a purely internal refactor. It removes the deprecated Onyx.connect() usage for ONYXKEYS.COLLECTION.POLICY_TAGS in createExpenseByType and replaces it with the useMoneyRequestPolicyTagsForReport (useOnyx) hook, threading policyTagList through the duplicate-expense call chain (Duplicate.ts, useExpenseActions, useBulkDuplicateAction, MoneyRequestHeaderSecondaryActions). It is part of the Onyx.connect migration (#72721).

There is no change to user-facing behavior, UI, labels, or workflows — the Duplicate expense flow works exactly as before (same result, same tags preserved), so nothing documented on the help site is affected. No draft PR was created.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants