decoupling policy

Author: mukhrr

src/components/MoneyRequestReportView/MoneyRequestReportTransactionList.tsx

@@ -334,9 +334,18 @@ function MoneyRequestReportTransactionList({
             shouldShowCommentsColumn,
             shouldShowReimbursableColumn: hasNonReimbursableTransactions(transactions),
             reportCurrency: report?.currency,
-            policy,
+            isPolicyTaxEnabled: isTaxEnabled,
         });
-    }, [transactions, currentUserDetails?.accountID, isExpenseReportViewFromIOUReport, shouldShowBillableColumn, shouldShowCommentsColumn, reportDetailsColumns, report?.currency, policy]);
+    }, [
+        transactions,
+        currentUserDetails?.accountID,
+        isExpenseReportViewFromIOUReport,
+        shouldShowBillableColumn,
+        shouldShowCommentsColumn,
+        reportDetailsColumns,
+        report?.currency,
+        isTaxEnabled,
+    ]);
 
     const {windowWidth, windowHeight} = useWindowDimensions();
     const minTableWidth = getTableMinWidth(columnsToShow);

src/libs/SearchUIUtils.ts

@@ -118,7 +118,6 @@ import {
     isPolicyAdmin,
     isPolicyApprover,
     isPolicyPayer,
-    isPolicyTaxEnabled,
 } from './PolicyUtils';
 import {
     getIOUActionForReportID,
@@ -5132,7 +5131,7 @@ function getColumnsToShow({
     shouldShowCommentsColumn = false,
     reportCurrency,
     shouldUseStrictDefaultExpenseColumns = false,
-    policy,
+    isPolicyTaxEnabled = false,
 }: {
     currentAccountID: number | undefined;
     data: OnyxTypes.SearchResults['data'] | OnyxTypes.Transaction[];
@@ -5146,7 +5145,7 @@ function getColumnsToShow({
     shouldShowCommentsColumn?: boolean;
     reportCurrency?: string;
     shouldUseStrictDefaultExpenseColumns?: boolean;
-    policy?: OnyxTypes.Policy;
+    isPolicyTaxEnabled?: boolean;
 }): SearchColumnType[] {
     if (type === CONST.SEARCH.DATA_TYPES.EXPENSE_REPORT) {
         const defaultReportColumns: SearchColumnType[] = [
@@ -5393,7 +5392,7 @@ function getColumnsToShow({
             // When the user explicitly selected the tax columns (customResult) and the workspace
             // has taxes enabled, keep them regardless of per-transaction values — older expenses
             // created before taxes were turned on still have null taxCode/taxAmount/taxValue.
-            const hasTaxInfo = (!!customResult && isPolicyTaxEnabled(policy)) || !!transaction.taxCode || !!transaction.taxAmount || !!transaction.taxValue;
+            const hasTaxInfo = (!!customResult && isPolicyTaxEnabled) || !!transaction.taxCode || !!transaction.taxAmount || !!transaction.taxValue;
             if (hasTaxInfo) {
                 columns[CONST.SEARCH.TABLE_COLUMNS.TAX_RATE] = true;
                 columns[CONST.SEARCH.TABLE_COLUMNS.TAX_AMOUNT] = true;

src/pages/settings/Report/ReportDetailsColumnsPage.tsx

@@ -9,6 +9,7 @@ import {setReportDetailsColumns} from '@libs/actions/ReportLayout';
 import {hasNonReimbursableTransactions, isBillableEnabledOnPolicy} from '@libs/MoneyRequestReportUtils';
 import Navigation from '@libs/Navigation/Navigation';
 import type {PlatformStackRouteProp} from '@libs/Navigation/PlatformStackNavigation/types';
+import {isPolicyTaxEnabled} from '@libs/PolicyUtils';
 import {isIOUReport} from '@libs/ReportUtils';
 import {getColumnsToShow} from '@libs/SearchUIUtils';
 import type {ReportSettingsNavigatorParamList} from '@navigation/types';
@@ -80,7 +81,7 @@ function ReportDetailsColumnsPage() {
             shouldShowBillableColumn: isBillableEnabledOnPolicy(policy),
             shouldShowReimbursableColumn: hasNonReimbursableTransactions(reportTransactions),
             reportCurrency: report?.currency,
-            policy,
+            isPolicyTaxEnabled: isPolicyTaxEnabled(policy),
         });
 
         // Filter to only columns available in the custom columns list (drops RECEIPT/TYPE/COMMENTS etc.)

tests/unit/Search/SearchUIUtilsTest.ts

@@ -41,7 +41,6 @@ import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
 import type * as OnyxTypes from '@src/types/onyx';
 import type {CustomCardFeedData} from '@src/types/onyx/CardFeeds';
-import type Policy from '@src/types/onyx/Policy';
 import type {Connections} from '@src/types/onyx/Policy';
 import type {SearchDataTypes} from '@src/types/onyx/SearchResults';
 import getOnyxValue from '../../utils/getOnyxValue';
@@ -8279,15 +8278,13 @@ describe('SearchUIUtils', () => {
                 taxCode: undefined,
                 taxAmount: undefined,
             };
-            const taxEnabledPolicy = {...policy, tax: {trackingEnabled: true}} as unknown as Policy;
-
             const visibleColumns = [CONST.SEARCH.TABLE_COLUMNS.DATE, CONST.SEARCH.TABLE_COLUMNS.TAX_RATE, CONST.SEARCH.TABLE_COLUMNS.TAX_AMOUNT, CONST.SEARCH.TABLE_COLUMNS.TOTAL_AMOUNT];
             const columns = SearchUIUtils.getColumnsToShow({
                 currentAccountID: submitterAccountID,
                 data: [legacyTransaction],
                 visibleColumns,
                 isExpenseReportView: true,
-                policy: taxEnabledPolicy,
+                isPolicyTaxEnabled: true,
             });
 
             expect(columns).toContain(CONST.SEARCH.TABLE_COLUMNS.TAX_RATE);
@@ -8307,15 +8304,13 @@ describe('SearchUIUtils', () => {
                 taxCode: undefined,
                 taxAmount: undefined,
             };
-            const taxEnabledPolicy = {...policy, tax: {trackingEnabled: true}} as unknown as Policy;
-
             const visibleColumns = [CONST.SEARCH.TABLE_COLUMNS.DATE, CONST.SEARCH.TABLE_COLUMNS.MERCHANT, CONST.SEARCH.TABLE_COLUMNS.TOTAL_AMOUNT];
             const columns = SearchUIUtils.getColumnsToShow({
                 currentAccountID: submitterAccountID,
                 data: [legacyTransaction],
                 visibleColumns,
                 isExpenseReportView: true,
-                policy: taxEnabledPolicy,
+                isPolicyTaxEnabled: true,
             });
 
             expect(columns).not.toContain(CONST.SEARCH.TABLE_COLUMNS.TAX_RATE);
@@ -8333,15 +8328,13 @@ describe('SearchUIUtils', () => {
                 taxCode: undefined,
                 taxAmount: undefined,
             };
-            const taxDisabledPolicy = {...policy, tax: {trackingEnabled: false}} as unknown as Policy;
-
             const visibleColumns = [CONST.SEARCH.TABLE_COLUMNS.DATE, CONST.SEARCH.TABLE_COLUMNS.TAX_RATE, CONST.SEARCH.TABLE_COLUMNS.TAX_AMOUNT, CONST.SEARCH.TABLE_COLUMNS.TOTAL_AMOUNT];
             const columns = SearchUIUtils.getColumnsToShow({
                 currentAccountID: submitterAccountID,
                 data: [legacyTransaction],
                 visibleColumns,
                 isExpenseReportView: true,
-                policy: taxDisabledPolicy,
+                isPolicyTaxEnabled: false,
             });
 
             expect(columns).not.toContain(CONST.SEARCH.TABLE_COLUMNS.TAX_RATE);