@zeniai/client-epic-state 5.2.94-beta0KB → 5.2.94-beta0MM

package/lib/entity/reconciliationReport/reconciliationReportPayload.d.ts

@@ -34,7 +34,6 @@ export interface ReconciliationReportTransactionRowPayload {
     date?: string | null;
     gl_account?: string | null;
     issue_date?: string | null;
-    qbo_id?: string | null;
     transaction_id?: ID | null;
 }
 export interface ReconciliationReportBucketPayload {

package/lib/entity/reconciliationReport/reconciliationReportReducer.js

@@ -54,7 +54,6 @@ function mapCountAmount(payload, currency) {
 function mapTransactionRow(payload, currency) {
     return {
         transactionId: payload.transaction_id ?? undefined,
-        qboId: payload.qbo_id ?? undefined,
         date: toOptionalDate(payload.date),
         type: payload.type,
         payee: payload.payee,

package/lib/entity/reconciliationReport/reconciliationReportState.d.ts

@@ -5,9 +5,8 @@ import { ReconciliationStatusCodeType } from '../accountRecon/accountReconState'
 declare const RECONCILIATION_REPORT_MATCH_TYPE: readonly ["automatic", "manual"];
 export type ReconciliationReportMatchType = (typeof RECONCILIATION_REPORT_MATCH_TYPE)[number];
 export declare const toReconciliationReportMatchType: (value: string) => ReconciliationReportMatchType;
-declare const RECONCILIATION_REPORT_DATA_SOURCE: readonly ["bank_statement", "plaid"];
-export type ReconciliationReportDataSource = (typeof RECONCILIATION_REPORT_DATA_SOURCE)[number];
-export declare const toReconciliationReportDataSource: (value: string) => ReconciliationReportDataSource;
+export declare const toReconciliationReportDataSource: (value: string) => "Statement" | "Plaid";
+export type ReconciliationReportDataSource = ReturnType<typeof toReconciliationReportDataSource>;
 export interface ReconciliationReportAccount {
     accountId: ID;
     accountName?: string;
@@ -45,7 +44,6 @@ export interface ReconciliationReportTransactionRow {
     date?: ZeniDate;
     glAccount?: string;
     issueDate?: ZeniDate;
-    qboId?: string;
     transactionId?: ID;
 }
 export interface ReconciliationReportBucket {

package/lib/entity/reconciliationReport/reconciliationReportState.js

@@ -10,9 +10,6 @@ const toReconciliationReportMatchType = (value) => {
     return (0, stringToUnion_1.stringToUnion)(value, RECONCILIATION_REPORT_MATCH_TYPE);
 };
 exports.toReconciliationReportMatchType = toReconciliationReportMatchType;
-const RECONCILIATION_REPORT_DATA_SOURCE = [
-    'bank_statement',
-    'plaid',
-];
+const RECONCILIATION_REPORT_DATA_SOURCE = ['Statement', 'Plaid'];
 const toReconciliationReportDataSource = (value) => (0, stringToUnion_1.stringToUnion)(value, RECONCILIATION_REPORT_DATA_SOURCE);
 exports.toReconciliationReportDataSource = toReconciliationReportDataSource;

package/lib/esm/entity/reconciliationReport/reconciliationReportReducer.js

@@ -49,7 +49,6 @@ function mapCountAmount(payload, currency) {
 function mapTransactionRow(payload, currency) {
     return {
         transactionId: payload.transaction_id ?? undefined,
-        qboId: payload.qbo_id ?? undefined,
         date: toOptionalDate(payload.date),
         type: payload.type,
         payee: payload.payee,

package/lib/esm/entity/reconciliationReport/reconciliationReportState.js

@@ -6,8 +6,5 @@ export const toReconciliationReportMatchType = (value) => {
     }
     return stringToUnion(value, RECONCILIATION_REPORT_MATCH_TYPE);
 };
-const RECONCILIATION_REPORT_DATA_SOURCE = [
-    'bank_statement',
-    'plaid',
-];
+const RECONCILIATION_REPORT_DATA_SOURCE = ['Statement', 'Plaid'];
 export const toReconciliationReportDataSource = (value) => stringToUnion(value, RECONCILIATION_REPORT_DATA_SOURCE);

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

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

package/lib/esm/view/expenseAutomationView/payload/actualMatchingPayload.js

@@ -44,9 +44,14 @@ export function toActualMatchingTransactionSearchResult(payload, fallbackCurrenc
         accountDescription: payload.account_description ?? undefined,
         accountingClassId: payload.accounting_class_id ?? undefined,
         accountingClassName: payload.accounting_class_name ?? undefined,
+        categorizationStatus: payload.categorization_status == null ||
+            payload.categorization_status === ''
+            ? undefined
+            : payload.categorization_status,
         currencyCode,
         currencySymbol: resolveMatchSearchCurrencySymbol(payload, currencyCode, fallbackCurrency),
         transactionMemo: payload.transaction_memo ?? undefined,
+        lineDescription: payload.line_description ?? undefined,
         transactionDescription: payload.transaction_description ?? undefined,
         transactionTypeName: payload.transaction_type_name ?? undefined,
         syncToken: payload.sync_token == null ? '' : String(payload.sync_token),

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

@@ -116,13 +116,15 @@ 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"), 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.
+ * sometimes pluralises ("other_current_assets", "expenses"). Comparing the
+ * normalised, de-pluralised forms keeps a picker from silently emptying because
+ * of a trailing "s".
  */
 const normalizeAccountTypeName = (value) => {
-    const normalized = value.toLowerCase().replace(/[^a-z0-9]+/g, '');
+    const normalized = value
+        .trim()
+        .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

@@ -39,8 +39,7 @@ export const getCreateTransactionView = createSelector([
     createStatus: createTransactionsState.createStatus,
     createdTransactionId: createTransactionsState.createdTransactionId,
     vendorList: Object.values(vendorByID),
-    accountListNestedAccountHierarchy: getNestedAccountListHierarchy(accountListState, 'createTransactionLineAccountList'),
-    paymentAccountListNestedAccountHierarchy: getNestedAccountListHierarchy(accountListState, 'createTransactionPaymentAccountList'),
+    accountListNestedAccountHierarchy: getNestedAccountListHierarchy(accountListState, 'accountList'),
     classListNestedAccountHierarchy: getNestedClassListHierarchy(classListState),
     transferAccountsList: transactionType === 'transfer' ? transferAccountsList : [],
     fetchState: createTransactionsState.createStatus.fetchState,

package/lib/view/accountList/accountListReducer.js

@@ -35,8 +35,6 @@ 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' | 'createTransactionLineAccountList' | 'createTransactionPaymentAccountList';
+export type AccountListKeyType = 'accountList' | 'reimbursementAccountList' | 'schedulesAccountList' | 'billPayAccountList';
 export interface AccountList extends FetchedState {
     accountIds: ID[];
     accountIdsByLabel: Record<AccountLabel, ID[]>;

package/lib/view/expenseAutomationView/payload/actualMatchingPayload.d.ts

@@ -32,8 +32,10 @@ export interface MatchTransactionSearchResultPayload {
     accounting_class_id?: ID | null;
     accounting_class_name?: string | null;
     amount?: number | null;
+    categorization_status?: string | null;
     currency_code?: string | null;
     currency_symbol?: string | null;
+    line_description?: string | null;
     sync_token?: string | null;
     total_amount?: number | null;
     transaction_description?: string | null;

package/lib/view/expenseAutomationView/payload/actualMatchingPayload.js

@@ -50,9 +50,14 @@ function toActualMatchingTransactionSearchResult(payload, fallbackCurrency) {
         accountDescription: payload.account_description ?? undefined,
         accountingClassId: payload.accounting_class_id ?? undefined,
         accountingClassName: payload.accounting_class_name ?? undefined,
+        categorizationStatus: payload.categorization_status == null ||
+            payload.categorization_status === ''
+            ? undefined
+            : payload.categorization_status,
         currencyCode,
         currencySymbol: resolveMatchSearchCurrencySymbol(payload, currencyCode, fallbackCurrency),
         transactionMemo: payload.transaction_memo ?? undefined,
+        lineDescription: payload.line_description ?? undefined,
         transactionDescription: payload.transaction_description ?? undefined,
         transactionTypeName: payload.transaction_type_name ?? undefined,
         syncToken: payload.sync_token == null ? '' : String(payload.sync_token),

package/lib/view/expenseAutomationView/types/actualMatchingViewState.d.ts

@@ -46,6 +46,9 @@ export interface ActualMatchingTransactionSearchResult {
     accountingClassId?: ID;
     accountingClassName?: string;
     accountName?: string;
+    categorizationStatus?: string;
+    /** QBO line description. Distinct from the header transaction description. */
+    lineDescription?: string;
     transactionDescription?: string;
     transactionMemo?: string;
     transactionTypeName?: string;

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

@@ -125,13 +125,15 @@ 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"), 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.
+ * sometimes pluralises ("other_current_assets", "expenses"). Comparing the
+ * normalised, de-pluralised forms keeps a picker from silently emptying because
+ * of a trailing "s".
  */
 const normalizeAccountTypeName = (value) => {
-    const normalized = value.toLowerCase().replace(/[^a-z0-9]+/g, '');
+    const normalized = value
+        .trim()
+        .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

@@ -10,16 +10,14 @@ import { RootState } from '../../../rootStateTypes';
 import { CreatableTransactionType, CreateTransactionLocalData } from './createTransactionState';
 export interface CreateTransactionView extends SelectorView {
     /**
-     * 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.
+     * 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.
      */
     accountListNestedAccountHierarchy: NestedAccountHierarchyForReport[];
     classListNestedAccountHierarchy: NestedClassHierarchyForReport[];
     createStatus: FetchStateAndError;
     localData: CreateTransactionLocalData;
-    /** 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,8 +45,7 @@ exports.getCreateTransactionView = (0, toolkit_1.createSelector)([
     createStatus: createTransactionsState.createStatus,
     createdTransactionId: createTransactionsState.createdTransactionId,
     vendorList: Object.values(vendorByID),
-    accountListNestedAccountHierarchy: (0, accountListSelector_1.getNestedAccountListHierarchy)(accountListState, 'createTransactionLineAccountList'),
-    paymentAccountListNestedAccountHierarchy: (0, accountListSelector_1.getNestedAccountListHierarchy)(accountListState, 'createTransactionPaymentAccountList'),
+    accountListNestedAccountHierarchy: (0, accountListSelector_1.getNestedAccountListHierarchy)(accountListState, 'accountList'),
     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-beta0KB",
+  "version": "5.2.94-beta0MM",
   "description": "Shared module between Web & Mobile containing required abstractions for state management, async network communication. ",
   "main": "lib/index.js",
   "module": "lib/esm/index.js",