[CP Staging][Better Expense Report View] Fix Send Money flow issue caused by excluding pay from one transaction thread logic by JakubKorytko · Pull Request #63648 · Expensify/App

JakubKorytko · 2025-06-06T12:35:48Z

Explanation of Change

In #63546 I stated that:

If the original message is a 'pay' IOU, it shouldn't be added to the transaction count.

This is true for every report except the Send Money flow, as in such a report, pay is the only IOU action and it is used to obtain expense information. This PR fixes an issue caused by the linked PR by checking whether the report is in the specified flow; if so, the action is counted as a transaction.

Fixed Issues

$ #63619
PROPOSAL: N/A

Tests

Open Expensify app.
Open 1:1 DM.
Click + > Pay user.
Enter amount > Next.
Click Pay elsewhere.
Click on the expense preview.
Verify that Send Money expense preview is displayed.

Offline tests

Same as tests.

QA Steps

Same as tests.

PR Author Checklist

Screenshots/Videos

Android: Native

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

Web.mov

MacOS: Desktop

melvin-bot · 2025-06-06T12:47:03Z

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

Ollyws · 2025-06-06T12:52:44Z

Testing now..

mountiny · 2025-06-06T12:56:22Z

src/libs/ReportActionsUtils.ts

+    const {type, chatType, parentReportID, parentReportActionID} = allReports?.[`${ONYXKEYS.COLLECTION.REPORT}${chatReportID}`] ?? {};
+
+    // ...and can only be triggered on DM chats
+    const isDM = type === CONST.REPORT.TYPE.CHAT && !chatType && !(parentReportID && parentReportActionID);


is there no helper method for this?

There is a simple helper isDM that does exactly this in ReportUtils but can't be imported due to circular import. Thought it would be better to just use the code directly instead of changing the structure of these files because it is rather simple check.

mountiny · 2025-06-06T12:56:59Z

src/libs/ReportActionsUtils.ts

+    // ...which is 'pay'...
+    const isFirstActionPay = getOriginalMessage(iouActions.at(0))?.type === CONST.IOU.REPORT_ACTION_TYPE.PAY;
+
+    const {type, chatType, parentReportID, parentReportActionID} = allReports?.[`${ONYXKEYS.COLLECTION.REPORT}${chatReportID}`] ?? {};


Please pass these props directly or pass the report object itself, this is not a pure function

mountiny · 2025-06-06T12:57:28Z

src/libs/ReportActionsUtils.ts

        return;
    }

+    const sendMoneyFlowID = getSendMoneyFlowOneTransactionThreadID(reportActions, report?.chatReportID);


even here se should pass the full report

Ollyws · 2025-06-06T14:51:19Z

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

01_Android_Native.mp4

Android: mWeb Chrome

02_Android_Chrome.mp4

iOS: HybridApp

03_iOS_Native.mp4

iOS: mWeb Safari

04_iOS_Safari.mp4

MacOS: Chrome / Safari

05_MacOS_Chrome.mp4

MacOS: Desktop

06_MacOS_Desktop.mp4

Ollyws

Tests well, approving to keep things moving.
Happy to test any further changes, just give me a ping.

JakubKorytko · 2025-06-06T15:00:52Z

For some context, discussion here: https://swmansion.slack.com/archives/C01GTK53T8Q/p1749216539285459?thread_ts=1749184956.665079&cid=C01GTK53T8Q

JakubKorytko · 2025-06-09T06:32:33Z

@mountiny comments about pure functions will be handled in #63731 to unblock deploy blocker.

We're making a followup PR to handle impure function

OSBotify · 2025-06-09T06:44:09Z

✋ This PR was not deployed to staging yet because QA is ongoing. It will be automatically deployed to staging after the next production release.

…-money-flow [Better Expense Report View] Fix Send Money flow issue caused by excluding pay from one transaction thread logic (cherry picked from commit 0e2b131) (cherry-picked to staging by mountiny)

github-actions · 2025-06-09T07:56:37Z

🚀 Cherry-picked to staging by https://github.com/mountiny in version: 9.1.60-4 🚀

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

@Expensify/applauseleads please QA this PR and check it off on the deploy checklist if it passes.

github-actions · 2025-06-09T15:02:13Z

🚀 Cherry-picked to staging by https://github.com/mountiny in version: 9.1.62-0 🚀

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

@Expensify/applauseleads please QA this PR and check it off on the deploy checklist if it passes.

github-actions · 2025-06-09T16:33:12Z

🚀 Deployed to production by https://github.com/Julesssss in version: 9.1.62-0 🚀

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

…3648-code-to-new-onyx-rule Adjust #63648 PR code to new pure Onyx functions rule

JakubKorytko added 2 commits June 6, 2025 14:07

Add getSendMoneyFlowOneTransactionThreadID function

bd52982

Add tests for getSendMoneyFlowOneTransactionThreadID

72cc40a

JakubKorytko mentioned this pull request Jun 6, 2025

[Better Expense Report Preview] Fix one-expense report view not displaying properly when we have one expense that was paid #63546

Merged

48 tasks

JakubKorytko marked this pull request as ready for review June 6, 2025 12:46

JakubKorytko requested a review from a team as a code owner June 6, 2025 12:46

melvin-bot bot requested review from Ollyws and removed request for a team June 6, 2025 12:47

JakubKorytko mentioned this pull request Jun 6, 2025

[Due for payment 2025-06-17] [Due for payment 2025-06-16] [Awaiting payment] Expense - Expense report is empty after paying someone #63619

Closed

8 tasks

mountiny assigned JakubKorytko Jun 6, 2025

mountiny reviewed Jun 6, 2025

View reviewed changes

mountiny previously requested changes Jun 6, 2025

View reviewed changes

Ollyws approved these changes Jun 6, 2025

View reviewed changes

melvin-bot bot requested a review from MonilBhavsar June 6, 2025 14:52

MonilBhavsar approved these changes Jun 9, 2025

View reviewed changes

Merge branch 'main' into korytko/fix-send-money-flow

c63bb04

JakubKorytko mentioned this pull request Jun 9, 2025

Adjust #63648 PR code to new pure Onyx functions rule #63731

Merged

48 tasks

MonilBhavsar merged commit 0e2b131 into Expensify:main Jun 9, 2025
17 checks passed

MonilBhavsar changed the title ~~[Better Expense Report View] Fix Send Money flow issue caused by excluding pay from one transaction thread logic~~ [CP Staging][Better Expense Report View] Fix Send Money flow issue caused by excluding pay from one transaction thread logic Jun 9, 2025

OSBotify added the CP Staging marks PRs that have been CP'd to staging label Jun 9, 2025

github-actions bot mentioned this pull request Jun 9, 2025

Deploy Checklist: New Expensify 2025-06-05 #63609

Closed

65 tasks

VickyStash mentioned this pull request Jun 12, 2025

[Due for payment 2025-11-03] [$125] Do not create optimistic transaction thread report on RequestMoney #58828

Closed

aldo-expensify added a commit that referenced this pull request Jun 12, 2025

Merge pull request #63731 from software-mansion-labs/korytko/adjust-6…

cab551a

…3648-code-to-new-onyx-rule Adjust #63648 PR code to new pure Onyx functions rule

dmkt9 mentioned this pull request Jul 23, 2025

[$250] Expense - After paying user via "+ > Pay" and changing workspace, expense details disappear #65322

Closed

8 tasks

Conversation

JakubKorytko commented Jun 6, 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 Jun 6, 2025

Uh oh!

Ollyws commented Jun 6, 2025

Uh oh!

mountiny Jun 6, 2025

Choose a reason for hiding this comment

Uh oh!

JakubKorytko Jun 6, 2025

Choose a reason for hiding this comment

Uh oh!

mountiny Jun 6, 2025

Choose a reason for hiding this comment

Uh oh!

mountiny Jun 6, 2025

Choose a reason for hiding this comment

Uh oh!

Ollyws commented Jun 6, 2025

Reviewer Checklist

Screenshots/Videos

Uh oh!

Ollyws left a comment • 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!

JakubKorytko commented Jun 6, 2025

Uh oh!

JakubKorytko commented Jun 9, 2025

Uh oh!

Uh oh!

OSBotify commented Jun 9, 2025

Uh oh!

github-actions bot commented Jun 9, 2025

Uh oh!

github-actions bot commented Jun 9, 2025

Uh oh!

github-actions bot commented Jun 9, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

JakubKorytko commented Jun 6, 2025 •

edited

Loading

Ollyws left a comment •

edited

Loading