Refactor `deleteReportComment()` to use useAncestors hook by Tony-MK · Pull Request #73604 · Expensify/App

Tony-MK · 2025-10-28T01:39:29Z

Explanation of Change

Refactoring deleteReportComment into a pure function.

Fixed Issues

$ #73568
PROPOSAL:

Tests

Send a message.
Reply in thread.
Enable Force Offline.
Send two messages in the thread.
Navigate back to the parent report.
Verify it has 2 replies.
Navigate back to the thread.
Delete a message.
Navigate back to the parent report.
Verify the parent message displays 1 reply.
Navigate back to the thread.
Delete the last message.
Navigate back to the parent report.
Verify the parent message does not display that it has any replies.
Disable Force Offline.
Wait for the network bar to stop loading.
Verify the parent message does not display that it has any replies.

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

Screenshots/Videos

Android: Native

Android: mWeb Chrome

Android.-.mWeb.webm

iOS: Native

iOS.-.Native.mp4

iOS: mWeb Safari

iOS.-.Safari.mp4

MacOS: Chrome / Safari

macOS.-.Chrome.mov

MacOS: Desktop

- Implemented getOptimisticDataForAncestors to handle optimistic updates for ancestor reports. - Updated deleteReportComment and editReportComment functions to utilize the new ancestors parameter. - Modified PopoverReportActionContextMenu and ReportActionItemMessageEdit components to fetch ancestors. - Enhanced tests in ReportTest to validate changes with ancestors.

…or ancestor calculations

… clarity

…portComment

codecov · 2025-10-28T22:58:43Z

Codecov Report

❌ Patch coverage is 68.42105% with 6 lines in your changes missing coverage. Please review.

Files with missing lines	Patch %	Lines
src/libs/ReportUtils.ts	50.00%	3 Missing ⚠️
...ort/ContextMenu/PopoverReportActionContextMenu.tsx	75.00%	2 Missing ⚠️
src/libs/actions/Report.ts	66.66%	1 Missing ⚠️

Files with missing lines	Coverage Δ
.../pages/home/report/ReportActionItemMessageEdit.tsx	`56.16% <100.00%> (+0.20%)`	⬆️
src/libs/actions/Report.ts	`52.08% <66.66%> (+<0.01%)`	⬆️
...ort/ContextMenu/PopoverReportActionContextMenu.tsx	`41.82% <75.00%> (+1.52%)`	⬆️
src/libs/ReportUtils.ts	`74.85% <50.00%> (-0.06%)`	⬇️

... and 10 files with indirect coverage changes

🚀 New features to boost your workflow:

❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

melvin-bot · 2025-10-28T23:02:58Z

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

FitseTLT · 2025-10-29T12:42:12Z

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

Screenshots/Videos

Android: HybridApp

Android: mWeb Chrome

iOS: HybridApp

iOS: mWeb Safari

MacOS: Chrome / Safari

MacOS: Desktop

…portComment

…arity and performance

Tony-MK · 2025-10-30T00:59:25Z

Bump, @FitseTLT.

…portComment

FitseTLT · 2025-10-31T14:24:07Z

@Tony-MK I don't get it why did you ignore the detail implementation of getOptimisticDataForParentReportAction in getOptimisticDataForAncestors. I have seen the same thing on the last pr. If it is a refactoring pr then you have to ensure that every detail is included unless you have a strong reason.

Tony-MK · 2025-10-31T14:29:56Z

@FitseTLT , it has the behaviour as before. Which parts look different?

FitseTLT · 2025-10-31T14:33:05Z

getOptimisticDataForParentReportAction

all the return null s when values don't exist and also this logic here

App/src/libs/ReportUtils.ts

Line 10256 in 0d4ec84

    
           previousActionDeleted = isDeletedAction(ancestorReportAction) && updatedReportAction.childVisibleActionCount === 0;

FitseTLT · 2025-10-31T14:33:20Z

And also conflicts @Tony-MK

src/pages/home/report/ContextMenu/PopoverReportActionContextMenu.tsx

src/pages/home/report/ReportActionItemMessageEdit.tsx

Tony-MK · 2025-10-31T18:43:42Z

getOptimisticDataForParentReportAction

all the return null s when values don't exist and also this logic here

App/src/libs/ReportUtils.ts

Line 10256 in 0d4ec84

previousActionDeleted = isDeletedAction(ancestorReportAction) && updatedReportAction.childVisibleActionCount === 0;

Apologies, the getOptimisticDataForParentReportAction was changed recently, and I missed that. I don't see a problem with filtering out null values in getOptimisticDataForAncestors. Is there a problem?

FitseTLT · 2025-10-31T18:52:15Z

I don't see a problem with filtering out null values in getOptimisticDataForAncestors. Is there a problem?

Oh because we filter it out in the hook, U are right 👍

…nsify-App into deleteReportComment

This reverts commit 4ab7817.

…cestors from changes in recent main merge commit Refactor comments and update optimistic data handling for ancestor report actions.

Tony-MK · 2025-11-03T15:22:20Z

Bump @FitseTLT

FitseTLT · 2025-11-03T15:22:39Z

BTW there is still a difference in the way we are getting ancestors

App/src/libs/ReportUtils.ts

Line 10282 in f814036

const ancestors = getAllAncestorReportActionIDs(report, true);

Notices how we passed the second param.
which decides the logic here

App/src/libs/ReportUtils.ts

Lines 10250 to 10252 in f814036

    
               (!includeTransactionThread && ((isTransactionThread(parentReportAction) && !isSentMoneyReportAction(parentReportAction)) || isReportPreviewAction(parentReportAction))) 
        
           ) { 
        
               break;

The logic of includeTransactionThread param still hasn't been implemented in here

App/src/libs/ReportUtils.ts

Lines 8627 to 8631 in f814036

    
           if (isTransactionThread(ancestorReportAction)) { 
        
               return !isSentMoneyReportAction(ancestorReportAction); 
        
           } 
        
           return isReportPreviewAction(ancestorReportAction);

Tony-MK · 2025-11-03T15:59:42Z

@FitseTLT, but const ancestors = getAllAncestorReportActionIDs(report, true); passes true
which means we should return all ancestors and not exclude any ancestors.

src/libs/ReportUtils.ts

tests/actions/ReportTest.ts

…portComment

…for clarity

…portComment

FitseTLT

LGTM

luacmartins

LGTM

OSBotify · 2025-11-03T23:02:27Z

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

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

OSBotify · 2025-11-04T20:50:00Z

🚀 Deployed to production by https://github.com/luacmartins in version: 9.2.43-2 🚀

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

parasharrajat · 2025-12-14T12:47:42Z

src/pages/home/report/ContextMenu/PopoverReportActionContextMenu.tsx

+    const [originalReport] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${getOriginalReportID(reportIDRef.current, reportActionRef.current)}`, {
+        canBeMissing: true,
+    });
+    const ancestorsRef = useRef<typeof ancestors>([]);


why do we need this ref when we already have ancestors values directly available in the next line?

Tony-MK added 2 commits October 27, 2025 21:25

Refactor PopoverReportActionContextMenu to use original report data f…

5f71e0a

…or ancestor calculations

melvin-bot bot assigned Tony-MK Oct 28, 2025

Tony-MK and others added 4 commits October 28, 2025 04:45

Merge branch 'main' into deleteReportComment

20236a2

refactor: PopoverReportActionContextMenu for improved type safety and…

c30db4b

… clarity

fixed ancestors params in UnreadIndicatorsTest

29f63ea

Merge branch 'main' of https://github.com/Expensify/App into deleteRe…

db59e27

…portComment

Tony-MK marked this pull request as ready for review October 28, 2025 23:02

Tony-MK requested a review from a team as a code owner October 28, 2025 23:02

melvin-bot bot requested review from FitseTLT and removed request for a team October 28, 2025 23:02

Tony-MK added 4 commits October 29, 2025 23:18

Merge branch 'main' of https://github.com/Expensify/App into deleteRe…

bcaebbd

…portComment

refactor: getOptimisticDataForAncestors to use reduce for improved cl…

176da24

…arity and performance

fix: update dependency array in useEffect for correct behavior

cf34c35

Merge branch 'Expensify:main' into deleteReportComment

0d4ec84

Merge branch 'main' of https://github.com/Expensify/App into deleteRe…

18fc26e

…portComment

FitseTLT reviewed Oct 31, 2025

View reviewed changes

src/pages/home/report/ContextMenu/PopoverReportActionContextMenu.tsx Show resolved Hide resolved

src/pages/home/report/ContextMenu/PopoverReportActionContextMenu.tsx Show resolved Hide resolved

src/pages/home/report/ReportActionItemMessageEdit.tsx Show resolved Hide resolved

Tony-MK and others added 2 commits October 31, 2025 21:46

Merge branch 'main' into deleteReportComment

88bf7da

update ancestors to use original parent report

4ab7817

Merge branch 'deleteReportComment' of https://github.com/Tony-MK/Expe…

93a099c

…nsify-App into deleteReportComment

Tony-MK and others added 5 commits October 31, 2025 21:57

Revert "update ancestors to use original parent report"

eaa496a

This reverts commit 4ab7817.

Adding new line

956b649

refactor: implemented previousActionDeleted in getOptimisticDataForAn…

bc199bf

…cestors from changes in recent main merge commit Refactor comments and update optimistic data handling for ancestor report actions.

prettier

6621f59

Merge branch 'Expensify:main' into deleteReportComment

f814036

Tony-MK requested a review from FitseTLT October 31, 2025 20:23

FitseTLT reviewed Nov 3, 2025

View reviewed changes

src/libs/ReportUtils.ts Outdated Show resolved Hide resolved

src/libs/ReportUtils.ts Outdated Show resolved Hide resolved

tests/actions/ReportTest.ts Show resolved Hide resolved

Tony-MK added 2 commits November 3, 2025 16:41

Merge branch 'main' of https://github.com/Expensify/App into deleteRe…

6bcdee1

…portComment

refactor: getOptimisticDataForAncestors to use map instead of reduce …

03bd81d

…for clarity

Tony-MK requested a review from FitseTLT November 3, 2025 18:00

Tony-MK added 3 commits November 3, 2025 19:08

refactor:test report

1d1f9c4

Merge branch 'main' of https://github.com/Expensify/App into deleteRe…

221e065

…portComment

prettier

86bc77e

FitseTLT approved these changes Nov 3, 2025

View reviewed changes

melvin-bot bot requested a review from luacmartins November 3, 2025 19:51

luacmartins approved these changes Nov 3, 2025

View reviewed changes

luacmartins merged commit 4f6960f into Expensify:main Nov 3, 2025
28 checks passed

OSBotify mentioned this pull request Nov 3, 2025

Deploy Checklist: New Expensify 2025-11-03 #74140

Closed

54 tasks

melvin-bot bot mentioned this pull request Nov 4, 2025

[Due for payment 2025-11-11] [$125] Refactor deleteReportComment to use useAncestorReportsAndReportActions hook #73568

Closed

parasharrajat reviewed Dec 14, 2025

View reviewed changes

This was referenced Dec 15, 2025

[CLEAN] Synthetic Benchmark PR #73604 - Refactor deleteReportComment() to use useAncestors hook qodo-benchmark/App#65

Open

[CORRUPTED] Synthetic Benchmark PR #73604 - Refactor deleteReportComment() to use useAncestors hook qodo-benchmark/App#66

Open

This was referenced Dec 31, 2025

[CLEAN] Synthetic Benchmark PR #73604 - Refactor deleteReportComment() to use useAncestors hook qodo-benchmark/App#115

Open

[CORRUPTED] Synthetic Benchmark PR #73604 - Refactor deleteReportComment() to use useAncestors hook qodo-benchmark/App#116

Open

Conversation

Tony-MK commented Oct 28, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Explanation of Change

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

Uh oh!

codecov bot commented Oct 28, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

melvin-bot bot commented Oct 28, 2025

Uh oh!

FitseTLT commented Oct 29, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

Tony-MK commented Oct 30, 2025

Uh oh!

FitseTLT commented Oct 31, 2025

Uh oh!

Tony-MK commented Oct 31, 2025

Uh oh!

FitseTLT commented Oct 31, 2025

Uh oh!

FitseTLT commented Oct 31, 2025

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Tony-MK commented Oct 31, 2025

Uh oh!

FitseTLT commented Oct 31, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Tony-MK commented Nov 3, 2025

Uh oh!

FitseTLT commented Nov 3, 2025

Uh oh!

Tony-MK commented Nov 3, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

FitseTLT left a comment

Choose a reason for hiding this comment

Uh oh!

luacmartins left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

OSBotify commented Nov 3, 2025

Uh oh!

OSBotify commented Nov 4, 2025

Uh oh!

parasharrajat Dec 14, 2025 • 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!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

Tony-MK commented Oct 28, 2025 •

edited

Loading

codecov bot commented Oct 28, 2025 •

edited

Loading

FitseTLT commented Oct 29, 2025 •

edited

Loading

FitseTLT commented Oct 31, 2025 •

edited

Loading

Tony-MK commented Nov 3, 2025 •

edited

Loading

parasharrajat Dec 14, 2025 •

edited

Loading