Skip to content

Commit a70e845

Browse files
authored
Revert "show error when rate invalid duplicate violation"
1 parent 176dbd8 commit a70e845

2 files changed

Lines changed: 3 additions & 63 deletions

File tree

src/libs/actions/IOU.ts

Lines changed: 0 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,6 @@ import {addSMSDomainIfPhoneNumber} from '@libs/PhoneNumber';
7373
import {
7474
getCorrectedAutoReportingFrequency,
7575
getDistanceRateCustomUnit,
76-
getDistanceRateCustomUnitRate,
7776
getMemberAccountIDsForWorkspace,
7877
getPerDiemCustomUnit,
7978
getPerDiemRateCustomUnitRate,
@@ -12144,19 +12143,6 @@ function updateSplitExpenseAmountField(draftTransaction: OnyxEntry<OnyxTypes.Tra
1214412143
});
1214512144
}
1214612145

12147-
/**
12148-
* Clear errors from split transaction draft
12149-
*/
12150-
function clearSplitTransactionDraftErrors(transactionID: string | undefined) {
12151-
if (!transactionID) {
12152-
return;
12153-
}
12154-
12155-
Onyx.merge(`${ONYXKEYS.COLLECTION.SPLIT_TRANSACTION_DRAFT}${transactionID}`, {
12156-
errors: null,
12157-
});
12158-
}
12159-
1216012146
function saveSplitTransactions(draftTransaction: OnyxEntry<OnyxTypes.Transaction>, hash: number) {
1216112147
const transactionReport = getReportOrDraftReport(draftTransaction?.reportID);
1216212148
const parentTransactionReport = getReportOrDraftReport(transactionReport?.parentReportID);
@@ -12174,23 +12160,6 @@ function saveSplitTransactions(draftTransaction: OnyxEntry<OnyxTypes.Transaction
1217412160
const participants = getMoneyRequestParticipantsFromReport(expenseReport);
1217512161
const splitExpenses = draftTransaction?.comment?.splitExpenses ?? [];
1217612162

12177-
// Validate distance rate before proceeding with split
12178-
const customUnitRateID = originalTransaction?.comment?.customUnit?.customUnitRateID;
12179-
if (customUnitRateID && policy) {
12180-
const customUnitRate = getDistanceRateCustomUnitRate(policy, customUnitRateID);
12181-
12182-
// If the rate doesn't exist or is disabled, show an error and return early
12183-
if (!customUnitRate || !customUnitRate.enabled) {
12184-
const errorMessage = !customUnitRate ? 'iou.error.invalidRate' : 'iou.error.genericEditFailureMessage';
12185-
12186-
// Show error to user
12187-
Onyx.merge(`${ONYXKEYS.COLLECTION.SPLIT_TRANSACTION_DRAFT}${originalTransactionID}`, {
12188-
errors: getMicroSecondOnyxErrorWithTranslationKey(errorMessage),
12189-
});
12190-
return;
12191-
}
12192-
}
12193-
1219412163
const splits: SplitTransactionSplitsParam =
1219512164
splitExpenses.map((split) => {
1219612165
const currentDescription = getParsedComment(Parser.htmlToMarkdown(split.description ?? ''));
@@ -12497,6 +12466,5 @@ export {
1249712466
reopenReport,
1249812467
retractReport,
1249912468
startDistanceRequest,
12500-
clearSplitTransactionDraftErrors,
1250112469
};
1250212470
export type {GPSPoint as GpsPoint, IOURequestType, StartSplitBilActionParams, CreateTrackExpenseParams, RequestMoneyInformation, ReplaceReceipt};

src/pages/iou/SplitExpensePage.tsx

Lines changed: 3 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import useOnyx from '@hooks/useOnyx';
1515
import usePolicy from '@hooks/usePolicy';
1616
import useResponsiveLayout from '@hooks/useResponsiveLayout';
1717
import useThemeStyles from '@hooks/useThemeStyles';
18-
import {addSplitExpenseField, clearSplitTransactionDraftErrors, initDraftSplitExpenseDataForEdit, saveSplitTransactions, updateSplitExpenseAmountField} from '@libs/actions/IOU';
18+
import {addSplitExpenseField, initDraftSplitExpenseDataForEdit, saveSplitTransactions, updateSplitExpenseAmountField} from '@libs/actions/IOU';
1919
import {convertToBackendAmount, convertToDisplayString} from '@libs/CurrencyUtils';
2020
import DateUtils from '@libs/DateUtils';
2121
import {canUseTouchScreen} from '@libs/DeviceCapabilities';
@@ -66,39 +66,11 @@ function SplitExpensePage({route}: SplitExpensePageProps) {
6666
setErrorMessage('');
6767
}, [sumOfSplitExpenses, draftTransaction?.comment?.splitExpenses?.length]);
6868

69-
useEffect(() => {
70-
if (!draftTransaction?.errors) {
71-
return;
72-
}
73-
74-
const errorKeys = Object.keys(draftTransaction.errors);
75-
if (errorKeys.length === 0) {
76-
return;
77-
}
78-
79-
const firstErrorKey = errorKeys.at(0);
80-
if (!firstErrorKey) {
81-
return;
82-
}
83-
84-
const errorText = draftTransaction.errors[firstErrorKey];
85-
if (errorText) {
86-
const errorString = typeof errorText === 'string' ? errorText : errorText.source;
87-
setErrorMessage(errorString);
88-
}
89-
}, [draftTransaction?.errors]);
90-
9169
const onAddSplitExpense = useCallback(() => {
92-
if (draftTransaction?.errors) {
93-
clearSplitTransactionDraftErrors(transactionID);
94-
}
9570
addSplitExpenseField(transaction, draftTransaction);
96-
}, [draftTransaction, transaction, transactionID]);
71+
}, [draftTransaction, transaction]);
9772

9873
const onSaveSplitExpense = useCallback(() => {
99-
if (draftTransaction?.errors) {
100-
clearSplitTransactionDraftErrors(transactionID);
101-
}
10274
if (sumOfSplitExpenses > Math.abs(transactionDetailsAmount)) {
10375
const difference = sumOfSplitExpenses - Math.abs(transactionDetailsAmount);
10476
setErrorMessage(translate('iou.totalAmountGreaterThanOriginal', {amount: convertToDisplayString(difference, transactionDetails?.currency)}));
@@ -116,7 +88,7 @@ function SplitExpensePage({route}: SplitExpensePageProps) {
11688
}
11789

11890
saveSplitTransactions(draftTransaction, currentSearchHash);
119-
}, [draftTransaction, sumOfSplitExpenses, transactionDetailsAmount, isPerDiem, isCard, currentSearchHash, transactionID, translate, transactionDetails?.currency]);
91+
}, [currentSearchHash, draftTransaction, isCard, isPerDiem, sumOfSplitExpenses, transactionDetailsAmount, transactionDetails?.currency, translate]);
12092

12193
const onSplitExpenseAmountChange = useCallback(
12294
(currentItemTransactionID: string, value: number) => {

0 commit comments

Comments
 (0)