Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion src/languages/de.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1416,7 +1416,6 @@ const translations: TranslationDeepObject<typeof en> = {
managerApproved: (manager: string) => `${manager} hat genehmigt:`,
managerApprovedAmount: (manager: string, amount: number | string) => `${manager} hat ${amount} genehmigt`,
payerSettled: (amount: number | string) => `${amount} bezahlt`,
payerSettledWithMissingBankAccount: (amount: number | string) => `${amount} bezahlt. Füge ein Bankkonto hinzu, um deine Zahlung zu erhalten.`,
automaticallyApproved: `über Genehmigung durch <a href="${CONST.CONFIGURE_EXPENSE_REPORT_RULES_HELP_URL}">Workspace-Regeln</a>`,
approvedAmount: (amount: number | string) => `${amount} genehmigt`,
approvedMessage: `genehmigt`,
Expand Down
1 change: 0 additions & 1 deletion src/languages/el.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1476,7 +1476,6 @@ const translations: TranslationDeepObject<typeof en> = {
managerApproved: (manager: string) => `${manager} ενέκρινε:`,
managerApprovedAmount: (manager: string, amount: number | string) => `Ο/Η ${manager} ενέκρινε ${amount}`,
payerSettled: (amount: number | string) => `πληρώθηκαν ${amount}`,
payerSettledWithMissingBankAccount: (amount: number | string) => `πληρώθηκαν ${amount}. Προσθέστε έναν τραπεζικό λογαριασμό για να λάβετε την πληρωμή σας.`,
automaticallyApproved: `εγκρίθηκε μέσω των <a href="${CONST.CONFIGURE_EXPENSE_REPORT_RULES_HELP_URL}">κανόνων χώρου εργασίας</a>`,
approvedAmount: (amount: number | string) => `εγκρίθηκε ${amount}`,
approvedMessage: `εγκεκριμένο`,
Expand Down
1 change: 0 additions & 1 deletion src/languages/en.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1499,7 +1499,6 @@ const translations = {
managerApproved: (manager: string) => `${manager} approved:`,
managerApprovedAmount: (manager: string, amount: number | string) => `${manager} approved ${amount}`,
payerSettled: (amount: number | string) => `paid ${amount}`,
payerSettledWithMissingBankAccount: (amount: number | string) => `paid ${amount}. Add a bank account to receive your payment.`,
automaticallyApproved: `approved via <a href="${CONST.CONFIGURE_EXPENSE_REPORT_RULES_HELP_URL}">workspace rules</a>`,
approvedAmount: (amount: number | string) => `approved ${amount}`,
approvedMessage: `approved`,
Expand Down
1 change: 0 additions & 1 deletion src/languages/es.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1416,7 +1416,6 @@ const translations: TranslationDeepObject<typeof en> = {
managerApproved: (manager) => `${manager} aprobó:`,
managerApprovedAmount: (manager, amount) => `${manager} aprobó ${amount}`,
payerSettled: (amount) => `pagó ${amount}`,
payerSettledWithMissingBankAccount: (amount) => `pagó ${amount}. Agrega una cuenta bancaria para recibir tu pago.`,
automaticallyApproved: `aprobó mediante <a href="${CONST.CONFIGURE_EXPENSE_REPORT_RULES_HELP_URL}">reglas del espacio de trabajo</a>`,
approvedAmount: (amount) => `aprobó ${amount}`,
approvedMessage: `aprobado`,
Expand Down
1 change: 0 additions & 1 deletion src/languages/fr.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1421,7 +1421,6 @@ const translations: TranslationDeepObject<typeof en> = {
managerApproved: (manager: string) => `${manager} a approuvé :`,
managerApprovedAmount: (manager: string, amount: number | string) => `${manager} a approuvé ${amount}`,
payerSettled: (amount: number | string) => `payé ${amount}`,
payerSettledWithMissingBankAccount: (amount: number | string) => `a payé ${amount}. Ajoutez un compte bancaire pour recevoir votre paiement.`,
automaticallyApproved: `approuvé via les <a href="${CONST.CONFIGURE_EXPENSE_REPORT_RULES_HELP_URL}">règles de l'espace de travail</a>`,
approvedAmount: (amount: number | string) => `${amount} approuvé`,
approvedMessage: `approuvé`,
Expand Down
1 change: 0 additions & 1 deletion src/languages/it.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1415,7 +1415,6 @@ const translations: TranslationDeepObject<typeof en> = {
managerApproved: (manager: string) => `${manager} ha approvato:`,
managerApprovedAmount: (manager: string, amount: number | string) => `${manager} ha approvato ${amount}`,
payerSettled: (amount: number | string) => `pagato ${amount}`,
payerSettledWithMissingBankAccount: (amount: number | string) => `ha pagato ${amount}. Aggiungi un conto bancario per ricevere il tuo pagamento.`,
automaticallyApproved: `approvata tramite le <a href="${CONST.CONFIGURE_EXPENSE_REPORT_RULES_HELP_URL}">regole dello spazio di lavoro</a>`,
approvedAmount: (amount: number | string) => `approvato ${amount}`,
approvedMessage: `approvato`,
Expand Down
1 change: 0 additions & 1 deletion src/languages/ja.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1399,7 +1399,6 @@ const translations: TranslationDeepObject<typeof en> = {
managerApproved: (manager: string) => `${manager} が承認しました:`,
managerApprovedAmount: (manager: string, amount: number | string) => `${manager} が ${amount} を承認しました`,
payerSettled: (amount: number | string) => `${amount} を支払いました`,
payerSettledWithMissingBankAccount: (amount: number | string) => `${amount}を支払いました。支払いを受け取るには銀行口座を追加してください。`,
automaticallyApproved: `<a href="${CONST.CONFIGURE_EXPENSE_REPORT_RULES_HELP_URL}">ワークスペースルール</a>により承認済み`,
approvedAmount: (amount: number | string) => `${amount} を承認しました`,
approvedMessage: `承認済み`,
Expand Down
1 change: 0 additions & 1 deletion src/languages/nl.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1414,7 +1414,6 @@ const translations: TranslationDeepObject<typeof en> = {
managerApproved: (manager: string) => `${manager} heeft goedgekeurd:`,
managerApprovedAmount: (manager: string, amount: number | string) => `${manager} heeft ${amount} goedgekeurd`,
payerSettled: (amount: number | string) => `heeft ${amount} betaald`,
payerSettledWithMissingBankAccount: (amount: number | string) => `heeft ${amount} betaald. Voeg een bankrekening toe om je betaling te ontvangen.`,
automaticallyApproved: `goedgekeurd via <a href="${CONST.CONFIGURE_EXPENSE_REPORT_RULES_HELP_URL}">werkruimteregels</a>`,
approvedAmount: (amount: number | string) => `goedgekeurd ${amount}`,
approvedMessage: `goedgekeurd`,
Expand Down
1 change: 0 additions & 1 deletion src/languages/pl.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1410,7 +1410,6 @@ const translations: TranslationDeepObject<typeof en> = {
managerApproved: (manager: string) => `${manager} zatwierdził(a):`,
managerApprovedAmount: (manager: string, amount: number | string) => `${manager} zatwierdził(a) ${amount}`,
payerSettled: (amount: number | string) => `zapłacono ${amount}`,
payerSettledWithMissingBankAccount: (amount: number | string) => `zapłacono ${amount}. Dodaj konto bankowe, aby otrzymać płatność.`,
automaticallyApproved: `zatwierdzone przez <a href="${CONST.CONFIGURE_EXPENSE_REPORT_RULES_HELP_URL}">reguły przestrzeni roboczej</a>`,
approvedAmount: (amount: number | string) => `zatwierdzono ${amount}`,
approvedMessage: `zatwierdzono`,
Expand Down
1 change: 0 additions & 1 deletion src/languages/pt-BR.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1414,7 +1414,6 @@ const translations: TranslationDeepObject<typeof en> = {
managerApproved: (manager: string) => `${manager} aprovou:`,
managerApprovedAmount: (manager: string, amount: number | string) => `${manager} aprovou ${amount}`,
payerSettled: (amount: number | string) => `pagou ${amount}`,
payerSettledWithMissingBankAccount: (amount: number | string) => `pagou ${amount}. Adicione uma conta bancária para receber seu pagamento.`,
automaticallyApproved: `aprovado por meio das <a href="${CONST.CONFIGURE_EXPENSE_REPORT_RULES_HELP_URL}">regras do workspace</a>`,
approvedAmount: (amount: number | string) => `aprovou ${amount}`,
approvedMessage: `aprovado`,
Expand Down
1 change: 0 additions & 1 deletion src/languages/zh-hans.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1362,7 +1362,6 @@ const translations: TranslationDeepObject<typeof en> = {
managerApproved: (manager: string) => `${manager} 已批准:`,
managerApprovedAmount: (manager: string, amount: number | string) => `${manager} 已批准 ${amount}`,
payerSettled: (amount: number | string) => `已支付 ${amount}`,
payerSettledWithMissingBankAccount: (amount: number | string) => `已支付 ${amount}。添加一个银行账户以接收你的付款。`,
automaticallyApproved: `通过<a href="${CONST.CONFIGURE_EXPENSE_REPORT_RULES_HELP_URL}">工作区规则</a>批准`,
approvedAmount: (amount: number | string) => `已批准 ${amount}`,
approvedMessage: `已批准`,
Expand Down
5 changes: 1 addition & 4 deletions src/libs/ReportUtils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11101,7 +11101,7 @@ function getIOUReportActionDisplayMessage(

switch (originalMessage.paymentType) {
case CONST.IOU.PAYMENT_TYPE.ELSEWHERE:
translationKey = hasMissingInvoiceBankAccount(IOUReportID) ? 'iou.payerSettledWithMissingBankAccount' : 'iou.paidElsewhere';
translationKey = 'iou.paidElsewhere';
break;
case CONST.IOU.PAYMENT_TYPE.EXPENSIFY:
case CONST.IOU.PAYMENT_TYPE.VBBA:
Expand Down Expand Up @@ -11129,9 +11129,6 @@ function getIOUReportActionDisplayMessage(
if (translationKey === 'iou.paidElsewhere') {
return getElsewherePaymentReportActionMessage(translate, originalMessage);
}
if (translationKey === 'iou.payerSettledWithMissingBankAccount') {
return translate(translationKey, '');
}
}

const amount = getTransactionAmount(transaction, !isEmptyObject(iouReport) && isExpenseReport(iouReport), transaction?.reportID === CONST.REPORT.UNREPORTED_REPORT_ID) ?? 0;
Expand Down
32 changes: 32 additions & 0 deletions tests/unit/ReportUtilsTest.ts
Original file line number Diff line number Diff line change
Expand Up @@ -649,6 +649,38 @@ describe('ReportUtils', () => {

expect(getIOUReportActionDisplayMessage(translateLocal, paidElsewhereReportAction, convertToDisplayString, undefined, iouReport)).toBe(translateLocal('iou.paidElsewhere'));
});

it('should return marked as paid when the invoice sender copies a settled elsewhere payment (missing invoice bank account)', async () => {
// Given a settled invoice report owned by the current user (the sender) on a policy with no invoice bank account.
// This is the exact condition that used to flip the copy path to "paid . Add a bank account to receive your payment."
const invoiceReportID = '9876543210';
const invoicePolicyID = 333;
await Onyx.merge(`${ONYXKEYS.COLLECTION.POLICY}${invoicePolicyID}`, createRandomPolicy(invoicePolicyID, CONST.POLICY.TYPE.TEAM));
await Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT}${invoiceReportID}`, {
...createExpenseReport(Number(invoiceReportID)),
type: CONST.REPORT.TYPE.INVOICE,
policyID: invoicePolicyID.toString(),
ownerAccountID: currentUserAccountID,
statusNum: CONST.REPORT.STATUS_NUM.REIMBURSED,
stateNum: CONST.REPORT.STATE_NUM.APPROVED,
});

const invoicePaidElsewhereReportAction = {
...createRandomReportAction(47),
actionName: CONST.REPORT.ACTIONS.TYPE.IOU,
reportID: invoiceReportID,
originalMessage: {
IOUReportID: invoiceReportID,
type: CONST.IOU.REPORT_ACTION_TYPE.PAY,
paymentType: CONST.IOU.PAYMENT_TYPE.ELSEWHERE,
},
};

// Then the copied message matches what is displayed ("marked as paid"), not the broken empty-amount string.
expect(getIOUReportActionDisplayMessage(translateLocal, invoicePaidElsewhereReportAction, convertToDisplayString, undefined, iouReport)).toBe(
translateLocal('iou.paidElsewhere'),
);
});
});

describe('getTaskAssigneeChatOnyxData', () => {
Expand Down
Loading