Skip to content

Get the correct action for split transactions. #61532

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
merged 10 commits into from
May 23, 2025
Merged

Get the correct action for split transactions. #61532

Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
349e791
Get the correct IOU action for split transactions.
Tony-MK May 6, 2025
c414c4b
prettier
Tony-MK May 6, 2025
9ee8e7b
Update src/components/ReportActionItem/TransactionPreview/index.tsx
Tony-MK May 14, 2025
d114a0a
rename variable
Tony-MK May 14, 2025
4947e2c
Merge branch 'Expensify:main' into fix/60083
Tony-MK May 19, 2025
0f4d029
Merge branch 'Expensify:main' into fix/60083
Tony-MK May 21, 2025
2701de7
Merge branch 'main' of https://github.com/Expensify/App into fix/60083
Tony-MK May 21, 2025
0383883
fallback
Tony-MK May 22, 2025
4609b62
Merge branch 'fix/60083' of https://github.com/Tony-MK/Expensify-App …
Tony-MK May 22, 2025
0acc3a5
prettier
Tony-MK May 22, 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
6 changes: 5 additions & 1 deletion 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 {getOriginalTransactionIfBillIsSplit, getReviewNavigationRoute} from '@libs/TransactionPreviewUtils';
import {isCardTransaction, removeSettledAndApprovedTransactions} from '@libs/TransactionUtils';
Expand Down Expand Up @@ -80,6 +80,8 @@ function TransactionPreview(props: TransactionPreviewProps) {

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

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

const shouldDisableOnPress = isBillSplit && isEmptyObject(transaction);
const isTransactionMadeWithCard = isCardTransaction(transaction);
const showCashOrCardTranslation = isTransactionMadeWithCard ? 'iou.card' : 'iou.cash';
Expand All @@ -98,6 +100,7 @@ function TransactionPreview(props: TransactionPreviewProps) {
<TransactionPreviewContent
/* eslint-disable-next-line react/jsx-props-no-spreading */
{...props}
action={iouAction}
isBillSplit={isBillSplit}
chatReport={chatReport}
personalDetails={personalDetails}
Expand All @@ -119,6 +122,7 @@ function TransactionPreview(props: TransactionPreviewProps) {
<TransactionPreviewContent
/* eslint-disable-next-line react/jsx-props-no-spreading */
{...props}
action={iouAction}
isBillSplit={isBillSplit}
chatReport={chatReport}
personalDetails={personalDetails}
Expand Down