Skip to content

[CP-stag] Revert "Split - Missing split preview when expense is split in room" #64686

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
chiragsalian merged 1 commit into from
Jun 20, 2025
Merged

[CP-stag] Revert "Split - Missing split preview when expense is split in room" #64686

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
12 changes: 8 additions & 4 deletions src/components/ReportActionItem/TransactionPreview/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import useTransactionViolations from '@hooks/useTransactionViolations';
import ControlSelection from '@libs/ControlSelection';
import {convertToDisplayString} from '@libs/CurrencyUtils';
import {canUseTouchScreen} from '@libs/DeviceCapabilities';
import {getOriginalMessage, isMoneyRequestAction as isMoneyRequestActionReportActionsUtils} from '@libs/ReportActionsUtils';
import {getIOUActionForReportID, getOriginalMessage, isMoneyRequestAction as isMoneyRequestActionReportActionsUtils} from '@libs/ReportActionsUtils';
import {getTransactionDetails} from '@libs/ReportUtils';
import {getReviewNavigationRoute} from '@libs/TransactionPreviewUtils';
import {getOriginalTransactionWithSplitInfo, isCardTransaction, removeSettledAndApprovedTransactions} from '@libs/TransactionUtils';
Expand Down Expand Up @@ -78,11 +78,15 @@ function TransactionPreview(props: TransactionPreviewProps) {
Navigation.navigate(getReviewNavigationRoute(route, report, transaction, duplicates));
}, [duplicates, report, route, transaction]);

const transactionPreview = transaction;
let transactionPreview = transaction;

const {originalTransaction, isBillSplit} = getOriginalTransactionWithSplitInfo(transaction);

const iouAction = action;
if (isBillSplit) {
transactionPreview = originalTransaction;
}

const iouAction = isBillSplit && originalTransaction ? (getIOUActionForReportID(chatReportID, originalTransaction.transactionID) ?? action) : action;

const shouldDisableOnPress = isBillSplit && isEmptyObject(transaction);
const isTransactionMadeWithCard = isCardTransaction(transaction);
Expand All @@ -104,7 +108,7 @@ function TransactionPreview(props: TransactionPreviewProps) {
/* eslint-disable-next-line react/jsx-props-no-spreading */
{...props}
action={iouAction}
isBillSplit={isBillSplit && !transaction?.comment?.originalTransactionID}
isBillSplit={isBillSplit}
chatReport={chatReport}
personalDetails={personalDetails}
transaction={transactionPreview}
Expand Down
4 changes: 2 additions & 2 deletions src/pages/home/report/PureReportActionItem.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -839,7 +839,9 @@ function PureReportActionItem({

// Show the preview for when expense is present
if (isIOURequestReportAction(action)) {
const isSplitInGroupChat = moneyRequestActionType === CONST.IOU.REPORT_ACTION_TYPE.SPLIT && report?.chatType === CONST.REPORT.CHAT_TYPE.GROUP;
const isSplitScanWithNoAmount = moneyRequestActionType === CONST.IOU.REPORT_ACTION_TYPE.SPLIT && moneyRequestOriginalMessage?.amount === 0;
const shouldShowSplitPreview = isSplitInGroupChat || isSplitScanWithNoAmount;
const chatReportID = moneyRequestOriginalMessage?.IOUReportID ? report?.chatReportID : reportID;
// There is no single iouReport for bill splits, so only 1:1 requests require an iouReportID
const iouReportID = moneyRequestOriginalMessage?.IOUReportID?.toString();
Expand All @@ -861,8 +863,6 @@ function PureReportActionItem({
);

if (report?.type === CONST.REPORT.TYPE.CHAT) {
const isSplitBill = moneyRequestActionType === CONST.IOU.REPORT_ACTION_TYPE.SPLIT;
const shouldShowSplitPreview = isSplitBill || isSplitScanWithNoAmount;
if (report.chatType === CONST.REPORT.CHAT_TYPE.SELF_DM || shouldShowSplitPreview) {
children = (
<View style={[styles.mt1, styles.w100]}>
Expand Down
Loading