Skip to content

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

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
Beamanator merged 7 commits into from
Jan 26, 2026
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
b7829f5
Revert "[CP Staging] Revert "fix: Incorrect split amount is allowed t…
nkdengineer Dec 22, 2025
3d597fd
Merge branch 'main' into revert-78156-revert-77311-fix/fix/76758
nkdengineer Dec 28, 2025
c9426b6
Merge branch 'main' into revert-78156-revert-77311-fix/fix/76758
nkdengineer Jan 12, 2026
5ed2286
correct test data
nkdengineer Jan 12, 2026
209ccab
resolve conflict
nkdengineer Jan 21, 2026
9ccca37
correct test data
nkdengineer Jan 21, 2026
25883b0
fix test
nkdengineer Jan 21, 2026
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 @@ -4477,7 +4477,7 @@ function getTransactionDetails(

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

return {
created: getFormattedCreated(transaction, createdDateFormat, locale),
Expand Down
4 changes: 2 additions & 2 deletions src/pages/iou/SplitExpensePage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,8 @@
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 {TransactionDetails} from '@libs/ReportUtils';
import type {TranslationPathOrText} from '@libs/TransactionPreviewUtils';
import {getChildTransactions, isManagedCardTransaction, isPerDiemRequest} from '@libs/TransactionUtils';
import CONST from '@src/CONST';
Expand Down Expand Up @@ -102,10 +102,10 @@

const isSplitAvailable = report && transaction && isSplitAction(currentReport, [transaction], originalTransaction, currentUserPersonalDetails.login ?? '', currentPolicy);

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

Check warning on line 108 in src/pages/iou/SplitExpensePage.tsx

View workflow job for this annotation

GitHub Actions / Changed files ESLint check 

The 'splitExpenses' logical expression could make the dependencies of useEffect Hook (at line 140) change on every render. To fix this, wrap the initialization of 'splitExpenses' in its own useMemo() Hook

const currencySymbol = getCurrencySymbol(transactionDetails.currency ?? '') ?? transactionDetails.currency ?? CONST.CURRENCY.USD;

Expand Down
6 changes: 3 additions & 3 deletions tests/actions/IOUTest.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1027,7 +1027,7 @@ describe('actions/IOU', () => {

const draftTransaction = transactionDrafts?.[`${ONYXKEYS.COLLECTION.TRANSACTION_DRAFT}${originalTransaction.transactionID}`];
expect(draftTransaction).toBeTruthy();
expect(draftTransaction?.amount).toBe(originalTransaction.amount);
expect(draftTransaction?.amount).toBe(-originalTransaction.amount);
expect(draftTransaction?.currency).toBe(originalTransaction.currency);
expect(draftTransaction?.actionableWhisperReportActionID).toBe(reportActionID);
expect(draftTransaction?.linkedTrackedExpenseReportID).toBe(selfDMReport.reportID);
Expand Down Expand Up @@ -8349,7 +8349,7 @@ describe('actions/IOU', () => {
it('should initialize split expense with correct transaction details', async () => {
const transaction: Transaction = {
transactionID: '123',
amount: 100,
amount: -100,
currency: 'USD',
merchant: 'Test Merchant',
comment: {
Expand Down Expand Up @@ -8433,7 +8433,7 @@ describe('actions/IOU', () => {
it('should initialize split expense with correct VND currency amounts', async () => {
const transaction: Transaction = {
transactionID: '123',
amount: 1700,
amount: -1700,
currency: 'VND',
merchant: 'Test Merchant',
comment: {
Expand Down
Loading