@zeniai/client-epic-state 5.0.31-betaAR11 → 5.0.31-betaAR3

package/lib/entity/account/accountSelector.d.ts

@@ -1,9 +1,9 @@
 import { AccountsViewParentID } from '../../commonStateTypes/accountView/nestedAccountID';
 import { ClassesViewParentID } from '../../commonStateTypes/classesView/nestedClassID';
+import { ProjectsViewParentID } from '../../commonStateTypes/projectView/projectViewParentID';
 import { AdditionalBalancesOptions } from '../../commonStateTypes/coaBalance/additionalBalances/getAdditionalBalances';
 import { COABalancesFilter } from '../../commonStateTypes/coaBalance/coaBalancesFilter';
 import { ID } from '../../commonStateTypes/common';
-import { ProjectsViewParentID } from '../../commonStateTypes/projectView/projectViewParentID';
 import { EntityOrder } from '../../commonStateTypes/selectorTypes/selectorTypes';
 import { ReportIDPlusForecastID } from '../../commonStateTypes/viewAndReport/viewAndReport';
 import { Account, AccountBase, AccountState, AccountType } from './accountState';
@@ -132,7 +132,12 @@ export declare const getAllAccounts: (accountState: AccountState) => Account[];
 export interface AccountFilterOption {
     accountId: ID;
     accountName: string;
-    accountType: AccountType;
+    /**
+     * Account type for the underlying account (e.g. 'bank', 'credit_card', 'expenses').
+     * Required by the Payment Account Type filter dropdown so it can show only the
+     * types actually present on the tenant rather than the full ALL_ACCOUNT_TYPES list.
+     */
+    accountType: AccountType | undefined;
 }
 /**
  * Partitions accounts for transaction filter dropdowns: bank/credit_card → paymentAccountNames,

package/lib/entity/account/accountSelector.js

@@ -208,9 +208,6 @@ const getTransactionFilterAccountOptions = (accountState) => {
     const paymentAccountNames = [];
     const categoryOptions = [];
     for (const account of accounts) {
-        if (account.accountType == null) {
-            continue;
-        }
         const option = {
             accountId: account.accountId,
             accountName: account.accountName,

package/lib/esm/entity/account/accountSelector.js

@@ -194,9 +194,6 @@ export const getTransactionFilterAccountOptions = (accountState) => {
     const paymentAccountNames = [];
     const categoryOptions = [];
     for (const account of accounts) {
-        if (account.accountType == null) {
-            continue;
-        }
         const option = {
             accountId: account.accountId,
             accountName: account.accountName,

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

@@ -332,20 +332,33 @@ const getCategoryValueForTransaction = (key, transaction) => {
             return undefined;
         }
         case 'payment_account_name': {
-            // 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;
+            // 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;
         }
         case 'payment_account_type': {
-            // Compare against the raw `paymentType` enum (e.g. "credit_card", "check",
-            // "cash"). The same enum is what TransactionCategorizationListRow uses for
-            // its icon switch on line ~1675, and it's what the dropdown options emit
-            // as `value`. Display labels come from each account's `paymentTypeName`
-            // field (populated by mapAccountBasePayloadToAccountBase from the backend
-            // payload) — no client-side label map required.
-            return transaction.transaction.paymentType;
+            // 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;
         }
         case 'category': {
             // Get from transactionLocalData (preferred) or from transaction lines