Create messages in single transaction thread / Fix resolving whispers by aldo-expensify · Pull Request #68415 · Expensify/App

aldo-expensify · 2025-08-12T22:56:30Z

Explanation of Change

Re-implementing #67707 while making sure I don't break actionable whispers #68239

The previous PR broke whispers because the code resolving whispers was using the reportID which pointed to the expense report when the whisper was in an expense report with a single transaction, even if the whisper reportAction itself was really linked to the transaction thread.

This solves the issue by first trying to use originalReportID. originalReportID holds the correct reportID corresponding to the action being handled by PureReportActionItem.

Fixed Issues

$ https://github.com/Expensify/Expensify/issues/526433
PROPOSAL:

Tests

You need to disable the beta BETAS.NO_OPTIMISTIC_TRANSACTION_THREADS to test this properly

Messages are stored in the correct report:

Create an account in NewDot
Create a workspace
Create an expense report
Create an expense (transaction) in the expense report with any category that is NOT "Travel"
Send some messages in the expense report
Send a message like Set category to "Travel"
Verify that the category changes to "Travel" and an automatic response from Concierge appears:
Send another message
Create another transaction (the expense report doesn't have a single transaction anymore)
Verify that all messages sent before are now in the first transaction thread
Verify that the expense report conversation is empty

Mention whisper:

Create a workspace
Create an empty expense report
Create an expense report
Send a message mentioning another user (any email should work)
Verify you get a whisper from Concierge to invite the user
Dismiss the invitation clicking "Do nothing"
Add another message mentioning the same user
Verify you get a whisper from Concierge to invite the user
Create another expense report
Verify that all messages so far are now under the transaction thread of the first expense
Verify that dismissing the whisper from concierge works

Suggested category actionable whisper:

Create a workspace
Create an empty expense report
Create an expense with a like dsgdgrewerfwefaeg and don't select any category
Wait for Concierge to send a whisper suggesting category options
Click on a suggested category
Verify the actionable whisper disappears and Concierge adds a comment like set the category to "Other"
Create a new expense in the report
Verify that the messages went into the transaction thread and are not visible anymore from the expense report

Report mention whisper:

Create a workspace
Create an empty expense report
Create an expense within the report
Send a message referencing a room name, for example: #1232534543634522 hello
Verify a whisper appears
Click "No"
Verify the whisper dissappears correctly
Send another message referencing a room name, for example: #asdasda214234 asdsasf
Verify a new whisper appears
Create another expense
Verify your initial messages and the whisper is now under the transaction thread of the first transaction
Click "Yes" in the whisper
Verify the room is created

Verify that no errors appear in the JS console

Offline tests

QA Steps

Same as tests

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

MacOS: Desktop

aldo-expensify · 2025-08-13T00:04:18Z

+ * @param reportID - The report ID where the comment should be added and the report action should be updated
 * @param reportActionID - The specific report action ID to update
 * @param selectedCategory - The category selected by the user
 */
-function resolveConciergeCategoryOptions(reportID: string | undefined, actionReportID: string | undefined, reportActionID: string | undefined, selectedCategory: string) {
-    if (!reportID || !actionReportID || !reportActionID) {
+function resolveConciergeCategoryOptions(reportID: string | undefined, reportActionID: string | undefined, selectedCategory: string) {
+    if (!reportID || !reportActionID) {


See this: https://github.com/Expensify/App/pull/64115/files#r2271663629

aldo-expensify · 2025-08-13T01:31:38Z

Added @jayeshmangwani as C+ reviewer since he has some context and reviewed the PR #67707 that was later reverted

melvin-bot · 2025-08-13T01:31:46Z

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

…tion-thread-2

jayeshmangwani · 2025-08-13T15:53:09Z

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

Android: mWeb Chrome

mweb-chrome.mov

iOS: HybridApp

ios-1.mov

ios-2.mov

iOS: mWeb Safari

mweb-safari.mov

MacOS: Chrome / Safari

web-1.mov

web-2.mov

MacOS: Desktop

desktop.mov

aldo-expensify · 2025-08-13T17:05:06Z

@jayeshmangwani I didn't mention it, but you need to disable the beta BETAS.NO_OPTIMISTIC_TRANSACTION_THREADS to test this properly

…tiot n-thread-2

aldo-expensify · 2025-08-13T17:38:59Z

Pulled main to try to fix the failing performance test

jayeshmangwani · 2025-08-13T17:47:37Z

I didn't mention it, but you need to disable the beta BETAS.NO_OPTIMISTIC_TRANSACTION_THREADS to test this properly

Okay, Testing this by manually disabling this beta

jayeshmangwani

Changes work well, PR LGTM 🚀

melvin-bot · 2025-08-14T15:12:21Z

@blimpich 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 · 2025-08-14T15:12:24Z

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

An E/App issue has been created to issue payment here: #68544.

OSBotify · 2025-08-14T18:54:46Z

✋ 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-08-15T04:00:39Z

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

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

mitarachim · 2025-08-15T05:42:48Z

Hello @aldo-expensify @jayeshmangwani, QA team is experiencing an issue where category suggestions are not displayed when following the steps below using the Expensifail account:

Create a workspace
Create an empty expense report
Create an expense within the report without a category

Screen.Recording.2025-08-15.at.12.21.18.mov

Is this the expected behavior?

Please note that the issue is not reproducible when using a Gmail account

Screen.Recording.2025-08-15.at.12.18.16.mov

aldo-expensify · 2025-08-15T16:58:02Z

@mitarachim hmm it is not expected, but it sounds unrelated. I'll give it a try.

OSBotify · 2025-08-18T15:31:02Z

🚀 Deployed to production by https://github.com/AndrewGable in version: 9.1.95-1 🚀

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

WIP: create messages in single transaction thread

6b814a4

aldo-expensify self-assigned this Aug 12, 2025

WIP: pass the right reportID

29408ec

aldo-expensify commented Aug 13, 2025

View reviewed changes

Remove console log

2dabdd0

aldo-expensify requested a review from jayeshmangwani August 13, 2025 01:31

aldo-expensify marked this pull request as ready for review August 13, 2025 01:31

aldo-expensify requested a review from a team as a code owner August 13, 2025 01:31

melvin-bot Bot requested review from eh2077 and removed request for a team August 13, 2025 01:31

aldo-expensify changed the title ~~WIP: create messages in single transaction thread~~ Create messages in single transaction thread / Fix resolving whispers Aug 13, 2025

aldo-expensify removed the request for review from eh2077 August 13, 2025 02:10

Merge branch 'main' of github.com:Expensify/App into aldo_use-transac…

9743d5b

…tion-thread-2

Merge branch 'main' of github.com:Expensify/App into aldo_use-transac…

ef35e5a

…tiot n-thread-2

jayeshmangwani mentioned this pull request Aug 14, 2025

Payment issue for E/App PR#67707 #68151

Closed

jayeshmangwani approved these changes Aug 14, 2025

View reviewed changes

melvin-bot Bot requested a review from blimpich August 14, 2025 15:12

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

Payment issue for E/App PR#68415 #68544

Closed

blimpich approved these changes Aug 14, 2025

View reviewed changes

blimpich merged commit e3338fc into main Aug 14, 2025
25 checks passed

blimpich deleted the aldo_use-transaction-thread-2 branch August 14, 2025 18:45

OSBotify mentioned this pull request Aug 15, 2025

Deploy Checklist: New Expensify 2025-08-15 #68569

Closed

44 tasks

mitarachim mentioned this pull request Aug 15, 2025

[$250] Expense- Incomplete message context menu & unresponsive whisper after deleting expense offline #68575

Closed

8 tasks

neil-marcellini mentioned this pull request Aug 15, 2025

[CP Staging] Revert PR 68415 #68598

Merged

51 tasks

aldo-expensify mentioned this pull request Aug 15, 2025

[$250] Back button reloads current report instead of returning to Reports list after clicking "New messages" #68591

Closed

16 tasks

carlosmiceli mentioned this pull request Aug 15, 2025

[Due for payment 2025-08-26] Expense - Message appears as a thread reply of "mark as paid" message in the expense report #68571

Closed

8 tasks

aldo-expensify mentioned this pull request Aug 18, 2025

Add new comments to transaction thread for single transaction expense #68692

Merged

51 tasks

Conversation

aldo-expensify commented Aug 12, 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!

aldo-expensify Aug 13, 2025

Choose a reason for hiding this comment

Uh oh!

aldo-expensify commented Aug 13, 2025

Uh oh!

melvin-bot Bot commented Aug 13, 2025

Uh oh!

jayeshmangwani commented Aug 13, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

aldo-expensify commented Aug 13, 2025

Uh oh!

aldo-expensify commented Aug 13, 2025

Uh oh!

jayeshmangwani commented Aug 13, 2025

Uh oh!

jayeshmangwani left a comment

Choose a reason for hiding this comment

Uh oh!

melvin-bot Bot commented Aug 14, 2025

Uh oh!

melvin-bot Bot commented Aug 14, 2025

Uh oh!

Uh oh!

OSBotify commented Aug 14, 2025

Uh oh!

OSBotify commented Aug 15, 2025

Uh oh!

mitarachim commented Aug 15, 2025

Uh oh!

aldo-expensify commented Aug 15, 2025

Uh oh!

OSBotify commented Aug 18, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

aldo-expensify commented Aug 12, 2025 •

edited

Loading

jayeshmangwani commented Aug 13, 2025 •

edited

Loading