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
32 changes: 32 additions & 0 deletions src/libs/actions/IOU.ts
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@ import {addSMSDomainIfPhoneNumber} from '@libs/PhoneNumber';
import {
getCorrectedAutoReportingFrequency,
getDistanceRateCustomUnit,
getDistanceRateCustomUnitRate,
getMemberAccountIDsForWorkspace,
getPerDiemCustomUnit,
getPerDiemRateCustomUnitRate,
Expand Down Expand Up @@ -11959,6 +11960,19 @@ function updateSplitExpenseAmountField(draftTransaction: OnyxEntry<OnyxTypes.Tra
});
}

/**
* Clear errors from split transaction draft
*/
function clearSplitTransactionDraftErrors(transactionID: string | undefined) {
if (!transactionID) {
return;
}

Onyx.merge(`${ONYXKEYS.COLLECTION.SPLIT_TRANSACTION_DRAFT}${transactionID}`, {
errors: null,
});
}

function saveSplitTransactions(draftTransaction: OnyxEntry<OnyxTypes.Transaction>, hash: number) {
const transactionReport = getReportOrDraftReport(draftTransaction?.reportID);
const parentTransactionReport = getReportOrDraftReport(transactionReport?.parentReportID);
Expand All @@ -11976,6 +11990,23 @@ function saveSplitTransactions(draftTransaction: OnyxEntry<OnyxTypes.Transaction
const participants = getMoneyRequestParticipantsFromReport(expenseReport);
const splitExpenses = draftTransaction?.comment?.splitExpenses ?? [];

// Validate distance rate before proceeding with split
const customUnitRateID = originalTransaction?.comment?.customUnit?.customUnitRateID;
if (customUnitRateID && policy) {
const customUnitRate = getDistanceRateCustomUnitRate(policy, customUnitRateID);

// If the rate doesn't exist or is disabled, show an error and return early
if (!customUnitRate || !customUnitRate.enabled) {
const errorMessage = !customUnitRate ? 'iou.error.invalidRate' : 'iou.error.genericEditFailureMessage';

// Show error to user
Onyx.merge(`${ONYXKEYS.COLLECTION.SPLIT_TRANSACTION_DRAFT}${originalTransactionID}`, {
errors: getMicroSecondOnyxErrorWithTranslationKey(errorMessage),
});
return;
}
}

const splits: SplitTransactionSplitsParam =
splitExpenses.map((split) => {
const currentDescription = getParsedComment(Parser.htmlToMarkdown(split.description ?? ''));
Expand Down Expand Up @@ -12254,5 +12285,6 @@ export {
reopenReport,
retractReport,
startDistanceRequest,
clearSplitTransactionDraftErrors,
};
export type {GPSPoint as GpsPoint, IOURequestType, StartSplitBilActionParams, CreateTrackExpenseParams, RequestMoneyInformation, ReplaceReceipt};
34 changes: 31 additions & 3 deletions src/pages/iou/SplitExpensePage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import useOnyx from '@hooks/useOnyx';
import usePolicy from '@hooks/usePolicy';
import useResponsiveLayout from '@hooks/useResponsiveLayout';
import useThemeStyles from '@hooks/useThemeStyles';
import {addSplitExpenseField, initDraftSplitExpenseDataForEdit, saveSplitTransactions, updateSplitExpenseAmountField} from '@libs/actions/IOU';
import {addSplitExpenseField, clearSplitTransactionDraftErrors, initDraftSplitExpenseDataForEdit, saveSplitTransactions, updateSplitExpenseAmountField} from '@libs/actions/IOU';
import {convertToBackendAmount, convertToDisplayString} from '@libs/CurrencyUtils';
import DateUtils from '@libs/DateUtils';
import {canUseTouchScreen} from '@libs/DeviceCapabilities';
Expand Down Expand Up @@ -66,11 +66,39 @@ function SplitExpensePage({route}: SplitExpensePageProps) {
setErrorMessage('');
}, [sumOfSplitExpenses, draftTransaction?.comment?.splitExpenses?.length]);

useEffect(() => {
if (!draftTransaction?.errors) {
return;
}

const errorKeys = Object.keys(draftTransaction.errors);
if (errorKeys.length === 0) {
return;
}

const firstErrorKey = errorKeys.at(0);
if (!firstErrorKey) {
return;
}

const errorText = draftTransaction.errors[firstErrorKey];
if (errorText) {
const errorString = typeof errorText === 'string' ? errorText : errorText.source;
setErrorMessage(errorString);
}
}, [draftTransaction?.errors]);

const onAddSplitExpense = useCallback(() => {
if (draftTransaction?.errors) {
clearSplitTransactionDraftErrors(transactionID);
}
addSplitExpenseField(transaction, draftTransaction);
}, [draftTransaction, transaction]);
}, [draftTransaction, transaction, transactionID]);

const onSaveSplitExpense = useCallback(() => {
if (draftTransaction?.errors) {
clearSplitTransactionDraftErrors(transactionID);
}
if (sumOfSplitExpenses > Math.abs(transactionDetailsAmount)) {
const difference = sumOfSplitExpenses - Math.abs(transactionDetailsAmount);
setErrorMessage(translate('iou.totalAmountGreaterThanOriginal', {amount: convertToDisplayString(difference, transactionDetails?.currency)}));
Expand All @@ -88,7 +116,7 @@ function SplitExpensePage({route}: SplitExpensePageProps) {
}

saveSplitTransactions(draftTransaction, currentSearchHash);
}, [currentSearchHash, draftTransaction, isCard, isPerDiem, sumOfSplitExpenses, transactionDetailsAmount, transactionDetails?.currency, translate]);
}, [draftTransaction, sumOfSplitExpenses, transactionDetailsAmount, isPerDiem, isCard, currentSearchHash, transactionID, translate, transactionDetails?.currency]);

const onSplitExpenseAmountChange = useCallback(
(currentItemTransactionID: string, value: number) => {
Expand Down