Support one transaction thread report creation if it wasn't created optimistically#68290
Merged
roryabraham merged 13 commits intoExpensify:mainfrom Aug 18, 2025
Conversation
VickyStash
changed the title
|
@hungvu193 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] |
Contributor
|
I'll review today! |
hungvu193
reviewed
Aug 13, 2025
Contributor
|
I'm still testing, will let you know if I find any issues |
Contributor
Reviewer Checklist
Screenshots/VideosAndroid: HybridAppandroid.movAndroid: mWeb ChromeScreen.Recording.2025-08-13.at.23.41.18.moviOS: HybridAppScreen.Recording.2025-08-13.at.23.37.00.moviOS: mWeb SafariScreen.Recording.2025-08-13.at.22.46.04.movScreen.Recording.2025-08-13.at.22.46.04.movMacOS: Chrome / SafariScreen.Recording.2025-08-13.at.22.37.25.movScreen.Recording.2025-08-13.at.22.39.14.movMacOS: DesktopScreen.Recording.2025-08-13.at.22.40.54.mov |
hungvu193
approved these changes
Aug 13, 2025
Contributor
Author
|
@roryabraham can you check this one please? Also, I'm going to be OOO tomorrow! |
roryabraham
requested changes
Aug 14, 2025
Contributor
roryabraham
left a comment
roryabraham
left a comment
There was a problem hiding this comment.
Please add automated tests covering the actions you updated
src/libs/actions/IOU.ts
Outdated
| onyxMethod: Onyx.METHOD.MERGE, | ||
| key: `${ONYXKEYS.COLLECTION.REPORT}${reportID}`, | ||
| value: { | ||
| ...report, |
Contributor
There was a problem hiding this comment.
Why spread the report here? Onyx.merge should be able to update pendingFields without needing to modify the whole report. In the case where it's just created optimistically, we should probably use Onyx.set as it's more idiomatic for a plain insert.
Contributor
There was a problem hiding this comment.
@VickyStash you're still doing an avoidable shallow copy here:
diff --git a/src/libs/actions/IOU.ts b/src/libs/actions/IOU.ts
index 3ff022a5f49..b80bd2c02f1 100644
--- a/src/libs/actions/IOU.ts
+++ b/src/libs/actions/IOU.ts
@@ -10934,6 +10934,8 @@ function putOnHold(transactionID: string, comment: string, initialReportID: stri
const moneyRequestReport = getReportOrDraftReport(transaction?.reportID);
report = buildTransactionThread(iouAction, moneyRequestReport, undefined, reportID);
}
+ // at this point, report should be defined, cast it as such
+ report ??= {} as OnyxTypes.Report;
const optimisticCreatedAction = buildOptimisticCreatedReportAction(currentUserEmail);
const parentReportActionOptimistic = getOptimisticDataForParentReportAction(report, createdReportActionComment.created, CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD);
@@ -11026,23 +11028,21 @@ function putOnHold(transactionID: string, comment: string, initialReportID: stri
onyxMethod: Onyx.METHOD.MERGE,
key: `${ONYXKEYS.COLLECTION.REPORT}${reportID}`,
value: {
- lastVisibleActionCreated: report?.lastVisibleActionCreated,
+ lastVisibleActionCreated: report.lastVisibleActionCreated,
},
},
];
// If the transaction thread report wasn't created before, we create it optimistically
if (!initialReportID) {
+ report.pendingFields = {
+ createChat: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD,
+ };
optimisticData.push(
{
onyxMethod: Onyx.METHOD.SET,
key: `${ONYXKEYS.COLLECTION.REPORT}${reportID}`,
- value: {
- ...report,
- pendingFields: {
- createChat: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD,
- },
- },
+ value: report,
},
{
onyxMethod: Onyx.METHOD.MERGE,
@@ -11062,13 +11062,13 @@ function putOnHold(transactionID: string, comment: string, initialReportID: stri
// We link the IOU action to the new transaction thread by setting childReportID optimistically
optimisticData.push({
onyxMethod: Onyx.METHOD.MERGE,
- key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${report?.parentReportID}`,
+ key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${report.parentReportID}`,
value: {[iouAction?.reportActionID]: {childReportID: reportID, childType: CONST.REPORT.TYPE.CHAT}},
});
// We reset the childReportID if the request fails
failureData.push({
onyxMethod: Onyx.METHOD.MERGE,
- key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${report?.parentReportID}`,
+ key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${report.parentReportID}`,
value: {[iouAction?.reportActionID]: {childReportID: null, childType: null}},
});
}
Contributor
There was a problem hiding this comment.
Also, can we give report a more specific name? we've got iouReport, is this a chatReport? workspaceChatReport? something else?
This was referenced Aug 18, 2025
iwiznia
previously approved these changes
Aug 18, 2025
Contributor
iwiznia
left a comment
iwiznia
left a comment
There was a problem hiding this comment.
Agree on set/vs merge comment from Rory, but other than that looks good, so approving
roryabraham
requested changes
Aug 18, 2025
src/libs/actions/IOU.ts
Outdated
| onyxMethod: Onyx.METHOD.MERGE, | ||
| key: `${ONYXKEYS.COLLECTION.REPORT}${reportID}`, | ||
| value: { | ||
| ...report, |
Contributor
There was a problem hiding this comment.
@VickyStash you're still doing an avoidable shallow copy here:
diff --git a/src/libs/actions/IOU.ts b/src/libs/actions/IOU.ts
index 3ff022a5f49..b80bd2c02f1 100644
--- a/src/libs/actions/IOU.ts
+++ b/src/libs/actions/IOU.ts
@@ -10934,6 +10934,8 @@ function putOnHold(transactionID: string, comment: string, initialReportID: stri
const moneyRequestReport = getReportOrDraftReport(transaction?.reportID);
report = buildTransactionThread(iouAction, moneyRequestReport, undefined, reportID);
}
+ // at this point, report should be defined, cast it as such
+ report ??= {} as OnyxTypes.Report;
const optimisticCreatedAction = buildOptimisticCreatedReportAction(currentUserEmail);
const parentReportActionOptimistic = getOptimisticDataForParentReportAction(report, createdReportActionComment.created, CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD);
@@ -11026,23 +11028,21 @@ function putOnHold(transactionID: string, comment: string, initialReportID: stri
onyxMethod: Onyx.METHOD.MERGE,
key: `${ONYXKEYS.COLLECTION.REPORT}${reportID}`,
value: {
- lastVisibleActionCreated: report?.lastVisibleActionCreated,
+ lastVisibleActionCreated: report.lastVisibleActionCreated,
},
},
];
// If the transaction thread report wasn't created before, we create it optimistically
if (!initialReportID) {
+ report.pendingFields = {
+ createChat: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD,
+ };
optimisticData.push(
{
onyxMethod: Onyx.METHOD.SET,
key: `${ONYXKEYS.COLLECTION.REPORT}${reportID}`,
- value: {
- ...report,
- pendingFields: {
- createChat: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD,
- },
- },
+ value: report,
},
{
onyxMethod: Onyx.METHOD.MERGE,
@@ -11062,13 +11062,13 @@ function putOnHold(transactionID: string, comment: string, initialReportID: stri
// We link the IOU action to the new transaction thread by setting childReportID optimistically
optimisticData.push({
onyxMethod: Onyx.METHOD.MERGE,
- key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${report?.parentReportID}`,
+ key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${report.parentReportID}`,
value: {[iouAction?.reportActionID]: {childReportID: reportID, childType: CONST.REPORT.TYPE.CHAT}},
});
// We reset the childReportID if the request fails
failureData.push({
onyxMethod: Onyx.METHOD.MERGE,
- key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${report?.parentReportID}`,
+ key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${report.parentReportID}`,
value: {[iouAction?.reportActionID]: {childReportID: null, childType: null}},
});
}
src/libs/actions/IOU.ts
Outdated
| onyxMethod: Onyx.METHOD.MERGE, | ||
| key: `${ONYXKEYS.COLLECTION.REPORT}${reportID}`, | ||
| value: { | ||
| ...report, |
Contributor
There was a problem hiding this comment.
Also, can we give report a more specific name? we've got iouReport, is this a chatReport? workspaceChatReport? something else?
Contributor
Author
|
Reassure test is failing on other PRs as well, probably related to this PR. |
Contributor
|
Merging through failed Reassure, as discussed here: https://expensify.slack.com/archives/C07J32337/p1755536660501719?thread_ts=1755531412.317049&cid=C07J32337 |
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. |
Contributor
|
@VickyStash thanks for noting that my PR caused reassure failng jobs. Here is PR that resolves that #68726 |
67 tasks
Contributor
|
🚀 Deployed to staging by https://github.com/roryabraham in version: 9.1.97-0 🚀
|
16 tasks
Contributor
|
🚀 Deployed to production by https://github.com/AndrewGable in version: 9.1.97-5 🚀
|
| const requestParentReportAction = useMemo(() => { | ||
| if (isMoneyRequestReport || isInvoiceReport) { | ||
| if (transactionThreadReportID === CONST.FAKE_REPORT_ID) { | ||
| return Object.values(childReportActions ?? {}).find((action) => action.actionName === CONST.REPORT.ACTIONS.TYPE.IOU); |
Contributor
There was a problem hiding this comment.
Came from this issue
We need to filter deleted reportActions to fix this issue
More context here
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
7 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Explanation of Change
This PR implements:
Fixed Issues
$ #67885
PROPOSAL: N/A
Tests
noOptimisticTransactionThreadsbeta.Block transaction thread report creationtoggle (you can also turn it on in the troubleshoot modal CMD + D)Offline tests
Same, as in the Tests steps
QA Steps
// TODO: These must be filled out, or the issue title must include "[No QA]."
Same, as in the Tests steps
PR Author Checklist
### Fixed Issuessection aboveTestssectionOffline stepssectionQA stepssectioncanBeMissingparam foruseOnyxtoggleReportand notonIconClick)src/languages/*files and using the translation methodSTYLE.md) were followedAvatar, I verified the components usingAvatarare working as expected)StyleUtils.getBackgroundAndBorderStyle(theme.componentBG))Avataris modified, I verified thatAvataris working as expected in all cases)Designlabel and/or tagged@Expensify/designso the design team can review the changes.ScrollViewcomponent to make it scrollable when more elements are added to the page.mainbranch was merged into this PR after a review, I tested again and verified the outcome was still expected according to theTeststeps.Screenshots/Videos
Android: Native
android.mp4
Android: mWeb Chrome
android_web.mp4
iOS: Native
ios.mp4
iOS: mWeb Safari
ios_web.mp4
MacOS: Chrome / Safari
web.mp4
MacOS: Desktop
desktop.mp4