@zeniai/client-epic-state 4.20.3-betaSS12 → 4.20.3-betaSS13

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

@@ -1,7 +1,7 @@
 "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.updateNodeCollapseState = exports.updateStatementUploadChosen = exports.uploadAccountStatementFailure = exports.uploadAccountStatementSuccess = exports.uploadAccountStatement = exports.includeAccountInReconciliationFailure = exports.includeAccountInReconciliationSuccess = exports.includeAccountInReconciliation = exports.excludeAccountFromReconciliationFailure = exports.excludeAccountFromReconciliationSuccess = exports.excludeAccountFromReconciliation = 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");
@@ -41,7 +41,15 @@ exports.initialReconciliationTabsState = {
     },
 };
 exports.initialActionFetchState = {
+    excludeAccountFetch: {
+        fetchState: 'Not-Started',
+        error: undefined,
+    },
     excludeFetchById: {},
+    includeAccountFetch: {
+        fetchState: 'Not-Started',
+        error: undefined,
+    },
     reconcileFetch: {
         fetchState: 'Not-Started',
         error: undefined,
@@ -55,6 +63,7 @@ exports.initialActionFetchState = {
 exports.initialState = {
     accountReconciliationRecordsBySelectedPeriod: {},
     accountConnectionStatusByAccountID: {},
+    excludedAccountExclusionInfo: {},
     fetchState: 'Not-Started',
     error: undefined,
     selectedTab: 'review',
@@ -64,10 +73,12 @@ exports.initialState = {
     selectedAccountId: undefined,
     statementUploadChosen: false,
     reconListUIState: {
+        nodeCollapseState: {},
         scrollPosition: {
             scrollTop: 0,
         },
     },
+    excludedAccountIDs: [],
 };
 // Create slice with reducers
 const expenseAutomationReconciliationView = (0, toolkit_1.createSlice)({
@@ -136,7 +147,7 @@ const expenseAutomationReconciliationView = (0, toolkit_1.createSlice)({
         fetchReconciliationSuccess: {
             reducer(draft, action) {
                 if (action.payload.accountId == null) {
-                    updateAllReconciliation(draft, action.payload.reconciliation.accounts, action.payload.selectedPeriod, action.payload.reconciliation.reconciliation, action.payload.refreshViewInBackground);
+                    updateAllReconciliation(draft, action.payload.reconciliation.accounts, action.payload.selectedPeriod, action.payload.reconciliation.reconciliation, action.payload.refreshViewInBackground, action.payload.reconciliation.excluded_accounts ?? []);
                 }
                 else if (action.payload.reconciliation.reconciliation.length > 0 &&
                     action.payload.reconciliation.accounts.length > 0) {
@@ -348,6 +359,10 @@ const expenseAutomationReconciliationView = (0, toolkit_1.createSlice)({
         updateReconListScrollPosition: (draft, action) => {
             draft.reconListUIState.scrollPosition = action.payload.scrollPosition;
         },
+        updateNodeCollapseState: (draft, action) => {
+            draft.reconListUIState.nodeCollapseState[action.payload.nodeId] =
+                action.payload.collapsed;
+        },
         setConnectionInProgressForAccount: (draft, action) => {
             if (draft.accountConnectionStatusByAccountID[action.payload.accountId] ==
                 null) {
@@ -425,6 +440,85 @@ const expenseAutomationReconciliationView = (0, toolkit_1.createSlice)({
                 ...localData,
             };
         },
+        excludeAccountFromReconciliation: {
+            reducer(draft) {
+                draft.actionFetchState.excludeAccountFetch = {
+                    fetchState: 'In-Progress',
+                    error: undefined,
+                };
+            },
+            prepare(payload) {
+                return { payload };
+            },
+        },
+        excludeAccountFromReconciliationSuccess: (draft, action) => {
+            draft.actionFetchState.excludeAccountFetch = {
+                fetchState: 'Completed',
+                error: undefined,
+            };
+            const { account, selectedPeriod } = action.payload;
+            if (account != null) {
+                if (!draft.excludedAccountIDs.includes(account.account_id)) {
+                    draft.excludedAccountIDs.push(account.account_id);
+                }
+                updateExcludedAccountExclusionInfo(draft, account);
+                const monthYearPeriodId = (0, timePeriod_1.toMonthYearPeriodId)(selectedPeriod);
+                if (draft.accountReconciliationRecordsBySelectedPeriod[monthYearPeriodId]
+                    ?.accountIDs != null) {
+                    draft.accountReconciliationRecordsBySelectedPeriod[monthYearPeriodId].accountIDs = draft.accountReconciliationRecordsBySelectedPeriod[monthYearPeriodId].accountIDs.filter((id) => id !== account.account_id);
+                }
+            }
+        },
+        excludeAccountFromReconciliationFailure: (draft, action) => {
+            draft.actionFetchState.excludeAccountFetch = {
+                fetchState: 'Error',
+                error: action.payload.error,
+            };
+        },
+        includeAccountInReconciliation: {
+            reducer(draft) {
+                draft.actionFetchState.includeAccountFetch = {
+                    fetchState: 'In-Progress',
+                    error: undefined,
+                };
+            },
+            prepare(payload) {
+                return { payload };
+            },
+        },
+        includeAccountInReconciliationSuccess: (draft, action) => {
+            draft.actionFetchState.includeAccountFetch = {
+                fetchState: 'Completed',
+                error: undefined,
+            };
+            const { reconciliation, selectedPeriod } = action.payload;
+            if (reconciliation == null) {
+                return;
+            }
+            const accountId = reconciliation.account_id;
+            draft.excludedAccountIDs = draft.excludedAccountIDs.filter((id) => id !== accountId);
+            delete draft.excludedAccountExclusionInfo[accountId];
+            const monthYearPeriodId = (0, timePeriod_1.toMonthYearPeriodId)(selectedPeriod);
+            const accountReconciliationRecords = draft.accountReconciliationRecordsBySelectedPeriod[monthYearPeriodId];
+            if (accountReconciliationRecords != null) {
+                if (!accountReconciliationRecords.accountIDs.includes(accountId)) {
+                    accountReconciliationRecords.accountIDs.push(accountId);
+                }
+                // put this in a function
+                updateReconciliationByAccountIDOnIncludeAccount(draft, accountId, reconciliation, monthYearPeriodId);
+            }
+            draft.accountConnectionStatusByAccountID[accountId] = {
+                status: (0, accountReconState_1.toBankStatusCodeType)(reconciliation.bank_status.code),
+                connectionInProgress: false,
+                paymentAccountId: undefined,
+            };
+        },
+        includeAccountInReconciliationFailure: (draft, action) => {
+            draft.actionFetchState.includeAccountFetch = {
+                fetchState: 'Error',
+                error: action.payload.error,
+            };
+        },
         updateStatementUploadChosen: (draft, action) => {
             draft.statementUploadChosen = action.payload.statementUploadChosen;
         },
@@ -434,10 +528,38 @@ const expenseAutomationReconciliationView = (0, toolkit_1.createSlice)({
     },
 });
 // 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.excludeAccountFromReconciliation = _a.excludeAccountFromReconciliation, exports.excludeAccountFromReconciliationSuccess = _a.excludeAccountFromReconciliationSuccess, exports.excludeAccountFromReconciliationFailure = _a.excludeAccountFromReconciliationFailure, exports.includeAccountInReconciliation = _a.includeAccountInReconciliation, exports.includeAccountInReconciliationSuccess = _a.includeAccountInReconciliationSuccess, exports.includeAccountInReconciliationFailure = _a.includeAccountInReconciliationFailure, exports.uploadAccountStatement = _a.uploadAccountStatement, exports.uploadAccountStatementSuccess = _a.uploadAccountStatementSuccess, exports.uploadAccountStatementFailure = _a.uploadAccountStatementFailure, exports.updateStatementUploadChosen = _a.updateStatementUploadChosen, exports.updateNodeCollapseState = _a.updateNodeCollapseState;
 // Export reducer
 exports.default = expenseAutomationReconciliationView.reducer;
-function updateAllReconciliation(draft, accounts, selectedPeriod, reconciliationData, refreshViewInBackground) {
+function updateAllReconciliation(draft, accounts, selectedPeriod, reconciliationData, refreshViewInBackground, excludedAccounts) {
+    draft.excludedAccountIDs = excludedAccounts.map((ea) => ea.account_id);
+    draft.excludedAccountExclusionInfo = {};
+    excludedAccounts.forEach((ea) => {
+        const { exclusion_info } = ea;
+        draft.excludedAccountExclusionInfo[ea.account_id] = {
+            bankBalance: exclusion_info.bank_balance != null
+                ? {
+                    amount: exclusion_info.bank_balance,
+                    currencyCode: ea.currency_code ?? 'USD',
+                    currencySymbol: ea.currency_symbol ?? '$',
+                }
+                : undefined,
+            clearedBalance: exclusion_info.cleared_balance != null
+                ? {
+                    amount: exclusion_info.cleared_balance,
+                    currencyCode: ea.currency_code ?? 'USD',
+                    currencySymbol: ea.currency_symbol ?? '$',
+                }
+                : undefined,
+            variance: exclusion_info.variance != null
+                ? {
+                    amount: exclusion_info.variance,
+                    currencyCode: ea.currency_code ?? 'USD',
+                    currencySymbol: ea.currency_symbol ?? '$',
+                }
+                : undefined,
+        };
+    });
     draft.accountReconciliationRecordsBySelectedPeriod[(0, timePeriod_1.toMonthYearPeriodId)(selectedPeriod)] = {
         accountIDs: [],
         reconciliationByAccountID: {},
@@ -475,6 +597,9 @@ function updateAllReconciliation(draft, accounts, selectedPeriod, reconciliation
                     ? (0, accountState_1.toReconciliationAccountSource)(account.reconciliation_source)
                     : undefined,
             },
+            accountDetectionReason: account?.detection_info != null && account.detection_reason != null
+                ? account.detection_reason
+                : undefined,
         };
         accountReconciliationRecords.accountIDs.push(reconciliation.account_id);
     });
@@ -520,3 +645,42 @@ function updateReconciliationByAccountID(draft, accounts, selectedPeriod, accoun
         };
     }
 }
+const updateExcludedAccountExclusionInfo = (draft, account) => {
+    draft.excludedAccountExclusionInfo[account.account_id] = {
+        bankBalance: account.bank_balance != null
+            ? {
+                amount: account.bank_balance,
+                currencyCode: account.currency_code ?? 'USD',
+                currencySymbol: account.currency_symbol ?? '$',
+            }
+            : undefined,
+        clearedBalance: account.cleared_balance != null
+            ? {
+                amount: account.cleared_balance,
+                currencyCode: account.currency_code ?? 'USD',
+                currencySymbol: account.currency_symbol ?? '$',
+            }
+            : undefined,
+        variance: account.variance != null
+            ? {
+                amount: account.variance,
+                currencyCode: account.currency_code ?? 'USD',
+                currencySymbol: account.currency_symbol ?? '$',
+            }
+            : undefined,
+    };
+};
+const updateReconciliationByAccountIDOnIncludeAccount = (draft, accountId, reconciliation, monthYearPeriodId) => {
+    draft.accountReconciliationRecordsBySelectedPeriod[monthYearPeriodId].reconciliationByAccountID[accountId] = {
+        accountId,
+        reconciliationId: reconciliation.reconciliation_id ?? undefined,
+        transactionFetchState: { fetchState: 'Not-Started', error: undefined },
+        refreshStatus: { fetchState: 'Not-Started', error: undefined },
+        statementDeleteStatus: { fetchState: 'Not-Started', error: undefined },
+        statementUploadStatus: { fetchState: 'Not-Started', error: undefined },
+        statementUpdateStatus: { fetchState: 'Not-Started', error: undefined },
+        statementParseInProgress: reconciliation.bank_status.code === 'parsing',
+        localData: {},
+        accountDetectionReason: undefined,
+    };
+};

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/missingReceiptsSelectorTypes.d.ts

@@ -51,8 +51,10 @@ export interface BulkUploadSelectorData {
     sortKey: BulkUploadSortKey;
     sortOrder: SortOrder;
     unmatchedFiles: ResolvedBatchFile[];
+    uploadedFileCount: number;
     uploadProgress: number;
     uploadStatus: FetchStateAndError;
+    currentBatchId?: ID;
 }
 export interface ResolvedBatchDetails {
     batchId: ID;

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

@@ -11,7 +11,7 @@ import { Vendor } from '../../../entity/vendor/vendorState';
 import { PlaidConnectionDetails } from '../../spendManagement/plaidAccount/plaidAccountViewState';
 import { AccountReconciliationLocalData, ActionFetchStates, ReconListUIState, ReconciliationTabsState, ReconciliationViewTabType } from '../types/reconciliationViewState';
 export declare const ALL_ACCOUNT_RECON_SECTION_IDS: readonly ["assets", "liabilities"];
-declare const toAccountReconSectionID: (v: string) => "assets" | "liabilities";
+export declare const toAccountReconSectionID: (v: string) => "assets" | "liabilities";
 export type AccountReconSectionID = ReturnType<typeof toAccountReconSectionID>;
 export interface ExpenseAutomationReconciliationViewSelector {
     accountListNestedAccountHierarchy: NestedAccountHierarchyForReport[];
@@ -24,7 +24,12 @@ export interface ExpenseAutomationReconciliationViewSelector {
     classListNestedAccountHierarchy: NestedClassHierarchyForReport[];
     completionStatus: CompletionStatusType;
     creditCards: AccountBase[];
+    excludeAccountFetchState: FetchStateAndError;
+    excludedAccountIDs: ID[];
+    excludedAccountReconciliationByAccountID: Record<ID, AccountReconciliationByAccount>;
+    excludedAccountReconciliationBySectionID: Record<AccountReconSectionID, AccountReconciliationBySection>;
     fetchStatus: FetchStateAndError;
+    includeAccountFetchState: FetchStateAndError;
     monthYearPeriod: MonthYearPeriod;
     plaidConnectionDetails: PlaidConnectionDetails;
     reconciliationTabsState: ReconciliationTabsState;
@@ -57,6 +62,6 @@ export interface AccountReconciliationByAccount {
     statementUpdateStatus: FetchStateAndError;
     statementUploadStatus: FetchStateAndError;
     transactionFetchState: FetchStateAndError;
+    accountDetectionReason?: string;
     paymentAccountId?: ID;
 }
-export {};

package/lib/view/expenseAutomationView/selectorTypes/reconciliationViewSelectorTypes.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ALL_ACCOUNT_RECON_SECTION_IDS = void 0;
+exports.toAccountReconSectionID = exports.ALL_ACCOUNT_RECON_SECTION_IDS = void 0;
 const stringToUnion_1 = require("../../../commonStateTypes/stringToUnion");
 exports.ALL_ACCOUNT_RECON_SECTION_IDS = ['assets', 'liabilities'];
-// eslint-disable-next-line @typescript-eslint/no-unused-vars
 const toAccountReconSectionID = (v) => (0, stringToUnion_1.stringToUnion)(v, exports.ALL_ACCOUNT_RECON_SECTION_IDS);
+exports.toAccountReconSectionID = toAccountReconSectionID;

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

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getExpenseAutomationFluxAnalysisView = getExpenseAutomationFluxAnalysisView;
+const reduceFetchState_1 = require("../../../commonStateTypes/reduceFetchState");
 const timePeriod_1 = require("../../../commonStateTypes/timePeriod");
 const accountSelector_1 = require("../../../entity/account/accountSelector");
 const classSelector_1 = require("../../../entity/class/classSelector");
@@ -9,7 +10,7 @@ const userSelector_1 = require("../../../entity/user/userSelector");
 const vendorSelector_1 = require("../../../entity/vendor/vendorSelector");
 const expenseAutomationViewSelectorTypes_1 = require("../selectorTypes/expenseAutomationViewSelectorTypes");
 function getExpenseAutomationFluxAnalysisView(state) {
-    const { expenseAutomationFluxAnalysisViewState, monthEndCloseChecksState } = state;
+    const { expenseAutomationFluxAnalysisViewState, monthEndCloseChecksState, monthEndCloseChecksViewState, } = state;
     const { fetchState, error, refreshStatus, uiState, reviewOperatingExpenseIdsByPeriod, selectedSectionIdsByPeriod, groupsBySelectedPeriod, fluxAnalysisEntities, bulkReviewStatus, currency, totalBalancesAndVariance, } = expenseAutomationFluxAnalysisViewState;
     const fetchStateAndError = {
         fetchState,
@@ -94,10 +95,17 @@ function getExpenseAutomationFluxAnalysisView(state) {
         },
     };
     const completionStatus = fluxCompletionStatus != null ? fluxCompletionStatus : 'incomplete';
+    const monthEndFetchState = monthYearPeriodId != null
+        ? (monthEndCloseChecksViewState.monthEndCloseChecksViewByTenantId[currentTenant.tenantId]?.[monthYearPeriodId] ?? { fetchState: 'Not-Started', error: undefined })
+        : { fetchState: 'Not-Started', error: undefined };
+    const reducedFetchStatus = (0, reduceFetchState_1.reduceAnyFetchState)([
+        fetchStateAndError,
+        monthEndFetchState,
+    ]);
     return {
         sections,
         totalBalancesAndVariance,
-        fetchStatus: fetchStateAndError,
+        fetchStatus: reducedFetchStatus,
         bulkReviewStatus,
         reviewOperatingExpensesIds,
         selectedSectionIds,

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

@@ -5,6 +5,8 @@ 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 reduceFetchState_1 = require("../../../commonStateTypes/reduceFetchState");
 const timePeriod_1 = require("../../../commonStateTypes/timePeriod");
 const accountSelector_1 = require("../../../entity/account/accountSelector");
 const jeSchedulesSelector_1 = require("../../../entity/jeSchedules/jeSchedulesSelector");
@@ -16,10 +18,48 @@ 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 'depCategory':
+            return (s) => s.jeCredit.account?.accountName?.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 = [];
-    const { accountState, accountListState, classState, classListState, expenseAutomationJESchedulesViewState, expenseAutomationViewState, monthEndCloseChecksState, } = state;
+    const { accountState, accountListState, classState, classListState, expenseAutomationJESchedulesViewState, expenseAutomationViewState, monthEndCloseChecksState, monthEndCloseChecksViewState, } = state;
     const { jeScheduleTransactionKeysByPeriod, failedJeScheduleTransactionKeysByPeriod, jeScheduleLocalDataById, postStatusById, ignoreStatusById, uiState, error, fetchState, refreshStatus, } = expenseAutomationJESchedulesViewState;
     const accountSettingsView = (0, jeAccountSettingsViewSelector_1.getJEAccountSettingsView)(state);
     const currentTenant = (0, tenantSelector_1.getCurrentTenant)(state);
@@ -65,18 +105,33 @@ 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)
         : [];
     const jeCompletionStatus = allSteps.find((step) => step.step === 'je_schedules')?.completionStatus;
     const completionStatus = jeCompletionStatus != null ? jeCompletionStatus : 'incomplete';
+    const monthEndFetchState = monthYearPeriodId != null
+        ? (monthEndCloseChecksViewState.monthEndCloseChecksViewByTenantId[currentTenant.tenantId]?.[monthYearPeriodId] ?? { fetchState: 'Not-Started', error: undefined })
+        : { fetchState: 'Not-Started', error: undefined };
+    const reducedFetchStatus = (0, reduceFetchState_1.reduceAnyFetchState)([
+        { fetchState, error },
+        monthEndFetchState,
+    ]);
     return {
         uncategorizedAccounts,
         allDepreciationAccountList: filteredDepAccounts,
@@ -85,15 +140,17 @@ function getExpenseAutomationJESchedulesView(state) {
         allAccountList: filteredAccounts,
         accountListNestedAccountHierarchy,
         allClassList: allClasses,
+        completedSchedules,
         draftSchedules,
+        ongoingSchedules,
         resolveSchedules: resolveSchedules,
         accountSettingsView,
         postStatusById: postStatusById,
         ignoreStatusById: ignoreStatusById,
-        fetchState: fetchState,
+        fetchState: reducedFetchStatus.fetchState,
         jeScheduleLocalDataById: jeScheduleLocalDataById,
         uiState: uiState,
-        error: error,
+        error: reducedFetchStatus.error,
         refreshStatus,
         completionStatus,
     };

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

@@ -5,6 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getExpenseAutomationMissingReceiptsView = getExpenseAutomationMissingReceiptsView;
 const orderBy_1 = __importDefault(require("lodash/orderBy"));
+const reduceFetchState_1 = require("../../../commonStateTypes/reduceFetchState");
 const timePeriod_1 = require("../../../commonStateTypes/timePeriod");
 const tenantSelector_1 = require("../../../entity/tenant/tenantSelector");
 const transactionSelector_1 = require("../../../entity/transaction/transactionSelector");
@@ -13,7 +14,7 @@ const missingReceiptsViewReducer_1 = require("../reducers/missingReceiptsViewRed
 const expenseAutomationViewSelectorTypes_1 = require("../selectorTypes/expenseAutomationViewSelectorTypes");
 const missingReceiptsViewState_1 = require("../types/missingReceiptsViewState");
 function getExpenseAutomationMissingReceiptsView(state) {
-    const { expenseAutomationMissingReceiptsViewState, expenseAutomationViewState, transactionState, monthEndCloseChecksState, } = state;
+    const { expenseAutomationMissingReceiptsViewState, expenseAutomationViewState, transactionState, monthEndCloseChecksState, monthEndCloseChecksViewState, } = state;
     const currentTenant = (0, tenantSelector_1.getCurrentTenant)(state);
     const { selectedPeriodByTenantId } = expenseAutomationViewState;
     const selectedPeriod = selectedPeriodByTenantId[currentTenant.tenantId];
@@ -42,7 +43,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:
@@ -181,9 +182,16 @@ function getExpenseAutomationMissingReceiptsView(state) {
             vendorLogo: result.vendorLogo ?? transaction?.logo?.href,
         };
     });
+    const monthEndFetchState = monthYearPeriodId != null
+        ? (monthEndCloseChecksViewState.monthEndCloseChecksViewByTenantId[currentTenant.tenantId]?.[monthYearPeriodId] ?? { fetchState: 'Not-Started', error: undefined })
+        : { fetchState: 'Not-Started', error: undefined };
+    const reducedFetchStatus = (0, reduceFetchState_1.reduceAnyFetchState)([
+        { fetchState, error },
+        monthEndFetchState,
+    ]);
     return {
-        fetchState,
-        error,
+        fetchState: reducedFetchStatus.fetchState,
+        error: reducedFetchStatus.error,
         uploadReceiptStatusById,
         uiState,
         refreshStatus,
@@ -196,6 +204,7 @@ function getExpenseAutomationMissingReceiptsView(state) {
             batchStatus: currentBatchStatus,
             batchDetails: resolvedBatchDetails,
             completedSubTab: bulkUpload.completedSubTab,
+            currentBatchId: bulkUpload.currentBatchId,
             completedTransactions: {
                 fetchState: completedTransactionsForPeriod?.fetchState ?? {
                     fetchState: 'Not-Started',
@@ -223,6 +232,7 @@ function getExpenseAutomationMissingReceiptsView(state) {
                 ...bulkUpload.manualSearch,
                 results: manualSearchResults,
             },
+            uploadedFileCount: bulkUpload.uploadedFileCount,
             uploadProgress: bulkUpload.uploadProgress,
         },
     };