Skip to content

Fix parent message not editable from a nested thread - #97418

Merged
blimpich merged 3 commits into
Expensify:mainfrom
mukhrr:fix/92077
Aug 3, 2026
Merged

blimpich merged 3 commits into
Expensify:mainfrom
mukhrr:fix/92077

Conversation

@mukhrr

@mukhrr mukhrr commented Jul 30, 2026 •

Copy link
Copy Markdown
Contributor

Explanation of Change

On narrow layouts editing happens in the shared main composer, and it saved the edit draft under the report you're currently viewing instead of the report that owns the message.

That only breaks two hops deep. In a nested thread the top ancestor is a grandparent message, so getOriginalReportID() can't rescue it (it only handles a direct parent, via childReportID === reportID) and falls back to the viewed thread's ID. Since saveReportActionDraft() writes with Onyx.setCollection, which replaces the whole drafts collection, the first keystroke moved the draft to the wrong bucket and deleted the correct one.

useActiveDraftReportAction then looks for the action in the nested thread's actions, doesn't find it, and returns editingReportAction: null. Both publishDraft() and deleteDraft() early-return on null, which is why save and cancel did nothing. Wide layouts were fine because the inline editor already saves with the row's own report ID.

Fix: both save sites now use editingReportID ?? reportID (the owning report, already resolved by useActiveDraftReportAction) and pass the full editingReportAction instead of a stripped {reportActionID} cast.

Fixed Issues

$ #92077
PROPOSAL: #92077 (comment)

Tests

  1. Login the app
  2. Open any chat and send a message — call it A.
  3. Long-press A → Reply in thread.
  4. Send a message in the thread — call it B.
  5. Long-press B → Reply in thread again. You are now in a nested thread, with A and B shown as ancestors at the top.
  6. Long-press A (the top ancestor) → Edit comment.
  7. Verify edit mode opens in the main composer with A's text.
  8. Change the text, then tap the save (checkmark) button.
  9. Verify the save works: A is updated everywhere it is displayed (in the nested thread's ancestor header, in the thread, and in the parent chat).
  10. Repeat steps 6–7, change the text, then tap the cancel (X) button instead.
  11. Verify edit mode closes and A keeps its original text.
  12. Regression check — repeat steps 6–11 for B (the direct parent), and for a plain message inside the nested thread itself. Verify edit, save, and cancel all still work.
  • Verify that no errors appear in the JS console

Offline tests

  1. Follow steps 1–5 above, then go offline.
  2. Long-press the top ancestor A → Edit comment, change the text, and tap save.
  3. Verify the edited text is shown optimistically with the usual offline (greyed / pending) styling.
  4. Go back online and verify the edit is sent and the message keeps the edited text.
  5. Repeat while offline but tap cancel instead, and verify edit mode closes with the original text intact.

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 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 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)
  • 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.
  • 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_app.mp4
Android: mWeb Chrome
android_web.mp4
iOS: Native
ios_app.mp4
iOS: mWeb Safari
ios.web.mp4
MacOS: Chrome / Safari
92077-web.mp4

@mukhrr
mukhrr requested review from a team as code owners July 30, 2026 02:39
@melvin-bot
melvin-bot Bot requested review from hoangzinh and removed request for a team July 30, 2026 02:39
@melvin-bot

melvin-bot Bot commented Jul 30, 2026

Copy link
Copy Markdown

@hoangzinh 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 JmillsExpensify and removed request for a team July 30, 2026 02:39
On narrow layouts the shared main composer persisted the edit draft using the
visible report's ID. For a nested thread's top ancestor the action is a
grandparent, so getOriginalReportID could not rescue it and fell through to the
viewed thread's own ID, and saveReportActionDraft's Onyx.setCollection replaced
the whole drafts collection, wiping the correct bucket. The read path then
resolved a null editingReportAction, so both save and cancel were inert.

Both edit-save sites now target editingReportID (the owning report, already
resolved by useActiveDraftReportAction) and pass the full editingReportAction
instead of a stripped {reportActionID} cast, which also defeated the
childReportID recovery for first-level threads.
@codecov

codecov Bot commented Jul 30, 2026 •

Copy link
Copy Markdown

Codecov Report

✅ Changes either increased or maintained existing code coverage, great job!

Files with missing lines Coverage Δ
...rt/ReportActionCompose/ComposerWithSuggestions.tsx 61.30% <66.66%> (+0.50%) ⬆️
... and 115 files with indirect coverage changes

}

saveReportActionDraft(reportID, {reportActionID: editingReportActionID} as OnyxTypes.ReportAction, newCommentConverted);
saveReportActionDraft(editingReportID ?? reportID, editingReportAction, newCommentConverted);

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.

By passing the whole reportAction object, it potentially causes a regression issue on this line

const isThreadReportParentAction = reportAction?.childReportID?.toString() === reportID;

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.

hmm.. do you think so? it can't fire here though. isThreadReportParentAction compares childReportID against the reportID we pass, and we now pass editingReportID, which is always the report that contains the action (ancestor, visible, transaction thread). childReportID is a thread spawned from the action, so it never equals the report the action lives in and the condition stays false either way.

checked it rather than assumed: with the owning report, the full and stripped objects return the same value. they only differ if you pass the child thread, which is what the old code did, where the full object recovers the parent and the stripped one falls through to the thread. also added a test for the direct-parent case (editing the parent from inside its own thread).

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

@mukhrr

mukhrr commented Aug 3, 2026

Copy link
Copy Markdown
Contributor Author

@hoangzinh kindly bump

@mukhrr
mukhrr requested a review from hoangzinh August 3, 2026 02:26
@hoangzinh

hoangzinh commented Aug 3, 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.
  • 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
Screen.Recording.2026-08-03.at.17.27.36.mov
Android: mWeb Chrome
iOS: HybridApp
iOS: mWeb Safari
MacOS: Chrome / Safari
Screen.Recording.2026-08-03.at.17.21.11.mov

@hoangzinh hoangzinh 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.

🚢

@melvin-bot
melvin-bot Bot requested a review from blimpich August 3, 2026 10:30
@blimpich
blimpich merged commit b2685a7 into Expensify:main Aug 3, 2026
34 of 35 checks passed
@OSBotify

OSBotify commented Aug 3, 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 Aug 3, 2026

Copy link
Copy Markdown
Contributor

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

@OSBotify OSBotify mentioned this pull request Aug 3, 2026
77 tasks done
@OSBotify

OSBotify commented Aug 3, 2026

Copy link
Copy Markdown
Contributor

🚀 Deployed to staging by https://github.com/blimpich in version: 9.4.49-0 🚀

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

@MelvinBot

Copy link
Copy Markdown
Contributor

🤖 Docs review: no help-site changes required.

This PR is a bug fix that restores the intended behavior of editing a parent/ancestor message from a nested thread on narrow layouts. It changes internal draft-resolution logic (editingReportID ?? reportID) and adds regression tests — there's no new or changed user-facing feature, UI element, label, or workflow.

The existing help article already documents editing messages and replying in threads accurately, and the corrected behavior matches what's documented:

Since the fix makes the app match already-documented behavior, no draft docs PR was created.

@mukhrr, no help site PR was needed here — let me know if you'd still like the Edit/Delete Messages or thread documentation expanded (e.g. to explicitly call out editing an ancestor message from within a nested thread), and I can draft one.

@OSBotify

OSBotify commented Aug 4, 2026

Copy link
Copy Markdown
Contributor

🚀 Deployed to production by https://github.com/arosiclair in version: 9.4.49-3 🚀

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.

6 participants