Refactor handling of MARKED_REIMBURSED actions from OD into ND by mukhrr · Pull Request #72033 · Expensify/App

mukhrr · 2025-10-07T20:07:58Z

Explanation of Change

Fixed Issues

$ #69929
$ #71403
$ #71411
$ #71954
$ #71947
PROPOSAL: #69929 (comment)

Tests

The same as QA.

Verify that no errors appear in the JS console

Offline tests

QA Steps

Preconditions: A collect workspace exists between an Admin using OldDot and a Member using NewDot.

Member - NewDot:

Navigate to the workspace chat
Submit an expense (can be manual)

Admin - OldDot:
4. Navigate to the "Processing" report from the Collect workspace
5. Click the "Approve" button
6. Reimburse the report using the "I'll do it manually - just mark it as reimbursed" option from the dropdown arrow next to the Reimburse button

#69929
Member - NewDot:
7. Navigate to the paid report
8. Verify there is "Marked as paid" message below

#71954
9. Verify you see "marked as paid" as last message in LHS

#71411
11. Open context menu on top of "Marked as paid" message
12. Click copy to clipboard and paste it into input
13. Verify that message is pasted
14. Click Reply in thread option
15. Verify header in thread is not loading infinitily, instead shows "marked as paid" message

#71403

Submit two expenses to workspace chat in ND
Open the expense report.
Click Submit, Approve and Mark as paid.
Go back to workspace chat.
Reopen the expense report.
Verify there is no empty message in chat

#71947
Precondition:

Disable Delayed submissions and Add approvals in Workflows settings.

Go to workspace chat.
Create an expense in workspace chat.
Open the expense report.
Click Pay > Mark as paid.
Refresh the report.
Verify you Marked as paid message along with user avatar and name

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

android_native.mp4

android_mWeb.mp4

Android: mWeb Chrome

android_mWeb.mp4

iOS: Native

ios_mweb.mp4

IOS_nativeApp.mp4

iOS: mWeb Safari

ios_mweb.mp4

IOS_mWeb.mp4

MacOS: Chrome / Safari

Web.mp4

web_chrome.mp4

MacOS: Desktop

desktop.mp4

…ibility and consistency across reports. Updated related functions to return appropriate translations and ensure correct display in report actions.

melvin-bot · 2025-10-07T20:08:04Z

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

codecov · 2025-10-07T20:21:54Z

Codecov Report

❌ Patch coverage is 52.63158% with 9 lines in your changes missing coverage. Please review.

Files with missing lines	Patch %	Lines
src/libs/ReportActionsUtils.ts	66.66%	4 Missing ⚠️
...ges/home/report/ContextMenu/ContextMenuActions.tsx	0.00%	2 Missing ⚠️
src/libs/OptionsListUtils/index.ts	50.00%	1 Missing ⚠️
src/libs/ReportUtils.ts	50.00%	1 Missing ⚠️
src/pages/home/report/PureReportActionItem.tsx	0.00%	1 Missing ⚠️

Additional details and impacted files

@@            Coverage Diff             @@
##             main   #72033      +/-   ##
==========================================
- Coverage   35.13%   35.05%   -0.09%     
==========================================
  Files        3307     3320      +13     
  Lines      108351   108855     +504     
  Branches    34619    34778     +159     
==========================================
+ Hits        38069    38158      +89     
- Misses      70096    70514     +418     
+ Partials      186      183       -3

Files with missing lines	Coverage Δ
src/libs/OptionsListUtils/index.ts	`70.77% <50.00%> (-0.04%)`	⬇️
src/libs/ReportUtils.ts	`73.77% <50.00%> (-0.09%)`	⬇️
src/pages/home/report/PureReportActionItem.tsx	`51.40% <0.00%> (-0.44%)`	⬇️
...ges/home/report/ContextMenu/ContextMenuActions.tsx	`0.92% <0.00%> (-0.01%)`	⬇️
src/libs/ReportActionsUtils.ts	`51.40% <66.66%> (-0.23%)`	⬇️

... and 173 files with indirect coverage changes

📢 Thoughts on this report? Let us know!

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

…ct message display. Updated conditions to check for simultaneous IOU and MARKED_REIMBURSED actions, improving clarity in report action messages.

…tions for IOU and MARKED_REIMBURSED actions. This update ensures accurate message rendering based on the presence of both action types, improving clarity in user notifications.

mukhrr · 2025-10-09T06:08:46Z

@jjcoffee PR is ready!

jjcoffee · 2025-10-09T14:50:58Z

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-app-2025-10-09_11.45.46.mp4

Android: mWeb Chrome

android-chrome-2025-10-09_11.46.48.mp4

iOS: HybridApp

ios-app-2025-10-09_11.39.18.mp4

iOS: mWeb Safari

ios-safari-2025-10-09_11.41.36.mp4

MacOS: Chrome / Safari

desktop-chrome-2025-10-10_10.11.47.mp4

MacOS: Desktop

desktop-app-2025-10-09_11.48.55.mp4

…network status and display properties, enhancing the overall clarity of report action processing.

mukhrr · 2025-10-10T03:26:11Z

@jjcoffee can you, pls, re-check?! It's ready

jjcoffee

LGTM!

OSBotify · 2025-10-13T13:38:54Z

✋ 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 · 2025-10-13T21:21:30Z

🚀 Deployed to staging by https://github.com/lakchote in version: 9.2.30-0 🚀

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

OSBotify · 2025-10-14T17:35:56Z

🚀 Deployed to production by https://github.com/mountiny in version: 9.2.30-6 🚀

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

Refactor handling of MARKED_REIMBURSED actions to improve message vis…

4beb637

…ibility and consistency across reports. Updated related functions to return appropriate translations and ensure correct display in report actions.

mukhrr requested a review from a team as a code owner October 7, 2025 20:07

melvin-bot Bot assigned mukhrr Oct 7, 2025

melvin-bot Bot requested a review from jjcoffee October 7, 2025 20:08

melvin-bot Bot removed the request for review from a team October 7, 2025 20:08

prettier fix

409bc26

mukhrr mentioned this pull request Oct 7, 2025

[Due for payment 2025-10-21] Expense - "marked as paid" no longer shows sender avatar and name after refreshing report #71947

Closed

8 tasks

mukhrr mentioned this pull request Oct 8, 2025

[Due for payment 2025-10-21] LHN shows "You marked report as manually reimbursed" when system message is "marked as paid" #71954

Closed

8 tasks

mukhrr added 3 commits October 9, 2025 10:18

Refactor logic for handling MARKED_REIMBURSED actions to ensure corre…

777083e

…ct message display. Updated conditions to check for simultaneous IOU and MARKED_REIMBURSED actions, improving clarity in report action messages.

Enhance logic for displaying report action messages by refining condi…

1da86db

…tions for IOU and MARKED_REIMBURSED actions. This update ensures accurate message rendering based on the presence of both action types, improving clarity in user notifications.

simplified showing marked as paid fom ND

cd26cdb

This comment was marked as resolved.

Sign in to view

mukhrr added 2 commits October 9, 2025 23:38

Merge remote-tracking branch 'origin' into fix/marked-as-reimbursed

c7536c9

Updated conditions to ensure accurate retrieval of actions based on …

37dbf1d

…network status and display properties, enhancing the overall clarity of report action processing.

jjcoffee approved these changes Oct 10, 2025

View reviewed changes

melvin-bot Bot requested a review from lakchote October 10, 2025 08:16

lakchote approved these changes Oct 13, 2025

View reviewed changes

lakchote merged commit e5f9bdd into Expensify:main Oct 13, 2025
21 checks passed

OSBotify mentioned this pull request Oct 13, 2025

Deploy Checklist: New Expensify 2025-10-13 #72503

Closed

92 tasks

mitarachim mentioned this pull request Oct 14, 2025

Report-Submit button is displayed with disabled 'Submission frequency' #72528

Closed

8 tasks

melvin-bot Bot mentioned this pull request Oct 14, 2025

[Due for payment 2025-10-21] [Due for payment 2025-10-15] [Due for payment 2025-10-06] [$250] Report - "Marked as paid" system message isn't displayed in ND when admin paid expense in OD #69929

Closed

8 tasks

Krishna2323 mentioned this pull request Oct 24, 2025

[$250] Report - 'Marked as paid" system message isn't displayed in ND when admin paid expense in OD #72467

Closed

8 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Refactor handling of MARKED_REIMBURSED actions from OD into ND#72033

Refactor handling of MARKED_REIMBURSED actions from OD into ND#72033
lakchote merged 7 commits into
Expensify:mainfrom
mukhrr:fix/marked-as-reimbursed

mukhrr commented Oct 7, 2025 •

edited

Loading

Uh oh!

melvin-bot Bot commented Oct 7, 2025

Uh oh!

codecov Bot commented Oct 7, 2025 •

edited

Loading

Uh oh!

mukhrr commented Oct 9, 2025

Uh oh!

jjcoffee commented Oct 9, 2025 •

edited

Loading

Uh oh!

This comment was marked as resolved.

This comment was marked as resolved.

mukhrr commented Oct 10, 2025

Uh oh!

jjcoffee left a comment

Uh oh!

Uh oh!

OSBotify commented Oct 13, 2025

Uh oh!

OSBotify commented Oct 13, 2025

Uh oh!

OSBotify commented Oct 14, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

Uh oh!

Conversation

mukhrr commented Oct 7, 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!

melvin-bot Bot commented Oct 7, 2025

Uh oh!

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

Uh oh!

Codecov Report

Uh oh!

mukhrr commented Oct 9, 2025

Uh oh!

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

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

This comment was marked as resolved.

This comment was marked as resolved.

mukhrr commented Oct 10, 2025

Uh oh!

jjcoffee left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

OSBotify commented Oct 13, 2025

Uh oh!

OSBotify commented Oct 13, 2025

Uh oh!

OSBotify commented Oct 14, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

mukhrr commented Oct 7, 2025 •

edited

Loading

codecov Bot commented Oct 7, 2025 •

edited

Loading

jjcoffee commented Oct 9, 2025 •

edited

Loading