Skip to content
Merged
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
16 changes: 8 additions & 8 deletions src/pages/iou/SplitExpensePage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ function SplitExpensePage({route}: SplitExpensePageProps) {

const transactionDetails = useMemo<Partial<TransactionDetails>>(() => getTransactionDetails(transaction) ?? {}, [transaction]);
const transactionDetailsAmount = transactionDetails?.amount ?? 0;
const sumOfSplitExpenses = useMemo(() => (draftTransaction?.comment?.splitExpenses ?? []).reduce((acc, item) => acc + Math.abs(item.amount ?? 0), 0), [draftTransaction]);
const sumOfSplitExpenses = useMemo(() => (draftTransaction?.comment?.splitExpenses ?? []).reduce((acc, item) => acc + (item.amount ?? 0), 0), [draftTransaction]);
const splitExpenses = useMemo(() => draftTransaction?.comment?.splitExpenses ?? [], [draftTransaction?.comment?.splitExpenses]);

const currencySymbol = currencyList?.[transactionDetails.currency ?? '']?.symbol ?? transactionDetails.currency ?? CONST.CURRENCY.USD;
Expand Down Expand Up @@ -143,13 +143,13 @@ function SplitExpensePage({route}: SplitExpensePageProps) {
if (draftTransaction?.errors) {
clearSplitTransactionDraftErrors(transactionID);
}
if (sumOfSplitExpenses > Math.abs(transactionDetailsAmount)) {
const difference = sumOfSplitExpenses - Math.abs(transactionDetailsAmount);
if (sumOfSplitExpenses > transactionDetailsAmount) {
const difference = sumOfSplitExpenses - transactionDetailsAmount;
setErrorMessage(translate('iou.totalAmountGreaterThanOriginal', {amount: convertToDisplayString(difference, transactionDetails?.currency)}));
return;
}
if (sumOfSplitExpenses < Math.abs(transactionDetailsAmount) && (isPerDiem || isCard)) {
const difference = Math.abs(transactionDetailsAmount) - sumOfSplitExpenses;
if (sumOfSplitExpenses < transactionDetailsAmount && (isPerDiem || isCard)) {
const difference = transactionDetailsAmount - sumOfSplitExpenses;
setErrorMessage(translate('iou.totalAmountLessThanOriginal', {amount: convertToDisplayString(difference, transactionDetails?.currency)}));
return;
}
Expand Down Expand Up @@ -266,7 +266,7 @@ function SplitExpensePage({route}: SplitExpensePageProps) {
...item,
headerText,
originalAmount: transactionDetailsAmount,
amount: transactionDetailsAmount >= 0 ? Math.abs(Number(item.amount)) : Number(item.amount),
amount: Number(item.amount),
merchant: item?.merchant ?? '',
currency: draftTransaction?.currency ?? CONST.CURRENCY.USD,
transactionID: item?.transactionID ?? CONST.IOU.OPTIMISTIC_TRANSACTION_ID,
Expand Down Expand Up @@ -310,9 +310,9 @@ function SplitExpensePage({route}: SplitExpensePageProps) {
);

const footerContent = useMemo(() => {
const shouldShowWarningMessage = sumOfSplitExpenses < Math.abs(transactionDetailsAmount);
const shouldShowWarningMessage = sumOfSplitExpenses < transactionDetailsAmount;
const warningMessage = shouldShowWarningMessage
? translate('iou.totalAmountLessThanOriginal', {amount: convertToDisplayString(Math.abs(transactionDetailsAmount) - sumOfSplitExpenses, transactionDetails.currency)})
? translate('iou.totalAmountLessThanOriginal', {amount: convertToDisplayString(transactionDetailsAmount - sumOfSplitExpenses, transactionDetails.currency)})
: '';
return (
<View
Expand Down