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

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,6 +132,7 @@ export declare const getAllAccounts: (accountState: AccountState) => Account[];
 export interface AccountFilterOption {
     accountId: ID;
     accountName: string;
+    accountType: AccountType;
 }
 /**
  * Partitions accounts for transaction filter dropdowns: bank/credit_card → paymentAccountNames,

package/lib/entity/account/accountSelector.js

@@ -208,9 +208,13 @@ 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,
+            accountType: account.accountType,
         };
         if ((0, accountState_1.isPaymentAccountType)(account.accountType)) {
             paymentAccountNames.push(option);

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

@@ -194,9 +194,13 @@ 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,
+            accountType: account.accountType,
         };
         if (isPaymentAccountType(account.accountType)) {
             paymentAccountNames.push(option);

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

@@ -332,33 +332,20 @@ 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;
+            // 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;
         }
         case 'category': {
             // Get from transactionLocalData (preferred) or from transaction lines

package/lib/index.d.ts

@@ -38,7 +38,7 @@ import { AgingDateSelectionType, AgingDetailReportInvoice, AgingDetailReportUISt
 import { isAgingReport, isCashFlowOrBalanceSheetReport, isDashboardClassesViewReport, isDashboardReport, isFluxAnalysisOpExReport, isOpExByVendorReport, isPAndLClassesViewReport, isPAndLProjectViewReport, isPAndLReport } from './commonStateTypes/viewAndReport/reportIDHelper';
 import { PageToken, Report, ReportFormat, ReportID, ReportIDPlusForecastID, SelectorReport, SelectorView, View, toReportFormatStrict, toReportID } from './commonStateTypes/viewAndReport/viewAndReport';
 import { PAYMENT_BUSINESS_DAYS, filterDays, getNextNthWorkingDay, getPreviousNthWorkingDay, getYearsList, holidaysFormatted, isHoliday, isHolidayToday } from './commonStateTypes/workingDayHelper';
-import { AccountReport, AccountWithBalanceReport, getAllAccounts, getTransactionFilterAccountOptions } from './entity/account/accountSelector';
+import { AccountFilterOption, AccountReport, AccountWithBalanceReport, getAllAccounts, getTransactionFilterAccountOptions } from './entity/account/accountSelector';
 import { ALL_ACCOUNT_TYPES, Account, AccountBase, AccountType, RecommendedAccountBase, ReconciliationAccountSourceType, StatementCloseDay, toAccountType, toReconciliationAccountSource } from './entity/account/accountState';
 import { NestedAccountReport } from './entity/account/subAccountSelector';
 import { AccountGroupReport } from './entity/accountGroup/accountGroupSelector';
@@ -647,7 +647,7 @@ export { VendorSpendTrendFilterTabType, toVendorSpendTrendFilterTabsTypeStrict,
 export { getNumberOfPeriods };
 export { SCHEDULE_DAYS_OF_MONTH, ScheduleDaysOfMonth, toScheduleDaysOfMonth, Day, Month, toMonth, toMonthStrict, Quarter, toQuarter, toQuarterStrict, AbsoluteDay, TimePeriod, };
 export { Tenant, TenantView, LoggedInUser, TenantBaseView, CurrentTenant, TenantProductSettings, getTenantBaseById, getCurrentTenant, getIsAccountingClassesEnabled, getIsAccountingProjectsEnabled, getTenantsByCheckInDateSelector, getTenantsBaseByCheckInDateSelector, getTenantsCoreDetailsByCheckInDateSelector, toTenantCoreDetailsView, getTenantBaseViewForTenantView, getTenantBaseViewForTenantId, isZeniDomainTenant, isTenantUsingZeniCOA, TenantsBaseOrdered, TenantsOrdered, TenantCoreDetailsView, fetchActiveTenant, fetchAllTenants, updateCurrentTenant, clearAll, doMagicLinkSignIn, verifyDeviceWithTwoFA, resendVerifyDeviceOTP, sendEmailMagicLinkToUser, doSignIn, updateSignInState, DoSignInPayload, doSignOut, sendSessionHeartbeat, resetSignInState, RoleResource, Connection, fetchExcludedResourcesForTenant, fetchExternalConnectionsForTenant, saveExternalConnectionForTenant, fetchSubscriptionSummaryForTenant, isTenantBankingOnly, isTenantCardsOnly, isTenantBookkeepingEnabled, isOtherProductsEnabledForTenant, };
-export { Account, ALL_ACCOUNT_TYPES, AccountType, AccountBase, StatementCloseDay, toAccountType, AccountReport, getAllAccounts, getTransactionFilterAccountOptions, NestedAccountReport, AccountWithBalanceReport, AccountGroup, AccountGroupReportV2, AccountGroupType, toAccountGroupType, AccountGroupReport, getAccountGroupKey, AccountGroupKey, RecommendedAccountBase, };
+export { Account, ALL_ACCOUNT_TYPES, AccountType, AccountBase, StatementCloseDay, toAccountType, AccountReport, AccountFilterOption, getAllAccounts, getTransactionFilterAccountOptions, NestedAccountReport, AccountWithBalanceReport, AccountGroup, AccountGroupReportV2, AccountGroupType, toAccountGroupType, AccountGroupReport, getAccountGroupKey, AccountGroupKey, RecommendedAccountBase, };
 export { Class, ClassBase, RecommendedClassBase, } from './entity/class/classState';
 export { getAllClasses, getClassById } from './entity/class/classSelector';
 export { ClassReport } from './entity/class/classSelectorTypes';