diff --git a/src/CONST.ts b/src/CONST.ts index dd28f214b1e2..566d5179f86a 100755 --- a/src/CONST.ts +++ b/src/CONST.ts @@ -669,6 +669,7 @@ const CONST = { MANAGER_DETACH_RECEIPT: 'MANAGERDETACHRECEIPT', // OldDot Action MARKED_REIMBURSED: 'MARKEDREIMBURSED', // OldDot Action MARK_REIMBURSED_FROM_INTEGRATION: 'MARKREIMBURSEDFROMINTEGRATION', // OldDot Action + MERGED_WITH_CASH_TRANSACTION: 'MERGEDWITHCASHTRANSACTION', MODIFIED_EXPENSE: 'MODIFIEDEXPENSE', MOVED: 'MOVED', OUTDATED_BANK_ACCOUNT: 'OUTDATEDBANKACCOUNT', // OldDot Action diff --git a/src/languages/en.ts b/src/languages/en.ts index 01816b54313d..232c7ea2074b 100755 --- a/src/languages/en.ts +++ b/src/languages/en.ts @@ -2999,4 +2999,7 @@ export default { offline: "You appear to be offline. Unfortunately, Expensify Classic doesn't work offline, but New Expensify does. If you prefer to use Expensify Classic, try again when you have an internet connection.", }, + systemMessage: { + mergedWithCashTransaction: 'matched a receipt to this transaction.', + }, } satisfies TranslationBase; diff --git a/src/languages/es.ts b/src/languages/es.ts index bd19b7615f54..bf36782c3393 100644 --- a/src/languages/es.ts +++ b/src/languages/es.ts @@ -3502,4 +3502,7 @@ export default { offline: 'Parece que estás desconectado. Desafortunadamente, Expensify Classic no funciona sin conexión, pero New Expensify sí. Si prefieres utilizar Expensify Classic, inténtalo de nuevo cuando tengas conexión a internet.', }, + systemMessage: { + mergedWithCashTransaction: 'encontró un recibo para esta transacción.', + }, } satisfies EnglishTranslation; diff --git a/src/pages/home/report/ReportActionItem.tsx b/src/pages/home/report/ReportActionItem.tsx index 917031336fc8..5697807ca825 100644 --- a/src/pages/home/report/ReportActionItem.tsx +++ b/src/pages/home/report/ReportActionItem.tsx @@ -612,6 +612,8 @@ function ReportActionItem({ children = ; } else if (action.actionName === CONST.REPORT.ACTIONS.TYPE.UNHOLD) { children = ; + } else if (action.actionName === CONST.REPORT.ACTIONS.TYPE.MERGED_WITH_CASH_TRANSACTION) { + children = ; } else if (action.actionName === CONST.REPORT.ACTIONS.TYPE.DISMISSED_VIOLATION) { children = ; } else { diff --git a/src/types/onyx/OriginalMessage.ts b/src/types/onyx/OriginalMessage.ts index d49db3e7ba0f..3cc9cb41cb20 100644 --- a/src/types/onyx/OriginalMessage.ts +++ b/src/types/onyx/OriginalMessage.ts @@ -312,6 +312,11 @@ type OriginalMessageMoved = { }; }; +type OriginalMessageMergedWithCashTransaction = { + actionName: typeof CONST.REPORT.ACTIONS.TYPE.MERGED_WITH_CASH_TRANSACTION; + originalMessage: Record; // No data is sent with this action +}; + type OriginalMessageDismissedViolation = { actionName: typeof CONST.REPORT.ACTIONS.TYPE.DISMISSED_VIOLATION; originalMessage: { @@ -344,6 +349,7 @@ type OriginalMessage = | OriginalMessageMoved | OriginalMessageMarkedReimbursed | OriginalMessageActionableTrackedExpenseWhisper + | OriginalMessageMergedWithCashTransaction | OriginalMessageDismissedViolation; export default OriginalMessage;