Skip to content

Commit 2fe1f70

Browse files
authored
Merge pull request Expensify#64686 from Expensify/revert-62638-fix/62235-missing-split-preview
[CP-stag] Revert "Split - Missing split preview when expense is split in room"
2 parents 2fa63aa + 299aaa1 commit 2fe1f70

2 files changed

Lines changed: 10 additions & 6 deletions

File tree

src/components/ReportActionItem/TransactionPreview/index.tsx

Lines changed: 8 additions & 4 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 {getOriginalMessage, isMoneyRequestAction as isMoneyRequestActionReportActionsUtils} from '@libs/ReportActionsUtils';
12+
import {getIOUActionForReportID, 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,11 +78,15 @@ function TransactionPreview(props: TransactionPreviewProps) {
7878
Navigation.navigate(getReviewNavigationRoute(route, report, transaction, duplicates));
7979
}, [duplicates, report, route, transaction]);
8080

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

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

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

8791
const shouldDisableOnPress = isBillSplit && isEmptyObject(transaction);
8892
const isTransactionMadeWithCard = isCardTransaction(transaction);
@@ -104,7 +108,7 @@ function TransactionPreview(props: TransactionPreviewProps) {
104108
/* eslint-disable-next-line react/jsx-props-no-spreading */
105109
{...props}
106110
action={iouAction}
107-
isBillSplit={isBillSplit && !transaction?.comment?.originalTransactionID}
111+
isBillSplit={isBillSplit}
108112
chatReport={chatReport}
109113
personalDetails={personalDetails}
110114
transaction={transactionPreview}

src/pages/home/report/PureReportActionItem.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -839,7 +839,9 @@ 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;
842843
const isSplitScanWithNoAmount = moneyRequestActionType === CONST.IOU.REPORT_ACTION_TYPE.SPLIT && moneyRequestOriginalMessage?.amount === 0;
844+
const shouldShowSplitPreview = isSplitInGroupChat || isSplitScanWithNoAmount;
843845
const chatReportID = moneyRequestOriginalMessage?.IOUReportID ? report?.chatReportID : reportID;
844846
// There is no single iouReport for bill splits, so only 1:1 requests require an iouReportID
845847
const iouReportID = moneyRequestOriginalMessage?.IOUReportID?.toString();
@@ -861,8 +863,6 @@ function PureReportActionItem({
861863
);
862864

863865
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)