@zeniai/client-epic-state 5.3.19 → 5.3.20

package/lib/commonStateTypes/coaBalance/coaBalance.d.ts

@@ -29,6 +29,15 @@ export type COABalanceTimeFrame = NonNullable<ReturnType<typeof toCOABalanceTime
 export type COABalanceMonthQuarterTimeframe = Extract<COABalanceTimeFrame, 'month' | 'quarter'>;
 export type COABalanceMonthQuarterYearTimeframe = Exclude<COABalanceTimeFrame, 'free_range' | 'week'>;
 export type FetchStateByTimeframe = Record<COABalanceMonthQuarterYearTimeframe, FetchStateAndError>;
+/**
+ * Custom start/end (YYYY-MM-DD) sent with the last fetch of each timeframe. A timeframe is missing
+ * when its last fetch used the default periods, so the stored balances cover full periods.
+ */
+export type CustomDateRangeByTimeframe = Partial<Record<COABalanceMonthQuarterYearTimeframe, {
+    endDate: string;
+    startDate: string;
+}>>;
+export declare function withFetchedCustomDateRange(current: CustomDateRangeByTimeframe | undefined, timeframe: COABalanceMonthQuarterYearTimeframe, startDate: string | undefined, endDate: string | undefined): CustomDateRangeByTimeframe | undefined;
 export interface COABalanceGroupedByPeriod {
     months?: COABalance[];
     quarters?: COABalance[];

package/lib/commonStateTypes/coaBalance/coaBalance.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.toCOABalanceTimeframe = void 0;
+exports.withFetchedCustomDateRange = withFetchedCustomDateRange;
 const stringToUnion_1 = require("../stringToUnion");
 /**
  * COA balance time frame
@@ -19,3 +20,13 @@ const ALL_COA_BALANCE_TIMEFRAME = [
 ];
 const toCOABalanceTimeframe = (v) => (0, stringToUnion_1.stringToUnionStrict)(v?.toLocaleLowerCase() ?? '', ALL_COA_BALANCE_TIMEFRAME);
 exports.toCOABalanceTimeframe = toCOABalanceTimeframe;
+function withFetchedCustomDateRange(current, timeframe, startDate, endDate) {
+    const next = { ...current };
+    if (startDate != null && endDate != null) {
+        next[timeframe] = { startDate, endDate };
+    }
+    else {
+        delete next[timeframe];
+    }
+    return Object.keys(next).length > 0 ? next : undefined;
+}

package/lib/epic.js

@@ -1579,6 +1579,7 @@ const ALL_EPICS = [
     fetchOpExWithForecastEpic_1.waitForForecastListThenFetchOpExWithForecastEpic,
     fetchRevenueWithForecastEpic_1.waitForForecastListThenFetchRevenueWithForecastEpic,
     fetchRecommendationsAndUpdateMerchantRecommendationsEpic_1.waitForMerchantRecommendationFetchThenUpdateRecommendationInMerchantEpic,
+    fetchRemiAndInitializeLocalStoreEpic_1.waitForRemiDetailThenInitializeLocalStoreEpic,
     fetchVendorAndUpdateBillLocalDataEpic_1.waitForVendorByIdThenSaveBillUpdatetoLocalStoreEpic,
     fetchVendorByNameAndParseInvoice_1.waitForVendorByNameThenParsetoLocalStoreEpic,
     fetchBillDetailEpic_1.waitForVendorByNameThenUpdateBillDetailEpic,

package/lib/esm/commonStateTypes/coaBalance/coaBalance.js

@@ -15,3 +15,13 @@ const ALL_COA_BALANCE_TIMEFRAME = [
     'free_range',
 ];
 export const toCOABalanceTimeframe = (v) => stringToUnionStrict(v?.toLocaleLowerCase() ?? '', ALL_COA_BALANCE_TIMEFRAME);
+export function withFetchedCustomDateRange(current, timeframe, startDate, endDate) {
+    const next = { ...current };
+    if (startDate != null && endDate != null) {
+        next[timeframe] = { startDate, endDate };
+    }
+    else {
+        delete next[timeframe];
+    }
+    return Object.keys(next).length > 0 ? next : undefined;
+}

package/lib/esm/epic.js

@@ -636,7 +636,7 @@ import { saveRealTimeApprovalEpic, } from './view/spendManagement/realTimeApprov
 import { fetchCurrencyConversionValueEpic, } from './view/spendManagement/reimbursement/editRemiView/epics/fetchCurrencyConversionValueEpic';
 import { fetchEditRemiDetailPageEpic, } from './view/spendManagement/reimbursement/editRemiView/epics/fetchEditRemiDetailPageEpic';
 import { fetchRecommendationsAndUpdateMerchantRecommendationsEpic, waitForMerchantRecommendationFetchThenUpdateRecommendationInMerchantEpic, } from './view/spendManagement/reimbursement/editRemiView/epics/fetchRecommendationsAndUpdateMerchantRecommendationsEpic';
-import { fetchRemiAndInitializeLocalStoreEpic, } from './view/spendManagement/reimbursement/editRemiView/epics/fetchRemiAndInitializeLocalStoreEpic';
+import { fetchRemiAndInitializeLocalStoreEpic, waitForRemiDetailThenInitializeLocalStoreEpic, } from './view/spendManagement/reimbursement/editRemiView/epics/fetchRemiAndInitializeLocalStoreEpic';
 import { initializeRemiToLocalStoreEpic, } from './view/spendManagement/reimbursement/editRemiView/epics/initializeRemiToLocalStoreEpic';
 import { parseReceiptsToRemiEpic, } from './view/spendManagement/reimbursement/editRemiView/epics/parseReceiptsToRemiEpic';
 import { saveRemiDetailEpic, } from './view/spendManagement/reimbursement/editRemiView/epics/saveRemiDetailEpic';
@@ -1576,6 +1576,7 @@ const ALL_EPICS = [
     waitForForecastListThenFetchOpExWithForecastEpic,
     waitForForecastListThenFetchRevenueWithForecastEpic,
     waitForMerchantRecommendationFetchThenUpdateRecommendationInMerchantEpic,
+    waitForRemiDetailThenInitializeLocalStoreEpic,
     waitForVendorByIdThenSaveBillUpdatetoLocalStoreEpic,
     waitForVendorByNameThenParsetoLocalStoreEpic,
     waitForVendorByNameThenUpdateBillDetailEpic,

package/lib/esm/view/balanceSheet/balanceSheetForTimeframeEpic.js

@@ -1,11 +1,15 @@
 import { from, of } from 'rxjs';
-import { catchError, filter, mergeMap } from 'rxjs/operators';
+import { catchError, filter, groupBy, mergeMap, switchMap } from 'rxjs/operators';
 import { updateCalculatedSectionAccountsView, updateSectionAccountsView, } from '../../entity/sectionAccountsView/sectionAccountsViewReducer';
 import { createZeniAPIStatus, isSuccessResponse } from '../../responsePayload';
 import { ALL_ASSETS_SECTIONS, ALL_CURRENT_ASSETS_SECTIONS, ALL_CURRENT_LIABILITIES_SECTIONS, ALL_LIABILITIES_SECTIONS, toSectionId, } from './balanceSheetPayload';
 import { fetchBalanceSheetForTimeframe, updateBalanceSheetForTimeframe, updateBalanceSheetForTimeframeFailure, } from './balanceSheetReducer';
 export const reportIdUniqueKey = () => 'balance_sheet';
-export const fetchBalanceSheetForTimeframeEpic = (actions$, _, zeniAPI) => actions$.pipe(filter(fetchBalanceSheetForTimeframe.match), mergeMap((action) => {
+export const fetchBalanceSheetForTimeframeEpic = (actions$, _, zeniAPI) => actions$.pipe(filter(fetchBalanceSheetForTimeframe.match), 
+// One stream per timeframe: a newer request for the same timeframe (e.g. a
+// custom-date-range change, or a dated fetch right after a default one)
+// cancels the older in-flight request so a stale response can't land last.
+groupBy((action) => action.payload.timeframe), mergeMap((group$) => group$.pipe(switchMap((action) => {
     const getTimeSeriesGroup = (timeframe) => {
         switch (timeframe) {
             case 'month':
@@ -20,7 +24,8 @@ export const fetchBalanceSheetForTimeframeEpic = (actions$, _, zeniAPI) => actio
         is_full_response: action.payload.fetchFullReport,
         time_series_groups: [getTimeSeriesGroup(action.payload.timeframe)],
     };
-    if (action.payload.startDate != null && action.payload.endDate != null) {
+    if (action.payload.startDate != null &&
+        action.payload.endDate != null) {
         queryValue.custom_start_date = action.payload.startDate;
         queryValue.custom_end_date = action.payload.endDate;
     }
@@ -73,4 +78,4 @@ export const fetchBalanceSheetForTimeframeEpic = (actions$, _, zeniAPI) => actio
         }
     }), catchError((error) => of(updateBalanceSheetForTimeframeFailure(createZeniAPIStatus('Unexpected Error', 'Balance Sheet REST API call errored out' +
         JSON.stringify(error)), action.payload.timeframe))));
-}));
+}))));

package/lib/esm/view/balanceSheet/balanceSheetReducer.js

@@ -1,5 +1,6 @@
 import { createSlice } from '@reduxjs/toolkit';
 import { mapReportPayloadV2ToReportV2 } from '../../commonPayloadTypes/v2/viewAndReportPayloadv2';
+import { withFetchedCustomDateRange } from '../../commonStateTypes/coaBalance/coaBalance';
 import { clearAll } from '../../rootActions';
 export const initialState = {
     bookCloseDate: undefined,
@@ -62,6 +63,7 @@ const balanceSheet = createSlice({
                     fetchState: 'In-Progress',
                     error: undefined,
                 };
+                draft.customDateRangeByTimeframe = withFetchedCustomDateRange(draft.customDateRangeByTimeframe, timeframe, action.payload.startDate, action.payload.endDate);
             },
         },
         updateBalanceSheetForTimeframe(draft, action) {

package/lib/esm/view/cashFlow/cashFlowForTimeframeEpic.js

@@ -1,11 +1,15 @@
 import { from, of } from 'rxjs';
-import { catchError, filter, mergeMap } from 'rxjs/operators';
+import { catchError, filter, groupBy, mergeMap, switchMap } from 'rxjs/operators';
 import { updateCalculatedSectionAccountsView, updateSectionAccountsView, } from '../../entity/sectionAccountsView/sectionAccountsViewReducer';
 import { createZeniAPIStatus, isSuccessResponse } from '../../responsePayload';
 import { toCashFlowReportViewID, } from './cashFlowPayload';
 import { fetchCashFlowForTimeframe, updateCashFlowForTimeframe, updateCashFlowForTimeframeFailure, } from './cashFlowReducer';
 export const reportIdUniqueKey = () => 'cash_flow';
-export const fetchCashFlowForTimeframeEpic = (actions$, _, zeniAPI) => actions$.pipe(filter(fetchCashFlowForTimeframe.match), mergeMap((action) => {
+export const fetchCashFlowForTimeframeEpic = (actions$, _, zeniAPI) => actions$.pipe(filter(fetchCashFlowForTimeframe.match), 
+// One stream per timeframe: a newer request for the same timeframe (e.g. a
+// custom-date-range change, or a dated fetch right after a default one)
+// cancels the older in-flight request so a stale response can't land last.
+groupBy((action) => action.payload.timeframe), mergeMap((group$) => group$.pipe(switchMap((action) => {
     const getTimeSeriesGroup = (timeframe) => {
         switch (timeframe) {
             case 'month':
@@ -20,7 +24,8 @@ export const fetchCashFlowForTimeframeEpic = (actions$, _, zeniAPI) => actions$.
         is_full_response: action.payload.fetchFullReport,
         time_series_groups: [getTimeSeriesGroup(action.payload.timeframe)],
     };
-    if (action.payload.startDate != null && action.payload.endDate != null) {
+    if (action.payload.startDate != null &&
+        action.payload.endDate != null) {
         queryValue.custom_start_date = action.payload.startDate;
         queryValue.custom_end_date = action.payload.endDate;
     }
@@ -48,5 +53,6 @@ export const fetchCashFlowForTimeframeEpic = (actions$, _, zeniAPI) => actions$.
         else {
             return of(updateCashFlowForTimeframeFailure(response.status, action.payload.timeframe));
         }
-    }), catchError((error) => of(updateCashFlowForTimeframeFailure(createZeniAPIStatus('Unexpected Error', 'Cash Flow REST API call errored out' + JSON.stringify(error)), action.payload.timeframe))));
-}));
+    }), catchError((error) => of(updateCashFlowForTimeframeFailure(createZeniAPIStatus('Unexpected Error', 'Cash Flow REST API call errored out' +
+        JSON.stringify(error)), action.payload.timeframe))));
+}))));

package/lib/esm/view/cashFlow/cashFlowReducer.js

@@ -1,5 +1,6 @@
 import { createSlice } from '@reduxjs/toolkit';
 import { mapReportPayloadV2ToReportV2 } from '../../commonPayloadTypes/v2/viewAndReportPayloadv2';
+import { withFetchedCustomDateRange } from '../../commonStateTypes/coaBalance/coaBalance';
 import { clearAll } from '../../rootActions';
 export const initialState = {
     fetchState: {
@@ -54,6 +55,7 @@ const cashFlow = createSlice({
                     fetchState: 'In-Progress',
                     error: undefined,
                 };
+                draft.customDateRangeByTimeframe = withFetchedCustomDateRange(draft.customDateRangeByTimeframe, timeframe, action.payload.startDate, action.payload.endDate);
             },
         },
         updateCashFlowForTimeframe(draft, action) {

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

@@ -161,6 +161,23 @@ export const getFinanceStatement = createSelector((state) => state.accountState,
         default:
             break;
     }
+    let customDateRangeByTimeframe;
+    switch (financeStatementState.selectedReportId) {
+        case 'profit_and_loss':
+            customDateRangeByTimeframe =
+                profitAndLossState.pandL.customDateRangeByTimeframe;
+            break;
+        case 'balance_sheet':
+            customDateRangeByTimeframe =
+                balanceSheetState.customDateRangeByTimeframe;
+            break;
+        case 'cash_flow':
+            customDateRangeByTimeframe = cashFlowState.customDateRangeByTimeframe;
+            break;
+        default:
+            break;
+    }
+    const selectedReportCustomDateRange = customDateRangeByTimeframe?.[financeStatementState.timeframe];
     return {
         reportId: 'finance_statement',
         reportTitle: '',
@@ -170,6 +187,7 @@ export const getFinanceStatement = createSelector((state) => state.accountState,
         allTimeframeTicks,
         balancesInTimeframe,
         selectedReportAndTimeframeFetchState,
+        selectedReportCustomDateRange,
         displayOrder: financeStatementState.displayOrder,
         reportFormat: financeStatementState.reportFormat,
         firstMonthOfFY,

package/lib/esm/view/profitAndLoss/profitAndLossForTimeframeEpic.js

@@ -1,12 +1,16 @@
 import { from, of } from 'rxjs';
-import { catchError, filter, mergeMap } from 'rxjs/operators';
+import { catchError, filter, groupBy, mergeMap, switchMap } from 'rxjs/operators';
 import { updateCalculatedSectionAccountsView, updateSectionAccountsView, } from '../../entity/sectionAccountsView/sectionAccountsViewReducer';
 import { createZeniAPIStatus, isSuccessResponse } from '../../responsePayload';
 import { fetchProfitAndLossForTimeframe, updateProfitAndLossForTimeframe, updateProfitAndLossForTimeframeFailure, } from './profitAndLossReducer';
 export const reportIdUniqueKey = (forecastId) => forecastId != null
     ? `profit_and_loss+${forecastId}`
     : 'profit_and_loss';
-export const fetchProfitAndLossForTimeframeEpic = (actions$, _, zeniAPI) => actions$.pipe(filter(fetchProfitAndLossForTimeframe.match), mergeMap((action) => {
+export const fetchProfitAndLossForTimeframeEpic = (actions$, _, zeniAPI) => actions$.pipe(filter(fetchProfitAndLossForTimeframe.match), 
+// One stream per timeframe: a newer request for the same timeframe (e.g. a
+// custom-date-range change, or a dated fetch right after a default one)
+// cancels the older in-flight request so a stale response can't land last.
+groupBy((action) => `${action.payload.forecastId ?? ''}_${action.payload.timeframe}`), mergeMap((group$) => group$.pipe(switchMap((action) => {
     const getTimeSeriesGroup = (timeframe) => {
         switch (timeframe) {
             case 'month':
@@ -25,7 +29,8 @@ export const fetchProfitAndLossForTimeframeEpic = (actions$, _, zeniAPI) => acti
         queryValue.forecast_id = action.payload.forecastId;
         queryValue.is_forecast_vs_actual = true;
     }
-    if (action.payload.startDate != null && action.payload.endDate != null) {
+    if (action.payload.startDate != null &&
+        action.payload.endDate != null) {
         queryValue.custom_start_date = action.payload.startDate;
         queryValue.custom_end_date = action.payload.endDate;
     }
@@ -55,4 +60,4 @@ export const fetchProfitAndLossForTimeframeEpic = (actions$, _, zeniAPI) => acti
             return of(updateProfitAndLossForTimeframeFailure(response.status, action.payload.forecastId, action.payload.timeframe));
         }
     }), catchError((error) => of(updateProfitAndLossForTimeframeFailure(createZeniAPIStatus('Unexpected Error', 'P&L REST API call errored out' + JSON.stringify(error)), action.payload.forecastId, action.payload.timeframe))));
-}));
+}))));

package/lib/esm/view/profitAndLoss/profitAndLossReducer.js

@@ -1,5 +1,6 @@
 import { createSlice } from '@reduxjs/toolkit';
 import { mapReportPayloadV2ToReportV2 } from '../../commonPayloadTypes/v2/viewAndReportPayloadv2';
+import { withFetchedCustomDateRange } from '../../commonStateTypes/coaBalance/coaBalance';
 import { clearAll } from '../../rootActions';
 export const initialPandLState = {
     bookCloseDate: undefined,
@@ -71,7 +72,10 @@ const profitAndLoss = createSlice({
                     fetchState: 'In-Progress',
                     error: undefined,
                 };
-                updateState(draft, action.payload.forecastId, { fetchState });
+                updateState(draft, action.payload.forecastId, {
+                    fetchState,
+                    customDateRangeByTimeframe: withFetchedCustomDateRange(pAndLState.customDateRangeByTimeframe, timeframe, action.payload.startDate, action.payload.endDate),
+                });
             },
         },
         updateProfitAndLossForTimeframe(draft, action) {

package/lib/esm/view/spendManagement/reimbursement/editRemiView/editRemiViewReducer.js

@@ -30,8 +30,13 @@ const editRemiView = createSlice({
                 };
             },
         },
-        indicateReadyToInitializeRemiLocalStore() {
-            // do nothing
+        indicateReadyToInitializeRemiLocalStore: {
+            reducer() {
+                // do nothing
+            },
+            prepare(reimbursementId) {
+                return { payload: { reimbursementId } };
+            },
         },
         fetchRecommendationsAndUpdateMerchantRecommendations: {
             reducer() {
@@ -137,6 +142,21 @@ const editRemiView = createSlice({
                 return { payload: { reimbursementId } };
             },
         },
+        initializeRemiToLocalStoreFailure: {
+            reducer(draft, action) {
+                const { reimbursementId, error } = action.payload;
+                draft.editRemiStateById[reimbursementId] = {
+                    ...draft.editRemiStateById[reimbursementId],
+                    fetchStatus: {
+                        fetchState: 'Error',
+                        error,
+                    },
+                };
+            },
+            prepare(reimbursementId, error) {
+                return { payload: { reimbursementId, error } };
+            },
+        },
         saveRemiUpdatesToLocalStore(draft, action) {
             if (action.payload.reimbursementId != null) {
                 const reimbursementId = action.payload.reimbursementId;
@@ -387,7 +407,7 @@ const editRemiView = createSlice({
         });
     },
 });
-export const { fetchEditRemiDetailPage, fetchRemiAndInitializeLocalStore, initializeRemiToLocalStore, fetchRecommendationsAndUpdateMerchantRecommendations, saveRemiUpdatesToLocalStore, updatesPaymentToInLocalStore, discardRemiUpdatesInLocalStore, removeFileFromRemiUpdatesInLocalStore, saveRemiDetail, saveRemiSuccessOrFailure, parseReceiptsToRemi, fetchCurrencyConversionValue, updateReimbursementType, updateHomeCurrencyConversion, currencyConversionValueSuccessOrFailure, waitForRemiDetailThenInitializeLocalStore, waitForMerchantRecommendationFetchThenUpdateRecommendationInMerchant, updateAddRemiAutoFields, indicateReadyToInitializeRemiLocalStore, updateUploadFetchState, updateRecommendationInMerchant, updateTentativeMerchantNames, clearTentativeMerchantName, clearAddRemiAutoFields, } = editRemiView.actions;
+export const { fetchEditRemiDetailPage, fetchRemiAndInitializeLocalStore, initializeRemiToLocalStore, fetchRecommendationsAndUpdateMerchantRecommendations, saveRemiUpdatesToLocalStore, updatesPaymentToInLocalStore, discardRemiUpdatesInLocalStore, removeFileFromRemiUpdatesInLocalStore, saveRemiDetail, saveRemiSuccessOrFailure, parseReceiptsToRemi, fetchCurrencyConversionValue, updateReimbursementType, updateHomeCurrencyConversion, currencyConversionValueSuccessOrFailure, waitForRemiDetailThenInitializeLocalStore, initializeRemiToLocalStoreFailure, waitForMerchantRecommendationFetchThenUpdateRecommendationInMerchant, updateAddRemiAutoFields, indicateReadyToInitializeRemiLocalStore, updateUploadFetchState, updateRecommendationInMerchant, updateTentativeMerchantNames, clearTentativeMerchantName, clearAddRemiAutoFields, } = editRemiView.actions;
 export default editRemiView.reducer;
 const doUpdateRecommendationForEntity = (draft, lineId, recommendations, shouldAutofill, reimbursementId, reimbursementStageCode) => {
     if (reimbursementId != null) {

package/lib/esm/view/spendManagement/reimbursement/editRemiView/epics/fetchRemiAndInitializeLocalStoreEpic.js

@@ -1,8 +1,9 @@
 import recordGet from 'lodash/get';
-import { from } from 'rxjs';
-import { filter, mergeMap } from 'rxjs/operators';
-import { fetchRemiDetail, } from '../../remiDetailView/remiDetailViewReducer';
-import { fetchRemiAndInitializeLocalStore, initializeRemiToLocalStore, waitForRemiDetailThenInitializeLocalStore, } from '../editRemiViewReducer';
+import { from, merge } from 'rxjs';
+import { filter, map, mergeMap, take, takeUntil, takeWhile, } from 'rxjs/operators';
+import { clearAll } from '../../../../../rootActions';
+import { fetchRemiDetail, updateRemiDetailFetchState, } from '../../remiDetailView/remiDetailViewReducer';
+import { fetchRemiAndInitializeLocalStore, indicateReadyToInitializeRemiLocalStore, initializeRemiToLocalStore, initializeRemiToLocalStoreFailure, waitForRemiDetailThenInitializeLocalStore, } from '../editRemiViewReducer';
 export const fetchRemiAndInitializeLocalStoreEpic = (actions$, state$) => actions$.pipe(filter(fetchRemiAndInitializeLocalStore.match), mergeMap((action) => {
     const { reimbursementId, cacheOverride, isShowDeletedReimbursementEnabled, } = action.payload;
     const state = state$.value;
@@ -35,3 +36,15 @@ export const fetchRemiAndInitializeLocalStoreEpic = (actions$, state$) => action
     }
     return from(remiDetailActions);
 }));
+export const waitForRemiDetailThenInitializeLocalStoreEpic = (actions$) => actions$.pipe(filter(waitForRemiDetailThenInitializeLocalStore.match), mergeMap((action) => {
+    const { reimbursementId } = action.payload;
+    const ready$ = actions$.pipe(filter(indicateReadyToInitializeRemiLocalStore.match), filter((readyAction) => readyAction.payload.reimbursementId === reimbursementId), take(1), map(() => initializeRemiToLocalStore(reimbursementId)));
+    const failed$ = actions$.pipe(filter(updateRemiDetailFetchState.match), filter((fetchStateAction) => fetchStateAction.payload.reimbursementId === reimbursementId &&
+        fetchStateAction.payload.fetchState === 'Error'), map((fetchStateAction) => initializeRemiToLocalStoreFailure(reimbursementId, fetchStateAction.payload.error)));
+    const supersededOrCleared$ = actions$.pipe(filter((nextAction) => clearAll.match(nextAction) ||
+        (waitForRemiDetailThenInitializeLocalStore.match(nextAction) &&
+            nextAction.payload.reimbursementId === reimbursementId)));
+    // An Error does not end the wait: a newer request for the same id may still succeed.
+    // After an Error, supersededOrCleared$ is what ends it.
+    return merge(ready$, failed$).pipe(takeWhile((resultAction) => !initializeRemiToLocalStore.match(resultAction), true), takeUntil(supersededOrCleared$));
+}));

package/lib/esm/view/spendManagement/reimbursement/remiDetailView/epics/fetchRemiDetailEpic.js

@@ -75,7 +75,7 @@ export const fetchRemiDetailEpic = (actions$, state$, zeniAPI) => actions$.pipe(
                         }));
                     }
                 });
-                actions.push(indicateReadyToInitializeRemiLocalStore()); // add dummy action
+                actions.push(indicateReadyToInitializeRemiLocalStore(reimbursementId));
                 if (response.data.transaction?.lines != null &&
                     response.data.transaction.lines.length > 0) {
                     actions.push(fetchDuplicateReimbursement(response.data.transaction.created_by_user_id, false, response.data.transaction.transaction_id));

package/lib/esm/view/transactionList/filterTransactionsByTimePeriod.js

@@ -0,0 +1,18 @@
+import { DEFAULT_DATE_FORMAT, toString, } from '../../commonStateTypes/timePeriod';
+/**
+ * Transaction lists are fetched and cached in month buckets: `splitPeriod`
+ * snaps the first bucket back to the 1st of the month, while the last bucket
+ * is fetched with the real end date. So a period that starts mid-month (e.g. a
+ * drill-down from the custom-date-range column "Jun 17-30 2026") pulls in the
+ * days before its start. Drop those so the list reconciles to the clicked
+ * figure. Periods starting on the 1st (every pre-existing caller) are returned
+ * untouched. Compares calendar days as `YYYY-MM-DD` strings so the viewer's
+ * timezone can't shift the boundary.
+ */
+export const filterTransactionsByTimePeriod = (transactions, period) => {
+    if (period.start.day === 1) {
+        return transactions;
+    }
+    const start = toString(period.start);
+    return transactions.filter((transaction) => transaction.date.format(DEFAULT_DATE_FORMAT) >= start);
+};

package/lib/esm/view/transactionList/transactionListByAccountSelector.js

@@ -2,6 +2,7 @@ import flatMap from 'lodash/flatMap';
 import recordGet from 'lodash/get';
 import orderBy from 'lodash/orderBy';
 import { getSupportedTransactionById } from '../../entity/transaction/transactionSelector';
+import { filterTransactionsByTimePeriod } from './filterTransactionsByTimePeriod';
 import { splitPeriod } from './parallelFetchAccountTransactionListEpic';
 import { isAnyFetchCompleted, reduceFetchState, } from './reduceTransactionListFetchState';
 import { getAcKey, getAcTranKey, } from './transactionListState';
@@ -29,7 +30,7 @@ export const getTransactionListByAccount = (transactionState, transactionListSta
             }
             return value != null;
         });
-        transactions = orderBy(transactionsUnsorted, (value) => value.date.valueOf(), 'desc');
+        transactions = orderBy(filterTransactionsByTimePeriod(transactionsUnsorted, filterByTimePeriod), (value) => value.date.valueOf(), 'desc');
     }
     const key = getAcKey(accountId, accountType);
     const uiState = recordGet(transactionListState.byAccount.transactionListUIStateByAccountKey, key, {});

package/lib/esm/view/transactionList/transactionListByCategoryTypeSelector.js

@@ -2,6 +2,7 @@ import flatMap from 'lodash/flatMap';
 import recordGet from 'lodash/get';
 import orderBy from 'lodash/orderBy';
 import { getSupportedTransactionById } from '../../entity/transaction/transactionSelector';
+import { filterTransactionsByTimePeriod } from './filterTransactionsByTimePeriod';
 import { splitPeriod } from './parallelFetchAccountTransactionListEpic';
 import { isAnyFetchCompleted, reduceFetchState, } from './reduceTransactionListFetchState';
 import { getCategoryTypeTranKey, } from './transactionListState';
@@ -26,7 +27,7 @@ export const getTransactionsListByCategoryType = (transactionState, transactionL
             }
             return value != null;
         });
-        transactions = orderBy(transactionsUnsorted, (value) => value.date.valueOf(), 'desc');
+        transactions = orderBy(filterTransactionsByTimePeriod(transactionsUnsorted, filterByTimePeriod), (value) => value.date.valueOf(), 'desc');
     }
     const uiState = transactionListState.byType[transactionCategoryType].transactionListUIState;
     return {

package/lib/esm/view/transactionList/transactionListByClassSelector.js

@@ -2,6 +2,7 @@ import flatMap from 'lodash/flatMap';
 import recordGet from 'lodash/get';
 import orderBy from 'lodash/orderBy';
 import { getSupportedTransactionById } from '../../entity/transaction/transactionSelector';
+import { filterTransactionsByTimePeriod } from './filterTransactionsByTimePeriod';
 import { splitPeriod } from './parallelFetchAccountTransactionListEpic';
 import { isAnyFetchCompleted, reduceFetchState, } from './reduceTransactionListFetchState';
 import { getClassAcKey, getClassAcTranKey, } from './transactionListState';
@@ -29,7 +30,7 @@ export const getTransactionListByClass = (transactionState, transactionListState
             }
             return value != null;
         });
-        transactions = orderBy(transactionsUnsorted, (value) => value.date.valueOf(), 'desc');
+        transactions = orderBy(filterTransactionsByTimePeriod(transactionsUnsorted, filterByTimePeriod), (value) => value.date.valueOf(), 'desc');
     }
     const key = getClassAcKey(accountId, accountType, classId);
     const uiState = recordGet(transactionListState.byClass.transactionListUIStateByClassKey, key, {});

package/lib/esm/view/transactionList/transactionListByProjectSelector.js

@@ -2,6 +2,7 @@ import flatMap from 'lodash/flatMap';
 import recordGet from 'lodash/get';
 import orderBy from 'lodash/orderBy';
 import { getSupportedTransactionById } from '../../entity/transaction/transactionSelector';
+import { filterTransactionsByTimePeriod } from './filterTransactionsByTimePeriod';
 import { splitPeriod } from './parallelFetchAccountTransactionListEpic';
 import { isAnyFetchCompleted, reduceFetchState, } from './reduceTransactionListFetchState';
 import { getProjectAcKey, getProjectAcTranKey, } from './transactionListState';
@@ -29,7 +30,7 @@ export const getTransactionListByProject = (transactionState, transactionListSta
             }
             return value != null;
         });
-        transactions = orderBy(transactionsUnsorted, (value) => value.date.valueOf(), 'desc');
+        transactions = orderBy(filterTransactionsByTimePeriod(transactionsUnsorted, filterByTimePeriod), (value) => value.date.valueOf(), 'desc');
     }
     const key = getProjectAcKey(accountId, accountType, projectId);
     const uiState = recordGet(transactionListState.byProject.transactionListUIStateByProjectKey, key, {});

package/lib/view/balanceSheet/balanceSheetForTimeframeEpic.js

@@ -9,7 +9,11 @@ const balanceSheetPayload_1 = require("./balanceSheetPayload");
 const balanceSheetReducer_1 = require("./balanceSheetReducer");
 const reportIdUniqueKey = () => 'balance_sheet';
 exports.reportIdUniqueKey = reportIdUniqueKey;
-const fetchBalanceSheetForTimeframeEpic = (actions$, _, zeniAPI) => actions$.pipe((0, operators_1.filter)(balanceSheetReducer_1.fetchBalanceSheetForTimeframe.match), (0, operators_1.mergeMap)((action) => {
+const fetchBalanceSheetForTimeframeEpic = (actions$, _, zeniAPI) => actions$.pipe((0, operators_1.filter)(balanceSheetReducer_1.fetchBalanceSheetForTimeframe.match), 
+// One stream per timeframe: a newer request for the same timeframe (e.g. a
+// custom-date-range change, or a dated fetch right after a default one)
+// cancels the older in-flight request so a stale response can't land last.
+(0, operators_1.groupBy)((action) => action.payload.timeframe), (0, operators_1.mergeMap)((group$) => group$.pipe((0, operators_1.switchMap)((action) => {
     const getTimeSeriesGroup = (timeframe) => {
         switch (timeframe) {
             case 'month':
@@ -24,7 +28,8 @@ const fetchBalanceSheetForTimeframeEpic = (actions$, _, zeniAPI) => actions$.pip
         is_full_response: action.payload.fetchFullReport,
         time_series_groups: [getTimeSeriesGroup(action.payload.timeframe)],
     };
-    if (action.payload.startDate != null && action.payload.endDate != null) {
+    if (action.payload.startDate != null &&
+        action.payload.endDate != null) {
         queryValue.custom_start_date = action.payload.startDate;
         queryValue.custom_end_date = action.payload.endDate;
     }
@@ -77,5 +82,5 @@ const fetchBalanceSheetForTimeframeEpic = (actions$, _, zeniAPI) => actions$.pip
         }
     }), (0, operators_1.catchError)((error) => (0, rxjs_1.of)((0, balanceSheetReducer_1.updateBalanceSheetForTimeframeFailure)((0, responsePayload_1.createZeniAPIStatus)('Unexpected Error', 'Balance Sheet REST API call errored out' +
         JSON.stringify(error)), action.payload.timeframe))));
-}));
+}))));
 exports.fetchBalanceSheetForTimeframeEpic = fetchBalanceSheetForTimeframeEpic;

package/lib/view/balanceSheet/balanceSheetReducer.js

@@ -4,6 +4,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.resetBalanceSheetNodeCollapseState = exports.updateBalanceSheetUIState = exports.updateBalanceSheetForTimeframeFailure = exports.updateBalanceSheetForTimeframe = exports.fetchBalanceSheetForTimeframe = exports.fetchBalanceSheet = exports.initialState = void 0;
 const toolkit_1 = require("@reduxjs/toolkit");
 const viewAndReportPayloadv2_1 = require("../../commonPayloadTypes/v2/viewAndReportPayloadv2");
+const coaBalance_1 = require("../../commonStateTypes/coaBalance/coaBalance");
 const rootActions_1 = require("../../rootActions");
 exports.initialState = {
     bookCloseDate: undefined,
@@ -66,6 +67,7 @@ const balanceSheet = (0, toolkit_1.createSlice)({
                     fetchState: 'In-Progress',
                     error: undefined,
                 };
+                draft.customDateRangeByTimeframe = (0, coaBalance_1.withFetchedCustomDateRange)(draft.customDateRangeByTimeframe, timeframe, action.payload.startDate, action.payload.endDate);
             },
         },
         updateBalanceSheetForTimeframe(draft, action) {

package/lib/view/balanceSheet/balanceSheetState.d.ts

@@ -1,3 +1,4 @@
+import { CustomDateRangeByTimeframe } from '../../commonStateTypes/coaBalance/coaBalance';
 import { FetchStateAndError, ID } from '../../commonStateTypes/common';
 import { Report } from '../../commonStateTypes/viewAndReport/viewAndReport';
 export interface BalanceSheetUIState {
@@ -14,4 +15,5 @@ export interface BalanceSheetState extends Report {
         year: FetchStateAndError;
     };
     uiState: BalanceSheetUIState;
+    customDateRangeByTimeframe?: CustomDateRangeByTimeframe;
 }

package/lib/view/cashFlow/cashFlowForTimeframeEpic.js

@@ -9,7 +9,11 @@ const cashFlowPayload_1 = require("./cashFlowPayload");
 const cashFlowReducer_1 = require("./cashFlowReducer");
 const reportIdUniqueKey = () => 'cash_flow';
 exports.reportIdUniqueKey = reportIdUniqueKey;
-const fetchCashFlowForTimeframeEpic = (actions$, _, zeniAPI) => actions$.pipe((0, operators_1.filter)(cashFlowReducer_1.fetchCashFlowForTimeframe.match), (0, operators_1.mergeMap)((action) => {
+const fetchCashFlowForTimeframeEpic = (actions$, _, zeniAPI) => actions$.pipe((0, operators_1.filter)(cashFlowReducer_1.fetchCashFlowForTimeframe.match), 
+// One stream per timeframe: a newer request for the same timeframe (e.g. a
+// custom-date-range change, or a dated fetch right after a default one)
+// cancels the older in-flight request so a stale response can't land last.
+(0, operators_1.groupBy)((action) => action.payload.timeframe), (0, operators_1.mergeMap)((group$) => group$.pipe((0, operators_1.switchMap)((action) => {
     const getTimeSeriesGroup = (timeframe) => {
         switch (timeframe) {
             case 'month':
@@ -24,7 +28,8 @@ const fetchCashFlowForTimeframeEpic = (actions$, _, zeniAPI) => actions$.pipe((0
         is_full_response: action.payload.fetchFullReport,
         time_series_groups: [getTimeSeriesGroup(action.payload.timeframe)],
     };
-    if (action.payload.startDate != null && action.payload.endDate != null) {
+    if (action.payload.startDate != null &&
+        action.payload.endDate != null) {
         queryValue.custom_start_date = action.payload.startDate;
         queryValue.custom_end_date = action.payload.endDate;
     }
@@ -52,6 +57,7 @@ const fetchCashFlowForTimeframeEpic = (actions$, _, zeniAPI) => actions$.pipe((0
         else {
             return (0, rxjs_1.of)((0, cashFlowReducer_1.updateCashFlowForTimeframeFailure)(response.status, action.payload.timeframe));
         }
-    }), (0, operators_1.catchError)((error) => (0, rxjs_1.of)((0, cashFlowReducer_1.updateCashFlowForTimeframeFailure)((0, responsePayload_1.createZeniAPIStatus)('Unexpected Error', 'Cash Flow REST API call errored out' + JSON.stringify(error)), action.payload.timeframe))));
-}));
+    }), (0, operators_1.catchError)((error) => (0, rxjs_1.of)((0, cashFlowReducer_1.updateCashFlowForTimeframeFailure)((0, responsePayload_1.createZeniAPIStatus)('Unexpected Error', 'Cash Flow REST API call errored out' +
+        JSON.stringify(error)), action.payload.timeframe))));
+}))));
 exports.fetchCashFlowForTimeframeEpic = fetchCashFlowForTimeframeEpic;

package/lib/view/cashFlow/cashFlowReducer.js

@@ -4,6 +4,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.resetCashFlowNodeCollapseState = exports.updateCashFlowUIState = exports.updateCashFlowForTimeframeFailure = exports.updateCashFlowForTimeframe = exports.fetchCashFlowForTimeframe = exports.fetchCashFlow = exports.initialState = void 0;
 const toolkit_1 = require("@reduxjs/toolkit");
 const viewAndReportPayloadv2_1 = require("../../commonPayloadTypes/v2/viewAndReportPayloadv2");
+const coaBalance_1 = require("../../commonStateTypes/coaBalance/coaBalance");
 const rootActions_1 = require("../../rootActions");
 exports.initialState = {
     fetchState: {
@@ -58,6 +59,7 @@ const cashFlow = (0, toolkit_1.createSlice)({
                     fetchState: 'In-Progress',
                     error: undefined,
                 };
+                draft.customDateRangeByTimeframe = (0, coaBalance_1.withFetchedCustomDateRange)(draft.customDateRangeByTimeframe, timeframe, action.payload.startDate, action.payload.endDate);
             },
         },
         updateCashFlowForTimeframe(draft, action) {

package/lib/view/cashFlow/cashFlowState.d.ts

@@ -1,3 +1,4 @@
+import { CustomDateRangeByTimeframe } from '../../commonStateTypes/coaBalance/coaBalance';
 import { ID } from '../../commonStateTypes/common';
 import { FetchStateAndError } from '../../commonStateTypes/common';
 import { Report } from '../../commonStateTypes/viewAndReport/viewAndReport';
@@ -8,6 +9,7 @@ export interface CashFlowState extends Report {
         year: FetchStateAndError;
     };
     uiState: CashFlowUIState;
+    customDateRangeByTimeframe?: CustomDateRangeByTimeframe;
 }
 export interface CashFlowUIState {
     nodeCollapseState: Record<ID, boolean>;

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

@@ -36,5 +36,13 @@ export interface FinanceStatementReport extends SelectorReport {
     selectedReportAndTimeframeFetchState: FetchStateAndError;
     selectedReportId: ReportID;
     dataAvailable?: DataAvailable;
+    /**
+     * Custom start/end the selected report (Accounts view only) was last fetched with for the
+     * selected timeframe; undefined when that fetch used the default periods.
+     */
+    selectedReportCustomDateRange?: {
+        endDate: string;
+        startDate: string;
+    };
 }
 export declare const getFinanceStatement: (state: RootState) => FinanceStatementReport;

package/lib/view/financeStatement/financeStatementSelector.js

@@ -164,6 +164,23 @@ exports.getFinanceStatement = (0, toolkit_1.createSelector)((state) => state.acc
         default:
             break;
     }
+    let customDateRangeByTimeframe;
+    switch (financeStatementState.selectedReportId) {
+        case 'profit_and_loss':
+            customDateRangeByTimeframe =
+                profitAndLossState.pandL.customDateRangeByTimeframe;
+            break;
+        case 'balance_sheet':
+            customDateRangeByTimeframe =
+                balanceSheetState.customDateRangeByTimeframe;
+            break;
+        case 'cash_flow':
+            customDateRangeByTimeframe = cashFlowState.customDateRangeByTimeframe;
+            break;
+        default:
+            break;
+    }
+    const selectedReportCustomDateRange = customDateRangeByTimeframe?.[financeStatementState.timeframe];
     return {
         reportId: 'finance_statement',
         reportTitle: '',
@@ -173,6 +190,7 @@ exports.getFinanceStatement = (0, toolkit_1.createSelector)((state) => state.acc
         allTimeframeTicks,
         balancesInTimeframe,
         selectedReportAndTimeframeFetchState,
+        selectedReportCustomDateRange,
         displayOrder: financeStatementState.displayOrder,
         reportFormat: financeStatementState.reportFormat,
         firstMonthOfFY,

package/lib/view/profitAndLoss/profitAndLossForTimeframeEpic.js

@@ -10,7 +10,11 @@ const reportIdUniqueKey = (forecastId) => forecastId != null
     ? `profit_and_loss+${forecastId}`
     : 'profit_and_loss';
 exports.reportIdUniqueKey = reportIdUniqueKey;
-const fetchProfitAndLossForTimeframeEpic = (actions$, _, zeniAPI) => actions$.pipe((0, operators_1.filter)(profitAndLossReducer_1.fetchProfitAndLossForTimeframe.match), (0, operators_1.mergeMap)((action) => {
+const fetchProfitAndLossForTimeframeEpic = (actions$, _, zeniAPI) => actions$.pipe((0, operators_1.filter)(profitAndLossReducer_1.fetchProfitAndLossForTimeframe.match), 
+// One stream per timeframe: a newer request for the same timeframe (e.g. a
+// custom-date-range change, or a dated fetch right after a default one)
+// cancels the older in-flight request so a stale response can't land last.
+(0, operators_1.groupBy)((action) => `${action.payload.forecastId ?? ''}_${action.payload.timeframe}`), (0, operators_1.mergeMap)((group$) => group$.pipe((0, operators_1.switchMap)((action) => {
     const getTimeSeriesGroup = (timeframe) => {
         switch (timeframe) {
             case 'month':
@@ -29,7 +33,8 @@ const fetchProfitAndLossForTimeframeEpic = (actions$, _, zeniAPI) => actions$.pi
         queryValue.forecast_id = action.payload.forecastId;
         queryValue.is_forecast_vs_actual = true;
     }
-    if (action.payload.startDate != null && action.payload.endDate != null) {
+    if (action.payload.startDate != null &&
+        action.payload.endDate != null) {
         queryValue.custom_start_date = action.payload.startDate;
         queryValue.custom_end_date = action.payload.endDate;
     }
@@ -59,5 +64,5 @@ const fetchProfitAndLossForTimeframeEpic = (actions$, _, zeniAPI) => actions$.pi
             return (0, rxjs_1.of)((0, profitAndLossReducer_1.updateProfitAndLossForTimeframeFailure)(response.status, action.payload.forecastId, action.payload.timeframe));
         }
     }), (0, operators_1.catchError)((error) => (0, rxjs_1.of)((0, profitAndLossReducer_1.updateProfitAndLossForTimeframeFailure)((0, responsePayload_1.createZeniAPIStatus)('Unexpected Error', 'P&L REST API call errored out' + JSON.stringify(error)), action.payload.forecastId, action.payload.timeframe))));
-}));
+}))));
 exports.fetchProfitAndLossForTimeframeEpic = fetchProfitAndLossForTimeframeEpic;

package/lib/view/profitAndLoss/profitAndLossReducer.js

@@ -5,6 +5,7 @@ exports.resetProfitAndLossNodeCollapseState = exports.updateProfitAndLossUIState
 exports.getState = getState;
 const toolkit_1 = require("@reduxjs/toolkit");
 const viewAndReportPayloadv2_1 = require("../../commonPayloadTypes/v2/viewAndReportPayloadv2");
+const coaBalance_1 = require("../../commonStateTypes/coaBalance/coaBalance");
 const rootActions_1 = require("../../rootActions");
 exports.initialPandLState = {
     bookCloseDate: undefined,
@@ -76,7 +77,10 @@ const profitAndLoss = (0, toolkit_1.createSlice)({
                     fetchState: 'In-Progress',
                     error: undefined,
                 };
-                updateState(draft, action.payload.forecastId, { fetchState });
+                updateState(draft, action.payload.forecastId, {
+                    fetchState,
+                    customDateRangeByTimeframe: (0, coaBalance_1.withFetchedCustomDateRange)(pAndLState.customDateRangeByTimeframe, timeframe, action.payload.startDate, action.payload.endDate),
+                });
             },
         },
         updateProfitAndLossForTimeframe(draft, action) {

package/lib/view/profitAndLoss/profitAndLossState.d.ts

@@ -1,4 +1,4 @@
-import { FetchStateByTimeframe } from '../../commonStateTypes/coaBalance/coaBalance';
+import { CustomDateRangeByTimeframe, FetchStateByTimeframe } from '../../commonStateTypes/coaBalance/coaBalance';
 import { ID } from '../../commonStateTypes/common';
 import { Report } from '../../commonStateTypes/viewAndReport/viewAndReport';
 export interface ProfitAndLossUIState {
@@ -11,6 +11,7 @@ export interface ProfitAndLossUIState {
 export interface ProfitAndLossState extends Report {
     fetchState: FetchStateByTimeframe;
     uiState: ProfitAndLossUIState;
+    customDateRangeByTimeframe?: CustomDateRangeByTimeframe;
     forecastId?: ID;
 }
 export interface ProfitAndLossWithForecastState {

package/lib/view/spendManagement/reimbursement/editRemiView/editRemiViewReducer.d.ts

@@ -69,7 +69,10 @@ export declare const fetchEditRemiDetailPage: import("@reduxjs/toolkit").ActionC
     reimbursementId?: ID;
 }, "editRemiView/currencyConversionValueSuccessOrFailure">, waitForRemiDetailThenInitializeLocalStore: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[reimbursementId: string], {
     reimbursementId: string;
-}, "editRemiView/waitForRemiDetailThenInitializeLocalStore", never, never>, waitForMerchantRecommendationFetchThenUpdateRecommendationInMerchant: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[lineId: string, reimbursementId?: string | undefined, merchantId?: string | undefined, merchantName?: string | undefined], {
+}, "editRemiView/waitForRemiDetailThenInitializeLocalStore", never, never>, initializeRemiToLocalStoreFailure: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[reimbursementId: string, error?: ZeniAPIStatus<Record<string, unknown>> | undefined], {
+    reimbursementId: string;
+    error: ZeniAPIStatus<Record<string, unknown>> | undefined;
+}, "editRemiView/initializeRemiToLocalStoreFailure", never, never>, waitForMerchantRecommendationFetchThenUpdateRecommendationInMerchant: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[lineId: string, reimbursementId?: string | undefined, merchantId?: string | undefined, merchantName?: string | undefined], {
     lineId: string;
     reimbursementId: string | undefined;
     merchantId: string | undefined;
@@ -77,7 +80,9 @@ export declare const fetchEditRemiDetailPage: import("@reduxjs/toolkit").ActionC
 }, "editRemiView/waitForMerchantRecommendationFetchThenUpdateRecommendationInMerchant", never, never>, updateAddRemiAutoFields: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
     addRemiAutoFields: Record<ID, AutoFields>;
     reimbursementId?: ID;
-}, "editRemiView/updateAddRemiAutoFields">, indicateReadyToInitializeRemiLocalStore: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<"editRemiView/indicateReadyToInitializeRemiLocalStore">, updateUploadFetchState: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
+}, "editRemiView/updateAddRemiAutoFields">, indicateReadyToInitializeRemiLocalStore: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[reimbursementId: string], {
+    reimbursementId: string;
+}, "editRemiView/indicateReadyToInitializeRemiLocalStore", never, never>, updateUploadFetchState: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
     fetchState: FetchState;
     reimbursementId?: ID;
 }, "editRemiView/updateUploadFetchState">, updateRecommendationInMerchant: import("@reduxjs/toolkit").ActionCreatorWithPayload<{

package/lib/view/spendManagement/reimbursement/editRemiView/editRemiViewReducer.js

@@ -1,7 +1,7 @@
 "use strict";
 var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.clearAddRemiAutoFields = exports.clearTentativeMerchantName = exports.updateTentativeMerchantNames = exports.updateRecommendationInMerchant = exports.updateUploadFetchState = exports.indicateReadyToInitializeRemiLocalStore = exports.updateAddRemiAutoFields = exports.waitForMerchantRecommendationFetchThenUpdateRecommendationInMerchant = exports.waitForRemiDetailThenInitializeLocalStore = exports.currencyConversionValueSuccessOrFailure = exports.updateHomeCurrencyConversion = exports.updateReimbursementType = exports.fetchCurrencyConversionValue = exports.parseReceiptsToRemi = exports.saveRemiSuccessOrFailure = exports.saveRemiDetail = exports.removeFileFromRemiUpdatesInLocalStore = exports.discardRemiUpdatesInLocalStore = exports.updatesPaymentToInLocalStore = exports.saveRemiUpdatesToLocalStore = exports.fetchRecommendationsAndUpdateMerchantRecommendations = exports.initializeRemiToLocalStore = exports.fetchRemiAndInitializeLocalStore = exports.fetchEditRemiDetailPage = exports.initialState = void 0;
+exports.clearAddRemiAutoFields = exports.clearTentativeMerchantName = exports.updateTentativeMerchantNames = exports.updateRecommendationInMerchant = exports.updateUploadFetchState = exports.indicateReadyToInitializeRemiLocalStore = exports.updateAddRemiAutoFields = exports.waitForMerchantRecommendationFetchThenUpdateRecommendationInMerchant = exports.initializeRemiToLocalStoreFailure = exports.waitForRemiDetailThenInitializeLocalStore = exports.currencyConversionValueSuccessOrFailure = exports.updateHomeCurrencyConversion = exports.updateReimbursementType = exports.fetchCurrencyConversionValue = exports.parseReceiptsToRemi = exports.saveRemiSuccessOrFailure = exports.saveRemiDetail = exports.removeFileFromRemiUpdatesInLocalStore = exports.discardRemiUpdatesInLocalStore = exports.updatesPaymentToInLocalStore = exports.saveRemiUpdatesToLocalStore = exports.fetchRecommendationsAndUpdateMerchantRecommendations = exports.initializeRemiToLocalStore = exports.fetchRemiAndInitializeLocalStore = exports.fetchEditRemiDetailPage = exports.initialState = void 0;
 const toolkit_1 = require("@reduxjs/toolkit");
 const amount_1 = require("../../../../commonStateTypes/amount");
 const rootActions_1 = require("../../../../rootActions");
@@ -34,8 +34,13 @@ const editRemiView = (0, toolkit_1.createSlice)({
                 };
             },
         },
-        indicateReadyToInitializeRemiLocalStore() {
-            // do nothing
+        indicateReadyToInitializeRemiLocalStore: {
+            reducer() {
+                // do nothing
+            },
+            prepare(reimbursementId) {
+                return { payload: { reimbursementId } };
+            },
         },
         fetchRecommendationsAndUpdateMerchantRecommendations: {
             reducer() {
@@ -141,6 +146,21 @@ const editRemiView = (0, toolkit_1.createSlice)({
                 return { payload: { reimbursementId } };
             },
         },
+        initializeRemiToLocalStoreFailure: {
+            reducer(draft, action) {
+                const { reimbursementId, error } = action.payload;
+                draft.editRemiStateById[reimbursementId] = {
+                    ...draft.editRemiStateById[reimbursementId],
+                    fetchStatus: {
+                        fetchState: 'Error',
+                        error,
+                    },
+                };
+            },
+            prepare(reimbursementId, error) {
+                return { payload: { reimbursementId, error } };
+            },
+        },
         saveRemiUpdatesToLocalStore(draft, action) {
             if (action.payload.reimbursementId != null) {
                 const reimbursementId = action.payload.reimbursementId;
@@ -391,7 +411,7 @@ const editRemiView = (0, toolkit_1.createSlice)({
         });
     },
 });
-_a = editRemiView.actions, exports.fetchEditRemiDetailPage = _a.fetchEditRemiDetailPage, exports.fetchRemiAndInitializeLocalStore = _a.fetchRemiAndInitializeLocalStore, exports.initializeRemiToLocalStore = _a.initializeRemiToLocalStore, exports.fetchRecommendationsAndUpdateMerchantRecommendations = _a.fetchRecommendationsAndUpdateMerchantRecommendations, exports.saveRemiUpdatesToLocalStore = _a.saveRemiUpdatesToLocalStore, exports.updatesPaymentToInLocalStore = _a.updatesPaymentToInLocalStore, exports.discardRemiUpdatesInLocalStore = _a.discardRemiUpdatesInLocalStore, exports.removeFileFromRemiUpdatesInLocalStore = _a.removeFileFromRemiUpdatesInLocalStore, exports.saveRemiDetail = _a.saveRemiDetail, exports.saveRemiSuccessOrFailure = _a.saveRemiSuccessOrFailure, exports.parseReceiptsToRemi = _a.parseReceiptsToRemi, exports.fetchCurrencyConversionValue = _a.fetchCurrencyConversionValue, exports.updateReimbursementType = _a.updateReimbursementType, exports.updateHomeCurrencyConversion = _a.updateHomeCurrencyConversion, exports.currencyConversionValueSuccessOrFailure = _a.currencyConversionValueSuccessOrFailure, exports.waitForRemiDetailThenInitializeLocalStore = _a.waitForRemiDetailThenInitializeLocalStore, exports.waitForMerchantRecommendationFetchThenUpdateRecommendationInMerchant = _a.waitForMerchantRecommendationFetchThenUpdateRecommendationInMerchant, exports.updateAddRemiAutoFields = _a.updateAddRemiAutoFields, exports.indicateReadyToInitializeRemiLocalStore = _a.indicateReadyToInitializeRemiLocalStore, exports.updateUploadFetchState = _a.updateUploadFetchState, exports.updateRecommendationInMerchant = _a.updateRecommendationInMerchant, exports.updateTentativeMerchantNames = _a.updateTentativeMerchantNames, exports.clearTentativeMerchantName = _a.clearTentativeMerchantName, exports.clearAddRemiAutoFields = _a.clearAddRemiAutoFields;
+_a = editRemiView.actions, exports.fetchEditRemiDetailPage = _a.fetchEditRemiDetailPage, exports.fetchRemiAndInitializeLocalStore = _a.fetchRemiAndInitializeLocalStore, exports.initializeRemiToLocalStore = _a.initializeRemiToLocalStore, exports.fetchRecommendationsAndUpdateMerchantRecommendations = _a.fetchRecommendationsAndUpdateMerchantRecommendations, exports.saveRemiUpdatesToLocalStore = _a.saveRemiUpdatesToLocalStore, exports.updatesPaymentToInLocalStore = _a.updatesPaymentToInLocalStore, exports.discardRemiUpdatesInLocalStore = _a.discardRemiUpdatesInLocalStore, exports.removeFileFromRemiUpdatesInLocalStore = _a.removeFileFromRemiUpdatesInLocalStore, exports.saveRemiDetail = _a.saveRemiDetail, exports.saveRemiSuccessOrFailure = _a.saveRemiSuccessOrFailure, exports.parseReceiptsToRemi = _a.parseReceiptsToRemi, exports.fetchCurrencyConversionValue = _a.fetchCurrencyConversionValue, exports.updateReimbursementType = _a.updateReimbursementType, exports.updateHomeCurrencyConversion = _a.updateHomeCurrencyConversion, exports.currencyConversionValueSuccessOrFailure = _a.currencyConversionValueSuccessOrFailure, exports.waitForRemiDetailThenInitializeLocalStore = _a.waitForRemiDetailThenInitializeLocalStore, exports.initializeRemiToLocalStoreFailure = _a.initializeRemiToLocalStoreFailure, exports.waitForMerchantRecommendationFetchThenUpdateRecommendationInMerchant = _a.waitForMerchantRecommendationFetchThenUpdateRecommendationInMerchant, exports.updateAddRemiAutoFields = _a.updateAddRemiAutoFields, exports.indicateReadyToInitializeRemiLocalStore = _a.indicateReadyToInitializeRemiLocalStore, exports.updateUploadFetchState = _a.updateUploadFetchState, exports.updateRecommendationInMerchant = _a.updateRecommendationInMerchant, exports.updateTentativeMerchantNames = _a.updateTentativeMerchantNames, exports.clearTentativeMerchantName = _a.clearTentativeMerchantName, exports.clearAddRemiAutoFields = _a.clearAddRemiAutoFields;
 exports.default = editRemiView.reducer;
 const doUpdateRecommendationForEntity = (draft, lineId, recommendations, shouldAutofill, reimbursementId, reimbursementStageCode) => {
     if (reimbursementId != null) {

package/lib/view/spendManagement/reimbursement/editRemiView/epics/fetchRemiAndInitializeLocalStoreEpic.d.ts

@@ -1,6 +1,9 @@
 import { ActionsObservable, StateObservable } from 'redux-observable';
+import { Observable } from 'rxjs';
+import { clearAll } from '../../../../../rootActions';
 import { RootState } from '../../../../../rootStateTypes';
-import { fetchRemiDetail, updateRemiDetail } from '../../remiDetailView/remiDetailViewReducer';
-import { fetchRemiAndInitializeLocalStore, initializeRemiToLocalStore, waitForRemiDetailThenInitializeLocalStore } from '../editRemiViewReducer';
-export type ActionType = ReturnType<typeof waitForRemiDetailThenInitializeLocalStore> | ReturnType<typeof fetchRemiDetail> | ReturnType<typeof updateRemiDetail> | ReturnType<typeof initializeRemiToLocalStore> | ReturnType<typeof fetchRemiAndInitializeLocalStore>;
-export declare const fetchRemiAndInitializeLocalStoreEpic: (actions$: ActionsObservable<ActionType>, state$: StateObservable<RootState>) => import("rxjs").Observable<ActionType>;
+import { fetchRemiDetail, updateRemiDetail, updateRemiDetailFetchState } from '../../remiDetailView/remiDetailViewReducer';
+import { fetchRemiAndInitializeLocalStore, indicateReadyToInitializeRemiLocalStore, initializeRemiToLocalStore, initializeRemiToLocalStoreFailure, waitForRemiDetailThenInitializeLocalStore } from '../editRemiViewReducer';
+export type ActionType = ReturnType<typeof waitForRemiDetailThenInitializeLocalStore> | ReturnType<typeof fetchRemiDetail> | ReturnType<typeof updateRemiDetail> | ReturnType<typeof updateRemiDetailFetchState> | ReturnType<typeof initializeRemiToLocalStore> | ReturnType<typeof fetchRemiAndInitializeLocalStore> | ReturnType<typeof indicateReadyToInitializeRemiLocalStore> | ReturnType<typeof initializeRemiToLocalStoreFailure> | ReturnType<typeof clearAll>;
+export declare const fetchRemiAndInitializeLocalStoreEpic: (actions$: ActionsObservable<ActionType>, state$: StateObservable<RootState>) => Observable<ActionType>;
+export declare const waitForRemiDetailThenInitializeLocalStoreEpic: (actions$: ActionsObservable<ActionType>) => Observable<ActionType>;

package/lib/view/spendManagement/reimbursement/editRemiView/epics/fetchRemiAndInitializeLocalStoreEpic.js

@@ -3,10 +3,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.fetchRemiAndInitializeLocalStoreEpic = void 0;
+exports.waitForRemiDetailThenInitializeLocalStoreEpic = exports.fetchRemiAndInitializeLocalStoreEpic = void 0;
 const get_1 = __importDefault(require("lodash/get"));
 const rxjs_1 = require("rxjs");
 const operators_1 = require("rxjs/operators");
+const rootActions_1 = require("../../../../../rootActions");
 const remiDetailViewReducer_1 = require("../../remiDetailView/remiDetailViewReducer");
 const editRemiViewReducer_1 = require("../editRemiViewReducer");
 const fetchRemiAndInitializeLocalStoreEpic = (actions$, state$) => actions$.pipe((0, operators_1.filter)(editRemiViewReducer_1.fetchRemiAndInitializeLocalStore.match), (0, operators_1.mergeMap)((action) => {
@@ -42,3 +43,16 @@ const fetchRemiAndInitializeLocalStoreEpic = (actions$, state$) => actions$.pipe
     return (0, rxjs_1.from)(remiDetailActions);
 }));
 exports.fetchRemiAndInitializeLocalStoreEpic = fetchRemiAndInitializeLocalStoreEpic;
+const waitForRemiDetailThenInitializeLocalStoreEpic = (actions$) => actions$.pipe((0, operators_1.filter)(editRemiViewReducer_1.waitForRemiDetailThenInitializeLocalStore.match), (0, operators_1.mergeMap)((action) => {
+    const { reimbursementId } = action.payload;
+    const ready$ = actions$.pipe((0, operators_1.filter)(editRemiViewReducer_1.indicateReadyToInitializeRemiLocalStore.match), (0, operators_1.filter)((readyAction) => readyAction.payload.reimbursementId === reimbursementId), (0, operators_1.take)(1), (0, operators_1.map)(() => (0, editRemiViewReducer_1.initializeRemiToLocalStore)(reimbursementId)));
+    const failed$ = actions$.pipe((0, operators_1.filter)(remiDetailViewReducer_1.updateRemiDetailFetchState.match), (0, operators_1.filter)((fetchStateAction) => fetchStateAction.payload.reimbursementId === reimbursementId &&
+        fetchStateAction.payload.fetchState === 'Error'), (0, operators_1.map)((fetchStateAction) => (0, editRemiViewReducer_1.initializeRemiToLocalStoreFailure)(reimbursementId, fetchStateAction.payload.error)));
+    const supersededOrCleared$ = actions$.pipe((0, operators_1.filter)((nextAction) => rootActions_1.clearAll.match(nextAction) ||
+        (editRemiViewReducer_1.waitForRemiDetailThenInitializeLocalStore.match(nextAction) &&
+            nextAction.payload.reimbursementId === reimbursementId)));
+    // An Error does not end the wait: a newer request for the same id may still succeed.
+    // After an Error, supersededOrCleared$ is what ends it.
+    return (0, rxjs_1.merge)(ready$, failed$).pipe((0, operators_1.takeWhile)((resultAction) => !editRemiViewReducer_1.initializeRemiToLocalStore.match(resultAction), true), (0, operators_1.takeUntil)(supersededOrCleared$));
+}));
+exports.waitForRemiDetailThenInitializeLocalStoreEpic = waitForRemiDetailThenInitializeLocalStoreEpic;

package/lib/view/spendManagement/reimbursement/remiDetailView/epics/fetchRemiDetailEpic.js

@@ -81,7 +81,7 @@ const fetchRemiDetailEpic = (actions$, state$, zeniAPI) => actions$.pipe((0, ope
                         }));
                     }
                 });
-                actions.push((0, editRemiViewReducer_1.indicateReadyToInitializeRemiLocalStore)()); // add dummy action
+                actions.push((0, editRemiViewReducer_1.indicateReadyToInitializeRemiLocalStore)(reimbursementId));
                 if (response.data.transaction?.lines != null &&
                     response.data.transaction.lines.length > 0) {
                     actions.push((0, remiDetailViewReducer_1.fetchDuplicateReimbursement)(response.data.transaction.created_by_user_id, false, response.data.transaction.transaction_id));

package/lib/view/transactionList/filterTransactionsByTimePeriod.d.ts

@@ -0,0 +1,15 @@
+import { TimePeriod } from '../../commonStateTypes/timePeriod';
+import { ZeniDate } from '../../zeniDayJS';
+/**
+ * Transaction lists are fetched and cached in month buckets: `splitPeriod`
+ * snaps the first bucket back to the 1st of the month, while the last bucket
+ * is fetched with the real end date. So a period that starts mid-month (e.g. a
+ * drill-down from the custom-date-range column "Jun 17-30 2026") pulls in the
+ * days before its start. Drop those so the list reconciles to the clicked
+ * figure. Periods starting on the 1st (every pre-existing caller) are returned
+ * untouched. Compares calendar days as `YYYY-MM-DD` strings so the viewer's
+ * timezone can't shift the boundary.
+ */
+export declare const filterTransactionsByTimePeriod: <T extends {
+    date: ZeniDate;
+}>(transactions: T[], period: TimePeriod) => T[];

package/lib/view/transactionList/filterTransactionsByTimePeriod.js

@@ -0,0 +1,22 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.filterTransactionsByTimePeriod = void 0;
+const timePeriod_1 = require("../../commonStateTypes/timePeriod");
+/**
+ * Transaction lists are fetched and cached in month buckets: `splitPeriod`
+ * snaps the first bucket back to the 1st of the month, while the last bucket
+ * is fetched with the real end date. So a period that starts mid-month (e.g. a
+ * drill-down from the custom-date-range column "Jun 17-30 2026") pulls in the
+ * days before its start. Drop those so the list reconciles to the clicked
+ * figure. Periods starting on the 1st (every pre-existing caller) are returned
+ * untouched. Compares calendar days as `YYYY-MM-DD` strings so the viewer's
+ * timezone can't shift the boundary.
+ */
+const filterTransactionsByTimePeriod = (transactions, period) => {
+    if (period.start.day === 1) {
+        return transactions;
+    }
+    const start = (0, timePeriod_1.toString)(period.start);
+    return transactions.filter((transaction) => transaction.date.format(timePeriod_1.DEFAULT_DATE_FORMAT) >= start);
+};
+exports.filterTransactionsByTimePeriod = filterTransactionsByTimePeriod;

package/lib/view/transactionList/transactionListByAccountSelector.js

@@ -8,6 +8,7 @@ const flatMap_1 = __importDefault(require("lodash/flatMap"));
 const get_1 = __importDefault(require("lodash/get"));
 const orderBy_1 = __importDefault(require("lodash/orderBy"));
 const transactionSelector_1 = require("../../entity/transaction/transactionSelector");
+const filterTransactionsByTimePeriod_1 = require("./filterTransactionsByTimePeriod");
 const parallelFetchAccountTransactionListEpic_1 = require("./parallelFetchAccountTransactionListEpic");
 const reduceTransactionListFetchState_1 = require("./reduceTransactionListFetchState");
 const transactionListState_1 = require("./transactionListState");
@@ -35,7 +36,7 @@ const getTransactionListByAccount = (transactionState, transactionListState, acc
             }
             return value != null;
         });
-        transactions = (0, orderBy_1.default)(transactionsUnsorted, (value) => value.date.valueOf(), 'desc');
+        transactions = (0, orderBy_1.default)((0, filterTransactionsByTimePeriod_1.filterTransactionsByTimePeriod)(transactionsUnsorted, filterByTimePeriod), (value) => value.date.valueOf(), 'desc');
     }
     const key = (0, transactionListState_1.getAcKey)(accountId, accountType);
     const uiState = (0, get_1.default)(transactionListState.byAccount.transactionListUIStateByAccountKey, key, {});

package/lib/view/transactionList/transactionListByCategoryTypeSelector.js

@@ -8,6 +8,7 @@ const flatMap_1 = __importDefault(require("lodash/flatMap"));
 const get_1 = __importDefault(require("lodash/get"));
 const orderBy_1 = __importDefault(require("lodash/orderBy"));
 const transactionSelector_1 = require("../../entity/transaction/transactionSelector");
+const filterTransactionsByTimePeriod_1 = require("./filterTransactionsByTimePeriod");
 const parallelFetchAccountTransactionListEpic_1 = require("./parallelFetchAccountTransactionListEpic");
 const reduceTransactionListFetchState_1 = require("./reduceTransactionListFetchState");
 const transactionListState_1 = require("./transactionListState");
@@ -32,7 +33,7 @@ const getTransactionsListByCategoryType = (transactionState, transactionListStat
             }
             return value != null;
         });
-        transactions = (0, orderBy_1.default)(transactionsUnsorted, (value) => value.date.valueOf(), 'desc');
+        transactions = (0, orderBy_1.default)((0, filterTransactionsByTimePeriod_1.filterTransactionsByTimePeriod)(transactionsUnsorted, filterByTimePeriod), (value) => value.date.valueOf(), 'desc');
     }
     const uiState = transactionListState.byType[transactionCategoryType].transactionListUIState;
     return {

package/lib/view/transactionList/transactionListByClassSelector.js

@@ -8,6 +8,7 @@ const flatMap_1 = __importDefault(require("lodash/flatMap"));
 const get_1 = __importDefault(require("lodash/get"));
 const orderBy_1 = __importDefault(require("lodash/orderBy"));
 const transactionSelector_1 = require("../../entity/transaction/transactionSelector");
+const filterTransactionsByTimePeriod_1 = require("./filterTransactionsByTimePeriod");
 const parallelFetchAccountTransactionListEpic_1 = require("./parallelFetchAccountTransactionListEpic");
 const reduceTransactionListFetchState_1 = require("./reduceTransactionListFetchState");
 const transactionListState_1 = require("./transactionListState");
@@ -35,7 +36,7 @@ const getTransactionListByClass = (transactionState, transactionListState, accou
             }
             return value != null;
         });
-        transactions = (0, orderBy_1.default)(transactionsUnsorted, (value) => value.date.valueOf(), 'desc');
+        transactions = (0, orderBy_1.default)((0, filterTransactionsByTimePeriod_1.filterTransactionsByTimePeriod)(transactionsUnsorted, filterByTimePeriod), (value) => value.date.valueOf(), 'desc');
     }
     const key = (0, transactionListState_1.getClassAcKey)(accountId, accountType, classId);
     const uiState = (0, get_1.default)(transactionListState.byClass.transactionListUIStateByClassKey, key, {});

package/lib/view/transactionList/transactionListByProjectSelector.js

@@ -8,6 +8,7 @@ const flatMap_1 = __importDefault(require("lodash/flatMap"));
 const get_1 = __importDefault(require("lodash/get"));
 const orderBy_1 = __importDefault(require("lodash/orderBy"));
 const transactionSelector_1 = require("../../entity/transaction/transactionSelector");
+const filterTransactionsByTimePeriod_1 = require("./filterTransactionsByTimePeriod");
 const parallelFetchAccountTransactionListEpic_1 = require("./parallelFetchAccountTransactionListEpic");
 const reduceTransactionListFetchState_1 = require("./reduceTransactionListFetchState");
 const transactionListState_1 = require("./transactionListState");
@@ -35,7 +36,7 @@ const getTransactionListByProject = (transactionState, transactionListState, acc
             }
             return value != null;
         });
-        transactions = (0, orderBy_1.default)(transactionsUnsorted, (value) => value.date.valueOf(), 'desc');
+        transactions = (0, orderBy_1.default)((0, filterTransactionsByTimePeriod_1.filterTransactionsByTimePeriod)(transactionsUnsorted, filterByTimePeriod), (value) => value.date.valueOf(), 'desc');
     }
     const key = (0, transactionListState_1.getProjectAcKey)(accountId, accountType, projectId);
     const uiState = (0, get_1.default)(transactionListState.byProject.transactionListUIStateByProjectKey, key, {});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zeniai/client-epic-state",
-  "version": "5.3.19",
+  "version": "5.3.20",
   "description": "Shared module between Web & Mobile containing required abstractions for state management, async network communication. ",
   "main": "lib/index.js",
   "module": "lib/esm/index.js",