Skip to content

[Part 2] Refactor iou Hold functions to remove allReports onyx references - #102348

Merged
mountiny merged 18 commits into
Expensify:mainfrom
parasharrajat:onyx/report-hold22
Nov 4, 2026
Merged

mountiny merged 18 commits into
Expensify:mainfrom
parasharrajat:onyx/report-hold22

Conversation

@parasharrajat

@parasharrajat parasharrajat commented Sep 26, 2026 •

Copy link
Copy Markdown
Member

Explanation of Change

Fixed Issues

$ #66517
PROPOSAL:

Tests

Test 1 — Single unhold from the context menu

  1. Open a report/expense thread with a held expense, long-press (or right-click) the money request preview, choose Remove hold.
  2. Expect: hold is removed immediately, the "removed hold" comment is added to the thread, next-step indicator updates. Reload and confirm it stays unheld.

Test 2 — Single unhold from the report/expense header

  1. Open a held expense or a report containing held expenses, use the header Remove hold action.
  2. Expect: same as Test 1, and the report unheldTotal/reimbursable totals are restored to include the expense.
  3. Repeat for an expense whose currency differs from the report currency.

Test 3 — Bulk unhold from Search

  1. Select 2–3 held expenses in Search, tap Remove hold.
  2. Expect: all selected expenses are unheld, each gets an unhold comment, totals and next-step update, and no partial failures.
  • Verify that no errors appear in the JS console

Offline tests

Test 1 — Single unhold offline

  1. Go offline, then Remove hold a held expense from the context menu.
  2. Expect: optimistic unhold (pendingAction set, hold comment cleared, unhold comment shown as pending), hold violation removed, totals restored locally.
  3. Force-quit/reload while still offline and reopen the report.
  4. Expect: the unheld state persists.
  5. Reconnect and confirm it syncs with no red error and no rollback.

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
    • MacOS: Desktop
  • 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 verified there are no new alerts related to the canBeMissing param for useOnyx
  • 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

27.09.2026_14.13.04_REC.mp4

@parasharrajat parasharrajat changed the title Refactor iou Hold functions to remove allReports onyx references [Part 2] Refactor iou Hold functions to remove allReports onyx references Sep 26, 2026
@parasharrajat
parasharrajat marked this pull request as ready for review October 7, 2026 16:46
@parasharrajat
parasharrajat requested review from a team as code owners October 7, 2026 16:46
@melvin-bot
melvin-bot Bot requested review from dylanexpensify and ikevin127 and removed request for a team and dylanexpensify October 7, 2026 16:46
@melvin-bot

melvin-bot Bot commented Oct 7, 2026

Copy link
Copy Markdown

@ikevin127 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 October 7, 2026 16:46
@ikevin127

ikevin127 commented Oct 7, 2026 •

Copy link
Copy Markdown
Contributor

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 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
    • 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
    • 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 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 the PR adds or modifies the UI:
    • I asked an AI agent to review the changes for accessibility issues and addressed its findings.
    • I tested with a screen reader (VoiceOver on macOS) and verified all new/changed elements are reachable with a logical focus order.
    • I verified all new/changed elements have meaningful accessible names and roles.
    • I verified state changes are announced (e.g. checked/unchecked, expanded/collapsed, selected).
  • 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.

Screenshots/Videos

Screen.Recording.2026-10-02.at.14.05.56.mov

@ikevin127 ikevin127 left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

🔴 The merge of main reverted the compiled bundles from main's undici 6.29.0 update (de30e671999). The newer header validation (isValidHeaderValue) is removed, and the verify job fails with "Diff found when Github Actions were rebuilt". Please restore them from main:

git checkout origin/main -- .github/actions/javascript

Tests not updated

🟠 These fail on CI because they still assert on reportID or the old signature:

  • BaseReportActionContextMenuTest.tsx › calls unholdRequest when pressing the unhold action
  • useSearchBulkActionsTest.ts › bulk unhold › calls unholdRequest with the live Onyx transaction…
  • useSelectedTransactionsActions.test.ts › should show unhold option…, and › should pass isOffline=true…
  • ReportUtilsTest.ts › changeMoneyRequestHoldStatus › should unhold request…

Could you also add a test for RemoveHoldPrimaryAction that checks changeMoneyRequestHoldStatus receives a defined report ? That would have caught the wrong key.


Please tag me for rereview once comments and issues are addressed 🙌

Comment thread src/libs/actions/IOU/Hold.ts Resolved
Comment thread src/libs/actions/IOU/Hold.ts Resolved
Comment thread src/libs/ReportUtils.ts Resolved
Comment thread src/hooks/useSearchBulkActions.ts Resolved
@parasharrajat

Copy link
Copy Markdown
Member Author

all fixed @ikevin127

@codecov

codecov Bot commented Oct 8, 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 Δ
...ortHeaderPrimaryAction/RemoveHoldPrimaryAction.tsx 95.12% <100.00%> (+95.12%) ⬆️
src/hooks/useSearchBulkActions.ts 80.95% <100.00%> (+0.01%) ⬆️
src/hooks/useSelectedTransactionsActions.ts 80.07% <ø> (ø)
src/libs/actions/IOU/Hold.ts 89.86% <100.00%> (-0.14%) ⬇️
...report/ContextMenu/BaseReportActionContextMenu.tsx 88.02% <100.00%> (+0.14%) ⬆️
src/hooks/useHoldRejectActions.ts 90.80% <83.33%> (+0.68%) ⬆️
...es/inbox/report/ContextMenu/ContextMenuActions.tsx 45.96% <50.00%> (ø)
.../components/MoneyRequestHeaderSecondaryActions.tsx 59.21% <11.11%> (+0.14%) ⬆️
src/components/MoneyRequestHeaderPrimaryAction.tsx 1.16% <0.00%> (-0.03%) ⬇️
src/hooks/useMoneyReportHeaderEducationalModals.ts 0.00% <0.00%> (ø)
... and 8 files with indirect coverage changes

Comment thread tests/unit/ReportUtilsTest.ts Resolved
@ikevin127

Copy link
Copy Markdown
Contributor

PR description, Offline tests

🔴 Offline Test 2 (bulk unhold from Search while offline) can't be run: Search hides Remove hold while offline (shouldShowUnholdOption = !isOffline && … in useSearchBulkActions.ts). Offline Test 1 also has leftover steps 3-4 ("all holds sync; … no duplicate hold comments") that don't belong to the unhold flow. QA runs these verbatim, so please:

  • replace Offline Test 2 with an offline unhold from the report header Remove hold button (the path that was broken)
  • remove the duplicate steps from Offline Test 1
  • fill in Explanation of Change

@parasharrajat Ready after these 4 items:

  1. Resolve the merge conflicts with main.
  2. Fix the PR description: Explanation of Change, Offline Test 2, and the leftover steps in Offline Test 1 (details above).
  3. Add the RemoveHoldPrimaryAction test.
  4. Pass distinct reports in the ReportUtilsTest unhold case.

@parasharrajat

Copy link
Copy Markdown
Member Author

will update this soon.

@parasharrajat

Copy link
Copy Markdown
Member Author

Ready @ikevin127

@ikevin127 ikevin127 left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Thanks for addressing my previous 8 inline comments which are now fixed except the distinct-reports test ask.

@parasharrajat Ready after these 4 items:

  1. Assert the IOU report update in HoldTest.ts so a report swap fails the test.
  2. Drop the type casts in RemoveHoldPrimaryAction.test.tsx.
  3. Cover the multi-expense IOUActions loop in RemoveHoldPrimaryAction.test.tsx.

Comment thread tests/actions/IOUTest/HoldTest.ts Resolved
Comment thread src/libs/actions/IOU/Hold.ts Resolved
@parasharrajat

Copy link
Copy Markdown
Member Author

All set.

@ikevin127 ikevin127 left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

🟢 LGTM - All previous comments are addressed, only one type cast left - should be fixed before merge but I won't block 🙌

@melvin-bot
melvin-bot Bot requested a review from danieldoglas November 2, 2026 23:01
@parasharrajat

Copy link
Copy Markdown
Member Author

Ready.

@ikevin127

Copy link
Copy Markdown
Contributor

@danieldoglas Ready for you!

@mountiny mountiny left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Looks good to me, thanks @parasharrajat and @ikevin127

@mountiny
mountiny merged commit 308bec9 into Expensify:main Nov 4, 2026
36 of 37 checks passed
@github-actions

github-actions Bot commented Nov 4, 2026

Copy link
Copy Markdown
Contributor

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

@OSBotify

OSBotify commented Nov 4, 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 Nov 4, 2026

Copy link
Copy Markdown
Contributor

@OSBotify OSBotify mentioned this pull request Nov 6, 2026
93 tasks done
@OSBotify

OSBotify commented Nov 6, 2026

Copy link
Copy Markdown
Contributor

🚀 Deployed to staging by https://github.com/mountiny in version: 9.5.33-0 🚀

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

@OSBotify

OSBotify commented Nov 7, 2026

Copy link
Copy Markdown
Contributor

🚀 Deployed to production by https://github.com/roryabraham in version: 9.5.33-1 🚀

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

Bundle Size Analysis (Sentry):

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.

4 participants