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
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import useCurrentUserPersonalDetails from '@hooks/useCurrentUserPersonalDetails'
import useDefaultExpensePolicy from '@hooks/useDefaultExpensePolicy';
import useLocalize from '@hooks/useLocalize';
import useOnyx from '@hooks/useOnyx';
import usePersonalPolicy from '@hooks/usePersonalPolicy';
import DistanceRequestUtils from '@libs/DistanceRequestUtils';
import shouldUseDefaultExpensePolicyUtil from '@libs/shouldUseDefaultExpensePolicy';
import {shouldUpdateGpsNotificationUnit, updateGpsTripNotificationLanguage, updateGpsTripNotificationUnit} from '@pages/iou/request/step/IOURequestStepDistanceGPS/GPSNotifications';
Expand Down Expand Up @@ -43,6 +44,7 @@ function useUpdateGpsNotificationOnUnitChange() {
const [transaction] = useOnyx(`${ONYXKEYS.COLLECTION.TRANSACTION_DRAFT}${CONST.IOU.OPTIMISTIC_TRANSACTION_ID}`);

const defaultExpensePolicy = useDefaultExpensePolicy();
const personalPolicy = usePersonalPolicy();
const shouldUseDefaultExpensePolicy = shouldUseDefaultExpensePolicyUtil(
CONST.IOU.TYPE.CREATE,
defaultExpensePolicy,
Expand All @@ -52,7 +54,11 @@ function useUpdateGpsNotificationOnUnitChange() {
currentUserPersonalDetails.accountID,
);

const unit = DistanceRequestUtils.getRate({transaction, policy: shouldUseDefaultExpensePolicy ? defaultExpensePolicy : undefined}).unit;
const unit = DistanceRequestUtils.getRate({
transaction,
policy: shouldUseDefaultExpensePolicy ? defaultExpensePolicy : undefined,
personalPolicyOutputCurrency: personalPolicy?.outputCurrency,
}).unit;

useEffect(() => {
if (!shouldUpdateGpsNotificationUnit()) {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import type {OnyxEntry} from 'react-native-onyx';
import useOnyx from '@hooks/useOnyx';
import usePersonalPolicy from '@hooks/usePersonalPolicy';
import usePrevious from '@hooks/usePrevious';
import DistanceRequestUtils from '@libs/DistanceRequestUtils';
import {getDistanceInMeters, hasRoute as hasRouteUtil} from '@libs/TransactionUtils';
Expand Down Expand Up @@ -68,12 +69,15 @@ function useDistanceRequestState({
const defaultMileageRate = defaultMileageRateDraft ?? defaultMileageRateReal;
const defaultRate = defaultMileageRate?.customUnitRateID;

const personalPolicy = usePersonalPolicy();

const mileageRate = DistanceRequestUtils.getRate({
transaction,
policy,
...(isMovingTransactionFromTrackExpense && {policyForMovingExpenses}),
isMovingTransactionFromTrackExpense,
policyDraft,
personalPolicyOutputCurrency: personalPolicy?.outputCurrency,
});
const distanceRate = mileageRate.rate;
const distanceUnit = mileageRate.unit;
Expand Down
12 changes: 11 additions & 1 deletion src/components/ReportActionItem/MoneyRequestView.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ import useLocalize from '@hooks/useLocalize';
import useNetwork from '@hooks/useNetwork';
import useOnyx from '@hooks/useOnyx';
import usePermissions from '@hooks/usePermissions';
import usePersonalPolicy from '@hooks/usePersonalPolicy';
import usePolicyForMovingExpenses from '@hooks/usePolicyForMovingExpenses';
import useReportAttributes from '@hooks/useReportAttributes';
import useReportIsArchived from '@hooks/useReportIsArchived';
Expand Down Expand Up @@ -206,6 +207,7 @@ function MoneyRequestView({
transaction = updatedTransaction;
}
const isExpenseUnreported = isExpenseUnreportedTransactionUtils(transaction);
const personalPolicy = usePersonalPolicy();
const {policyForMovingExpensesID, policyForMovingExpenses, shouldSelectPolicy} = usePolicyForMovingExpenses();
const isTimeRequest = isTimeRequestTransactionUtils(transaction);

Expand Down Expand Up @@ -467,7 +469,15 @@ function MoneyRequestView({
let amountDescription = `${translate('iou.amount')}`;
let dateDescription = `${translate('common.date')}`;

const {unit, rate, name: rateName} = DistanceRequestUtils.getRate({transaction: updatedTransaction ?? transaction, policy: distanceOriginalPolicy ?? policy});
const {
unit,
rate,
name: rateName,
} = DistanceRequestUtils.getRate({
transaction: updatedTransaction ?? transaction,
policy: distanceOriginalPolicy ?? policy,
personalPolicyOutputCurrency: personalPolicy?.outputCurrency,
});
const distance = getDistanceInMeters(transactionBackup ?? updatedTransaction ?? transaction, unit);
const currency = transactionCurrency ?? CONST.CURRENCY.USD;
const hasRequiredCompanyCardViolation = transactionViolations.some((violation) => violation.name === CONST.VIOLATIONS.COMPANY_CARD_REQUIRED);
Expand Down
12 changes: 11 additions & 1 deletion src/pages/iou/SplitExpenseEditPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ import useEnvironment from '@hooks/useEnvironment';
import useLocalize from '@hooks/useLocalize';
import useNetwork from '@hooks/useNetwork';
import useOnyx from '@hooks/useOnyx';
import usePersonalPolicy from '@hooks/usePersonalPolicy';
import usePolicyForMovingExpenses from '@hooks/usePolicyForMovingExpenses';
import usePrevious from '@hooks/usePrevious';
import useReportAttributes from '@hooks/useReportAttributes';
Expand Down Expand Up @@ -74,6 +75,7 @@ function SplitExpenseEditPage({route}: SplitExpensePageProps) {
const parentReport = allReports?.[`${ONYXKEYS.COLLECTION.REPORT}${report?.parentReportID}`];
const currentReport = report ?? currentSearchResults?.data?.[`${ONYXKEYS.COLLECTION.REPORT}${getNonEmptyStringOnyxID(reportID)}`];

const personalPolicy = usePersonalPolicy();
const effectivePolicy = useSplitEffectivePolicy(currentReport, splitExpenseDraftTransaction, transaction);
const [allPolicies] = useOnyx(ONYXKEYS.COLLECTION.POLICY);

Expand Down Expand Up @@ -161,7 +163,15 @@ function SplitExpenseEditPage({route}: SplitExpensePageProps) {
const isDistance = isDistanceRequest(splitExpenseDraftTransaction);
const isManualDistance = isManualDistanceRequest(splitExpenseDraftTransaction);
const isOdometerDistance = isOdometerDistanceRequest(splitExpenseDraftTransaction);
const {unit, rate, name: rateName} = DistanceRequestUtils.getRate({transaction: splitExpenseDraftTransaction, policy: effectivePolicy});
const {
unit,
rate,
name: rateName,
} = DistanceRequestUtils.getRate({
transaction: splitExpenseDraftTransaction,
policy: effectivePolicy,
personalPolicyOutputCurrency: personalPolicy?.outputCurrency,
});
const distance = getDistanceInMeters(splitExpenseDraftTransaction, unit);
const currentAmount =
isDistance && distance && rate
Expand Down
1 change: 1 addition & 0 deletions src/pages/iou/request/step/IOURequestStepDistance.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -166,6 +166,7 @@ function IOURequestStepDistance({
transaction: currentTransaction,
policy,
useTransactionDistanceUnit: false,
personalPolicyOutputCurrency: personalPolicy?.outputCurrency,
});
const distanceUnit = mileageRate.unit;
const distanceRate = mileageRate.rate ?? 0;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,11 @@ function IOURequestStepDistanceGPS({

const shouldUseDefaultExpensePolicy = shouldUseDefaultExpensePolicyUtil(iouType, defaultExpensePolicy, amountOwed, userBillingGracePeriodEnds, ownerBillingGracePeriodEnd);

const unit = DistanceRequestUtils.getRate({transaction, policy: shouldUseDefaultExpensePolicy ? defaultExpensePolicy : policy}).unit;
const unit = DistanceRequestUtils.getRate({
transaction,
policy: shouldUseDefaultExpensePolicy ? defaultExpensePolicy : policy,
personalPolicyOutputCurrency: personalPolicy?.outputCurrency,
}).unit;

const shouldSkipConfirmation = !skipConfirmation || !report?.reportID ? false : !(isArchived || isPolicyExpenseChatUtils(report));

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,7 @@ function IOURequestStepDistanceManual({
transaction,
policy: shouldUseDefaultExpensePolicy ? defaultExpensePolicy : policy,
useTransactionDistanceUnit: isEditing,
personalPolicyOutputCurrency: personalPolicy?.outputCurrency,
});
const unit = mileageRate.unit;
const rate = mileageRate.rate ?? 0;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,11 @@ function IOURequestStepDistanceOdometer({
[iouType, defaultExpensePolicy, amountOwed, userBillingGracePeriodEnds, ownerBillingGracePeriodEnd],
);

const mileageRate = DistanceRequestUtils.getRate({transaction: currentTransaction, policy: shouldUseDefaultExpensePolicy ? defaultExpensePolicy : policy});
const mileageRate = DistanceRequestUtils.getRate({
transaction: currentTransaction,
policy: shouldUseDefaultExpensePolicy ? defaultExpensePolicy : policy,
personalPolicyOutputCurrency: personalPolicy?.outputCurrency,
});
const unit = mileageRate.unit;
const rate = mileageRate.rate ?? 0;

Expand Down
Loading