@zeniai/client-epic-state 4.20.7 → 4.20.8

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

@@ -1,8 +1,11 @@
 import orderBy from 'lodash/orderBy';
 import { toMonthYearPeriodId } from '../../../commonStateTypes/timePeriod';
 import { getCurrentTenant } from '../../../entity/tenant/tenantSelector';
-import { getSupportedTransactionsByIds } from '../../../entity/transaction/transactionSelector';
+import { getSupportedTransactionById, getSupportedTransactionsByIds, } from '../../../entity/transaction/transactionSelector';
+import { isBatchListStatusCompleted } from '../payload/missingReceiptsPayload';
+import { getCompletedTransactionsCacheKey } from '../reducers/missingReceiptsViewReducer';
 import { getAllSteps } from '../selectorTypes/expenseAutomationViewSelectorTypes';
+import { isUnmatchedTabFileStatus, } from '../types/missingReceiptsViewState';
 export function getExpenseAutomationMissingReceiptsView(state) {
     const { expenseAutomationMissingReceiptsViewState, expenseAutomationViewState, transactionState, monthEndCloseChecksState, } = state;
     const currentTenant = getCurrentTenant(state);
@@ -47,6 +50,131 @@ export function getExpenseAutomationMissingReceiptsView(state) {
     const completionStatus = missingReceiptsCompletionStatus != null
         ? missingReceiptsCompletionStatus
         : 'incomplete';
+    const { bulkUpload, pendingMissingReceiptsTabNavigation } = expenseAutomationMissingReceiptsViewState;
+    const currentBatchStatus = bulkUpload.currentBatchId != null
+        ? bulkUpload.batchStatusById[bulkUpload.currentBatchId]
+        : undefined;
+    const batchList = monthYearPeriodId != null
+        ? (bulkUpload.batchListByPeriod[monthYearPeriodId] ?? [])
+        : [];
+    /**
+     * Primary "Unmatched" batch = first completed batch in platform list order, preferring the
+     * first batch that still has possible_matches/no_match work when any completed batch has such work.
+     * Batches without details yet: wait if the list row still reports unmatched work; otherwise skip
+     * so we do not block the whole tab while other rows are not fetched yet.
+     */
+    const primaryBatchIdFromDetailsOrder = getPrimaryBatchIdFromBatchListOrder(batchList, bulkUpload.batchDetailsById, bulkUpload.failedBatchDetailIds);
+    /**
+     * During upload/matching, prefer `currentBatchId` only when its batch details are loaded,
+     * completed, and still have unmatched-tab work. Otherwise keep `primaryBatchIdFromDetailsOrder`.
+     *
+     * If we pinned to `currentBatchId` as soon as it was absent from the batch list (in-flight
+     * upload), details are often not loaded yet — `unmatchedFiles` would empty while older batches
+     * moved to "past", so the primary "Unmatched Receipts" section vanished during auto-matching.
+     */
+    const unmatchedSectionBatchId = (() => {
+        const phase = bulkUpload.phase;
+        if (phase !== 'matching' && phase !== 'uploading') {
+            return primaryBatchIdFromDetailsOrder;
+        }
+        const currentId = bulkUpload.currentBatchId;
+        if (currentId == null) {
+            return primaryBatchIdFromDetailsOrder;
+        }
+        const currentDetails = bulkUpload.batchDetailsById[currentId];
+        if (currentDetails != null &&
+            currentDetails.status === 'completed' &&
+            batchDetailsHasUnmatchedWork(currentDetails)) {
+            return currentId;
+        }
+        return primaryBatchIdFromDetailsOrder;
+    })();
+    const completedBatchesInApiOrder = batchList.filter((batchListItem) => isBatchListStatusCompleted(batchListItem.status));
+    const currentBatchDetails = unmatchedSectionBatchId != null
+        ? bulkUpload.batchDetailsById[unmatchedSectionBatchId]
+        : undefined;
+    const resolvedFiles = currentBatchDetails?.files.map((file) => resolveBatchFile(file, currentBatchDetails.batchId, transactionState));
+    const failedIds = new Set(bulkUpload.failedBatchDetailIds);
+    const hasMoreBatchDetails = completedBatchesInApiOrder.some((batchListItem) => bulkUpload.batchDetailsById[batchListItem.batchId] == null &&
+        !failedIds.has(batchListItem.batchId));
+    const getSortValue = (file) => {
+        const matchedTransaction = file.matchedTransaction;
+        if (matchedTransaction == null) {
+            return null;
+        }
+        switch (bulkUpload.sortKey) {
+            case 'vendor':
+                return ((matchedTransaction.vendorName ?? matchedTransaction.description)?.toLowerCase() ?? null);
+            case 'category': {
+                const line = matchedTransaction.lines?.[0];
+                return line?.account?.accountName?.toLowerCase() ?? null;
+            }
+            case 'class': {
+                const line = matchedTransaction.lines?.[0];
+                return line?.class?.className?.toLowerCase() ?? null;
+            }
+            case 'date':
+                return matchedTransaction.date.valueOf();
+            case 'amount':
+                return matchedTransaction.amount.amount;
+            default:
+                return null;
+        }
+    };
+    const bulkUploadSortDirection = bulkUpload.sortOrder === 'ascending' ? 'asc' : 'desc';
+    const matchedFiles = orderBy(resolvedFiles?.filter((resolvedFile) => resolvedFile.status === 'exact_match') ?? [], getSortValue, bulkUploadSortDirection);
+    const unmatchedFiles = orderBy(resolvedFiles?.filter((resolvedFile) => isUnmatchedTabFileStatus(resolvedFile.status)) ?? [], getSortValue, bulkUploadSortDirection);
+    const progress = currentBatchStatus != null
+        ? {
+            ...currentBatchStatus.progress,
+            percentage: currentBatchStatus.progress.total > 0
+                ? Math.round((currentBatchStatus.progress.processed /
+                    currentBatchStatus.progress.total) *
+                    100)
+                : 0,
+        }
+        : { total: 0, processed: 0, percentage: 0 };
+    const batchListFetchState = bulkUpload.batchListFetchState;
+    /**
+     * When primary batch is not resolved yet, still aggregate unmatched files from every batch
+     * that has details loaded (otherwise past is empty and receipts vanish from the UI).
+     */
+    const pastBatches = unmatchedSectionBatchId != null
+        ? batchList.filter((batchListItem) => batchListItem.batchId !== unmatchedSectionBatchId)
+        : batchList;
+    const pastUnmatchedFiles = pastBatches.flatMap((pastBatch) => {
+        const details = bulkUpload.batchDetailsById[pastBatch.batchId];
+        if (details == null) {
+            return [];
+        }
+        return details.files
+            .filter((batchFile) => isUnmatchedTabFileStatus(batchFile.status))
+            .map((batchFile) => resolveBatchFile(batchFile, pastBatch.batchId, transactionState));
+    });
+    const completedTransactionsCacheKey = monthYearPeriodId != null
+        ? getCompletedTransactionsCacheKey(monthYearPeriodId, bulkUpload.sortKey, bulkUpload.sortOrder, bulkUpload.completedSubTab)
+        : undefined;
+    const completedTransactionsForPeriod = completedTransactionsCacheKey != null
+        ? bulkUpload.completedTransactionsByPeriod[completedTransactionsCacheKey]
+        : undefined;
+    const completedTransactionIds = completedTransactionsForPeriod?.transactionIds ?? [];
+    const resolvedCompletedTransactions = getSupportedTransactionsByIds(transactionState, completedTransactionIds);
+    const resolvedBatchDetails = currentBatchDetails != null && resolvedFiles != null
+        ? {
+            batchId: currentBatchDetails.batchId,
+            createdAt: currentBatchDetails.createdAt,
+            files: resolvedFiles,
+            status: currentBatchDetails.status,
+            summary: currentBatchDetails.summary,
+        }
+        : undefined;
+    const manualSearchResults = bulkUpload.manualSearch.results.map((result) => {
+        const transaction = getSupportedTransactionById(transactionState, result.transactionId);
+        return {
+            ...result,
+            vendorLogo: result.vendorLogo ?? transaction?.logo?.href,
+        };
+    });
     return {
         fetchState,
         error,
@@ -55,5 +183,121 @@ export function getExpenseAutomationMissingReceiptsView(state) {
         refreshStatus,
         transactions: sortedTransactions,
         completionStatus,
+        pendingMissingReceiptsTabNavigation: pendingMissingReceiptsTabNavigation ?? null,
+        bulkUpload: {
+            phase: bulkUpload.phase,
+            uploadStatus: bulkUpload.uploadStatus,
+            batchStatus: currentBatchStatus,
+            batchDetails: resolvedBatchDetails,
+            completedSubTab: bulkUpload.completedSubTab,
+            completedTransactions: {
+                fetchState: completedTransactionsForPeriod?.fetchState ?? {
+                    fetchState: 'Not-Started',
+                    error: undefined,
+                },
+                nextPageToken: completedTransactionsForPeriod?.nextPageToken ?? null,
+                totalCount: completedTransactionsForPeriod?.totalCount ?? 0,
+                transactions: resolvedCompletedTransactions,
+            },
+            matchedFiles,
+            unmatchedFiles,
+            progress,
+            currentResultsTab: bulkUpload.currentResultsTab,
+            sortKey: bulkUpload.sortKey,
+            sortOrder: bulkUpload.sortOrder,
+            batchList,
+            batchListFetchState,
+            pastBatches,
+            pastUnmatchedFiles,
+            confirmMatchStatus: bulkUpload.confirmMatchStatus,
+            manualSearchUiResetKey: bulkUpload.manualSearchUiResetKey,
+            hasMoreBatchDetails,
+            batchDetailsPaginationState: bulkUpload.batchDetailsPaginationState,
+            manualSearch: {
+                ...bulkUpload.manualSearch,
+                results: manualSearchResults,
+            },
+            uploadedFileCount: bulkUpload.uploadedFileCount,
+            uploadProgress: bulkUpload.uploadProgress,
+        },
+    };
+}
+function batchDetailsHasUnmatchedWork(details) {
+    return details.files.some((file) => isUnmatchedTabFileStatus(file.status));
+}
+/** List row summary before batch details load — aligns with unmatched / possible-match work. */
+function batchListItemHasUnmatchedWork(batch) {
+    return batch.noMatchCount > 0 || batch.possibleMatchesCount > 0;
+}
+/**
+ * `batchList` must match platform order (same sequence as the bulk-upload batches API). Picks the
+ * primary batch for the top "Unmatched" section. Skips failed detail fetches.
+ *
+ * If details are not loaded for an earlier list row but that row reports no unmatched work, we
+ * skip it so later rows with loaded details can be primary (avoids an empty tab when the first
+ * fetch page only loaded later batches). If the list reports unmatched work but details are still
+ * loading, we wait (undefined) so primary order stays correct once details arrive.
+ */
+function getPrimaryBatchIdFromBatchListOrder(batchListInPlatformOrder, batchDetailsById, failedBatchDetailIds) {
+    const failedIds = new Set(failedBatchDetailIds);
+    const anyCompletedBatchHasUnmatchedWork = batchListInPlatformOrder.some((batch) => {
+        if (failedIds.has(batch.batchId)) {
+            return false;
+        }
+        const details = batchDetailsById[batch.batchId];
+        if (details != null &&
+            details.status === 'completed' &&
+            batchDetailsHasUnmatchedWork(details)) {
+            return true;
+        }
+        return details == null && batchListItemHasUnmatchedWork(batch);
+    });
+    for (const batch of batchListInPlatformOrder) {
+        if (failedIds.has(batch.batchId)) {
+            continue;
+        }
+        const details = batchDetailsById[batch.batchId];
+        if (details == null) {
+            if (batchListItemHasUnmatchedWork(batch)) {
+                return undefined;
+            }
+            continue;
+        }
+        if (details.status !== 'completed') {
+            continue;
+        }
+        if (anyCompletedBatchHasUnmatchedWork) {
+            if (batchDetailsHasUnmatchedWork(details)) {
+                return batch.batchId;
+            }
+            continue;
+        }
+        return batch.batchId;
+    }
+    return undefined;
+}
+function resolveBatchFile(file, batchId, transactionState) {
+    const matchedTransaction = file.matchedTransactionId != null
+        ? getSupportedTransactionById(transactionState, file.matchedTransactionId)
+        : undefined;
+    const candidates = file.candidates
+        ?.map((ref) => {
+        const transaction = getSupportedTransactionById(transactionState, ref.transactionId);
+        return transaction != null
+            ? { transaction, matchScore: ref.matchScore }
+            : undefined;
+    })
+        .filter((candidate) => candidate != null);
+    return {
+        attachmentId: file.attachmentId,
+        batchId,
+        fileDownloadUrl: file.fileDownloadUrl,
+        fileId: file.fileId,
+        filename: file.filename,
+        filePreviewUrl: file.filePreviewUrl,
+        status: file.status,
+        matchedTransaction,
+        candidates: candidates != null && candidates.length > 0 ? candidates : undefined,
+        matchSource: file.matchSource,
     };
 }

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

@@ -10,7 +10,7 @@ import { getAllSteps } from '../selectorTypes/expenseAutomationViewSelectorTypes
 export function getExpenseAutomationTransactionView(state) {
     const { accountState, classState, classListState, accountListState, expenseAutomationTransactionsViewState, expenseAutomationViewState, transactionState, monthEndCloseChecksState, } = state;
     const { selectedTransactionCategorizationTab } = expenseAutomationTransactionsViewState;
-    const { uiState, refreshStatus, saveStatus, markAsNotMiscategorizedStatus, transactionIdsBySelectedPeriod, transactionReviewLocalDataById, selectedCheckBoxTransactionIds, transactionIdsWithUnsavedData, selectedTransactionId, selectedTransactionLineId, } = expenseAutomationTransactionsViewState.transactionCategorizationView[selectedTransactionCategorizationTab];
+    const { uiState, refreshStatus, saveStatus, markAsNotMiscategorizedStatus, transactionIdsBySelectedPeriod, transactionReviewLocalDataById, selectedCheckBoxTransactionIds, transactionIdsWithUnsavedData, uploadReceiptStatusById, selectedTransactionId, selectedTransactionLineId, } = expenseAutomationTransactionsViewState.transactionCategorizationView[selectedTransactionCategorizationTab];
     const uncategorizedIncomeExpense = getUncategorizedAccounts(accountState, accountListState, 'accountList');
     const accountList = getAccountList(accountState, accountListState, 'accountList');
     const classList = getClassList(classState, classListState);
@@ -94,6 +94,7 @@ export function getExpenseAutomationTransactionView(state) {
         completionStatus,
         totalCountByTab,
         fetchStateByTransactionTabs: fetchStateByTab,
+        uploadReceiptStatusById,
         selectedTransactionId,
         selectedTransactionLineId,
     };

package/lib/esm/view/expenseAutomationView/types/missingReceiptsViewState.js

@@ -7,3 +7,47 @@ const MISSING_RECEIPTS_SORT_KEYS = [
     'amount',
 ];
 export const toMissingReceiptsSortKey = (v) => stringToUnion(v, MISSING_RECEIPTS_SORT_KEYS);
+// -- Bulk Receipt Upload Types --
+/**
+ * Minimum trimmed query length before manual-match search calls the expense-automation API.
+ * Kept in sync with `ManualSearchInput` in web-components (fires search only when length ≥ this).
+ */
+export const MIN_MANUAL_TRANSACTION_SEARCH_LENGTH = 2;
+const BATCH_STATUS_VALUES = ['pending', 'processing', 'completed'];
+export const toBatchStatusValue = (v) => stringToUnion(v.trim().toLowerCase(), BATCH_STATUS_VALUES);
+/** Canonical batch file statuses (API ingress may use aliases; see `parseBatchFileStatus`). */
+export const BATCH_FILE_STATUSES = [
+    'exact_match',
+    'possible_matches',
+    'no_match',
+    'failed',
+];
+export const toBatchFileStatus = (v) => stringToUnion(v.trim().toLowerCase().replace(/-/g, '_'), BATCH_FILE_STATUSES);
+const UNMATCHED_TAB_FILE_STATUSES = ['possible_matches', 'no_match'];
+/** True for files that belong in the Unmatched tab (possible matches or no match). */
+export function isUnmatchedTabFileStatus(status) {
+    return UNMATCHED_TAB_FILE_STATUSES.includes(status);
+}
+const BULK_UPLOAD_PHASES = [
+    'idle',
+    'uploading',
+    'matching',
+    'completed',
+];
+export const toBulkUploadPhase = (v) => stringToUnion(v.trim().toLowerCase(), BULK_UPLOAD_PHASES);
+const BULK_UPLOAD_RESULTS_TABS = ['completed', 'unmatched'];
+export const toBulkUploadResultsTab = (v) => stringToUnion(v.trim().toLowerCase(), BULK_UPLOAD_RESULTS_TABS);
+const MISSING_RECEIPTS_TABS = ['missing', 'completed', 'unmatched'];
+export const toMissingReceiptsTab = (v) => stringToUnion(v.trim().toLowerCase(), MISSING_RECEIPTS_TABS);
+const COMPLETED_SUB_TABS = ['all', 'ai_accountant', 'manual'];
+export const toCompletedSubTab = (v) => stringToUnion(v.trim().toLowerCase(), COMPLETED_SUB_TABS);
+const MATCH_SOURCES = ['ai', 'manual'];
+export const toMatchSource = (v) => stringToUnion(v.trim().toLowerCase(), MATCH_SOURCES);
+const BULK_UPLOAD_SORT_KEYS = [
+    'amount',
+    'category',
+    'class',
+    'date',
+    'vendor',
+];
+export const toBulkUploadSortKey = (v) => stringToUnion(v.trim().toLowerCase(), BULK_UPLOAD_SORT_KEYS);

package/lib/esm/view/expenseAutomationView/types/transactionsViewState.js

@@ -4,10 +4,11 @@ const TRANSACTIONS_SORT_KEYS = [
     'vendor',
     'amount',
     'transaction_type',
+    'payment_account',
     'date',
     'category',
     'class',
-    'memo',
+    'memo_and_receipt',
 ];
 export const toTransactionsSortKey = (v) => stringToUnion(v, TRANSACTIONS_SORT_KEYS);
 export const TRANSACTIONS_TABS = ['review', 'autoCategorized'];

package/lib/esm/view/financeStatement/financeStatementReducer.js

@@ -44,19 +44,20 @@ const financeStatement = createSlice({
         updateFinanceStatementThisPeriod(draft, action) {
             const { firstMonthOfFY, coaBalances, maxNumOfPeriodsToHighlight } = action.payload;
             const { timeframe, selectedCOABalancesRange } = draft;
-            if (coaBalances.length > 0) {
-                const prevThisPeriod = extractThisPeriod(action.payload.firstMonthOfFY, timeframe, selectedCOABalancesRange, coaBalances);
+            const safeCoaBalances = coaBalances != null ? coaBalances : [];
+            if (safeCoaBalances.length > 0) {
+                const prevThisPeriod = extractThisPeriod(action.payload.firstMonthOfFY, timeframe, selectedCOABalancesRange, safeCoaBalances);
                 if (prevThisPeriod != null) {
                     const selectedCoaBalancesRangeWithThisPeriod = {
                         ...selectedCOABalancesRange,
                         thisPeriod: prevThisPeriod,
                     };
-                    const newThisPeriod = getMatchingThisPeriod(action.payload.firstMonthOfFY, timeframe, action.payload.thisPeriod, coaBalances);
+                    const newThisPeriod = getMatchingThisPeriod(action.payload.firstMonthOfFY, timeframe, action.payload.thisPeriod, safeCoaBalances);
                     if (newThisPeriod != null) {
                         const selectionRanges = getSelectedAndHighlightedRangesForThisPeriod({
                             firstMonthOfFY,
                             thisPeriod: newThisPeriod,
-                            coaBalances,
+                            coaBalances: safeCoaBalances,
                             timeframe,
                             maxNumOfPeriodsToSelect: maxNumOfPeriodsToHighlight,
                             currentSelection: {
@@ -75,7 +76,9 @@ const financeStatement = createSlice({
             draft.selectedReportId = action.payload;
         },
         updateFinanceStatementAdditionalBalancesSelection(draft, action) {
-            const { firstMonthOfFY, additionalBalances, coaBalances, maxNumOfPeriodsToHighlight, } = action.payload;
+            const { firstMonthOfFY, additionalBalances: additionalBalancesPayload, coaBalances, maxNumOfPeriodsToHighlight, } = action.payload;
+            const safeCoaBalances = coaBalances != null ? coaBalances : [];
+            const additionalBalances = additionalBalancesPayload ?? [];
             let tempAdditionalBalances = [...additionalBalances];
             if (additionalBalances.includes('this_period_vs_last_period') ||
                 additionalBalances.includes('this_period_vs_last_period_percent')) {
@@ -91,8 +94,8 @@ const financeStatement = createSlice({
             draft.isAdditionalBalancesShown =
                 additionalBalances.length != 0 ? true : false;
             const { timeframe, selectedCOABalancesRange } = draft;
-            if (coaBalances.length > 0) {
-                const thisPeriod = extractThisPeriod(action.payload.firstMonthOfFY, timeframe, selectedCOABalancesRange, coaBalances);
+            if (safeCoaBalances.length > 0) {
+                const thisPeriod = extractThisPeriod(action.payload.firstMonthOfFY, timeframe, selectedCOABalancesRange, safeCoaBalances);
                 if (thisPeriod != null) {
                     const selectedCoaBalancesRangeWithThisPeriod = {
                         ...selectedCOABalancesRange,
@@ -101,7 +104,7 @@ const financeStatement = createSlice({
                     const selectionRanges = getSelectedAndHighlightedRangesForThisPeriod({
                         firstMonthOfFY,
                         thisPeriod: thisPeriod,
-                        coaBalances,
+                        coaBalances: safeCoaBalances,
                         timeframe,
                         maxNumOfPeriodsToHighlight: maxNumOfPeriodsToHighlight,
                         currentSelection: {

package/lib/esm/view/financeStatement/financeStatementSelector.js

@@ -1,4 +1,5 @@
 import { createSelector } from '@reduxjs/toolkit';
+import { stripCompareAdditionalBalanceTypes } from '../../commonStateTypes/coaBalance/coaBalanceType';
 import { newBalancesFilter, newBalancesFilterForDateRange, } from '../../commonStateTypes/coaBalance/coaBalancesFilter';
 import { newBalancesFilterClassesView } from '../../commonStateTypes/coaBalance/coaBalancesFilterClassesView';
 import { getNumberOfPeriods, } from '../../commonStateTypes/dataAvailable';
@@ -8,6 +9,7 @@ import { extractThisPeriod } from '../../commonStateTypes/viewAndReport/thisPeri
 import { getBalanceSheet } from '../balanceSheet/balanceSheetSelector';
 import { getCashFlow } from '../cashFlow/cashFlowSelector';
 import { getProfitAndLossReport, } from '../profitAndLoss/profitAndLossSelector';
+import { getProfitAndLossClassesHorizontalView } from '../profitAndLossClassesView/profitAndLossClassesByClassHorizontalSelector';
 import { getProfitAndLossClassesView } from '../profitAndLossClassesView/profitAndLossClassesViewSelector';
 function getDateRangeForFinanceReports(profitAndLossState, balanceSheetState, cashFlowState) {
     const datesSorted = [
@@ -42,11 +44,11 @@ export const getFinanceStatement = createSelector((state) => state.accountState,
     if (dataAvailable != null) {
         const noFilter = newBalancesFilterForDateRange(firstMonthOfFY, financeStatementState.timeframe, dataAvailable, 'ascending_date', []);
         const profitAndLossForTimeframeTicks = getProfitAndLossReport(noFilter, undefined, accountState, accountGroupState, sectionAccountsViewState, profitAndLossState, forecastState);
-        if (profitAndLossForTimeframeTicks.sections.expenses != null) {
-            balancesInTimeframe =
-                profitAndLossForTimeframeTicks.sections.expenses.balances.length > 0
-                    ? profitAndLossForTimeframeTicks.sections['expenses'].balances
-                    : profitAndLossForTimeframeTicks.sections['income'].balances;
+        const expensesBalances = profitAndLossForTimeframeTicks.sections.expenses?.balances ?? [];
+        const incomeBalances = profitAndLossForTimeframeTicks.sections.income?.balances ?? [];
+        balancesInTimeframe =
+            expensesBalances.length > 0 ? expensesBalances : incomeBalances;
+        if (balancesInTimeframe.length > 0) {
             allTimeframeTicks = balancesInTimeframe.map((balance) => toTimeframeTick(balance));
         }
     }
@@ -54,12 +56,22 @@ export const getFinanceStatement = createSelector((state) => state.accountState,
     if (thisPeriod == null && balancesInTimeframe.length > 0) {
         thisPeriod = toTimeframeTick(balancesInTimeframe[balancesInTimeframe.length - 1]);
     }
-    const filter = newBalancesFilter(firstMonthOfFY, financeStatementState.timeframe, Math.min(getNumberOfPeriods(firstMonthOfFY, financeStatementState.timeframe, dataAvailable) ?? financeStatementState.selectedCOABalancesRange.numberOfPeriods, financeStatementState.selectedCOABalancesRange.numberOfPeriods), thisPeriod, 'ascending_date', financeStatementState.isAdditionalBalancesShown === true
+    const rawAdditionalBalances = financeStatementState.isAdditionalBalancesShown === true
         ? financeStatementState.selectedAdditionalBalances
-        : []);
+        : [];
+    const useHorizontalClassesLayout = profitAndLossClassesViewState.uiState.classViewLayout ===
+        'horizontal' &&
+        financeStatementState.selectedReportId === 'profit_and_loss_by_classes';
+    const additionalBalancesForFilter = useHorizontalClassesLayout
+        ? stripCompareAdditionalBalanceTypes(rawAdditionalBalances)
+        : rawAdditionalBalances;
+    const filter = newBalancesFilter(firstMonthOfFY, financeStatementState.timeframe, Math.min(getNumberOfPeriods(firstMonthOfFY, financeStatementState.timeframe, dataAvailable) ?? financeStatementState.selectedCOABalancesRange.numberOfPeriods, financeStatementState.selectedCOABalancesRange.numberOfPeriods), thisPeriod, 'ascending_date', additionalBalancesForFilter);
     const profitAndLossReport = getProfitAndLossReport(filter, undefined, accountState, accountGroupState, sectionAccountsViewState, profitAndLossState, forecastState);
     const classFilter = newBalancesFilterClassesView(filter.firstMonthOfFY, filter.timeframe, filter.balancesRange.numberOfPeriods, filter.balancesRange.thisPeriod, filter.balancesRange.orderBy, filter.additionalBalances, profitAndLossClassesViewState.uiState.classesToFilterOut);
     const profitAndLossByClassReport = getProfitAndLossClassesView(classFilter, accountState, classState, sectionsState, profitAndLossClassesViewState);
+    const profitAndLossByClassHorizontalReport = getProfitAndLossClassesHorizontalView(classFilter, accountState, classState, sectionsState, profitAndLossClassesViewState, profitAndLossClassesViewState.uiState.classViewLayout === 'horizontal'
+        ? thisPeriod
+        : undefined);
     const balanceSheetReport = getBalanceSheet(filter, accountState, accountGroupState, sectionAccountsViewState, balanceSheetState);
     const cashFlowReport = getCashFlow(filter, accountState, accountGroupState, sectionAccountsViewState, cashFlowState);
     const allReports = [
@@ -107,12 +119,15 @@ export const getFinanceStatement = createSelector((state) => state.accountState,
         dataAvailable,
         profitAndLossReport,
         profitAndLossByClassReport,
+        profitAndLossByClassHorizontalReport,
         balanceSheetReport,
         cashFlowReport,
         filter,
         selectedReportId: financeStatementState.selectedReportId,
         downloadState: financeStatementState.downloadState,
-        isCompareModeOn: financeStatementState.selectedAdditionalBalances.includes('this_period_vs_last_period') ||
-            financeStatementState.selectedAdditionalBalances.includes('this_period_vs_last_period_percent'),
+        isCompareModeOn: useHorizontalClassesLayout
+            ? false
+            : financeStatementState.selectedAdditionalBalances.includes('this_period_vs_last_period') ||
+                financeStatementState.selectedAdditionalBalances.includes('this_period_vs_last_period_percent'),
     };
 });

package/lib/esm/view/profitAndLossClassesView/horizontalSectionEmptyBalancesSlice.js

@@ -0,0 +1,17 @@
+/**
+ * Empty `COABalancesSlice` for horizontal P&L-by-class section / calculated headers when
+ * enrichment has not produced balances yet, or for UI mapping fallbacks.
+ * Structure matches {@link enrichProfitAndLossByClassHorizontalReport} output.
+ */
+export function getEmptyHorizontalSectionBalancesSlice(firstMonthOfFY, timeframe = 'month') {
+    return {
+        balances: [],
+        additionalBalances: [],
+        filter: {
+            firstMonthOfFY,
+            timeframe,
+            balancesRange: { numberOfPeriods: 0, orderBy: 'ascending_date' },
+            additionalBalances: [],
+        },
+    };
+}