@zeniai/client-epic-state 5.2.94-betaNB1 → 5.2.95-beta0KB

package/lib/esm/view/accountList/accountListReducer.js

@@ -28,6 +28,8 @@ export const initialState = {
         reimbursementAccountList: initialAccountList,
         schedulesAccountList: initialAccountList,
         billPayAccountList: initialAccountList,
+        createTransactionLineAccountList: initialAccountList,
+        createTransactionPaymentAccountList: initialAccountList,
     },
 };
 const accountList = createSlice({

package/lib/esm/view/invoicing/invoicingQboView/invoicingQboViewSelector.js

@@ -116,15 +116,13 @@ export const getInvoicingQboAccountOptions = createSelector([
  * Normalises an account-type name for comparison. The config's mapping kinds
  * name QuickBooks types the way QuickBooks displays them ("Other Current
  * Asset", "Expense"), while the accounting service uses snake_case and
- * sometimes pluralises ("other_current_assets", "expenses"). Comparing the
- * normalised, de-pluralised forms keeps a picker from silently emptying because
- * of a trailing "s".
+ * sometimes pluralises ("other_current_assets", "expenses"), and QuickBooks
+ * itself sends PascalCase sub types ("SalesTaxPayable"). Comparing the
+ * separator-free, de-pluralised forms keeps a picker from silently emptying
+ * because of a trailing "s", and an exclusion from missing on casing.
  */
 const normalizeAccountTypeName = (value) => {
-    const normalized = value
-        .trim()
-        .toLowerCase()
-        .replace(/[^a-z0-9]+/g, '_');
+    const normalized = value.toLowerCase().replace(/[^a-z0-9]+/g, '');
     // Singularise so "Other Current Liability" meets `other_current_liabilities`
     // and "Expense" meets `expenses`. `-ies` needs its own case: stripping the
     // trailing "s" alone would leave "liabilitie", matching nothing.

package/lib/esm/view/transactionDetail/createTransaction/createTransactionSelector.js

@@ -1,5 +1,5 @@
 import { createSelector } from '@reduxjs/toolkit';
-import { getNestedAccountListHierarchy } from '../../accountList/accountListSelector';
+import { getAccountListFetchState, getNestedAccountListHierarchy, } from '../../accountList/accountListSelector';
 import { getNestedClassListHierarchy } from '../../classList/classListSelector';
 import { getResolvedTransferAccounts } from '../../createTransferEntry/createTransferEntrySelector';
 import { getRecommendationsForEntity } from '../../recommendation/recommendationSelector';
@@ -39,7 +39,11 @@ export const getCreateTransactionView = createSelector([
     createStatus: createTransactionsState.createStatus,
     createdTransactionId: createTransactionsState.createdTransactionId,
     vendorList: Object.values(vendorByID),
-    accountListNestedAccountHierarchy: getNestedAccountListHierarchy(accountListState, 'accountList'),
+    accountListFetchState: getAccountListFetchState(accountListState, 'accountList'),
+    lineAccountListFetchState: getAccountListFetchState(accountListState, 'createTransactionLineAccountList'),
+    paymentAccountListFetchState: getAccountListFetchState(accountListState, 'createTransactionPaymentAccountList'),
+    accountListNestedAccountHierarchy: getNestedAccountListHierarchy(accountListState, 'createTransactionLineAccountList'),
+    paymentAccountListNestedAccountHierarchy: getNestedAccountListHierarchy(accountListState, 'createTransactionPaymentAccountList'),
     classListNestedAccountHierarchy: getNestedClassListHierarchy(classListState),
     transferAccountsList: transactionType === 'transfer' ? transferAccountsList : [],
     fetchState: createTransactionsState.createStatus.fetchState,

package/lib/view/accountList/accountListReducer.js

@@ -35,6 +35,8 @@ exports.initialState = {
         reimbursementAccountList: exports.initialAccountList,
         schedulesAccountList: exports.initialAccountList,
         billPayAccountList: exports.initialAccountList,
+        createTransactionLineAccountList: exports.initialAccountList,
+        createTransactionPaymentAccountList: exports.initialAccountList,
     },
 };
 const accountList = (0, toolkit_1.createSlice)({

package/lib/view/accountList/accountListState.d.ts

@@ -1,7 +1,7 @@
 import { NestedAccountHierarchyForReport } from '../../commonStateTypes/accountView/nestedAccountID';
 import { FetchedState, ID } from '../../commonStateTypes/common';
 import { AccountLabel } from '../../entity/account/accountState';
-export type AccountListKeyType = 'accountList' | 'reimbursementAccountList' | 'schedulesAccountList' | 'billPayAccountList';
+export type AccountListKeyType = 'accountList' | 'reimbursementAccountList' | 'schedulesAccountList' | 'billPayAccountList' | 'createTransactionLineAccountList' | 'createTransactionPaymentAccountList';
 export interface AccountList extends FetchedState {
     accountIds: ID[];
     accountIdsByLabel: Record<AccountLabel, ID[]>;

package/lib/view/invoicing/invoicingQboView/invoicingQboViewSelector.js

@@ -125,15 +125,13 @@ exports.getInvoicingQboAccountOptions = (0, toolkit_1.createSelector)([
  * Normalises an account-type name for comparison. The config's mapping kinds
  * name QuickBooks types the way QuickBooks displays them ("Other Current
  * Asset", "Expense"), while the accounting service uses snake_case and
- * sometimes pluralises ("other_current_assets", "expenses"). Comparing the
- * normalised, de-pluralised forms keeps a picker from silently emptying because
- * of a trailing "s".
+ * sometimes pluralises ("other_current_assets", "expenses"), and QuickBooks
+ * itself sends PascalCase sub types ("SalesTaxPayable"). Comparing the
+ * separator-free, de-pluralised forms keeps a picker from silently emptying
+ * because of a trailing "s", and an exclusion from missing on casing.
  */
 const normalizeAccountTypeName = (value) => {
-    const normalized = value
-        .trim()
-        .toLowerCase()
-        .replace(/[^a-z0-9]+/g, '_');
+    const normalized = value.toLowerCase().replace(/[^a-z0-9]+/g, '');
     // Singularise so "Other Current Liability" meets `other_current_liabilities`
     // and "Expense" meets `expenses`. `-ies` needs its own case: stripping the
     // trailing "s" alone would leave "liabilitie", matching nothing.

package/lib/view/transactionDetail/createTransaction/createTransactionSelector.d.ts

@@ -9,15 +9,21 @@ import { Vendor } from '../../../entity/vendor/vendorState';
 import { RootState } from '../../../rootStateTypes';
 import { CreatableTransactionType, CreateTransactionLocalData } from './createTransactionState';
 export interface CreateTransactionView extends SelectorView {
+    /** The shared COA; on this page it only backs the transfer From/To fallback. */
+    accountListFetchState: FetchState;
     /**
-     * COA and class trees for the header account and the line dropdowns. The hierarchies rather
-     * than flat lists, because the create page builds its grouped "Recommended" / "All" options
-     * with the same helpers the detail page uses.
+     * COA and class trees for the line dropdowns. The hierarchies rather than flat lists, because
+     * the create page builds its grouped "Recommended" / "All" options with the same helpers the
+     * detail page uses.
      */
     accountListNestedAccountHierarchy: NestedAccountHierarchyForReport[];
     classListNestedAccountHierarchy: NestedClassHierarchyForReport[];
     createStatus: FetchStateAndError;
+    lineAccountListFetchState: FetchState;
     localData: CreateTransactionLocalData;
+    paymentAccountListFetchState: FetchState;
+    /** Bank, credit card and other current asset accounts for the header payment account. */
+    paymentAccountListNestedAccountHierarchy: NestedAccountHierarchyForReport[];
     transactionType: CreatableTransactionType;
     /** Populated for transfer only; the COA would offer ineligible accounts. */
     transferAccountsList: AccountBase[];

package/lib/view/transactionDetail/createTransaction/createTransactionSelector.js

@@ -45,7 +45,11 @@ exports.getCreateTransactionView = (0, toolkit_1.createSelector)([
     createStatus: createTransactionsState.createStatus,
     createdTransactionId: createTransactionsState.createdTransactionId,
     vendorList: Object.values(vendorByID),
-    accountListNestedAccountHierarchy: (0, accountListSelector_1.getNestedAccountListHierarchy)(accountListState, 'accountList'),
+    accountListFetchState: (0, accountListSelector_1.getAccountListFetchState)(accountListState, 'accountList'),
+    lineAccountListFetchState: (0, accountListSelector_1.getAccountListFetchState)(accountListState, 'createTransactionLineAccountList'),
+    paymentAccountListFetchState: (0, accountListSelector_1.getAccountListFetchState)(accountListState, 'createTransactionPaymentAccountList'),
+    accountListNestedAccountHierarchy: (0, accountListSelector_1.getNestedAccountListHierarchy)(accountListState, 'createTransactionLineAccountList'),
+    paymentAccountListNestedAccountHierarchy: (0, accountListSelector_1.getNestedAccountListHierarchy)(accountListState, 'createTransactionPaymentAccountList'),
     classListNestedAccountHierarchy: (0, classListSelector_1.getNestedClassListHierarchy)(classListState),
     transferAccountsList: transactionType === 'transfer' ? transferAccountsList : [],
     fetchState: createTransactionsState.createStatus.fetchState,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zeniai/client-epic-state",
-  "version": "5.2.94-betaNB1",
+  "version": "5.2.95-beta0KB",
   "description": "Shared module between Web & Mobile containing required abstractions for state management, async network communication. ",
   "main": "lib/index.js",
   "module": "lib/esm/index.js",