@zeniai/client-epic-state 5.1.37-betaRD1 → 5.1.37-betaRD3

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

@@ -188,15 +188,28 @@ export function getExpenseAutomationTransactionView(state) {
     };
     // Parent-tab badge counts. Sourced from `parent_tab_total_count` in the
     // listing response and used exclusively by the navbar / tab strip badges.
-    // Independent of which Completed sub-tab is active so the badge stays
-    // stable across sub-tab switches.
+    // When a search or filter is active the badge switches to the filtered count
+    // so the number tracks what the user is looking at.
+    const autoCatTabView = expenseAutomationTransactionsViewState.transactionCategorizationView
+        .autoCategorized;
+    const reviewTabView = expenseAutomationTransactionsViewState.transactionCategorizationView.review;
+    const autoCatSubTabCache = expenseAutomationTransactionsViewState.autoCategorizedSubTabCache;
+    const autoCatFilterActive = autoCatTabView.uiState.searchString !== '' ||
+        autoCatTabView.filters.categories.length > 0;
+    const reviewFilterActive = reviewTabView.uiState.searchString !== '' ||
+        reviewTabView.filters.categories.length > 0;
     const parentTotalCountByTab = expenseAutomationTransactionsViewState.parentTotalCountByTab;
     const parentTabTotalCountByTab = {
         review: monthYearPeriodId != null
-            ? (parentTotalCountByTab.review[monthYearPeriodId] ?? 0)
+            ? reviewFilterActive
+                ? totalCountByReview[monthYearPeriodId]
+                : (parentTotalCountByTab.review[monthYearPeriodId] ?? 0)
             : 0,
         autoCategorized: monthYearPeriodId != null
-            ? (parentTotalCountByTab.autoCategorized[monthYearPeriodId] ?? 0)
+            ? autoCatFilterActive
+                ? (autoCatSubTabCache['all']?.totalCount[monthYearPeriodId] ??
+                    totalCountByAutoCat[monthYearPeriodId])
+                : (parentTotalCountByTab.autoCategorized[monthYearPeriodId] ?? 0)
             : 0,
     };
     const fetchStateByTab = {
@@ -239,7 +252,13 @@ export function getExpenseAutomationTransactionView(state) {
         isAccountingProjectsEnabled,
         projectList,
         transactionLocalData: filteredTransactionLocalData,
-        uiState,
+        // When a client-side category filter is active the server pageToken is
+        // misleading — the server has more pages but the filter already reduces
+        // what's visible. Masking pageToken here prevents the skeleton "loading"
+        // row from appearing when the user is looking at a filtered result set.
+        uiState: filters.categories.length > 0
+            ? { ...uiState, pageToken: null }
+            : uiState,
         refreshStatus,
         saveStatus,
         markAsNotMiscategorizedStatus,

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

@@ -198,15 +198,28 @@ function getExpenseAutomationTransactionView(state) {
     };
     // Parent-tab badge counts. Sourced from `parent_tab_total_count` in the
     // listing response and used exclusively by the navbar / tab strip badges.
-    // Independent of which Completed sub-tab is active so the badge stays
-    // stable across sub-tab switches.
+    // When a search or filter is active the badge switches to the filtered count
+    // so the number tracks what the user is looking at.
+    const autoCatTabView = expenseAutomationTransactionsViewState.transactionCategorizationView
+        .autoCategorized;
+    const reviewTabView = expenseAutomationTransactionsViewState.transactionCategorizationView.review;
+    const autoCatSubTabCache = expenseAutomationTransactionsViewState.autoCategorizedSubTabCache;
+    const autoCatFilterActive = autoCatTabView.uiState.searchString !== '' ||
+        autoCatTabView.filters.categories.length > 0;
+    const reviewFilterActive = reviewTabView.uiState.searchString !== '' ||
+        reviewTabView.filters.categories.length > 0;
     const parentTotalCountByTab = expenseAutomationTransactionsViewState.parentTotalCountByTab;
     const parentTabTotalCountByTab = {
         review: monthYearPeriodId != null
-            ? (parentTotalCountByTab.review[monthYearPeriodId] ?? 0)
+            ? reviewFilterActive
+                ? totalCountByReview[monthYearPeriodId]
+                : (parentTotalCountByTab.review[monthYearPeriodId] ?? 0)
             : 0,
         autoCategorized: monthYearPeriodId != null
-            ? (parentTotalCountByTab.autoCategorized[monthYearPeriodId] ?? 0)
+            ? autoCatFilterActive
+                ? (autoCatSubTabCache['all']?.totalCount[monthYearPeriodId] ??
+                    totalCountByAutoCat[monthYearPeriodId])
+                : (parentTotalCountByTab.autoCategorized[monthYearPeriodId] ?? 0)
             : 0,
     };
     const fetchStateByTab = {
@@ -249,7 +262,13 @@ function getExpenseAutomationTransactionView(state) {
         isAccountingProjectsEnabled,
         projectList,
         transactionLocalData: filteredTransactionLocalData,
-        uiState,
+        // When a client-side category filter is active the server pageToken is
+        // misleading — the server has more pages but the filter already reduces
+        // what's visible. Masking pageToken here prevents the skeleton "loading"
+        // row from appearing when the user is looking at a filtered result set.
+        uiState: filters.categories.length > 0
+            ? { ...uiState, pageToken: null }
+            : uiState,
         refreshStatus,
         saveStatus,
         markAsNotMiscategorizedStatus,

package/package.json

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