From 4f62ad5afe48ca57da12e34eaf83ef5fa1147aeb Mon Sep 17 00:00:00 2001 From: nkdengineer Date: Wed, 10 Apr 2024 01:56:59 +0700 Subject: [PATCH 1/4] fix LHN preview for payment cancellation --- src/libs/OptionsListUtils.ts | 2 +- src/libs/ReportUtils.ts | 13 ++++++++++--- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/src/libs/OptionsListUtils.ts b/src/libs/OptionsListUtils.ts index e1a3e9207ad82..613041d8a618b 100644 --- a/src/libs/OptionsListUtils.ts +++ b/src/libs/OptionsListUtils.ts @@ -609,7 +609,7 @@ function getLastMessageTextForReport(report: OnyxEntry, lastActorDetails } else if (ReportActionUtils.isReimbursementQueuedAction(lastReportAction)) { lastMessageTextFromReport = ReportUtils.getReimbursementQueuedActionMessage(lastReportAction, report); } else if (ReportActionUtils.isReimbursementDeQueuedAction(lastReportAction)) { - lastMessageTextFromReport = ReportUtils.getReimbursementDeQueuedActionMessage(lastReportAction, report); + lastMessageTextFromReport = ReportUtils.getReimbursementDeQueuedActionMessage(lastReportAction, report, true); } else if (ReportActionUtils.isDeletedParentAction(lastReportAction) && ReportUtils.isChatReport(report)) { lastMessageTextFromReport = ReportUtils.getDeletedParentActionMessageForChatReport(lastReportAction); } else if (ReportActionUtils.isPendingRemove(lastReportAction) && ReportActionUtils.isThreadParentMessage(lastReportAction, report?.reportID ?? '')) { diff --git a/src/libs/ReportUtils.ts b/src/libs/ReportUtils.ts index c2bb77bd97ce5..046ee0f6504f1 100644 --- a/src/libs/ReportUtils.ts +++ b/src/libs/ReportUtils.ts @@ -1954,14 +1954,21 @@ function getReimbursementQueuedActionMessage(reportAction: OnyxEntry, report: OnyxEntry | EmptyObject): string { +function getReimbursementDeQueuedActionMessage( + reportAction: OnyxEntry, + report: OnyxEntry | EmptyObject, + isLHNPreview = false, +): string { const originalMessage = reportAction?.originalMessage as ReimbursementDeQueuedMessage | undefined; const amount = originalMessage?.amount; const currency = originalMessage?.currency; const formattedAmount = CurrencyUtils.convertToDisplayString(amount, currency); if (originalMessage?.cancellationReason === CONST.REPORT.CANCEL_PAYMENT_REASONS.ADMIN) { - const payerOrApproverName = isExpenseReport(report) ? getPolicyName(report, false) : getDisplayNameForParticipant(report?.managerID) ?? ''; - return Localize.translateLocal('iou.adminCanceledRequest', {manager: payerOrApproverName, amount: formattedAmount}); + let payerOrApproverName = report?.managerID === currentUserAccountID ? '' : getDisplayNameForParticipant(report?.managerID, true); + if (!isLHNPreview) { + payerOrApproverName = ''; + } + payerOrApproverName = payerOrApproverName ? `${payerOrApproverName}:` : payerOrApproverName; } const submitterDisplayName = getDisplayNameForParticipant(report?.ownerAccountID, true) ?? ''; return Localize.translateLocal('iou.canceledRequest', {submitterDisplayName, amount: formattedAmount}); From 53f07695faac28dc287018ce49240eff67ab4e67 Mon Sep 17 00:00:00 2001 From: nkdengineer Date: Wed, 10 Apr 2024 02:07:28 +0700 Subject: [PATCH 2/4] fix missing adminCanceledRequest --- src/libs/ReportUtils.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/libs/ReportUtils.ts b/src/libs/ReportUtils.ts index 046ee0f6504f1..bde9a445ea49c 100644 --- a/src/libs/ReportUtils.ts +++ b/src/libs/ReportUtils.ts @@ -1969,6 +1969,7 @@ function getReimbursementDeQueuedActionMessage( payerOrApproverName = ''; } payerOrApproverName = payerOrApproverName ? `${payerOrApproverName}:` : payerOrApproverName; + return Localize.translateLocal('iou.adminCanceledRequest', {manager: payerOrApproverName, amount: formattedAmount}); } const submitterDisplayName = getDisplayNameForParticipant(report?.ownerAccountID, true) ?? ''; return Localize.translateLocal('iou.canceledRequest', {submitterDisplayName, amount: formattedAmount}); From 9be63ee2a78afa60a39d4498b4dbdafff68b1472 Mon Sep 17 00:00:00 2001 From: nkdengineer Date: Wed, 10 Apr 2024 15:19:14 +0700 Subject: [PATCH 3/4] fix update translation adminCanceledRequest --- src/languages/en.ts | 2 +- src/languages/es.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/languages/en.ts b/src/languages/en.ts index ab1a53a55da94..0b54969205cd0 100755 --- a/src/languages/en.ts +++ b/src/languages/en.ts @@ -669,7 +669,7 @@ export default { payerSettled: ({amount}: PayerSettledParams) => `paid ${amount}`, approvedAmount: ({amount}: ApprovedAmountParams) => `approved ${amount}`, waitingOnBankAccount: ({submitterDisplayName}: WaitingOnBankAccountParams) => `started settling up, payment is held until ${submitterDisplayName} adds a bank account`, - adminCanceledRequest: ({manager, amount}: AdminCanceledRequestParams) => `${manager} cancelled the ${amount} payment.`, + adminCanceledRequest: ({manager, amount}: AdminCanceledRequestParams) => `${manager ? `${manager} ` : ''}cancelled the ${amount} 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 6330ade811ca4..e9bc4d5388bd1 100644 --- a/src/languages/es.ts +++ b/src/languages/es.ts @@ -665,7 +665,7 @@ export default { payerSettled: ({amount}: PayerSettledParams) => `pagó ${amount}`, approvedAmount: ({amount}: ApprovedAmountParams) => `aprobó ${amount}`, waitingOnBankAccount: ({submitterDisplayName}: WaitingOnBankAccountParams) => `inicio el pago, pero no se procesará hasta que ${submitterDisplayName} añada una cuenta bancaria`, - adminCanceledRequest: ({manager, amount}: AdminCanceledRequestParams) => `${manager} canceló el pago de ${amount}.`, + adminCanceledRequest: ({manager, amount}: AdminCanceledRequestParams) => `${manager ? `${manager} ` : ''}canceló el pago de ${amount}.`, canceledRequest: ({amount, submitterDisplayName}: CanceledRequestParams) => `canceló el pago ${amount}, porque ${submitterDisplayName} no habilitó su billetera Expensify en un plazo de 30 días.`, settledAfterAddedBankAccount: ({submitterDisplayName, amount}: SettledAfterAddedBankAccountParams) => From 2b4fbdb1f683c256d44fd75035cbce2e6b3d27af Mon Sep 17 00:00:00 2001 From: nkdengineer Date: Wed, 10 Apr 2024 22:22:21 +0700 Subject: [PATCH 4/4] fix update adminCanceledRequest --- src/languages/en.ts | 2 +- src/languages/es.ts | 2 +- src/libs/ReportUtils.ts | 6 +----- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/src/languages/en.ts b/src/languages/en.ts index 0b54969205cd0..0fecc1cb97edb 100755 --- a/src/languages/en.ts +++ b/src/languages/en.ts @@ -669,7 +669,7 @@ export default { payerSettled: ({amount}: PayerSettledParams) => `paid ${amount}`, approvedAmount: ({amount}: ApprovedAmountParams) => `approved ${amount}`, waitingOnBankAccount: ({submitterDisplayName}: WaitingOnBankAccountParams) => `started settling up, payment is held until ${submitterDisplayName} adds a bank account`, - adminCanceledRequest: ({manager, amount}: AdminCanceledRequestParams) => `${manager ? `${manager} ` : ''}cancelled the ${amount} payment.`, + adminCanceledRequest: ({manager, amount}: AdminCanceledRequestParams) => `${manager ? `${manager}: ` : ''}cancelled the ${amount} 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 e9bc4d5388bd1..7307070bb0149 100644 --- a/src/languages/es.ts +++ b/src/languages/es.ts @@ -665,7 +665,7 @@ export default { payerSettled: ({amount}: PayerSettledParams) => `pagó ${amount}`, approvedAmount: ({amount}: ApprovedAmountParams) => `aprobó ${amount}`, waitingOnBankAccount: ({submitterDisplayName}: WaitingOnBankAccountParams) => `inicio el pago, pero no se procesará hasta que ${submitterDisplayName} añada una cuenta bancaria`, - adminCanceledRequest: ({manager, amount}: AdminCanceledRequestParams) => `${manager ? `${manager} ` : ''}canceló el pago de ${amount}.`, + adminCanceledRequest: ({manager, amount}: AdminCanceledRequestParams) => `${manager ? `${manager}: ` : ''}canceló el pago de ${amount}.`, canceledRequest: ({amount, submitterDisplayName}: CanceledRequestParams) => `canceló el pago ${amount}, porque ${submitterDisplayName} no habilitó su billetera Expensify en un plazo de 30 días.`, settledAfterAddedBankAccount: ({submitterDisplayName, amount}: SettledAfterAddedBankAccountParams) => diff --git a/src/libs/ReportUtils.ts b/src/libs/ReportUtils.ts index bde9a445ea49c..45ed2f4cdd94c 100644 --- a/src/libs/ReportUtils.ts +++ b/src/libs/ReportUtils.ts @@ -1964,11 +1964,7 @@ function getReimbursementDeQueuedActionMessage( const currency = originalMessage?.currency; const formattedAmount = CurrencyUtils.convertToDisplayString(amount, currency); if (originalMessage?.cancellationReason === CONST.REPORT.CANCEL_PAYMENT_REASONS.ADMIN) { - let payerOrApproverName = report?.managerID === currentUserAccountID ? '' : getDisplayNameForParticipant(report?.managerID, true); - if (!isLHNPreview) { - payerOrApproverName = ''; - } - payerOrApproverName = payerOrApproverName ? `${payerOrApproverName}:` : payerOrApproverName; + const payerOrApproverName = report?.managerID === currentUserAccountID || !isLHNPreview ? '' : getDisplayNameForParticipant(report?.managerID, true); return Localize.translateLocal('iou.adminCanceledRequest', {manager: payerOrApproverName, amount: formattedAmount}); } const submitterDisplayName = getDisplayNameForParticipant(report?.ownerAccountID, true) ?? '';