Skip to content

Hide redundant MARKEDREIMBURSED action when report has a sibling IOU pay action - #95015

Draft
MelvinBot wants to merge 1 commit into
mainfrom
claude-markedReimbursedSiblingPayCheck
Draft

Hide redundant MARKEDREIMBURSED action when report has a sibling IOU pay action#95015
MelvinBot wants to merge 1 commit into
mainfrom
claude-markedReimbursedSiblingPayCheck

Conversation

@MelvinBot

Copy link
Copy Markdown
Contributor

Explanation of Change

NewDot renders the IOU pay action in place of the MARKEDREIMBURSED action, so the two should never both be displayed on the same report. The existing guard in shouldReportActionBeVisible hides MARKEDREIMBURSED only when the write-time originalMessage.isNewDot flag is set or the baked shouldShow is false.

Both of those signals are computed once, at write time, and persisted into the Onyx update. When a MARKEDREIMBURSED action is created outside a NewDot request (e.g. a background job, then served back via GetMissingOnyxMessages), isNewDot is unset and a stale shouldShow: true gets baked in — so neither condition fires and the row leaks through alongside the IOU pay action, producing the duplicate "marked as paid" message.

This change stops trusting the stale baked flags and instead derives the answer locally: a new hasSiblingPayReportAction helper checks whether the report already contains an IOU pay action, and MARKEDREIMBURSED is hidden when it does. This is scoped to MARKEDREIMBURSED only (not REIMBURSED), and is purely additive to the existing flag checks, so:

  • Repro case (MARKEDREIMBURSED + IOU pay on the same report) → sibling pay exists → hidden → duplicate fixed.
  • No-twin paths (ABA-file batch reimbursements, zero-amount paychecks, OldDot non-instant-submit reports) create MARKEDREIMBURSED with no IOU pay → sibling absent → still visible → no regression.

Fixed Issues

$ https://github.com/Expensify/Expensify/issues/636674
PROPOSAL: https://github.com/Expensify/Expensify/issues/636674#issuecomment-4617734150

Tests

// TODO: The human co-author must fill out the tests you ran before marking this PR as "ready for review". Please describe what tests you performed that validate your change worked.

Suggested manual test:

  1. On NewDot, open an expense report that was reimbursed/paid (so it has both the IOU "paid" action and a backend MARKEDREIMBURSED action — e.g. reproduce via the onboarding "Get paid back by employer" flow, create an expense with a cropped receipt, then open it).
  2. Verify the "marked as paid" / "paid" message appears only once in the report timeline.
  3. Open a report reimbursed via a path that produces no IOU pay action (e.g. an OldDot-marked-reimbursed bill/invoice) and verify the "marked as paid" message is still shown.
  • Verify that no errors appear in the JS console

Offline tests

Same as Tests.

QA Steps

// TODO: The human co-author must fill out the QA steps before marking this PR as "ready for review". Please describe what QA needs to validate and what areas to test for regressions.

  • 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 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 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.
  • 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

…tion

Co-authored-by: Rory Abraham <roryabraham@users.noreply.github.com>
@MelvinBot
MelvinBot requested a review from a team June 30, 2026 22:57
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.

2 participants