diff --git a/src/components/MoneyReportHeader.tsx b/src/components/MoneyReportHeader.tsx index e904e787267a8..c681897c4a57a 100644 --- a/src/components/MoneyReportHeader.tsx +++ b/src/components/MoneyReportHeader.tsx @@ -17,8 +17,7 @@ import useTheme from '@hooks/useTheme'; import useThemeStyles from '@hooks/useThemeStyles'; import {turnOffMobileSelectionMode} from '@libs/actions/MobileSelectionMode'; import {downloadReportPDF, exportReportToCSV, exportReportToPDF, exportToIntegration, markAsManuallyExported, openUnreportedExpense} from '@libs/actions/Report'; -import {convertToDisplayString} from '@libs/CurrencyUtils'; -import {getThreadReportIDsForTransactions} from '@libs/MoneyRequestReportUtils'; +import {getThreadReportIDsForTransactions, getTotalAmountForIOUReportPreviewButton} from '@libs/MoneyRequestReportUtils'; import Navigation from '@libs/Navigation/Navigation'; import {buildOptimisticNextStepForPreventSelfApprovalsEnabled} from '@libs/NextStepUtils'; import {getConnectedIntegration} from '@libs/PolicyUtils'; @@ -31,7 +30,6 @@ import { getBankAccountRoute, getIntegrationIcon, getIntegrationNameFromExportMessage as getIntegrationNameFromExportMessageUtils, - getMoneyRequestSpendBreakdown, getNonHeldAndFullAmount, getTransactionsWithReceipts, hasHeldExpenses as hasHeldExpensesReportUtils, @@ -179,7 +177,6 @@ function MoneyReportHeader({policy, report: moneyRequestReport, transactionThrea const theme = useTheme(); const {translate} = useLocalize(); const {isOffline} = useNetwork(); - const {reimbursableSpend} = getMoneyRequestSpendBreakdown(moneyRequestReport); const isOnHold = isOnHoldTransactionUtils(transaction); const [isHoldMenuVisible, setIsHoldMenuVisible] = useState(false); @@ -285,10 +282,8 @@ function MoneyReportHeader({policy, report: moneyRequestReport, transactionThrea const shouldShowNextStep = isFromPaidPolicy && !!optimisticNextStep?.message?.length && !shouldShowStatusBar; const bankAccountRoute = getBankAccountRoute(chatReport); - const formattedAmount = convertToDisplayString(reimbursableSpend, moneyRequestReport?.currency); const {nonHeldAmount, fullAmount, hasValidNonHeldAmount} = getNonHeldAndFullAmount(moneyRequestReport, shouldShowPayButton); const isAnyTransactionOnHold = hasHeldExpensesReportUtils(moneyRequestReport?.reportID); - const displayedAmount = isAnyTransactionOnHold && canAllowSettlement && hasValidNonHeldAmount ? nonHeldAmount : formattedAmount; const {isDelegateAccessRestricted} = useDelegateUserDetails(); const [isNoDelegateAccessMenuVisible, setIsNoDelegateAccessMenuVisible] = useState(false); const [isLoadingReportData] = useOnyx(ONYXKEYS.IS_LOADING_REPORT_DATA, {canBeMissing: true}); @@ -460,6 +455,10 @@ function MoneyReportHeader({policy, report: moneyRequestReport, transactionThrea [moneyRequestReport?.reportID, translate], ); + const getAmount = (actionType: ValueOf) => ({ + formattedAmount: getTotalAmountForIOUReportPreviewButton(moneyRequestReport, policy, actionType), + }); + const primaryActionsImplementation = { [CONST.REPORT.PRIMARY_ACTIONS.SUBMIT]: (