Skip to content

Commit b9b3462

Browse files
authored
Merge pull request #62638 from thelullabyy/fix/62235-missing-split-preview
Split - Missing split preview when expense is split in room
2 parents 90d39ec + 304ca31 commit b9b3462

2 files changed

Lines changed: 6 additions & 10 deletions

File tree

src/components/ReportActionItem/TransactionPreview/index.tsx

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import useTransactionViolations from '@hooks/useTransactionViolations';
99
import ControlSelection from '@libs/ControlSelection';
1010
import {convertToDisplayString} from '@libs/CurrencyUtils';
1111
import {canUseTouchScreen} from '@libs/DeviceCapabilities';
12-
import {getIOUActionForReportID, getOriginalMessage, isMoneyRequestAction as isMoneyRequestActionReportActionsUtils} from '@libs/ReportActionsUtils';
12+
import {getOriginalMessage, isMoneyRequestAction as isMoneyRequestActionReportActionsUtils} from '@libs/ReportActionsUtils';
1313
import {getTransactionDetails} from '@libs/ReportUtils';
1414
import {getReviewNavigationRoute} from '@libs/TransactionPreviewUtils';
1515
import {getOriginalTransactionWithSplitInfo, isCardTransaction, removeSettledAndApprovedTransactions} from '@libs/TransactionUtils';
@@ -78,15 +78,11 @@ function TransactionPreview(props: TransactionPreviewProps) {
7878
Navigation.navigate(getReviewNavigationRoute(route, report, transaction, duplicates));
7979
}, [duplicates, report, route, transaction]);
8080

81-
let transactionPreview = transaction;
81+
const transactionPreview = transaction;
8282

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

85-
if (isBillSplit) {
86-
transactionPreview = originalTransaction;
87-
}
88-
89-
const iouAction = isBillSplit && originalTransaction ? (getIOUActionForReportID(chatReportID, originalTransaction.transactionID) ?? action) : action;
85+
const iouAction = action;
9086

9187
const shouldDisableOnPress = isBillSplit && isEmptyObject(transaction);
9288
const isTransactionMadeWithCard = isCardTransaction(transaction);
@@ -108,7 +104,7 @@ function TransactionPreview(props: TransactionPreviewProps) {
108104
/* eslint-disable-next-line react/jsx-props-no-spreading */
109105
{...props}
110106
action={iouAction}
111-
isBillSplit={isBillSplit}
107+
isBillSplit={isBillSplit && !transaction?.comment?.originalTransactionID}
112108
chatReport={chatReport}
113109
personalDetails={personalDetails}
114110
transaction={transactionPreview}

src/pages/home/report/PureReportActionItem.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -839,9 +839,7 @@ function PureReportActionItem({
839839

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

865863
if (report?.type === CONST.REPORT.TYPE.CHAT) {
864+
const isSplitBill = moneyRequestActionType === CONST.IOU.REPORT_ACTION_TYPE.SPLIT;
865+
const shouldShowSplitPreview = isSplitBill || isSplitScanWithNoAmount;
866866
if (report.chatType === CONST.REPORT.CHAT_TYPE.SELF_DM || shouldShowSplitPreview) {
867867
children = (
868868
<View style={[styles.mt1, styles.w100]}>

0 commit comments

Comments
 (0)