Skip to content

[Payment due @Krishna2323] Remove usage of IOUReportID in IOU actions#87530

Merged
carlosmiceli merged 44 commits into
mainfrom
youssef_cleanup_iou_data
Jun 15, 2026
Merged

[Payment due @Krishna2323] Remove usage of IOUReportID in IOU actions#87530
carlosmiceli merged 44 commits into
mainfrom
youssef_cleanup_iou_data

Conversation

@youssef-lr

@youssef-lr youssef-lr commented Apr 9, 2026

Copy link
Copy Markdown
Contributor

Explanation of Change

IOUReportID for actions of type CREATE has always been identical to the reportID in the DB column, it's extra data stored for no reason. I'm adding a fallback to use action?.reportID whenever we retrieve IOUReportID. Keeping it in the TS definition though as it is necessary for IOU actions with type=PAY.

I'm also cleaning up some code that assumes we're displaying IOU actions for a transaction from an expense reports. Currently, IOU actions are strictly only displayed for P2P group splits in the chat report, and tracked expenses in the selfDM. Keep this in mind while reviewing!

Fixed Issues

part of https://github.com/Expensify/Expensify/issues/601607
PROPOSAL:

Tests

  • Verify that no errors appear in the JS console
  1. Create p2p IOU request, verify the report and transaction thread all look fine
  2. Create p2p splits in a group chat, verify last message text of report, IOU reports, and transaction threads all look fine
  3. Verify the same for Per Diem & Distance requests
  4. Verify the same for the flows: Split/Merge expense.
  5. Verify tracked expenses in selfDM look good

Offline tests

Same as tests, but offline first, then turn on connection.

QA Steps

  • Verify that no errors appear in the JS console
  1. Create p2p IOU request, verify the report and transaction thread all look fine
  2. Create p2p splits in a group chat, verify last message text of report, IOU reports, and transaction threads all look fine
  3. Verify the same for Per Diem & Distance requests
  4. Verify the same for the flows: Split/Merge expense.
  5. Verify tracked expenses in selfDM look good

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: mWeb Chrome
iOS: Native
iOS: mWeb Safari
MacOS: Chrome / Safari

@youssef-lr youssef-lr changed the title wip Remove usage of IOUReportID in IOU actions Apr 13, 2026
const chatReportID = moneyRequestOriginalMessage?.IOUReportID ? report?.chatReportID : reportID;
// There is no single iouReport for bill splits, so only 1:1 requests require an iouReportID
const iouReportID = moneyRequestOriginalMessage?.IOUReportID?.toString();
children = (

@youssef-lr youssef-lr Apr 21, 2026

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.

children are always overwritten inside the check below if (report?.type === CONST.REPORT.TYPE.CHAT) {, becase IOU actions are now only displayed in selfDMs (track exenses) or for p2p split bills, and both always have a parent type=chat report. I've also deleted the MoneyRequestAction component completely.

@codecov

codecov Bot commented Apr 26, 2026

Copy link
Copy Markdown

Codecov Report

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

Files with missing lines Coverage Δ
src/hooks/useGetIOUReportFromReportAction.ts 100.00% <100.00%> (ø)
src/libs/actions/IOU/DeleteMoneyRequest.ts 75.90% <100.00%> (ø)
src/libs/actions/IOU/Hold.ts 93.20% <ø> (ø)
src/libs/actions/IOU/MoneyRequestBuilder.ts 89.08% <ø> (ø)
src/libs/actions/IOU/Split.ts 74.30% <ø> (ø)
src/libs/actions/Report/index.ts 69.19% <ø> (ø)
src/libs/actions/Transaction.ts 72.77% <ø> (ø)
...report/ContextMenu/BaseReportActionContextMenu.tsx 85.53% <100.00%> (ø)
src/pages/inbox/report/ReportActionItem.tsx 90.47% <100.00%> (ø)
...x/report/actionContents/IouReportActionMessage.tsx 100.00% <100.00%> (ø)
... and 8 more
... and 11 files with indirect coverage changes

@youssef-lr youssef-lr marked this pull request as ready for review April 28, 2026 00:57
@youssef-lr youssef-lr requested review from a team as code owners April 28, 2026 00:57
@melvin-bot melvin-bot Bot requested review from Beamanator and JmillsExpensify and removed request for a team April 28, 2026 00:57
@melvin-bot

melvin-bot Bot commented Apr 28, 2026

Copy link
Copy Markdown

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

@youssef-lr

Copy link
Copy Markdown
Contributor Author

Ready again @Krishna2323!

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

No product review required on this one.

@Krishna2323

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
    • 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_hybrid.mp4
Android: mWeb Chrome
android_mWeb.mp4
iOS: HybridApp
ios_hybrid.mp4
iOS: mWeb Safari
ios_mWeb.mp4
MacOS: Chrome / Safari
web_chrome.mp4

@Krishna2323

Copy link
Copy Markdown
Contributor

@youssef-lr there are a few failing checks to fix, but otherwise this looks good to me.

@youssef-lr

Copy link
Copy Markdown
Contributor Author

On it now

youssef-lr and others added 2 commits June 15, 2026 15:18
# Conflicts:
#	tests/ui/ReportActionItemTest.tsx
… refs

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>

@Krishna2323 Krishna2323 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!

@melvin-bot melvin-bot Bot requested a review from carlosmiceli June 15, 2026 15:50
@melvin-bot

melvin-bot Bot commented Jun 15, 2026

Copy link
Copy Markdown

@carlosmiceli 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 changed the title Remove usage of IOUReportID in IOU actions [Payment due @Krishna2323] Remove usage of IOUReportID in IOU actions Jun 15, 2026
@melvin-bot

melvin-bot Bot commented Jun 15, 2026

Copy link
Copy Markdown

🎯 @Krishna2323, thanks for reviewing and testing this PR! 🎉

A payment issue will be created for your review once this PR is deployed to production.
E/E issue linked to the PR - no internal issue.

If payment is not needed (e.g., regression PR review fix etc), react with 👎 to this comment to prevent the payment issue from being created.

@carlosmiceli carlosmiceli merged commit 0c3df3a into main Jun 15, 2026
38 checks passed
@carlosmiceli carlosmiceli deleted the youssef_cleanup_iou_data branch June 15, 2026 17:09
@OSBotify

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

Copy link
Copy Markdown
Contributor

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

@OSBotify

Copy link
Copy Markdown
Contributor

🚀 Deployed to staging by https://github.com/carlosmiceli in version: 9.4.8-0 🚀

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

Bundle Size Analysis (Sentry):

@MelvinBot

Copy link
Copy Markdown
Contributor

🤖 I reviewed the changes in this PR and no help site changes are required.

This is an internal code cleanup with no user-facing impact:

  • Removes redundant IOUReportID storage for CREATE IOU actions (it was always identical to reportID) and adds an action?.reportID fallback.
  • Cleans up code that assumed IOU actions are shown for expense-report transactions.
  • All changes are scoped to internal utilities (ReportUtils.ts, IOU actions), type definitions (OriginalMessage.ts), hooks, and tests.

There are no new features, no UI/label changes, and no src/languages/* copy updates — nothing that the customer-facing help articles under App/docs/articles document. No draft docs PR was created.

@youssef-lr, if you believe a behavior change here is actually surfaced to users and warrants a docs update, let me know which flow and I'll draft the help site PR.

@OSBotify

Copy link
Copy Markdown
Contributor

🚀 Deployed to staging by https://github.com/carlosmiceli in version: 9.4.8-0 🚀

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

Bundle Size Analysis (Sentry):

@OSBotify

Copy link
Copy Markdown
Contributor

🚀 Deployed to production by https://github.com/puneetlath in version: 9.4.8-3 🚀

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

@melvin-bot

melvin-bot Bot commented Jun 16, 2026

Copy link
Copy Markdown

🤖 Payment issue created: #93743

FitseTLT pushed a commit to FitseTLT/App that referenced this pull request Jun 17, 2026
Temporary client-side fallback to originalMessage.IOUReportID when
resolving the report an IOU action belongs to, restoring behavior
removed in PR Expensify#87530. The backend does not reliably send reportID on
IOU actions, so resolving purely from reportAction.reportID broke
editability (admins/managers could not edit fields on submitted
expense reports). Remove once the backend reliably includes reportID.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
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.

7 participants