Merge pull request #36521 from Expensify/vit-removeIsTaxTrackingEnabled

Add the policy tax trackingEnabled

src/components/MoneyRequestConfirmationList.js

@@ -249,7 +249,7 @@ function MoneyRequestConfirmationList(props) {
     const shouldShowTags = props.isPolicyExpenseChat && (props.iouTag || OptionsListUtils.hasEnabledOptions(_.values(policyTagList)));
 
     // A flag for showing tax fields - tax rate and tax amount
-    const shouldShowTax = props.isPolicyExpenseChat && props.policy.isTaxTrackingEnabled;
+    const shouldShowTax = props.isPolicyExpenseChat && lodashGet(props.policy, 'tax.trackingEnabled', props.policy.isTaxTrackingEnabled);
 
     // A flag for showing the billable field
     const shouldShowBillable = !lodashGet(props.policy, 'disabledFields.defaultBillable', true);

src/components/MoneyTemporaryForRefactorRequestConfirmationList.js

@@ -279,7 +279,7 @@ function MoneyTemporaryForRefactorRequestConfirmationList({
     const shouldShowTags = isPolicyExpenseChat && OptionsListUtils.hasEnabledOptions(_.values(policyTagList));
 
     // A flag for showing tax rate
-    const shouldShowTax = isPolicyExpenseChat && policy && policy.isTaxTrackingEnabled;
+    const shouldShowTax = isPolicyExpenseChat && policy && lodashGet(policy, 'tax.trackingEnabled', policy.isTaxTrackingEnabled);
 
     // A flag for showing the billable field
     const shouldShowBillable = !lodashGet(policy, 'disabledFields.defaultBillable', true);

src/pages/iou/request/step/IOURequestStepAmount.js

@@ -1,4 +1,5 @@
 import {useFocusEffect} from '@react-navigation/native';
+import lodashGet from 'lodash/get';
 import PropTypes from 'prop-types';
 import React, {useCallback, useEffect, useRef} from 'react';
 import {withOnyx} from 'react-native-onyx';
@@ -39,8 +40,17 @@ const propTypes = {
 
     /** The policy of the report */
     policy: PropTypes.shape({
-        /** Is Tax tracking Enabled */
+        /**
+         * Whether or not the policy has tax tracking enabled
+         *
+         * @deprecated - use tax.trackingEnabled instead
+         */
         isTaxTrackingEnabled: PropTypes.bool,
+
+        /** Whether or not the policy has tax tracking enabled */
+        tax: PropTypes.shape({
+            trackingEnabled: PropTypes.bool,
+        }),
     }),
 };
 
@@ -74,7 +84,7 @@ function IOURequestStepAmount({
     const iouRequestType = getRequestType(transaction);
 
     const isPolicyExpenseChat = ReportUtils.isPolicyExpenseChat(ReportUtils.getRootParentReport(report));
-    const isTaxTrackingEnabled = isPolicyExpenseChat && policy.isTaxTrackingEnabled;
+    const isTaxTrackingEnabled = isPolicyExpenseChat && lodashGet(policy, 'tax.trackingEnabled', policy.isTaxTrackingEnabled);
 
     useFocusEffect(
         useCallback(() => {

src/pages/workspace/withPolicy.tsx

@@ -69,8 +69,17 @@ const policyPropTypes = {
         /** Whether or not the policy has multiple tag lists */
         hasMultipleTagLists: PropTypes.bool,
 
-        /** Whether or not the policy has tax tracking enabled */
+        /**
+         * Whether or not the policy has tax tracking enabled
+         *
+         * @deprecated - use tax.trackingEnabled instead
+         */
         isTaxTrackingEnabled: PropTypes.bool,
+
+        /** Whether or not the policy has tax tracking enabled */
+        tax: PropTypes.shape({
+            trackingEnabled: PropTypes.bool,
+        }),
     }),
 
     /** The employee list of this policy */

src/types/onyx/Policy.ts

@@ -159,9 +159,18 @@ type Policy = {
     /** Whether the workspace has multiple levels of tags enabled */
     hasMultipleTagLists?: boolean;
 
-    /** When tax tracking is enabled */
+    /**
+     * Whether or not the policy has tax tracking enabled
+     *
+     * @deprecated - use tax.trackingEnabled instead
+     */
     isTaxTrackingEnabled?: boolean;
 
+    /** Whether or not the policy has tax tracking enabled */
+    tax?: {
+        trackingEnabled: boolean;
+    };
+
     /** ReportID of the admins room for this workspace */
     chatReportIDAdmins?: number;