Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Deep merge transaction for Distance request #32437

Merged
merged 4 commits into from
Dec 26, 2023
Merged

Deep merge transaction for Distance request #32437

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
caea8cd
Deep merge transaction for Distance request
esh-g Dec 4, 2023
6e403d5
fix lint
esh-g Dec 4, 2023
46a838d
fix lint
esh-g Dec 4, 2023
4a84e14
Merge branch 'main' into distance-transaction-deep-merge
esh-g Dec 19, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 2 additions & 5 deletions src/libs/actions/IOU.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import Str from 'expensify-common/lib/str';
import lodashGet from 'lodash/get';
import lodashHas from 'lodash/has';
import Onyx from 'react-native-onyx';
import OnyxUtils from 'react-native-onyx/lib/utils';
import _ from 'underscore';
import ReceiptGeneric from '@assets/images/receipt-generic.png';
import * as API from '@libs/API';
Expand Down Expand Up @@ -681,11 +682,7 @@ function getMoneyRequestInformation(
// to remind me to do this.
const existingTransaction = allTransactionDrafts[`${ONYXKEYS.COLLECTION.TRANSACTION_DRAFT}${CONST.IOU.OPTIMISTIC_TRANSACTION_ID}`];
if (existingTransaction && existingTransaction.iouRequestType === CONST.IOU.REQUEST_TYPE.DISTANCE) {
optimisticTransaction = {
...optimisticTransaction,
...existingTransaction,
transactionID: optimisticTransaction.transactionID,
};
optimisticTransaction = OnyxUtils.fastMerge(existingTransaction, optimisticTransaction);
}

// STEP 4: Build optimistic reportActions. We need:
Expand Down
Loading