Merged
Conversation
This was referenced Aug 8, 2025
Closed
8 tasks
8 tasks
8 tasks
8 tasks
This was referenced Aug 8, 2025
16 tasks
16 tasks
Contributor
|
Here's another issue. Can't merge tracked expense with iou receipt expense |
16 tasks
Contributor
|
🚀 Deployed to production by https://github.com/marcaaron in version: 9.1.92-5 🚀
|
bernhardoj
reviewed
Nov 13, 2025
| const {isOffline} = useNetwork(); | ||
| const [targetTransaction] = useOnyx(`${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`, {canBeMissing: false}); | ||
| const [report] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${getTransactionThreadReportID(targetTransaction)}`, {canBeMissing: false}); | ||
| const [policy] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY}${report?.policyID}`, {canBeMissing: false}); |
Contributor
There was a problem hiding this comment.
Not all report has policyID, which causes the onyx data can be missing, but canBeMissing is set to false here causing #73418
8 tasks
7 tasks
7 tasks
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
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
Design doc: https://docs.google.com/document/d/1RXJyOVsX2AgKWNViLSxNm3PH2bSnJCuo6K_jcOxUGuo/edit?pli=1&tab=t.0#heading=h.4ipw72mqhwe3
Fixed Issues
$ #65574
PROPOSAL:
Tests
Same as QA Steps
Offline tests
Same as QA Steps
QA Steps
// TODO: These must be filled out, or the issue title must include "[No QA]."
Case 1: Merge cash expense and IOU
Case 2: Merge scan expense with manual expense
Case 3: Merge expense from Self DM
Case 4: Merge open expense from a report that contains multiple expenses
Case 5: Merge processing expense
Case 6: Merge card expense and cash expense
Pre-requisite: Connect a third-party card to your submitter account
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
Screen.Recording.2025-07-25.at.07.25.24.android.mov
Android: mWeb Chrome
Screen.Recording.2025-07-25.at.07.17.17.android.chrome.mov
iOS: Native
Screen.Recording.2025-07-25.at.09.04.21.ios.mp4
iOS: mWeb Safari
Screen.Recording.2025-07-25.at.07.37.34.ios.safari.mov
MacOS: Chrome / Safari
Screen.Recording.2025-07-25.at.06.00.48.web.mov
MacOS: Desktop
Screen.Recording.2025-07-25.at.06.24.54.desktop.mov