Skip to content

Remove Onyx.connect() usage for ONYXKEYS.COLLECTION.POLICY_TAGS in getMoneyRequestInformation function from src/libs/actions/IOU/index.ts#87236

Merged
amyevans merged 11 commits intoExpensify:mainfrom
software-mansion-labs:Guccio163/onyx-connect/policy_tags/getMoneyRequestInformation
Apr 17, 2026
Merged

Remove Onyx.connect() usage for ONYXKEYS.COLLECTION.POLICY_TAGS in getMoneyRequestInformation function from src/libs/actions/IOU/index.ts#87236
amyevans merged 11 commits intoExpensify:mainfrom
software-mansion-labs:Guccio163/onyx-connect/policy_tags/getMoneyRequestInformation

Conversation

@Guccio163
Copy link
Copy Markdown
Contributor

@Guccio163 Guccio163 commented Apr 7, 2026

Explanation of Change

Fixed Issues

$ #72721
PROPOSAL:

Tests

Test 1 – Tag is saved as recently used after submitting an expense

Preconditions:

  • Workspace with at least 12 enabled tags in a tag list (e.g. Tag1…Tag12)
  • User is the owner or submitter

Steps:

  1. Create a new expense in the workspace (Submit Expense)
  2. On the confirmation screen, select one of the tags
  3. Submit the expense
  4. Create another expense in the same workspace
  5. Open the tag picker

Expected result:

  • A "Recent" section appears at the top of the tag list containing previously used Tag

Test 2 – Recently used tags are isolated per workspace

Preconditions:

  • Workspace A with 12+ tags including TagX
  • Workspace B with 12+ tags

Steps:

  1. Create an expense in Workspace A, select TagX, submit
  2. Create an expense in Workspace B, open the tag picker

Expected result:

  • TagX does not appear in Workspace B's "Recent" section
  • The "Recent" section in Workspace B is empty or contains only tags previously used in Workspace B

Test 3 – fall back: fewer than 12 tags, recently used stored but no "Recent" section

Preconditions:

  • Workspace with fewer than 12 enabled tags

Steps:

  1. Create an expense, select TagX, submit
  2. Create another expense in the same workspace, open the tag picker

Expected result:

  • No separate "Recent" section is shown (all tags appear in a flat list — this is by design)
  • Optionally verify via Onyx Explorer that nvp_recentlyUsedTags_{policyID} contains TagX

Expected result:

  • TagX appears as a recently used tag

  • 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
test1.mov
test2.mov
test3.mov

@Guccio163 Guccio163 marked this pull request as ready for review April 8, 2026 10:20
@Guccio163 Guccio163 requested review from a team as code owners April 8, 2026 10:20
@melvin-bot melvin-bot Bot requested review from heyjennahay and parasharrajat and removed request for a team April 8, 2026 10:20
@melvin-bot
Copy link
Copy Markdown

melvin-bot Bot commented Apr 8, 2026

@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 requested review from a team and amyevans and removed request for a team April 8, 2026 10:20
@melvin-bot
Copy link
Copy Markdown

melvin-bot Bot commented Apr 8, 2026

@amyevans 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 April 8, 2026 10:20
…-fork into Guccio163/onyx-connect/policy_tags/getMoneyRequestInformation
…-fork into Guccio163/onyx-connect/policy_tags/getMoneyRequestInformation
@amyevans
Copy link
Copy Markdown
Contributor

@Guccio163 there are some conflicts to resolve 😄

@parasharrajat bump for review please

@parasharrajat
Copy link
Copy Markdown
Member

I will get this tomorrow.

optimisticReportPreviewActionID,
shouldDeferAutoSubmit,
} = distanceRequestInformation;
const {policy, policyCategories, policyTagList, policyRecentlyUsedCategories, policyRecentlyUsedTags} = policyParams;
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.

We were passing policyTagList here in params so why did we remove it.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

policyTagList is removed because its value is never used beside policyParams in getMoneyRequestInformation. Since we're not certain that this exact param contains the exact same values as getPolicyTagsData(iouReport.policyID) inside getPolicyTagsData, I think that the best move forward is using policyTagList to pass down correct, bubbled-up value, extracted by us, but bubbling it step-by-step, just like until now - one function per PR.

Comment on lines +846 to +864
function getMoneyRequestPolicyTags({
existingIOUReport,
moneyRequestReportID,
parentChatReport,
participant,
}: {
existingIOUReport?: OnyxEntry<OnyxTypes.Report>;
moneyRequestReportID?: string;
parentChatReport: OnyxEntry<OnyxTypes.Report>;
participant: Participant;
}): OnyxTypes.PolicyTagLists {
const iouReportPolicyID =
existingIOUReport?.policyID ??
(moneyRequestReportID ? allReports?.[`${ONYXKEYS.COLLECTION.REPORT}${moneyRequestReportID}`]?.policyID : undefined) ??
parentChatReport?.policyID ??
allReports?.[`${ONYXKEYS.COLLECTION.REPORT}${participant.reportID}`]?.policyID;
// eslint-disable-next-line @typescript-eslint/no-deprecated
return getPolicyTagsData(iouReportPolicyID) ?? {};
}
Copy link
Copy Markdown
Member

@parasharrajat parasharrajat Apr 13, 2026

Choose a reason for hiding this comment

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

What is the basis of this implementation? why are we using this many params?

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.

Bump @Guccio163

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

getMoneyRequestPolicyTags exists to let callers of getMoneyRequestInformation resolve the correct policyTagList before passing it in, so the function no longer needs to call getPolicyTagsData
internally.

The multiple params are needed because the policy ID of the IOU report can come from several different sources depending on the call context, mirroring the exact fallback chain that
getMoneyRequestInformation uses internally when resolving iouReport (lines 2301–2308):

  1. existingIOUReport?.policyID — direct match to iouReport = existingIOUReport
  2. allReports[moneyRequestReportID]?.policyID — direct match to iouReport = allReports[moneyRequestReportID]
  3. parentChatReport?.policyID — equivalent to new optimistic report's policyID: chatReport.policyID where chatReport = parentChatReport
  4. allReports[participant.reportID]?.policyID — same, but for the policy expense chat path where chatReport was resolved from allReports[participant.reportID]

Cases 3 and 4 are equivalent to the internal iouReport.policyID because expense reports always inherit their policyID from the parent chat — either set directly on buildOptimisticExpenseReport({
policyID: chatReport.policyID }), or already stored that way on the existing report in Onyx.

In short: every param is a different source of the same policyID. Together they guarantee that getMoneyRequestPolicyTags returns the exact same PolicyTagLists that
getPolicyTagsData(iouReport.policyID) would have returned had it been called inside getMoneyRequestInformation.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

I can get you a breakdown of how it maps to getMoneyRequestInformation's internal iouReport calculations if it might help, just let me know 👀

Copy link
Copy Markdown
Member

@parasharrajat parasharrajat left a comment

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 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.
17.04.2026_18.04.18_REC.mp4

🎀 👀 🎀 C+ reviewed

@amyevans amyevans merged commit 42f483c into Expensify:main Apr 17, 2026
33 checks passed
@OSBotify
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
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.3.61-0 🚀

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

Bundle Size Analysis (Sentry):

@MelvinBot
Copy link
Copy Markdown
Contributor

I reviewed the changes in this PR. It's a purely internal code refactoring that removes an Onyx.connect() usage for ONYXKEYS.COLLECTION.POLICY_TAGS in getMoneyRequestInformation and replaces it with explicit parameter passing via a new getMoneyRequestPolicyTags helper.

No help site documentation changes are required. This PR:

  • Introduces no new user-facing features
  • Changes no UI elements, labels, or workflows
  • Modifies no user-visible behavior — tags work exactly the same way
  • Is strictly an internal state management refactoring

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.

5 participants