diff --git a/src/components/ReportActionItem/MoneyRequestReportPreview/MoneyRequestReportPreviewContent.tsx b/src/components/ReportActionItem/MoneyRequestReportPreview/MoneyRequestReportPreviewContent.tsx index 6f11b89f10a6..17aad4b4887d 100644 --- a/src/components/ReportActionItem/MoneyRequestReportPreview/MoneyRequestReportPreviewContent.tsx +++ b/src/components/ReportActionItem/MoneyRequestReportPreview/MoneyRequestReportPreviewContent.tsx @@ -61,15 +61,7 @@ import { isTripRoom as isTripRoomReportUtils, isWaitingForSubmissionFromCurrentUser as isWaitingForSubmissionFromCurrentUserReportUtils, } from '@libs/ReportUtils'; -import { - getMerchant, - hasPendingUI, - isCardTransaction, - isPartialMerchant, - isPending, - isReceiptBeingScanned, - shouldShowBrokenConnectionViolationForMultipleTransactions, -} from '@libs/TransactionUtils'; +import {getMerchant, hasPendingUI, isCardTransaction, isPartialMerchant, isPending, shouldShowBrokenConnectionViolationForMultipleTransactions} from '@libs/TransactionUtils'; import colors from '@styles/theme/colors'; import variables from '@styles/variables'; import {approveMoneyRequest, canApproveIOU, canIOUBePaid as canIOUBePaidIOUActions, canSubmitReport, payInvoice, payMoneyRequest, submitReport} from '@userActions/IOU'; @@ -181,7 +173,6 @@ function MoneyRequestReportPreviewContent({ const canAllowSettlement = hasUpdatedTotal(iouReport, policy); const numberOfRequests = transactions?.length ?? 0; const transactionsWithReceipts = getTransactionsWithReceipts(iouReportID); - const numberOfScanningReceipts = transactionsWithReceipts.filter((transaction) => isReceiptBeingScanned(transaction)).length; const numberOfPendingRequests = transactionsWithReceipts.filter((transaction) => isPending(transaction) && isCardTransaction(transaction)).length; const hasReceipts = transactionsWithReceipts.length > 0; @@ -334,12 +325,10 @@ function MoneyRequestReportPreviewContent({ } return { supportText: translate('iou.expenseCount', { - scanningReceipts: numberOfScanningReceipts, - pendingReceipts: numberOfPendingRequests, count: numberOfRequests, }), }; - }, [translate, numberOfRequests, numberOfScanningReceipts, numberOfPendingRequests]); + }, [translate, numberOfRequests]); /* * Manual export diff --git a/src/components/ReportActionItem/ReportPreview.tsx b/src/components/ReportActionItem/ReportPreview.tsx index fc7d43e2a2cc..047f8f3717f9 100644 --- a/src/components/ReportActionItem/ReportPreview.tsx +++ b/src/components/ReportActionItem/ReportPreview.tsx @@ -456,7 +456,7 @@ function ReportPreview({ }; } return { - supportText: translate('iou.expenseCount', { + supportText: translate('iou.expenseCountWithStatus', { scanningReceipts: numberOfScanningReceipts, pendingReceipts: numberOfPendingRequests, count: numberOfRequests, diff --git a/src/languages/en.ts b/src/languages/en.ts index abc6e1cde737..a146e49476b6 100755 --- a/src/languages/en.ts +++ b/src/languages/en.ts @@ -952,7 +952,8 @@ const translations = { yourCompanyWebsiteNote: "If you don't have a website, you can provide your company's LinkedIn or social media profile instead.", invalidDomainError: 'You have entered an invalid domain. To continue, please enter a valid domain.', publicDomainError: 'You have entered a public domain. To continue, please enter a private domain.', - expenseCount: ({scanningReceipts = 0, pendingReceipts = 0}: RequestCountParams) => { + // TODO: This key should be deprecated. More details: https://github.com/Expensify/App/pull/59653#discussion_r2028653252 + expenseCountWithStatus: ({scanningReceipts = 0, pendingReceipts = 0}: RequestCountParams) => { const statusText: string[] = []; if (scanningReceipts > 0) { statusText.push(`${scanningReceipts} scanning`); @@ -965,6 +966,12 @@ const translations = { other: (count: number) => (statusText.length > 0 ? `${count} expenses (${statusText.join(', ')})` : `${count} expenses`), }; }, + expenseCount: () => { + return { + one: '1 expense', + other: (count: number) => `${count} expenses`, + }; + }, deleteExpense: () => ({ one: 'Delete expense', other: 'Delete expenses', diff --git a/src/languages/es.ts b/src/languages/es.ts index 131ede19005d..8dc31f2af238 100644 --- a/src/languages/es.ts +++ b/src/languages/es.ts @@ -947,7 +947,8 @@ const translations = { yourCompanyWebsiteNote: 'Si no tiene un sitio web, puede proporcionar el perfil de LinkedIn o de las redes sociales de su empresa.', invalidDomainError: 'Ha introducido un dominio no válido. Para continuar, introduzca un dominio válido.', publicDomainError: 'Ha introducido un dominio público. Para continuar, introduzca un dominio privado.', - expenseCount: ({scanningReceipts = 0, pendingReceipts = 0}: RequestCountParams) => { + // TODO: This key should be deprecated. More details: https://github.com/Expensify/App/pull/59653#discussion_r2028653252 + expenseCountWithStatus: ({scanningReceipts = 0, pendingReceipts = 0}: RequestCountParams) => { const statusText: string[] = []; if (scanningReceipts > 0) { statusText.push(`${scanningReceipts} escaneando`); @@ -960,6 +961,12 @@ const translations = { other: (count: number) => (statusText.length > 0 ? `${count} gastos (${statusText.join(', ')})` : `${count} gastos`), }; }, + expenseCount: () => { + return { + one: '1 gasto', + other: (count: number) => `${count} gastos`, + }; + }, deleteExpense: () => ({ one: 'Eliminar gasto', other: 'Eliminar gastos',