@zeniai/client-epic-state 4.19.96-betaJK21 → 4.19.96-betaJK4

package/lib/view/expenseAutomationView/reducers/reconciliationViewReducer.d.ts

@@ -3,7 +3,7 @@ import { FetchState, ID } from '../../../commonStateTypes/common';
 import { SortOrder } from '../../../commonStateTypes/selectorTypes/sortOrderTypes';
 import { MonthYearPeriod } from '../../../commonStateTypes/timePeriod';
 import { ZeniAPIStatus } from '../../../responsePayload';
-import { ReconciliationPayload, UploadStatementDocumentAIPayload } from '../payload/reconciliationPayload';
+import { ExcludedAccountPayload, ReconciliationPayload, UploadStatementDocumentAIPayload } from '../payload/reconciliationPayload';
 import { AccountReconciliationLocalData, ActionFetchStates, ReconReconcileSortKey, ReconReviewSortKey, ReconciliationReviewTabLocalData, ReconciliationTabsState, ReconciliationViewState, ReconciliationViewTabType, SaveReconcileDetailActionPayload, SaveReconciliationDetailFailurePayload, TransactionSummary } from '../types/reconciliationViewState';
 export declare const initialReconciliationTabsState: ReconciliationTabsState;
 export declare const initialActionFetchState: ActionFetchStates;
@@ -99,6 +99,13 @@ export declare const fetchReconciliation: import("@reduxjs/toolkit").ActionCreat
     selectedPeriod: MonthYearPeriod;
 }, "expenseAutomationReconciliationView/uploadAccountStatementFailure">, updateStatementUploadChosen: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
     statementUploadChosen: boolean;
-}, "expenseAutomationReconciliationView/updateStatementUploadChosen">;
+}, "expenseAutomationReconciliationView/updateStatementUploadChosen">, fetchReconExcludedAccounts: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[accountId: string, exclusionReason: string], {
+    accountId: string;
+    exclusionReason: string;
+}, "expenseAutomationReconciliationView/fetchReconExcludedAccounts", never, never>, fetchReconExcludedAccountsSuccess: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
+    excludedAccounts: ExcludedAccountPayload[];
+}, "expenseAutomationReconciliationView/fetchReconExcludedAccountsSuccess">, fetchReconExcludedAccountsFailure: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
+    error: ZeniAPIStatus;
+}, "expenseAutomationReconciliationView/fetchReconExcludedAccountsFailure">;
 declare const _default: import("redux").Reducer<ReconciliationViewState>;
 export default _default;

package/lib/view/expenseAutomationView/reducers/reconciliationViewReducer.js

@@ -1,11 +1,12 @@
 "use strict";
 var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.updateStatementUploadChosen = exports.uploadAccountStatementFailure = exports.uploadAccountStatementSuccess = exports.uploadAccountStatement = exports.deleteAccountStatementFailure = exports.deleteAccountStatementSuccess = exports.deleteAccountStatement = exports.updateAccountReconciliationLocalData = exports.updateReconListScrollPosition = exports.updateSaveReconciliationReviewFetchStatus = exports.saveReconciliationReview = exports.updateReviewTabLocalData = exports.initializeReconciliationReviewTabLocalData = exports.updateReviewTabSortState = exports.updateSelectedDrawerAccountId = exports.clearExpenseAutomationReconciliationView = exports.initialiseLocalDataForSelectedAccountId = exports.updateBalancesLocalData = exports.updateSelectedTab = exports.saveReconciliationDetailSuccess = exports.updateReconcileTabListScrollState = exports.updateReconcileTabListSortState = exports.updateReconcileTabLocalData = exports.setStatementParseInProgress = exports.setConnectionInProgressForAccount = exports.updateSelectedAccountId = exports.saveReconciliationDetailFailure = exports.saveReconciliationDetail = exports.fetchReconciliationSuccess = exports.fetchReconciliationFailure = exports.fetchReconciliation = exports.initialState = exports.initialActionFetchState = exports.initialReconciliationTabsState = void 0;
+exports.fetchReconExcludedAccountsFailure = exports.fetchReconExcludedAccountsSuccess = exports.fetchReconExcludedAccounts = exports.updateStatementUploadChosen = exports.uploadAccountStatementFailure = exports.uploadAccountStatementSuccess = exports.uploadAccountStatement = exports.deleteAccountStatementFailure = exports.deleteAccountStatementSuccess = exports.deleteAccountStatement = exports.updateAccountReconciliationLocalData = exports.updateReconListScrollPosition = exports.updateSaveReconciliationReviewFetchStatus = exports.saveReconciliationReview = exports.updateReviewTabLocalData = exports.initializeReconciliationReviewTabLocalData = exports.updateReviewTabSortState = exports.updateSelectedDrawerAccountId = exports.clearExpenseAutomationReconciliationView = exports.initialiseLocalDataForSelectedAccountId = exports.updateBalancesLocalData = exports.updateSelectedTab = exports.saveReconciliationDetailSuccess = exports.updateReconcileTabListScrollState = exports.updateReconcileTabListSortState = exports.updateReconcileTabLocalData = exports.setStatementParseInProgress = exports.setConnectionInProgressForAccount = exports.updateSelectedAccountId = exports.saveReconciliationDetailFailure = exports.saveReconciliationDetail = exports.fetchReconciliationSuccess = exports.fetchReconciliationFailure = exports.fetchReconciliation = exports.initialState = exports.initialActionFetchState = exports.initialReconciliationTabsState = void 0;
 const toolkit_1 = require("@reduxjs/toolkit");
 const timePeriod_1 = require("../../../commonStateTypes/timePeriod");
 const accountState_1 = require("../../../entity/account/accountState");
 const accountReconState_1 = require("../../../entity/accountRecon/accountReconState");
+const reconciliationPayload_1 = require("../payload/reconciliationPayload");
 // Initial state
 exports.initialReconciliationTabsState = {
     balances: {
@@ -55,6 +56,8 @@ exports.initialActionFetchState = {
 exports.initialState = {
     accountReconciliationRecordsBySelectedPeriod: {},
     accountConnectionStatusByAccountID: {},
+    excludedAccounts: [],
+    excludedAccountsFetchState: { fetchState: 'Not-Started', error: undefined },
     fetchState: 'Not-Started',
     error: undefined,
     selectedTab: 'review',
@@ -428,13 +431,48 @@ const expenseAutomationReconciliationView = (0, toolkit_1.createSlice)({
         updateStatementUploadChosen: (draft, action) => {
             draft.statementUploadChosen = action.payload.statementUploadChosen;
         },
+        fetchReconExcludedAccounts: {
+            reducer(draft) {
+                draft.excludedAccountsFetchState = {
+                    fetchState: 'In-Progress',
+                    error: undefined,
+                };
+            },
+            prepare(accountId, exclusionReason) {
+                return {
+                    payload: { accountId, exclusionReason },
+                };
+            },
+        },
+        fetchReconExcludedAccountsSuccess: (draft, action) => {
+            draft.excludedAccountsFetchState = {
+                fetchState: 'Completed',
+                error: undefined,
+            };
+            action.payload.excludedAccounts.forEach((excludedAccount) => {
+                const existingIndex = draft.excludedAccounts.findIndex((account) => account.excludedAccountId === excludedAccount.excluded_account_id);
+                if (existingIndex >= 0) {
+                    draft.excludedAccounts[existingIndex] =
+                        (0, reconciliationPayload_1.toExcludedAccount)(excludedAccount);
+                }
+                else {
+                    draft.excludedAccounts.push((0, reconciliationPayload_1.toExcludedAccount)(excludedAccount));
+                }
+            });
+        },
+        fetchReconExcludedAccountsFailure: (draft, action) => {
+            draft.excludedAccountsFetchState = {
+                fetchState: 'Error',
+                error: action.payload.error,
+            };
+        },
         clearExpenseAutomationReconciliationView: (draft) => {
             Object.assign(draft, exports.initialState);
         },
     },
 });
 // Export actions
-_a = expenseAutomationReconciliationView.actions, exports.fetchReconciliation = _a.fetchReconciliation, exports.fetchReconciliationFailure = _a.fetchReconciliationFailure, exports.fetchReconciliationSuccess = _a.fetchReconciliationSuccess, exports.saveReconciliationDetail = _a.saveReconciliationDetail, exports.saveReconciliationDetailFailure = _a.saveReconciliationDetailFailure, exports.updateSelectedAccountId = _a.updateSelectedAccountId, exports.setConnectionInProgressForAccount = _a.setConnectionInProgressForAccount, exports.setStatementParseInProgress = _a.setStatementParseInProgress, exports.updateReconcileTabLocalData = _a.updateReconcileTabLocalData, exports.updateReconcileTabListSortState = _a.updateReconcileTabListSortState, exports.updateReconcileTabListScrollState = _a.updateReconcileTabListScrollState, exports.saveReconciliationDetailSuccess = _a.saveReconciliationDetailSuccess, exports.updateSelectedTab = _a.updateSelectedTab, exports.updateBalancesLocalData = _a.updateBalancesLocalData, exports.initialiseLocalDataForSelectedAccountId = _a.initialiseLocalDataForSelectedAccountId, exports.clearExpenseAutomationReconciliationView = _a.clearExpenseAutomationReconciliationView, exports.updateSelectedDrawerAccountId = _a.updateSelectedDrawerAccountId, exports.updateReviewTabSortState = _a.updateReviewTabSortState, exports.initializeReconciliationReviewTabLocalData = _a.initializeReconciliationReviewTabLocalData, exports.updateReviewTabLocalData = _a.updateReviewTabLocalData, exports.saveReconciliationReview = _a.saveReconciliationReview, exports.updateSaveReconciliationReviewFetchStatus = _a.updateSaveReconciliationReviewFetchStatus, exports.updateReconListScrollPosition = _a.updateReconListScrollPosition, exports.updateAccountReconciliationLocalData = _a.updateAccountReconciliationLocalData, exports.deleteAccountStatement = _a.deleteAccountStatement, exports.deleteAccountStatementSuccess = _a.deleteAccountStatementSuccess, exports.deleteAccountStatementFailure = _a.deleteAccountStatementFailure, exports.uploadAccountStatement = _a.uploadAccountStatement, exports.uploadAccountStatementSuccess = _a.uploadAccountStatementSuccess, exports.uploadAccountStatementFailure = _a.uploadAccountStatementFailure, exports.updateStatementUploadChosen = _a.updateStatementUploadChosen;
+_a = expenseAutomationReconciliationView.actions, exports.fetchReconciliation = _a.fetchReconciliation, exports.fetchReconciliationFailure = _a.fetchReconciliationFailure, exports.fetchReconciliationSuccess = _a.fetchReconciliationSuccess, exports.saveReconciliationDetail = _a.saveReconciliationDetail, exports.saveReconciliationDetailFailure = _a.saveReconciliationDetailFailure, exports.updateSelectedAccountId = _a.updateSelectedAccountId, exports.setConnectionInProgressForAccount = _a.setConnectionInProgressForAccount, exports.setStatementParseInProgress = _a.setStatementParseInProgress, exports.updateReconcileTabLocalData = _a.updateReconcileTabLocalData, exports.updateReconcileTabListSortState = _a.updateReconcileTabListSortState, exports.updateReconcileTabListScrollState = _a.updateReconcileTabListScrollState, exports.saveReconciliationDetailSuccess = _a.saveReconciliationDetailSuccess, exports.updateSelectedTab = _a.updateSelectedTab, exports.updateBalancesLocalData = _a.updateBalancesLocalData, exports.initialiseLocalDataForSelectedAccountId = _a.initialiseLocalDataForSelectedAccountId, exports.clearExpenseAutomationReconciliationView = _a.clearExpenseAutomationReconciliationView, exports.updateSelectedDrawerAccountId = _a.updateSelectedDrawerAccountId, exports.updateReviewTabSortState = _a.updateReviewTabSortState, exports.initializeReconciliationReviewTabLocalData = _a.initializeReconciliationReviewTabLocalData, exports.updateReviewTabLocalData = _a.updateReviewTabLocalData, exports.saveReconciliationReview = _a.saveReconciliationReview, exports.updateSaveReconciliationReviewFetchStatus = _a.updateSaveReconciliationReviewFetchStatus, exports.updateReconListScrollPosition = _a.updateReconListScrollPosition, exports.updateAccountReconciliationLocalData = _a.updateAccountReconciliationLocalData, exports.deleteAccountStatement = _a.deleteAccountStatement, exports.deleteAccountStatementSuccess = _a.deleteAccountStatementSuccess, exports.deleteAccountStatementFailure = _a.deleteAccountStatementFailure, exports.uploadAccountStatement = _a.uploadAccountStatement, exports.uploadAccountStatementSuccess = _a.uploadAccountStatementSuccess, exports.uploadAccountStatementFailure = _a.uploadAccountStatementFailure, exports.updateStatementUploadChosen = _a.updateStatementUploadChosen, exports.fetchReconExcludedAccounts = _a.fetchReconExcludedAccounts, exports.fetchReconExcludedAccountsSuccess = _a.fetchReconExcludedAccountsSuccess, exports.fetchReconExcludedAccountsFailure = _a.fetchReconExcludedAccountsFailure;
 // Export reducer
 exports.default = expenseAutomationReconciliationView.reducer;
 function updateAllReconciliation(draft, accounts, selectedPeriod, reconciliationData, refreshViewInBackground) {

package/lib/view/expenseAutomationView/selectorTypes/jeSchedulesSelectorTypes.d.ts

@@ -18,10 +18,12 @@ export interface ExpenseAutomationJESchedulesViewSelector extends SelectorView {
     allDepreciationAccountList: AccountBase[];
     allDepreciationAccountListNestedAccountHierarchy: NestedAccountHierarchyForReport[];
     classListNestedAccountHierarchy: NestedClassHierarchyForReport[];
+    completedSchedules: JEScheduledTransaction[];
     completionStatus: CompletionStatusType;
     draftSchedules: JEScheduledTransaction[];
     ignoreStatusById: Record<JEScheduleTransactionKey, FetchStateAndError>;
     jeScheduleLocalDataById: Record<ID, JEScheduleLocalData>;
+    ongoingSchedules: JEScheduledTransaction[];
     postStatusById: Record<ID, FetchStateAndError>;
     refreshStatus: FetchStateAndError;
     resolveSchedules: JEScheduledTransactionWithFailedEntries[];

package/lib/view/expenseAutomationView/selectorTypes/reconciliationViewSelectorTypes.d.ts

@@ -24,6 +24,7 @@ export interface ExpenseAutomationReconciliationViewSelector {
     classListNestedAccountHierarchy: NestedClassHierarchyForReport[];
     completionStatus: CompletionStatusType;
     creditCards: AccountBase[];
+    excludedAccountReconciliationBySectionID: Record<AccountReconSectionID, AccountReconciliationBySection>;
     fetchStatus: FetchStateAndError;
     monthYearPeriod: MonthYearPeriod;
     plaidConnectionDetails: PlaidConnectionDetails;

package/lib/view/expenseAutomationView/selectors/jeSchedulesViewSelector.js

@@ -5,6 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getExpenseAutomationJESchedulesView = getExpenseAutomationJESchedulesView;
 const omit_1 = __importDefault(require("lodash/omit"));
+const orderBy_1 = __importDefault(require("lodash/orderBy"));
 const timePeriod_1 = require("../../../commonStateTypes/timePeriod");
 const accountSelector_1 = require("../../../entity/account/accountSelector");
 const jeSchedulesSelector_1 = require("../../../entity/jeSchedules/jeSchedulesSelector");
@@ -16,6 +17,42 @@ const scheduleDetailSelector_1 = require("../../scheduleView/scheduleDetailView/
 const scheduleListHelper_1 = require("../../scheduleView/scheduleListView/scheduleListHelper");
 const expenseAutomationViewSelectorTypes_1 = require("../selectorTypes/expenseAutomationViewSelectorTypes");
 const jeAccountSettingsViewSelector_1 = require("./jeAccountSettingsViewSelector");
+function getJEScheduleSortAccessor(sortKey) {
+    switch (sortKey) {
+        case 'vendor':
+            return (s) => s.vendor.name?.toLowerCase();
+        case 'category':
+            return (s) => s.jeDebit.account?.accountName?.toLowerCase();
+        case 'class':
+            return (s) => s.jeDebit.accountingClass?.className?.toLowerCase();
+        case 'scheduleCategory':
+            return (s) => s.jeScheduleType;
+        case 'startMonth':
+            return (s) => s.startDate?.valueOf();
+        case 'type':
+            return (s) => s.baseTransaction.typeOfTransaction;
+        case 'amortizationPeriod':
+            return (s) => s.period;
+        case 'jePostingDate':
+            return (s) => s.dayOfPostingDate;
+        case 'remainingMonths':
+            return (s) => s.period;
+        case 'runningBalance':
+            return (s) => s.balanceAsOfToday?.amount;
+        case 'totalAmount':
+            return (s) => s.baseTransaction.amount.amount;
+        case 'transactionDate':
+            return (s) => s.baseTransaction.date.valueOf();
+        case 'memo':
+            return (s) => s.baseTransaction.memo?.toLowerCase();
+        default:
+            return (s) => s.startDate?.valueOf();
+    }
+}
+function sortJEScheduledTransactions(transactions, sortKey, sortOrder) {
+    const accessor = getJEScheduleSortAccessor(sortKey);
+    return (0, orderBy_1.default)(transactions, [accessor], [sortOrder === 'ascending' ? 'asc' : 'desc']);
+}
 function getExpenseAutomationJESchedulesView(state) {
     const jeScheduledTransaction = [];
     const failedJeScheduledTransaction = [];
@@ -65,13 +102,21 @@ function getExpenseAutomationJESchedulesView(state) {
         const jeScheduleDetails = (0, jeSchedulesSelector_1.getJEScheduledTransactionByJEScheduleTransactionKey)(jeScheduleKey, state);
         failedJeScheduledTransaction.push(jeScheduleDetails);
     });
-    const draftSchedules = jeScheduledTransaction.filter((schedule) => schedule.status.code === 'draft');
-    const resolveSchedules = [];
+    const { sortKey, sortOrder } = uiState;
+    const draftSchedules = sortJEScheduledTransactions(jeScheduledTransaction.filter((schedule) => schedule.status.code === 'draft'), sortKey, sortOrder);
+    const ongoingSchedules = sortJEScheduledTransactions(jeScheduledTransaction.filter((schedule) => schedule.status.code === 'ongoing'), sortKey, sortOrder);
+    const completedSchedules = sortJEScheduledTransactions(jeScheduledTransaction.filter((schedule) => schedule.status.code === 'completed' ||
+        schedule.status.code === 'marked_as_completed'), sortKey, sortOrder);
+    const unsortedResolveSchedules = [];
     failedJeScheduledTransaction.forEach((schedule) => {
         schedule.scheduledJournalEntry.forEach((journalEntry) => {
-            resolveSchedules.push({ ...schedule, scheduledJournalEntry: journalEntry });
+            unsortedResolveSchedules.push({
+                ...schedule,
+                scheduledJournalEntry: journalEntry,
+            });
         });
     });
+    const resolveSchedules = sortJEScheduledTransactions(unsortedResolveSchedules, sortKey, sortOrder);
     const allSteps = monthYearPeriodId != null
         ? (0, expenseAutomationViewSelectorTypes_1.getAllSteps)(monthEndCloseChecksState, monthYearPeriodId, currentTenant.tenantId)
         : [];
@@ -85,7 +130,9 @@ function getExpenseAutomationJESchedulesView(state) {
         allAccountList: filteredAccounts,
         accountListNestedAccountHierarchy,
         allClassList: allClasses,
+        completedSchedules,
         draftSchedules,
+        ongoingSchedules,
         resolveSchedules: resolveSchedules,
         accountSettingsView,
         postStatusById: postStatusById,

package/lib/view/expenseAutomationView/selectors/missingReceiptsSelector.js

@@ -42,7 +42,7 @@ function getExpenseAutomationMissingReceiptsView(state) {
                     transaction.lines.length > 0 &&
                     transaction.lines[0]
                         ?.class != null
-                    ? transaction.lines[0].class.className.toLowerCase()
+                    ? transaction.lines[0].class?.className.toLowerCase()
                     : null;
             case 'vendor':
             default:

package/lib/view/expenseAutomationView/selectors/reconciliationViewSelector.js

@@ -86,6 +86,26 @@ exports.getExpenseAutomationReconciliationView = (0, toolkit_1.createSelector)((
                     totalVariancePercentage: undefined,
                 },
             },
+            excludedAccountReconciliationBySectionID: {
+                assets: {
+                    sectionId: 'assets',
+                    accountIDs: [],
+                    totalBankBalance: undefined,
+                    totalClearedBalance: undefined,
+                    totalReconciledBalance: undefined,
+                    totalVariance: undefined,
+                    totalVariancePercentage: undefined,
+                },
+                liabilities: {
+                    sectionId: 'liabilities',
+                    accountIDs: [],
+                    totalBankBalance: undefined,
+                    totalClearedBalance: undefined,
+                    totalReconciledBalance: undefined,
+                    totalVariance: undefined,
+                    totalVariancePercentage: undefined,
+                },
+            },
         };
     }
     const allAccountIDs = accountReconForMonthYearPeriod.accountIDs;
@@ -245,6 +265,137 @@ exports.getExpenseAutomationReconciliationView = (0, toolkit_1.createSelector)((
             totalVariancePercentage: liabilityTotals.variancePercentage,
         },
     };
+    const bankAccountIdSet = new Set(uniqueBankAccounts.map((a) => a.accountId));
+    const creditCardIdSet = new Set(uniqueCreditCards.map((a) => a.accountId));
+    const excludedAssetAccountIDs = [];
+    const excludedLiabilityAccountIDs = [];
+    const excludedAssetTotals = {};
+    const excludedLiabilityTotals = {};
+    reconciliationViewState.excludedAccounts
+        .filter((ea) => !ea.isDeleted)
+        .forEach((excludedAccount) => {
+        const accountID = excludedAccount.accountId;
+        const accountRecon = (0, accountReconSelector_1.getAccountReconByAccountIdAndSelectedPeriod)(state, accountID, selectedPeriod);
+        const isAsset = bankAccountIdSet.has(accountID);
+        const isLiability = creditCardIdSet.has(accountID);
+        if (!isAsset && !isLiability) {
+            return;
+        }
+        let balanceTotal = undefined;
+        let clearedTotal = undefined;
+        let varianceTotal = undefined;
+        const total = {};
+        if (isAsset) {
+            balanceTotal =
+                excludedAssetTotals.balanceTotal != null
+                    ? (0, big_js_1.default)(excludedAssetTotals.balanceTotal.amount)
+                    : undefined;
+            clearedTotal =
+                excludedAssetTotals.clearedTotal != null
+                    ? (0, big_js_1.default)(excludedAssetTotals.clearedTotal.amount)
+                    : undefined;
+            varianceTotal =
+                excludedAssetTotals.varianceTotal != null
+                    ? (0, big_js_1.default)(excludedAssetTotals.varianceTotal.amount)
+                    : undefined;
+        }
+        else {
+            balanceTotal =
+                excludedLiabilityTotals.balanceTotal != null
+                    ? (0, big_js_1.default)(excludedLiabilityTotals.balanceTotal.amount)
+                    : undefined;
+            clearedTotal =
+                excludedLiabilityTotals.clearedTotal != null
+                    ? (0, big_js_1.default)(excludedLiabilityTotals.clearedTotal.amount)
+                    : undefined;
+            varianceTotal =
+                excludedLiabilityTotals.varianceTotal != null
+                    ? (0, big_js_1.default)(excludedLiabilityTotals.varianceTotal.amount)
+                    : undefined;
+        }
+        if (accountRecon?.balance != null && balanceTotal != null) {
+            balanceTotal = balanceTotal.plus(accountRecon.balance.amount);
+        }
+        else if (accountRecon?.balance != null && balanceTotal == null) {
+            balanceTotal = (0, big_js_1.default)(accountRecon.balance.amount);
+        }
+        if (accountRecon?.clearedBalance != null && clearedTotal != null) {
+            clearedTotal = clearedTotal.plus(accountRecon.clearedBalance.amount);
+        }
+        else if (accountRecon?.clearedBalance != null &&
+            clearedTotal == null) {
+            clearedTotal = (0, big_js_1.default)(accountRecon.clearedBalance.amount);
+        }
+        const currency = accountRecon?.currency;
+        if (balanceTotal != null && currency != null) {
+            total.balanceTotal = {
+                ...currency,
+                amount: parseFloat(balanceTotal.toFixed(2)),
+            };
+        }
+        if (clearedTotal != null && currency != null) {
+            total.clearedTotal = {
+                ...currency,
+                amount: parseFloat(clearedTotal.toFixed(2)),
+            };
+        }
+        if (clearedTotal != null && balanceTotal != null) {
+            varianceTotal = clearedTotal.minus(balanceTotal).abs();
+        }
+        else if (clearedTotal != null) {
+            varianceTotal = clearedTotal.abs();
+        }
+        else if (balanceTotal != null) {
+            varianceTotal = (0, big_js_1.default)(0).minus(balanceTotal).abs();
+        }
+        if (varianceTotal != null && currency != null) {
+            total.varianceTotal = {
+                ...currency,
+                amount: parseFloat(varianceTotal.toFixed(2)),
+            };
+        }
+        total.variancePercentage =
+            total.varianceTotal != null &&
+                total.balanceTotal != null &&
+                total.balanceTotal.amount !== 0
+                ? Math.abs((total.varianceTotal.amount / total.balanceTotal.amount) * 100)
+                : undefined;
+        if (isAsset) {
+            excludedAssetAccountIDs.push(accountID);
+            excludedAssetTotals.balanceTotal = total.balanceTotal;
+            excludedAssetTotals.clearedTotal = total.clearedTotal;
+            excludedAssetTotals.varianceTotal = total.varianceTotal;
+            excludedAssetTotals.variancePercentage = total.variancePercentage;
+        }
+        else {
+            excludedLiabilityAccountIDs.push(accountID);
+            excludedLiabilityTotals.balanceTotal = total.balanceTotal;
+            excludedLiabilityTotals.clearedTotal = total.clearedTotal;
+            excludedLiabilityTotals.varianceTotal = total.varianceTotal;
+            excludedLiabilityTotals.variancePercentage =
+                total.variancePercentage;
+        }
+    });
+    const excludedAccountReconciliationBySectionID = {
+        assets: {
+            sectionId: 'assets',
+            accountIDs: excludedAssetAccountIDs,
+            totalBankBalance: excludedAssetTotals.balanceTotal,
+            totalClearedBalance: excludedAssetTotals.clearedTotal,
+            totalReconciledBalance: excludedAssetTotals.varianceTotal,
+            totalVariance: excludedAssetTotals.varianceTotal,
+            totalVariancePercentage: excludedAssetTotals.variancePercentage,
+        },
+        liabilities: {
+            sectionId: 'liabilities',
+            accountIDs: excludedLiabilityAccountIDs,
+            totalBankBalance: excludedLiabilityTotals.balanceTotal,
+            totalClearedBalance: excludedLiabilityTotals.clearedTotal,
+            totalReconciledBalance: excludedLiabilityTotals.varianceTotal,
+            totalVariance: excludedLiabilityTotals.varianceTotal,
+            totalVariancePercentage: excludedLiabilityTotals.variancePercentage,
+        },
+    };
     const accountListNestedAccountHierarchy = (0, accountListSelector_1.getNestedAccountListHierarchy)(accountListState, 'accountList');
     const classListNestedAccountHierarchy = (0, classListSelector_1.getNestedClassListHierarchy)(classListState);
     const accountsList = (0, accountListSelector_1.getAccountList)(accountState, accountListState, 'accountList');
@@ -290,6 +441,7 @@ exports.getExpenseAutomationReconciliationView = (0, toolkit_1.createSelector)((
         statementUploadChosen: reconciliationViewState.statementUploadChosen,
         monthYearPeriod: selectedPeriod,
         accountReconciliationBySectionID,
+        excludedAccountReconciliationBySectionID,
         selectedAccountId: reconciliationViewState.selectedAccountId,
         selectedReconAccount: reconciliationViewState.selectedAccountId != null &&
             reconList[reconciliationViewState.selectedAccountId] != null

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

@@ -1,16 +1,21 @@
 import { NestedAccountHierarchyForReport } from '../../../commonStateTypes/accountView/nestedAccountID';
 import { FetchStateAndError, FetchedState, ID } from '../../../commonStateTypes/common';
 import { Recommendation } from '../../../commonStateTypes/recommendationBase';
+import { SortOrder } from '../../../commonStateTypes/selectorTypes/sortOrderTypes';
 import { MonthYearPeriodId } from '../../../commonStateTypes/timePeriod';
 import { AccountBase } from '../../../entity/account/accountState';
 import { JEScheduleTransactionKey, ScheduleTypes } from '../../../entity/jeSchedules/jeSchedulesTypes';
 import { VendorBase } from '../../../entity/vendor/vendorState';
+export declare const toJEScheduleSortKey: (v: string) => "vendor" | "type" | "category" | "class" | "memo" | "transactionDate" | "totalAmount" | "runningBalance" | "scheduleCategory" | "startMonth" | "amortizationPeriod" | "jePostingDate" | "remainingMonths";
+export type JEScheduleSortKey = ReturnType<typeof toJEScheduleSortKey>;
 export interface JESchedulesViewUIState {
     scrollPosition: {
         scrollTop: number;
         scrollLeft?: number;
     } | undefined;
     searchString: string;
+    sortKey: JEScheduleSortKey;
+    sortOrder: SortOrder;
     totalCount: number;
     limit?: number;
 }

package/lib/view/expenseAutomationView/types/jeSchedulesViewState.js

@@ -1,2 +1,21 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.toJEScheduleSortKey = void 0;
+const stringToUnion_1 = require("../../../commonStateTypes/stringToUnion");
+const JE_SCHEDULE_SORT_KEYS = [
+    'vendor',
+    'category',
+    'class',
+    'scheduleCategory',
+    'startMonth',
+    'type',
+    'amortizationPeriod',
+    'jePostingDate',
+    'remainingMonths',
+    'runningBalance',
+    'totalAmount',
+    'transactionDate',
+    'memo',
+];
+const toJEScheduleSortKey = (v) => (0, stringToUnion_1.stringToUnion)(v, JE_SCHEDULE_SORT_KEYS);
+exports.toJEScheduleSortKey = toJEScheduleSortKey;

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

@@ -3,10 +3,11 @@ import { FetchStateAndError, ID } from '../../../commonStateTypes/common';
 import { SortOrder } from '../../../commonStateTypes/selectorTypes/sortOrderTypes';
 import { MonthYearPeriodId } from '../../../commonStateTypes/timePeriod';
 import { ReconciliationAccountSourceType } from '../../../entity/account/accountState';
-import { BankStatusCodeType, RecommendedActionCodeType } from '../../../entity/accountRecon/accountReconState';
+import { BankStatusCodeType } from '../../../entity/accountRecon/accountReconState';
 import { CustomerBase } from '../../../entity/customer/customerState';
 import { VendorBase } from '../../../entity/vendor/vendorState';
 import { ZeniAPIStatus } from '../../../responsePayload';
+import { ZeniDate } from '../../../zeniDayJS';
 export declare const RECONCILE_ACTIONS: readonly ["reconcile", "save_reconcile_for_later", "exclude"];
 export declare const toReconcileActions: (v: string) => "reconcile" | "save_reconcile_for_later" | "exclude";
 export type ReconcileActionType = ReturnType<typeof toReconcileActions>;
@@ -71,10 +72,7 @@ export interface ReconciliationReviewTabLocalData {
     classId?: ID;
     creditCardId?: ID;
     customer?: CustomerBase;
-    jeCreditClassId?: ID;
-    jeDebitClassId?: ID;
     matchedTransactionId?: ID;
-    recommendedActionType?: RecommendedActionCodeType;
     vendor?: VendorBase;
 }
 export interface ActionFetchStates {
@@ -83,6 +81,22 @@ export interface ActionFetchStates {
     saveForLaterFetch: FetchStateAndError;
     saveReconciliationReviewFetch: Record<ID, FetchStateAndError>;
 }
+export interface ExclusionHistory {
+    action: string;
+    at: string;
+    by: string;
+    reason: string;
+}
+export interface ExcludedAccount {
+    accountId: ID;
+    createTime: ZeniDate;
+    detectionSignals: string[];
+    excludedAccountId: ID;
+    excludedByUserId: ID;
+    exclusionHistory: ExclusionHistory[];
+    isDeleted: boolean;
+    updateTime: ZeniDate;
+}
 export interface ReconListUIState {
     scrollPosition: {
         scrollTop: number;
@@ -93,6 +107,8 @@ export interface ReconciliationViewState extends FetchStateAndError {
     accountConnectionStatusByAccountID: Record<ID, BankConnectionStatus>;
     accountReconciliationRecordsBySelectedPeriod: Record<MonthYearPeriodId, AccountReconciliationRecords>;
     actionFetchState: ActionFetchStates;
+    excludedAccounts: ExcludedAccount[];
+    excludedAccountsFetchState: FetchStateAndError;
     reconListUIState: ReconListUIState;
     reconTabsState: ReconciliationTabsState;
     refreshStatus: FetchStateAndError;

package/lib/view/scheduleView/scheduleListView/scheduleListTypes.d.ts

@@ -7,7 +7,7 @@ export declare const getScheduleListKey: (selectedCategory: ID, selectedTimefram
 export type ScheduleListKey = ReturnType<typeof getScheduleListKey>;
 export declare const toScheduleSubTabType: (v: string) => "completed" | "new" | "ongoing" | "all";
 export type ScheduleSubTabType = ReturnType<typeof toScheduleSubTabType>;
-declare const toScheduleSortKeyType: (v: string) => "months" | "amount" | "vendor" | "status" | "user" | "createTime" | "class" | "memo" | "balanceAsOfToday" | "transactionDate" | "transactionType" | "assetId" | "accruedExpenseCategory" | "scheduleCategory" | "expenseCategory" | "accumulatedDepreciationCategory" | "startMonth" | "endMonth";
+declare const toScheduleSortKeyType: (v: string) => "months" | "amount" | "vendor" | "status" | "user" | "createTime" | "class" | "memo" | "balanceAsOfToday" | "transactionDate" | "transactionType" | "assetId" | "scheduleCategory" | "startMonth" | "accruedExpenseCategory" | "expenseCategory" | "accumulatedDepreciationCategory" | "endMonth";
 export declare type ScheduleListSortKey = ReturnType<typeof toScheduleSortKeyType>;
 export interface DownloadJEScheduleTabOptions {
     categoryId: ID;

package/lib/view/spendManagement/billPay/billList/billListSelector.js

@@ -424,6 +424,14 @@ const getBillListOnSort = (sortKey, sortOrder, currentTab, transactions) => {
                     transactionsWithNoSortKeyValue.push(transaction);
                 }
                 break;
+            case 'invoiceNumber':
+                if (transaction.documentId != null) {
+                    transactionsWithSortKeyValue.push(transaction);
+                }
+                else {
+                    transactionsWithNoSortKeyValue.push(transaction);
+                }
+                break;
             case 'dueDate':
                 if (currentTab === 'draft') {
                     if (Boolean(transaction.dueDate) === true) {
@@ -526,6 +534,8 @@ const getBillListOnSort = (sortKey, sortOrder, currentTab, transactions) => {
                 return transaction.totalAmountInUSD?.amount ?? 0;
             case 'paymentMethod':
                 return transaction.billPayInfo.billPaymentMethodType.name;
+            case 'invoiceNumber':
+                return transaction.documentId;
         }
     }, getColumnWiseSortOrder(sortOrder));
     return [

package/lib/view/spendManagement/billPay/billList/billListState.d.ts

@@ -37,7 +37,7 @@ declare const toBillTabType: (v: string) => "paid" | "pending_approval" | "sched
 export type BillTab = ReturnType<typeof toBillTabType>;
 declare const toBillsSubTabType: (v: string) => "rejected" | "failed" | "ach" | "wire" | "cancelled" | "deleted" | "overdue" | "all" | "awaiting_approval" | "awaiting_my_approval" | "offline";
 export type BillsSubTabType = ReturnType<typeof toBillsSubTabType>;
-declare const toBillPaySortKeyType: (v: string) => "amount" | "status" | "name" | "dueDate" | "paymentMethod" | "invoiceDate";
+declare const toBillPaySortKeyType: (v: string) => "amount" | "status" | "name" | "dueDate" | "paymentMethod" | "invoiceNumber" | "invoiceDate";
 export declare type BillPayViewSortKey = ReturnType<typeof toBillPaySortKeyType>;
 export interface BillPayFilters {
     categories: BillPayFilterCategory[];

package/lib/view/spendManagement/billPay/billList/billListState.js

@@ -47,6 +47,7 @@ const ALL_BILL_PAY_SORT_KEYS = [
     'invoiceDate',
     'name',
     'paymentMethod',
+    'invoiceNumber',
 ];
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
 const toBillPaySortKeyType = (v) => (0, stringToUnion_1.stringToUnion)(v, ALL_BILL_PAY_SORT_KEYS);

package/lib/view/spendManagement/billPay/billPayReview/billPayReviewSelector.js

@@ -9,6 +9,7 @@ const reduceFetchState_1 = require("../../../../commonStateTypes/reduceFetchStat
 const contactSelector_1 = require("../../../../entity/billPay/contact/contactSelector");
 const paymentAccountSelector_1 = require("../../../../entity/paymentAccount/paymentAccountSelector");
 const vendorSelector_1 = require("../../../../entity/vendor/vendorSelector");
+const tenantSelector_1 = require("../../../../entity/tenant/tenantSelector");
 const accountListSelector_1 = require("../../../accountList/accountListSelector");
 const setupViewSelector_1 = require("../../commonSetup/setupViewSelector");
 const depositAccountListSelector_1 = require("../../zeniAccounts/depositAccountList/depositAccountListSelector");
@@ -80,11 +81,14 @@ const getReviewPageBillDetail = (state, billId) => {
             }
         }
         if (sourceBillDetail != null) {
-            sourceBillDetailFetchState = (0, reduceFetchState_1.reduceFetchState)([
+            const fetchStateList = [
                 sourceBillDetail.fetchStatus,
                 accountListState.byReportId['billPayAccountList'],
-                classListState,
-            ]).fetchState;
+            ];
+            if ((0, tenantSelector_1.getIsAccountingClassesEnabled)(state)) {
+                fetchStateList.push(classListState);
+            }
+            sourceBillDetailFetchState = (0, reduceFetchState_1.reduceFetchState)(fetchStateList).fetchState;
         }
     }
     else {

package/lib/view/spendManagement/billPay/billPaySetupApproverView/billPaySetupApproverViewSelector.js

@@ -9,6 +9,7 @@ const cloneDeep_1 = __importDefault(require("lodash/cloneDeep"));
 const reduceFetchState_1 = require("../../../../commonStateTypes/reduceFetchState");
 const approvalRuleSelector_1 = require("../../../../entity/approvalRule/approvalRuleSelector");
 const classSelector_1 = require("../../../../entity/class/classSelector");
+const tenantSelector_1 = require("../../../../entity/tenant/tenantSelector");
 const userSelector_1 = require("../../../../entity/user/userSelector");
 const userRoleSelector_1 = require("../../../../entity/userRole/userRoleSelector");
 exports.getBillPaySetupApproverView = (0, toolkit_1.createSelector)((state) => state.billPaySetupApproverViewState, (state) => state.approvalRuleState, (state) => state.userState, (billPaySetupApproverViewState, approvalRuleState, userState) => {
@@ -50,7 +51,7 @@ exports.getBillPaySetupApproverView = (0, toolkit_1.createSelector)((state) => s
         newApprovalRuleId,
     };
 });
-exports.getBillPaySetupApproverUpdateDataView = (0, toolkit_1.createSelector)((state) => state.billPaySetupApproverViewState, (state) => state.approvalRuleState, (state) => state.userState, (state) => state.classState, (state) => state.classListState, (state) => state.userRoleState, (billPaySetupApproverViewState, approvalRuleState, userState, classState, classListState, userRoleState) => {
+exports.getBillPaySetupApproverUpdateDataView = (0, toolkit_1.createSelector)((state) => state.billPaySetupApproverViewState, (state) => state.approvalRuleState, (state) => state.userState, (state) => state.classState, (state) => state.classListState, (state) => state.userRoleState, (state) => (0, tenantSelector_1.getIsAccountingClassesEnabled)(state), (billPaySetupApproverViewState, approvalRuleState, userState, classState, classListState, userRoleState, isAccountingClassesEnabled) => {
     const { affectedEntityIds, approvalRuleIds, approverListState, billPaySetupApproverViewUpdateData, fetchState, error, listeningToPusherEvent, } = billPaySetupApproverViewState;
     const { approverIds, attributes } = approverListState;
     const allApprovalRules = (0, approvalRuleSelector_1.getApprovalRulesByIds)(approvalRuleState, approvalRuleIds);
@@ -98,10 +99,9 @@ exports.getBillPaySetupApproverUpdateDataView = (0, toolkit_1.createSelector)((s
         allAttributes,
         filteredAttributes,
         billPaySetupApproverViewUpdateData,
-        approverListFetchStatus: (0, reduceFetchState_1.reduceAllFetchState)([
-            approverListState.fetchStatus,
-            classListState,
-        ]),
+        approverListFetchStatus: isAccountingClassesEnabled
+            ? (0, reduceFetchState_1.reduceAllFetchState)([approverListState.fetchStatus, classListState])
+            : approverListState.fetchStatus,
         fetchState,
         allAccountingClasses,
         error,