@zeniai/client-epic-state 5.1.8-betaSS1 → 5.1.9

package/lib/esm/view/expenseAutomationView/epics/transactionCategorization/fetchTransactionCategorizationEpic.js

@@ -6,10 +6,11 @@ import { updateTransactions } from '../../../../entity/transaction/transactionRe
 import { createZeniAPIStatus, isSuccessResponse, } from '../../../../responsePayload';
 import { getLineItemsByTransactionsIdsFromResponse } from '../../helpers/transactionCategorizationLocalDataHelper';
 import { fetchTransactionCategorization, fetchTransactionCategorizationFailure, fetchTransactionCategorizationSuccess, initializeTransactionCategorizationViewLocalData, resetOtherTabsFetchState, updateParentTotalCountForTab, updateTotalCountForTransactionCategorization, updateTransactionCategorizationUIState, } from '../../reducers/transactionsViewReducer';
+import { DEFAULT_COMPLETED_SUB_TAB } from '../../types/completedSubTab';
 import { TRANSACTIONS_TABS, toTransactionsSortKey, } from '../../types/transactionsViewState';
 export const fetchTransactionCategorizationEpic = (actions$, state$, zeniAPI) => actions$.pipe(filter(fetchTransactionCategorization.match), switchMap((action) => {
     const { expenseAutomationViewState: { selectedPeriodByTenantId }, expenseAutomationTransactionsViewState, } = state$.value;
-    const { period, keepExistingListItems, selectedTab, refreshViewInBackground, statuses, countOnlyStatuses, } = action.payload;
+    const { period, keepExistingListItems, selectedTab, refreshViewInBackground, } = action.payload;
     const uiState = expenseAutomationTransactionsViewState.transactionCategorizationView[selectedTab].uiState;
     const { pageToken, sortOrder, sortKey } = uiState;
     const currentTenant = getCurrentTenant(state$.value);
@@ -17,26 +18,18 @@ export const fetchTransactionCategorizationEpic = (actions$, state$, zeniAPI) =>
     const queryParam = {
         start_date: toString(period.start),
         end_date: toString(period.end),
+        auto_categorized: selectedTab === 'autoCategorized',
         sort_by: toTransactionsSortKey(sortKey),
         sort_order: sortOrder === 'ascending' ? 'asc' : 'desc',
         page_token: pageToken,
         page_size: 25,
         search_text: uiState.searchString,
-        statuses,
-        count_only_statuses: countOnlyStatuses,
+        sub_tab: selectedTab === 'autoCategorized'
+            ? expenseAutomationTransactionsViewState.selectedTransactionCategorizationCompletedSubTab
+            : DEFAULT_COMPLETED_SUB_TAB,
     };
-    // #region agent log
-    fetch('http://127.0.0.1:7755/ingest/4e987812-899d-4b9b-8ed6-a799cd019b33', { method: 'POST', headers: { 'Content-Type': 'application/json', 'X-Debug-Session-Id': 'f3bde0' }, body: JSON.stringify({ sessionId: 'f3bde0', hypothesisId: 'A/B/C', location: 'fetchTransactionCategorizationEpic.ts:84', message: 'fetchTransactionCategorizationEpic firing API', data: { selectedTab, incomingStatuses: statuses, incomingCountOnlyStatuses: countOnlyStatuses, refreshViewInBackground, keepExistingListItems, searchString: uiState.searchString, pageToken, start: toString(period.start), end: toString(period.end), statusesIsUndefined: statuses === undefined, stack: (new Error().stack || '').split('\n').slice(1, 10).join(' | ') }, timestamp: Date.now() }) }).catch(() => { });
-    // #endregion
-    // BETA TEST — Shubham dev namespace for transaction-categorization
-    // `statuses` / `count_only_statuses` rollout. Revert before merge by
-    // restoring `${zeniAPI.apiEndPoints.accountMicroServiceBaseUrl}` in
-    // place of the hardcoded base. Mirrored in
-    // `backgroundRefetchReviewTabEpic.ts` and
-    // `searchTransactionsForManualMatchEpic.ts` — grep `BETA TEST` to
-    // find every override site.
     return zeniAPI
-        .getJSON(`https://dev.api.zeni.ai/version/accounting/shubham/1.0/expense-automation/transactions?query=${encodeURIComponent(JSON.stringify(queryParam))}`)
+        .getJSON(`${zeniAPI.apiEndPoints.accountMicroServiceBaseUrl}/1.0/expense-automation/transactions?query=${encodeURIComponent(JSON.stringify(queryParam))}`)
         .pipe(mergeMap((response) => {
         if (isSuccessResponse(response) && response.data != null) {
             const updateActions = [];
@@ -59,11 +52,8 @@ export const fetchTransactionCategorizationEpic = (actions$, state$, zeniAPI) =>
             updateActions.push(updateParentTotalCountForTab({
                 selectedPeriod,
                 selectedTab,
-                // Optional — present only when the request supplied
-                // `count_only_statuses`. The reducer no-ops on undefined so
-                // any cached parent badge stays intact across scoped
-                // fetches (sort changes, pagination, etc.).
-                parentTotalCount: response.data.count_only_total,
+                parentTotalCount: response.data.parent_tab_total_count ??
+                    response.data.total_count,
             }));
             updateActions.push(resetOtherTabsFetchState({
                 refreshViewInBackground,

package/lib/esm/view/expenseAutomationView/epics/transactionCategorization/fetchTransactionCategorizationViewEpic.js

@@ -8,7 +8,7 @@ import { fetchOwnerList } from '../../../ownerList/ownerListReducer';
 import { fetchProjectList } from '../../../projectList/projectListReducer';
 import { fetchTransactionCategorization, fetchTransactionCategorizationView, } from '../../reducers/transactionsViewReducer';
 export const fetchTransactionCategorizationViewEpic = (actions$, state$) => actions$.pipe(filter(fetchTransactionCategorizationView.match), mergeMap((action) => {
-    const { selectedTab, cacheOverride, keepExistingListItems, pageToken, period, refreshViewInBackground, searchString, resetListItems, isUncategorizedExpenseCategoryEnabled, statuses, countOnlyStatuses, } = action.payload;
+    const { selectedTab, cacheOverride, keepExistingListItems, pageToken, period, refreshViewInBackground, searchString, resetListItems, isUncategorizedExpenseCategoryEnabled, } = action.payload;
     const updateActions = [];
     const { expenseAutomationTransactionsViewState } = state$.value;
     const { fetchState, transactionIdsBySelectedPeriod } = expenseAutomationTransactionsViewState.transactionCategorizationView[selectedTab];
@@ -42,7 +42,7 @@ export const fetchTransactionCategorizationViewEpic = (actions$, state$) => acti
     if (cacheOverride === true ||
         fetchState === 'Not-Started' ||
         transactionIds.length === 0) {
-        updateActions.push(fetchTransactionCategorization(selectedTab, period, cacheOverride, keepExistingListItems, searchString, pageToken, refreshViewInBackground, resetListItems, isUncategorizedExpenseCategoryEnabled, statuses, countOnlyStatuses));
+        updateActions.push(fetchTransactionCategorization(selectedTab, period, cacheOverride, keepExistingListItems, searchString, pageToken, refreshViewInBackground, resetListItems, isUncategorizedExpenseCategoryEnabled));
     }
     return from(updateActions);
 }));

package/lib/esm/view/expenseAutomationView/epics/transactionCategorization/markTransactionAsNotMiscategorizedEpic.js

@@ -10,7 +10,7 @@ import { getSnackbarMessageForTransactionReview } from '../../helpers/transactio
 import { fetchTransactionCategorizationView, markTransactionAsNotMiscategorized, updateStatusForTransactionNotMiscategorizedUpdateForCategorization, updateTotalCountForTransactionCategorization, } from '../../reducers/transactionsViewReducer';
 export const markTransactionAsNotMiscategorizedEpic = (actions$, state$, zeniAPI) => actions$.pipe(filter(markTransactionAsNotMiscategorized.match), mergeMap((action) => {
     const { expenseAutomationViewState, expenseAutomationTransactionsViewState, } = state$.value;
-    const { transactionsInReview, selectedTab, isUncategorizedExpenseCategoryEnabled, reviewStatuses: reviewStatusesFromAction, } = action.payload;
+    const { transactionsInReview, selectedTab, isUncategorizedExpenseCategoryEnabled, } = action.payload;
     const transactionsSuccess = transactionsInReview.transactions_update_success;
     const transactionsFailed = transactionsInReview.transactions_update_failed;
     const currentTenant = getCurrentTenant(state$.value);
@@ -105,20 +105,9 @@ export const markTransactionAsNotMiscategorizedEpic = (actions$, state$, zeniAPI
                     const timePeriodStart = toAbsoluteDay(period.start);
                     const timePeriodEnd = toAbsoluteDay(period.end);
                     if (timePeriodStart != null && timePeriodEnd != null) {
-                        // Statsig-resolved Review-tab statuses are threaded
-                        // through the EA save chain by `ExpenseAutomationScreen`
-                        // (resolves via `useDynamicConfig` +
-                        // `resolveTransactionCategorizationStatuses`). The
-                        // hardcoded `['pending_review']` last-resort prevents
-                        // accidental "all statuses" widening if the chain ever
-                        // delivers `undefined` (defensive — every live caller
-                        // should be passing this through).
-                        const reviewStatuses = reviewStatusesFromAction ?? [
-                            'pending_review',
-                        ];
                         actions.push(fetchTransactionCategorizationView('review', { start: timePeriodStart, end: timePeriodEnd }, true, // cacheOverride = true to force refresh
                         false, undefined, undefined, true, // refreshViewInBackground
-                        false, isUncategorizedExpenseCategoryEnabled, reviewStatuses));
+                        false, isUncategorizedExpenseCategoryEnabled));
                     }
                 }
                 actions.push(updateTotalCountForTransactionCategorization({

package/lib/esm/view/expenseAutomationView/epics/transactionCategorization/saveTransactionCategorizationEpic.js

@@ -6,7 +6,7 @@ import { getUncategorizedAccounts } from '../../../accountList/accountListSelect
 import { toTransactionUpdatesFromTransactionCategorizationLocalData } from '../../helpers/saveTransactionHelper';
 import { saveTransactionCategorization, updateTransactionCategorization, } from '../../reducers/transactionsViewReducer';
 export const saveTransactionCategorizationEpic = (actions$, state$) => actions$.pipe(filter(saveTransactionCategorization.match), mergeMap((action) => {
-    const { transactionIds, cotTrackingByTransactionId, selectedTab, isUncategorizedExpenseCategoryEnabled, reviewStatuses, } = action.payload;
+    const { transactionIds, cotTrackingByTransactionId, selectedTab, isUncategorizedExpenseCategoryEnabled, } = action.payload;
     const fetchActions = [];
     const { transactionState, expenseAutomationTransactionsViewState } = state$.value;
     const transactionSaveUpdates = [];
@@ -19,10 +19,6 @@ export const saveTransactionCategorizationEpic = (actions$, state$) => actions$.
             transactionSaveUpdates.push(toTransactionUpdatesFromTransactionCategorizationLocalData(localData, transaction, uncategorizedIncomeExpense));
         }
     });
-    // Forward `reviewStatuses` so the downstream
-    // `updateTransactionCategorizationEpic` -> `markTransactionAsNotMiscategorized`
-    // chain receives the Statsig-resolved Review-tab statuses end-to-end
-    // without reading Statsig from epic-land.
-    fetchActions.push(updateTransactionCategorization(selectedTab, transactionIds, transactionSaveUpdates, cotTrackingByTransactionId, isUncategorizedExpenseCategoryEnabled, reviewStatuses));
+    fetchActions.push(updateTransactionCategorization(selectedTab, transactionIds, transactionSaveUpdates, cotTrackingByTransactionId, isUncategorizedExpenseCategoryEnabled));
     return from(fetchActions);
 }));

package/lib/esm/view/expenseAutomationView/epics/transactionCategorization/triggerReviewTabRefetchEpic.js

@@ -4,7 +4,7 @@ import { convertToPeriod, toAbsoluteDay, } from '../../../../commonStateTypes/ti
 import { getCurrentTenant } from '../../../../entity/tenant/tenantSelector';
 import { backgroundRefetchReviewTab, syncTransactionCategorizationFromDetailSave, } from '../../reducers/transactionsViewReducer';
 export const triggerReviewTabRefetchEpic = (actions$, state$) => actions$.pipe(filter(syncTransactionCategorizationFromDetailSave.match), mergeMap((action) => {
-    const { pendingReviewLineIds, transactionId, isUncategorizedExpenseCategoryEnabled, reviewStatuses, } = action.payload;
+    const { pendingReviewLineIds, transactionId, isUncategorizedExpenseCategoryEnabled, } = action.payload;
     if (pendingReviewLineIds.length === 0) {
         return EMPTY;
     }
@@ -23,5 +23,5 @@ export const triggerReviewTabRefetchEpic = (actions$, state$) => actions$.pipe(f
     if (timePeriodStart == null || timePeriodEnd == null) {
         return EMPTY;
     }
-    return of(backgroundRefetchReviewTab({ start: timePeriodStart, end: timePeriodEnd }, isUncategorizedExpenseCategoryEnabled, reviewStatuses));
+    return of(backgroundRefetchReviewTab({ start: timePeriodStart, end: timePeriodEnd }, isUncategorizedExpenseCategoryEnabled));
 }));

package/lib/esm/view/expenseAutomationView/epics/transactionCategorization/updateTransactionCategorizationEpic.js

@@ -15,7 +15,7 @@ import { getVendorByVendorId } from '../../../../entity/vendor/vendorSelector';
 import { createZeniAPIStatus, isSuccessResponse, } from '../../../../responsePayload';
 import { markTransactionAsNotMiscategorized, updateTransactionCategorization, updateTransactionCategorizationSaveStatus, } from '../../reducers/transactionsViewReducer';
 export const updateTransactionCategorizationEpic = (actions$, state$, zeniAPI) => actions$.pipe(filter(updateTransactionCategorization.match), mergeMap((action) => {
-    const { selectedTab, transactionIds, transactionSaveUpdates, cotTrackingByTransactionId, isUncategorizedExpenseCategoryEnabled, reviewStatuses, } = action.payload;
+    const { selectedTab, transactionIds, transactionSaveUpdates, cotTrackingByTransactionId, isUncategorizedExpenseCategoryEnabled, } = action.payload;
     const { transactionState, vendorState, expenseAutomationTransactionsViewState, } = state$.value;
     const payloadArray = preparePayload(selectedTab, transactionState, vendorState, expenseAutomationTransactionsViewState, transactionIds, transactionSaveUpdates, cotTrackingByTransactionId).filter((payload) => payload != null);
     return zeniAPI
@@ -24,11 +24,7 @@ export const updateTransactionCategorizationEpic = (actions$, state$, zeniAPI) =
         if (isSuccessResponse(response) && response.data != null) {
             const transactionsInReview = response.data;
             const actions = [];
-            // Forward `reviewStatuses` so the downstream
-            // `markTransactionAsNotMiscategorizedEpic` can request the
-            // Statsig-resolved Review-tab statuses for its conditional
-            // background refetch via `fetchTransactionCategorizationView`.
-            actions.push(markTransactionAsNotMiscategorized(selectedTab, transactionsInReview, isUncategorizedExpenseCategoryEnabled, reviewStatuses), updateTransactionCategorizationSaveStatus(selectedTab, 'Completed', createZeniAPIStatus('Completed', 'Transaction categorization updated successfully')));
+            actions.push(markTransactionAsNotMiscategorized(selectedTab, transactionsInReview, isUncategorizedExpenseCategoryEnabled), updateTransactionCategorizationSaveStatus(selectedTab, 'Completed', createZeniAPIStatus('Completed', 'Transaction categorization updated successfully')));
             return from(actions);
         }
         else {

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

@@ -18,37 +18,20 @@ const expenseAutomationView = createSlice({
             reducer() {
                 //do nothing
             },
-            /**
-             * `statuses` / `countOnlyStatuses` carry the Statsig-resolved values
-             * for the currently selected transaction-categorization tab. The
-             * host (`ExpenseAutomationScreen`) resolves them via
-             * `useDynamicConfig` + `resolveTransactionCategorizationStatuses`
-             * and passes them in so the downstream bootstrap fetch hits the
-             * listing API with the correct status filter. Optional only as a
-             * defensive type concession for non-categorization callers (the
-             * action is also used to bootstrap the missing-receipts / reconciliation
-             * / month-end views, which don't consume these args).
-             */
-            prepare(cacheOverride = false, refreshViewInBackground = false, isUncategorizedExpenseCategoryEnabled = false, statuses, countOnlyStatuses) {
+            prepare(cacheOverride = false, refreshViewInBackground = false, isUncategorizedExpenseCategoryEnabled = false) {
                 return {
                     payload: {
                         cacheOverride,
                         refreshViewInBackground,
                         isUncategorizedExpenseCategoryEnabled,
-                        statuses,
-                        countOnlyStatuses,
                     },
                 };
             },
         },
         refreshExpenseAutomationCurrentTab: {
-            prepare(isUncategorizedExpenseCategoryEnabled, statuses, countOnlyStatuses) {
+            prepare(isUncategorizedExpenseCategoryEnabled) {
                 return {
-                    payload: {
-                        isUncategorizedExpenseCategoryEnabled,
-                        statuses,
-                        countOnlyStatuses,
-                    },
+                    payload: { isUncategorizedExpenseCategoryEnabled },
                 };
             },
             reducer() {

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

@@ -121,7 +121,7 @@ const expenseAutomationTransactionsView = createSlice({
     reducers: {
         fetchTransactionCategorizationView: {
             prepare(selectedTab, period, cacheOverride = false, keepExistingListItems = false, searchString, // when this is defined the output should go to search result IDs
-            pageToken, refreshViewInBackground = false, resetListItems = false, isUncategorizedExpenseCategoryEnabled, statuses, countOnlyStatuses) {
+            pageToken, refreshViewInBackground = false, resetListItems = false, isUncategorizedExpenseCategoryEnabled) {
                 return {
                     payload: {
                         selectedTab,
@@ -133,8 +133,6 @@ const expenseAutomationTransactionsView = createSlice({
                         refreshViewInBackground,
                         resetListItems,
                         isUncategorizedExpenseCategoryEnabled,
-                        statuses,
-                        countOnlyStatuses,
                     },
                 };
             },
@@ -183,7 +181,7 @@ const expenseAutomationTransactionsView = createSlice({
                 }
             },
             prepare(selectedTab, period, cacheOverride = false, keepExistingListItems = false, searchString, // when this is defined the output should go to search result IDs
-            pageToken, refreshViewInBackground = false, resetListItems, isUncategorizedExpenseCategoryEnabled, statuses, countOnlyStatuses) {
+            pageToken, refreshViewInBackground = false, resetListItems, isUncategorizedExpenseCategoryEnabled) {
                 return {
                     payload: {
                         selectedTab,
@@ -195,8 +193,6 @@ const expenseAutomationTransactionsView = createSlice({
                         refreshViewInBackground,
                         resetListItems,
                         isUncategorizedExpenseCategoryEnabled,
-                        statuses,
-                        countOnlyStatuses,
                     },
                 };
             },
@@ -315,25 +311,13 @@ const expenseAutomationTransactionsView = createSlice({
             draft.transactionCategorizationView[selectedTab].filters = filters;
         },
         saveTransactionCategorization: {
-            /**
-             * `reviewStatuses` carries the Statsig-resolved Review-tab statuses
-             * forwarded by `ExpenseAutomationScreen`.
-             * `saveTransactionCategorizationEpic` threads them downstream into
-             * `updateTransactionCategorization` -> `markTransactionAsNotMiscategorized`
-             * so the conditional background Review-tab refetch in
-             * `markTransactionAsNotMiscategorizedEpic` can request the correct
-             * status set without reading Statsig from epic-land. Optional during
-             * the deprecation window so un-migrated callers continue to work via
-             * slice fallback.
-             */
-            prepare(selectedTab, transactionIds, cotTrackingByTransactionId, isUncategorizedExpenseCategoryEnabled, reviewStatuses) {
+            prepare(selectedTab, transactionIds, cotTrackingByTransactionId, isUncategorizedExpenseCategoryEnabled) {
                 return {
                     payload: {
                         selectedTab,
                         transactionIds,
                         cotTrackingByTransactionId,
                         isUncategorizedExpenseCategoryEnabled,
-                        reviewStatuses,
                     },
                 };
             },
@@ -407,16 +391,9 @@ const expenseAutomationTransactionsView = createSlice({
                     fetchState: 'In-Progress',
                 };
             },
-            /**
-             * `reviewStatuses` carries the Statsig-resolved Review-tab statuses
-             * forwarded from `saveTransactionCategorization`.
-             * `updateTransactionCategorizationEpic` threads them downstream into
-             * `markTransactionAsNotMiscategorized`.
-             */
-            prepare(selectedTab, transactionIds, transactionSaveUpdates, cotTrackingByTransactionId, isUncategorizedExpenseCategoryEnabled, reviewStatuses) {
+            prepare(selectedTab, transactionIds, transactionSaveUpdates, cotTrackingByTransactionId, isUncategorizedExpenseCategoryEnabled) {
                 return {
                     payload: {
-                        reviewStatuses,
                         selectedTab,
                         transactionIds,
                         transactionSaveUpdates,
@@ -881,20 +858,12 @@ const expenseAutomationTransactionsView = createSlice({
                     error: undefined,
                 };
             },
-            /**
-             * `reviewStatuses` carries the Statsig-resolved Review-tab statuses
-             * forwarded from the EA-screen save chain.
-             * `markTransactionAsNotMiscategorizedEpic` reads this payload value
-             * when dispatching the conditional background Review-tab refetch via
-             * `fetchTransactionCategorizationView`.
-             */
-            prepare(selectedTab, transactionsInReview, isUncategorizedExpenseCategoryEnabled, reviewStatuses) {
+            prepare(selectedTab, transactionsInReview, isUncategorizedExpenseCategoryEnabled) {
                 return {
                     payload: {
                         selectedTab,
                         transactionsInReview,
                         isUncategorizedExpenseCategoryEnabled,
-                        reviewStatuses,
                     },
                 };
             },
@@ -952,17 +921,10 @@ const expenseAutomationTransactionsView = createSlice({
         },
         updateTotalCountForTransactionCategorization(draft, action) {
             const { selectedTab, selectedPeriod, totalCount } = action.payload;
-            const periodId = toMonthYearPeriodId(selectedPeriod);
-            draft.transactionCategorizationView[selectedTab].uiState.totalCount[periodId] = totalCount;
-            if (selectedTab === 'review') {
-                draft.parentTotalCountByTab.review[periodId] = totalCount;
-            }
+            draft.transactionCategorizationView[selectedTab].uiState.totalCount[toMonthYearPeriodId(selectedPeriod)] = totalCount;
         },
         updateParentTotalCountForTab(draft, action) {
             const { selectedTab, selectedPeriod, parentTotalCount } = action.payload;
-            if (parentTotalCount == null) {
-                return;
-            }
             draft.parentTotalCountByTab[selectedTab][toMonthYearPeriodId(selectedPeriod)] = parentTotalCount;
         },
         updateSelectedCheckboxTransactionIds(draft, action) {
@@ -1011,7 +973,7 @@ const expenseAutomationTransactionsView = createSlice({
             },
         },
         syncTransactionCategorizationFromDetailSave: {
-            prepare(transactionId, updatedTransaction, pendingReviewLineIds, uncategorizedIncomeExpense, isUncategorizedExpenseCategoryEnabled, reviewStatuses) {
+            prepare(transactionId, updatedTransaction, pendingReviewLineIds, uncategorizedIncomeExpense, isUncategorizedExpenseCategoryEnabled) {
                 return {
                     payload: {
                         transactionId,
@@ -1019,7 +981,6 @@ const expenseAutomationTransactionsView = createSlice({
                         pendingReviewLineIds,
                         uncategorizedIncomeExpense,
                         isUncategorizedExpenseCategoryEnabled,
-                        reviewStatuses,
                     },
                 };
             },
@@ -1065,12 +1026,11 @@ const expenseAutomationTransactionsView = createSlice({
             },
         },
         backgroundRefetchReviewTab: {
-            prepare(period, isUncategorizedExpenseCategoryEnabled, reviewStatuses) {
+            prepare(period, isUncategorizedExpenseCategoryEnabled) {
                 return {
                     payload: {
                         period,
                         isUncategorizedExpenseCategoryEnabled,
-                        reviewStatuses,
                     },
                 };
             },

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

@@ -5,12 +5,12 @@ import { toMonthYearPeriodId } from '../../../commonStateTypes/timePeriod';
 import { getCurrentTenant, getIsAccountingClassesEnabled, getIsAccountingProjectsEnabled, } from '../../../entity/tenant/tenantSelector';
 import { getTransactionWithCOT } from '../../../entity/transaction/transactionHelper';
 import { getSupportedTransactionsByIds } from '../../../entity/transaction/transactionSelector';
+import { applyTransactionFilters, } from '../transactionFilterHelpers';
 import { getAccountList, getNestedAccountListHierarchy, getUncategorizedAccounts, } from '../../accountList/accountListSelector';
 import { getClassList, getNestedClassListHierarchy, } from '../../classList/classListSelector';
 import { getResolvedTransferAccounts } from '../../createTransferEntry/createTransferEntrySelector';
 import { getProjectList } from '../../projectList/projectListSelector';
 import { getAllSteps } from '../selectorTypes/expenseAutomationViewSelectorTypes';
-import { applyTransactionFilters, } from '../transactionFilterHelpers';
 // Walks the tab's transactionReviewLocalDataById map and returns
 // `{ [transactionId]: true }` for every transaction that has at least
 // one line whose targeted-fetch is In-Progress. Pulled out as a plain
@@ -186,11 +186,10 @@ export function getExpenseAutomationTransactionView(state) {
         review: monthYearPeriodId != null ? totalCountByReview[monthYearPeriodId] : 0,
         autoCategorized: monthYearPeriodId != null ? totalCountByAutoCat[monthYearPeriodId] : 0,
     };
-    // Parent-tab badge counts. Sourced from the listing response's optional
-    // `count_only_total` (only emitted when the request supplied
-    // `count_only_statuses`) 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.
+    // 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.
     const parentTotalCountByTab = expenseAutomationTransactionsViewState.parentTotalCountByTab;
     const parentTabTotalCountByTab = {
         review: monthYearPeriodId != null

package/lib/esm/view/fileView/epic/deleteFileEpic.js

@@ -1,9 +1,9 @@
 import { of } from 'rxjs';
-import { catchError, filter, mergeMap } from 'rxjs/operators';
+import { catchError, filter, mergeMap, switchMap } from 'rxjs/operators';
 import { removeFiles } from '../../../entity/file/fileReducer';
 import { createZeniAPIStatus, isSuccessResponse } from '../../../responsePayload';
 import { deleteFile, deleteFileFailure, deleteFileSuccess, } from '../fileViewReducer';
-export const deleteFileEpic = (actions$, _state$, zeniAPI) => actions$.pipe(filter(deleteFile.match), mergeMap((action) => {
+export const deleteFileEpic = (actions$, _state$, zeniAPI) => actions$.pipe(filter(deleteFile.match), switchMap((action) => {
     /**
      * tenantId is required for deleting onboarding files.
      */

package/lib/esm/view/fileView/epic/deleteFileListEpic.js

@@ -1,9 +1,9 @@
 import { of } from 'rxjs';
-import { catchError, filter, mergeMap } from 'rxjs/operators';
+import { catchError, filter, mergeMap, switchMap } from 'rxjs/operators';
 import { removeFiles } from '../../../entity/file/fileReducer';
 import { createZeniAPIStatus, isSuccessResponse } from '../../../responsePayload';
 import { deleteFileList, deleteFileListFailure, deleteFileListSuccess, } from '../fileViewReducer';
-export const deleteFileListEpic = (actions$, _state$, zeniAPI) => actions$.pipe(filter(deleteFileList.match), mergeMap((action) => {
+export const deleteFileListEpic = (actions$, _state$, zeniAPI) => actions$.pipe(filter(deleteFileList.match), switchMap((action) => {
     const { fileIds } = action.payload;
     return zeniAPI
         .deleteAndGetJSON(`${zeniAPI.apiEndPoints.fileMicroServiceBaseUrl}/1.0/files?query=${encodeURIComponent(JSON.stringify({ file_ids: fileIds }))}`)

package/lib/esm/view/onboardingView/customerView/epic/customerDetails/updateOnboardingCustomerViewEpic.js

@@ -18,7 +18,7 @@ import { getOnboardingCustomerView } from '../../onboardingCustomerViewSelector'
 export const updateOnboardingCustomerViewEpic = (actions$, state$, zeniAPI) => actions$.pipe(filter(updateOnboardingCustomerView.match), mergeMap((action) => {
     const { companyId, officerType, sendForVerification, reCalculateCurrentStep = false, isBillingAddressUpdate, } = action.payload;
     const { onboardingCustomerViewState } = state$.value;
-    const { companyDetails, primaryContactDetails, companyOfficerUpdateStatus, currentStep, currentSubStep, } = onboardingCustomerViewState;
+    const { companyDetails, primaryContactDetails, companyOfficerUpdateStatus, currentStep, } = onboardingCustomerViewState;
     const companyLocalData = companyDetails.localData;
     const primaryContactLocalData = primaryContactDetails.localData;
     let companyOfficerLocalData;
@@ -52,12 +52,8 @@ export const updateOnboardingCustomerViewEpic = (actions$, state$, zeniAPI) => a
             Boolean(companyOfficerLocalData.email) === true // Don't save Empty Company Officer details
             ? toBusinessVerificationOfficerDataPayload(companyOfficerLocalData, false, companyOfficerAddressToCreate)
             : {};
-        // Verification step has two sub-steps that share currentStep but save
-        // different payloads — currentSubStep is the source of truth here.
-        const isOfficerSave = currentStep === 'verification' &&
-            currentSubStep === 'company_officer';
         if (isBillingAddressUpdate === false) {
-            if (isOfficerSave) {
+            if (currentStep === 'company_officer') {
                 payload = {
                     company: toBusinessVerificationMinimalCompanyDataPayload(companyLocalData),
                     company_officer,
@@ -70,11 +66,6 @@ export const updateOnboardingCustomerViewEpic = (actions$, state$, zeniAPI) => a
                 };
             }
         }
-        const section = isBillingAddressUpdate === true
-            ? 'setup_billing'
-            : isOfficerSave
-                ? 'company_officer'
-                : 'company_details';
         const messageSectionMapper = {
             company_officer: {
                 sendForVerification: 'onboarding_customer_identity_verification_submit',
@@ -84,20 +75,23 @@ export const updateOnboardingCustomerViewEpic = (actions$, state$, zeniAPI) => a
                 sendForVerification: 'onboarding_customer_business_verification_submit',
                 save: 'onboarding_customer_business_verification_save',
             },
-            setup_billing: {
+            link_payment_account: {
                 save: 'billing_address_view',
                 sendForVerification: 'billing_address_view',
             },
         };
         let messageSection;
         if (isBillingAddressUpdate === true) {
-            messageSection = messageSectionMapper[section].save;
-        }
-        else if (sendForVerification === true) {
-            messageSection = messageSectionMapper[section].sendForVerification;
+            messageSection = messageSectionMapper[currentStep].save;
         }
         else {
-            messageSection = messageSectionMapper[section].save;
+            if (sendForVerification === true) {
+                messageSection =
+                    messageSectionMapper[currentStep].sendForVerification;
+            }
+            else {
+                messageSection = messageSectionMapper[currentStep].save;
+            }
         }
         return zeniAPI
             .putAndGetJSON(`${zeniAPI.apiEndPoints.tenantMicroServiceBaseUrl}/1.0/companies/${companyId}`, payload)
@@ -120,18 +114,18 @@ export const updateOnboardingCustomerViewEpic = (actions$, state$, zeniAPI) => a
                 const externalConnections = currentTenant.externalConnections;
                 const isQBOConnection = externalConnections?.accounting?.some((connection) => connection.connectionName.match(/quickbooks/i)) ?? false;
                 const { allSteps } = getOnboardingCustomerView(state$.value, companyId);
-                if (currentStep === 'setup_billing') {
+                if (currentStep === 'link_payment_account') {
                     if (isQBOConnection === true &&
-                        allSteps.includes('connect_ledger')) {
-                        actions.push(updateCurrentStep({ step: 'connect_ledger' }));
+                        allSteps.includes('qbo_connection')) {
+                        actions.push(updateCurrentStep({ step: 'qbo_connection' }));
                     }
                     else {
-                        actions.push(updateCurrentStep({ step: 'verification' }));
+                        actions.push(updateCurrentStep({ step: 'company_officer' }));
                     }
                 }
-                // The officer→details transition is now a sub-step change
-                // handled by the page (currentSubStep dispatch). No
-                // currentStep update needed for that traversal anymore.
+                if (currentStep === 'company_officer') {
+                    actions.push(updateCurrentStep({ step: 'company_details' }));
+                }
                 actions.push(updateOnboardingCustomerViewLocalStoreData({
                     companyId: response.data.companies[0].company_id,
                     currentStep,

package/lib/esm/view/onboardingView/customerView/epic/customerDetails/updateOnboardingCustomerViewLocalStoreDataEpic.js

@@ -12,11 +12,11 @@ import { newAddressInLocalStore, resetNewAddressesInLocalStore, } from '../../..
 import { toAddressViewLocalData } from '../../../../addressView/toAddressViewLocalData';
 import { getCompanyView } from '../../../../companyView/selectorHelpers/getCompanyView';
 import { toSetupViewLocalData } from '../../../../spendManagement/commonSetup/epic/setup/updateSetupViewLocalStoreDataEpic';
-import { clearOnboardingCustomerViewDataInLocalStore, saveOnboardingCustomerViewDataInLocalStore, updateCurrentStep, updateCurrentSubStep, updateOnboardingCustomerViewLocalStoreData, } from '../../onboardingCustomerViewReducer';
-import { onboardingStepsData } from '../../onboardingCustomerViewSelector';
+import { clearOnboardingCustomerViewDataInLocalStore, saveOnboardingCustomerViewDataInLocalStore, updateCurrentStep, updateOnboardingCustomerViewLocalStoreData, } from '../../onboardingCustomerViewReducer';
+import { isOfficerDetailsCompleted, onboardingStepsData, } from '../../onboardingCustomerViewSelector';
 export const updateOnboardingCustomerViewLocalStoreDataEpic = (actions$, state$) => actions$.pipe(filter(updateOnboardingCustomerViewLocalStoreData.match), mergeMap((action) => {
     const { companyId, currentStep, reCalculateCurrentStep } = action.payload;
-    const { companyState, companyViewState, userState, userRoleState, onboardingCustomerViewState, subscriptionPaymentAccountState, paymentAccountState, addressState, } = state$.value;
+    const { companyState, companyViewState, fileState, userState, userRoleState, onboardingCustomerViewState, subscriptionPaymentAccountState, paymentAccountState, addressState, } = state$.value;
     const { subscriptionPaymentAccountIds } = onboardingCustomerViewState;
     const subscriptionIDs = recordGet(companyViewState.passportView.subscriptionIDsByCompanyID, companyId, undefined);
     const companyView = getCompanyView(state$.value, companyId, subscriptionIDs ?? []);
@@ -36,12 +36,7 @@ export const updateOnboardingCustomerViewLocalStoreDataEpic = (actions$, state$)
         const onboardingCustomerViewLocalData = toOnboardingCustomerViewLocalData(company, companyOfficers, companyOfficerRoles, primaryContact);
         const { companyDetails, officers, primaryContactDetails } = onboardingCustomerViewLocalData;
         let updatedCompanyDetails = companyDetails;
-        // After an officer sub-step save inside the verification step, propagate
-        // the latest syncToken into the cached company-details local data so the
-        // user's next details-save doesn't 409.
-        const isOfficerSave = currentStep === 'verification' &&
-            onboardingCustomerViewState.currentSubStep === 'company_officer';
-        if (isOfficerSave &&
+        if (currentStep === 'company_officer' &&
             onboardingCustomerViewState.companyDetails.localData != null) {
             const { companyInfo } = company;
             const { syncToken } = companyInfo;
@@ -50,7 +45,7 @@ export const updateOnboardingCustomerViewLocalStoreDataEpic = (actions$, state$)
                 syncToken,
             };
         }
-        let updatedCurrentStep = 'setup_billing';
+        let updatedCurrentStep = 'link_payment_account';
         let subscriptionPaymentAccount;
         const { companyOnboardingInfo } = company;
         const accountingConnectionCreationMode = companyOnboardingInfo?.onboardingInfo
@@ -77,17 +72,18 @@ export const updateOnboardingCustomerViewLocalStoreDataEpic = (actions$, state$)
                 cardPaymentViewState.cardPaymentsIds.length > 0) &&
                 companyView?.company.company.companyOnboardingInfo
                     .subscriptionBillingAddressId != null) {
-                updatedCurrentStep = 'connect_ledger';
-                const isOnboardingAiActivationViewed = companyOnboardingInfo?.onboardingInfo
-                    ?.onboardingAiActivationInfo?.isOnboardingAiActivationViewed ??
-                    false;
-                // Past the ledger step we always sit on connect_data_source —
-                // it has many integrations, so we treat it as never auto-complete
-                // and only advance to verification on an explicit user dispatch.
-                // While the AI activation interstitial hasn't been viewed yet,
-                // stay on connect_ledger so the interstitial gets its chance.
-                if (isValidConnection && isOnboardingAiActivationViewed) {
-                    updatedCurrentStep = 'connect_data_source';
+                updatedCurrentStep = 'qbo_connection';
+                if (isValidConnection) {
+                    updatedCurrentStep = 'company_officer';
+                    let officerIndex = companyOfficers.length > 0
+                        ? officers.findIndex((officer) => officer?.isSelectedForVerification === true)
+                        : 0;
+                    if (officerIndex === -1) {
+                        officerIndex = 0;
+                    }
+                    if (isOfficerDetailsCompleted(companyOfficers, companyOfficerRoles, officers[officerIndex], fileState)) {
+                        updatedCurrentStep = 'company_details';
+                    }
                 }
             }
         }
@@ -109,14 +105,6 @@ export const updateOnboardingCustomerViewLocalStoreDataEpic = (actions$, state$)
         }
         if (reCalculateCurrentStep === true) {
             fetchActions.push(updateCurrentStep({ step: updatedCurrentStep }));
-            // Whenever the recalc lands the user on a different step, reset
-            // the sub-step to the step's landing sub-state — otherwise a
-            // stale subStep (e.g. 'default' carried over from another step)
-            // leaves verification rendering an empty form.
-            if (updatedCurrentStep !== onboardingCustomerViewState.currentStep) {
-                const targetSubStep = updatedCurrentStep === 'verification' ? 'unlock-stack' : 'default';
-                fetchActions.push(updateCurrentSubStep({ subStep: targetSubStep }));
-            }
         }
     }
     if (companyView != null) {