Skip to content

Fix: Missing Split indicator next to Amount when card expense is split #67916

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
luacmartins merged 5 commits into from
Aug 15, 2025
Merged

Fix: Missing Split indicator next to Amount when card expense is split #67916

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
db07a8d
Fix: Missing Split indicator next to Amount when card expense is split
ryntgh Aug 5, 2025
5451edb
Merge branch 'main' into issue-66900
ryntgh Aug 13, 2025
07ff33b
Fix: Missing Split indicator next to Amount when card expense is split
ryntgh Aug 14, 2025
ec71970
Merge branch 'main' into issue-66900
ryntgh Aug 15, 2025
3f2cff1
Fix: Missing Split indicator next to Amount when card expense is split
ryntgh Aug 15, 2025
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
10 changes: 8 additions & 2 deletions src/components/ReportActionItem/MoneyRequestView.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,6 @@ import {
getCurrency,
getDescription,
getDistanceInMeters,
getOriginalTransactionWithSplitInfo,
getTagForDisplay,
getTaxName,
hasMissingSmartscanFields,
Expand All @@ -70,6 +69,7 @@ import {
hasRoute as hasRouteTransactionUtils,
isCardTransaction as isCardTransactionTransactionUtils,
isDistanceRequest as isDistanceRequestTransactionUtils,
isExpenseSplit,
isPerDiemRequest as isPerDiemRequestTransactionUtils,
isScanning,
shouldShowAttendees as shouldShowAttendeesTransactionUtils,
Expand Down Expand Up @@ -176,6 +176,9 @@ function MoneyRequestView({
const transactionViolations = useTransactionViolations(transaction?.transactionID);
const [outstandingReportsByPolicyID] = useOnyx(ONYXKEYS.DERIVED.OUTSTANDING_REPORTS_BY_POLICY_ID, {canBeMissing: true});

const originalTransactionIDFromComment = transaction?.comment?.originalTransactionID;
const [originalTransaction] = useOnyx(`${ONYXKEYS.COLLECTION.TRANSACTION}${originalTransactionIDFromComment ?? ''}`, {canBeMissing: true});

const {
created: transactionDate,
amount: transactionAmount,
Expand Down Expand Up @@ -327,14 +330,17 @@ function MoneyRequestView({
if (formattedOriginalAmount) {
amountDescription += ` ${CONST.DOT_SEPARATOR} ${translate('iou.original')} ${formattedOriginalAmount}`;
}
if (isExpenseSplit(transaction, originalTransaction)) {
amountDescription += ` ${CONST.DOT_SEPARATOR} ${translate('iou.split')}`;
}
if (isCancelled) {
amountDescription += ` ${CONST.DOT_SEPARATOR} ${translate('iou.canceled')}`;
}
} else {
if (!isDistanceRequest && !isPerDiemRequest) {
amountDescription += ` ${CONST.DOT_SEPARATOR} ${translate('iou.cash')}`;
}
if (getOriginalTransactionWithSplitInfo(transaction).isExpenseSplit) {
if (isExpenseSplit(transaction, originalTransaction)) {
amountDescription += ` ${CONST.DOT_SEPARATOR} ${translate('iou.split')}`;
}
if (isCancelled) {
Expand Down
14 changes: 13 additions & 1 deletion src/libs/TransactionUtils/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@

let allTransactions: OnyxCollection<Transaction> = {};

Onyx.connect({

Check warning on line 105 in src/libs/TransactionUtils/index.ts

View workflow job for this annotation

GitHub Actions / Changed files ESLint check 

Onyx.connect() is deprecated. Use useOnyx() hook instead and pass the data as parameters to a pure function
key: ONYXKEYS.COLLECTION.TRANSACTION,
waitForCollectionCallback: true,
callback: (value) => {
Expand All @@ -114,7 +114,7 @@
});

let allTransactionDrafts: OnyxCollection<Transaction> = {};
Onyx.connect({

Check warning on line 117 in src/libs/TransactionUtils/index.ts

View workflow job for this annotation

GitHub Actions / Changed files ESLint check 

Onyx.connect() is deprecated. Use useOnyx() hook instead and pass the data as parameters to a pure function
key: ONYXKEYS.COLLECTION.TRANSACTION_DRAFT,
waitForCollectionCallback: true,
callback: (value) => {
Expand All @@ -123,7 +123,7 @@
});

let allReports: OnyxCollection<Report> = {};
Onyx.connect({

Check warning on line 126 in src/libs/TransactionUtils/index.ts

View workflow job for this annotation

GitHub Actions / Changed files ESLint check 

Onyx.connect() is deprecated. Use useOnyx() hook instead and pass the data as parameters to a pure function
key: ONYXKEYS.COLLECTION.REPORT,
waitForCollectionCallback: true,
callback: (value) => {
Expand All @@ -132,7 +132,7 @@
});

let allTransactionViolations: OnyxCollection<TransactionViolations> = {};
Onyx.connect({

Check warning on line 135 in src/libs/TransactionUtils/index.ts

View workflow job for this annotation

GitHub Actions / Changed files ESLint check 

Onyx.connect() is deprecated. Use useOnyx() hook instead and pass the data as parameters to a pure function
key: ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS,
waitForCollectionCallback: true,
callback: (value) => (allTransactionViolations = value),
Expand All @@ -140,7 +140,7 @@

let currentUserEmail = '';
let currentUserAccountID = -1;
Onyx.connect({

Check warning on line 143 in src/libs/TransactionUtils/index.ts

View workflow job for this annotation

GitHub Actions / Changed files ESLint check 

Onyx.connect() is deprecated. Use useOnyx() hook instead and pass the data as parameters to a pure function
key: ONYXKEYS.SESSION,
callback: (val) => {
currentUserEmail = val?.email ?? '';
Expand Down Expand Up @@ -1814,6 +1814,17 @@
return transactions?.length === 1 && hasPendingUI(transactions?.at(0), getTransactionViolations(transactions?.at(0), allTransactionViolations));
}

function isExpenseSplit(transaction: OnyxEntry<Transaction>, originalTransaction: OnyxEntry<Transaction>): boolean {

@jjcoffee jjcoffee Mar 16, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Coming from #73732, we missed cases here where there is only one split remaining, in which case it shouldn't be visually displayed as if it were a split expense.

const {originalTransactionID, source, splits} = transaction?.comment ?? {};

// eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
if ((splits && splits.length > 0) || !originalTransactionID || source !== CONST.IOU.TYPE.SPLIT) {
return false;
}

return !originalTransaction?.comment?.splits;
}

const getOriginalTransactionWithSplitInfo = (transaction: OnyxEntry<Transaction>) => {
const {originalTransactionID, source, splits} = transaction?.comment ?? {};
const originalTransaction = allTransactions?.[`${ONYXKEYS.COLLECTION.TRANSACTION}${originalTransactionID}`];
Expand All @@ -1828,7 +1839,7 @@

// To determine if it’s a split bill or a split expense, we check for the presence of `comment.splits` on the original transaction.
// Since both splits use `comment.originalTransaction`, but split expenses won’t have `comment.splits`.
return {isBillSplit: !!originalTransaction?.comment?.splits, isExpenseSplit: !originalTransaction?.comment?.splits, originalTransaction: originalTransaction ?? transaction};
return {isBillSplit: !!originalTransaction?.comment?.splits, isExpenseSplit: isExpenseSplit(transaction, originalTransaction), originalTransaction: originalTransaction ?? transaction};
};

/**
Expand Down Expand Up @@ -1975,6 +1986,7 @@
shouldShowViolation,
isUnreportedAndHasInvalidDistanceRateTransaction,
getTransactionViolationsOfTransaction,
isExpenseSplit,
};

export type {TransactionChanges};
Loading