@zeniai/client-epic-state 4.19.99-betaVR3 → 4.19.100

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

@@ -12,149 +12,7 @@ export interface MissingReceiptsViewUIState {
     sortKey: MissingReceiptsSortKey;
     sortOrder: SortOrder;
 }
-/**
- * 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 declare const MIN_MANUAL_TRANSACTION_SEARCH_LENGTH = 2;
-export declare const toBatchStatusValue: (v: string) => "pending" | "processing" | "completed";
-export type BatchStatusValue = ReturnType<typeof toBatchStatusValue>;
-/** Canonical batch file statuses (API ingress may use aliases; see `parseBatchFileStatus`). */
-export declare const BATCH_FILE_STATUSES: readonly ["exact_match", "possible_matches", "no_match", "failed"];
-export declare const toBatchFileStatus: (v: string) => "failed" | "exact_match" | "possible_matches" | "no_match";
-export type BatchFileStatus = ReturnType<typeof toBatchFileStatus>;
-/** True for files that belong in the Unmatched tab (possible matches or no match). */
-export declare function isUnmatchedTabFileStatus(status: BatchFileStatus): boolean;
-export declare const toBulkUploadPhase: (v: string) => "completed" | "idle" | "uploading" | "matching";
-export type BulkUploadPhase = ReturnType<typeof toBulkUploadPhase>;
-export declare const toBulkUploadResultsTab: (v: string) => "completed" | "unmatched";
-export type BulkUploadResultsTab = ReturnType<typeof toBulkUploadResultsTab>;
-export declare const toMissingReceiptsTab: (v: string) => "completed" | "unmatched" | "missing";
-export type MissingReceiptsTab = ReturnType<typeof toMissingReceiptsTab>;
-export declare const toCompletedSubTab: (v: string) => "all" | "manual" | "ai_accountant";
-export type CompletedSubTab = ReturnType<typeof toCompletedSubTab>;
-export declare const toMatchSource: (v: string) => "manual" | "ai";
-export type MatchSource = ReturnType<typeof toMatchSource>;
-export declare const toBulkUploadSortKey: (v: string) => "date" | "amount" | "vendor" | "category" | "class";
-export type BulkUploadSortKey = ReturnType<typeof toBulkUploadSortKey>;
-export interface CandidateRef {
-    matchScore: number;
-    transactionId: ID;
-}
-export interface MatchCandidate {
-    amount: number;
-    currencyCode: string;
-    matchScore: number;
-    transactionDate: string;
-    transactionId: ID;
-    transactionType: string;
-    vendorName: string;
-    vendorLogo?: string;
-}
-export interface BatchFile {
-    attachmentId: ID;
-    fileDownloadUrl: string | null;
-    fileId: ID;
-    filename: string;
-    filePreviewUrl: string | null;
-    status: BatchFileStatus;
-    candidates?: CandidateRef[];
-    matchedTransactionId?: ID;
-    matchSource?: MatchSource;
-}
-export interface BatchSummary {
-    failed: number;
-    matched: number;
-    noMatch: number;
-    possibleMatches: number;
-    total: number;
-}
-export interface BatchStatus {
-    batchId: ID;
-    progress: {
-        processed: number;
-        total: number;
-    };
-    status: BatchStatusValue;
-}
-export interface BatchDetails {
-    batchId: ID;
-    createdAt: string;
-    files: BatchFile[];
-    status: BatchStatusValue;
-    summary: BatchSummary;
-}
-export interface BatchListItem {
-    batchId: ID;
-    createdAt: string;
-    failedCount: number;
-    matchedCount: number;
-    noMatchCount: number;
-    possibleMatchesCount: number;
-    status: string;
-    totalFiles: number;
-}
-export interface ManualSearchResult {
-    amount: number;
-    currencyCode: string;
-    entityId: string;
-    memo: string;
-    transactionDate: string;
-    transactionId: ID;
-    transactionType: string;
-    vendorName: string;
-    /** Present when API/merged transaction state supplies a logo URL. */
-    vendorLogo?: string;
-}
-export interface ManualSearchState {
-    fetchState: FetchStateAndError;
-    /** True while appending the next page (initial search uses fetchState only). */
-    isLoadingMore: boolean;
-    nextPageToken: string | null;
-    pageSize: number;
-    results: ManualSearchResult[];
-    searchQuery: string;
-    totalCount: number;
-}
-/** Same union as {@link CompletedSubTab} — used for completed-transactions API `match_type`. */
-export type CompletedTransactionsMatchType = CompletedSubTab;
-export interface CompletedTransactionsState {
-    fetchState: FetchStateAndError;
-    nextPageToken: string | null;
-    totalCount: number;
-    transactionIds: ID[];
-}
-export interface BulkUploadState {
-    batchDetailsById: Record<ID, BatchDetails>;
-    batchDetailsPaginationState: FetchStateAndError;
-    batchListByPeriod: Record<MonthYearPeriodId, BatchListItem[]>;
-    batchListFetchState: FetchStateAndError;
-    batchStatusById: Record<ID, BatchStatus>;
-    completedSubTab: CompletedSubTab;
-    completedTransactionsByPeriod: Record<string, CompletedTransactionsState>;
-    confirmMatchStatus: FetchStateAndError;
-    currentResultsTab: BulkUploadResultsTab;
-    failedBatchDetailIds: ID[];
-    /**
-     * Incremented when manual search Redux state is cleared so Unmatched `ManualSearchInput`
-     * instances remount and drop local query text.
-     */
-    manualSearch: ManualSearchState;
-    manualSearchUiResetKey: number;
-    phase: BulkUploadPhase;
-    sortKey: BulkUploadSortKey;
-    sortOrder: SortOrder;
-    uploadProgress: number;
-    uploadStatus: FetchStateAndError;
-    currentBatchId?: ID;
-}
 export interface MissingReceiptsViewState extends FetchedState {
-    bulkUpload: BulkUploadState;
-    /**
-     * When set, the app shell should switch the Missing Receipts sub-tab (e.g. to Unmatched)
-     * once, then clear via `clearMissingReceiptsTabNavigation`.
-     */
-    pendingMissingReceiptsTabNavigation: BulkUploadResultsTab | null;
     refreshStatus: FetchStateAndError;
     transactionIdsBySelectedPeriod: Record<MonthYearPeriodId, ID[]>;
     uiState: MissingReceiptsViewUIState;

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

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.toBulkUploadSortKey = exports.toMatchSource = exports.toCompletedSubTab = exports.toMissingReceiptsTab = exports.toBulkUploadResultsTab = exports.toBulkUploadPhase = exports.toBatchFileStatus = exports.BATCH_FILE_STATUSES = exports.toBatchStatusValue = exports.MIN_MANUAL_TRANSACTION_SEARCH_LENGTH = exports.toMissingReceiptsSortKey = void 0;
-exports.isUnmatchedTabFileStatus = isUnmatchedTabFileStatus;
+exports.toMissingReceiptsSortKey = void 0;
 const stringToUnion_1 = require("../../../commonStateTypes/stringToUnion");
 const MISSING_RECEIPTS_SORT_KEYS = [
     'vendor',
@@ -12,55 +11,3 @@ const MISSING_RECEIPTS_SORT_KEYS = [
 ];
 const toMissingReceiptsSortKey = (v) => (0, stringToUnion_1.stringToUnion)(v, MISSING_RECEIPTS_SORT_KEYS);
 exports.toMissingReceiptsSortKey = toMissingReceiptsSortKey;
-// -- 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).
- */
-exports.MIN_MANUAL_TRANSACTION_SEARCH_LENGTH = 2;
-const BATCH_STATUS_VALUES = ['pending', 'processing', 'completed'];
-const toBatchStatusValue = (v) => (0, stringToUnion_1.stringToUnion)(v.trim().toLowerCase(), BATCH_STATUS_VALUES);
-exports.toBatchStatusValue = toBatchStatusValue;
-/** Canonical batch file statuses (API ingress may use aliases; see `parseBatchFileStatus`). */
-exports.BATCH_FILE_STATUSES = [
-    'exact_match',
-    'possible_matches',
-    'no_match',
-    'failed',
-];
-const toBatchFileStatus = (v) => (0, stringToUnion_1.stringToUnion)(v.trim().toLowerCase().replace(/-/g, '_'), exports.BATCH_FILE_STATUSES);
-exports.toBatchFileStatus = toBatchFileStatus;
-const UNMATCHED_TAB_FILE_STATUSES = ['possible_matches', 'no_match'];
-/** True for files that belong in the Unmatched tab (possible matches or no match). */
-function isUnmatchedTabFileStatus(status) {
-    return UNMATCHED_TAB_FILE_STATUSES.includes(status);
-}
-const BULK_UPLOAD_PHASES = [
-    'idle',
-    'uploading',
-    'matching',
-    'completed',
-];
-const toBulkUploadPhase = (v) => (0, stringToUnion_1.stringToUnion)(v.trim().toLowerCase(), BULK_UPLOAD_PHASES);
-exports.toBulkUploadPhase = toBulkUploadPhase;
-const BULK_UPLOAD_RESULTS_TABS = ['completed', 'unmatched'];
-const toBulkUploadResultsTab = (v) => (0, stringToUnion_1.stringToUnion)(v.trim().toLowerCase(), BULK_UPLOAD_RESULTS_TABS);
-exports.toBulkUploadResultsTab = toBulkUploadResultsTab;
-const MISSING_RECEIPTS_TABS = ['missing', 'completed', 'unmatched'];
-const toMissingReceiptsTab = (v) => (0, stringToUnion_1.stringToUnion)(v.trim().toLowerCase(), MISSING_RECEIPTS_TABS);
-exports.toMissingReceiptsTab = toMissingReceiptsTab;
-const COMPLETED_SUB_TABS = ['all', 'ai_accountant', 'manual'];
-const toCompletedSubTab = (v) => (0, stringToUnion_1.stringToUnion)(v.trim().toLowerCase(), COMPLETED_SUB_TABS);
-exports.toCompletedSubTab = toCompletedSubTab;
-const MATCH_SOURCES = ['ai', 'manual'];
-const toMatchSource = (v) => (0, stringToUnion_1.stringToUnion)(v.trim().toLowerCase(), MATCH_SOURCES);
-exports.toMatchSource = toMatchSource;
-const BULK_UPLOAD_SORT_KEYS = [
-    'amount',
-    'category',
-    'class',
-    'date',
-    'vendor',
-];
-const toBulkUploadSortKey = (v) => (0, stringToUnion_1.stringToUnion)(v.trim().toLowerCase(), BULK_UPLOAD_SORT_KEYS);
-exports.toBulkUploadSortKey = toBulkUploadSortKey;

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

@@ -15,7 +15,7 @@ import { VendorBase } from '../../../entity/vendor/vendorState';
 import { ZeniDate } from '../../../zeniDayJS';
 import { EntityRecommendationKey } from '../../recommendation/recommendationState';
 import { TransactionDetailKey } from '../../transactionDetail/transactionDetailState';
-export declare const toTransactionsSortKey: (v: string) => "date" | "amount" | "vendor" | "category" | "class" | "payment_account" | "transaction_type" | "memo_and_receipt";
+export declare const toTransactionsSortKey: (v: string) => "date" | "amount" | "vendor" | "category" | "class" | "memo" | "transaction_type";
 export type TransactionsSortKey = ReturnType<typeof toTransactionsSortKey>;
 export declare const TRANSACTIONS_TABS: readonly ["review", "autoCategorized"];
 export declare const toTransactionsTabKey: (v: string) => "review" | "autoCategorized";
@@ -97,7 +97,6 @@ export interface TransactionsTabViewState extends FetchedState {
     transactionIdsWithUnsavedData: ID[];
     transactionReviewLocalDataById: Record<ID | TransactionDetailKey, SupportedTransactionCategorization>;
     uiState: TransactionsViewUIState;
-    uploadReceiptStatusById: Record<ID, FetchStateAndError>;
     selectedTransactionId?: ID;
     selectedTransactionLineId?: ID;
 }

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

@@ -7,11 +7,10 @@ const TRANSACTIONS_SORT_KEYS = [
     'vendor',
     'amount',
     'transaction_type',
-    'payment_account',
     'date',
     'category',
     'class',
-    'memo_and_receipt',
+    'memo',
 ];
 const toTransactionsSortKey = (v) => (0, stringToUnion_1.stringToUnion)(v, TRANSACTIONS_SORT_KEYS);
 exports.toTransactionsSortKey = toTransactionsSortKey;

package/lib/view/financeStatement/financeStatementReducer.js

@@ -48,20 +48,19 @@ const financeStatement = (0, toolkit_1.createSlice)({
         updateFinanceStatementThisPeriod(draft, action) {
             const { firstMonthOfFY, coaBalances, maxNumOfPeriodsToHighlight } = action.payload;
             const { timeframe, selectedCOABalancesRange } = draft;
-            const safeCoaBalances = coaBalances != null ? coaBalances : [];
-            if (safeCoaBalances.length > 0) {
-                const prevThisPeriod = (0, thisPeriodHelpers_1.extractThisPeriod)(action.payload.firstMonthOfFY, timeframe, selectedCOABalancesRange, safeCoaBalances);
+            if (coaBalances.length > 0) {
+                const prevThisPeriod = (0, thisPeriodHelpers_1.extractThisPeriod)(action.payload.firstMonthOfFY, timeframe, selectedCOABalancesRange, coaBalances);
                 if (prevThisPeriod != null) {
                     const selectedCoaBalancesRangeWithThisPeriod = {
                         ...selectedCOABalancesRange,
                         thisPeriod: prevThisPeriod,
                     };
-                    const newThisPeriod = (0, thisPeriodHelpers_1.getMatchingThisPeriod)(action.payload.firstMonthOfFY, timeframe, action.payload.thisPeriod, safeCoaBalances);
+                    const newThisPeriod = (0, thisPeriodHelpers_1.getMatchingThisPeriod)(action.payload.firstMonthOfFY, timeframe, action.payload.thisPeriod, coaBalances);
                     if (newThisPeriod != null) {
                         const selectionRanges = (0, getSelectedAndHighlightedRanges_1.getSelectedAndHighlightedRangesForThisPeriod)({
                             firstMonthOfFY,
                             thisPeriod: newThisPeriod,
-                            coaBalances: safeCoaBalances,
+                            coaBalances,
                             timeframe,
                             maxNumOfPeriodsToSelect: maxNumOfPeriodsToHighlight,
                             currentSelection: {
@@ -80,9 +79,7 @@ const financeStatement = (0, toolkit_1.createSlice)({
             draft.selectedReportId = action.payload;
         },
         updateFinanceStatementAdditionalBalancesSelection(draft, action) {
-            const { firstMonthOfFY, additionalBalances: additionalBalancesPayload, coaBalances, maxNumOfPeriodsToHighlight, } = action.payload;
-            const safeCoaBalances = coaBalances != null ? coaBalances : [];
-            const additionalBalances = additionalBalancesPayload ?? [];
+            const { firstMonthOfFY, additionalBalances, coaBalances, maxNumOfPeriodsToHighlight, } = action.payload;
             let tempAdditionalBalances = [...additionalBalances];
             if (additionalBalances.includes('this_period_vs_last_period') ||
                 additionalBalances.includes('this_period_vs_last_period_percent')) {
@@ -98,8 +95,8 @@ const financeStatement = (0, toolkit_1.createSlice)({
             draft.isAdditionalBalancesShown =
                 additionalBalances.length != 0 ? true : false;
             const { timeframe, selectedCOABalancesRange } = draft;
-            if (safeCoaBalances.length > 0) {
-                const thisPeriod = (0, thisPeriodHelpers_1.extractThisPeriod)(action.payload.firstMonthOfFY, timeframe, selectedCOABalancesRange, safeCoaBalances);
+            if (coaBalances.length > 0) {
+                const thisPeriod = (0, thisPeriodHelpers_1.extractThisPeriod)(action.payload.firstMonthOfFY, timeframe, selectedCOABalancesRange, coaBalances);
                 if (thisPeriod != null) {
                     const selectedCoaBalancesRangeWithThisPeriod = {
                         ...selectedCOABalancesRange,
@@ -108,7 +105,7 @@ const financeStatement = (0, toolkit_1.createSlice)({
                     const selectionRanges = (0, getSelectedAndHighlightedRanges_1.getSelectedAndHighlightedRangesForThisPeriod)({
                         firstMonthOfFY,
                         thisPeriod: thisPeriod,
-                        coaBalances: safeCoaBalances,
+                        coaBalances,
                         timeframe,
                         maxNumOfPeriodsToHighlight: maxNumOfPeriodsToHighlight,
                         currentSelection: {

package/lib/view/financeStatement/financeStatementSelector.d.ts

@@ -8,7 +8,6 @@ import { RootState } from '../../reducer';
 import { BalanceSheetReport } from '../balanceSheet/balanceSheetSelectorTypes';
 import { CashFlowReport } from '../cashFlow/cashFlowSelectorTypes';
 import { ProfitAndLossReport } from '../profitAndLoss/profitAndLossSelector';
-import { ProfitAndLossByClassHorizontalReport } from '../profitAndLossClassesView/profitAndLossClassesByClassHorizontalSelectorTypes';
 import { ProfitAndLossClassesViewReport } from '../profitAndLossClassesView/profitAndLossClassesViewSelectorTypes';
 export interface FinanceStatementReport extends SelectorReport {
     allTimeframeTicks: TimeframeTickWithMetaData[];
@@ -19,7 +18,6 @@ export interface FinanceStatementReport extends SelectorReport {
     downloadState: FetchState;
     filter: COABalancesFilter;
     isCompareModeOn: boolean;
-    profitAndLossByClassHorizontalReport: ProfitAndLossByClassHorizontalReport;
     profitAndLossByClassReport: ProfitAndLossClassesViewReport;
     profitAndLossReport: ProfitAndLossReport;
     reportFormat: ReportFormat;

package/lib/view/financeStatement/financeStatementSelector.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getFinanceStatement = void 0;
 const toolkit_1 = require("@reduxjs/toolkit");
-const coaBalanceType_1 = require("../../commonStateTypes/coaBalance/coaBalanceType");
 const coaBalancesFilter_1 = require("../../commonStateTypes/coaBalance/coaBalancesFilter");
 const coaBalancesFilterClassesView_1 = require("../../commonStateTypes/coaBalance/coaBalancesFilterClassesView");
 const dataAvailable_1 = require("../../commonStateTypes/dataAvailable");
@@ -12,7 +11,6 @@ const thisPeriodHelpers_1 = require("../../commonStateTypes/viewAndReport/thisPe
 const balanceSheetSelector_1 = require("../balanceSheet/balanceSheetSelector");
 const cashFlowSelector_1 = require("../cashFlow/cashFlowSelector");
 const profitAndLossSelector_1 = require("../profitAndLoss/profitAndLossSelector");
-const profitAndLossClassesByClassHorizontalSelector_1 = require("../profitAndLossClassesView/profitAndLossClassesByClassHorizontalSelector");
 const profitAndLossClassesViewSelector_1 = require("../profitAndLossClassesView/profitAndLossClassesViewSelector");
 function getDateRangeForFinanceReports(profitAndLossState, balanceSheetState, cashFlowState) {
     const datesSorted = [
@@ -47,11 +45,11 @@ exports.getFinanceStatement = (0, toolkit_1.createSelector)((state) => state.acc
     if (dataAvailable != null) {
         const noFilter = (0, coaBalancesFilter_1.newBalancesFilterForDateRange)(firstMonthOfFY, financeStatementState.timeframe, dataAvailable, 'ascending_date', []);
         const profitAndLossForTimeframeTicks = (0, profitAndLossSelector_1.getProfitAndLossReport)(noFilter, undefined, accountState, accountGroupState, sectionAccountsViewState, profitAndLossState, forecastState);
-        const expensesBalances = profitAndLossForTimeframeTicks.sections.expenses?.balances ?? [];
-        const incomeBalances = profitAndLossForTimeframeTicks.sections.income?.balances ?? [];
-        balancesInTimeframe =
-            expensesBalances.length > 0 ? expensesBalances : incomeBalances;
-        if (balancesInTimeframe.length > 0) {
+        if (profitAndLossForTimeframeTicks.sections.expenses != null) {
+            balancesInTimeframe =
+                profitAndLossForTimeframeTicks.sections.expenses.balances.length > 0
+                    ? profitAndLossForTimeframeTicks.sections['expenses'].balances
+                    : profitAndLossForTimeframeTicks.sections['income'].balances;
             allTimeframeTicks = balancesInTimeframe.map((balance) => (0, timeframeTick_1.toTimeframeTick)(balance));
         }
     }
@@ -59,22 +57,12 @@ exports.getFinanceStatement = (0, toolkit_1.createSelector)((state) => state.acc
     if (thisPeriod == null && balancesInTimeframe.length > 0) {
         thisPeriod = (0, timeframeTick_1.toTimeframeTick)(balancesInTimeframe[balancesInTimeframe.length - 1]);
     }
-    const rawAdditionalBalances = financeStatementState.isAdditionalBalancesShown === true
+    const filter = (0, coaBalancesFilter_1.newBalancesFilter)(firstMonthOfFY, financeStatementState.timeframe, Math.min((0, dataAvailable_1.getNumberOfPeriods)(firstMonthOfFY, financeStatementState.timeframe, dataAvailable) ?? financeStatementState.selectedCOABalancesRange.numberOfPeriods, financeStatementState.selectedCOABalancesRange.numberOfPeriods), thisPeriod, 'ascending_date', financeStatementState.isAdditionalBalancesShown === true
         ? financeStatementState.selectedAdditionalBalances
-        : [];
-    const useHorizontalClassesLayout = profitAndLossClassesViewState.uiState.classViewLayout ===
-        'horizontal' &&
-        financeStatementState.selectedReportId === 'profit_and_loss_by_classes';
-    const additionalBalancesForFilter = useHorizontalClassesLayout
-        ? (0, coaBalanceType_1.stripCompareAdditionalBalanceTypes)(rawAdditionalBalances)
-        : rawAdditionalBalances;
-    const filter = (0, coaBalancesFilter_1.newBalancesFilter)(firstMonthOfFY, financeStatementState.timeframe, Math.min((0, dataAvailable_1.getNumberOfPeriods)(firstMonthOfFY, financeStatementState.timeframe, dataAvailable) ?? financeStatementState.selectedCOABalancesRange.numberOfPeriods, financeStatementState.selectedCOABalancesRange.numberOfPeriods), thisPeriod, 'ascending_date', additionalBalancesForFilter);
+        : []);
     const profitAndLossReport = (0, profitAndLossSelector_1.getProfitAndLossReport)(filter, undefined, accountState, accountGroupState, sectionAccountsViewState, profitAndLossState, forecastState);
     const classFilter = (0, coaBalancesFilterClassesView_1.newBalancesFilterClassesView)(filter.firstMonthOfFY, filter.timeframe, filter.balancesRange.numberOfPeriods, filter.balancesRange.thisPeriod, filter.balancesRange.orderBy, filter.additionalBalances, profitAndLossClassesViewState.uiState.classesToFilterOut);
     const profitAndLossByClassReport = (0, profitAndLossClassesViewSelector_1.getProfitAndLossClassesView)(classFilter, accountState, classState, sectionsState, profitAndLossClassesViewState);
-    const profitAndLossByClassHorizontalReport = (0, profitAndLossClassesByClassHorizontalSelector_1.getProfitAndLossClassesHorizontalView)(classFilter, accountState, classState, sectionsState, profitAndLossClassesViewState, profitAndLossClassesViewState.uiState.classViewLayout === 'horizontal'
-        ? thisPeriod
-        : undefined);
     const balanceSheetReport = (0, balanceSheetSelector_1.getBalanceSheet)(filter, accountState, accountGroupState, sectionAccountsViewState, balanceSheetState);
     const cashFlowReport = (0, cashFlowSelector_1.getCashFlow)(filter, accountState, accountGroupState, sectionAccountsViewState, cashFlowState);
     const allReports = [
@@ -122,15 +110,12 @@ exports.getFinanceStatement = (0, toolkit_1.createSelector)((state) => state.acc
         dataAvailable,
         profitAndLossReport,
         profitAndLossByClassReport,
-        profitAndLossByClassHorizontalReport,
         balanceSheetReport,
         cashFlowReport,
         filter,
         selectedReportId: financeStatementState.selectedReportId,
         downloadState: financeStatementState.downloadState,
-        isCompareModeOn: useHorizontalClassesLayout
-            ? false
-            : financeStatementState.selectedAdditionalBalances.includes('this_period_vs_last_period') ||
-                financeStatementState.selectedAdditionalBalances.includes('this_period_vs_last_period_percent'),
+        isCompareModeOn: financeStatementState.selectedAdditionalBalances.includes('this_period_vs_last_period') ||
+            financeStatementState.selectedAdditionalBalances.includes('this_period_vs_last_period_percent'),
     };
 });

package/lib/view/profitAndLossClassesView/profitAndLossClassesViewReducer.d.ts

@@ -2,7 +2,7 @@ import { NestedClassID } from '../../commonStateTypes/classesView/nestedClassID'
 import { AccountViewMode, ID } from '../../commonStateTypes/common';
 import { ZeniAPIStatus, ZeniReportData } from '../../responsePayload';
 import { ProfitAndLossClassesViewPayload } from './profitAndLossClassesViewPayload';
-import { ClassViewLayout, ProfitAndLossClassesViewState } from './profitAndLossClassesViewState';
+import { ProfitAndLossClassesViewState } from './profitAndLossClassesViewState';
 export declare const initialState: ProfitAndLossClassesViewState;
 export declare const fetchProfitAndLossClassesView: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[cacheOverride?: boolean | undefined], {
     cacheOverride: boolean;
@@ -30,8 +30,6 @@ export declare const fetchProfitAndLossClassesView: import("@reduxjs/toolkit").A
     };
 }, "profitAndLossClassesView/updateProfitAndLossClassesViewUIState">, updateAccountViewMode: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
     viewMode: AccountViewMode;
-}, "profitAndLossClassesView/updateAccountViewMode">, updateClassViewLayout: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
-    classViewLayout: ClassViewLayout;
-}, "profitAndLossClassesView/updateClassViewLayout">, resetProfitAndLossClassesNodeCollapseState: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<"profitAndLossClassesView/resetProfitAndLossClassesNodeCollapseState">, clearProfitAndLossClassesView: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<"profitAndLossClassesView/clearProfitAndLossClassesView">;
+}, "profitAndLossClassesView/updateAccountViewMode">, resetProfitAndLossClassesNodeCollapseState: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<"profitAndLossClassesView/resetProfitAndLossClassesNodeCollapseState">, clearProfitAndLossClassesView: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<"profitAndLossClassesView/clearProfitAndLossClassesView">;
 declare const _default: import("redux").Reducer<ProfitAndLossClassesViewState>;
 export default _default;

package/lib/view/profitAndLossClassesView/profitAndLossClassesViewReducer.js

@@ -1,7 +1,7 @@
 "use strict";
 var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.clearProfitAndLossClassesView = exports.resetProfitAndLossClassesNodeCollapseState = exports.updateClassViewLayout = exports.updateAccountViewMode = exports.updateProfitAndLossClassesViewUIState = exports.updateClassesToFilterOut = exports.updateProfitAndLossForTimeframeClassesViewFailure = exports.updateProfitAndLossForTimeframeClassesView = exports.fetchProfitAndLossForTimeframeClassesView = exports.fetchProfitAndLossClassesView = exports.initialState = void 0;
+exports.clearProfitAndLossClassesView = exports.resetProfitAndLossClassesNodeCollapseState = exports.updateAccountViewMode = exports.updateProfitAndLossClassesViewUIState = exports.updateClassesToFilterOut = exports.updateProfitAndLossForTimeframeClassesViewFailure = exports.updateProfitAndLossForTimeframeClassesView = exports.fetchProfitAndLossForTimeframeClassesView = exports.fetchProfitAndLossClassesView = exports.initialState = void 0;
 const toolkit_1 = require("@reduxjs/toolkit");
 const viewAndReportPayloadv2_1 = require("../../commonPayloadTypes/v2/viewAndReportPayloadv2");
 const getNestedClassIDHierarchyForReport_1 = require("../../commonStateTypes/classesView/getNestedClassIDHierarchyForReport");
@@ -27,7 +27,6 @@ exports.initialState = {
         nodeCollapseState: {},
         scrollPosition: undefined,
         accountViewMode: 'account_group',
-        classViewLayout: 'vertical',
         classesToFilterOut: [],
     },
     firstMonthOfFY: 1,
@@ -99,9 +98,6 @@ const profitAndLossClassesView = (0, toolkit_1.createSlice)({
         updateAccountViewMode(draft, action) {
             draft.uiState.accountViewMode = action.payload.viewMode;
         },
-        updateClassViewLayout(draft, action) {
-            draft.uiState.classViewLayout = action.payload.classViewLayout;
-        },
         resetProfitAndLossClassesNodeCollapseState(draft) {
             draft.uiState.nodeCollapseState = {};
         },
@@ -110,11 +106,10 @@ const profitAndLossClassesView = (0, toolkit_1.createSlice)({
         },
     },
 });
-_a = profitAndLossClassesView.actions, exports.fetchProfitAndLossClassesView = _a.fetchProfitAndLossClassesView, exports.fetchProfitAndLossForTimeframeClassesView = _a.fetchProfitAndLossForTimeframeClassesView, exports.updateProfitAndLossForTimeframeClassesView = _a.updateProfitAndLossForTimeframeClassesView, exports.updateProfitAndLossForTimeframeClassesViewFailure = _a.updateProfitAndLossForTimeframeClassesViewFailure, exports.updateClassesToFilterOut = _a.updateClassesToFilterOut, exports.updateProfitAndLossClassesViewUIState = _a.updateProfitAndLossClassesViewUIState, exports.updateAccountViewMode = _a.updateAccountViewMode, exports.updateClassViewLayout = _a.updateClassViewLayout, exports.resetProfitAndLossClassesNodeCollapseState = _a.resetProfitAndLossClassesNodeCollapseState, exports.clearProfitAndLossClassesView = _a.clearProfitAndLossClassesView;
+_a = profitAndLossClassesView.actions, exports.fetchProfitAndLossClassesView = _a.fetchProfitAndLossClassesView, exports.fetchProfitAndLossForTimeframeClassesView = _a.fetchProfitAndLossForTimeframeClassesView, exports.updateProfitAndLossForTimeframeClassesView = _a.updateProfitAndLossForTimeframeClassesView, exports.updateProfitAndLossForTimeframeClassesViewFailure = _a.updateProfitAndLossForTimeframeClassesViewFailure, exports.updateClassesToFilterOut = _a.updateClassesToFilterOut, exports.updateProfitAndLossClassesViewUIState = _a.updateProfitAndLossClassesViewUIState, exports.updateAccountViewMode = _a.updateAccountViewMode, exports.resetProfitAndLossClassesNodeCollapseState = _a.resetProfitAndLossClassesNodeCollapseState, exports.clearProfitAndLossClassesView = _a.clearProfitAndLossClassesView;
 exports.default = profitAndLossClassesView.reducer;
 const doUpdatedProfitAndLossClassesView = (draft, timeframe, pandLReport) => {
     const report = (0, viewAndReportPayloadv2_1.mapReportPayloadV2ToReportV2)(pandLReport.report);
-    draft.currency = report.currency;
     draft.dataAvailable = report.dataAvailable;
     draft.firstMonthOfFY = report.firstMonthOfFY;
     draft.bookCloseDate = report.bookCloseDate;

package/lib/view/profitAndLossClassesView/profitAndLossClassesViewSelector.js

@@ -4,7 +4,6 @@ exports.getProfitAndLossClassesView = exports.profitAndLossIdsInOrder = void 0;
 const getDifferenceOfBalancesGroupedByPeriod_1 = require("../../commonStateTypes/coaBalance/classBalances/getDifferenceOfBalancesGroupedByPeriod");
 const getSumOfBalancesGroupedByPeriod_1 = require("../../commonStateTypes/coaBalance/classBalances/getSumOfBalancesGroupedByPeriod");
 const coaBalance_1 = require("../../commonStateTypes/coaBalance/coaBalance");
-const reduceFetchState_1 = require("../../commonStateTypes/reduceFetchState");
 const sectionClassesViewSelector_1 = require("../../entity/sectionClassesViewV2/sectionClassesViewSelector");
 const profitAndLossClassesViewSelectorTypes_1 = require("./profitAndLossClassesViewSelectorTypes");
 exports.profitAndLossIdsInOrder = [
@@ -19,7 +18,7 @@ exports.profitAndLossIdsInOrder = [
     'netIncome',
 ];
 const getProfitAndLossClassesView = (filter, accountState, classState, sectionsState, profitAndLossClassesViewState) => {
-    const fetchState = (0, reduceFetchState_1.reduceFetchStateParallelTimeframes)([
+    const fetchState = reduceFetchState([
         profitAndLossClassesViewState.fetchState.month,
         profitAndLossClassesViewState.fetchState.quarter,
         profitAndLossClassesViewState.fetchState.year,
@@ -69,3 +68,31 @@ const getProfitAndLossClassesView = (filter, accountState, classState, sectionsS
     };
 };
 exports.getProfitAndLossClassesView = getProfitAndLossClassesView;
+function reduceFetchState(fetchStateList) {
+    const isAnyProgress = fetchStateList.reduce((prevValue, currentValue) => {
+        return prevValue === true || currentValue.fetchState === 'In-Progress';
+    }, false);
+    const isAllCompleted = fetchStateList.reduce((prevValue, currentValue) => {
+        return prevValue === true && currentValue.fetchState === 'Completed';
+    }, true);
+    const isAnyError = fetchStateList.reduce((prevValue, currentValue) => {
+        return prevValue === true || currentValue.fetchState === 'Error';
+    }, false);
+    const error = fetchStateList.reduce((prevValue, currentValue) => {
+        return prevValue ?? currentValue.error;
+    }, undefined);
+    let fetchState = 'Not-Started';
+    if (isAnyProgress) {
+        fetchState = 'In-Progress';
+    }
+    else if (isAllCompleted) {
+        fetchState = 'Completed';
+    }
+    else if (isAnyError) {
+        fetchState = 'Error';
+    }
+    return {
+        fetchState,
+        error,
+    };
+}

package/lib/view/profitAndLossClassesView/profitAndLossClassesViewState.d.ts

@@ -1,12 +1,9 @@
-import { Currency } from '../../commonStateTypes/amount';
 import { NestedClassHierarchyForReport, NestedClassID } from '../../commonStateTypes/classesView/nestedClassID';
 import { AccountViewMode, FetchStateAndError, ID } from '../../commonStateTypes/common';
 import { Report } from '../../commonStateTypes/viewAndReport/viewAndReport';
-export type ClassViewLayout = 'vertical' | 'horizontal';
 export interface ProfitAndLossClassesViewUIState {
     accountViewMode: AccountViewMode;
     classesToFilterOut: NestedClassID[];
-    classViewLayout: ClassViewLayout;
     nodeCollapseState: Record<ID, boolean>;
     scrollPosition: {
         scrollTop: number;
@@ -21,5 +18,4 @@ export interface ProfitAndLossClassesViewState extends Report {
         year: FetchStateAndError;
     };
     uiState: ProfitAndLossClassesViewUIState;
-    currency?: Currency;
 }

package/lib/view/profitAndLossClassesView/profitAndLossForTimeframeClassesViewEpic.js

@@ -27,13 +27,11 @@ const fetchProfitAndLossForTimeframeClassesViewEpic = (actions$, _, zeniAPI) =>
         .pipe((0, operators_1.mergeMap)((response) => {
         if (response.data != null && (0, responsePayload_1.isSuccessResponse)(response)) {
             const actions = [];
-            const report = response.data.report;
-            const currency = report.currency;
-            actions.push((0, sectionClassesViewReducer_1.updateSectionClassesView)(action.payload.timeframe, 'cogs', 'profit_and_loss_by_classes', report.cogs, report.classes, report.accounts, currency));
-            actions.push((0, sectionClassesViewReducer_1.updateSectionClassesView)(action.payload.timeframe, 'expenses', 'profit_and_loss_by_classes', report.expenses, report.classes, report.accounts, currency));
-            actions.push((0, sectionClassesViewReducer_1.updateSectionClassesView)(action.payload.timeframe, 'income', 'profit_and_loss_by_classes', report.income, report.classes, report.accounts, currency));
-            actions.push((0, sectionClassesViewReducer_1.updateSectionClassesView)(action.payload.timeframe, 'otherExpenses', 'profit_and_loss_by_classes', report.other_expenses, report.classes, report.accounts, currency));
-            actions.push((0, sectionClassesViewReducer_1.updateSectionClassesView)(action.payload.timeframe, 'otherIncome', 'profit_and_loss_by_classes', report.other_income, report.classes, report.accounts, currency));
+            actions.push((0, sectionClassesViewReducer_1.updateSectionClassesView)(action.payload.timeframe, 'cogs', 'profit_and_loss_by_classes', response.data.report.cogs, response.data.report.classes, response.data.report.accounts, response.data.report.currency));
+            actions.push((0, sectionClassesViewReducer_1.updateSectionClassesView)(action.payload.timeframe, 'expenses', 'profit_and_loss_by_classes', response.data.report.expenses, response.data.report.classes, response.data.report.accounts, response.data.report.currency));
+            actions.push((0, sectionClassesViewReducer_1.updateSectionClassesView)(action.payload.timeframe, 'income', 'profit_and_loss_by_classes', response.data.report.income, response.data.report.classes, response.data.report.accounts, response.data.report.currency));
+            actions.push((0, sectionClassesViewReducer_1.updateSectionClassesView)(action.payload.timeframe, 'otherExpenses', 'profit_and_loss_by_classes', response.data.report.other_expenses, response.data.report.classes, response.data.report.accounts, response.data.report.currency));
+            actions.push((0, sectionClassesViewReducer_1.updateSectionClassesView)(action.payload.timeframe, 'otherIncome', 'profit_and_loss_by_classes', response.data.report.other_income, response.data.report.classes, response.data.report.accounts, response.data.report.currency));
             actions.push((0, profitAndLossClassesViewReducer_1.updateProfitAndLossForTimeframeClassesView)({
                 timeframe: action.payload.timeframe,
                 report: response.data,

package/lib/view/reportUIOptions/updateReportUIOptionCOABalancesRangeEpic.js

@@ -11,13 +11,9 @@ const opExReducer_1 = require("../opEx/opExReducer");
 const revenueReducer_1 = require("../revenue/revenueReducer");
 const reportUIOptionsReducer_1 = require("./reportUIOptionsReducer");
 const updateReportUIOptionCOABalancesRangeEpic = (actions$, state$) => actions$.pipe((0, operators_1.filter)(reportUIOptionsReducer_1.updateReportUIOptionCOABalancesRange.match), (0, operators_1.switchMap)((action) => {
-    const selectedRange = action.payload.selectedCOABalancesRange;
-    const thisPeriod = selectedRange.thisPeriod;
-    const orderBy = selectedRange.orderBy;
-    const numberOfPeriodsFromSelection = selectedRange.numberOfPeriods;
-    const highlightedNoOfPeriods = state$.value.reportUIOptionsState.isCompareModeOn === true
-        ? numberOfPeriodsFromSelection
-        : 1;
+    const thisPeriod = action.payload.selectedCOABalancesRange.thisPeriod;
+    const orderBy = action.payload.selectedCOABalancesRange.orderBy;
+    const highlightedNoOfPeriods = state$.value.reportUIOptionsState.isCompareModeOn === true ? 4 : 1;
     const highlightedCOABalancesRange = action.payload.highlightedCOABalancesRange == null && thisPeriod != null
         ? {
             numberOfPeriods: highlightedNoOfPeriods,
@@ -69,7 +65,9 @@ const updateReportUIOptionCOABalancesRangeEpic = (actions$, state$) => actions$.
         thisPeriod: action.payload.highlightedCOABalancesRange != null
             ? action.payload.highlightedCOABalancesRange.thisPeriod
             : thisPeriod,
-        numberOfPeriods: numberOfPeriodsFromSelection,
+        numberOfPeriods: state$.value.reportUIOptionsState.isCompareModeOn === true
+            ? 4
+            : financeStatementReducer_1.initialFinanceStatementState.maxNumOfPeriodsToHighlight,
         orderBy,
     }));
 }));

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

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

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

@@ -424,14 +424,6 @@ 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) {
@@ -534,8 +526,6 @@ const getBillListOnSort = (sortKey, sortOrder, currentTab, transactions) => {
                 return transaction.totalAmountInUSD?.amount ?? 0;
             case 'paymentMethod':
                 return transaction.billPayInfo.billPaymentMethodType.name;
-            case 'invoiceNumber':
-                return transaction.documentId;
         }
     }, getColumnWiseSortOrder(sortOrder));
     return [

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

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

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

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