@zeniai/client-epic-state 4.19.91-beta0ND → 4.19.91-beta2ND

package/lib/commonStateTypes/reduceFetchState.d.ts

@@ -11,6 +11,15 @@ export declare const isAllFetchCompleted: (fetchStateList: FetchStateAndError[])
  * @return single fetchStateWithError
  */
 export declare function reduceFetchState(fetchStateList: FetchStateAndError[]): FetchStateAndError;
+/**
+ * Combine multiple independent fetches (e.g. month / quarter / year for one report).
+ * In-Progress if any fetch is in progress; Completed only when all complete; Error if
+ * any failed once nothing is still in progress.
+ *
+ * Differs from {@link reduceFetchState} (requires all In-Progress for that state) and
+ * from {@link reduceAllFetchState} (Error only when every fetch failed).
+ */
+export declare function reduceFetchStateParallelTimeframes(fetchStateList: FetchStateAndError[]): FetchStateAndError;
 /**
  * Reduces list of fetch state to boolean
  * @param fetchStateList list of fetch states

package/lib/commonStateTypes/reduceFetchState.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.reduceAnyCompletedFetchState = exports.reduceAllFetchState = exports.reduceAnyFetchState = exports.isAnyFetchCompleted = exports.isAnyFetchInProgress = exports.isAllFetchCompleted = void 0;
 exports.reduceFetchState = reduceFetchState;
+exports.reduceFetchStateParallelTimeframes = reduceFetchStateParallelTimeframes;
 /**
  * Reduces list of fetch state to boolean
  * @param fetchStateList list of fetch states
@@ -55,6 +56,31 @@ function reduceFetchState(fetchStateList) {
         error,
     };
 }
+/**
+ * Combine multiple independent fetches (e.g. month / quarter / year for one report).
+ * In-Progress if any fetch is in progress; Completed only when all complete; Error if
+ * any failed once nothing is still in progress.
+ *
+ * Differs from {@link reduceFetchState} (requires all In-Progress for that state) and
+ * from {@link reduceAllFetchState} (Error only when every fetch failed).
+ */
+function reduceFetchStateParallelTimeframes(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 = reduceError(fetchStateList);
+    let fetchState = 'Not-Started';
+    if (isAnyProgress) {
+        fetchState = 'In-Progress';
+    }
+    else if (isAllCompleted) {
+        fetchState = 'Completed';
+    }
+    else if (isAnyError) {
+        fetchState = 'Error';
+    }
+    return { fetchState, error };
+}
 /**
  * Reduces list of fetch state to boolean
  * @param fetchStateList list of fetch states

package/lib/esm/commonStateTypes/reduceFetchState.js

@@ -50,6 +50,31 @@ export function reduceFetchState(fetchStateList) {
         error,
     };
 }
+/**
+ * Combine multiple independent fetches (e.g. month / quarter / year for one report).
+ * In-Progress if any fetch is in progress; Completed only when all complete; Error if
+ * any failed once nothing is still in progress.
+ *
+ * Differs from {@link reduceFetchState} (requires all In-Progress for that state) and
+ * from {@link reduceAllFetchState} (Error only when every fetch failed).
+ */
+export function reduceFetchStateParallelTimeframes(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 = reduceError(fetchStateList);
+    let fetchState = 'Not-Started';
+    if (isAnyProgress) {
+        fetchState = 'In-Progress';
+    }
+    else if (isAllCompleted) {
+        fetchState = 'Completed';
+    }
+    else if (isAnyError) {
+        fetchState = 'Error';
+    }
+    return { fetchState, error };
+}
 /**
  * Reduces list of fetch state to boolean
  * @param fetchStateList list of fetch states

package/lib/esm/index.js

@@ -14,7 +14,7 @@ import { getActualPeriodOfFY, getActualPeriodOfFYQtr, } from './commonStateTypes
 import { getFYMonths } from './commonStateTypes/fiscalYearHelpers/getFYMonths';
 import { getFYQuarterAndYear, getLastMonthOfFYQuarter, getLastMonthOfFYYear, } from './commonStateTypes/fiscalYearHelpers/getFYQuarterAndYear';
 import { getStartOfAndEndOfTimeframeForFY } from './commonStateTypes/fiscalYearHelpers/getStartOfAndEndOfTimeframeFY';
-import { isAllFetchCompleted, isAnyFetchInProgress, reduceAllFetchState, reduceAnyCompletedFetchState, reduceAnyFetchState, reduceFetchState, } from './commonStateTypes/reduceFetchState';
+import { isAllFetchCompleted, isAnyFetchInProgress, reduceAllFetchState, reduceAnyCompletedFetchState, reduceAnyFetchState, reduceFetchState, reduceFetchStateParallelTimeframes, } from './commonStateTypes/reduceFetchState';
 import { toReimbursementTypeCode } from './commonStateTypes/reimbursementTypeCode';
 import { stringToUnion, stringToUnionStrict, } from './commonStateTypes/stringToUnion';
 import { SCHEDULE_DAYS_OF_MONTH, convertToPeriod, toAbsoluteDay, toMonth, toMonthStrict, toMonthYearPeriodId, toQuarter, toQuarterStrict, toScheduleDaysOfMonth, } from './commonStateTypes/timePeriod';
@@ -544,7 +544,7 @@ export { saveRealTimeApproval, updateIsEditModeRealTimeApprovals, };
 export { deleteRemi, fetchRemiDetail, cancelAndDeleteRemi, approveOrRejectRemi, clearRemiDetailView, fetchDuplicateReimbursement, clearDuplicateReimbursementDetail, removeDuplicateReimbursementByLineId, };
 export { getEditRemiDetail, };
 export { fetchEditRemiDetailPage, fetchRecommendationsAndUpdateMerchantRecommendations, fetchRemiAndInitializeLocalStore, initializeRemiToLocalStore, saveRemiUpdatesToLocalStore, fetchCurrencyConversionValue, discardRemiUpdatesInLocalStore, removeFileFromRemiUpdatesInLocalStore, saveRemiDetail, saveRemiSuccessOrFailure, parseReceiptsToRemi, clearEditRemiViewDetail, updateAddRemiAutoFields, updateUploadFetchState, updateTentativeMerchantNames, clearTentativeMerchantName, updateReimbursementType, updateHomeCurrencyConversion, clearAddRemiAutoFields, };
-export { reduceFetchState, reduceAnyFetchState, reduceAllFetchState, reduceAnyCompletedFetchState, isAnyFetchInProgress, isAllFetchCompleted, ALL_FILE_TYPES, toFileTypeStrict, };
+export { reduceFetchState, reduceFetchStateParallelTimeframes, reduceAnyFetchState, reduceAllFetchState, reduceAnyCompletedFetchState, isAnyFetchInProgress, isAllFetchCompleted, ALL_FILE_TYPES, toFileTypeStrict, };
 export { getNextNthWorkingDay, getPreviousNthWorkingDay, isHolidayToday, filterDays, getYearsList, isHoliday, holidaysFormatted, PAYMENT_BUSINESS_DAYS, };
 export { fetchCompanyOnboardingView, fetchQBOConnectionPool, updateQBOConnectionPoolExternalConnection, fetchOnboardingCompletedCompanies, saveOnboardingCustomerCompletedStatus, toProductType, toProductTypeStrict, getOnboardingCockpitView, getNewOnboardingCustomerView, getOnboardingEmailGroup, initializeOnboardingCustomerViewUpdateData, clearOnboardingCustomerViewUpdateData, saveOnboardingCustomerViewUpdateData, updateOnboardingCustomerListUIState, updateCustomerCreationStatus, updateStatusAfterOnboardingCompleted, saveOnboardingCustomerViewUpdates, saveOnboardingCustomerNotes, saveOnboardingCustomerDataInLocalStore, updateOnboardingCustomerDataInLocalStore, resetNewOnboardedCustomerId, sendOnboardingCustomerViewInvite, retryBankAccountConnectionForOnboarding, };
 export { getTransactionsListByCategoryType, getTransactionListUIStateByCategoryType, };

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

@@ -44,7 +44,7 @@ const financeStatement = createSlice({
         updateFinanceStatementThisPeriod(draft, action) {
             const { firstMonthOfFY, coaBalances, maxNumOfPeriodsToHighlight } = action.payload;
             const { timeframe, selectedCOABalancesRange } = draft;
-            const safeCoaBalances = coaBalances ?? [];
+            const safeCoaBalances = coaBalances != null ? coaBalances : [];
             if (safeCoaBalances.length > 0) {
                 const prevThisPeriod = extractThisPeriod(action.payload.firstMonthOfFY, timeframe, selectedCOABalancesRange, safeCoaBalances);
                 if (prevThisPeriod != null) {
@@ -77,7 +77,7 @@ const financeStatement = createSlice({
         },
         updateFinanceStatementAdditionalBalancesSelection(draft, action) {
             const { firstMonthOfFY, additionalBalances: additionalBalancesPayload, coaBalances, maxNumOfPeriodsToHighlight, } = action.payload;
-            const safeCoaBalances = coaBalances ?? [];
+            const safeCoaBalances = coaBalances != null ? coaBalances : [];
             const additionalBalances = additionalBalancesPayload ?? [];
             let tempAdditionalBalances = [...additionalBalances];
             if (additionalBalances.includes('this_period_vs_last_period') ||

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

@@ -43,15 +43,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);
-        const expensesSection = profitAndLossForTimeframeTicks.sections.expenses;
-        const incomeSection = profitAndLossForTimeframeTicks.sections.income;
-        const expensesBalances = expensesSection?.balances;
-        const incomeBalances = incomeSection?.balances;
-        if (expensesSection != null) {
-            balancesInTimeframe =
-                (expensesBalances?.length ?? 0) > 0
-                    ? expensesBalances ?? []
-                    : incomeBalances ?? [];
+        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));
         }
     }
@@ -65,9 +61,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 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 = [

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

@@ -1,7 +1,11 @@
 import { toAmountWC } from '../../commonStateTypes/amount';
+import { reduceFetchStateParallelTimeframes } from '../../commonStateTypes/reduceFetchState';
 import { getSectionClassesViewReport } from '../../entity/sectionClassesViewV2/sectionClassesViewSelector';
-import { ALL_PANDL_REPORT_VIEW_SECTION_IDS, } from './profitAndLossClassesViewSelectorTypes';
-const DEFAULT_CURRENCY = { currencyCode: 'USD', currencySymbol: '$' };
+/** If `ProfitAndLossClassesViewState.currency` is unset (e.g. tests). */
+const FALLBACK_REPORT_CURRENCY = {
+    currencyCode: 'USD',
+    currencySymbol: '$',
+};
 export const profitAndLossHorizontalIdsInOrder = [
     'income',
     'cogs',
@@ -24,8 +28,16 @@ const SECTION_TITLES = {
     netOtherIncome: 'Net Other Income',
     netIncome: 'Net Income',
 };
+/** Sections fetched and pivoted for horizontal layout (excludes e.g. `netOperatingIncome`). */
+const HORIZONTAL_PANDL_SECTION_IDS = [
+    'income',
+    'cogs',
+    'expenses',
+    'otherIncome',
+    'otherExpenses',
+];
 export const getProfitAndLossClassesHorizontalView = (filter, accountState, classState, sectionsState, profitAndLossClassesViewState, selectedPeriod) => {
-    const fetchState = reduceFetchState([
+    const fetchState = reduceFetchStateParallelTimeframes([
         profitAndLossClassesViewState.fetchState.month,
         profitAndLossClassesViewState.fetchState.quarter,
         profitAndLossClassesViewState.fetchState.year,
@@ -35,24 +47,20 @@ export const getProfitAndLossClassesHorizontalView = (filter, accountState, clas
     const classColumns = buildClassColumns(profitAndLossClassesViewState.classHierarchy, profitAndLossClassesViewState.uiState.classesToFilterOut);
     const sections = {};
     const calculatedSections = {};
+    let reportCurrency = FALLBACK_REPORT_CURRENCY;
     if (fetchState.fetchState === 'Completed' && selectedPeriod != null) {
         // Get section reports using existing selector infrastructure
         const sectionReports = {};
-        ALL_PANDL_REPORT_VIEW_SECTION_IDS.forEach((sectionId) => {
+        HORIZONTAL_PANDL_SECTION_IDS.forEach((sectionId) => {
             sectionReports[sectionId] = getSectionClassesViewReport(accountState, classState, sectionsState, { reportId, sectionId }, filter);
         });
+        reportCurrency =
+            profitAndLossClassesViewState.currency ?? FALLBACK_REPORT_CURRENCY;
         // Pivot each section from class→account to account→class
-        const sectionIds = [
-            'income',
-            'cogs',
-            'expenses',
-            'otherIncome',
-            'otherExpenses',
-        ];
-        sectionIds.forEach((sectionId) => {
+        HORIZONTAL_PANDL_SECTION_IDS.forEach((sectionId) => {
             const sectionReport = sectionReports[sectionId];
             if (sectionReport != null) {
-                sections[sectionId] = pivotSectionToHorizontal(sectionReport, classColumns, SECTION_TITLES[sectionId] ?? sectionId);
+                sections[sectionId] = pivotSectionToHorizontal(sectionReport, classColumns, SECTION_TITLES[sectionId] ?? sectionId, reportCurrency);
             }
         });
         // Calculate derived sections
@@ -83,7 +91,7 @@ export const getProfitAndLossClassesHorizontalView = (filter, accountState, clas
         }
     }
     // Build synthetic header COABalances for rendering class names as column headers
-    const headerBalances = buildHeaderBalances(classColumns, filter.timeframe, selectedPeriod);
+    const headerBalances = buildHeaderBalances(classColumns, filter.timeframe, selectedPeriod, reportCurrency);
     return {
         reportId,
         reportTitle: 'Profit and Loss by Class',
@@ -104,19 +112,21 @@ export const getProfitAndLossClassesHorizontalView = (filter, accountState, clas
  * Build column definitions from class hierarchy (top-level classes only).
  */
 function buildClassColumns(classHierarchy, classesToFilterOut) {
+    const filteredIds = new Set(classesToFilterOut.map((id) => id[0]));
     return classHierarchy
-        .filter((c) => !classesToFilterOut.some((filteredId) => filteredId[0] === c.classId[0]))
+        .filter((c) => !filteredIds.has(c.classId[0]))
         .map((c) => ({
         classId: c.classId[0],
         className: c.className,
         nestedClassId: c.classId,
         qboId: c.qboId,
-    }));
+    }))
+        .sort((a, b) => a.className.localeCompare(b.className, undefined, { sensitivity: 'base' }));
 }
 /**
  * Pivot a section from class→account→balances to account→class→balance (single period).
  */
-function pivotSectionToHorizontal(section, classColumns, title) {
+function pivotSectionToHorizontal(section, classColumns, title, currency) {
     // Map: accountId -> { accountName, classId -> balance }
     const accountMap = new Map();
     // Also track class totals
@@ -126,7 +136,7 @@ function pivotSectionToHorizontal(section, classColumns, title) {
     section.classes.forEach((classReport) => {
         const classId = classReport.id[0];
         // Only process classes that are in our columns
-        if (!classColumns.some((col) => col.classId === classId)) {
+        if (!classTotalMap.has(classId)) {
             return;
         }
         // Sum all sliced period balances (same slice as vertical columns; multi-period = range total)
@@ -140,27 +150,27 @@ function pivotSectionToHorizontal(section, classColumns, title) {
     accountMap.forEach((accountData, accountId) => {
         const classBalances = classColumns.map((col) => ({
             classId: col.classId,
-            balance: toAmountWC(accountData.classBalances.get(col.classId) ?? 0, DEFAULT_CURRENCY),
+            balance: toAmountWC(accountData.classBalances.get(col.classId) ?? 0, currency),
         }));
         const rowTotal = classBalances.reduce((sum, cb) => sum + cb.balance.amount, 0);
         accounts.push({
             accountId,
             accountName: accountData.accountName,
             classBalances,
-            rowTotal: toAmountWC(rowTotal, DEFAULT_CURRENCY),
+            rowTotal: toAmountWC(rowTotal, currency),
         });
     });
     // Build class totals
     const classTotals = classColumns.map((col) => ({
         classId: col.classId,
-        balance: toAmountWC(classTotalMap.get(col.classId) ?? 0, DEFAULT_CURRENCY),
+        balance: toAmountWC(classTotalMap.get(col.classId) ?? 0, currency),
     }));
     const sectionTotal = classTotals.reduce((sum, ct) => sum + ct.balance.amount, 0);
     return {
         title,
         accounts,
         classTotals,
-        sectionTotal: toAmountWC(sectionTotal, DEFAULT_CURRENCY),
+        sectionTotal: toAmountWC(sectionTotal, currency),
     };
 }
 /**
@@ -205,8 +215,7 @@ function collectAccountsFromNestedAccount(nestedAccount, classId, accountMap) {
 function sumBalancesInSlice(balances) {
     let sum = 0;
     for (const bal of balances) {
-        const b = bal;
-        sum += b.balance?.amount ?? 0;
+        sum += bal.balance?.amount ?? 0;
     }
     return sum;
 }
@@ -214,15 +223,19 @@ function sumBalancesInSlice(balances) {
  * Compute a calculated section by adding or subtracting two sets of class totals.
  */
 function computeCalculatedSection(aTotals, bTotals, aTotal, bTotal, operation, title) {
+    const currency = {
+        currencyCode: aTotal.currencyCode,
+        currencySymbol: aTotal.currencySymbol,
+    };
+    const bTotalsMap = new Map(bTotals.map((b) => [b.classId, b.balance.amount]));
     const classTotals = aTotals.map((a) => {
-        const bMatch = bTotals.find((b) => b.classId === a.classId);
-        const bAmount = bMatch?.balance.amount ?? 0;
+        const bAmount = bTotalsMap.get(a.classId) ?? 0;
         const resultAmount = operation === 'add'
             ? a.balance.amount + bAmount
             : a.balance.amount - bAmount;
         return {
             classId: a.classId,
-            balance: toAmountWC(resultAmount, DEFAULT_CURRENCY),
+            balance: toAmountWC(resultAmount, currency),
         };
     });
     const sectionTotalAmount = operation === 'add'
@@ -231,20 +244,20 @@ function computeCalculatedSection(aTotals, bTotals, aTotal, bTotal, operation, t
     return {
         title,
         classTotals,
-        sectionTotal: toAmountWC(sectionTotalAmount, DEFAULT_CURRENCY),
+        sectionTotal: toAmountWC(sectionTotalAmount, currency),
     };
 }
 /**
  * Build synthetic COABalance array for header rendering.
  * One entry per class column + one for "Total".
  */
-function buildHeaderBalances(classColumns, timeframe, selectedPeriod) {
+function buildHeaderBalances(classColumns, timeframe, selectedPeriod, currency) {
     if (selectedPeriod == null) {
         return [];
     }
     const { endDate, startDate } = selectedPeriod;
     const balances = classColumns.map((col) => ({
-        balance: toAmountWC(0, DEFAULT_CURRENCY),
+        balance: toAmountWC(0, currency),
         balanceTimeFrame: timeframe,
         endDate,
         startDate,
@@ -253,7 +266,7 @@ function buildHeaderBalances(classColumns, timeframe, selectedPeriod) {
     }));
     // Add a "Total" column
     balances.push({
-        balance: toAmountWC(0, DEFAULT_CURRENCY),
+        balance: toAmountWC(0, currency),
         balanceTimeFrame: timeframe,
         endDate,
         startDate,
@@ -262,20 +275,3 @@ function buildHeaderBalances(classColumns, timeframe, selectedPeriod) {
     });
     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/profitAndLossClassesViewReducer.js

@@ -110,6 +110,7 @@ export const { fetchProfitAndLossClassesView, fetchProfitAndLossForTimeframeClas
 export default profitAndLossClassesView.reducer;
 const doUpdatedProfitAndLossClassesView = (draft, timeframe, pandLReport) => {
     const report = mapReportPayloadV2ToReportV2(pandLReport.report);
+    draft.currency = report.currency;
     draft.dataAvailable = report.dataAvailable;
     draft.firstMonthOfFY = report.firstMonthOfFY;
     draft.bookCloseDate = report.bookCloseDate;

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

@@ -1,6 +1,7 @@
 import { getDifferenceOfBalancesGroupedByPeriod } from '../../commonStateTypes/coaBalance/classBalances/getDifferenceOfBalancesGroupedByPeriod';
 import { getSumOfBalancesByGroupedByPeriod } from '../../commonStateTypes/coaBalance/classBalances/getSumOfBalancesGroupedByPeriod';
 import { getCOABalances } from '../../commonStateTypes/coaBalance/coaBalance';
+import { reduceFetchStateParallelTimeframes } from '../../commonStateTypes/reduceFetchState';
 import { getSectionClassesViewReport } from '../../entity/sectionClassesViewV2/sectionClassesViewSelector';
 import { ALL_PANDL_REPORT_VIEW_SECTION_IDS, } from './profitAndLossClassesViewSelectorTypes';
 export const profitAndLossIdsInOrder = [
@@ -15,7 +16,7 @@ export const profitAndLossIdsInOrder = [
     'netIncome',
 ];
 export const getProfitAndLossClassesView = (filter, accountState, classState, sectionsState, profitAndLossClassesViewState) => {
-    const fetchState = reduceFetchState([
+    const fetchState = reduceFetchStateParallelTimeframes([
         profitAndLossClassesViewState.fetchState.month,
         profitAndLossClassesViewState.fetchState.quarter,
         profitAndLossClassesViewState.fetchState.year,
@@ -64,31 +65,3 @@ export const getProfitAndLossClassesView = (filter, accountState, classState, se
         idsInOrder: profitAndLossIdsInOrder,
     };
 };
-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/esm/view/profitAndLossClassesView/profitAndLossForTimeframeClassesViewEpic.js

@@ -24,11 +24,13 @@ export const fetchProfitAndLossForTimeframeClassesViewEpic = (actions$, _, zeniA
         .pipe(mergeMap((response) => {
         if (response.data != null && isSuccessResponse(response)) {
             const actions = [];
-            actions.push(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(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(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(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(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));
+            const report = response.data.report;
+            const currency = report.currency;
+            actions.push(updateSectionClassesView(action.payload.timeframe, 'cogs', 'profit_and_loss_by_classes', report.cogs, report.classes, report.accounts, currency));
+            actions.push(updateSectionClassesView(action.payload.timeframe, 'expenses', 'profit_and_loss_by_classes', report.expenses, report.classes, report.accounts, currency));
+            actions.push(updateSectionClassesView(action.payload.timeframe, 'income', 'profit_and_loss_by_classes', report.income, report.classes, report.accounts, currency));
+            actions.push(updateSectionClassesView(action.payload.timeframe, 'otherExpenses', 'profit_and_loss_by_classes', report.other_expenses, report.classes, report.accounts, currency));
+            actions.push(updateSectionClassesView(action.payload.timeframe, 'otherIncome', 'profit_and_loss_by_classes', report.other_income, report.classes, report.accounts, currency));
             actions.push(updateProfitAndLossForTimeframeClassesView({
                 timeframe: action.payload.timeframe,
                 report: response.data,

package/lib/esm/view/reportUIOptions/updateReportUIOptionCOABalancesRangeEpic.js

@@ -2,15 +2,19 @@ import { of } from 'rxjs';
 import { filter, switchMap } from 'rxjs/operators';
 import { updateCashInCashOutCOABalancesRange } from '../cashInCashOut/cashInCashOutReducer';
 import { updateCashPositionCOABalancesRange } from '../cashPosition/cashPositionReducer';
-import { initialFinanceStatementState, updateCOABalancesRange, } from '../financeStatement/financeStatementReducer';
+import { updateCOABalancesRange } from '../financeStatement/financeStatementReducer';
 import { updateNetBurnOrIncomeCOABalancesRange } from '../netBurnOrIncome/netBurnOrIncomeReducer';
 import { updateOpExCOABalancesRange } from '../opEx/opExReducer';
 import { updateRevenueCOABalancesRange } from '../revenue/revenueReducer';
 import { updateReportUIOptionCOABalancesRange } from './reportUIOptionsReducer';
 export const updateReportUIOptionCOABalancesRangeEpic = (actions$, state$) => actions$.pipe(filter(updateReportUIOptionCOABalancesRange.match), switchMap((action) => {
-    const thisPeriod = action.payload.selectedCOABalancesRange.thisPeriod;
-    const orderBy = action.payload.selectedCOABalancesRange.orderBy;
-    const highlightedNoOfPeriods = state$.value.reportUIOptionsState.isCompareModeOn === true ? 4 : 1;
+    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 highlightedCOABalancesRange = action.payload.highlightedCOABalancesRange == null && thisPeriod != null
         ? {
             numberOfPeriods: highlightedNoOfPeriods,
@@ -62,9 +66,7 @@ export const updateReportUIOptionCOABalancesRangeEpic = (actions$, state$) => ac
         thisPeriod: action.payload.highlightedCOABalancesRange != null
             ? action.payload.highlightedCOABalancesRange.thisPeriod
             : thisPeriod,
-        numberOfPeriods: state$.value.reportUIOptionsState.isCompareModeOn === true
-            ? 4
-            : initialFinanceStatementState.maxNumOfPeriodsToHighlight,
+        numberOfPeriods: numberOfPeriodsFromSelection,
         orderBy,
     }));
 }));

package/lib/index.d.ts

@@ -24,7 +24,7 @@ import { getFYMonths } from './commonStateTypes/fiscalYearHelpers/getFYMonths';
 import { getFYQuarterAndYear, getLastMonthOfFYQuarter, getLastMonthOfFYYear } from './commonStateTypes/fiscalYearHelpers/getFYQuarterAndYear';
 import { getStartOfAndEndOfTimeframeForFY } from './commonStateTypes/fiscalYearHelpers/getStartOfAndEndOfTimeframeFY';
 import { COTLineItemTracking, COTRecommendationTracking, COTTransactionTracking, COTTransactionTrackingByTransactionId, Recommendation, RecommendationWithCOT, TransactionLineRecommendationFieldTypes } from './commonStateTypes/recommendationBase';
-import { isAllFetchCompleted, isAnyFetchInProgress, reduceAllFetchState, reduceAnyCompletedFetchState, reduceAnyFetchState, reduceFetchState } from './commonStateTypes/reduceFetchState';
+import { isAllFetchCompleted, isAnyFetchInProgress, reduceAllFetchState, reduceAnyCompletedFetchState, reduceAnyFetchState, reduceFetchState, reduceFetchStateParallelTimeframes } from './commonStateTypes/reduceFetchState';
 import { toReimbursementTypeCode } from './commonStateTypes/reimbursementTypeCode';
 import { ClassesViewSelectorReportV2 } from './commonStateTypes/selectorTypes/classesViewSelectorReport';
 import { COABalancesSliceOrder, CalculatedSection, EntityOrder, Section, SectionWithAccountOnly, TransactionsOrder } from './commonStateTypes/selectorTypes/selectorTypes';
@@ -782,7 +782,7 @@ export { RemiDetailLocalData, AutoFields, OutofPocketReimbursementLineWithRecomm
 export { Merchant };
 export { fetchEditRemiDetailPage, fetchRecommendationsAndUpdateMerchantRecommendations, fetchRemiAndInitializeLocalStore, initializeRemiToLocalStore, saveRemiUpdatesToLocalStore, fetchCurrencyConversionValue, discardRemiUpdatesInLocalStore, removeFileFromRemiUpdatesInLocalStore, saveRemiDetail, saveRemiSuccessOrFailure, parseReceiptsToRemi, clearEditRemiViewDetail, updateAddRemiAutoFields, updateUploadFetchState, updateTentativeMerchantNames, clearTentativeMerchantName, updateReimbursementType, updateHomeCurrencyConversion, clearAddRemiAutoFields, };
 export { AnimationFileName };
-export { reduceFetchState, reduceAnyFetchState, reduceAllFetchState, reduceAnyCompletedFetchState, isAnyFetchInProgress, isAllFetchCompleted, SortOrder, ALL_FILE_TYPES, FileType, toFileTypeStrict, };
+export { reduceFetchState, reduceFetchStateParallelTimeframes, reduceAnyFetchState, reduceAllFetchState, reduceAnyCompletedFetchState, isAnyFetchInProgress, isAllFetchCompleted, SortOrder, ALL_FILE_TYPES, FileType, toFileTypeStrict, };
 export { getNextNthWorkingDay, getPreviousNthWorkingDay, isHolidayToday, filterDays, getYearsList, isHoliday, holidaysFormatted, PAYMENT_BUSINESS_DAYS, };
 export { CustomerRatingCodeType, TeamRatingCodeType };
 export { CustomerSatisfactionInfo };