Skip to content
8 changes: 6 additions & 2 deletions src/components/ReportActionItem/MoneyRequestView.tsx
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import {policyTypeSelector} from '@selectors/Policy';
import {Str} from 'expensify-common';
import React, {useState} from 'react';
import {View} from 'react-native';
Expand Down Expand Up @@ -66,6 +67,7 @@ import {
getTagLists,
hasDependentTags as hasDependentTagsPolicyUtils,
isAttendeeTrackingEnabled,
isGroupPolicyByType,
isPolicyAccessible,
isTaxTrackingEnabled,
} from '@libs/PolicyUtils';
Expand All @@ -84,7 +86,6 @@ import {
isOpenReport,
isPaidGroupPolicy,
isReportApproved,
isReportInGroupPolicy,
isSettled as isSettledReportUtils,
isTrackExpenseReportNew,
shouldEnableNegative,
Expand Down Expand Up @@ -421,7 +422,10 @@ function MoneyRequestView({

// A flag for verifying that the current report is a sub-report of a expense chat
// if the policy of the report is either Collect or Control, then this report must be tied to expense chat
const isPolicyExpenseChat = isReportInGroupPolicy(moneyRequestReport);
const [moneyRequestReportPolicyType] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY}${moneyRequestReport?.policyID}`, {
selector: policyTypeSelector,
});
const isPolicyExpenseChat = isGroupPolicyByType(moneyRequestReportPolicyType);
const policyTagLists = getTagLists(policyTagList);

const category = transactionCategory ?? '';
Expand Down
13 changes: 13 additions & 0 deletions src/libs/PolicyUtils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1083,10 +1083,18 @@ function isPaidGroupPolicy(policy: OnyxInputOrEntry<Policy>): boolean {
return policy?.type === CONST.POLICY.TYPE.TEAM || policy?.type === CONST.POLICY.TYPE.CORPORATE;
}

function isPaidGroupPolicyByType(policyType: string | undefined): boolean {
return policyType === CONST.POLICY.TYPE.TEAM || policyType === CONST.POLICY.TYPE.CORPORATE;
}

function isSubmitPolicy(policy: OnyxInputOrEntry<Policy>): boolean {
return policy?.type === CONST.POLICY.TYPE.SUBMIT;
}

function isSubmitPolicyByType(policyType: string | undefined): boolean {
return policyType === CONST.POLICY.TYPE.SUBMIT;
}

/**
* We only allow users to access Submit feature if they have the SUBMIT_2026 beta enabled.
*
Expand Down Expand Up @@ -1120,6 +1128,10 @@ function isGroupPolicy(policy: OnyxInputOrEntry<Policy>): boolean {
return isPaidGroupPolicy(policy) || isSubmitPolicy(policy);
}

function isGroupPolicyByType(policyType: string | undefined): boolean {
return isPaidGroupPolicyByType(policyType) || isSubmitPolicyByType(policyType);
}

function getOwnedPaidPolicies(policies: OnyxCollection<Policy> | null, currentUserAccountID: number | undefined): Policy[] {
return Object.values(policies ?? {}).filter((policy): policy is Policy => isPolicyOwner(policy, currentUserAccountID ?? CONST.DEFAULT_NUMBER_ID) && isPaidGroupPolicy(policy));
}
Expand Down Expand Up @@ -2479,6 +2491,7 @@ export {
canMemberRead,
canMemberWrite,
isGroupPolicy,
isGroupPolicyByType,
isPendingDeletePolicy,
isPolicyAdmin,
isPolicyUser,
Expand Down
1 change: 1 addition & 0 deletions src/libs/ReportUtils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1748,6 +1748,7 @@ function isCurrentUserInvoiceReceiver(report: OnyxEntry<Report>): boolean {
/**
* Whether the provided report belongs to a paid group or Submit policy
*/
// TODO: Remove this function and use isGroupPolicy directly after https://github.com/Expensify/App/issues/66415 is done
function isReportInGroupPolicy(report: OnyxInputOrEntry<Report>, policy?: OnyxInputOrEntry<Policy>): boolean {
return isGroupPolicyPolicyUtils(policy ?? allPolicies?.[`${ONYXKEYS.COLLECTION.POLICY}${report?.policyID}`]);
}
Expand Down
9 changes: 7 additions & 2 deletions src/pages/iou/HoldReasonPage.tsx
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import {policyTypeSelector} from '@selectors/Policy';
import {getReportOwnerAccountID} from '@selectors/Report';
import React, {useCallback, useEffect} from 'react';
import {useDelegateNoAccessActions, useDelegateNoAccessState} from '@components/DelegateNoAccessModalProvider';
Expand All @@ -12,8 +13,9 @@ import {addErrorMessage} from '@libs/ErrorUtils';
import Navigation from '@libs/Navigation/Navigation';
import type {PlatformStackScreenProps} from '@libs/Navigation/PlatformStackNavigation/types';
import type {MoneyRequestNavigatorParamList, SearchReportActionsParamList} from '@libs/Navigation/types';
import {isGroupPolicyByType} from '@libs/PolicyUtils';
import {getReportAction, isMoneyRequestAction} from '@libs/ReportActionsUtils';
import {canEditMoneyRequest, isReportInGroupPolicy} from '@libs/ReportUtils';
import {canEditMoneyRequest} from '@libs/ReportUtils';
import {getFieldRequiredErrors} from '@libs/ValidationUtils';
import {clearErrorFields, clearErrors, setErrors} from '@userActions/FormActions';
import ONYXKEYS from '@src/ONYXKEYS';
Expand All @@ -37,11 +39,14 @@ function HoldReasonPage({route}: HoldReasonPageProps) {
const {isOffline} = useNetwork();
const ancestors = useAncestors(report);

const [policyType] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY}${report?.policyID}`, {
selector: policyTypeSelector,
});
const [parentReportOwnerAccountID] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${report?.parentReportID}`, {selector: getReportOwnerAccountID});

// We first check if the report is part of a policy - if not, then it's a personal request (1:1 request)
// For personal requests, we need to allow both users to put the request on hold
const isWorkspaceRequest = isReportInGroupPolicy(report);
const isWorkspaceRequest = isGroupPolicyByType(policyType);
const isSubmitter = parentReportOwnerAccountID === currentUserAccountID;
const parentReportAction = getReportAction(report?.parentReportID, report?.parentReportActionID);

Expand Down
10 changes: 7 additions & 3 deletions src/pages/iou/SplitExpenseEditPage.tsx
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import {policyTypeSelector} from '@selectors/Policy';
import React, {useCallback, useEffect, useMemo} from 'react';
import {View} from 'react-native';
import FullPageNotFoundView from '@components/BlockingViews/FullPageNotFoundView';
Expand Down Expand Up @@ -34,11 +35,11 @@ import type {PlatformStackScreenProps} from '@libs/Navigation/PlatformStackNavig
import type {SplitExpenseParamList} from '@libs/Navigation/types';
import {hasEnabledOptions} from '@libs/OptionsListUtils';
import Parser from '@libs/Parser';
import {getDistanceRateCustomUnitRate, getGroupPaidPoliciesWithExpenseChatEnabled, getTagLists} from '@libs/PolicyUtils';
import {getDistanceRateCustomUnitRate, getGroupPaidPoliciesWithExpenseChatEnabled, getTagLists, isGroupPolicyByType} from '@libs/PolicyUtils';
import {getReportName} from '@libs/ReportNameUtils';
import {isSplitAction} from '@libs/ReportSecondaryActionUtils';
import type {TransactionDetails} from '@libs/ReportUtils';
import {getParsedComment, getReportOrDraftReport, getTransactionDetails, isReportInGroupPolicy, isSelfDM} from '@libs/ReportUtils';
import {getParsedComment, getReportOrDraftReport, getTransactionDetails, isSelfDM} from '@libs/ReportUtils';
import {getTagVisibility, hasEnabledTags} from '@libs/TagsOptionsListUtils';
import {getDistanceInMeters, getRateID, getTag, getTagForDisplay, isDistanceRequest, isManualDistanceRequest, isOdometerDistanceRequest} from '@libs/TransactionUtils';
import CONST from '@src/CONST';
Expand Down Expand Up @@ -118,7 +119,10 @@ function SplitExpenseEditPage({route}: SplitExpensePageProps) {
const draftTransactionReport = getReportOrDraftReport(splitExpenseDraftTransaction?.reportID);
const isSelfDMSplit = isSelfDM(draftTransactionReport);
const isExpenseUnreported = isSelfDMSplit;
const isPolicyExpenseChat = isReportInGroupPolicy(draftTransactionReport);
const [draftTransactionPolicyType] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY}${draftTransactionReport?.policyID}`, {
selector: policyTypeSelector,
});
const isPolicyExpenseChat = isGroupPolicyByType(draftTransactionPolicyType);

const originalTransactionCategory = transaction?.category ?? '';
const originalTransactionTag = transaction?.tag ?? '';
Expand Down
9 changes: 6 additions & 3 deletions src/pages/iou/request/step/IOURequestStepDistanceRate.tsx
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import {policyTypeSelector} from '@selectors/Policy';
import lodashIsEmpty from 'lodash/isEmpty';
import React, {useState} from 'react';
import type {OnyxEntry} from 'react-native-onyx';
Expand Down Expand Up @@ -29,8 +30,7 @@ import DistanceRequestUtils from '@libs/DistanceRequestUtils';
import getNonEmptyStringOnyxID from '@libs/getNonEmptyStringOnyxID';
import {isMovingTransactionFromTrackExpense as isMovingTransactionFromTrackExpenseUtil, shouldUseTransactionDraft} from '@libs/IOUUtils';
import Navigation from '@libs/Navigation/Navigation';
import {getDistanceRateCustomUnitRate, getGroupPaidPoliciesWithExpenseChatEnabled, isTaxTrackingEnabled} from '@libs/PolicyUtils';
import {isReportInGroupPolicy} from '@libs/ReportUtils';
import {getDistanceRateCustomUnitRate, getGroupPaidPoliciesWithExpenseChatEnabled, isGroupPolicyByType, isTaxTrackingEnabled} from '@libs/PolicyUtils';
import {
calculateTaxAmount,
getCurrency,
Expand Down Expand Up @@ -64,6 +64,9 @@ function IOURequestStepDistanceRate({
transaction,
}: IOURequestStepDistanceRateProps) {
const [policyDraft] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY_DRAFTS}${getIOURequestPolicyID(transaction, reportDraft)}`);
const [reportPolicyType] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY}${report?.policyID}`, {
selector: policyTypeSelector,
});
const [policyCategories] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY_CATEGORIES}${report?.policyID}`);
const [policyTags] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY_TAGS}${report?.policyID}`);
const [parentReport] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${getNonEmptyStringOnyxID(report?.parentReportID)}`);
Expand Down Expand Up @@ -99,7 +102,7 @@ function IOURequestStepDistanceRate({
const policy = policyForTransaction ?? policyByCustomUnitID ?? policyByCustomUnitRateID ?? fallbackAvailablePolicy;
const isDistanceRequest = isDistanceRequestTransactionUtils(currentTransaction);
const {getCurrencySymbol, getCurrencyDecimals} = useCurrencyListActions();
const isPolicyExpenseChat = isReportInGroupPolicy(report);
const isPolicyExpenseChat = isGroupPolicyByType(reportPolicyType);
const isTrackExpense = iouType === CONST.IOU.TYPE.TRACK;
const shouldShowTax = isTaxTrackingEnabled(isPolicyExpenseChat || isTrackExpense || isExpenseUnreported(currentTransaction), policy, isDistanceRequest);

Expand Down
3 changes: 3 additions & 0 deletions src/selectors/Policy.ts
Original file line number Diff line number Diff line change
Expand Up @@ -213,6 +213,8 @@ function lastWorkspaceNumberSelector(policies: OnyxCollection<Policy>, email: st

const policyNameSelector = (policy: OnyxEntry<Policy>) => policy?.name;

const policyTypeSelector = (policy: OnyxEntry<Policy>) => policy?.type;

const areInvoicesEnabledSelector = (policy: OnyxEntry<Policy>) => policy?.areInvoicesEnabled;

function isAdminForPolicyByIDSelector(policyID?: string) {
Expand Down Expand Up @@ -260,6 +262,7 @@ export {
lastWorkspaceNumberSelector,
hasOnlyPersonalPoliciesSelector,
policyNameSelector,
policyTypeSelector,
areInvoicesEnabledSelector,
createAdminPoliciesSelector,
isAdminForPolicyByIDSelector,
Expand Down
Loading