@zeniai/client-epic-state 5.2.35-beta8MM → 5.2.35-beta9MM

package/lib/entity/actualMatching/actualMatchingPayload.js

@@ -12,6 +12,12 @@ const MATCH_KINDS = [
 function toMatchKind(raw) {
     return (0, stringToUnion_1.stringToUnion)(raw, MATCH_KINDS);
 }
+function toMatchMemberAccrual(member, matchCurrencyCode) {
+    const currency = member.currency != null && member.currency !== ''
+        ? member.currency
+        : matchCurrencyCode;
+    return (0, jeSchedulesPayload_1.toJEOneTimeAccrual)({ ...member, currency });
+}
 function toActualMatchingMatch(payload, fallbackCurrency) {
     const currencyCode = payload.currency_code != null && payload.currency_code !== ''
         ? payload.currency_code
@@ -34,7 +40,7 @@ function toActualMatchingMatch(payload, fallbackCurrency) {
         matchShape: payload.match_shape ?? undefined,
         accruedAmount: (0, amount_1.toAmount)(payload.accrued_amount, currencyCode, currencySymbol),
         actualAmount: (0, amount_1.toAmount)(payload.actual_amount, currencyCode, currencySymbol),
-        members: payload.members.map(jeSchedulesPayload_1.toJEOneTimeAccrual),
-        leftovers: (payload.leftovers ?? []).map(jeSchedulesPayload_1.toJEOneTimeAccrual),
+        members: payload.members.map((member) => toMatchMemberAccrual(member, currencyCode)),
+        leftovers: (payload.leftovers ?? []).map((member) => toMatchMemberAccrual(member, currencyCode)),
     };
 }

package/lib/entity/aiCfo/aiCfoReducer.js

@@ -7,6 +7,7 @@ const rootActions_1 = require("../../rootActions");
 const zeniDayJS_1 = require("../../zeniDayJS");
 const aiCfoState_1 = require("./aiCfoState");
 exports.initialAiCfoState = {
+    deletedChatSessionIds: [],
     aiCfoByChatSessionId: {},
     partialQuestionAnswers: {},
     syntheticAnswersByChatSessionId: {},
@@ -474,6 +475,11 @@ const toResponseBlockType = (answer, userId) => {
         createdAt: (0, zeniDayJS_1.date)(timestamp),
     };
 };
+// How many deleted session ids to remember. The tombstone only has to outlive
+// an in-flight history request, which is seconds, so this is generous. Capped
+// because `clearSession` would otherwise grow the array for the life of the
+// store and every `setChatHistory` scans it.
+const DELETED_SESSION_MEMORY = 100;
 const aiCfo = (0, toolkit_1.createSlice)({
     name: 'aiCfo',
     initialState: exports.initialAiCfoState,
@@ -495,8 +501,25 @@ const aiCfo = (0, toolkit_1.createSlice)({
         setSessions(draft, action) {
             action.payload.forEach((chatSessionPayload) => {
                 const { chat_session_id } = chatSessionPayload;
-                // This is to prevent overwriting the session if it is already in state
-                if (draft.aiCfoByChatSessionId[chat_session_id] == null) {
+                if (draft.aiCfoByChatSessionId[chat_session_id] != null) {
+                    // The list is authoritative for a session's metadata, and a session
+                    // seeded by `setChatHistory` has guessed metadata: no summary, and a
+                    // `createdAt` taken from one page of a newest-first paginated
+                    // history, which is later than the session really started.
+                    // `questionAnswers` is left alone — the list must never wipe a
+                    // thread that is on screen.
+                    const entry = draft.aiCfoByChatSessionId[chat_session_id];
+                    const incoming = toChatSession(chatSessionPayload);
+                    entry.chatSession = {
+                        ...incoming,
+                        // Never downgrade a title already in state: a page of the list can
+                        // carry a nullish summary, and assigning it wholesale would blank
+                        // a header that was correct.
+                        chatSessionSummary: incoming.chatSessionSummary ??
+                            entry.chatSession.chatSessionSummary,
+                    };
+                }
+                else {
                     draft.aiCfoByChatSessionId[chat_session_id] = {
                         chatSession: toChatSession(chatSessionPayload),
                         questionAnswers: [],
@@ -509,8 +532,52 @@ const aiCfo = (0, toolkit_1.createSlice)({
         setChatHistory(draft, action) {
             const { chatSessionId, history, isPaginationComplete = false, } = action.payload;
             if (draft.aiCfoByChatSessionId[chatSessionId] == null) {
-                console.warn(`session with id ${chatSessionId} not found in setChatHistory`);
-                return;
+                // Sessions created server-side (a routine run) are opened by deep
+                // link, so their history can arrive before the sessions list has
+                // registered them. Dropping it here loses the messages for good: the
+                // response's null page token sets `hasMore: false`, which is the
+                // condition the refetch is guarded on. The response is itself proof
+                // the session exists, so seed the entry from the messages.
+                if (history.length === 0) {
+                    return;
+                }
+                // A deleted session. Its history request is never cancelled
+                // (`mergeMap`), so seeding would resurrect the conversation into the
+                // rail, where clicking it 404s. Only this path is guarded:
+                // `clearSession` is optimistic, so if the server still lists the
+                // session, `setSessions` re-adding it is correct.
+                if (draft.deletedChatSessionIds?.includes(chatSessionId) === true) {
+                    return;
+                }
+                // The human's id, taken off a message they actually sent. The API
+                // returns newest first, so `history[0]` is usually the agent's reply,
+                // and `chatSession.userId` is read as "whose conversation is this".
+                const owner = history.find((message) => message.sender === 'user') ?? history[0];
+                // Oldest message in the page, not `history[0]`: a session cannot
+                // start after its own messages, and the API returns newest first.
+                //
+                // Compared as instants, not strings. The wire format is an RFC 1123
+                // HTTP-date ("Thu, 03 Sep 2026 12:34:56 GMT") because `set_200`
+                // bypasses chat's isoformat encoder, and lexically "Mon…" precedes
+                // "Sat…" while being the later day. Unparseable values are filtered
+                // out, not compared: every comparison against NaN is false, so one
+                // used as the reduce's seed would carry through to an Invalid Date.
+                const oldest = history
+                    .map((message) => ({ at: Date.parse(message.created_at), message }))
+                    .filter(({ at }) => !Number.isNaN(at))
+                    .reduce((min, entry) => (min == null || entry.at < min.at ? entry : min), undefined)?.message;
+                draft.aiCfoByChatSessionId[chatSessionId] = {
+                    chatSession: {
+                        chatSessionId,
+                        userId: owner.user_id,
+                        chatSessionSummary: undefined,
+                        // Nothing in the page carried a usable timestamp. "Now" is a
+                        // guess, but it is a sane one and it keeps the row out of the
+                        // Invalid-Date behaviour above; the sessions list corrects it.
+                        createdAt: oldest != null ? (0, zeniDayJS_1.date)(oldest.created_at) : (0, zeniDayJS_1.dateNow)(),
+                    },
+                    questionAnswers: [],
+                };
             }
             const session = draft.aiCfoByChatSessionId[chatSessionId];
             // Check if we have an existing partial Q&A pair for this session
@@ -790,6 +857,13 @@ const aiCfo = (0, toolkit_1.createSlice)({
         },
         clearSession(draft, action) {
             const sessionId = action.payload;
+            draft.deletedChatSessionIds ?? (draft.deletedChatSessionIds = []);
+            if (!draft.deletedChatSessionIds.includes(sessionId)) {
+                draft.deletedChatSessionIds.push(sessionId);
+                if (draft.deletedChatSessionIds.length > DELETED_SESSION_MEMORY) {
+                    draft.deletedChatSessionIds.splice(0, draft.deletedChatSessionIds.length - DELETED_SESSION_MEMORY);
+                }
+            }
             delete draft.aiCfoByChatSessionId[sessionId];
             delete draft.syntheticAnswersByChatSessionId[sessionId];
             if (draft.partialQuestionAnswers?.[sessionId] != null) {

package/lib/entity/aiCfo/aiCfoState.d.ts

@@ -241,4 +241,20 @@ export interface AiCfoState {
     aiCfoByChatSessionId: Record<ID, ChatSessionWithMessages>;
     partialQuestionAnswers: Record<ID, AiCfoQuestionWithAnswer | undefined>;
     syntheticAnswersByChatSessionId: Record<ID, SyntheticAiCfoAnswer[]>;
+    /**
+     * Sessions this client has deleted. `setChatHistory` seeds an entry for a
+     * session it has not seen, so without a tombstone an in-flight history
+     * response arriving after the delete would recreate the whole conversation
+     * and put the deleted chat back in the rail. `fetchChatHistoryEpic` uses
+     * `mergeMap`, so that request is never cancelled. Same race, and the same
+     * reasoning, as `deletedScheduleIds` on the view slice. Bounded — it only
+     * needs to outlive an in-flight request.
+     *
+     * Optional because `AiCfoState` is public API of a package four apps
+     * consume: making it required turns a bug fix into a compile break for
+     * every literal of this type, in this repo and in theirs. The reducer's
+     * initial state always sets it, so it is only ever absent on a
+     * hand-built literal — which is exactly the case that must keep working.
+     */
+    deletedChatSessionIds?: ID[];
 }

package/lib/esm/entity/actualMatching/actualMatchingPayload.js

@@ -9,6 +9,12 @@ const MATCH_KINDS = [
 function toMatchKind(raw) {
     return stringToUnion(raw, MATCH_KINDS);
 }
+function toMatchMemberAccrual(member, matchCurrencyCode) {
+    const currency = member.currency != null && member.currency !== ''
+        ? member.currency
+        : matchCurrencyCode;
+    return toJEOneTimeAccrual({ ...member, currency });
+}
 export function toActualMatchingMatch(payload, fallbackCurrency) {
     const currencyCode = payload.currency_code != null && payload.currency_code !== ''
         ? payload.currency_code
@@ -31,7 +37,7 @@ export function toActualMatchingMatch(payload, fallbackCurrency) {
         matchShape: payload.match_shape ?? undefined,
         accruedAmount: toAmount(payload.accrued_amount, currencyCode, currencySymbol),
         actualAmount: toAmount(payload.actual_amount, currencyCode, currencySymbol),
-        members: payload.members.map(toJEOneTimeAccrual),
-        leftovers: (payload.leftovers ?? []).map(toJEOneTimeAccrual),
+        members: payload.members.map((member) => toMatchMemberAccrual(member, currencyCode)),
+        leftovers: (payload.leftovers ?? []).map((member) => toMatchMemberAccrual(member, currencyCode)),
     };
 }

package/lib/esm/entity/aiCfo/aiCfoReducer.js

@@ -1,8 +1,9 @@
 import { createSlice } from '@reduxjs/toolkit';
 import { clearAll } from '../../rootActions';
-import { date as zeniDate } from '../../zeniDayJS';
+import { dateNow, date as zeniDate } from '../../zeniDayJS';
 import { ALL_AI_CFO_ANSWER_RESPONSE_TYPES, toAiCfoAnswerResponseType, toAiCfoAnswerResponseTypeStrict, toAiCfoAnswerStateType, toAiCfoVisualizationTypeStrict, toInteractiveFormTypeStrict, toMessageSender, toMessageType, toYFormatScaleStrict, toYFormatTypeStrict, toYFormatUnitStrict, } from './aiCfoState';
 export const initialAiCfoState = {
+    deletedChatSessionIds: [],
     aiCfoByChatSessionId: {},
     partialQuestionAnswers: {},
     syntheticAnswersByChatSessionId: {},
@@ -468,6 +469,11 @@ const toResponseBlockType = (answer, userId) => {
         createdAt: zeniDate(timestamp),
     };
 };
+// How many deleted session ids to remember. The tombstone only has to outlive
+// an in-flight history request, which is seconds, so this is generous. Capped
+// because `clearSession` would otherwise grow the array for the life of the
+// store and every `setChatHistory` scans it.
+const DELETED_SESSION_MEMORY = 100;
 const aiCfo = createSlice({
     name: 'aiCfo',
     initialState: initialAiCfoState,
@@ -489,8 +495,25 @@ const aiCfo = createSlice({
         setSessions(draft, action) {
             action.payload.forEach((chatSessionPayload) => {
                 const { chat_session_id } = chatSessionPayload;
-                // This is to prevent overwriting the session if it is already in state
-                if (draft.aiCfoByChatSessionId[chat_session_id] == null) {
+                if (draft.aiCfoByChatSessionId[chat_session_id] != null) {
+                    // The list is authoritative for a session's metadata, and a session
+                    // seeded by `setChatHistory` has guessed metadata: no summary, and a
+                    // `createdAt` taken from one page of a newest-first paginated
+                    // history, which is later than the session really started.
+                    // `questionAnswers` is left alone — the list must never wipe a
+                    // thread that is on screen.
+                    const entry = draft.aiCfoByChatSessionId[chat_session_id];
+                    const incoming = toChatSession(chatSessionPayload);
+                    entry.chatSession = {
+                        ...incoming,
+                        // Never downgrade a title already in state: a page of the list can
+                        // carry a nullish summary, and assigning it wholesale would blank
+                        // a header that was correct.
+                        chatSessionSummary: incoming.chatSessionSummary ??
+                            entry.chatSession.chatSessionSummary,
+                    };
+                }
+                else {
                     draft.aiCfoByChatSessionId[chat_session_id] = {
                         chatSession: toChatSession(chatSessionPayload),
                         questionAnswers: [],
@@ -503,8 +526,52 @@ const aiCfo = createSlice({
         setChatHistory(draft, action) {
             const { chatSessionId, history, isPaginationComplete = false, } = action.payload;
             if (draft.aiCfoByChatSessionId[chatSessionId] == null) {
-                console.warn(`session with id ${chatSessionId} not found in setChatHistory`);
-                return;
+                // Sessions created server-side (a routine run) are opened by deep
+                // link, so their history can arrive before the sessions list has
+                // registered them. Dropping it here loses the messages for good: the
+                // response's null page token sets `hasMore: false`, which is the
+                // condition the refetch is guarded on. The response is itself proof
+                // the session exists, so seed the entry from the messages.
+                if (history.length === 0) {
+                    return;
+                }
+                // A deleted session. Its history request is never cancelled
+                // (`mergeMap`), so seeding would resurrect the conversation into the
+                // rail, where clicking it 404s. Only this path is guarded:
+                // `clearSession` is optimistic, so if the server still lists the
+                // session, `setSessions` re-adding it is correct.
+                if (draft.deletedChatSessionIds?.includes(chatSessionId) === true) {
+                    return;
+                }
+                // The human's id, taken off a message they actually sent. The API
+                // returns newest first, so `history[0]` is usually the agent's reply,
+                // and `chatSession.userId` is read as "whose conversation is this".
+                const owner = history.find((message) => message.sender === 'user') ?? history[0];
+                // Oldest message in the page, not `history[0]`: a session cannot
+                // start after its own messages, and the API returns newest first.
+                //
+                // Compared as instants, not strings. The wire format is an RFC 1123
+                // HTTP-date ("Thu, 03 Sep 2026 12:34:56 GMT") because `set_200`
+                // bypasses chat's isoformat encoder, and lexically "Mon…" precedes
+                // "Sat…" while being the later day. Unparseable values are filtered
+                // out, not compared: every comparison against NaN is false, so one
+                // used as the reduce's seed would carry through to an Invalid Date.
+                const oldest = history
+                    .map((message) => ({ at: Date.parse(message.created_at), message }))
+                    .filter(({ at }) => !Number.isNaN(at))
+                    .reduce((min, entry) => (min == null || entry.at < min.at ? entry : min), undefined)?.message;
+                draft.aiCfoByChatSessionId[chatSessionId] = {
+                    chatSession: {
+                        chatSessionId,
+                        userId: owner.user_id,
+                        chatSessionSummary: undefined,
+                        // Nothing in the page carried a usable timestamp. "Now" is a
+                        // guess, but it is a sane one and it keeps the row out of the
+                        // Invalid-Date behaviour above; the sessions list corrects it.
+                        createdAt: oldest != null ? zeniDate(oldest.created_at) : dateNow(),
+                    },
+                    questionAnswers: [],
+                };
             }
             const session = draft.aiCfoByChatSessionId[chatSessionId];
             // Check if we have an existing partial Q&A pair for this session
@@ -784,6 +851,13 @@ const aiCfo = createSlice({
         },
         clearSession(draft, action) {
             const sessionId = action.payload;
+            draft.deletedChatSessionIds ?? (draft.deletedChatSessionIds = []);
+            if (!draft.deletedChatSessionIds.includes(sessionId)) {
+                draft.deletedChatSessionIds.push(sessionId);
+                if (draft.deletedChatSessionIds.length > DELETED_SESSION_MEMORY) {
+                    draft.deletedChatSessionIds.splice(0, draft.deletedChatSessionIds.length - DELETED_SESSION_MEMORY);
+                }
+            }
             delete draft.aiCfoByChatSessionId[sessionId];
             delete draft.syntheticAnswersByChatSessionId[sessionId];
             if (draft.partialQuestionAnswers?.[sessionId] != null) {

package/lib/esm/view/expenseAutomationView/epics/actualMatching/matchAndReverseAccrualsEpic.js

@@ -72,9 +72,9 @@ exhaustMap((action) => {
         transaction_sync_token: transactionSyncToken,
         accrual_ids: accrualIds,
     };
-    const openedFromMatchId = state$.value.expenseAutomationActualMatchingViewState.matchModal
-        .openedFromMatchId;
-    const matchId = openedFromMatchId ?? `${transactionType}:${transactionIntegrationId}`;
+    // Key leftover results and snackbar vendor to the confirmed bill, not the
+    // row Match New was opened from (user can pick a different txn).
+    const matchId = `${transactionType.toLowerCase()}:${transactionIntegrationId}`;
     const vendorName = matchVendorName(state$.value, matchId);
     return zeniAPI
         .postAndGetJSON(`${zeniAPI.apiEndPoints.accountMicroServiceBaseUrl}/1.0/accruals/match-and-reverse`, body)

package/lib/esm/view/expenseAutomationView/epics/jeSchedule/prefetchOtherJeSchedulesTabEpic.js

@@ -41,11 +41,10 @@ export const prefetchOtherJeSchedulesTabEpic = (actions$, state$) => actions$.pi
             month: period.start.month,
             year: period.start.year,
         });
-        const actualMatching = state.expenseAutomationActualMatchingViewState;
-        const amAlreadyLoading = actualMatching.fetchState === 'In-Progress' ||
-            actualMatching.refreshStatus.fetchState === 'In-Progress';
-        if (!amAlreadyLoading &&
-            actualMatching.matchIdsByPeriod[periodId] == null) {
+        // `fetchState` is global across months. Skipping on In-Progress would drop
+        // October prefetch while September is still loading; September's success
+        // then marks the slice Completed and October looks loaded with no ids.
+        if (state.expenseAutomationActualMatchingViewState.matchIdsByPeriod[periodId] == null) {
             actions.push(fetchActualMatchingPage(period, true));
         }
     }

package/lib/esm/view/expenseAutomationView/expenseAutomationViewSelector.js

@@ -22,7 +22,7 @@ const isPreviousStepDisabled = (selectedTransactionCategorizationTab, allSteps,
     return allSteps[stepIndex - 1].isDisabled;
 };
 export function getExpenseAutomationView(state) {
-    const { expenseAutomationViewState, tenantState, expenseAutomationMissingReceiptsViewState, expenseAutomationJESchedulesViewState, expenseAutomationActualMatchingViewState, expenseAutomationTransactionsViewState, expenseAutomationReconciliationViewState, monthEndCloseChecksState, companyState, } = state;
+    const { expenseAutomationViewState, tenantState, expenseAutomationMissingReceiptsViewState, expenseAutomationJESchedulesViewState, expenseAutomationTransactionsViewState, expenseAutomationReconciliationViewState, monthEndCloseChecksState, companyState, } = state;
     const { loggedInUser, currentTenantId } = tenantState;
     const currentTenant = getCurrentTenant(state);
     const { currentSelectedView, selectedPeriodByTenantId } = expenseAutomationViewState;
@@ -102,10 +102,12 @@ export function getExpenseAutomationView(state) {
             };
             break;
     }
+    // AM is optional (flag-off / background prefetch) and must not keep the
+    // page-level AND-complete fetchState stuck on Not-Started. Tab chrome uses
+    // currentSelectedViewFetchState, which already switches to AM when selected.
     const fetchStateVariables = [
         expenseAutomationMissingReceiptsViewState,
         expenseAutomationJESchedulesViewState,
-        expenseAutomationActualMatchingViewState,
         expenseAutomationTransactionsView,
         expenseAutomationReconciliationViewState,
     ];

package/lib/esm/view/expenseAutomationView/payload/actualMatchingPayload.js

@@ -33,7 +33,7 @@ export function toActualMatchingTransactionSearchResult(payload, fallbackCurrenc
     return {
         transactionId: payload.transaction_id,
         transactionIntegrationId: payload.transaction_integration_id,
-        transactionType: payload.transaction_type,
+        transactionType: (payload.transaction_type || '').toLowerCase(),
         lineId: payload.line_id,
         vendorId: payload.vendor_id ?? undefined,
         vendorName: payload.vendor_name ?? '',

package/lib/esm/view/expenseAutomationView/reducers/actualMatchingViewReducer.js

@@ -22,6 +22,7 @@ export const initialAccrualSearchState = {
 export const initialMatchModalState = {
     isOpen: false,
     openedFromMatchId: undefined,
+    didPinPrefillTransactions: false,
     pinnedTransactionResults: [],
     transactionSearch: initialTransactionSearchState,
     accrualSearch: initialAccrualSearchState,
@@ -60,6 +61,7 @@ function resetMatchModalSearches(draft) {
     };
     draft.matchModal.lastBatchResults = undefined;
     draft.matchModal.openedFromMatchId = undefined;
+    draft.matchModal.didPinPrefillTransactions = false;
     draft.matchModal.pinnedTransactionResults = [];
 }
 const expenseAutomationActualMatchingView = createSlice({
@@ -84,6 +86,9 @@ const expenseAutomationActualMatchingView = createSlice({
                 const { refreshViewInBackground } = action.payload;
                 if (refreshViewInBackground) {
                     draft.refreshStatus = { fetchState: 'In-Progress', error: undefined };
+                    if (draft.fetchState === 'Not-Started') {
+                        draft.fetchState = 'In-Progress';
+                    }
                 }
                 else {
                     draft.fetchState = 'In-Progress';
@@ -105,6 +110,10 @@ const expenseAutomationActualMatchingView = createSlice({
             draft.matchIdsByPeriod[periodId] = matchIds;
             if (refreshViewInBackground) {
                 draft.refreshStatus = { fetchState: 'Completed', error: undefined };
+                if (draft.fetchState !== 'Completed') {
+                    draft.fetchState = 'Completed';
+                    draft.error = undefined;
+                }
             }
             else {
                 draft.fetchState = 'Completed';
@@ -115,6 +124,10 @@ const expenseAutomationActualMatchingView = createSlice({
             const { status, refreshViewInBackground } = action.payload;
             if (refreshViewInBackground) {
                 draft.refreshStatus = { fetchState: 'Error', error: status };
+                if (draft.fetchState !== 'Completed') {
+                    draft.fetchState = 'Error';
+                    draft.error = status;
+                }
             }
             else {
                 draft.fetchState = 'Error';
@@ -254,7 +267,8 @@ const expenseAutomationActualMatchingView = createSlice({
             else {
                 draft.matchModal.transactionSearch.results = results;
                 if (draft.matchModal.openedFromMatchId != null &&
-                    draft.matchModal.pinnedTransactionResults.length === 0) {
+                    !draft.matchModal.didPinPrefillTransactions) {
+                    draft.matchModal.didPinPrefillTransactions = true;
                     draft.matchModal.pinnedTransactionResults = results;
                 }
             }
@@ -363,6 +377,7 @@ const expenseAutomationActualMatchingView = createSlice({
                     fetchState: 'Completed',
                     error: undefined,
                 };
+                delete draft.lastMatchResultsByMatchId[matchId];
                 draft.closeMatchAfterUndo =
                     results.length > 0 &&
                         results.every((result) => result.status === 'undone');

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

@@ -4,6 +4,7 @@ import { getActualMatchingMatchById } from '../../../entity/actualMatching/actua
 import { generateJEOneTimeAccrualKey } from '../../../entity/jeSchedules/jeScheduleHelper';
 import { getJEOneTimeAccrualByKey, } from '../../../entity/jeSchedules/jeSchedulesSelector';
 import { getCurrentTenant } from '../../../entity/tenant/tenantSelector';
+import { date } from '../../../zeniDayJS';
 import { actualMatchingTransactionLineKey, } from '../types/actualMatchingViewState';
 export function getSelectedMonthYearForCurrentTenant(state) {
     const tenantId = getCurrentTenant(state)?.tenantId;
@@ -92,11 +93,18 @@ export function getClearedMatchedAmount(accrual) {
 export function getActualMatchingAmount(row) {
     return row.actualAmount?.amount ?? row.estimatedAmount.amount;
 }
-export function getActualMatchingReversalDate(accrual) {
-    if (isPendingReviewAccrual(accrual)) {
-        return accrual.matchSuggestion.matchedTransactionDate;
+function parseMatchTransactionDate(transactionDate) {
+    if (transactionDate == null || transactionDate === '') {
+        return undefined;
     }
-    return accrual.cleared?.matchedTransactionDate;
+    const parsed = date(transactionDate);
+    return Number.isFinite(parsed.valueOf()) ? parsed : undefined;
+}
+export function getActualMatchingReversalDate(accrual, matchTransactionDate) {
+    const matchedDate = isPendingReviewAccrual(accrual)
+        ? accrual.matchSuggestion.matchedTransactionDate
+        : accrual.cleared?.matchedTransactionDate;
+    return matchedDate ?? parseMatchTransactionDate(matchTransactionDate);
 }
 function collectGroupedMembers(members) {
     if (members.length <= 1) {
@@ -150,7 +158,7 @@ function toActualMatchingRow(match) {
         groupedMembers: collectGroupedMembers(match.members),
         intendedAccrualIds,
         leftovers: collectLeftoverMembers(match.leftovers),
-        reversalDate: getActualMatchingReversalDate(first),
+        reversalDate: getActualMatchingReversalDate(first, match.transactionDate),
         vendorName: match.vendorName != null && match.vendorName !== ''
             ? match.vendorName
             : first.vendorName,
@@ -174,8 +182,13 @@ function getActualMatchingSortValue(row, sortKey) {
     switch (sortKey) {
         case 'vendor':
             return (row.vendorName ?? '').toLowerCase();
-        case 'date':
-            return row.reversalDate?.valueOf() ?? row.transactionDate;
+        case 'date': {
+            const millis = row.reversalDate?.valueOf() ??
+                (row.transactionDate != null && row.transactionDate !== ''
+                    ? date(row.transactionDate).valueOf()
+                    : 0);
+            return Number.isFinite(millis) ? millis : 0;
+        }
         case 'amount':
             return getActualMatchingAmount(row);
         case 'category':
@@ -363,9 +376,16 @@ export function getExpenseAutomationActualMatchingView(state) {
                 ? { consumedLineIds }
                 : {}),
         };
+    // `fetchState` is a flat slice field that survives a period switch, so it still
+    // reads 'Completed' before the newly selected period's ids land. Reporting
+    // 'Not-Started' until they do keeps the skeleton up instead of flashing the
+    // empty-complete chrome over a month that has not been fetched.
+    const fetchStatus = fetchState === 'Completed' && matchIds == null
+        ? { fetchState: 'Not-Started', error: undefined }
+        : { fetchState, error };
     return {
-        fetchState,
-        error,
+        fetchState: fetchStatus.fetchState,
+        error: fetchStatus.error,
         reversed,
         pendingReview,
         kpiSummary,

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

@@ -33,9 +33,18 @@ const financeStatement = createSlice({
             },
         },
         updateFinanceStatementTimeframe(draft, action) {
+            // Unrelated UI re-dispatches the *current* timeframe as a side effect (the
+            // reports page hangs its table scroll reset off that callback); dropping the
+            // anchor there would silently reset the user's period to the latest one.
+            if (draft.timeframe === action.payload) {
+                return;
+            }
             draft.timeframe = action.payload;
+            // A month anchor is meaningless once the timeframe becomes quarter/year, so
+            // a real change drops it and returns the width to the default — 12 months
+            // must not become 12 quarters. Order is the user's, so it survives.
             draft.selectedCOABalancesRange = {
-                numberOfPeriods: draft.selectedCOABalancesRange.numberOfPeriods,
+                numberOfPeriods: initialFinanceStatementState.selectedCOABalancesRange.numberOfPeriods,
                 orderBy: draft.selectedCOABalancesRange.orderBy,
             };
         },
@@ -77,8 +86,7 @@ const financeStatement = createSlice({
             draft.selectedReportId = action.payload;
         },
         updateFinanceStatementAdditionalBalancesSelection(draft, action) {
-            const { firstMonthOfFY, additionalBalances: additionalBalancesPayload, coaBalances, maxNumOfPeriodsToHighlight, } = action.payload;
-            const safeCoaBalances = coaBalances != null ? coaBalances : [];
+            const { additionalBalances: additionalBalancesPayload, maxNumOfPeriodsToHighlight, } = action.payload;
             const additionalBalances = additionalBalancesPayload ?? [];
             let tempAdditionalBalances = [...additionalBalances];
             if (additionalBalances.includes('this_period_vs_last_period') ||
@@ -94,30 +102,12 @@ const financeStatement = createSlice({
             draft.maxNumOfPeriodsToHighlight = maxNumOfPeriodsToHighlight;
             draft.isAdditionalBalancesShown =
                 additionalBalances.length != 0 ? true : false;
-            const { timeframe, selectedCOABalancesRange } = draft;
-            if (safeCoaBalances.length > 0) {
-                const thisPeriod = extractThisPeriod(action.payload.firstMonthOfFY, timeframe, selectedCOABalancesRange, safeCoaBalances);
-                if (thisPeriod != null) {
-                    const selectedCoaBalancesRangeWithThisPeriod = {
-                        ...selectedCOABalancesRange,
-                        thisPeriod,
-                    };
-                    const selectionRanges = getSelectedAndHighlightedRangesForThisPeriod({
-                        firstMonthOfFY,
-                        thisPeriod: thisPeriod,
-                        coaBalances: safeCoaBalances,
-                        timeframe,
-                        maxNumOfPeriodsToHighlight: maxNumOfPeriodsToHighlight,
-                        currentSelection: {
-                            selectedCOABalancesRange: selectedCoaBalancesRangeWithThisPeriod,
-                        },
-                        orderBy: 'ascending_date',
-                        maxNumOfPeriodsToSelect: maxNumOfPeriodsToHighlight,
-                    });
-                    draft.selectedCOABalancesRange =
-                        selectionRanges.selectedCOABalancesRange;
-                }
-            }
+            // Column metadata only — must not touch selectedCOABalancesRange. The
+            // reports page fires this on load, on resize and on every fetch-state
+            // transition (so also on report switch and on remount after a drill-down)
+            // with a viewport-derived period count that knows nothing about the range
+            // the user picked. The width default comes from initial state, and from
+            // updateFinanceStatementTimeframe on a real timeframe change.
         },
         updateDownloadState(draft, action) {
             draft.downloadState = action.payload;

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

@@ -8,7 +8,7 @@ import { isAwaitingMarkAsPaid, isBulkProcessing, isSodAdminFallbackEligibleForSt
 import { applyAdvancedFiltersOnList } from '../../spendManagementFilterHelpers';
 import { getSelectedWithdrawFromAccount } from '../billDetailView/billDetailViewSelector';
 import { getBillPayConfigBotEmail } from '../billPayConfig/billPayConfigSelector';
-import { getCategoryValueForBill } from './billListFilterHelpers';
+import { getActualPaymentDate, getCategoryValueForBill, } from './billListFilterHelpers';
 import { ALL_BILL_TABS, getBillListKey, } from './billListState';
 export const getBillList = (state, currentTimePeriod, isBulkActionFeatureEnabled, loggedInUserId) => {
     const { billListState, billTransactionState, billPayConfigState, entityApprovalStatusState, userState, recurringBillState, billsBulkActionViewState, } = state;
@@ -432,7 +432,7 @@ export const getBillListOnSort = (sortKey, sortOrder, currentTab, transactions)
                     }
                 }
                 else {
-                    if (Boolean(transaction.billPayInfo.paymentDate) === true) {
+                    if (Boolean(getActualPaymentDate(transaction.billPayInfo)) === true) {
                         transactionsWithSortKeyValue.push(transaction);
                     }
                     else {
@@ -517,7 +517,7 @@ export const getBillListOnSort = (sortKey, sortOrder, currentTab, transactions)
             case 'dueDate':
                 return currentTab === 'draft'
                     ? transaction.dueDate
-                    : transaction.billPayInfo.paymentDate;
+                    : getActualPaymentDate(transaction.billPayInfo);
             case 'status':
                 return getStatusPerTab(transaction);
             case 'amount':

package/lib/view/expenseAutomationView/epics/actualMatching/matchAndReverseAccrualsEpic.js

@@ -75,9 +75,9 @@ const matchAndReverseAccrualsEpic = (actions$, state$, zeniAPI) => actions$.pipe
         transaction_sync_token: transactionSyncToken,
         accrual_ids: accrualIds,
     };
-    const openedFromMatchId = state$.value.expenseAutomationActualMatchingViewState.matchModal
-        .openedFromMatchId;
-    const matchId = openedFromMatchId ?? `${transactionType}:${transactionIntegrationId}`;
+    // Key leftover results and snackbar vendor to the confirmed bill, not the
+    // row Match New was opened from (user can pick a different txn).
+    const matchId = `${transactionType.toLowerCase()}:${transactionIntegrationId}`;
     const vendorName = matchVendorName(state$.value, matchId);
     return zeniAPI
         .postAndGetJSON(`${zeniAPI.apiEndPoints.accountMicroServiceBaseUrl}/1.0/accruals/match-and-reverse`, body)

package/lib/view/expenseAutomationView/epics/jeSchedule/prefetchOtherJeSchedulesTabEpic.js

@@ -44,11 +44,10 @@ const prefetchOtherJeSchedulesTabEpic = (actions$, state$) => actions$.pipe((0,
             month: period.start.month,
             year: period.start.year,
         });
-        const actualMatching = state.expenseAutomationActualMatchingViewState;
-        const amAlreadyLoading = actualMatching.fetchState === 'In-Progress' ||
-            actualMatching.refreshStatus.fetchState === 'In-Progress';
-        if (!amAlreadyLoading &&
-            actualMatching.matchIdsByPeriod[periodId] == null) {
+        // `fetchState` is global across months. Skipping on In-Progress would drop
+        // October prefetch while September is still loading; September's success
+        // then marks the slice Completed and October looks loaded with no ids.
+        if (state.expenseAutomationActualMatchingViewState.matchIdsByPeriod[periodId] == null) {
             actions.push((0, actualMatchingViewReducer_1.fetchActualMatchingPage)(period, true));
         }
     }

package/lib/view/expenseAutomationView/expenseAutomationViewSelector.js

@@ -25,7 +25,7 @@ const isPreviousStepDisabled = (selectedTransactionCategorizationTab, allSteps,
     return allSteps[stepIndex - 1].isDisabled;
 };
 function getExpenseAutomationView(state) {
-    const { expenseAutomationViewState, tenantState, expenseAutomationMissingReceiptsViewState, expenseAutomationJESchedulesViewState, expenseAutomationActualMatchingViewState, expenseAutomationTransactionsViewState, expenseAutomationReconciliationViewState, monthEndCloseChecksState, companyState, } = state;
+    const { expenseAutomationViewState, tenantState, expenseAutomationMissingReceiptsViewState, expenseAutomationJESchedulesViewState, expenseAutomationTransactionsViewState, expenseAutomationReconciliationViewState, monthEndCloseChecksState, companyState, } = state;
     const { loggedInUser, currentTenantId } = tenantState;
     const currentTenant = (0, tenantSelector_1.getCurrentTenant)(state);
     const { currentSelectedView, selectedPeriodByTenantId } = expenseAutomationViewState;
@@ -105,10 +105,12 @@ function getExpenseAutomationView(state) {
             };
             break;
     }
+    // AM is optional (flag-off / background prefetch) and must not keep the
+    // page-level AND-complete fetchState stuck on Not-Started. Tab chrome uses
+    // currentSelectedViewFetchState, which already switches to AM when selected.
     const fetchStateVariables = [
         expenseAutomationMissingReceiptsViewState,
         expenseAutomationJESchedulesViewState,
-        expenseAutomationActualMatchingViewState,
         expenseAutomationTransactionsView,
         expenseAutomationReconciliationViewState,
     ];

package/lib/view/expenseAutomationView/payload/actualMatchingPayload.js

@@ -39,7 +39,7 @@ function toActualMatchingTransactionSearchResult(payload, fallbackCurrency) {
     return {
         transactionId: payload.transaction_id,
         transactionIntegrationId: payload.transaction_integration_id,
-        transactionType: payload.transaction_type,
+        transactionType: (payload.transaction_type || '').toLowerCase(),
         lineId: payload.line_id,
         vendorId: payload.vendor_id ?? undefined,
         vendorName: payload.vendor_name ?? '',

package/lib/view/expenseAutomationView/reducers/actualMatchingViewReducer.js

@@ -26,6 +26,7 @@ exports.initialAccrualSearchState = {
 exports.initialMatchModalState = {
     isOpen: false,
     openedFromMatchId: undefined,
+    didPinPrefillTransactions: false,
     pinnedTransactionResults: [],
     transactionSearch: exports.initialTransactionSearchState,
     accrualSearch: exports.initialAccrualSearchState,
@@ -64,6 +65,7 @@ function resetMatchModalSearches(draft) {
     };
     draft.matchModal.lastBatchResults = undefined;
     draft.matchModal.openedFromMatchId = undefined;
+    draft.matchModal.didPinPrefillTransactions = false;
     draft.matchModal.pinnedTransactionResults = [];
 }
 const expenseAutomationActualMatchingView = (0, toolkit_1.createSlice)({
@@ -88,6 +90,9 @@ const expenseAutomationActualMatchingView = (0, toolkit_1.createSlice)({
                 const { refreshViewInBackground } = action.payload;
                 if (refreshViewInBackground) {
                     draft.refreshStatus = { fetchState: 'In-Progress', error: undefined };
+                    if (draft.fetchState === 'Not-Started') {
+                        draft.fetchState = 'In-Progress';
+                    }
                 }
                 else {
                     draft.fetchState = 'In-Progress';
@@ -109,6 +114,10 @@ const expenseAutomationActualMatchingView = (0, toolkit_1.createSlice)({
             draft.matchIdsByPeriod[periodId] = matchIds;
             if (refreshViewInBackground) {
                 draft.refreshStatus = { fetchState: 'Completed', error: undefined };
+                if (draft.fetchState !== 'Completed') {
+                    draft.fetchState = 'Completed';
+                    draft.error = undefined;
+                }
             }
             else {
                 draft.fetchState = 'Completed';
@@ -119,6 +128,10 @@ const expenseAutomationActualMatchingView = (0, toolkit_1.createSlice)({
             const { status, refreshViewInBackground } = action.payload;
             if (refreshViewInBackground) {
                 draft.refreshStatus = { fetchState: 'Error', error: status };
+                if (draft.fetchState !== 'Completed') {
+                    draft.fetchState = 'Error';
+                    draft.error = status;
+                }
             }
             else {
                 draft.fetchState = 'Error';
@@ -258,7 +271,8 @@ const expenseAutomationActualMatchingView = (0, toolkit_1.createSlice)({
             else {
                 draft.matchModal.transactionSearch.results = results;
                 if (draft.matchModal.openedFromMatchId != null &&
-                    draft.matchModal.pinnedTransactionResults.length === 0) {
+                    !draft.matchModal.didPinPrefillTransactions) {
+                    draft.matchModal.didPinPrefillTransactions = true;
                     draft.matchModal.pinnedTransactionResults = results;
                 }
             }
@@ -367,6 +381,7 @@ const expenseAutomationActualMatchingView = (0, toolkit_1.createSlice)({
                     fetchState: 'Completed',
                     error: undefined,
                 };
+                delete draft.lastMatchResultsByMatchId[matchId];
                 draft.closeMatchAfterUndo =
                     results.length > 0 &&
                         results.every((result) => result.status === 'undone');

package/lib/view/expenseAutomationView/selectors/actualMatchingViewSelector.d.ts

@@ -23,7 +23,7 @@ export declare function isPendingReviewAccrual(accrual: JEOneTimeAccrual): accru
 export declare function isReversedMatchKind(kind: ActualMatchingRowKind): boolean;
 export declare function getClearedMatchedAmount(accrual: JEOneTimeAccrual): number | undefined;
 export declare function getActualMatchingAmount(row: ActualMatchingRow): number;
-export declare function getActualMatchingReversalDate(accrual: JEOneTimeAccrual): ZeniDate | undefined;
+export declare function getActualMatchingReversalDate(accrual: JEOneTimeAccrual, matchTransactionDate?: string): ZeniDate | undefined;
 export declare function buildActualMatchingKpiSummary(rows: ActualMatchingRow[], displayCurrencyCode?: string): ActualMatchingKpiSummary;
 export interface ExpenseAutomationActualMatchingMatchView {
     detailFetchState: FetchStateAndError;

package/lib/view/expenseAutomationView/selectors/actualMatchingViewSelector.js

@@ -23,6 +23,7 @@ const actualMatchingSelector_1 = require("../../../entity/actualMatching/actualM
 const jeScheduleHelper_1 = require("../../../entity/jeSchedules/jeScheduleHelper");
 const jeSchedulesSelector_1 = require("../../../entity/jeSchedules/jeSchedulesSelector");
 const tenantSelector_1 = require("../../../entity/tenant/tenantSelector");
+const zeniDayJS_1 = require("../../../zeniDayJS");
 const actualMatchingViewState_1 = require("../types/actualMatchingViewState");
 function getSelectedMonthYearForCurrentTenant(state) {
     const tenantId = (0, tenantSelector_1.getCurrentTenant)(state)?.tenantId;
@@ -111,11 +112,18 @@ function getClearedMatchedAmount(accrual) {
 function getActualMatchingAmount(row) {
     return row.actualAmount?.amount ?? row.estimatedAmount.amount;
 }
-function getActualMatchingReversalDate(accrual) {
-    if (isPendingReviewAccrual(accrual)) {
-        return accrual.matchSuggestion.matchedTransactionDate;
+function parseMatchTransactionDate(transactionDate) {
+    if (transactionDate == null || transactionDate === '') {
+        return undefined;
     }
-    return accrual.cleared?.matchedTransactionDate;
+    const parsed = (0, zeniDayJS_1.date)(transactionDate);
+    return Number.isFinite(parsed.valueOf()) ? parsed : undefined;
+}
+function getActualMatchingReversalDate(accrual, matchTransactionDate) {
+    const matchedDate = isPendingReviewAccrual(accrual)
+        ? accrual.matchSuggestion.matchedTransactionDate
+        : accrual.cleared?.matchedTransactionDate;
+    return matchedDate ?? parseMatchTransactionDate(matchTransactionDate);
 }
 function collectGroupedMembers(members) {
     if (members.length <= 1) {
@@ -169,7 +177,7 @@ function toActualMatchingRow(match) {
         groupedMembers: collectGroupedMembers(match.members),
         intendedAccrualIds,
         leftovers: collectLeftoverMembers(match.leftovers),
-        reversalDate: getActualMatchingReversalDate(first),
+        reversalDate: getActualMatchingReversalDate(first, match.transactionDate),
         vendorName: match.vendorName != null && match.vendorName !== ''
             ? match.vendorName
             : first.vendorName,
@@ -193,8 +201,13 @@ function getActualMatchingSortValue(row, sortKey) {
     switch (sortKey) {
         case 'vendor':
             return (row.vendorName ?? '').toLowerCase();
-        case 'date':
-            return row.reversalDate?.valueOf() ?? row.transactionDate;
+        case 'date': {
+            const millis = row.reversalDate?.valueOf() ??
+                (row.transactionDate != null && row.transactionDate !== ''
+                    ? (0, zeniDayJS_1.date)(row.transactionDate).valueOf()
+                    : 0);
+            return Number.isFinite(millis) ? millis : 0;
+        }
         case 'amount':
             return getActualMatchingAmount(row);
         case 'category':
@@ -382,9 +395,16 @@ function getExpenseAutomationActualMatchingView(state) {
                 ? { consumedLineIds }
                 : {}),
         };
+    // `fetchState` is a flat slice field that survives a period switch, so it still
+    // reads 'Completed' before the newly selected period's ids land. Reporting
+    // 'Not-Started' until they do keeps the skeleton up instead of flashing the
+    // empty-complete chrome over a month that has not been fetched.
+    const fetchStatus = fetchState === 'Completed' && matchIds == null
+        ? { fetchState: 'Not-Started', error: undefined }
+        : { fetchState, error };
     return {
-        fetchState,
-        error,
+        fetchState: fetchStatus.fetchState,
+        error: fetchStatus.error,
         reversed,
         pendingReview,
         kpiSummary,

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

@@ -83,6 +83,7 @@ export interface ActualMatchingAccrualSearchState extends FetchStateAndError {
 export interface ActualMatchingMatchModalState {
     accrualSearch: ActualMatchingAccrualSearchState;
     confirmStatus: FetchStateAndError;
+    didPinPrefillTransactions: boolean;
     isOpen: boolean;
     pinnedTransactionResults: ActualMatchingTransactionSearchResult[];
     transactionSearch: ActualMatchingTransactionSearchState;

package/lib/view/financeStatement/financeStatementReducer.js

@@ -37,9 +37,18 @@ const financeStatement = (0, toolkit_1.createSlice)({
             },
         },
         updateFinanceStatementTimeframe(draft, action) {
+            // Unrelated UI re-dispatches the *current* timeframe as a side effect (the
+            // reports page hangs its table scroll reset off that callback); dropping the
+            // anchor there would silently reset the user's period to the latest one.
+            if (draft.timeframe === action.payload) {
+                return;
+            }
             draft.timeframe = action.payload;
+            // A month anchor is meaningless once the timeframe becomes quarter/year, so
+            // a real change drops it and returns the width to the default — 12 months
+            // must not become 12 quarters. Order is the user's, so it survives.
             draft.selectedCOABalancesRange = {
-                numberOfPeriods: draft.selectedCOABalancesRange.numberOfPeriods,
+                numberOfPeriods: exports.initialFinanceStatementState.selectedCOABalancesRange.numberOfPeriods,
                 orderBy: draft.selectedCOABalancesRange.orderBy,
             };
         },
@@ -81,8 +90,7 @@ const financeStatement = (0, toolkit_1.createSlice)({
             draft.selectedReportId = action.payload;
         },
         updateFinanceStatementAdditionalBalancesSelection(draft, action) {
-            const { firstMonthOfFY, additionalBalances: additionalBalancesPayload, coaBalances, maxNumOfPeriodsToHighlight, } = action.payload;
-            const safeCoaBalances = coaBalances != null ? coaBalances : [];
+            const { additionalBalances: additionalBalancesPayload, maxNumOfPeriodsToHighlight, } = action.payload;
             const additionalBalances = additionalBalancesPayload ?? [];
             let tempAdditionalBalances = [...additionalBalances];
             if (additionalBalances.includes('this_period_vs_last_period') ||
@@ -98,30 +106,12 @@ const financeStatement = (0, toolkit_1.createSlice)({
             draft.maxNumOfPeriodsToHighlight = maxNumOfPeriodsToHighlight;
             draft.isAdditionalBalancesShown =
                 additionalBalances.length != 0 ? true : false;
-            const { timeframe, selectedCOABalancesRange } = draft;
-            if (safeCoaBalances.length > 0) {
-                const thisPeriod = (0, thisPeriodHelpers_1.extractThisPeriod)(action.payload.firstMonthOfFY, timeframe, selectedCOABalancesRange, safeCoaBalances);
-                if (thisPeriod != null) {
-                    const selectedCoaBalancesRangeWithThisPeriod = {
-                        ...selectedCOABalancesRange,
-                        thisPeriod,
-                    };
-                    const selectionRanges = (0, getSelectedAndHighlightedRanges_1.getSelectedAndHighlightedRangesForThisPeriod)({
-                        firstMonthOfFY,
-                        thisPeriod: thisPeriod,
-                        coaBalances: safeCoaBalances,
-                        timeframe,
-                        maxNumOfPeriodsToHighlight: maxNumOfPeriodsToHighlight,
-                        currentSelection: {
-                            selectedCOABalancesRange: selectedCoaBalancesRangeWithThisPeriod,
-                        },
-                        orderBy: 'ascending_date',
-                        maxNumOfPeriodsToSelect: maxNumOfPeriodsToHighlight,
-                    });
-                    draft.selectedCOABalancesRange =
-                        selectionRanges.selectedCOABalancesRange;
-                }
-            }
+            // Column metadata only — must not touch selectedCOABalancesRange. The
+            // reports page fires this on load, on resize and on every fetch-state
+            // transition (so also on report switch and on remount after a drill-down)
+            // with a viewport-derived period count that knows nothing about the range
+            // the user picked. The width default comes from initial state, and from
+            // updateFinanceStatementTimeframe on a real timeframe change.
         },
         updateDownloadState(draft, action) {
             draft.downloadState = action.payload;

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

@@ -440,7 +440,7 @@ const getBillListOnSort = (sortKey, sortOrder, currentTab, transactions) => {
                     }
                 }
                 else {
-                    if (Boolean(transaction.billPayInfo.paymentDate) === true) {
+                    if (Boolean((0, billListFilterHelpers_1.getActualPaymentDate)(transaction.billPayInfo)) === true) {
                         transactionsWithSortKeyValue.push(transaction);
                     }
                     else {
@@ -525,7 +525,7 @@ const getBillListOnSort = (sortKey, sortOrder, currentTab, transactions) => {
             case 'dueDate':
                 return currentTab === 'draft'
                     ? transaction.dueDate
-                    : transaction.billPayInfo.paymentDate;
+                    : (0, billListFilterHelpers_1.getActualPaymentDate)(transaction.billPayInfo);
             case 'status':
                 return getStatusPerTab(transaction);
             case 'amount':

package/package.json

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