Skip to content

Commit fea1592

Browse files
committed
fix: resolved comments
1 parent 1b7fa95 commit fea1592

3 files changed

Lines changed: 6 additions & 5 deletions

File tree

src/libs/ReportUtils.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4482,7 +4482,7 @@ function getTransactionReportName({
44824482
}
44834483

44844484
const report = getReportOrDraftReport(transaction?.reportID, reports);
4485-
const amount = getTransactionAmount(transaction, !isEmptyObject(report) && isExpenseReport(report)) ?? 0;
4485+
const amount = getTransactionAmount(transaction, !isEmptyObject(report) && isExpenseReport(report), transaction?.reportID === CONST.REPORT.UNREPORTED_REPORT_ID) ?? 0;
44864486
const formattedAmount = convertToDisplayString(amount, getCurrency(transaction)) ?? '';
44874487
const comment = getMerchantOrDescription(transaction);
44884488

@@ -4537,7 +4537,7 @@ function getReportPreviewMessage(
45374537
return translateLocal('iou.receiptMissingDetails');
45384538
}
45394539

4540-
const amount = getTransactionAmount(linkedTransaction, !isEmptyObject(report) && isExpenseReport(report)) ?? 0;
4540+
const amount = getTransactionAmount(linkedTransaction, !isEmptyObject(report) && isExpenseReport(report), linkedTransaction?.reportID === CONST.REPORT.UNREPORTED_REPORT_ID) ?? 0;
45414541
const formattedAmount = convertToDisplayString(amount, getCurrency(linkedTransaction)) ?? '';
45424542
return translateLocal('iou.didSplitAmount', {formattedAmount, comment: getMerchantOrDescription(linkedTransaction)});
45434543
}
@@ -4559,7 +4559,7 @@ function getReportPreviewMessage(
45594559
return translateLocal('iou.receiptMissingDetails');
45604560
}
45614561

4562-
const amount = getTransactionAmount(linkedTransaction, !isEmptyObject(report) && isExpenseReport(report)) ?? 0;
4562+
const amount = getTransactionAmount(linkedTransaction, !isEmptyObject(report) && isExpenseReport(report), linkedTransaction?.reportID === CONST.REPORT.UNREPORTED_REPORT_ID) ?? 0;
45634563
const formattedAmount = convertToDisplayString(amount, getCurrency(linkedTransaction)) ?? '';
45644564
return translateLocal('iou.trackedAmount', {formattedAmount, comment: getMerchantOrDescription(linkedTransaction)});
45654565
}
@@ -9242,7 +9242,7 @@ function getIOUReportActionDisplayMessage(reportAction: OnyxEntry<ReportAction>,
92429242
return translateLocal(translationKey, {amount: formattedAmount, payer: '', last4Digits});
92439243
}
92449244

9245-
const amount = getTransactionAmount(transaction, !isEmptyObject(iouReport) && isExpenseReport(iouReport)) ?? 0;
9245+
const amount = getTransactionAmount(transaction, !isEmptyObject(iouReport) && isExpenseReport(iouReport), transaction?.reportID === CONST.REPORT.UNREPORTED_REPORT_ID) ?? 0;
92469246
const formattedAmount = convertToDisplayString(amount, getCurrency(transaction)) ?? '';
92479247
const isRequestSettled = isSettled(IOUReportID);
92489248
const isApproved = isReportApproved({report: iouReport});

src/libs/TransactionUtils/index.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -411,6 +411,7 @@ function getUpdatedTransaction({
411411
}
412412
if (Object.hasOwn(transactionChanges, 'amount') && typeof transactionChanges.amount === 'number') {
413413
updatedTransaction.modifiedAmount = isFromExpenseReport || isUnReportedExpense ? -transactionChanges.amount : transactionChanges.amount;
414+
shouldStopSmartscan = true;
414415
}
415416
if (Object.hasOwn(transactionChanges, 'currency')) {
416417
updatedTransaction.modifiedCurrency = transactionChanges.currency;

tests/unit/IOUUtilsTest.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -384,7 +384,7 @@ describe('Check valid amount for IOU/Expense request', () => {
384384
expect(expenseAmount).toBeLessThan(0);
385385
});
386386

387-
test('Return correct unreported transaction amount with negative sign', () => {
387+
test('Unreported expense amount should retain negative sign', () => {
388388
const unreportedTransaction = TransactionUtils.buildOptimisticTransaction({
389389
transactionParams: {
390390
amount: 100,

0 commit comments

Comments
 (0)