diff --git a/src/libs/actions/IOU.ts b/src/libs/actions/IOU.ts index 6f6e21fbd2a9..dd381b135045 100644 --- a/src/libs/actions/IOU.ts +++ b/src/libs/actions/IOU.ts @@ -72,6 +72,7 @@ import {addSMSDomainIfPhoneNumber} from '@libs/PhoneNumber'; import { getCorrectedAutoReportingFrequency, getDistanceRateCustomUnit, + getDistanceRateCustomUnitRate, getMemberAccountIDsForWorkspace, getPerDiemCustomUnit, getPerDiemRateCustomUnitRate, @@ -11959,6 +11960,19 @@ function updateSplitExpenseAmountField(draftTransaction: OnyxEntry, hash: number) { const transactionReport = getReportOrDraftReport(draftTransaction?.reportID); const parentTransactionReport = getReportOrDraftReport(transactionReport?.parentReportID); @@ -11976,6 +11990,23 @@ function saveSplitTransactions(draftTransaction: OnyxEntry { const currentDescription = getParsedComment(Parser.htmlToMarkdown(split.description ?? '')); @@ -12254,5 +12285,6 @@ export { reopenReport, retractReport, startDistanceRequest, + clearSplitTransactionDraftErrors, }; export type {GPSPoint as GpsPoint, IOURequestType, StartSplitBilActionParams, CreateTrackExpenseParams, RequestMoneyInformation, ReplaceReceipt}; diff --git a/src/pages/iou/SplitExpensePage.tsx b/src/pages/iou/SplitExpensePage.tsx index 8c825708cc37..c91fab3a6b80 100644 --- a/src/pages/iou/SplitExpensePage.tsx +++ b/src/pages/iou/SplitExpensePage.tsx @@ -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'; @@ -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)})); @@ -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) => {