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
2 changes: 1 addition & 1 deletion src/libs/ReportUtils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4537,7 +4537,7 @@ function getTransactionDetails(

const report = getReportOrDraftReport(transaction?.reportID, undefined, 'report' in transaction ? transaction.report : undefined);
const isManualDistanceRequest = isManualDistanceRequestTransactionUtils(transaction);
const isFromExpenseReport = !isEmptyObject(report) && isExpenseReport(report);
const isFromExpenseReport = (!isEmptyObject(report) && isExpenseReport(report)) || isPaidGroupPolicyPolicyUtils(policy);

return {
created: getFormattedCreated(transaction, createdDateFormat),
Expand Down
21 changes: 16 additions & 5 deletions src/pages/iou/SplitExpensePage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@ import OnyxTabNavigator, {TabScreenWithFocusTrapWrapper, TopTab} from '@libs/Nav
import type {PlatformStackScreenProps} from '@libs/Navigation/PlatformStackNavigation/types';
import type {SplitExpenseParamList} from '@libs/Navigation/types';
import {isSplitAction} from '@libs/ReportSecondaryActionUtils';
import type {TransactionDetails} from '@libs/ReportUtils';
import {getReportOrDraftReport, getTransactionDetails, isReportApproved, isSettled as isSettledReportUtils} from '@libs/ReportUtils';
import type {TranslationPathOrText} from '@libs/TransactionPreviewUtils';
import {getChildTransactions, isManagedCardTransaction, isPerDiemRequest} from '@libs/TransactionUtils';
Expand Down Expand Up @@ -98,12 +97,12 @@ function SplitExpensePage({route}: SplitExpensePageProps) {

const isSplitAvailable = report && transaction && isSplitAction(currentReport, [transaction], originalTransaction, currentPolicy);

const transactionDetails = useMemo<Partial<TransactionDetails>>(() => getTransactionDetails(transaction) ?? {}, [transaction]);
const transactionDetails = getTransactionDetails(transaction, undefined, currentPolicy);
const transactionDetailsAmount = transactionDetails?.amount ?? 0;
const sumOfSplitExpenses = useMemo(() => (draftTransaction?.comment?.splitExpenses ?? []).reduce((acc, item) => acc + (item.amount ?? 0), 0), [draftTransaction?.comment?.splitExpenses]);
const splitExpenses = useMemo(() => draftTransaction?.comment?.splitExpenses ?? [], [draftTransaction?.comment?.splitExpenses]);

const currencySymbol = currencyList?.[transactionDetails.currency ?? '']?.symbol ?? transactionDetails.currency ?? CONST.CURRENCY.USD;
const currencySymbol = currencyList?.[transactionDetails?.currency ?? '']?.symbol ?? transactionDetails?.currency ?? CONST.CURRENCY.USD;

const isPerDiem = isPerDiemRequest(transaction);
const isCard = isManagedCardTransaction(transaction);
Expand Down Expand Up @@ -363,7 +362,7 @@ function SplitExpensePage({route}: SplitExpensePageProps) {
const footerContent = useMemo(() => {
const shouldShowWarningMessage = sumOfSplitExpenses < transactionDetailsAmount;
const warningMessage = shouldShowWarningMessage
? translate('iou.totalAmountLessThanOriginal', {amount: convertToDisplayString(transactionDetailsAmount - sumOfSplitExpenses, transactionDetails.currency)})
? translate('iou.totalAmountLessThanOriginal', {amount: convertToDisplayString(transactionDetailsAmount - sumOfSplitExpenses, transactionDetails?.currency)})
: '';
return (
<View style={[styles.ph5, styles.pb5]}>
Expand All @@ -386,7 +385,19 @@ function SplitExpensePage({route}: SplitExpensePageProps) {
/>
</View>
);
}, [sumOfSplitExpenses, transactionDetailsAmount, translate, transactionDetails.currency, errorMessage, styles.ph1, styles.mb2, styles.w100, styles.ph5, styles.pb5, onSaveSplitExpense]);
}, [
sumOfSplitExpenses,
transactionDetailsAmount,
translate,
transactionDetails?.currency,
errorMessage,
styles.ph1,
styles.mb2,
styles.w100,
styles.ph5,
styles.pb5,
onSaveSplitExpense,
]);

const initiallyFocusedOptionKey = useMemo(
() => sections.at(0)?.data.find((option) => option.transactionID === splitExpenseTransactionID)?.keyForList,
Expand Down
Loading