diff --git a/src/languages/de.ts b/src/languages/de.ts index 35ae0c66a4da..cc763b1e4530 100644 --- a/src/languages/de.ts +++ b/src/languages/de.ts @@ -24,7 +24,6 @@ import type { AddEmployeeParams, AddOrDeletePolicyCustomUnitRateParams, AddressLineParams, - AdminCanceledRequestParams, AirlineParams, AlreadySignedInParams, ApprovalWorkflowErrorParams, @@ -1282,7 +1281,7 @@ const translations = { forwarded: `genehmigt`, rejectedThisReport: 'diesen Bericht abgelehnt', waitingOnBankAccount: ({submitterDisplayName}: WaitingOnBankAccountParams) => `hat die Zahlung gestartet, wartet aber darauf, dass ${submitterDisplayName} ein Bankkonto hinzufügt.`, - adminCanceledRequest: ({manager}: AdminCanceledRequestParams) => `${manager ? `${manager}: ` : ''} hat die Zahlung storniert`, + adminCanceledRequest: 'hat die Zahlung storniert', canceledRequest: ({amount, submitterDisplayName}: CanceledRequestParams) => `hat die Zahlung von ${amount} storniert, weil ${submitterDisplayName} ihre Expensify Wallet nicht innerhalb von 30 Tagen aktiviert hat`, settledAfterAddedBankAccount: ({submitterDisplayName, amount}: SettledAfterAddedBankAccountParams) => diff --git a/src/languages/en.ts b/src/languages/en.ts index 6fd4f79200c4..a8a47e8e6632 100755 --- a/src/languages/en.ts +++ b/src/languages/en.ts @@ -13,7 +13,6 @@ import type { AddEmployeeParams, AddOrDeletePolicyCustomUnitRateParams, AddressLineParams, - AdminCanceledRequestParams, AirlineParams, AlreadySignedInParams, ApprovalWorkflowErrorParams, @@ -1256,7 +1255,7 @@ const translations = { forwarded: `approved`, rejectedThisReport: 'rejected this report', waitingOnBankAccount: ({submitterDisplayName}: WaitingOnBankAccountParams) => `started payment, but is waiting for ${submitterDisplayName} to add a bank account.`, - adminCanceledRequest: ({manager}: AdminCanceledRequestParams) => `${manager ? `${manager}: ` : ''}canceled the payment`, + adminCanceledRequest: 'canceled the payment', canceledRequest: ({amount, submitterDisplayName}: CanceledRequestParams) => `canceled the ${amount} payment, because ${submitterDisplayName} did not enable their Expensify Wallet within 30 days`, settledAfterAddedBankAccount: ({submitterDisplayName, amount}: SettledAfterAddedBankAccountParams) => diff --git a/src/languages/es.ts b/src/languages/es.ts index bbd9d16c573c..aff1fcd3ff91 100644 --- a/src/languages/es.ts +++ b/src/languages/es.ts @@ -11,7 +11,6 @@ import type { AddEmployeeParams, AddOrDeletePolicyCustomUnitRateParams, AddressLineParams, - AdminCanceledRequestParams, AirlineParams, AlreadySignedInParams, ApprovalWorkflowErrorParams, @@ -1246,7 +1245,7 @@ const translations = { forwarded: `aprobó`, rejectedThisReport: 'rechazó este informe', waitingOnBankAccount: ({submitterDisplayName}: WaitingOnBankAccountParams) => `inició el pago, pero está esperando a que ${submitterDisplayName} añada una cuenta bancaria.`, - adminCanceledRequest: ({manager}: AdminCanceledRequestParams) => `${manager ? `${manager}: ` : ''}canceló el pago`, + adminCanceledRequest: 'canceló el pago', canceledRequest: ({amount, submitterDisplayName}: CanceledRequestParams) => `canceló el pago ${amount}, porque ${submitterDisplayName} no habilitó tu Billetera Expensify en un plazo de 30 días.`, settledAfterAddedBankAccount: ({submitterDisplayName, amount}: SettledAfterAddedBankAccountParams) => diff --git a/src/languages/fr.ts b/src/languages/fr.ts index b2d64347fb90..22a98007a669 100644 --- a/src/languages/fr.ts +++ b/src/languages/fr.ts @@ -24,7 +24,6 @@ import type { AddEmployeeParams, AddOrDeletePolicyCustomUnitRateParams, AddressLineParams, - AdminCanceledRequestParams, AirlineParams, AlreadySignedInParams, ApprovalWorkflowErrorParams, @@ -1281,7 +1280,7 @@ const translations = { forwarded: `approuvé`, rejectedThisReport: 'a rejeté ce rapport', waitingOnBankAccount: ({submitterDisplayName}: WaitingOnBankAccountParams) => `a commencé le paiement, mais attend que ${submitterDisplayName} ajoute un compte bancaire.`, - adminCanceledRequest: ({manager}: AdminCanceledRequestParams) => `${manager ? `${manager}: ` : ''} a annulé le paiement`, + adminCanceledRequest: 'a annulé le paiement', canceledRequest: ({amount, submitterDisplayName}: CanceledRequestParams) => `a annulé le paiement de ${amount}, car ${submitterDisplayName} n'a pas activé leur Expensify Wallet dans les 30 jours`, settledAfterAddedBankAccount: ({submitterDisplayName, amount}: SettledAfterAddedBankAccountParams) => diff --git a/src/languages/it.ts b/src/languages/it.ts index 86b4fac55911..4c59b9d666f1 100644 --- a/src/languages/it.ts +++ b/src/languages/it.ts @@ -24,7 +24,6 @@ import type { AddEmployeeParams, AddOrDeletePolicyCustomUnitRateParams, AddressLineParams, - AdminCanceledRequestParams, AirlineParams, AlreadySignedInParams, ApprovalWorkflowErrorParams, @@ -1275,7 +1274,7 @@ const translations = { forwarded: `approvato`, rejectedThisReport: 'ha respinto questo rapporto', waitingOnBankAccount: ({submitterDisplayName}: WaitingOnBankAccountParams) => `ha avviato il pagamento, ma è in attesa che ${submitterDisplayName} aggiunga un conto bancario.`, - adminCanceledRequest: ({manager}: AdminCanceledRequestParams) => `${manager ? `${manager}: ` : ''} ha annullato il pagamento`, + adminCanceledRequest: 'ha annullato il pagamento', canceledRequest: ({amount, submitterDisplayName}: CanceledRequestParams) => `annullato il pagamento di ${amount}, perché ${submitterDisplayName} non ha attivato il loro Expensify Wallet entro 30 giorni`, settledAfterAddedBankAccount: ({submitterDisplayName, amount}: SettledAfterAddedBankAccountParams) => diff --git a/src/languages/ja.ts b/src/languages/ja.ts index dd61389475a7..7b4990c7ad34 100644 --- a/src/languages/ja.ts +++ b/src/languages/ja.ts @@ -24,7 +24,6 @@ import type { AddEmployeeParams, AddOrDeletePolicyCustomUnitRateParams, AddressLineParams, - AdminCanceledRequestParams, AirlineParams, AlreadySignedInParams, ApprovalWorkflowErrorParams, @@ -1278,7 +1277,7 @@ const translations = { forwarded: `承認済み`, rejectedThisReport: 'このレポートを拒否しました', waitingOnBankAccount: ({submitterDisplayName}: WaitingOnBankAccountParams) => `支払いを開始しましたが、${submitterDisplayName}が銀行口座を追加するのを待っています。`, - adminCanceledRequest: ({manager}: AdminCanceledRequestParams) => `${manager ? `${manager}: ` : ''}が支払いをキャンセルしました`, + adminCanceledRequest: '支払いをキャンセルしました', canceledRequest: ({amount, submitterDisplayName}: CanceledRequestParams) => `${submitterDisplayName}が30日以内にExpensifyウォレットを有効にしなかったため、${amount}の支払いをキャンセルしました。`, settledAfterAddedBankAccount: ({submitterDisplayName, amount}: SettledAfterAddedBankAccountParams) => diff --git a/src/languages/nl.ts b/src/languages/nl.ts index a52a7a4ca482..2dfc26187e58 100644 --- a/src/languages/nl.ts +++ b/src/languages/nl.ts @@ -24,7 +24,6 @@ import type { AddEmployeeParams, AddOrDeletePolicyCustomUnitRateParams, AddressLineParams, - AdminCanceledRequestParams, AirlineParams, AlreadySignedInParams, ApprovalWorkflowErrorParams, @@ -1276,7 +1275,7 @@ const translations = { forwarded: `goedgekeurd`, rejectedThisReport: 'heeft dit rapport afgewezen', waitingOnBankAccount: ({submitterDisplayName}: WaitingOnBankAccountParams) => `is met de betaling begonnen, maar wacht op ${submitterDisplayName} om een bankrekening toe te voegen.`, - adminCanceledRequest: ({manager}: AdminCanceledRequestParams) => `${manager ? `${manager}: ` : ''}heeft de betaling geannuleerd`, + adminCanceledRequest: 'heeft de betaling geannuleerd', canceledRequest: ({amount, submitterDisplayName}: CanceledRequestParams) => `heeft de betaling van ${amount} geannuleerd, omdat ${submitterDisplayName} hun Expensify Wallet niet binnen 30 dagen heeft geactiveerd.`, settledAfterAddedBankAccount: ({submitterDisplayName, amount}: SettledAfterAddedBankAccountParams) => diff --git a/src/languages/params.ts b/src/languages/params.ts index c091b76af4b3..6bf723a44cab 100644 --- a/src/languages/params.ts +++ b/src/languages/params.ts @@ -215,8 +215,6 @@ type WaitingOnBankAccountParams = {submitterDisplayName: string}; type CanceledRequestParams = {amount: string; submitterDisplayName: string}; -type AdminCanceledRequestParams = {manager: string; amount: string}; - type SettledAfterAddedBankAccountParams = {submitterDisplayName: string; amount: string}; type PaidElsewhereParams = {payer?: string} | undefined; @@ -1017,7 +1015,6 @@ export type { LowerUpperParams, LogSizeAndDateParams, AddressLineParams, - AdminCanceledRequestParams, AlreadySignedInParams, ApprovedAmountParams, BeginningOfChatHistoryAdminRoomParams, diff --git a/src/languages/pl.ts b/src/languages/pl.ts index 687f503be612..e99117987748 100644 --- a/src/languages/pl.ts +++ b/src/languages/pl.ts @@ -24,7 +24,6 @@ import type { AddEmployeeParams, AddOrDeletePolicyCustomUnitRateParams, AddressLineParams, - AdminCanceledRequestParams, AirlineParams, AlreadySignedInParams, ApprovalWorkflowErrorParams, @@ -1275,7 +1274,7 @@ const translations = { forwarded: `zatwierdzony`, rejectedThisReport: 'odrzucono ten raport', waitingOnBankAccount: ({submitterDisplayName}: WaitingOnBankAccountParams) => `rozpoczęto płatność, ale oczekuje na ${submitterDisplayName}, aby dodał konto bankowe.`, - adminCanceledRequest: ({manager}: AdminCanceledRequestParams) => `${manager ? `${manager}: ` : ''} anulował płatność`, + adminCanceledRequest: 'anulował płatność', canceledRequest: ({amount, submitterDisplayName}: CanceledRequestParams) => `anulowano płatność w wysokości ${amount}, ponieważ ${submitterDisplayName} nie aktywował swojego Portfela Expensify w ciągu 30 dni`, settledAfterAddedBankAccount: ({submitterDisplayName, amount}: SettledAfterAddedBankAccountParams) => diff --git a/src/languages/pt-BR.ts b/src/languages/pt-BR.ts index 40396c933ff9..f5bb4d65fe94 100644 --- a/src/languages/pt-BR.ts +++ b/src/languages/pt-BR.ts @@ -24,7 +24,6 @@ import type { AddEmployeeParams, AddOrDeletePolicyCustomUnitRateParams, AddressLineParams, - AdminCanceledRequestParams, AirlineParams, AlreadySignedInParams, ApprovalWorkflowErrorParams, @@ -1273,7 +1272,7 @@ const translations = { forwarded: `aprovado`, rejectedThisReport: 'rejeitou este relatório', waitingOnBankAccount: ({submitterDisplayName}: WaitingOnBankAccountParams) => `iniciou o pagamento, mas está aguardando ${submitterDisplayName} adicionar uma conta bancária.`, - adminCanceledRequest: ({manager}: AdminCanceledRequestParams) => `${manager ? `${manager}: ` : ''} cancelou o pagamento`, + adminCanceledRequest: 'cancelou o pagamento', canceledRequest: ({amount, submitterDisplayName}: CanceledRequestParams) => `cancelou o pagamento de ${amount}, porque ${submitterDisplayName} não ativou sua Expensify Wallet dentro de 30 dias`, settledAfterAddedBankAccount: ({submitterDisplayName, amount}: SettledAfterAddedBankAccountParams) => diff --git a/src/languages/zh-hans.ts b/src/languages/zh-hans.ts index 295d28210cf7..7d9726b737bb 100644 --- a/src/languages/zh-hans.ts +++ b/src/languages/zh-hans.ts @@ -24,7 +24,6 @@ import type { AddEmployeeParams, AddOrDeletePolicyCustomUnitRateParams, AddressLineParams, - AdminCanceledRequestParams, AirlineParams, AlreadySignedInParams, ApprovalWorkflowErrorParams, @@ -1265,7 +1264,7 @@ const translations = { forwarded: `批准`, rejectedThisReport: '拒绝了此报告', waitingOnBankAccount: ({submitterDisplayName}: WaitingOnBankAccountParams) => `已开始付款，但正在等待${submitterDisplayName}添加银行账户。`, - adminCanceledRequest: ({manager}: AdminCanceledRequestParams) => `${manager ? `${manager}: ` : ''}取消了付款`, + adminCanceledRequest: '取消了付款', canceledRequest: ({amount, submitterDisplayName}: CanceledRequestParams) => `取消了${amount}付款，因为${submitterDisplayName}在30天内未启用他们的Expensify Wallet。`, settledAfterAddedBankAccount: ({submitterDisplayName, amount}: SettledAfterAddedBankAccountParams) => `${submitterDisplayName} 添加了一个银行账户。${amount} 付款已完成。`, paidElsewhere: ({payer}: PaidElsewhereParams = {}) => `${payer ? `${payer} ` : ''}已标记为已支付`, diff --git a/src/libs/OptionsListUtils/index.ts b/src/libs/OptionsListUtils/index.ts index 988ea1322831..7a290e7c92a1 100644 --- a/src/libs/OptionsListUtils/index.ts +++ b/src/libs/OptionsListUtils/index.ts @@ -627,7 +627,7 @@ function getLastMessageTextForReport({ } else if (isReimbursementQueuedAction(lastReportAction)) { lastMessageTextFromReport = getReimbursementQueuedActionMessage({reportAction: lastReportAction, reportOrID: report}); } else if (isReimbursementDeQueuedOrCanceledAction(lastReportAction)) { - lastMessageTextFromReport = getReimbursementDeQueuedOrCanceledActionMessage(lastReportAction, report, true); + lastMessageTextFromReport = getReimbursementDeQueuedOrCanceledActionMessage(lastReportAction, report); } else if (isDeletedParentAction(lastReportAction) && reportUtilsIsChatReport(report)) { lastMessageTextFromReport = getDeletedParentActionMessageForChatReport(lastReportAction); } else if (isPendingRemove(lastReportAction) && report?.reportID && isThreadParentMessage(lastReportAction, report.reportID)) { diff --git a/src/libs/ReportUtils.ts b/src/libs/ReportUtils.ts index 99363754316d..f029ca1e44a7 100644 --- a/src/libs/ReportUtils.ts +++ b/src/libs/ReportUtils.ts @@ -3654,7 +3654,6 @@ function getReimbursementQueuedActionMessage({ function getReimbursementDeQueuedOrCanceledActionMessage( reportAction: OnyxEntry>, reportOrID: OnyxEntry | string | SearchReport, - isLHNPreview = false, ): string { const report = typeof reportOrID === 'string' ? getReport(reportOrID, allReports) : reportOrID; const originalMessage = getOriginalMessage(reportAction); @@ -3662,8 +3661,7 @@ function getReimbursementDeQueuedOrCanceledActionMessage( const currency = originalMessage?.currency; const formattedAmount = convertToDisplayString(amount, currency); if (originalMessage?.cancellationReason === CONST.REPORT.CANCEL_PAYMENT_REASONS.ADMIN || originalMessage?.cancellationReason === CONST.REPORT.CANCEL_PAYMENT_REASONS.USER) { - const payerOrApproverName = report?.managerID === currentUserAccountID || !isLHNPreview ? '' : getDisplayNameForParticipant({accountID: report?.managerID, shouldUseShortForm: true}); - return translateLocal('iou.adminCanceledRequest', {manager: payerOrApproverName, amount: formattedAmount}); + return translateLocal('iou.adminCanceledRequest'); } const submitterDisplayName = getDisplayNameForParticipant({accountID: report?.ownerAccountID, shouldUseShortForm: true}) ?? ''; return translateLocal('iou.canceledRequest', {submitterDisplayName, amount: formattedAmount});