Merge pull request #87993 from dominictb/fix/time-expenses-are-created-with-tax

Fix: Time expenses are created with tax

Author: youssef-lr

src/pages/iou/request/step/IOURequestStepConfirmation.tsx

@@ -270,6 +270,7 @@ function IOURequestStepConfirmation({
         isCategorizingTrackExpense,
         isSharingTrackExpense,
         isUnreported,
+        isPolicyExpenseChat,
         draftTransactionIDs,
         privateIsArchivedMap,
         backToReport,

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

@@ -23,6 +23,7 @@ import dismissModalAndOpenReportInInboxTabHelper from '@libs/Navigation/helpers/
 import navigateAfterExpenseCreate from '@libs/Navigation/helpers/navigateAfterExpenseCreate';
 import Navigation from '@libs/Navigation/Navigation';
 import {rand64, roundToTwoDecimalPlaces} from '@libs/NumberUtils';
+import {isTaxTrackingEnabled} from '@libs/PolicyUtils';
 import {findSelfDMReportID, generateReportID, getReportOrDraftReport, hasViolations as hasViolationsReportUtils, isMoneyRequestReport, isSelectedManagerMcTest} from '@libs/ReportUtils';
 import {endSpan, getSpan, startSpan} from '@libs/telemetry/activeSpans';
 import markSubmitExpenseEnd from '@libs/telemetry/markSubmitExpenseEnd';
@@ -111,6 +112,7 @@ type UseExpenseSubmissionParams = {
     isCategorizingTrackExpense: boolean;
     isSharingTrackExpense: boolean;
     isUnreported: boolean;
+    isPolicyExpenseChat: boolean;
 
     // Onyx values
     draftTransactionIDs: string[] | undefined;
@@ -144,6 +146,7 @@ function useExpenseSubmission(params: UseExpenseSubmissionParams) {
         isCategorizingTrackExpense,
         isSharingTrackExpense,
         isUnreported,
+        isPolicyExpenseChat,
         draftTransactionIDs,
         privateIsArchivedMap,
         backToReport,
@@ -219,7 +222,9 @@ function useExpenseSubmission(params: UseExpenseSubmissionParams) {
     const customUnitRateID = getRateID(transaction) ?? '';
     const transactionDistance = isManualDistanceRequest || isOdometerDistanceRequest || isGPSDistanceRequest ? (transaction?.comment?.customUnit?.quantity ?? undefined) : undefined;
     const defaultTaxCode = getDefaultTaxCode(policy, transaction);
-    const transactionTaxCode = (transaction?.taxCode ? transaction?.taxCode : defaultTaxCode) ?? '';
+    const transactionTaxCode = isTaxTrackingEnabled(isPolicyExpenseChat || isUnreported, policy, isDistanceRequest, isPerDiemRequest, isTimeRequest)
+        ? ((transaction?.taxCode ? transaction?.taxCode : defaultTaxCode) ?? '')
+        : '';
     const transactionTaxAmount = transaction?.taxAmount ?? 0;
     const transactionTaxValue = transaction?.taxValue ?? getTaxValue(policy, transaction, transactionTaxCode) ?? '';
 

tests/ui/TimeExpenseConfirmationTest.tsx

@@ -123,6 +123,22 @@ function createPolicyWithTimeTracking(): Policy {
         ...createRandomPolicy(1, CONST.POLICY.TYPE.CORPORATE, 'Test Policy'),
         id: POLICY_ID,
         outputCurrency: CONST.CURRENCY.USD,
+        tax: {
+            trackingEnabled: true,
+        },
+        taxRates: {
+            defaultExternalID: 'TAX_RATE_1',
+            defaultValue: '10%',
+            foreignTaxDefault: 'TAX_RATE_2',
+            name: 'Tax',
+            taxes: {
+                TAX_RATE_1: {
+                    name: 'Tax Rate 1',
+                    value: '10%',
+                    isDisabled: false,
+                },
+            },
+        },
         units: {
             time: {
                 enabled: true,
@@ -340,6 +356,23 @@ describe('TimeExpenseConfirmationTest', () => {
             expect(requestMoney).toHaveBeenCalled();
         });
 
+        it('should not apply default tax code to time expenses', async () => {
+            await setupTransaction();
+
+            renderConfirmation();
+            await waitForBatchedUpdatesWithAct();
+
+            const submitButton = screen.getByText(/create.*expense/i);
+            fireEvent.press(submitButton);
+            await waitForBatchedUpdatesWithAct();
+
+            expect(requestMoney).toHaveBeenCalled();
+            // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
+            const callArgs = (requestMoney as jest.Mock).mock.calls.at(0)?.[0] as {transactionParams: {taxCode: string; taxAmount: number}};
+            expect(callArgs.transactionParams.taxCode).toBe('');
+            expect(callArgs.transactionParams.taxAmount).toBe(0);
+        });
+
         it('should show error when rate and hours result in too large amount', async () => {
             await setupTransaction({
                 comment: {