From 8432563c2fc7f54f19d927d457833c594fb3d9d5 Mon Sep 17 00:00:00 2001 From: Agata Kosior Date: Wed, 27 Dec 2023 17:51:07 +0100 Subject: [PATCH] fix: apply requested changes --- src/languages/en.ts | 6 +++--- src/languages/es.ts | 6 +++--- src/languages/types.ts | 6 +++--- src/libs/ReportUtils.ts | 2 ++ 4 files changed, 11 insertions(+), 9 deletions(-) diff --git a/src/languages/en.ts b/src/languages/en.ts index 3cdb7cf2bf98..284667dd6a73 100755 --- a/src/languages/en.ts +++ b/src/languages/en.ts @@ -576,7 +576,7 @@ export default { amountEach: ({amount}: AmountEachParams) => `${amount} each`, payerOwesAmount: ({payer, amount}: PayerOwesAmountParams) => `${payer} owes ${amount}`, payerOwes: ({payer}: PayerOwesParams) => `${payer} owes: `, - payerPaidAmount: ({payer, amount}: PayerPaidAmountParams): string => `${payer} paid ${amount}`, + payerPaidAmount: ({payer, amount}: PayerPaidAmountParams): string => `${payer ? `${payer} ` : ''}paid ${amount}`, payerPaid: ({payer}: PayerPaidParams) => `${payer} paid: `, payerSpentAmount: ({payer, amount}: PayerPaidAmountParams): string => `${payer} spent ${amount}`, payerSpent: ({payer}: PayerPaidParams) => `${payer} spent: `, @@ -589,8 +589,8 @@ export default { `Canceled the ${amount} payment, because ${submitterDisplayName} did not enable their Expensify Wallet within 30 days`, settledAfterAddedBankAccount: ({submitterDisplayName, amount}: SettledAfterAddedBankAccountParams) => `${submitterDisplayName} added a bank account. The ${amount} payment has been made.`, - paidElsewhereWithAmount: ({payer, amount}: PaidElsewhereWithAmountParams) => `${payer} paid ${amount} elsewhere`, - paidWithExpensifyWithAmount: ({payer, amount}: PaidWithExpensifyWithAmountParams) => `${payer} paid ${amount} using Expensify`, + paidElsewhereWithAmount: ({payer, amount}: PaidElsewhereWithAmountParams) => `${payer ? `${payer} ` : ''}paid ${amount} elsewhere`, + paidWithExpensifyWithAmount: ({payer, amount}: PaidWithExpensifyWithAmountParams) => `${payer ? `${payer} ` : ''}paid ${amount} using Expensify`, noReimbursableExpenses: 'This report has an invalid amount', pendingConversionMessage: "Total will update when you're back online", changedTheRequest: 'changed the request', diff --git a/src/languages/es.ts b/src/languages/es.ts index d11211ca9325..9b424fc48793 100644 --- a/src/languages/es.ts +++ b/src/languages/es.ts @@ -569,7 +569,7 @@ export default { amountEach: ({amount}: AmountEachParams) => `${amount} cada uno`, payerOwesAmount: ({payer, amount}: PayerOwesAmountParams) => `${payer} debe ${amount}`, payerOwes: ({payer}: PayerOwesParams) => `${payer} debe: `, - payerPaidAmount: ({payer, amount}: PayerPaidAmountParams) => `${payer} pagó ${amount}`, + payerPaidAmount: ({payer, amount}: PayerPaidAmountParams) => `${payer ? `${payer} ` : ''}pagó ${amount}`, payerPaid: ({payer}: PayerPaidParams) => `${payer} pagó: `, payerSpentAmount: ({payer, amount}: PayerPaidAmountParams): string => `${payer} gastó ${amount}`, payerSpent: ({payer}: PayerPaidParams) => `${payer} gastó: `, @@ -582,8 +582,8 @@ export default { `Canceló el pago ${amount}, porque ${submitterDisplayName} no habilitó su billetera Expensify en un plazo de 30 días.`, settledAfterAddedBankAccount: ({submitterDisplayName, amount}: SettledAfterAddedBankAccountParams) => `${submitterDisplayName} añadió una cuenta bancaria. El pago de ${amount} se ha realizado.`, - paidElsewhereWithAmount: ({payer, amount}: PaidElsewhereWithAmountParams) => `${payer} pagó ${amount} de otra forma`, - paidWithExpensifyWithAmount: ({payer, amount}: PaidWithExpensifyWithAmountParams) => `${payer} pagó ${amount} con Expensify`, + paidElsewhereWithAmount: ({payer, amount}: PaidElsewhereWithAmountParams) => `${payer ? `${payer} ` : ''}pagó ${amount} de otra forma`, + paidWithExpensifyWithAmount: ({payer, amount}: PaidWithExpensifyWithAmountParams) => `${payer ? `${payer} ` : ''}pagó ${amount} con Expensify`, noReimbursableExpenses: 'El importe de este informe no es válido', pendingConversionMessage: 'El total se actualizará cuando estés online', changedTheRequest: 'cambió la solicitud', diff --git a/src/languages/types.ts b/src/languages/types.ts index 6ef47b72ce1a..427a5777b2ea 100644 --- a/src/languages/types.ts +++ b/src/languages/types.ts @@ -115,7 +115,7 @@ type PayerOwesAmountParams = {payer: string; amount: number | string}; type PayerOwesParams = {payer: string}; -type PayerPaidAmountParams = {payer: string; amount: number | string}; +type PayerPaidAmountParams = {payer?: string; amount: number | string}; type ApprovedAmountParams = {amount: number | string}; @@ -133,9 +133,9 @@ type CanceledRequestParams = {amount: string; submitterDisplayName: string}; type SettledAfterAddedBankAccountParams = {submitterDisplayName: string; amount: string}; -type PaidElsewhereWithAmountParams = {payer: string; amount: string}; +type PaidElsewhereWithAmountParams = {payer?: string; amount: string}; -type PaidWithExpensifyWithAmountParams = {payer: string; amount: string}; +type PaidWithExpensifyWithAmountParams = {payer?: string; amount: string}; type ThreadRequestReportNameParams = {formattedAmount: string; comment: string}; diff --git a/src/libs/ReportUtils.ts b/src/libs/ReportUtils.ts index 731e35d9c7a5..b41b74cd5758 100644 --- a/src/libs/ReportUtils.ts +++ b/src/libs/ReportUtils.ts @@ -2046,6 +2046,8 @@ function getReportPreviewMessage( const amount = originalMessage?.amount; const currency = originalMessage?.currency ?? report.currency ?? ''; const amountToDisplay = CurrencyUtils.convertToDisplayString(Math.abs(amount), currency); + + // We only want to show the actor name in the preview if it's not the current user who took the action const requestorName = lastActorID && lastActorID !== currentUserAccountID ? getDisplayNameForParticipant(lastActorID, !isPreviewMessageForParentChatReport) : ''; return `${requestorName ? `${requestorName}: ` : ''}${Localize.translateLocal('iou.requestedAmount', {formattedAmount: amountToDisplay})}`; }