Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 28 additions & 0 deletions src/hooks/useTravelBillingFundID.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
import {getCardSettings} from '@libs/CardUtils';
import {getTravelBillingCardSettingsKey} from '@libs/TravelBillingUtils';

import CONST from '@src/CONST';

import useDefaultFundID from './useDefaultFundID';
import useOnyx from './useOnyx';
import useWorkspaceAccountID from './useWorkspaceAccountID';

/**
* Hook to get the fundID that holds Consolidated Travel Billing for a given policyID.
* It returns the default fundID unless only the workspace account holds the TRAVEL_US program.
*/
function useTravelBillingFundID(policyID: string | undefined) {
const defaultFundID = useDefaultFundID(policyID);
const workspaceAccountID = useWorkspaceAccountID(policyID);
const [defaultFundCardSettings] = useOnyx(getTravelBillingCardSettingsKey(defaultFundID));
const [workspaceCardSettings] = useOnyx(getTravelBillingCardSettingsKey(workspaceAccountID));

// Setup falls back to the workspace account when the domain already has a card program.
if (!getCardSettings(defaultFundCardSettings, CONST.TRAVEL.PROGRAM_TRAVEL_US) && getCardSettings(workspaceCardSettings, CONST.TRAVEL.PROGRAM_TRAVEL_US)) {
return workspaceAccountID;
}

return defaultFundID;
}

export default useTravelBillingFundID;
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ import Text from '@components/Text';

import useAutoFocusInput from '@hooks/useAutoFocusInput';
import useConfirmModal from '@hooks/useConfirmModal';
import useDefaultFundID from '@hooks/useDefaultFundID';
import useLocalize from '@hooks/useLocalize';
import useOnyx from '@hooks/useOnyx';
import useThemeStyles from '@hooks/useThemeStyles';
import useTravelBillingFundID from '@hooks/useTravelBillingFundID';

import {updateTravelBillingMonthlyLimit} from '@libs/actions/TravelBilling';
import {getCardSettings} from '@libs/CardUtils';
Expand All @@ -36,16 +36,16 @@ function WorkspaceTravelBillingMonthlyLimitPage({route}: WorkspaceTravelBillingM
const styles = useThemeStyles();
const {translate} = useLocalize();
const policyID = route.params?.policyID;
const defaultFundID = useDefaultFundID(policyID);
const [cardSettings] = useOnyx(getTravelBillingCardSettingsKey(defaultFundID));
const travelBillingFundID = useTravelBillingFundID(policyID);
const [cardSettings] = useOnyx(getTravelBillingCardSettingsKey(travelBillingFundID));
const travelSettings = getCardSettings(cardSettings, CONST.TRAVEL.PROGRAM_TRAVEL_US);
const currentLimit = travelSettings?.monthlySpendLimitPerUser ?? 0;
const defaultValue = convertToFrontendAmountAsString(currentLimit, CONST.DEFAULT_CURRENCY_DECIMALS);
const {inputCallbackRef} = useAutoFocusInput();
const {showConfirmModal} = useConfirmModal();

const submitLimit = (newLimitInCents: number) => {
updateTravelBillingMonthlyLimit(defaultFundID, newLimitInCents, currentLimit);
updateTravelBillingMonthlyLimit(travelBillingFundID, newLimitInCents, currentLimit);
Navigation.setNavigationActionToMicrotaskQueue(Navigation.goBack);
};

Expand Down
26 changes: 13 additions & 13 deletions src/pages/workspace/travel/WorkspaceTravelBillingSection.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@ import Text from '@components/Text';

import useConfirmModal from '@hooks/useConfirmModal';
import {useCurrencyListActions} from '@hooks/useCurrencyList';
import useDefaultFundID from '@hooks/useDefaultFundID';
import useExpensifyCardFeedsForFeedSelector from '@hooks/useExpensifyCardFeedsForFeedSelector';
import useLocalize from '@hooks/useLocalize';
import useOnyx from '@hooks/useOnyx';
import usePolicyFeatureWriteAccess from '@hooks/usePolicyFeatureWriteAccess';
import useResponsiveLayout from '@hooks/useResponsiveLayout';
import useThemeStyles from '@hooks/useThemeStyles';
import useTravelBillingFundID from '@hooks/useTravelBillingFundID';

import {
clearTravelBillingErrors,
Expand Down Expand Up @@ -82,7 +82,7 @@ function WorkspaceTravelBillingSection({policyID}: WorkspaceTravelBillingSection
const {isLargeScreenWidth} = useResponsiveLayout();
const {translate} = useLocalize();
const {convertToDisplayString} = useCurrencyListActions();
const defaultFundID = useDefaultFundID(policyID);
const travelBillingFundID = useTravelBillingFundID(policyID);
const {allFeeds: accessibleTravelFeeds} = useExpensifyCardFeedsForFeedSelector(policyID, [CONST.TRAVEL.PROGRAM_TRAVEL_US]);

const {showConfirmModal, closeModal} = useConfirmModal();
Expand All @@ -93,15 +93,15 @@ function WorkspaceTravelBillingSection({policyID}: WorkspaceTravelBillingSection
const shouldResumeToggleRef = useRef(false);

// Read the travel feed from the resolved fund so a shared domain feed shows feed-wide spend and limit.
const [cardSettings] = useOnyx(getTravelBillingCardSettingsKey(defaultFundID));
const [cardSettings] = useOnyx(getTravelBillingCardSettingsKey(travelBillingFundID));
const [cardOnWaitlist] = useOnyx(`${ONYXKEYS.COLLECTION.NVP_EXPENSIFY_ON_CARD_WAITLIST}${policyID}`);
const [account] = useOnyx(ONYXKEYS.ACCOUNT);
const [policy] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY}${policyID}`);
const {canWrite: canWriteMoreFeatures, showReadOnlyModal} = usePolicyFeatureWriteAccess(policy, CONST.POLICY.POLICY_FEATURE.MORE_FEATURES);
const [bankAccountList] = useOnyx(ONYXKEYS.BANK_ACCOUNT_LIST);
const [reimbursementAccount] = useOnyx(ONYXKEYS.REIMBURSEMENT_ACCOUNT);
const [privatePersonalDetails] = useOnyx(ONYXKEYS.PRIVATE_PERSONAL_DETAILS);
const [domainMemberData] = useOnyx(`${ONYXKEYS.COLLECTION.SHARED_NVP_PRIVATE_DOMAIN_MEMBER}${defaultFundID}`);
const [domainMemberData] = useOnyx(`${ONYXKEYS.COLLECTION.SHARED_NVP_PRIVATE_DOMAIN_MEMBER}${travelBillingFundID}`);

// Resolve travel-specific settings from the shared card settings key
const travelSettings = getCardSettings(cardSettings, CONST.TRAVEL.PROGRAM_TRAVEL_US);
Expand Down Expand Up @@ -210,15 +210,15 @@ function WorkspaceTravelBillingSection({policyID}: WorkspaceTravelBillingSection
if (result.action !== ModalActions.CONFIRM) {
return;
}
payTravelBillingSpend(policyID, defaultFundID, travelSpendRef.current);
payTravelBillingSpend(policyID, travelBillingFundID, travelSpendRef.current);
};

/**
* Navigates to the Spend page pre-filtered on the Consolidated Travel Billing feed so admins
* can reconcile their travel spend.
*/
const handleViewOnSpend = () => {
const travelFeedID = getTravelBillingFeedID(defaultFundID);
const travelFeedID = getTravelBillingFeedID(travelBillingFundID);
const query = buildQueryStringFromFilterFormValues({
type: CONST.SEARCH.DATA_TYPES.EXPENSE,
feed: [travelFeedID],
Expand Down Expand Up @@ -260,7 +260,7 @@ function WorkspaceTravelBillingSection({policyID}: WorkspaceTravelBillingSection

// Has settlement account - enable Travel Billing and navigate to settlement page to show verification state
if (settlementAccount?.bankAccountID) {
configureTravelBillingForPolicy(policyID, defaultFundID, settlementAccount.bankAccountID);
configureTravelBillingForPolicy(policyID, travelBillingFundID, settlementAccount.bankAccountID);
}
Navigation.navigate(ROUTES.WORKSPACE_TRAVEL_SETTINGS_ACCOUNT.getRoute(policyID));
};
Expand Down Expand Up @@ -293,7 +293,7 @@ function WorkspaceTravelBillingSection({policyID}: WorkspaceTravelBillingSection
if (result.action !== ModalActions.CONFIRM) {
return;
}
deactivateTravelBilling(policyID, defaultFundID);
deactivateTravelBilling(policyID, travelBillingFundID);
};

/**
Expand Down Expand Up @@ -388,7 +388,7 @@ function WorkspaceTravelBillingSection({policyID}: WorkspaceTravelBillingSection
<FormHelpMessageRowWithRetryButton
message={translate('workspace.moreFeatures.travel.travelInvoicing.travelInvoicingSection.subsections.provisioningError')}
size={CONST.BUTTON_SIZE.SMALL}
onRetry={() => retryTravelCardsProvisioning(policyID, defaultFundID, travelProvisioningErrors ?? {})}
onRetry={() => retryTravelCardsProvisioning(policyID, travelBillingFundID, travelProvisioningErrors ?? {})}
variant={CONST.BUTTON_VARIANT.DANGER}
shouldAlignButtonToMessage
/>
Expand Down Expand Up @@ -444,7 +444,7 @@ function WorkspaceTravelBillingSection({policyID}: WorkspaceTravelBillingSection
<OfflineWithFeedback
errors={settlementAccountErrors}
pendingAction={settlementAccountPendingAction}
onClose={() => clearTravelBillingSettlementAccountErrors(defaultFundID, travelSettings?.previousPaymentBankAccountID ?? null)}
onClose={() => clearTravelBillingSettlementAccountErrors(travelBillingFundID, travelSettings?.previousPaymentBankAccountID ?? null)}
errorRowStyles={styles.mh2half}
errorRowTextStyles={styles.mr3}
>
Expand All @@ -468,7 +468,7 @@ function WorkspaceTravelBillingSection({policyID}: WorkspaceTravelBillingSection
<OfflineWithFeedback
errors={settlementFrequencyErrors}
pendingAction={cardSettings?.pendingFields?.monthlySettlementDate}
onClose={() => clearTravelBillingSettlementFrequencyErrors(defaultFundID, travelSettings?.previousMonthlySettlementDate)}
onClose={() => clearTravelBillingSettlementFrequencyErrors(travelBillingFundID, travelSettings?.previousMonthlySettlementDate)}
errorRowStyles={styles.mh2half}
errorRowTextStyles={styles.mr3}
>
Expand All @@ -487,7 +487,7 @@ function WorkspaceTravelBillingSection({policyID}: WorkspaceTravelBillingSection
<OfflineWithFeedback
errors={monthlyLimitErrors}
pendingAction={cardSettings?.pendingFields?.monthlySpendLimitPerUser}
onClose={() => clearTravelBillingMonthlyLimitErrors(defaultFundID)}
onClose={() => clearTravelBillingMonthlyLimitErrors(travelBillingFundID)}
errorRowStyles={styles.mh2half}
errorRowTextStyles={styles.mr3}
>
Expand Down Expand Up @@ -520,7 +520,7 @@ function WorkspaceTravelBillingSection({policyID}: WorkspaceTravelBillingSection
showLockIcon={!canWriteMoreFeatures || isOnWaitlist || hasOutstandingBalance}
pendingAction={togglePendingAction}
errors={toggleErrors}
onCloseError={() => clearTravelBillingErrors(defaultFundID)}
onCloseError={() => clearTravelBillingErrors(travelBillingFundID)}
subMenuItems={travelBillingSubMenuItems}
/>
</Section>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ import SettlementAccountSelector, {BankAccountListItemLeftElement} from '@compon
import type {BankAccountListItem} from '@components/SettlementAccountSelector';
import Text from '@components/Text';

import useDefaultFundID from '@hooks/useDefaultFundID';
import useLocalize from '@hooks/useLocalize';
import useOnyx from '@hooks/useOnyx';
import useThemeStyles from '@hooks/useThemeStyles';
import useTravelBillingFundID from '@hooks/useTravelBillingFundID';

import {configureTravelBillingForPolicy, setTravelBillingSettlementAccount} from '@libs/actions/TravelBilling';
import {getLastFourDigits} from '@libs/BankAccountUtils';
Expand All @@ -37,10 +37,10 @@ function WorkspaceTravelBillingSettlementAccountPage({route}: WorkspaceTravelBil
const styles = useThemeStyles();
const {translate} = useLocalize();
const policyID = route.params?.policyID;
const defaultFundID = useDefaultFundID(policyID);
const travelBillingFundID = useTravelBillingFundID(policyID);

const [bankAccountsList] = useOnyx(ONYXKEYS.BANK_ACCOUNT_LIST);
const [cardSettings] = useOnyx(getTravelBillingCardSettingsKey(defaultFundID));
const [cardSettings] = useOnyx(getTravelBillingCardSettingsKey(travelBillingFundID));
const [cardOnWaitlist] = useOnyx(`${ONYXKEYS.COLLECTION.NVP_EXPENSIFY_ON_CARD_WAITLIST}${policyID}`);

const travelSettings = getCardSettings(cardSettings, CONST.TRAVEL.PROGRAM_TRAVEL_US);
Expand Down Expand Up @@ -89,12 +89,12 @@ function WorkspaceTravelBillingSettlementAccountPage({route}: WorkspaceTravelBil
}

if (!isTravelBillingEnabled) {
configureTravelBillingForPolicy(policyID, defaultFundID, value);
configureTravelBillingForPolicy(policyID, travelBillingFundID, value);
return;
}

const previousPaymentBankAccountID = travelSettings?.previousPaymentBankAccountID ?? travelSettings?.paymentBankAccountID;
setTravelBillingSettlementAccount(policyID, defaultFundID, value, previousPaymentBankAccountID);
setTravelBillingSettlementAccount(policyID, travelBillingFundID, value, previousPaymentBankAccountID);
Navigation.goBack();
};

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ import SingleSelectListItem from '@components/SelectionList/ListItem/SingleSelec
import type {ListItem} from '@components/SelectionList/types';
import Text from '@components/Text';

import useDefaultFundID from '@hooks/useDefaultFundID';
import useLocalize from '@hooks/useLocalize';
import useOnyx from '@hooks/useOnyx';
import useThemeStyles from '@hooks/useThemeStyles';
import useTravelBillingFundID from '@hooks/useTravelBillingFundID';

import {updateTravelBillingSettlementFrequency} from '@libs/actions/TravelBilling';
import {getCardSettings} from '@libs/CardUtils';
Expand Down Expand Up @@ -36,8 +36,8 @@ function WorkspaceTravelBillingSettlementFrequencyPage({route}: WorkspaceTravelB
const styles = useThemeStyles();
const {translate} = useLocalize();
const policyID = route.params?.policyID;
const defaultFundID = useDefaultFundID(policyID);
const [cardSettings] = useOnyx(getTravelBillingCardSettingsKey(defaultFundID));
const travelBillingFundID = useTravelBillingFundID(policyID);
const [cardSettings] = useOnyx(getTravelBillingCardSettingsKey(travelBillingFundID));
const travelSettings = getCardSettings(cardSettings, CONST.TRAVEL.PROGRAM_TRAVEL_US);

const currentFrequency = getTravelSettlementFrequency(travelSettings);
Expand Down Expand Up @@ -68,7 +68,7 @@ function WorkspaceTravelBillingSettlementFrequencyPage({route}: WorkspaceTravelB
const monthlySettlementDate = travelSettings?.monthlySettlementDate;
const saveAndGoBack = () => {
if (selectedFrequency && (selectedFrequency !== currentFrequency || hasFrequencyError)) {
updateTravelBillingSettlementFrequency(defaultFundID, selectedFrequency, monthlySettlementDate);
updateTravelBillingSettlementFrequency(travelBillingFundID, selectedFrequency, monthlySettlementDate);
}
Navigation.goBack();
};
Expand Down
32 changes: 32 additions & 0 deletions tests/ui/WorkspaceTravelBillingSectionTest.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ import waitForBatchedUpdatesWithAct from '../utils/waitForBatchedUpdatesWithAct'
// because jest.mock() is hoisted before variable declarations are evaluated
const POLICY_ID = 'testPolicy123';
const WORKSPACE_ACCOUNT_ID = 999888;
const DOMAIN_ACCOUNT_ID = 8309850;

// jest.mock() factories are hoisted and run before imports/variables are defined.
// Therefore, they cannot reference variables like POLICY_ID or WORKSPACE_ACCOUNT_ID.
Expand Down Expand Up @@ -636,6 +637,37 @@ describe('WorkspaceTravelBillingSection', () => {
expect(deactivateTravelBilling).toHaveBeenCalledWith(POLICY_ID, WORKSPACE_ACCOUNT_ID);
});

it('should deactivate on the workspace account when the domain card program has no travel program', async () => {
// Given a domain card program linked to this workspace, and travel billing set up on the workspace account
await act(async () => {
await Onyx.merge(`${ONYXKEYS.COLLECTION.POLICY}${POLICY_ID}`, mockPolicy);
await Onyx.merge(getTravelBillingCardSettingsKey(DOMAIN_ACCOUNT_ID), {
US: {
linkedPolicyIDs: [POLICY_ID],
paymentBankAccountID: 67890,
},
});
await Onyx.merge(cardSettingsKey, {
TRAVEL_US: {
isEnabled: true,
paymentBankAccountID: 12345,
currentBalance: 0,
pendingSettlementAmount: 0,
},
});
await waitForBatchedUpdatesWithAct();
});

// When the admin turns travel billing off
renderWorkspaceTravelBillingSection();
await waitForBatchedUpdatesWithAct();
fireEvent.press(screen.getByRole('switch'));
await waitForBatchedUpdatesWithAct();

// Then the toggle was on and the workspace account's travel billing is deactivated
expect(deactivateTravelBilling).toHaveBeenCalledWith(POLICY_ID, WORKSPACE_ACCOUNT_ID);
});

it('should not deactivate when the confirmation modal is dismissed', async () => {
mockShowConfirmModal.mockResolvedValueOnce({action: 'CLOSE'});

Expand Down
Loading