Skip to content

Refactor putOnhold to use the useAncestors() hook.#74628

Merged
luacmartins merged 24 commits intoExpensify:mainfrom
Tony-MK:putOnHold
Nov 20, 2025
Merged

Refactor putOnhold to use the useAncestors() hook.#74628
luacmartins merged 24 commits intoExpensify:mainfrom
Tony-MK:putOnHold

Conversation

@Tony-MK
Copy link
Contributor

@Tony-MK Tony-MK commented Nov 8, 2025

Explanation of Change

Fixed Issues

$ #73566
PROPOSAL:

Tests

  1. Create an expense.
  2. Navigate to the expense thread.
  3. Enable Force Offline.
  4. Hold the expense.
  5. Navigate back to the report preview.
  6. Verify the reply count is one.
  7. Disable Force Offline.
  8. Verify the reply count doesn't change.
  • Verify that no errors appear in the JS console

Offline tests

QA Steps

// TODO: These must be filled out, or the issue title must include "[No QA]."

  • 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

Android: Native
Android.-.Native.webm
Android: mWeb Chrome
Android.-.mWeb.webm
iOS: Native
iOS.-.mWeb.mp4
iOS: mWeb Safari
iOS.-.Native.mp4
MacOS: Chrome / Safari
macOS.-.Chrome.mov
MacOS: Desktop
macOS.-.Desktop.mov

- Introduced `getAncestors` function to traverse report hierarchy and fetch ancestor reports and actions.
- Updated `putOnHold` and `putTransactionsOnHold` functions to accept ancestor data.
- Integrated `useTransactionsAncestors` hook in `SearchHoldReasonPage` to retrieve ancestors for selected transactions.
@codecov
Copy link

codecov bot commented Nov 8, 2025

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/pages/iou/HoldReasonPage.tsx 0.00% <ø> (ø)
src/libs/actions/IOU.ts 64.64% <50.00%> (-0.04%) ⬇️
src/pages/Search/SearchHoldReasonPage.tsx 0.00% <0.00%> (ø)
... and 3 files with indirect coverage changes

@Tony-MK
Copy link
Contributor Author

Tony-MK commented Nov 10, 2025

Hey @luacmartins and @FitseTLT, if a report has multiple transactions. Since the report will still have no new hold comments, expect the transaction thread. We are supposed to update the report's parent action. E.g.: childCommentCount, etc...

@luacmartins
Copy link
Contributor

@Tony-MK sorry, I'm not sure that I understood your comment. Could you please list the steps to reproduce the issue you're referring to?

@Tony-MK
Copy link
Contributor Author

Tony-MK commented Nov 10, 2025

This is after holding and unholding a singular expense, then adding another expense to the report.

Mutiple.Transactions.mov

Should the reply count change like holding a single expense? I believe it should not update the REPORT_PREVIEW action's childCommentCount value. It should be zero since there are no visible comments.

@luacmartins
Copy link
Contributor

@Tony-MK isn't the visible comment in the transaction thread?

@Tony-MK

This comment was marked as resolved.

@Tony-MK
Copy link
Contributor Author

Tony-MK commented Nov 11, 2025

Apologies, this is a bug that has been happening since staging because putTransactionsOnHold doesn't update using the current new ancestors optimistic data; instead, it uses the old ancestors data value. In short, it only increases the childCommentCount by 1, regardless of the number of transaction threads that created a hold comment.

@Tony-MK Tony-MK marked this pull request as ready for review November 11, 2025 20:10
@Tony-MK Tony-MK requested a review from a team as a code owner November 11, 2025 20:10
@Tony-MK
Copy link
Contributor Author

Tony-MK commented Nov 19, 2025

Hey @luacmartins, could we create an issue for #74628 (comment)? I already started a draft PR. Thanks

@situchan
Copy link
Contributor

we are checking if the ancestors report action is updated correctly.

ok, makes sense

@Tony-MK
Copy link
Contributor Author

Tony-MK commented Nov 19, 2025

Updated the test case.

@situchan
Copy link
Contributor

Please merge main

@situchan
Copy link
Contributor

Expense thread after creating new expense seems broken on main

Screen.Recording.2025-11-20.at.2.14.14.AM.mov

Had to test with old expenses

@Tony-MK
Copy link
Contributor Author

Tony-MK commented Nov 19, 2025

Let me look into it.

@situchan
Copy link
Contributor

Pretty bad regression. I see it's reported as deploy blocker - #75565

@situchan
Copy link
Contributor

Another bug happening on main:

duplicated/unnecessary report preview shows in transaction thread when offline. disappears after online

Screen.Recording.2025-11-20.at.2.55.46.PM.mov

Copy link
Contributor

@situchan situchan left a comment

Choose a reason for hiding this comment

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

Above bugs are not caused by this PR

@melvin-bot melvin-bot bot requested a review from luacmartins November 20, 2025 09:02
@luacmartins luacmartins merged commit 5c64aa8 into Expensify:main Nov 20, 2025
27 checks passed
@OSBotify
Copy link
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.

@OSBotify
Copy link
Contributor

🚀 Deployed to staging by https://github.com/luacmartins in version: 9.2.62-0 🚀

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

@deetergp
Copy link
Contributor

I'm pretty sure this PR caused this blocker. After confirming the behavior in my local Android simulator, I reverted this PR and I was able to hold the expense from the Reports screen drop down.

deetergp added a commit that referenced this pull request Nov 22, 2025
This reverts commit 5c64aa8, reversing
changes made to 94d3272.
@situchan
Copy link
Contributor

@Tony-MK please check ^

mountiny added a commit that referenced this pull request Nov 23, 2025
[CP Staging] Revert "Merge pull request #74628 from Tony-MK/putOnHold"
@Tony-MK
Copy link
Contributor Author

Tony-MK commented Nov 24, 2025

Hey @situchan, created a PR for it.

context.clearSelectedTransactions(true);
} else {
holdMoneyRequestOnSearch(context.currentSearchHash, Object.keys(context.selectedTransactions), comment, allTransactions, allReportActions);
holdMoneyRequestOnSearch(context.currentSearchHash, context.selectedTransactionIDs, comment, allTransactions, allReportActions);
Copy link
Contributor

Choose a reason for hiding this comment

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

Looks like you reverted this change in new PR.
What was this change for and why did it cause the issue?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

The issue was that the context was not available because of https://github.com/Expensify/App/pull/75833/files#r2554436669.

Copy link
Contributor

Choose a reason for hiding this comment

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

ok you answered to why did it cause the issue?

Now what was this change for?

Copy link
Contributor

Choose a reason for hiding this comment

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

@Tony-MK anything that I can help with to move this forward?

OSBotify pushed a commit that referenced this pull request Nov 24, 2025
[CP Staging] Revert "Merge pull request #74628 from Tony-MK/putOnHold"

(cherry picked from commit a60213e)

(cherry-picked to staging by mountiny)
@OSBotify
Copy link
Contributor

🚀 Deployed to production by https://github.com/marcaaron in version: 9.2.62-5 🚀

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

@OSBotify
Copy link
Contributor

🚀 Deployed to staging by https://github.com/luacmartins in version: 9.2.63-0 🚀

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

@OSBotify
Copy link
Contributor

🚀 Deployed to production by https://github.com/marcaaron in version: 9.2.63-8 🚀

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

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