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

package/lib/esm/view/expenseAutomationView/reducers/jeSchedulesViewReducer.js

@@ -44,6 +44,9 @@ export const initialState = {
     uiState: {
         searchString: '',
         scrollPosition: { scrollTop: 0, scrollLeft: undefined },
+        selectedMainTab: 'pending_review',
+        sortKey: 'transactionDate',
+        sortOrder: 'descending',
         totalCount: 0,
         limit: 10,
     },
@@ -365,12 +368,29 @@ const expenseAutomationJESchedulesView = createSlice({
         clearJeAccountSettingsLocalData(draft) {
             draft.accountSettings.localData = accountSettingsInitialState.localData;
         },
+        updateJESchedulesUIState(draft, action) {
+            if (action.payload.sortKey != null) {
+                draft.uiState.sortKey = action.payload.sortKey;
+            }
+            if (action.payload.sortOrder != null) {
+                draft.uiState.sortOrder = action.payload.sortOrder;
+            }
+            if (action.payload.searchString != null) {
+                draft.uiState.searchString = action.payload.searchString;
+            }
+            if (action.payload.scrollPosition != null) {
+                draft.uiState.scrollPosition = action.payload.scrollPosition;
+            }
+            if (action.payload.selectedMainTab != null) {
+                draft.uiState.selectedMainTab = action.payload.selectedMainTab;
+            }
+        },
         clearExpenseAutomationJESchedulesView(draft) {
             Object.assign(draft, initialState);
         },
     },
 });
-export const { clearExpenseAutomationJESchedulesView, clearJeAccountSettingsLocalData, clearJeScheduleLocalData, fetchAccountSettingsListForAccountTypes, fetchJeSchedules, fetchJeSchedulesFailure, fetchJeSchedulesPage, fetchJeSchedulesSuccess, fetchRecommendationForAccountSettings, ignoreRecommendedJeSchedule, ignoreRecommendedJeScheduleFailure, ignoreRecommendedJeScheduleSuccess, initializeAccountSettingsView, initializeJeScheduleLocalData, removeFailedJeScheduleTransactionKey, removeJeScheduleLocalDataById, removeJeScheduleTransactionKey, retryJeSchedule, retryJeScheduleFailure, retryJeScheduleSuccess, saveAccountSettings, saveAccountSettingsFailure, saveAccountSettingsLocalData, saveAccountSettingsSuccess, updateAccountSettingsListForAccountTypes, updateAccountSettingsListForAccountTypesFailure, updateJeScheduleLocalDataById, updateJeScheduleTransactionKeys, updateRecommendationForAccountSettings, updateRecommendationForAccountSettingsFailure, } = expenseAutomationJESchedulesView.actions;
+export const { clearExpenseAutomationJESchedulesView, clearJeAccountSettingsLocalData, clearJeScheduleLocalData, fetchAccountSettingsListForAccountTypes, fetchJeSchedules, fetchJeSchedulesFailure, fetchJeSchedulesPage, fetchJeSchedulesSuccess, fetchRecommendationForAccountSettings, ignoreRecommendedJeSchedule, ignoreRecommendedJeScheduleFailure, ignoreRecommendedJeScheduleSuccess, initializeAccountSettingsView, initializeJeScheduleLocalData, removeFailedJeScheduleTransactionKey, removeJeScheduleLocalDataById, removeJeScheduleTransactionKey, retryJeSchedule, retryJeScheduleFailure, retryJeScheduleSuccess, saveAccountSettings, saveAccountSettingsFailure, saveAccountSettingsLocalData, saveAccountSettingsSuccess, updateAccountSettingsListForAccountTypes, updateAccountSettingsListForAccountTypesFailure, updateJESchedulesUIState, updateJeScheduleLocalDataById, updateJeScheduleTransactionKeys, updateRecommendationForAccountSettings, updateRecommendationForAccountSettingsFailure, } = expenseAutomationJESchedulesView.actions;
 export default expenseAutomationJESchedulesView.reducer;
 const doUpdateRecommendationForAccountSettings = (draft, payload) => {
     const { prepaidExpensesRecommendations, fixedAssetsRecommendations, accruedExpensesRecommendations, } = mapAccountTypeRecommendationPayloadToAccountRecommendationByType(payload);

package/lib/esm/view/expenseAutomationView/reducers/missingReceiptsViewReducer.js

@@ -27,6 +27,7 @@ export const initialBulkUploadState = {
     phase: 'idle',
     sortKey: 'date',
     sortOrder: 'descending',
+    uploadedFileCount: 0,
     uploadProgress: 0,
     uploadStatus: { fetchState: 'Not-Started', error: undefined },
 };
@@ -53,6 +54,12 @@ export const initialState = {
 };
 /** Epic trigger only; batch-details fetch is handled in epics. */
 export const fetchBulkUploadBatchDetails = createAction('expenseAutomationMissingReceiptsView/fetchBulkUploadBatchDetails');
+/**
+ * Epic trigger only. Dispatched from the screen on missing-receipts entry / period switch so the
+ * automatching banner is restored for the logged-in user even when they sit on the Missing tab
+ * after a hard refresh. The epic owns the list + details API calls end-to-end.
+ */
+export const restoreBulkUploadAutomatchingOnMount = createAction('expenseAutomationMissingReceiptsView/restoreBulkUploadAutomatchingOnMount');
 const expenseAutomationMissingReceiptsView = createSlice({
     name: 'expenseAutomationMissingReceiptsView',
     initialState,
@@ -156,21 +163,29 @@ const expenseAutomationMissingReceiptsView = createSlice({
         },
         // -- Bulk Upload Actions --
         bulkUploadReceipts: {
-            reducer(draft) {
+            reducer(draft, action) {
                 draft.bulkUpload.phase = 'uploading';
                 draft.bulkUpload.uploadProgress = 0;
+                draft.bulkUpload.uploadedFileCount = action.payload.fileCount;
                 draft.bulkUpload.uploadStatus = {
                     fetchState: 'In-Progress',
                     error: undefined,
                 };
             },
             prepare(files) {
-                return { payload: { files } };
+                return { payload: { files, fileCount: files.length } };
             },
         },
         updateBulkUploadProgress(draft, action) {
             draft.bulkUpload.uploadProgress = action.payload;
         },
+        /**
+         * Sync file count when bulk upload uses direct HTTP (`bulkUploadReceipts` Redux action is not
+         * dispatched, so `bulkUploadReceipts` reducer never runs).
+         */
+        setBulkUploadUploadedFileCount(draft, action) {
+            draft.bulkUpload.uploadedFileCount = action.payload;
+        },
         bulkUploadReceiptsSuccess(draft, action) {
             draft.bulkUpload.currentBatchId = action.payload.batchId;
             draft.bulkUpload.uploadProgress = 100;
@@ -187,6 +202,14 @@ const expenseAutomationMissingReceiptsView = createSlice({
             };
             draft.bulkUpload.phase = 'idle';
         },
+        restoreBulkUploadMatchingState(draft, action) {
+            if (draft.bulkUpload.phase !== 'idle') {
+                return;
+            }
+            draft.bulkUpload.currentBatchId = action.payload.batchId;
+            draft.bulkUpload.uploadedFileCount = action.payload.totalFiles;
+            draft.bulkUpload.phase = 'matching';
+        },
         bulkUploadAutomatchingTimedOut: {
             reducer(draft, action) {
                 if (draft.bulkUpload.phase !== 'matching' ||
@@ -499,9 +522,9 @@ const expenseAutomationMissingReceiptsView = createSlice({
             },
         },
         fetchCompletedTransactionsSuccess(draft, action) {
-            const { transactionIds, nextPageToken, totalCount, selectedPeriod, isInitialLoad, } = action.payload;
+            const { transactionIds, nextPageToken, totalCount, selectedPeriod, isInitialLoad, sortKey, sortOrder, completedSubTab, } = action.payload;
             const periodId = toMonthYearPeriodId(selectedPeriod);
-            const cacheKey = getCompletedTransactionsCacheKey(periodId, draft.bulkUpload.sortKey, draft.bulkUpload.sortOrder, draft.bulkUpload.completedSubTab);
+            const cacheKey = getCompletedTransactionsCacheKey(periodId, sortKey, sortOrder, completedSubTab);
             if (isInitialLoad) {
                 draft.bulkUpload.completedTransactionsByPeriod[cacheKey] = {
                     transactionIds,
@@ -530,7 +553,7 @@ const expenseAutomationMissingReceiptsView = createSlice({
         },
         fetchCompletedTransactionsFailure(draft, action) {
             const periodId = toMonthYearPeriodId(action.payload.selectedPeriod);
-            const cacheKey = getCompletedTransactionsCacheKey(periodId, draft.bulkUpload.sortKey, draft.bulkUpload.sortOrder, draft.bulkUpload.completedSubTab);
+            const cacheKey = getCompletedTransactionsCacheKey(periodId, action.payload.sortKey, action.payload.sortOrder, action.payload.completedSubTab);
             const existing = draft.bulkUpload.completedTransactionsByPeriod[cacheKey];
             if (existing != null) {
                 existing.fetchState = {
@@ -551,7 +574,7 @@ const expenseAutomationMissingReceiptsView = createSlice({
 });
 export const { fetchMissingReceipts, fetchMissingReceiptsSuccess, fetchMissingReceiptsFailure, uploadMissingReceiptSuccess, updateMissingReceiptUploadState, updateMissingReceiptsUIState, markMissingReceiptAsDone, clearExpenseAutomationMissingReceiptsView, 
 // Bulk Upload
-bulkUploadReceipts, updateBulkUploadProgress, bulkUploadReceiptsSuccess, bulkUploadReceiptsFailure, bulkUploadAutomatchingTimedOut, pusherBatchStatusUpdate, requestMissingReceiptsTabNavigation, clearMissingReceiptsTabNavigation, fetchBulkUploadBatchDetailsSuccess, fetchBulkUploadBatchDetailsFailure, storeBatchDetails, batchDetailFetchFailed, setInitialBatchDetailsLoading, fetchMoreBatchDetails, fetchMoreBatchDetailsComplete, fetchMoreBatchDetailsFailure, fetchBulkUploadBatches, fetchBulkUploadBatchesSuccess, fetchBulkUploadBatchesFailure, confirmBulkUploadMatch, confirmBulkUploadMatchSuccess, confirmBulkUploadMatchFailure, setBulkUploadResultsTab, setBulkUploadCompletedSubTab, setBulkUploadSortConfig, clearBulkUpload, searchTransactionsForManualMatch, searchTransactionsForManualMatchSuccess, searchTransactionsForManualMatchFailure, clearManualSearchResults, acknowledgeBulkUploadConfirmMatchComplete, 
+bulkUploadReceipts, updateBulkUploadProgress, setBulkUploadUploadedFileCount, bulkUploadReceiptsSuccess, bulkUploadReceiptsFailure, restoreBulkUploadMatchingState, bulkUploadAutomatchingTimedOut, pusherBatchStatusUpdate, requestMissingReceiptsTabNavigation, clearMissingReceiptsTabNavigation, fetchBulkUploadBatchDetailsSuccess, fetchBulkUploadBatchDetailsFailure, storeBatchDetails, batchDetailFetchFailed, setInitialBatchDetailsLoading, fetchMoreBatchDetails, fetchMoreBatchDetailsComplete, fetchMoreBatchDetailsFailure, fetchBulkUploadBatches, fetchBulkUploadBatchesSuccess, fetchBulkUploadBatchesFailure, confirmBulkUploadMatch, confirmBulkUploadMatchSuccess, confirmBulkUploadMatchFailure, setBulkUploadResultsTab, setBulkUploadCompletedSubTab, setBulkUploadSortConfig, clearBulkUpload, searchTransactionsForManualMatch, searchTransactionsForManualMatchSuccess, searchTransactionsForManualMatchFailure, clearManualSearchResults, acknowledgeBulkUploadConfirmMatchComplete, 
 // Completed Transactions
 fetchCompletedTransactions, fetchCompletedTransactionsSuccess, fetchCompletedTransactionsFailure, } = expenseAutomationMissingReceiptsView.actions;
 export default expenseAutomationMissingReceiptsView.reducer;

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

@@ -37,7 +37,15 @@ export const initialReconciliationTabsState = {
     },
 };
 export const initialActionFetchState = {
+    excludeAccountFetch: {
+        fetchState: 'Not-Started',
+        error: undefined,
+    },
     excludeFetchById: {},
+    includeAccountFetch: {
+        fetchState: 'Not-Started',
+        error: undefined,
+    },
     reconcileFetch: {
         fetchState: 'Not-Started',
         error: undefined,
@@ -51,6 +59,7 @@ export const initialActionFetchState = {
 export const initialState = {
     accountReconciliationRecordsBySelectedPeriod: {},
     accountConnectionStatusByAccountID: {},
+    excludedAccountExclusionInfo: {},
     fetchState: 'Not-Started',
     error: undefined,
     selectedTab: 'review',
@@ -60,10 +69,12 @@ export const initialState = {
     selectedAccountId: undefined,
     statementUploadChosen: false,
     reconListUIState: {
+        nodeCollapseState: {},
         scrollPosition: {
             scrollTop: 0,
         },
     },
+    excludedAccountIDs: [],
 };
 // Create slice with reducers
 const expenseAutomationReconciliationView = createSlice({
@@ -132,7 +143,7 @@ const expenseAutomationReconciliationView = 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) {
@@ -344,6 +355,10 @@ const expenseAutomationReconciliationView = 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) {
@@ -421,6 +436,85 @@ const expenseAutomationReconciliationView = 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 = 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 = 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: 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;
         },
@@ -430,10 +524,38 @@ const expenseAutomationReconciliationView = createSlice({
     },
 });
 // Export actions
-export const { fetchReconciliation, fetchReconciliationFailure, fetchReconciliationSuccess, saveReconciliationDetail, saveReconciliationDetailFailure, updateSelectedAccountId, setConnectionInProgressForAccount, setStatementParseInProgress, updateReconcileTabLocalData, updateReconcileTabListSortState, updateReconcileTabListScrollState, saveReconciliationDetailSuccess, updateSelectedTab, updateBalancesLocalData, initialiseLocalDataForSelectedAccountId, clearExpenseAutomationReconciliationView, updateSelectedDrawerAccountId, updateReviewTabSortState, initializeReconciliationReviewTabLocalData, updateReviewTabLocalData, saveReconciliationReview, updateSaveReconciliationReviewFetchStatus, updateReconListScrollPosition, updateAccountReconciliationLocalData, deleteAccountStatement, deleteAccountStatementSuccess, deleteAccountStatementFailure, uploadAccountStatement, uploadAccountStatementSuccess, uploadAccountStatementFailure, updateStatementUploadChosen, } = expenseAutomationReconciliationView.actions;
+export const { fetchReconciliation, fetchReconciliationFailure, fetchReconciliationSuccess, saveReconciliationDetail, saveReconciliationDetailFailure, updateSelectedAccountId, setConnectionInProgressForAccount, setStatementParseInProgress, updateReconcileTabLocalData, updateReconcileTabListSortState, updateReconcileTabListScrollState, saveReconciliationDetailSuccess, updateSelectedTab, updateBalancesLocalData, initialiseLocalDataForSelectedAccountId, clearExpenseAutomationReconciliationView, updateSelectedDrawerAccountId, updateReviewTabSortState, initializeReconciliationReviewTabLocalData, updateReviewTabLocalData, saveReconciliationReview, updateSaveReconciliationReviewFetchStatus, updateReconListScrollPosition, updateAccountReconciliationLocalData, deleteAccountStatement, deleteAccountStatementSuccess, deleteAccountStatementFailure, excludeAccountFromReconciliation, excludeAccountFromReconciliationSuccess, excludeAccountFromReconciliationFailure, includeAccountInReconciliation, includeAccountInReconciliationSuccess, includeAccountInReconciliationFailure, uploadAccountStatement, uploadAccountStatementSuccess, uploadAccountStatementFailure, updateStatementUploadChosen, updateNodeCollapseState, } = expenseAutomationReconciliationView.actions;
 // Export reducer
 export 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[toMonthYearPeriodId(selectedPeriod)] = {
         accountIDs: [],
         reconciliationByAccountID: {},
@@ -471,6 +593,9 @@ function updateAllReconciliation(draft, accounts, selectedPeriod, reconciliation
                     ? toReconciliationAccountSource(account.reconciliation_source)
                     : undefined,
             },
+            accountDetectionReason: account?.detection_info != null && account.detection_reason != null
+                ? account.detection_reason
+                : undefined,
         };
         accountReconciliationRecords.accountIDs.push(reconciliation.account_id);
     });
@@ -516,3 +641,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/esm/view/expenseAutomationView/selectorTypes/reconciliationViewSelectorTypes.js

@@ -1,4 +1,3 @@
 import { stringToUnion } from '../../../commonStateTypes/stringToUnion';
 export const ALL_ACCOUNT_RECON_SECTION_IDS = ['assets', 'liabilities'];
-// eslint-disable-next-line @typescript-eslint/no-unused-vars
-const toAccountReconSectionID = (v) => stringToUnion(v, ALL_ACCOUNT_RECON_SECTION_IDS);
+export const toAccountReconSectionID = (v) => stringToUnion(v, ALL_ACCOUNT_RECON_SECTION_IDS);

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

@@ -1,3 +1,4 @@
+import { reduceAnyFetchState } from '../../../commonStateTypes/reduceFetchState';
 import { toMonthYearPeriodId } from '../../../commonStateTypes/timePeriod';
 import { getAccountBase } from '../../../entity/account/accountSelector';
 import { getClassById } from '../../../entity/class/classSelector';
@@ -6,7 +7,7 @@ import { getUserByUserId } from '../../../entity/user/userSelector';
 import { getVendorByVendorId } from '../../../entity/vendor/vendorSelector';
 import { getAllSteps } from '../selectorTypes/expenseAutomationViewSelectorTypes';
 export 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,
@@ -91,10 +92,17 @@ export 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 = reduceAnyFetchState([
+        fetchStateAndError,
+        monthEndFetchState,
+    ]);
     return {
         sections,
         totalBalancesAndVariance,
-        fetchStatus: fetchStateAndError,
+        fetchStatus: reducedFetchStatus,
         bulkReviewStatus,
         reviewOperatingExpensesIds,
         selectedSectionIds,

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

@@ -1,4 +1,6 @@
 import omit from 'lodash/omit';
+import orderBy from 'lodash/orderBy';
+import { reduceAnyFetchState } from '../../../commonStateTypes/reduceFetchState';
 import { toMonthYearPeriodId } from '../../../commonStateTypes/timePeriod';
 import { getAccountIdsForTypes } from '../../../entity/account/accountSelector';
 import { getJEScheduledTransactionByJEScheduleTransactionKey, } from '../../../entity/jeSchedules/jeSchedulesSelector';
@@ -10,10 +12,48 @@ import { filterNestedAccountHierarchyById } from '../../scheduleView/scheduleDet
 import { getAccountLabelForScheduleType, getAccountsTypesForScheduleList, } from '../../scheduleView/scheduleListView/scheduleListHelper';
 import { getAllSteps } from '../selectorTypes/expenseAutomationViewSelectorTypes';
 import { getJEAccountSettingsView } from './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 orderBy(transactions, [accessor], [sortOrder === 'ascending' ? 'asc' : 'desc']);
+}
 export 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 = getJEAccountSettingsView(state);
     const currentTenant = getCurrentTenant(state);
@@ -59,18 +99,33 @@ export function getExpenseAutomationJESchedulesView(state) {
         const jeScheduleDetails = 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
         ? 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 = reduceAnyFetchState([
+        { fetchState, error },
+        monthEndFetchState,
+    ]);
     return {
         uncategorizedAccounts,
         allDepreciationAccountList: filteredDepAccounts,
@@ -79,15 +134,17 @@ export 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/esm/view/expenseAutomationView/selectors/missingReceiptsSelector.js

@@ -1,4 +1,5 @@
 import orderBy from 'lodash/orderBy';
+import { reduceAnyFetchState } from '../../../commonStateTypes/reduceFetchState';
 import { toMonthYearPeriodId } from '../../../commonStateTypes/timePeriod';
 import { getCurrentTenant } from '../../../entity/tenant/tenantSelector';
 import { getSupportedTransactionById, getSupportedTransactionsByIds, } from '../../../entity/transaction/transactionSelector';
@@ -7,7 +8,7 @@ import { getCompletedTransactionsCacheKey } from '../reducers/missingReceiptsVie
 import { getAllSteps } from '../selectorTypes/expenseAutomationViewSelectorTypes';
 import { isUnmatchedTabFileStatus, } from '../types/missingReceiptsViewState';
 export function getExpenseAutomationMissingReceiptsView(state) {
-    const { expenseAutomationMissingReceiptsViewState, expenseAutomationViewState, transactionState, monthEndCloseChecksState, } = state;
+    const { expenseAutomationMissingReceiptsViewState, expenseAutomationViewState, transactionState, monthEndCloseChecksState, monthEndCloseChecksViewState, } = state;
     const currentTenant = getCurrentTenant(state);
     const { selectedPeriodByTenantId } = expenseAutomationViewState;
     const selectedPeriod = selectedPeriodByTenantId[currentTenant.tenantId];
@@ -36,7 +37,7 @@ export 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:
@@ -175,9 +176,16 @@ export 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 = reduceAnyFetchState([
+        { fetchState, error },
+        monthEndFetchState,
+    ]);
     return {
-        fetchState,
-        error,
+        fetchState: reducedFetchStatus.fetchState,
+        error: reducedFetchStatus.error,
         uploadReceiptStatusById,
         uiState,
         refreshStatus,
@@ -190,6 +198,7 @@ export function getExpenseAutomationMissingReceiptsView(state) {
             batchStatus: currentBatchStatus,
             batchDetails: resolvedBatchDetails,
             completedSubTab: bulkUpload.completedSubTab,
+            currentBatchId: bulkUpload.currentBatchId,
             completedTransactions: {
                 fetchState: completedTransactionsForPeriod?.fetchState ?? {
                     fetchState: 'Not-Started',
@@ -217,6 +226,7 @@ export function getExpenseAutomationMissingReceiptsView(state) {
                 ...bulkUpload.manualSearch,
                 results: manualSearchResults,
             },
+            uploadedFileCount: bulkUpload.uploadedFileCount,
             uploadProgress: bulkUpload.uploadProgress,
         },
     };