Merge pull request Expensify#78109 from callstack-internal/feat/72239-per-diem-field

Enable creating per diem expense from self dm

Author: cristipaval

src/CONST/index.ts

@@ -1145,6 +1145,7 @@ const CONST = {
         SPLIT_DISTANCE: 'splitDistance',
         TRACK_MANUAL: 'trackManual',
         TRACK_SCAN: 'trackScan',
+        TRACK_PER_DIEM: 'trackPerDiem',
         TRACK_DISTANCE: 'trackDistance',
         ASSIGN_TASK: 'assignTask',
         SEND_MONEY: 'sendMoney',

src/components/MoneyRequestConfirmationList.tsx

@@ -11,6 +11,7 @@ import {MouseProvider} from '@hooks/useMouseContext';
 import useOnyx from '@hooks/useOnyx';
 import usePermissions from '@hooks/usePermissions';
 import usePolicyForMovingExpenses from '@hooks/usePolicyForMovingExpenses';
+import usePolicyForTransaction from '@hooks/usePolicyForTransaction';
 import usePreferredPolicy from '@hooks/usePreferredPolicy';
 import usePrevious from '@hooks/usePrevious';
 import useThemeStyles from '@hooks/useThemeStyles';
@@ -270,7 +271,6 @@ function MoneyRequestConfirmationList({
 }: MoneyRequestConfirmationListProps) {
     const [policyCategoriesReal] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY_CATEGORIES}${policyID}`, {canBeMissing: true});
     const [policyTags] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY_TAGS}${policyID}`, {canBeMissing: true});
-    const [policyReal] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY}${policyID}`, {canBeMissing: true});
     const [transactionReport] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${transaction?.reportID}`, {canBeMissing: true});
     const [policyDraft] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY_DRAFTS}${policyID}`, {canBeMissing: true});
     const [defaultMileageRateDraft] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY_DRAFTS}${policyID}`, {
@@ -307,7 +307,14 @@ function MoneyRequestConfirmationList({
     );
 
     const isTrackExpense = iouType === CONST.IOU.TYPE.TRACK;
-    const policy = isTrackExpense ? policyForMovingExpenses : (policyReal ?? policyDraft);
+    const {policy} = usePolicyForTransaction({
+        transaction,
+        reportPolicyID: policyID,
+        action,
+        iouType,
+        isPerDiemRequest,
+    });
+
     const policyCategories = policyCategoriesReal ?? policyCategoriesDraft;
     const defaultMileageRate = defaultMileageRateDraft ?? defaultMileageRateReal;
 

src/hooks/usePolicyForTransaction.ts

@@ -1,37 +1,51 @@
+import {useMemo} from 'react';
 import type {OnyxEntry} from 'react-native-onyx';
+import {getPolicyByCustomUnitID} from '@libs/PolicyUtils';
 import {isExpenseUnreported} from '@libs/TransactionUtils';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
-import type {Policy, Report, Transaction} from '@src/types/onyx';
+import type {Policy, Transaction} from '@src/types/onyx';
 import useOnyx from './useOnyx';
 import usePolicyForMovingExpenses from './usePolicyForMovingExpenses';
 
 type UsePolicyForTransactionParams = {
     /** The transaction to determine the policy for */
     transaction: OnyxEntry<Transaction>;
 
-    /** The report associated with the transaction */
-    report: OnyxEntry<Report>;
+    /** The report policy ID associated with the transaction */
+    reportPolicyID: string | undefined;
 
     /** The current action being performed */
     action: string;
 
     /** The type of IOU (split, track, submit, etc.) */
     iouType: string;
+
+    /** Indicates if the request is a per diem request */
+    isPerDiemRequest?: boolean;
 };
 
 type UsePolicyForTransactionResult = {
     /** The policy to use for the transaction */
     policy: OnyxEntry<Policy>;
 };
 
-function usePolicyForTransaction({transaction, report, action, iouType}: UsePolicyForTransactionParams): UsePolicyForTransactionResult {
+function usePolicyForTransaction({transaction, reportPolicyID, action, iouType, isPerDiemRequest}: UsePolicyForTransactionParams): UsePolicyForTransactionResult {
     const {policyForMovingExpenses} = usePolicyForMovingExpenses();
+
+    const [allPolicies] = useOnyx(ONYXKEYS.COLLECTION.POLICY, {canBeMissing: true});
+
+    const customUnitPolicy = useMemo(() => {
+        return getPolicyByCustomUnitID(transaction, allPolicies);
+    }, [transaction, allPolicies]);
+
+    const [reportPolicy] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY}${reportPolicyID}`, {canBeMissing: true});
+
     const isUnreportedExpense = isExpenseUnreported(transaction);
     const isCreatingTrackExpense = action === CONST.IOU.ACTION.CREATE && iouType === CONST.IOU.TYPE.TRACK;
 
-    const [reportPolicy] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY}${report?.policyID}`, {canBeMissing: true});
-    const policy = isUnreportedExpense || isCreatingTrackExpense ? policyForMovingExpenses : reportPolicy;
+    const policyForSelfDMExpense = isPerDiemRequest ? customUnitPolicy : policyForMovingExpenses;
+    const policy = isUnreportedExpense || isCreatingTrackExpense ? policyForSelfDMExpense : reportPolicy;
 
     return {policy};
 }

src/libs/API/parameters/CreatePerDiemRequestParams.ts

@@ -11,7 +11,7 @@ type CreatePerDiemRequestParams = {
     category?: string;
     description: string;
     tag?: string;
-    iouReportID: string;
+    iouReportID?: string;
     chatReportID: string;
     transactionID: string;
     reportActionID: string;

src/libs/QuickActionUtils.ts

@@ -21,6 +21,7 @@ const getQuickActionIcon = (
         case CONST.QUICK_ACTIONS.REQUEST_DISTANCE:
             return icons.Car;
         case CONST.QUICK_ACTIONS.PER_DIEM:
+        case CONST.QUICK_ACTIONS.TRACK_PER_DIEM:
             return icons.CalendarSolid;
         case CONST.QUICK_ACTIONS.SPLIT_MANUAL:
         case CONST.QUICK_ACTIONS.SPLIT_SCAN:
@@ -75,6 +76,7 @@ const getQuickActionTitle = (action: QuickActionName): TranslationPaths => {
         case CONST.QUICK_ACTIONS.TRACK_DISTANCE:
             return 'quickAction.recordDistance';
         case CONST.QUICK_ACTIONS.PER_DIEM:
+        case CONST.QUICK_ACTIONS.TRACK_PER_DIEM:
             return 'quickAction.perDiem';
         case CONST.QUICK_ACTIONS.SPLIT_MANUAL:
             return 'quickAction.splitBill';
@@ -101,7 +103,7 @@ const isQuickActionAllowed = (
     isReportArchived: boolean | undefined,
     isRestrictedToPreferredPolicy = false,
 ) => {
-    if (quickAction?.action === CONST.QUICK_ACTIONS.PER_DIEM) {
+    if (quickAction?.action === CONST.QUICK_ACTIONS.PER_DIEM || quickAction?.action === CONST.QUICK_ACTIONS.TRACK_PER_DIEM) {
         if (!quickActionPolicy?.arePerDiemRatesEnabled) {
             return false;
         }