Skip to content

Commit 4baa536

Browse files
committed
fix: track expense ignores tax
1 parent c89c413 commit 4baa536

1 file changed

Lines changed: 5 additions & 4 deletions

File tree

src/pages/iou/request/step/confirmation/useExpenseSubmission.ts

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -218,11 +218,12 @@ function useExpenseSubmission(params: UseExpenseSubmissionParams) {
218218
const parentReportAction = useParentReportAction(viewTourTaskReport);
219219

220220
// Derived values from transaction
221+
const isTrackExpense = iouType === CONST.IOU.TYPE.TRACK;
221222
const isGPSDistanceRequest = isGPSDistanceRequestTransactionUtils(transaction);
222223
const customUnitRateID = getRateID(transaction) ?? '';
223224
const transactionDistance = isManualDistanceRequest || isOdometerDistanceRequest || isGPSDistanceRequest ? (transaction?.comment?.customUnit?.quantity ?? undefined) : undefined;
224225
const defaultTaxCode = getDefaultTaxCode(policy, transaction);
225-
const transactionTaxCode = isTaxTrackingEnabled(isPolicyExpenseChat || isUnreported, policy, isDistanceRequest, isPerDiemRequest, isTimeRequest)
226+
const transactionTaxCode = isTaxTrackingEnabled(isPolicyExpenseChat || isUnreported || isTrackExpense, policy, isDistanceRequest, isPerDiemRequest, isTimeRequest)
226227
? ((transaction?.taxCode ? transaction?.taxCode : defaultTaxCode) ?? '')
227228
: '';
228229
const transactionTaxAmount = transaction?.taxAmount ?? 0;
@@ -365,7 +366,7 @@ function useExpenseSubmission(params: UseExpenseSubmissionParams) {
365366
if (!participant || isEmptyObject(transaction.comment) || isEmptyObject(transaction.comment.customUnit)) {
366367
return;
367368
}
368-
if (iouType === CONST.IOU.TYPE.TRACK) {
369+
if (isTrackExpense) {
369370
submitPerDiemExpenseForSelfDM({
370371
selfDMReport,
371372
policy,
@@ -610,7 +611,7 @@ function useExpenseSubmission(params: UseExpenseSubmissionParams) {
610611

611612
// Telemetry spans (SPAN_SUBMIT_EXPENSE, SPAN_SUBMIT_TO_DESTINATION_VISIBLE)
612613
// are started by SubmitExpenseOrchestrator before calling createTransaction.
613-
if (iouType !== CONST.IOU.TYPE.TRACK && isDistanceRequest && !isMovingTransactionFromTrackExpense && !isUnreported) {
614+
if (!isTrackExpense && isDistanceRequest && !isMovingTransactionFromTrackExpense && !isUnreported) {
614615
createDistanceRequest(iouType === CONST.IOU.TYPE.SPLIT ? splitParticipants : selectedParticipantsArg, trimmedComment, shouldHandleNavigation);
615616
markSubmitExpenseEnd();
616617
return;
@@ -756,7 +757,7 @@ function useExpenseSubmission(params: UseExpenseSubmissionParams) {
756757
return;
757758
}
758759

759-
if (!isPerDiemRequest && (iouType === CONST.IOU.TYPE.TRACK || isCategorizingTrackExpense || isSharingTrackExpense)) {
760+
if (!isPerDiemRequest && (isTrackExpense || isCategorizingTrackExpense || isSharingTrackExpense)) {
760761
if (Object.values(receiptFiles).filter((receipt) => !!receipt).length && transaction) {
761762
// If the transaction amount is zero, then the money is being requested through the "Scan" flow and the GPS coordinates need to be included.
762763
if (transaction.amount === 0 && !isSharingTrackExpense && !isCategorizingTrackExpense && locationPermissionGranted) {

0 commit comments

Comments
 (0)