Skip to content

[CP Staging] Revert "fix: Incorrect split amount is allowed to save" #78156

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
cristipaval merged 1 commit into from
Dec 19, 2025
Merged

[CP Staging] Revert "fix: Incorrect split amount is allowed to save" #78156

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion src/libs/ReportUtils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4543,7 +4543,7 @@

const report = getReportOrDraftReport(transaction?.reportID, undefined, 'report' in transaction ? transaction.report : undefined);
const isManualDistanceRequest = isManualDistanceRequestTransactionUtils(transaction);
const isFromExpenseReport = (!isEmptyObject(report) && isExpenseReport(report)) || isPaidGroupPolicyPolicyUtils(policy);
const isFromExpenseReport = !isEmptyObject(report) && isExpenseReport(report);

return {
created: getFormattedCreated(transaction, createdDateFormat),
Expand Down Expand Up @@ -5316,7 +5316,7 @@
return translateLocal(translatePhraseKey, payerDisplayName ?? '');
}
if (translatePhraseKey === 'iou.payerPaidAmount') {
return translateLocal(translatePhraseKey, '', payerDisplayName ?? '');

Check failure on line 5319 in src/libs/ReportUtils.ts

View workflow job for this annotation

GitHub Actions / Changed files ESLint check 

`translateLocal` is deprecated. This function uses imperative Onyx data access patterns, similar to `Onyx.connect`. Use `useLocalize` hook instead for reactive data access in React components
}
}

Expand Down Expand Up @@ -10521,14 +10521,14 @@

if (automaticAction) {
if (originalMessage.paymentType === CONST.IOU.PAYMENT_TYPE.EXPENSIFY) {
return translateLocal('iou.automaticallyPaidWithExpensify', '');

Check failure on line 10524 in src/libs/ReportUtils.ts

View workflow job for this annotation

GitHub Actions / Changed files ESLint check 

`translateLocal` is deprecated. This function uses imperative Onyx data access patterns, similar to `Onyx.connect`. Use `useLocalize` hook instead for reactive data access in React components
}
// eslint-disable-next-line @typescript-eslint/no-deprecated
return translateLocal('iou.automaticallyPaidWithBusinessBankAccount', '', last4Digits);
}
break;
default:
return translateLocal('iou.payerPaidAmount', '', '');

Check failure on line 10531 in src/libs/ReportUtils.ts

View workflow job for this annotation

GitHub Actions / Changed files ESLint check 

`translateLocal` is deprecated. This function uses imperative Onyx data access patterns, similar to `Onyx.connect`. Use `useLocalize` hook instead for reactive data access in React components
}
if (translationKey === 'iou.businessBankAccount') {
// eslint-disable-next-line @typescript-eslint/no-deprecated
Expand Down
21 changes: 5 additions & 16 deletions src/pages/iou/SplitExpensePage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ import OnyxTabNavigator, {TabScreenWithFocusTrapWrapper, TopTab} from '@libs/Nav
import type {PlatformStackScreenProps} from '@libs/Navigation/PlatformStackNavigation/types';
import type {SplitExpenseParamList} from '@libs/Navigation/types';
import {isSplitAction} from '@libs/ReportSecondaryActionUtils';
import type {TransactionDetails} from '@libs/ReportUtils';
import {getReportOrDraftReport, getTransactionDetails, isReportApproved, isSettled as isSettledReportUtils} from '@libs/ReportUtils';
import type {TranslationPathOrText} from '@libs/TransactionPreviewUtils';
import {getChildTransactions, isManagedCardTransaction, isPerDiemRequest} from '@libs/TransactionUtils';
Expand Down Expand Up @@ -98,12 +99,12 @@ function SplitExpensePage({route}: SplitExpensePageProps) {

const isSplitAvailable = report && transaction && isSplitAction(currentReport, [transaction], originalTransaction, currentPolicy);

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

const currencySymbol = currencyList?.[transactionDetails?.currency ?? '']?.symbol ?? transactionDetails?.currency ?? CONST.CURRENCY.USD;
const currencySymbol = currencyList?.[transactionDetails.currency ?? '']?.symbol ?? transactionDetails.currency ?? CONST.CURRENCY.USD;

const isPerDiem = isPerDiemRequest(transaction);
const isCard = isManagedCardTransaction(transaction);
Expand Down Expand Up @@ -365,7 +366,7 @@ function SplitExpensePage({route}: SplitExpensePageProps) {
const footerContent = useMemo(() => {
const shouldShowWarningMessage = sumOfSplitExpenses < transactionDetailsAmount;
const warningMessage = shouldShowWarningMessage
? translate('iou.totalAmountLessThanOriginal', {amount: convertToDisplayString(transactionDetailsAmount - sumOfSplitExpenses, transactionDetails?.currency)})
? translate('iou.totalAmountLessThanOriginal', {amount: convertToDisplayString(transactionDetailsAmount - sumOfSplitExpenses, transactionDetails.currency)})
: '';
return (
<View style={[styles.ph5, styles.pb5]}>
Expand All @@ -388,19 +389,7 @@ function SplitExpensePage({route}: SplitExpensePageProps) {
/>
</View>
);
}, [
sumOfSplitExpenses,
transactionDetailsAmount,
translate,
transactionDetails?.currency,
errorMessage,
styles.ph1,
styles.mb2,
styles.w100,
styles.ph5,
styles.pb5,
onSaveSplitExpense,
]);
}, [sumOfSplitExpenses, transactionDetailsAmount, translate, transactionDetails.currency, errorMessage, styles.ph1, styles.mb2, styles.w100, styles.ph5, styles.pb5, onSaveSplitExpense]);

const splitDatesTitle = useMemo(() => {
const startDate = draftTransaction?.comment?.splitsStartDate;
Expand Down
Loading