@zeniai/client-epic-state 4.19.90-beta1AD → 4.19.90-beta2ND

package/lib/esm/view/aiCfoView/aiCfoViewReducer.js

@@ -1,19 +1,4 @@
 import { createSlice } from '@reduxjs/toolkit';
-function removeSessionIdFromPageKeyMap(draft, sessionId) {
-    const map = draft.uiState.chatSessionIdByPageKey;
-    for (const key of Object.keys(map)) {
-        if (map[key] === sessionId) {
-            delete map[key];
-        }
-    }
-}
-function mirrorCurrentSessionToPageKeyMapIfActive(draft) {
-    const key = draft.uiState.aiCfoSidePanelHostPageKey;
-    const sessionId = draft.uiState.currentChatSessionId;
-    if (key != null && sessionId != null) {
-        draft.uiState.chatSessionIdByPageKey[key] = sessionId;
-    }
-}
 export const initialAiCfoViewState = {
     fetchState: 'Not-Started',
     error: undefined,
@@ -21,8 +6,6 @@ export const initialAiCfoViewState = {
         currentInput: '',
         scrollPositionByChatSessionId: {},
         currentChatSessionId: undefined,
-        aiCfoSidePanelHostPageKey: undefined,
-        chatSessionIdByPageKey: {},
         agentId: undefined,
         chatHistoryNextPageToken: {},
         chatSessionsNextPageToken: { nextPageToken: null, hasMore: false },
@@ -46,7 +29,6 @@ export const initialAiCfoViewState = {
     fetchChatSessionHistoryByChatSessionId: {},
     responseStateByChatSessionId: {},
     stopSubmitStateByChatSessionId: {},
-    suggestedQuestionsByPageContext: {},
 };
 const aiCfoView = createSlice({
     name: 'aiCfoView',
@@ -180,7 +162,6 @@ const aiCfoView = createSlice({
         setSession(draft, action) {
             draft.uiState.currentChatSessionId = action.payload.sessionId;
             draft.uiState.agentId = action.payload.agentId;
-            mirrorCurrentSessionToPageKeyMapIfActive(draft);
         },
         createSession: {
             reducer(draft, action) {
@@ -204,7 +185,6 @@ const aiCfoView = createSlice({
                 nextPageToken: null,
                 hasMore: false,
             };
-            mirrorCurrentSessionToPageKeyMapIfActive(draft);
         },
         createSessionFailure(draft, action) {
             draft.createSessionState.fetchState = 'Error';
@@ -242,7 +222,6 @@ const aiCfoView = createSlice({
                 nextPageToken: null,
                 hasMore: false,
             };
-            mirrorCurrentSessionToPageKeyMapIfActive(draft);
         },
         createSessionAndSubmitSuccess(draft) {
             // Note: currentChatSessionId, agentId, and chatHistoryNextPageToken are set by initializeNewSessionState
@@ -359,7 +338,6 @@ const aiCfoView = createSlice({
                 draft.uiState.currentChatSessionId = undefined;
                 draft.uiState.agentId = undefined;
             }
-            removeSessionIdFromPageKeyMap(draft, chatSessionId);
             delete draft.uiState.chatHistoryNextPageToken[chatSessionId];
             delete draft.uiState.scrollPositionByChatSessionId[chatSessionId];
             delete draft.fetchChatSessionHistoryByChatSessionId[chatSessionId];
@@ -382,65 +360,6 @@ const aiCfoView = createSlice({
         },
         clearCurrentSessionId(draft) {
             draft.uiState.currentChatSessionId = undefined;
-            const key = draft.uiState.aiCfoSidePanelHostPageKey;
-            if (key != null) {
-                delete draft.uiState.chatSessionIdByPageKey[key];
-            }
-        },
-        applyAiCfoSidePanelHostPageTransition(draft, action) {
-            const { newAiCfoSidePanelHostPageKey, nextCurrentChatSessionId } = action.payload;
-            const prevKey = draft.uiState.aiCfoSidePanelHostPageKey;
-            const curId = draft.uiState.currentChatSessionId;
-            if (prevKey != null &&
-                prevKey !== newAiCfoSidePanelHostPageKey &&
-                curId != null) {
-                draft.uiState.chatSessionIdByPageKey[prevKey] = curId;
-            }
-            draft.uiState.aiCfoSidePanelHostPageKey = newAiCfoSidePanelHostPageKey;
-            draft.uiState.currentChatSessionId =
-                nextCurrentChatSessionId != null ? nextCurrentChatSessionId : undefined;
-            draft.uiState.currentInput = '';
-            mirrorCurrentSessionToPageKeyMapIfActive(draft);
-        },
-        clearAiCfoSidePanelHostPageContext(draft) {
-            const key = draft.uiState.aiCfoSidePanelHostPageKey;
-            const curId = draft.uiState.currentChatSessionId;
-            if (key != null && curId != null) {
-                draft.uiState.chatSessionIdByPageKey[key] = curId;
-            }
-            draft.uiState.aiCfoSidePanelHostPageKey = undefined;
-        },
-        fetchSuggestedQuestions(draft, action) {
-            const { pageContext } = action.payload;
-            const prev = draft.suggestedQuestionsByPageContext[pageContext];
-            draft.suggestedQuestionsByPageContext[pageContext] = {
-                fetchState: 'In-Progress',
-                pageContext,
-                suggestedQuestions: prev?.suggestedQuestions ?? [],
-                generatedAt: prev?.generatedAt,
-                error: undefined,
-            };
-        },
-        fetchSuggestedQuestionsSuccess(draft, action) {
-            const { pageContext, generatedAt, suggestedQuestions } = action.payload;
-            draft.suggestedQuestionsByPageContext[pageContext] = {
-                fetchState: 'Completed',
-                pageContext,
-                generatedAt,
-                suggestedQuestions,
-                error: undefined,
-            };
-        },
-        fetchSuggestedQuestionsFailure(draft, action) {
-            const { pageContext, error } = action.payload;
-            const prev = draft.suggestedQuestionsByPageContext[pageContext];
-            draft.suggestedQuestionsByPageContext[pageContext] = {
-                fetchState: 'Error',
-                pageContext,
-                suggestedQuestions: prev?.suggestedQuestions ?? [],
-                generatedAt: prev?.generatedAt,
-                error,
-            };
         },
         clearAiCfoView(draft) {
             Object.assign(draft, initialAiCfoViewState);
@@ -452,5 +371,5 @@ const aiCfoView = createSlice({
         },
     },
 });
-export const { submitQuestion, submitQuestionSuccess, submitQuestionFailure, updateResponseState, updateAiCfoViewScrollPosition, updateCurrentInput, clearInput, setSession, createSession, createSessionSuccess, createSessionFailure, createSessionAndSubmit, initializeNewSessionState, createSessionAndSubmitSuccess, createSessionAndSubmitFailure, fetchChatSessionsForUser, fetchChatSessionsForUserSuccess, fetchChatSessionsForUserFailure, fetchChatHistory, fetchChatHistorySuccess, fetchChatHistoryFailure, clearCurrentSessionId, clearLastContextMessage, stopSubmit, stopSubmitSuccess, stopSubmitFailure, stopSubmitQuestion, stopSubmitQuestionSuccess, stopSubmitQuestionFailure, acceptMasterTOS, acceptMasterTOSSuccess, acceptMasterTOSFailure, deleteChatSession, deleteChatSessionSuccess, deleteChatSessionFailure, clearDeleteChatSessionStatus, clearAiCfoView, updateCotCollapsedState, fetchSuggestedQuestions, fetchSuggestedQuestionsSuccess, fetchSuggestedQuestionsFailure, applyAiCfoSidePanelHostPageTransition, clearAiCfoSidePanelHostPageContext, } = aiCfoView.actions;
+export const { submitQuestion, submitQuestionSuccess, submitQuestionFailure, updateResponseState, updateAiCfoViewScrollPosition, updateCurrentInput, clearInput, setSession, createSession, createSessionSuccess, createSessionFailure, createSessionAndSubmit, initializeNewSessionState, createSessionAndSubmitSuccess, createSessionAndSubmitFailure, fetchChatSessionsForUser, fetchChatSessionsForUserSuccess, fetchChatSessionsForUserFailure, fetchChatHistory, fetchChatHistorySuccess, fetchChatHistoryFailure, clearCurrentSessionId, clearLastContextMessage, stopSubmit, stopSubmitSuccess, stopSubmitFailure, stopSubmitQuestion, stopSubmitQuestionSuccess, stopSubmitQuestionFailure, acceptMasterTOS, acceptMasterTOSSuccess, acceptMasterTOSFailure, deleteChatSession, deleteChatSessionSuccess, deleteChatSessionFailure, clearDeleteChatSessionStatus, clearAiCfoView, updateCotCollapsedState, } = aiCfoView.actions;
 export default aiCfoView.reducer;

package/lib/esm/view/aiCfoView/aiCfoViewSelector.js

@@ -1,8 +1,6 @@
-import { initialAiCfoState } from '../../entity/aiCfo/aiCfoReducer';
 import { getAiCfoSelectorView, } from '../../entity/aiCfo/aiCfoSelector';
-import { initialAiCfoViewState } from './aiCfoViewReducer';
 export const getAiCfoView = (state) => {
-    const { fetchState, error, uiState, createSessionState, createSessionAndSubmitState, deleteChatSessionStateByChatSessionId, stopSubmitStateByChatSessionId, responseStateByChatSessionId, fetchChatSessionHistoryByChatSessionId, masterTOSAcceptanceState, suggestedQuestionsByPageContext, } = state.aiCfoViewState ?? initialAiCfoViewState;
+    const { fetchState, error, uiState, createSessionState, createSessionAndSubmitState, deleteChatSessionStateByChatSessionId, stopSubmitStateByChatSessionId, responseStateByChatSessionId, fetchChatSessionHistoryByChatSessionId, masterTOSAcceptanceState, } = state.aiCfoViewState;
     return {
         fetchState,
         error,
@@ -14,11 +12,7 @@ export const getAiCfoView = (state) => {
         uiState,
         fetchChatSessionHistoryByChatSessionId,
         masterTOSAcceptanceState,
-        suggestedQuestionsByPageContext,
-        ...getAiCfoSelectorView(state.aiCfoState ?? initialAiCfoState),
+        ...getAiCfoSelectorView(state.aiCfoState),
         version: 1,
     };
 };
-export function getSuggestedQuestionsForPageContext(state, pageContext) {
-    return state.aiCfoViewState?.suggestedQuestionsByPageContext?.[pageContext];
-}

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 ?? [];
+            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 ?? [];
+            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

@@ -8,6 +8,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 +43,15 @@ 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) {
+        const expensesSection = profitAndLossForTimeframeTicks.sections.expenses;
+        const incomeSection = profitAndLossForTimeframeTicks.sections.income;
+        const expensesBalances = expensesSection?.balances;
+        const incomeBalances = incomeSection?.balances;
+        if (expensesSection != null) {
             balancesInTimeframe =
-                profitAndLossForTimeframeTicks.sections.expenses.balances.length > 0
-                    ? profitAndLossForTimeframeTicks.sections['expenses'].balances
-                    : profitAndLossForTimeframeTicks.sections['income'].balances;
+                (expensesBalances?.length ?? 0) > 0
+                    ? expensesBalances ?? []
+                    : incomeBalances ?? [];
             allTimeframeTicks = balancesInTimeframe.map((balance) => toTimeframeTick(balance));
         }
     }
@@ -60,6 +65,9 @@ export const getFinanceStatement = createSelector((state) => state.accountState,
     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 = profitAndLossClassesViewState.uiState.classViewLayout === 'horizontal'
+        ? getProfitAndLossClassesHorizontalView(classFilter, accountState, classState, sectionsState, profitAndLossClassesViewState, thisPeriod)
+        : getProfitAndLossClassesHorizontalView(classFilter, accountState, classState, sectionsState, profitAndLossClassesViewState, undefined);
     const balanceSheetReport = getBalanceSheet(filter, accountState, accountGroupState, sectionAccountsViewState, balanceSheetState);
     const cashFlowReport = getCashFlow(filter, accountState, accountGroupState, sectionAccountsViewState, cashFlowState);
     const allReports = [
@@ -107,6 +115,7 @@ export const getFinanceStatement = createSelector((state) => state.accountState,
         dataAvailable,
         profitAndLossReport,
         profitAndLossByClassReport,
+        profitAndLossByClassHorizontalReport,
         balanceSheetReport,
         cashFlowReport,
         filter,

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

@@ -0,0 +1,281 @@
+import { toAmountWC } from '../../commonStateTypes/amount';
+import { getSectionClassesViewReport } from '../../entity/sectionClassesViewV2/sectionClassesViewSelector';
+import { ALL_PANDL_REPORT_VIEW_SECTION_IDS, } from './profitAndLossClassesViewSelectorTypes';
+const DEFAULT_CURRENCY = { currencyCode: 'USD', currencySymbol: '$' };
+export const profitAndLossHorizontalIdsInOrder = [
+    'income',
+    'cogs',
+    'grossProfit',
+    'expenses',
+    'earningsBeforeInterestAndTax',
+    'otherIncome',
+    'otherExpenses',
+    'netOtherIncome',
+    'netIncome',
+];
+const SECTION_TITLES = {
+    income: 'Income',
+    cogs: 'Cost of Goods Sold',
+    grossProfit: 'Gross Profit',
+    expenses: 'Expenses',
+    earningsBeforeInterestAndTax: 'Net Operating Income',
+    otherIncome: 'Other Income',
+    otherExpenses: 'Other Expenses',
+    netOtherIncome: 'Net Other Income',
+    netIncome: 'Net Income',
+};
+export const getProfitAndLossClassesHorizontalView = (filter, accountState, classState, sectionsState, profitAndLossClassesViewState, selectedPeriod) => {
+    const fetchState = reduceFetchState([
+        profitAndLossClassesViewState.fetchState.month,
+        profitAndLossClassesViewState.fetchState.quarter,
+        profitAndLossClassesViewState.fetchState.year,
+    ]);
+    const reportId = 'profit_and_loss_by_classes';
+    // Build class columns from the class hierarchy (top-level only)
+    const classColumns = buildClassColumns(profitAndLossClassesViewState.classHierarchy, profitAndLossClassesViewState.uiState.classesToFilterOut);
+    const sections = {};
+    const calculatedSections = {};
+    if (fetchState.fetchState === 'Completed' && selectedPeriod != null) {
+        // Get section reports using existing selector infrastructure
+        const sectionReports = {};
+        ALL_PANDL_REPORT_VIEW_SECTION_IDS.forEach((sectionId) => {
+            sectionReports[sectionId] = getSectionClassesViewReport(accountState, classState, sectionsState, { reportId, sectionId }, filter);
+        });
+        // Pivot each section from class→account to account→class
+        const sectionIds = [
+            'income',
+            'cogs',
+            'expenses',
+            'otherIncome',
+            'otherExpenses',
+        ];
+        sectionIds.forEach((sectionId) => {
+            const sectionReport = sectionReports[sectionId];
+            if (sectionReport != null) {
+                sections[sectionId] = pivotSectionToHorizontal(sectionReport, classColumns, SECTION_TITLES[sectionId] ?? sectionId);
+            }
+        });
+        // Calculate derived sections
+        const incomeSection = sections['income'];
+        const cogsSection = sections['cogs'];
+        const expensesSection = sections['expenses'];
+        const otherIncomeSection = sections['otherIncome'];
+        const otherExpensesSection = sections['otherExpenses'];
+        // Gross Profit = Income - COGS
+        if (incomeSection != null && cogsSection != null) {
+            calculatedSections['grossProfit'] = computeCalculatedSection(incomeSection.classTotals, cogsSection.classTotals, incomeSection.sectionTotal, cogsSection.sectionTotal, 'subtract', SECTION_TITLES['grossProfit']);
+        }
+        // EBIT = Gross Profit - Expenses
+        const grossProfit = calculatedSections['grossProfit'];
+        if (grossProfit != null && expensesSection != null) {
+            calculatedSections['earningsBeforeInterestAndTax'] =
+                computeCalculatedSection(grossProfit.classTotals, expensesSection.classTotals, grossProfit.sectionTotal, expensesSection.sectionTotal, 'subtract', SECTION_TITLES['earningsBeforeInterestAndTax']);
+        }
+        // Net Other Income = Other Income - Other Expenses
+        if (otherIncomeSection != null && otherExpensesSection != null) {
+            calculatedSections['netOtherIncome'] = computeCalculatedSection(otherIncomeSection.classTotals, otherExpensesSection.classTotals, otherIncomeSection.sectionTotal, otherExpensesSection.sectionTotal, 'subtract', SECTION_TITLES['netOtherIncome']);
+        }
+        // Net Income = EBIT + Net Other Income
+        const ebit = calculatedSections['earningsBeforeInterestAndTax'];
+        const netOtherIncome = calculatedSections['netOtherIncome'];
+        if (ebit != null && netOtherIncome != null) {
+            calculatedSections['netIncome'] = computeCalculatedSection(ebit.classTotals, netOtherIncome.classTotals, ebit.sectionTotal, netOtherIncome.sectionTotal, 'add', SECTION_TITLES['netIncome']);
+        }
+    }
+    // Build synthetic header COABalances for rendering class names as column headers
+    const headerBalances = buildHeaderBalances(classColumns, filter.timeframe, selectedPeriod);
+    return {
+        reportId,
+        reportTitle: 'Profit and Loss by Class',
+        firstMonthOfFY: profitAndLossClassesViewState.firstMonthOfFY,
+        fetchState: fetchState.fetchState,
+        bookCloseDate: profitAndLossClassesViewState.bookCloseDate,
+        dataAvailable: profitAndLossClassesViewState.dataAvailable,
+        selectedPeriod,
+        classColumns,
+        sections,
+        calculatedSections,
+        idsInOrder: profitAndLossHorizontalIdsInOrder,
+        uiState: profitAndLossClassesViewState.uiState,
+        headerBalances,
+    };
+};
+/**
+ * Build column definitions from class hierarchy (top-level classes only).
+ */
+function buildClassColumns(classHierarchy, classesToFilterOut) {
+    return classHierarchy
+        .filter((c) => !classesToFilterOut.some((filteredId) => filteredId[0] === c.classId[0]))
+        .map((c) => ({
+        classId: c.classId[0],
+        className: c.className,
+        nestedClassId: c.classId,
+        qboId: c.qboId,
+    }));
+}
+/**
+ * Pivot a section from class→account→balances to account→class→balance (single period).
+ */
+function pivotSectionToHorizontal(section, classColumns, title) {
+    // Map: accountId -> { accountName, classId -> balance }
+    const accountMap = new Map();
+    // Also track class totals
+    const classTotalMap = new Map();
+    classColumns.forEach((col) => classTotalMap.set(col.classId, 0));
+    // Iterate over each class in the section
+    section.classes.forEach((classReport) => {
+        const classId = classReport.id[0];
+        // Only process classes that are in our columns
+        if (!classColumns.some((col) => col.classId === classId)) {
+            return;
+        }
+        // Sum all sliced period balances (same slice as vertical columns; multi-period = range total)
+        const classBalance = sumBalancesInSlice(classReport.childrenBalancesTotal.balances);
+        classTotalMap.set(classId, classBalance);
+        // Iterate through accounts in this class
+        collectAccountsFromClass(classReport, classId, accountMap);
+    });
+    // Build account rows
+    const accounts = [];
+    accountMap.forEach((accountData, accountId) => {
+        const classBalances = classColumns.map((col) => ({
+            classId: col.classId,
+            balance: toAmountWC(accountData.classBalances.get(col.classId) ?? 0, DEFAULT_CURRENCY),
+        }));
+        const rowTotal = classBalances.reduce((sum, cb) => sum + cb.balance.amount, 0);
+        accounts.push({
+            accountId,
+            accountName: accountData.accountName,
+            classBalances,
+            rowTotal: toAmountWC(rowTotal, DEFAULT_CURRENCY),
+        });
+    });
+    // Build class totals
+    const classTotals = classColumns.map((col) => ({
+        classId: col.classId,
+        balance: toAmountWC(classTotalMap.get(col.classId) ?? 0, DEFAULT_CURRENCY),
+    }));
+    const sectionTotal = classTotals.reduce((sum, ct) => sum + ct.balance.amount, 0);
+    return {
+        title,
+        accounts,
+        classTotals,
+        sectionTotal: toAmountWC(sectionTotal, DEFAULT_CURRENCY),
+    };
+}
+/**
+ * Recursively collect account balances from a NestedClassReportV2 into accountMap.
+ */
+function collectAccountsFromClass(classReport, classId, accountMap) {
+    // Process accounts directly on this class
+    classReport.class.accounts.forEach((nestedAccount) => {
+        collectAccountsFromNestedAccount(nestedAccount, classId, accountMap);
+    });
+}
+/**
+ * Recursively collect accounts from NestedAccountReport (handles sub-accounts).
+ */
+function collectAccountsFromNestedAccount(nestedAccount, classId, accountMap) {
+    const accountId = nestedAccount.account.accountId;
+    const accountName = nestedAccount.account.accountName;
+    const balance = sumBalancesInSlice(nestedAccount.account.balancesInTimeframe.balances);
+    if (!accountMap.has(accountId)) {
+        accountMap.set(accountId, {
+            accountName,
+            classBalances: new Map(),
+        });
+    }
+    const accountData = accountMap.get(accountId);
+    if (accountData == null) {
+        return;
+    }
+    const existing = accountData.classBalances.get(classId) ?? 0;
+    accountData.classBalances.set(classId, existing + balance);
+    // Process sub-accounts
+    nestedAccount.children.forEach((child) => {
+        collectAccountsFromNestedAccount(child, classId, accountMap);
+    });
+}
+/**
+ * Total amount for the current report slice. `balances` is already narrowed by
+ * `getCOABalances` / `sliceCOABalances` to the selected range; summing matches
+ * multi-period selections and avoids mismatches when `thisPeriod` does not
+ * align with a row (e.g. slice fallback) or when several period rows are shown.
+ */
+function sumBalancesInSlice(balances) {
+    let sum = 0;
+    for (const bal of balances) {
+        const b = bal;
+        sum += b.balance?.amount ?? 0;
+    }
+    return sum;
+}
+/**
+ * Compute a calculated section by adding or subtracting two sets of class totals.
+ */
+function computeCalculatedSection(aTotals, bTotals, aTotal, bTotal, operation, title) {
+    const classTotals = aTotals.map((a) => {
+        const bMatch = bTotals.find((b) => b.classId === a.classId);
+        const bAmount = bMatch?.balance.amount ?? 0;
+        const resultAmount = operation === 'add'
+            ? a.balance.amount + bAmount
+            : a.balance.amount - bAmount;
+        return {
+            classId: a.classId,
+            balance: toAmountWC(resultAmount, DEFAULT_CURRENCY),
+        };
+    });
+    const sectionTotalAmount = operation === 'add'
+        ? aTotal.amount + bTotal.amount
+        : aTotal.amount - bTotal.amount;
+    return {
+        title,
+        classTotals,
+        sectionTotal: toAmountWC(sectionTotalAmount, DEFAULT_CURRENCY),
+    };
+}
+/**
+ * Build synthetic COABalance array for header rendering.
+ * One entry per class column + one for "Total".
+ */
+function buildHeaderBalances(classColumns, timeframe, selectedPeriod) {
+    if (selectedPeriod == null) {
+        return [];
+    }
+    const { endDate, startDate } = selectedPeriod;
+    const balances = classColumns.map((col) => ({
+        balance: toAmountWC(0, DEFAULT_CURRENCY),
+        balanceTimeFrame: timeframe,
+        endDate,
+        startDate,
+        type: 'default',
+        label: col.className,
+    }));
+    // Add a "Total" column
+    balances.push({
+        balance: toAmountWC(0, DEFAULT_CURRENCY),
+        balanceTimeFrame: timeframe,
+        endDate,
+        startDate,
+        type: 'default',
+        label: 'Total',
+    });
+    return balances;
+}
+function reduceFetchState(fetchStateList) {
+    const isAnyProgress = fetchStateList.some((s) => s.fetchState === 'In-Progress');
+    const isAllCompleted = fetchStateList.every((s) => s.fetchState === 'Completed');
+    const isAnyError = fetchStateList.some((s) => s.fetchState === 'Error');
+    const error = fetchStateList.find((s) => s.error != null)?.error;
+    let fetchState = 'Not-Started';
+    if (isAnyProgress) {
+        fetchState = 'In-Progress';
+    }
+    else if (isAllCompleted) {
+        fetchState = 'Completed';
+    }
+    else if (isAnyError) {
+        fetchState = 'Error';
+    }
+    return { fetchState, error };
+}

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

@@ -0,0 +1 @@
+export {};

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

@@ -23,6 +23,7 @@ export const initialState = {
         nodeCollapseState: {},
         scrollPosition: undefined,
         accountViewMode: 'account_group',
+        classViewLayout: 'vertical',
         classesToFilterOut: [],
     },
     firstMonthOfFY: 1,
@@ -94,6 +95,9 @@ const profitAndLossClassesView = createSlice({
         updateAccountViewMode(draft, action) {
             draft.uiState.accountViewMode = action.payload.viewMode;
         },
+        updateClassViewLayout(draft, action) {
+            draft.uiState.classViewLayout = action.payload.classViewLayout;
+        },
         resetProfitAndLossClassesNodeCollapseState(draft) {
             draft.uiState.nodeCollapseState = {};
         },
@@ -102,7 +106,7 @@ const profitAndLossClassesView = createSlice({
         },
     },
 });
-export const { fetchProfitAndLossClassesView, fetchProfitAndLossForTimeframeClassesView, updateProfitAndLossForTimeframeClassesView, updateProfitAndLossForTimeframeClassesViewFailure, updateClassesToFilterOut, updateProfitAndLossClassesViewUIState, updateAccountViewMode, resetProfitAndLossClassesNodeCollapseState, clearProfitAndLossClassesView, } = profitAndLossClassesView.actions;
+export const { fetchProfitAndLossClassesView, fetchProfitAndLossForTimeframeClassesView, updateProfitAndLossForTimeframeClassesView, updateProfitAndLossForTimeframeClassesViewFailure, updateClassesToFilterOut, updateProfitAndLossClassesViewUIState, updateAccountViewMode, updateClassViewLayout, resetProfitAndLossClassesNodeCollapseState, clearProfitAndLossClassesView, } = profitAndLossClassesView.actions;
 export default profitAndLossClassesView.reducer;
 const doUpdatedProfitAndLossClassesView = (draft, timeframe, pandLReport) => {
     const report = mapReportPayloadV2ToReportV2(pandLReport.report);

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

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

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

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

package/lib/esm/view/spendManagement/chargeCards/chargeCardList/chargeCardList.js

@@ -75,7 +75,6 @@ const ALL_CHARGE_CARD_SORT_KEYS = [
     'cardName',
     'department',
     'cardType',
-    'accountType',
     'status',
     'utilisation',
     'limit',

package/lib/esm/view/spendManagement/chargeCards/chargeCardList/chargeCardListSelector.js

@@ -219,8 +219,6 @@ const getCardsBySortKey = (card, sortKey) => {
             return card.cardName.toLowerCase();
         case 'cardType':
             return card.type.code;
-        case 'accountType':
-            return card.type.code.includes('credit') ? 'credit' : 'debit';
         case 'status':
             return card.status.code;
         case 'utilisation':