Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
23 changes: 2 additions & 21 deletions src/components/ReportActionItem/TransactionPreview/index.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import {useRoute} from '@react-navigation/native';
import React, {useCallback, useMemo} from 'react';
import type {GestureResponderEvent} from 'react-native';
import type {OnyxEntry} from 'react-native-onyx';
import PressableWithoutFeedback from '@components/Pressable/PressableWithoutFeedback';
import {showContextMenuForReport} from '@components/ShowContextMenuContext';
import useLocalize from '@hooks/useLocalize';
Expand All @@ -12,8 +11,8 @@ import {convertToDisplayString} from '@libs/CurrencyUtils';
import {canUseTouchScreen} from '@libs/DeviceCapabilities';
import {getOriginalMessage, isMoneyRequestAction as isMoneyRequestActionReportActionsUtils} from '@libs/ReportActionsUtils';
import {getTransactionDetails} from '@libs/ReportUtils';
import {getReviewNavigationRoute} from '@libs/TransactionPreviewUtils';
import {getTransaction, isCardTransaction, removeSettledAndApprovedTransactions} from '@libs/TransactionUtils';
import {getOriginalTransactionIfBillIsSplit, getReviewNavigationRoute} from '@libs/TransactionPreviewUtils';
import {isCardTransaction, removeSettledAndApprovedTransactions} from '@libs/TransactionUtils';
import Navigation from '@navigation/Navigation';
import type {PlatformStackRouteProp} from '@navigation/PlatformStackNavigation/types';
import type {TransactionDuplicateNavigatorParamList} from '@navigation/types';
Expand All @@ -22,28 +21,10 @@ import {clearIOUError} from '@userActions/Report';
import CONST from '@src/CONST';
import ONYXKEYS from '@src/ONYXKEYS';
import type SCREENS from '@src/SCREENS';
import type {Transaction} from '@src/types/onyx';
import {isEmptyObject} from '@src/types/utils/EmptyObject';
import TransactionPreviewContent from './TransactionPreviewContent';
import type {TransactionPreviewProps} from './types';

const getOriginalTransactionIfBillIsSplit = (transaction: OnyxEntry<Transaction>) => {
const {originalTransactionID, source, splits} = transaction?.comment ?? {};

// If splits property is defined in the transaction, it is actually an original transaction
if (splits && splits.length > 0) {
return {isBillSplit: true, originalTransaction: transaction};
}

if (!originalTransactionID || source !== CONST.IOU.TYPE.SPLIT) {
return {isBillSplit: false, originalTransaction: transaction};
}

const originalTransaction = getTransaction(originalTransactionID);

return {isBillSplit: !!originalTransaction, originalTransaction: originalTransaction ?? transaction};
};

function TransactionPreview(props: TransactionPreviewProps) {
const {translate} = useLocalize();
const {
Expand Down
22 changes: 20 additions & 2 deletions src/libs/TransactionPreviewUtils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ import StringUtils from './StringUtils';
import {
compareDuplicateTransactionFields,
getFormattedCreated,
getTransaction,
hasMissingSmartscanFields,
hasNoticeTypeViolation,
hasPendingRTERViolation,
Expand Down Expand Up @@ -108,6 +109,22 @@ type TranslationPathOrText = {

const dotSeparator: TranslationPathOrText = {text: ` ${CONST.DOT_SEPARATOR} `};

const getOriginalTransactionIfBillIsSplit = (transaction: OnyxEntry<OnyxTypes.Transaction>) => {
const {originalTransactionID, source, splits} = transaction?.comment ?? {};

if (splits && splits.length > 0) {
return {isBillSplit: true, originalTransaction: getTransaction(originalTransactionID) ?? transaction};
}

if (!originalTransactionID || source !== CONST.IOU.TYPE.SPLIT) {
return {isBillSplit: false, originalTransaction: transaction};
}

const originalTransaction = getTransaction(originalTransactionID);

return {isBillSplit: !!originalTransaction, originalTransaction: originalTransaction ?? transaction};
};

function getTransactionPreviewTextAndTranslationPaths({
iouReport,
transaction,
Expand Down Expand Up @@ -224,7 +241,8 @@ function getTransactionPreviewTextAndTranslationPaths({
}
}

let displayAmountText: TranslationPathOrText = isScanning ? {translationPath: 'iou.receiptStatusTitle'} : {text: convertToDisplayString(requestAmount, requestCurrency)};
const amount = isBillSplit ? getOriginalTransactionIfBillIsSplit(transaction).originalTransaction?.amount : requestAmount;

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.

Amount is showing 0 when we split by scanning receipt and update amount: #63496

let displayAmountText: TranslationPathOrText = isScanning ? {translationPath: 'iou.receiptStatusTitle'} : {text: convertToDisplayString(amount, requestCurrency)};
if (isFetchingWaypoints && !requestAmount) {
displayAmountText = {translationPath: 'iou.fieldPending'};
}
Expand Down Expand Up @@ -317,5 +335,5 @@ function createTransactionPreviewConditionals({
};
}

export {getReviewNavigationRoute, getIOUData, getTransactionPreviewTextAndTranslationPaths, createTransactionPreviewConditionals};
export {getReviewNavigationRoute, getIOUData, getTransactionPreviewTextAndTranslationPaths, createTransactionPreviewConditionals, getOriginalTransactionIfBillIsSplit};
export type {TranslationPathOrText};
2 changes: 1 addition & 1 deletion src/libs/__mocks__/TransactionPreviewUtils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -30,5 +30,5 @@ function getIOUData(
return undefined;
}

export {getTransactionPreviewTextAndTranslationPaths, createTransactionPreviewConditionals, getReviewNavigationRoute} from '../TransactionPreviewUtils';
export {getTransactionPreviewTextAndTranslationPaths, createTransactionPreviewConditionals, getReviewNavigationRoute, getOriginalTransactionIfBillIsSplit} from '../TransactionPreviewUtils';
export {getIOUData};