@zeniai/client-epic-state 5.0.31-betaAR6 → 5.0.31-betaAR7

package/lib/esm/view/spendManagement/spendManagementFilterHelpers.js

@@ -332,33 +332,22 @@ const getCategoryValueForTransaction = (key, transaction) => {
             return undefined;
         }
         case 'payment_account_name': {
-            // Get from transaction.account or from lines
-            if (transaction.transaction.account?.accountName) {
-                return transaction.transaction.account.accountName;
-            }
-            // Get from first line's account
-            const firstLine = transaction.transaction.lines?.[0];
-            if (firstLine?.type === 'transaction_with_account_and_class_line' ||
-                firstLine?.type === 'transaction_with_product_or_service_line' ||
-                firstLine?.type === 'journal_entry_transaction_line') {
-                const accountLine = firstLine;
-                return accountLine.account?.accountName;
-            }
-            return undefined;
+            // Match the value the row renders: TransactionCategorizationListRow reads
+            // `currentTransaction?.account?.accountName` for the Payment Account Name
+            // column. Returning the same field here keeps filter-match parity with the
+            // visible cell, so any row a user can see is also a row the filter can match.
+            return transaction.transaction.account?.accountName;
         }
         case 'payment_account_type': {
-            // Similar to payment_account_name but for type
-            if (transaction.transaction.account?.accountType) {
-                return transaction.transaction.account.accountType;
-            }
-            const firstLineForType = transaction.transaction.lines?.[0];
-            if (firstLineForType?.type === 'transaction_with_account_and_class_line' ||
-                firstLineForType?.type === 'transaction_with_product_or_service_line' ||
-                firstLineForType?.type === 'journal_entry_transaction_line') {
-                const accountLineForType = firstLineForType;
-                return accountLineForType.account?.accountType;
-            }
-            return undefined;
+            // Match the value the row renders: TransactionCategorizationListRow reads
+            // `currentTransaction?.paymentTypeName` for the Payment Type column
+            // (e.g. "Credit Card", "Check"). NOTE: the Payment Account Type filter
+            // dropdown options are currently derived from raw `account.accountType`
+            // values (e.g. "credit_card", "bank") in
+            // `ExpenseAutomationPage.filterOptions`. With this matcher change, the
+            // dropdown options must be aligned to also emit `paymentTypeName` values,
+            // otherwise the filter will silently match nothing.
+            return transaction.transaction.paymentTypeName;
         }
         case 'category': {
             // Get from transactionLocalData (preferred) or from transaction lines