diff --git a/src/languages/en.ts b/src/languages/en.ts index 3ddd13628ce1..eab0f4b5884b 100755 --- a/src/languages/en.ts +++ b/src/languages/en.ts @@ -67,7 +67,6 @@ import type { DeleteTransactionParams, DemotedFromWorkspaceParams, DidSplitAmountMessageParams, - DisplayNameParams, DuplicateTransactionParams, EarlyDiscountSubtitleParams, EarlyDiscountTitleParams, @@ -185,6 +184,7 @@ import type { ToValidateLoginParams, TransferParams, TrialStartedTitleParams, + UnapprovedParams, UnapproveWithIntegrationWarningParams, UnreportedTransactionParams, UnshareParams, @@ -1021,8 +1021,8 @@ const translations = { sendInvoice: ({amount}: RequestAmountParams) => `Send ${amount} invoice`, submitAmount: ({amount}: RequestAmountParams) => `Submit ${amount}`, submittedAmount: ({formattedAmount, comment}: RequestedAmountMessageParams) => `submitted ${formattedAmount}${comment ? ` for ${comment}` : ''}`, - submittedWithDisplayName: ({displayName}: DisplayNameParams) => `${displayName} submitted`, - automaticallySubmitted: ({displayName}: DisplayNameParams) => `${displayName} submitted via delayed submission`, + automaticallySubmittedAmount: ({formattedAmount}: RequestedAmountMessageParams) => + `automatically submitted ${formattedAmount} via delayed submission`, trackedAmount: ({formattedAmount, comment}: RequestedAmountMessageParams) => `tracking ${formattedAmount}${comment ? ` for ${comment}` : ''}`, splitAmount: ({amount}: SplitAmountParams) => `split ${amount}`, didSplitAmount: ({formattedAmount, comment}: DidSplitAmountMessageParams) => `split ${formattedAmount}${comment ? ` for ${comment}` : ''}`, @@ -1037,10 +1037,10 @@ const translations = { managerApprovedAmount: ({manager, amount}: ManagerApprovedAmountParams) => `${manager} approved ${amount}`, payerSettled: ({amount}: PayerSettledParams) => `paid ${amount}`, payerSettledWithMissingBankAccount: ({amount}: PayerSettledParams) => `paid ${amount}. Add a bank account to receive your payment.`, + automaticallyApprovedAmount: ({amount}: ApprovedAmountParams) => + `automatically approved ${amount} via workspace rules`, approvedAmount: ({amount}: ApprovedAmountParams) => `approved ${amount}`, - automaticallyApproved: ({displayName}: DisplayNameParams) => `${displayName} approved via workspace rules`, - approvedWithDisplayName: ({displayName}: DisplayNameParams) => `${displayName} approved`, - unapproved: ({displayName}: DisplayNameParams) => `${displayName} unapproved`, + unapprovedAmount: ({amount}: UnapprovedParams) => `unapproved ${amount}`, automaticallyForwardedAmount: ({amount}: ForwardedAmountParams) => `automatically approved ${amount} via workspace rules`, forwardedAmount: ({amount}: ForwardedAmountParams) => `approved ${amount}`, diff --git a/src/languages/es.ts b/src/languages/es.ts index 00b4ce0199e3..7aee1d5e8d8c 100644 --- a/src/languages/es.ts +++ b/src/languages/es.ts @@ -66,7 +66,6 @@ import type { DeleteTransactionParams, DemotedFromWorkspaceParams, DidSplitAmountMessageParams, - DisplayNameParams, DuplicateTransactionParams, EarlyDiscountSubtitleParams, EarlyDiscountTitleParams, @@ -184,6 +183,7 @@ import type { ToValidateLoginParams, TransferParams, TrialStartedTitleParams, + UnapprovedParams, UnapproveWithIntegrationWarningParams, UnreportedTransactionParams, UnshareParams, @@ -1016,8 +1016,8 @@ const translations = { sendInvoice: ({amount}: RequestAmountParams) => `Enviar factura de ${amount}`, submitAmount: ({amount}: RequestAmountParams) => `Solicitar ${amount}`, submittedAmount: ({formattedAmount, comment}: RequestedAmountMessageParams) => `solicitó ${formattedAmount}${comment ? ` para ${comment}` : ''}`, - submittedWithDisplayName: ({displayName}: DisplayNameParams) => `${displayName} enviado`, - automaticallySubmitted: ({displayName}: DisplayNameParams) => `${displayName} enviado mediante envío diferido`, + automaticallySubmittedAmount: ({formattedAmount}: RequestedAmountMessageParams) => + `se enviaron automáticamente ${formattedAmount} mediante envío diferido`, trackedAmount: ({formattedAmount, comment}: RequestedAmountMessageParams) => `realizó un seguimiento de ${formattedAmount}${comment ? ` para ${comment}` : ''}`, splitAmount: ({amount}: SplitAmountParams) => `dividir ${amount}`, didSplitAmount: ({formattedAmount, comment}: DidSplitAmountMessageParams) => `dividió ${formattedAmount}${comment ? ` para ${comment}` : ''}`, @@ -1032,11 +1032,10 @@ const translations = { managerApprovedAmount: ({manager, amount}: ManagerApprovedAmountParams) => `${manager} aprobó ${amount}`, payerSettled: ({amount}: PayerSettledParams) => `pagó ${amount}`, payerSettledWithMissingBankAccount: ({amount}: PayerSettledParams) => `pagó ${amount}. Agrega una cuenta bancaria para recibir tu pago.`, + automaticallyApprovedAmount: ({amount}: ApprovedAmountParams) => + `aprobado automáticamente ${amount} según las reglas del espacio de trabajo`, approvedAmount: ({amount}: ApprovedAmountParams) => `aprobó ${amount}`, - automaticallyApproved: ({displayName}: DisplayNameParams) => - `${displayName} aprobado mediante reglas del espacio de trabajo`, - approvedWithDisplayName: ({displayName}: DisplayNameParams) => `${displayName} aprobado`, - unapproved: ({displayName}: DisplayNameParams) => `${displayName} no aprobado`, + unapprovedAmount: ({amount}: UnapprovedParams) => `desaprobó ${amount}`, automaticallyForwardedAmount: ({amount}: ForwardedAmountParams) => `aprobado automáticamente ${amount} según las reglas del espacio de trabajo`, forwardedAmount: ({amount}: ForwardedAmountParams) => `aprobó ${amount}`, diff --git a/src/languages/params.ts b/src/languages/params.ts index 9bf59d2832f4..9414f19d4ea1 100644 --- a/src/languages/params.ts +++ b/src/languages/params.ts @@ -156,8 +156,6 @@ type CompanyCardFeedNameParams = {feedName: string}; type PayerPaidAmountParams = {payer?: string; amount: number | string}; -type DisplayNameParams = {displayName: string}; - type ApprovedAmountParams = {amount: number | string}; type ForwardedAmountParams = {amount: number | string}; @@ -372,6 +370,8 @@ type UnshareParams = {to: string}; type StripePaidParams = {amount: string; currency: string}; +type UnapprovedParams = {amount: string}; + type RemoveMembersWarningPrompt = { memberName: string; ownerName: string; @@ -766,7 +766,6 @@ export type { AdminCanceledRequestParams, AlreadySignedInParams, ApprovedAmountParams, - DisplayNameParams, BeginningOfChatHistoryAdminRoomPartOneParams, BeginningOfChatHistoryAnnounceRoomPartOneParams, BeginningOfChatHistoryAnnounceRoomPartTwo, @@ -885,6 +884,7 @@ export type { ShareParams, UnshareParams, StripePaidParams, + UnapprovedParams, RemoveMembersWarningPrompt, ApprovalWorkflowErrorParams, ConnectionNameParams, diff --git a/src/libs/ReportUtils.ts b/src/libs/ReportUtils.ts index b79a71438601..663e0d7e8bda 100644 --- a/src/libs/ReportUtils.ts +++ b/src/libs/ReportUtils.ts @@ -5654,19 +5654,14 @@ function getFormattedAmount(reportAction: ReportAction, report?: Report | null) return formattedAmount; } -function getActorDisplayName(action: ReportAction) { - const actorAccountID = getReportActionActorAccountID(action, undefined, undefined, undefined); - - return getDisplayNameForParticipant({accountID: actorAccountID}); -} - function getReportAutomaticallySubmittedMessage( reportAction: | ReportAction | ReportAction | ReportAction, + report?: Report, ) { - return translateLocal('iou.automaticallySubmitted', {displayName: getActorDisplayName(reportAction)}); + return translateLocal('iou.automaticallySubmittedAmount', {formattedAmount: getFormattedAmount(reportAction, report)}); } function getIOUSubmittedMessage( @@ -5674,20 +5669,21 @@ function getIOUSubmittedMessage( | ReportAction | ReportAction | ReportAction, + report?: Report, ) { - return translateLocal('iou.submittedWithDisplayName', {displayName: getActorDisplayName(reportAction)}); + return translateLocal('iou.submittedAmount', {formattedAmount: getFormattedAmount(reportAction, report)}); } -function getReportAutomaticallyApprovedMessage(reportAction: ReportAction) { - return translateLocal('iou.automaticallyApproved', {displayName: getActorDisplayName(reportAction)}); +function getReportAutomaticallyApprovedMessage(reportAction: ReportAction, report?: Report) { + return translateLocal('iou.automaticallyApprovedAmount', {amount: getFormattedAmount(reportAction, report)}); } -function getIOUUnapprovedMessage(reportAction: ReportAction) { - return translateLocal('iou.unapproved', {displayName: getActorDisplayName(reportAction)}); +function getIOUUnapprovedMessage(reportAction: ReportAction, report?: Report) { + return translateLocal('iou.unapprovedAmount', {amount: getFormattedAmount(reportAction, report)}); } -function getIOUApprovedMessage(reportAction: ReportAction) { - return translateLocal('iou.approvedWithDisplayName', {displayName: getActorDisplayName(reportAction)}); +function getIOUApprovedMessage(reportAction: ReportAction, report?: Report) { + return translateLocal('iou.approvedAmount', {amount: getFormattedAmount(reportAction, report)}); } /** diff --git a/src/pages/home/report/PureReportActionItem.tsx b/src/pages/home/report/PureReportActionItem.tsx index 277a35ecb413..c636540c1c05 100644 --- a/src/pages/home/report/PureReportActionItem.tsx +++ b/src/pages/home/report/PureReportActionItem.tsx @@ -973,25 +973,25 @@ function PureReportActionItem({ if (wasSubmittedViaHarvesting) { children = ( - ${getReportAutomaticallySubmittedMessage(action)}`} /> + ${getReportAutomaticallySubmittedMessage(action, report)}`} /> ); } else { - children = ; + children = ; } } else if (isActionOfType(action, CONST.REPORT.ACTIONS.TYPE.APPROVED)) { const wasAutoApproved = getOriginalMessage(action)?.automaticAction ?? false; if (wasAutoApproved) { children = ( - ${getReportAutomaticallyApprovedMessage(action)}`} /> + ${getReportAutomaticallyApprovedMessage(action, report)}`} /> ); } else { - children = ; + children = ; } } else if (isUnapprovedAction(action)) { - children = ; + children = ; } else if (isActionOfType(action, CONST.REPORT.ACTIONS.TYPE.FORWARDED)) { const wasAutoForwarded = getOriginalMessage(action)?.automaticAction ?? false; if (wasAutoForwarded) { diff --git a/tests/unit/ReportUtilsTest.ts b/tests/unit/ReportUtilsTest.ts index 7391cbfe6ec7..0516bd60f7fc 100644 --- a/tests/unit/ReportUtilsTest.ts +++ b/tests/unit/ReportUtilsTest.ts @@ -605,35 +605,13 @@ describe('ReportUtils', () => { }; const submittedParentReportAction = { actionName: CONST.REPORT.ACTIONS.TYPE.SUBMITTED, - adminAccountID: 1, originalMessage: { amount: 169, currency: 'USD', }, } as ReportAction; - expect(getReportName(threadOfSubmittedReportAction, policy, submittedParentReportAction)).toBe('Ragnar Lothbrok submitted'); - }); - - test('Manually Approved Report Action', () => { - const threadOfApprovedReportAction = { - ...LHNTestUtils.getFakeReport(), - type: CONST.REPORT.TYPE.EXPENSE, - stateNum: CONST.REPORT.STATE_NUM.APPROVED, - statusNum: CONST.REPORT.STATUS_NUM.APPROVED, - parentReportID: '101', - policyID: policy.id, - }; - const approvedParentReportAction = { - actionName: CONST.REPORT.ACTIONS.TYPE.APPROVED, - actorAccountID: 1, - originalMessage: { - amount: 169, - currency: 'USD', - }, - } as ReportAction; - - expect(getReportName(threadOfApprovedReportAction, policy, approvedParentReportAction)).toBe('Ragnar Lothbrok approved'); + expect(getReportName(threadOfSubmittedReportAction, policy, submittedParentReportAction)).toBe('submitted $1.69'); }); test('Invited/Removed Room Member Action', () => {