Add tax fields for distance requests

src/components/MoneyRequestConfirmationList.tsx

@@ -293,13 +293,13 @@ function MoneyRequestConfirmationList({
 
  const canUpdateSenderWorkspace = useMemo(() => PolicyUtils.canSendInvoice(allPolicies) && !!transaction?.isFromGlobalCreate, [allPolicies, transaction?.isFromGlobalCreate]);
 
+ const canModifyTaxFields = !isReadOnly && !isDistanceRequest;
+
  // A flag for showing the tags field
  // TODO: remove the !isTypeInvoice from this condition after BE supports tags for invoices: https://github.com/Expensify/App/issues/41281
  const shouldShowTags = useMemo(() => isPolicyExpenseChat && OptionsListUtils.hasEnabledTags(policyTagLists) && !isTypeInvoice, [isPolicyExpenseChat, policyTagLists, isTypeInvoice]);
 
- // A flag for showing tax rate
- // TODO: remove the !isTypeInvoice from this condition after BE supports tax for invoices: https://github.com/Expensify/App/issues/41281
- const shouldShowTax = isTaxTrackingEnabled(isPolicyExpenseChat, policy) && !isTypeInvoice;
+ const shouldShowTax = isTaxTrackingEnabled(isPolicyExpenseChat, policy, isDistanceRequest) && !isTypeInvoice;
 
  // A flag for showing the billable field
  const shouldShowBillable = policy?.disabledFields?.defaultBillable === false;
@@ -371,15 +371,15 @@ function MoneyRequestConfirmationList({
 
  // Calculate and set tax amount in transaction draft
  useEffect(() => {
- const taxAmount = getTaxAmount(transaction, policy).toString();
+ const taxAmount = isDistanceRequest && isOffline ? (transaction?.taxAmount ?? 0).toString() : getTaxAmount(transaction, policy).toString();
  const amountInSmallestCurrencyUnits = CurrencyUtils.convertToBackendAmount(Number.parseFloat(taxAmount));
 
  if (transaction?.taxAmount && previousTransactionAmount === transaction?.amount && previousTransactionCurrency === transaction?.currency) {
  return IOU.setMoneyRequestTaxAmount(transactionID, transaction?.taxAmount ?? 0, true);
  }
 
  IOU.setMoneyRequestTaxAmount(transactionID, amountInSmallestCurrencyUnits, true);
- }, [policy, transaction, transactionID, previousTransactionAmount, previousTransactionCurrency]);
+ }, [policy, transaction, transactionID, previousTransactionAmount, previousTransactionCurrency, isOffline, isDistanceRequest]);
 
  // If completing a split expense fails, set didConfirm to false to allow the user to edit the fields again
  if (isEditingSplitBill && didConfirm) {
@@ -1023,14 +1023,14 @@ function MoneyRequestConfirmationList({
  item: (
  <MenuItemWithTopDescription
  key={`${taxRates?.name}${taxRateTitle}`}
- shouldShowRightIcon={!isReadOnly}
+ shouldShowRightIcon={canModifyTaxFields}
  title={taxRateTitle}
  description={taxRates?.name}
  style={[styles.moneyRequestMenuItem]}
  titleStyle={styles.flex1}
  onPress={() => Navigation.navigate(ROUTES.MONEY_REQUEST_STEP_TAX_RATE.getRoute(action, iouType, transactionID, reportID, Navigation.getActiveRouteWithoutParams()))}
  disabled={didConfirm}
- interactive={!isReadOnly}
+ interactive={canModifyTaxFields}
  />
  ),
  shouldShow: shouldShowTax,
@@ -1040,14 +1040,14 @@ function MoneyRequestConfirmationList({
  item: (
  <MenuItemWithTopDescription
  key={`${taxRates?.name}${formattedTaxAmount}`}
- shouldShowRightIcon={!isReadOnly}
+ shouldShowRightIcon={canModifyTaxFields}
  title={formattedTaxAmount}
  description={translate('iou.taxAmount')}
  style={[styles.moneyRequestMenuItem]}
  titleStyle={styles.flex1}
  onPress={() => Navigation.navigate(ROUTES.MONEY_REQUEST_STEP_TAX_AMOUNT.getRoute(action, iouType, transactionID, reportID, Navigation.getActiveRouteWithoutParams()))}
  disabled={didConfirm}
- interactive={!isReadOnly}
+ interactive={canModifyTaxFields}
  />
  ),
  shouldShow: shouldShowTax,

src/components/ReportActionItem/MoneyRequestView.tsx

@@ -141,6 +141,8 @@ function MoneyRequestView({
 
  // Used for non-restricted fields such as: description, category, tag, billable, etc.
  const canEdit = ReportUtils.canEditMoneyRequest(parentReportAction);
+ const canEditTaxFields = canEdit && !isDistanceRequest;
+
  const canEditAmount = ReportUtils.canEditFieldOfMoneyRequest(parentReportAction, CONST.EDIT_REQUEST_FIELD.AMOUNT);
  const canEditMerchant = ReportUtils.canEditFieldOfMoneyRequest(parentReportAction, CONST.EDIT_REQUEST_FIELD.MERCHANT);
  const canEditDate = ReportUtils.canEditFieldOfMoneyRequest(parentReportAction, CONST.EDIT_REQUEST_FIELD.DATE);
@@ -170,8 +172,7 @@ function MoneyRequestView({
  const shouldShowTag = isPolicyExpenseChat && (transactionTag || OptionsListUtils.hasEnabledTags(policyTagLists));
  const shouldShowBillable = isPolicyExpenseChat && (!!transactionBillable || !(policy?.disabledFields?.defaultBillable ?? true));
 
- // A flag for showing tax rate
- const shouldShowTax = isTaxTrackingEnabled(isPolicyExpenseChat, policy);
+ const shouldShowTax = isTaxTrackingEnabled(isPolicyExpenseChat, policy, isDistanceRequest);
 
  const {getViolationsForField} = useViolations(transactionViolations ?? []);
  const hasViolations = useCallback(
@@ -504,8 +505,8 @@ function MoneyRequestView({
  <MenuItemWithTopDescription
  title={taxRateTitle ?? ''}
  description={taxRatesDescription}
- interactive={canEdit}
- shouldShowRightIcon={canEdit}
+ interactive={canEditTaxFields}
+ shouldShowRightIcon={canEditTaxFields}
  titleStyle={styles.flex1}
  onPress={() =>
  Navigation.navigate(ROUTES.MONEY_REQUEST_STEP_TAX_RATE.getRoute(CONST.IOU.ACTION.EDIT, iouType, transaction?.transactionID ?? '', report.reportID))
@@ -521,8 +522,8 @@ function MoneyRequestView({
  <MenuItemWithTopDescription
  title={formattedTaxAmount ? formattedTaxAmount.toString() : ''}
  description={translate('iou.taxAmount')}
- interactive={canEdit}
- shouldShowRightIcon={canEdit}
+ interactive={canEditTaxFields}
+ shouldShowRightIcon={canEditTaxFields}
  titleStyle={styles.flex1}
  onPress={() =>
  Navigation.navigate(ROUTES.MONEY_REQUEST_STEP_TAX_AMOUNT.getRoute(CONST.IOU.ACTION.EDIT, iouType, transaction?.transactionID ?? '', report.reportID))

src/libs/PolicyUtils.ts

@@ -263,8 +263,13 @@ function isPaidGroupPolicy(policy: OnyxEntry<Policy> | EmptyObject): boolean {
  return policy?.type === CONST.POLICY.TYPE.TEAM || policy?.type === CONST.POLICY.TYPE.CORPORATE;
 }
 
-function isTaxTrackingEnabled(isPolicyExpenseChat: boolean, policy: OnyxEntry<Policy>): boolean {
- return (isPolicyExpenseChat && (policy?.tax?.trackingEnabled ?? policy?.isTaxTrackingEnabled)) ?? false;
+function isTaxTrackingEnabled(isPolicyExpenseChat: boolean, policy: OnyxEntry<Policy>, isDistanceRequest: boolean): boolean {
+ const distanceUnit = Object.values(policy?.customUnits ?? {}).find((unit) => unit.name === CONST.CUSTOM_UNITS.NAME_DISTANCE);
+ const customUnitID = distanceUnit?.customUnitID ?? 0;
+ const isPolicyTaxTrackingEnabled = isPolicyExpenseChat && policy?.tax?.trackingEnabled;
+ const isTaxEnabledForDistance = isPolicyTaxTrackingEnabled && policy?.customUnits?.[customUnitID]?.attributes?.taxEnabled;
+
+ return Boolean(isDistanceRequest ? isTaxEnabledForDistance : isPolicyTaxTrackingEnabled);
 }
 
 /**

src/libs/actions/IOU.ts

@@ -421,9 +421,12 @@ function setCustomUnitRateID(transactionID: string, customUnitRateID: string) {
 }
 
 /** Update transaction distance rate */
-function updateDistanceRequestRate(transactionID: string, rateID: string, policyID: string) {
+function updateDistanceRequestRate(transactionID: string, rateID: string, policyID: string, taxAmount?: number) {
  Onyx.merge(ONYXKEYS.NVP_LAST_SELECTED_DISTANCE_RATES, {[policyID]: rateID});
  Onyx.merge(`${ONYXKEYS.COLLECTION.TRANSACTION_DRAFT}${transactionID}`, {comment: {customUnit: {customUnitRateID: rateID}}});
+ if (taxAmount) {
+ Onyx.merge(`${ONYXKEYS.COLLECTION.TRANSACTION_DRAFT}${transactionID}`, {taxAmount});
+ }
 }
 
 /** Helper function to get the receipt error for expenses, or the generic error if there's no receipt */

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

@@ -5,11 +5,14 @@ import SelectionList from '@components/SelectionList';
 import RadioListItem from '@components/SelectionList/RadioListItem';
 import Text from '@components/Text';
 import useLocalize from '@hooks/useLocalize';
+import useNetwork from '@hooks/useNetwork';
 import useThemeStyles from '@hooks/useThemeStyles';
 import * as IOU from '@libs/actions/IOU';
+import * as CurrencyUtils from '@libs/CurrencyUtils';
 import type {MileageRate} from '@libs/DistanceRequestUtils';
 import DistanceRequestUtils from '@libs/DistanceRequestUtils';
 import Navigation from '@libs/Navigation/Navigation';
+import * as ReportUtils from '@libs/ReportUtils';
 import * as TransactionUtils from '@libs/TransactionUtils';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
@@ -45,6 +48,15 @@ function IOURequestStepDistanceRate({
 }: IOURequestStepDistanceRateProps) {
  const styles = useThemeStyles();
  const {translate, toLocaleDigit} = useLocalize();
+ const isDistanceRequest = TransactionUtils.isDistanceRequest(transaction);
+ const transactionDetails = ReportUtils.getTransactionDetails(transaction);
+ const currency = transactionDetails?.currency;
+ const distanceUnit = Object.values(policy?.customUnits ?? {}).find((unit) => unit.name === CONST.CUSTOM_UNITS.NAME_DISTANCE);
+ const customUnitID = distanceUnit?.customUnitID;
+ const {isOffline} = useNetwork();
+
+ const defaultTaxCode = TransactionUtils.getDefaultTaxCode(policy, transaction, currency) ?? '';
+ const taxPercentage = TransactionUtils.getTaxValue(policy, transaction, defaultTaxCode) ?? '';
 
  const lastSelectedRateID = TransactionUtils.getRateID(transaction) ?? '';
 
@@ -69,7 +81,13 @@ function IOURequestStepDistanceRate({
  const initiallyFocusedOption = sections.find((item) => item.isSelected)?.keyForList;
 
  function selectDistanceRate(customUnitRateID: string) {
- IOU.updateDistanceRequestRate(transactionID, customUnitRateID, policy?.id ?? '');
+ let taxAmount;
+ if (isDistanceRequest && transaction?.amount && policy?.customUnits && customUnitID && isOffline) {
+ const taxClaimablePercentage = policy?.customUnits[customUnitID].rates[customUnitRateID].attributes?.taxClaimablePercentage ?? 0;
+ const taxableAmount = -1 * transaction.amount * taxClaimablePercentage;
+ taxAmount = CurrencyUtils.convertToBackendAmount(TransactionUtils.calculateTaxAmount(taxPercentage, taxableAmount));
+ }
+ IOU.updateDistanceRequestRate(transactionID, customUnitRateID, policy?.id ?? '', taxAmount);
  navigateBack();
  }
 

src/types/onyx/Policy.ts

@@ -15,10 +15,12 @@ type Rate = OnyxCommon.OnyxValueWithOfflineFeedback<{
  enabled?: boolean;
  errors?: OnyxCommon.Errors;
  errorFields?: OnyxCommon.ErrorFields;
+ attributes?: {taxClaimablePercentage?: number};
 }>;
 
 type Attributes = {
  unit: Unit;
+ taxEnabled?: boolean;
 };
 
 type CustomUnit = OnyxCommon.OnyxValueWithOfflineFeedback<{