Skip to content

Commit f82128f

Browse files
authored
Merge pull request Expensify#86104 from abbasifaizan70/84252
84252: Track distance - Amount and Rate are not greyed out after editing in offline mode
2 parents 0cc58e9 + 2eddc32 commit f82128f

1 file changed

Lines changed: 8 additions & 0 deletions

File tree

src/libs/actions/IOU/index.ts

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4330,6 +4330,7 @@ function getUpdateMoneyRequestParams(params: GetUpdateMoneyRequestParamsType): U
43304330
key: `${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`,
43314331
value: {
43324332
...updatedTransaction,
4333+
pendingFields,
43334334
errorFields: null,
43344335
reportID: newTransactionReportID ?? updatedTransaction?.reportID,
43354336
},
@@ -4486,6 +4487,7 @@ function getUpdateMoneyRequestParams(params: GetUpdateMoneyRequestParamsType): U
44864487
const hasModifiedReimbursable = 'reimbursable' in transactionChanges;
44874488
const hasModifiedTaxCode = 'taxCode' in transactionChanges;
44884489
const hasModifiedDate = 'date' in transactionChanges;
4490+
const hasModifiedDistance = 'distance' in transactionChanges;
44894491
const hasModifiedAttendees = 'attendees' in transactionChanges;
44904492

44914493
const isInvoice = isInvoiceReportReportUtils(iouReport);
@@ -4501,6 +4503,7 @@ function getUpdateMoneyRequestParams(params: GetUpdateMoneyRequestParamsType): U
45014503
hasModifiedComment ||
45024504
hasModifiedMerchant ||
45034505
hasModifiedDistanceRate ||
4506+
hasModifiedDistance ||
45044507
hasModifiedDate ||
45054508
hasModifiedCurrency ||
45064509
hasModifiedAmount ||
@@ -4522,6 +4525,11 @@ function getUpdateMoneyRequestParams(params: GetUpdateMoneyRequestParamsType): U
45224525
if (hasPendingWaypoints) {
45234526
optimisticViolations = optimisticViolations.filter((violation) => violation.name !== CONST.VIOLATIONS.NO_ROUTE);
45244527
}
4528+
if (hasModifiedDistanceRate || hasModifiedDistance) {
4529+
optimisticViolations = optimisticViolations.filter(
4530+
(violation) => !(violation.name === CONST.VIOLATIONS.MODIFIED_AMOUNT && violation.data?.type === CONST.MODIFIED_AMOUNT_VIOLATION_DATA.DISTANCE),
4531+
);
4532+
}
45254533

45264534
const violationsOnyxData = ViolationsUtils.getViolationsOnyxData(
45274535
updatedTransaction,

0 commit comments

Comments
 (0)