@zeniai/client-epic-state 5.1.35-betaAK7 → 5.1.35-betaDI1

package/lib/esm/reducer.js

@@ -33,15 +33,6 @@ import forecast, { initialState as initialForecastState, } from './entity/foreca
 import entity, { initialState as initialEntityState, } from './entity/genericEntity/entityReducer';
 import globalMerchant, { initialState as initialGlobalMerchantState, } from './entity/globalMerchant/globalMerchantReducer';
 import insights, { initialState as initialInsightState, } from './entity/insights/insightReducer';
-import invoicingCoupon, { initialState as initialInvoicingCouponState, } from './entity/invoicing/coupon/couponReducer';
-import invoicingCreditNote, { initialState as initialInvoicingCreditNoteState, } from './entity/invoicing/creditNote/creditNoteReducer';
-import invoicingDunningCase, { initialState as initialInvoicingDunningCaseState, } from './entity/invoicing/dunningCase/dunningCaseReducer';
-import invoicingInvoice, { initialState as initialInvoicingInvoiceState, } from './entity/invoicing/invoice/invoiceReducer';
-import invoicingCustomer, { initialState as initialInvoicingCustomerState, } from './entity/invoicing/invoicingCustomer/invoicingCustomerReducer';
-import invoicingSubscription, { initialState as initialInvoicingSubscriptionState, } from './entity/invoicing/invoicingSubscription/invoicingSubscriptionReducer';
-import invoicingTransaction, { initialState as initialInvoicingTransactionState, } from './entity/invoicing/invoicingTransaction/invoicingTransactionReducer';
-import invoicingPlan, { initialState as initialInvoicingPlanState, } from './entity/invoicing/plan/planReducer';
-import invoicingProduct, { initialState as initialInvoicingProductState, } from './entity/invoicing/product/productReducer';
 import jeSchedules, { initialState as initialJESchedulesState, } from './entity/jeSchedules/jeSchedulesReducer';
 import merchant, { initialState as initialMerchantState, } from './entity/merchant/merchantReducer';
 import monthEndCloseChecks, { initialState as initialMonthEndCloseChecksState, } from './entity/monthEndCloseChecks/monthEndCloseChecksReducer';
@@ -126,40 +117,6 @@ import forecastList, { initialState as initialForecastListState, } from './view/
 import globalMerchantAutoComplete, { initialState as initialGlobalMerchantAutoCompleteState, } from './view/globalMerchantView/globalMerchantAutoCompleteView/globalMerchantAutoCompleteViewReducer';
 import globalMerchantView, { initialState as initialGlobalMerchantViewState, } from './view/globalMerchantView/globalMerchantViewReducer';
 import insightsCard, { initialState as initialInsightCardState, } from './view/insightsCard/insightsCardReducer';
-import invoicingApprovalAction, { initialState as initialInvoicingApprovalActionState, } from './view/invoicing/approvalAction/approvalActionReducer';
-import invoicingApprovalsView, { initialState as initialInvoicingApprovalsViewState, } from './view/invoicing/approvalsView/approvalsViewReducer';
-import invoicingAuditView, { initialState as initialInvoicingAuditViewState, } from './view/invoicing/auditView/auditViewReducer';
-import invoicingCouponView, { initialState as initialInvoicingCouponViewState, } from './view/invoicing/couponView/couponViewReducer';
-import invoicingCreateInvoice, { initialState as initialInvoicingCreateInvoiceState, } from './view/invoicing/createInvoice/createInvoiceReducer';
-import invoicingCustomerPaymentMethod, { initialState as initialInvoicingCustomerPaymentMethodState, } from './view/invoicing/customerPaymentMethod/customerPaymentMethodReducer';
-import invoicingDataImportAction, { initialState as initialInvoicingDataImportActionState, } from './view/invoicing/dataImportAction/dataImportActionReducer';
-import invoicingDataImportView, { initialState as initialInvoicingDataImportViewState, } from './view/invoicing/dataImportView/dataImportViewReducer';
-import invoicingDunningAction, { initialState as initialInvoicingDunningActionState, } from './view/invoicing/dunningAction/dunningActionReducer';
-import editInvoicingCatalogItemDetailView, { initialState as initialEditInvoicingCatalogItemDetailViewState, } from './view/invoicing/editInvoicingCatalogItemDetailView/editInvoicingCatalogItemDetailViewReducer';
-import editInvoicingCouponDetailView, { initialState as initialEditInvoicingCouponDetailViewState, } from './view/invoicing/editInvoicingCouponDetailView/editInvoicingCouponDetailViewReducer';
-import editInvoicingCustomerDetailView, { initialState as initialEditInvoicingCustomerDetailViewState, } from './view/invoicing/editInvoicingCustomerDetailView/editInvoicingCustomerDetailViewReducer';
-import editInvoicingSubscriptionDetailView, { initialState as initialEditInvoicingSubscriptionDetailViewState, } from './view/invoicing/editInvoicingSubscriptionDetailView/editInvoicingSubscriptionDetailViewReducer';
-import invoicingInvoiceAction, { initialState as initialInvoicingInvoiceActionState, } from './view/invoicing/invoiceAction/invoiceActionReducer';
-import invoicingInvoiceDetail, { initialState as initialInvoicingInvoiceDetailState, } from './view/invoicing/invoiceDetail/invoiceDetailReducer';
-import invoicingInvoiceList, { initialState as initialInvoicingInvoiceListState, } from './view/invoicing/invoiceList/invoiceListReducer';
-import invoicingCatalogItemDetailView, { initialState as initialInvoicingCatalogItemDetailViewState, } from './view/invoicing/invoicingCatalogItemDetailView/invoicingCatalogItemDetailViewReducer';
-import invoicingCatalogListView, { initialState as initialInvoicingCatalogListViewState, } from './view/invoicing/invoicingCatalogListView/invoicingCatalogListViewReducer';
-import invoicingCouponDetailView, { initialState as initialInvoicingCouponDetailViewState, } from './view/invoicing/invoicingCouponDetailView/invoicingCouponDetailViewReducer';
-import invoicingCreditNoteDetailView, { initialState as initialInvoicingCreditNoteDetailViewState, } from './view/invoicing/invoicingCreditNoteDetailView/invoicingCreditNoteDetailViewReducer';
-import invoicingCreditNoteListView, { initialState as initialInvoicingCreditNoteListViewState, } from './view/invoicing/invoicingCreditNoteListView/invoicingCreditNoteListViewReducer';
-import invoicingCustomerDetailView, { initialState as initialInvoicingCustomerDetailViewState, } from './view/invoicing/invoicingCustomerDetailView/invoicingCustomerDetailViewReducer';
-import invoicingCustomerListView, { initialState as initialInvoicingCustomerListViewState, } from './view/invoicing/invoicingCustomerListView/invoicingCustomerListViewReducer';
-import invoicingDunningCaseDetailView, { initialState as initialInvoicingDunningCaseDetailViewState, } from './view/invoicing/invoicingDunningCaseDetailView/invoicingDunningCaseDetailViewReducer';
-import invoicingDunningCaseListView, { initialState as initialInvoicingDunningCaseListViewState, } from './view/invoicing/invoicingDunningCaseListView/invoicingDunningCaseListViewReducer';
-import invoicingOverview, { initialState as initialInvoicingOverviewState, } from './view/invoicing/invoicingOverview/invoicingOverviewReducer';
-import invoicingSubscriptionDetailView, { initialState as initialInvoicingSubscriptionDetailViewState, } from './view/invoicing/invoicingSubscriptionDetailView/invoicingSubscriptionDetailViewReducer';
-import invoicingSubscriptionListView, { initialState as initialInvoicingSubscriptionListViewState, } from './view/invoicing/invoicingSubscriptionListView/invoicingSubscriptionListViewReducer';
-import invoicingTransactionDetailView, { initialState as initialInvoicingTransactionDetailViewState, } from './view/invoicing/invoicingTransactionDetailView/invoicingTransactionDetailViewReducer';
-import invoicingTransactionListView, { initialState as initialInvoicingTransactionListViewState, } from './view/invoicing/invoicingTransactionListView/invoicingTransactionListViewReducer';
-import invoicingPaymentAction, { initialState as initialInvoicingPaymentActionState, } from './view/invoicing/paymentAction/paymentActionReducer';
-import invoicingRecordPayment, { initialState as initialInvoicingRecordPaymentState, } from './view/invoicing/recordPayment/recordPaymentReducer';
-import invoicingSettingsView, { initialState as initialInvoicingSettingsViewState, } from './view/invoicing/settingsView/settingsViewReducer';
-import invoicingSubscriptionAction, { initialState as initialInvoicingSubscriptionActionState, } from './view/invoicing/subscriptionAction/subscriptionActionReducer';
 import monthEndCloseChecksView, { initialState as initialMonthEndCloseChecksViewState, } from './view/monthEndCloseChecksView/monthEndCloseChecksViewReducer';
 import netBurnOrIncome, { initialState as initialNetBurnOrIncomeWithForecastState, } from './view/netBurnOrIncome/netBurnOrIncomeReducer';
 import netBurnOrIncomeClassesView, { initialState as initialNetBurnOrIncomeClassesViewState, } from './view/netBurnOrIncomeClassesView/netBurnOrIncomeClassesViewReducer';
@@ -309,15 +266,6 @@ const initialEntitiesState = {
     forecastState: initialForecastState,
     globalMerchantState: initialGlobalMerchantState,
     insightState: initialInsightState,
-    invoicingCouponState: initialInvoicingCouponState,
-    invoicingCreditNoteState: initialInvoicingCreditNoteState,
-    invoicingCustomerState: initialInvoicingCustomerState,
-    invoicingDunningCaseState: initialInvoicingDunningCaseState,
-    invoicingInvoiceState: initialInvoicingInvoiceState,
-    invoicingPlanState: initialInvoicingPlanState,
-    invoicingProductState: initialInvoicingProductState,
-    invoicingSubscriptionState: initialInvoicingSubscriptionState,
-    invoicingTransactionState: initialInvoicingTransactionState,
     jeSchedulesState: initialJESchedulesState,
     merchantState: initialMerchantState,
     monthEndCloseChecksState: initialMonthEndCloseChecksState,
@@ -434,40 +382,6 @@ const initialViewsState = {
     globalMerchantAutoCompleteState: initialGlobalMerchantAutoCompleteState,
     globalMerchantViewState: initialGlobalMerchantViewState,
     insightsCardState: initialInsightCardState,
-    invoicingOverviewState: initialInvoicingOverviewState,
-    invoicingApprovalActionState: initialInvoicingApprovalActionState,
-    invoicingApprovalsViewState: initialInvoicingApprovalsViewState,
-    invoicingAuditViewState: initialInvoicingAuditViewState,
-    editInvoicingCatalogItemDetailViewState: initialEditInvoicingCatalogItemDetailViewState,
-    invoicingCatalogItemDetailViewState: initialInvoicingCatalogItemDetailViewState,
-    invoicingCatalogListViewState: initialInvoicingCatalogListViewState,
-    editInvoicingCouponDetailViewState: initialEditInvoicingCouponDetailViewState,
-    invoicingCouponDetailViewState: initialInvoicingCouponDetailViewState,
-    invoicingCouponViewState: initialInvoicingCouponViewState,
-    invoicingCreditNoteDetailViewState: initialInvoicingCreditNoteDetailViewState,
-    invoicingCreditNoteListViewState: initialInvoicingCreditNoteListViewState,
-    invoicingCreateInvoiceState: initialInvoicingCreateInvoiceState,
-    invoicingRecordPaymentState: initialInvoicingRecordPaymentState,
-    invoicingCustomerDetailViewState: initialInvoicingCustomerDetailViewState,
-    invoicingCustomerListViewState: initialInvoicingCustomerListViewState,
-    invoicingCustomerPaymentMethodState: initialInvoicingCustomerPaymentMethodState,
-    editInvoicingCustomerDetailViewState: initialEditInvoicingCustomerDetailViewState,
-    invoicingDataImportActionState: initialInvoicingDataImportActionState,
-    invoicingDataImportViewState: initialInvoicingDataImportViewState,
-    invoicingDunningActionState: initialInvoicingDunningActionState,
-    invoicingDunningCaseDetailViewState: initialInvoicingDunningCaseDetailViewState,
-    invoicingDunningCaseListViewState: initialInvoicingDunningCaseListViewState,
-    invoicingInvoiceActionState: initialInvoicingInvoiceActionState,
-    invoicingInvoiceDetailState: initialInvoicingInvoiceDetailState,
-    invoicingInvoiceListState: initialInvoicingInvoiceListState,
-    invoicingPaymentActionState: initialInvoicingPaymentActionState,
-    invoicingSettingsViewState: initialInvoicingSettingsViewState,
-    invoicingSubscriptionActionState: initialInvoicingSubscriptionActionState,
-    invoicingSubscriptionDetailViewState: initialInvoicingSubscriptionDetailViewState,
-    invoicingSubscriptionListViewState: initialInvoicingSubscriptionListViewState,
-    editInvoicingSubscriptionDetailViewState: initialEditInvoicingSubscriptionDetailViewState,
-    invoicingTransactionDetailViewState: initialInvoicingTransactionDetailViewState,
-    invoicingTransactionListViewState: initialInvoicingTransactionListViewState,
     internationalWireState: initialInternationalWireState,
     issueChargeCardState: issueChargeCardInitialstate,
     internationalWireVerificationState: initialInternationalWireVerificationState,
@@ -595,15 +509,6 @@ const entityReducers = {
     forecastState: forecast,
     globalMerchantState: globalMerchant,
     insightState: insights,
-    invoicingCouponState: invoicingCoupon,
-    invoicingCreditNoteState: invoicingCreditNote,
-    invoicingCustomerState: invoicingCustomer,
-    invoicingDunningCaseState: invoicingDunningCase,
-    invoicingInvoiceState: invoicingInvoice,
-    invoicingPlanState: invoicingPlan,
-    invoicingProductState: invoicingProduct,
-    invoicingSubscriptionState: invoicingSubscription,
-    invoicingTransactionState: invoicingTransaction,
     jeSchedulesState: jeSchedules,
     merchantState: merchant,
     monthEndCloseChecksState: monthEndCloseChecks,
@@ -719,40 +624,6 @@ const viewReducers = {
     globalMerchantAutoCompleteState: globalMerchantAutoComplete,
     globalMerchantViewState: globalMerchantView,
     insightsCardState: insightsCard,
-    invoicingOverviewState: invoicingOverview,
-    invoicingApprovalActionState: invoicingApprovalAction,
-    invoicingApprovalsViewState: invoicingApprovalsView,
-    invoicingAuditViewState: invoicingAuditView,
-    editInvoicingCatalogItemDetailViewState: editInvoicingCatalogItemDetailView,
-    invoicingCatalogItemDetailViewState: invoicingCatalogItemDetailView,
-    invoicingCatalogListViewState: invoicingCatalogListView,
-    editInvoicingCouponDetailViewState: editInvoicingCouponDetailView,
-    invoicingCouponDetailViewState: invoicingCouponDetailView,
-    invoicingCouponViewState: invoicingCouponView,
-    invoicingCreditNoteDetailViewState: invoicingCreditNoteDetailView,
-    invoicingCreditNoteListViewState: invoicingCreditNoteListView,
-    invoicingCreateInvoiceState: invoicingCreateInvoice,
-    invoicingRecordPaymentState: invoicingRecordPayment,
-    invoicingCustomerDetailViewState: invoicingCustomerDetailView,
-    invoicingCustomerListViewState: invoicingCustomerListView,
-    invoicingCustomerPaymentMethodState: invoicingCustomerPaymentMethod,
-    editInvoicingCustomerDetailViewState: editInvoicingCustomerDetailView,
-    invoicingDataImportActionState: invoicingDataImportAction,
-    invoicingDataImportViewState: invoicingDataImportView,
-    invoicingDunningActionState: invoicingDunningAction,
-    invoicingDunningCaseDetailViewState: invoicingDunningCaseDetailView,
-    invoicingDunningCaseListViewState: invoicingDunningCaseListView,
-    invoicingInvoiceActionState: invoicingInvoiceAction,
-    invoicingInvoiceDetailState: invoicingInvoiceDetail,
-    invoicingInvoiceListState: invoicingInvoiceList,
-    invoicingPaymentActionState: invoicingPaymentAction,
-    invoicingSettingsViewState: invoicingSettingsView,
-    invoicingSubscriptionActionState: invoicingSubscriptionAction,
-    invoicingSubscriptionDetailViewState: invoicingSubscriptionDetailView,
-    invoicingSubscriptionListViewState: invoicingSubscriptionListView,
-    editInvoicingSubscriptionDetailViewState: editInvoicingSubscriptionDetailView,
-    invoicingTransactionDetailViewState: invoicingTransactionDetailView,
-    invoicingTransactionListViewState: invoicingTransactionListView,
     internationalWireState: internationalWire,
     issueChargeCardState: issueChargeCards,
     internationalWireVerificationState: internationalWireVerification,

package/lib/esm/view/companyTaskManagerView/epics/fetchCompanyTaskManagerViewEpic.js

@@ -18,6 +18,10 @@ export const fetchCompanyTaskManagerViewEpic = (actions$, _state$, zeniAPI) => a
         ...(filters?.categories != null && filters.categories.length > 0
             ? { filter_by: toFilterByPayload(filters) }
             : {}),
+        task_group_scopes: filters?.taskGroupScopes != null &&
+            filters.taskGroupScopes.length > 0
+            ? filters.taskGroupScopes
+            : ['internal'],
     };
     return zeniAPI
         .getJSON(`${zeniAPI.apiEndPoints.tenantMicroServiceBaseUrl}/1.0/cockpit-panels/tasks-es?query=${encodeURIComponent(JSON.stringify(queryValue))}`)

package/lib/esm/view/companyTaskManagerView/epics/fetchTaskManagerMetricsEpic.js

@@ -3,7 +3,13 @@ import { catchError, filter, mergeMap, switchMap } from 'rxjs/operators';
 import { isSuccessResponse } from '../../../responsePayload';
 import { fetchTaskManagerMetrics, updateTaskManagerMetrics, updateTaskManagerMetricsOnFailure, } from '../companyTaskManagerViewReducer';
 export const fetchTaskManagerMetricsEpic = (actions$, _state$, zeniAPI) => actions$.pipe(filter(fetchTaskManagerMetrics.match), switchMap(() => {
-    const query = JSON.stringify({ is_filter_by_logged_in_user: true });
+    // Include subtasks so the cockpit count matches the customer dashboard
+    // pending count. The dashboard counts every task (subtasks included);
+    // cockpit's default of include_subtasks=false otherwise undercounts.
+    const query = JSON.stringify({
+        is_filter_by_logged_in_user: true,
+        include_subtasks: true,
+    });
     return zeniAPI
         .getJSON(`${zeniAPI.apiEndPoints.tenantMicroServiceBaseUrl}/1.0/cockpit-panels/tasks-es-metrics?query=${encodeURIComponent(query)}`)
         .pipe(mergeMap((response) => {

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

@@ -14,8 +14,7 @@ export const fetchTransactionCategorizationEpic = (actions$, state$, zeniAPI) =>
 groupBy((action) => action.payload.selectedTab), mergeMap((group$) => group$.pipe(switchMap((action) => {
     const { expenseAutomationViewState: { selectedPeriodByTenantId }, expenseAutomationTransactionsViewState, } = state$.value;
     const { period, keepExistingListItems, selectedTab, refreshViewInBackground, } = action.payload;
-    const uiState = expenseAutomationTransactionsViewState
-        .transactionCategorizationView[selectedTab].uiState;
+    const uiState = expenseAutomationTransactionsViewState.transactionCategorizationView[selectedTab].uiState;
     const { pageToken, sortOrder, sortKey } = uiState;
     const requestSearchString = uiState.searchString;
     const currentTenant = getCurrentTenant(state$.value);

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

@@ -52,8 +52,7 @@ export const fetchTransactionCategorizationViewEpic = (actions$, state$) => acti
     // fresh fetch on click. refreshViewInBackground=true keeps it silent.
     if (searchString === undefined) {
         TRANSACTIONS_TABS.filter((tab) => tab !== selectedTab).forEach((otherTab) => {
-            const otherTabFetchState = expenseAutomationTransactionsViewState
-                .transactionCategorizationView[otherTab].fetchState;
+            const otherTabFetchState = expenseAutomationTransactionsViewState.transactionCategorizationView[otherTab].fetchState;
             if (otherTabFetchState === 'Not-Started') {
                 updateActions.push(fetchTransactionCategorization(otherTab, period, false, false, undefined, undefined, true, undefined, isUncategorizedExpenseCategoryEnabled));
             }
@@ -66,8 +65,7 @@ export const fetchTransactionCategorizationViewEpic = (actions$, state$) => acti
     // if available; otherwise issue a background fetch.
     if (searchString !== undefined) {
         TRANSACTIONS_TABS.filter((tab) => tab !== selectedTab).forEach((otherTab) => {
-            const otherTabSearchString = expenseAutomationTransactionsViewState
-                .transactionCategorizationView[otherTab].uiState.searchString;
+            const otherTabSearchString = expenseAutomationTransactionsViewState.transactionCategorizationView[otherTab].uiState.searchString;
             if (searchString !== otherTabSearchString) {
                 updateActions.push(fetchTransactionCategorization(otherTab, period, true, keepExistingListItems, searchString, undefined, true, true, isUncategorizedExpenseCategoryEnabled));
             }

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

@@ -166,7 +166,8 @@ const expenseAutomationTransactionsView = createSlice({
                 // Only overwrite when explicitly set; undefined means a non-search fetch
                 // (tab switch, period change) should preserve the existing search string.
                 if (searchString !== undefined) {
-                    draft.transactionCategorizationView[selectedTab].uiState.searchString = searchString;
+                    draft.transactionCategorizationView[selectedTab].uiState.searchString =
+                        searchString;
                 }
                 draft.transactionCategorizationView[selectedTab].error = undefined;
                 const monthYearPeriod = {

package/lib/esm/view/fileView/fileUploadHelpers.js

@@ -70,7 +70,8 @@ export async function uploadFiles(fileBlobs, metadataPayload, filesEndPoint, aut
             return undefined;
         }
         const responseBody = await httpResponse.json();
-        if (responseBody?.status?.code >= 200 && responseBody?.status?.code < 300) {
+        if (responseBody?.status?.code >= 200 &&
+            responseBody?.status?.code < 300) {
             return responseBody.data?.files;
         }
         console.error(`Upload files failed with ${responseBody?.status?.message ?? 'unknown API error'}`);

package/lib/esm/view/onboardingView/cockpitView/epic/initializeOnboardingCustomerViewUpdateDataEpic.js

@@ -122,7 +122,11 @@ const getSelectedProducts = (isDebitCardFlagEnabled, tenant) => {
         return [];
     }
     else if (isBookkeepingEnabled) {
-        return ['bookkeeping', 'zeni_bill_pay', 'zeni_reimbursements'];
+        return [
+            'bookkeeping',
+            'zeni_bill_pay',
+            'zeni_reimbursements',
+        ];
     }
     else if (isOtherProductsEnabled) {
         const selectedProducts = [];

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

@@ -78,8 +78,9 @@ export const updateOnboardingCustomerViewLocalStoreDataEpic = (actions$, state$)
                 companyView?.company.company.companyOnboardingInfo
                     .subscriptionBillingAddressId != null) {
                 updatedCurrentStep = 'connect_ledger';
-                const isOnboardingAiActivationViewed = companyOnboardingInfo?.onboardingInfo?.onboardingAiActivationInfo
-                    ?.isOnboardingAiActivationViewed ?? false;
+                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.
@@ -113,9 +114,7 @@ export const updateOnboardingCustomerViewLocalStoreDataEpic = (actions$, state$)
             // 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';
+                const targetSubStep = updatedCurrentStep === 'verification' ? 'unlock-stack' : 'default';
                 fetchActions.push(updateCurrentSubStep({ subStep: targetSubStep }));
             }
         }

package/lib/esm/view/spendManagement/commonSetup/setupViewReducer.js

@@ -111,8 +111,7 @@ const setupView = createSlice({
         saveSetupViewDataInLocalStore(draft, action) {
             const setupViewLocalData = action.payload;
             if (setupViewLocalData.companyDetails != null) {
-                const syncToken = setupViewLocalData.companyDetails.syncToken ??
-                    draft.companyDetails.localData?.syncToken;
+                const syncToken = setupViewLocalData.companyDetails.syncToken ?? draft.companyDetails.localData?.syncToken;
                 draft.companyDetails.localData = {
                     ...setupViewLocalData.companyDetails,
                     ...(syncToken != null ? { syncToken } : {}),

package/lib/esm/view/taskManager/taskDetailView/epics/createSubTaskEpic.js

@@ -0,0 +1,96 @@
+import { from, of } from 'rxjs';
+import { catchError, filter, mergeMap } from 'rxjs/operators';
+import { convertHHMMStrToMinutes } from '../../../../commonStateTypes/fiscalYearHelpers/formatMinutesToFromHHMM';
+import { openSnackbar } from '../../../../entity/snackbar/snackbarReducer';
+import { appendSubTaskId, updateTasks, } from '../../../../entity/task/taskReducer';
+import { getTaskById } from '../../../../entity/task/taskSelector';
+import { createZeniAPIStatus, isSuccessResponse, } from '../../../../responsePayload';
+import { updateTaskListOnNewTaskCreationSuccess } from '../../taskListView/taskListReducer';
+import { createSubTask, createSubTaskSuccessOrFailure, } from '../taskDetailReducer';
+export const createSubTaskEpic = (actions$, state$, zeniAPI) => actions$.pipe(filter(createSubTask.match), mergeMap((action) => {
+    const state = state$.value;
+    const parentTask = getTaskById(state.taskState, action.payload.parentTaskId);
+    // Subtasks inherit every parent group membership, not just the first,
+    // so the subtask surfaces in all the same buckets as its parent.
+    const parentTaskGroupIds = parentTask?.taskGroupIds ?? [];
+    const parentTaskGroupId = parentTaskGroupIds[0];
+    const isTaskListFetched = state.taskListState.fetchState === 'Completed';
+    const payload = prepareSubTaskPayload(action.payload, parentTaskGroupIds);
+    return zeniAPI
+        .postAndGetJSON(`${zeniAPI.apiEndPoints.taskMicroServiceBaseUrl}/1.0/task-manager/tasks`, payload)
+        .pipe(mergeMap((response) => {
+        if (isSuccessResponse(response) &&
+            response.data != null &&
+            response.data.tasks.length > 0) {
+            const newTaskId = response.data.tasks[0].task_id;
+            const actions = [
+                updateTasks(response.data.tasks),
+                appendSubTaskId({
+                    parentTaskId: action.payload.parentTaskId,
+                    subTaskId: newTaskId,
+                }),
+                createSubTaskSuccessOrFailure({
+                    fetchState: 'Completed',
+                    newTaskId,
+                }),
+                openSnackbar({
+                    messageSection: 'create_sub_task',
+                    messageText: 'success',
+                    type: 'success',
+                }),
+            ];
+            // The task list is keyed on parent tasks (no parent_task_id)
+            // — subtasks belong to their parent's children list, not the
+            // top-level list. Pushing a subtask into the list would
+            // surface it as an orphan row at the top of the group.
+            // Only fire the list-update for actual parent tasks.
+            const createdTask = response.data.tasks[0];
+            const isSubtask = createdTask.parent_task_id != null &&
+                createdTask.parent_task_id !== '';
+            if (!isSubtask &&
+                isTaskListFetched === true &&
+                parentTaskGroupId != null) {
+                actions.push(updateTaskListOnNewTaskCreationSuccess({
+                    taskGroupId: parentTaskGroupId,
+                    task: createdTask,
+                }));
+            }
+            return from(actions);
+        }
+        else {
+            return of(createSubTaskSuccessOrFailure({
+                fetchState: 'Error',
+                error: response.status,
+            }), openSnackbar({
+                messageSection: 'create_sub_task',
+                messageText: 'failed',
+                type: 'error',
+                variables: [
+                    {
+                        variableName: '_api-error_',
+                        variableValue: response.status.message,
+                    },
+                ],
+            }));
+        }
+    }), catchError((error) => of(createSubTaskSuccessOrFailure({
+        fetchState: 'Error',
+        error: createZeniAPIStatus('Unexpected Error', 'Create Sub Task REST API call errored out' +
+            JSON.stringify(error)),
+    }))));
+}));
+const prepareSubTaskPayload = (subTask, parentTaskGroupIds) => ({
+    name: subTask.name,
+    assignees: subTask.assignee,
+    description: subTask.description,
+    priority: subTask.priority,
+    status: subTask.status,
+    tags: subTask.tagIds,
+    time_spent: convertHHMMStrToMinutes(subTask.timeSpent),
+    group_assignees: subTask.groupAssignees,
+    parent_task_id: subTask.parentTaskId,
+    // Inherit every parent group, not just the first — see callsite for
+    // the two-scope rationale.
+    task_group_ids: parentTaskGroupIds,
+    due_date: subTask.dueDate?.format('YYYY-MM-DD') ?? null,
+});

package/lib/esm/view/taskManager/taskDetailView/epics/fetchSubTasksEpic.js

@@ -0,0 +1,53 @@
+import { of } from 'rxjs';
+import { catchError, filter, mergeMap } from 'rxjs/operators';
+import { setSubTaskIds, updateTasks } from '../../../../entity/task/taskReducer';
+import { createZeniAPIStatus, isSuccessResponse, } from '../../../../responsePayload';
+import { fetchSubTasks, updateSubTasks, updateSubTasksFetchStatus, } from '../taskDetailReducer';
+export const fetchSubTasksEpic = (actions$, _state$, zeniAPI) => actions$.pipe(filter(fetchSubTasks.match), 
+// Use mergeMap, not switchMap: switchMap cancels in-flight requests for
+// the previous parent without dispatching success or failure, leaving
+// subTaskListFetchStatusByParentId stuck at In-Progress and blocking the
+// detail page's combined fetchStatus via reduceAnyFetchState. Per-parent
+// races on the same parentTaskId are handled last-write-wins downstream.
+mergeMap((action) => {
+    const { parentTaskId } = action.payload;
+    const query = JSON.stringify({
+        task_type: 'subtasks',
+        parent_task_id: parentTaskId,
+    });
+    return zeniAPI
+        .getJSON(`${zeniAPI.apiEndPoints.taskMicroServiceBaseUrl}/1.0/task-manager/tasks?query=${encodeURIComponent(query)}`)
+        .pipe(mergeMap((response) => {
+        if (isSuccessResponse(response) && response.data != null) {
+            const { tasks } = response.data;
+            // Keep the parent's `subTasksIds` in sync with the fetched
+            // bucket. Without this, the parent entity record can drift
+            // out of sync with what the children fetch returned —
+            // e.g. a server-side delete won't drop from the parent
+            // record until the next list re-fetch.
+            const fetchedChildIds = tasks
+                .filter((t) => t.parent_task_id === parentTaskId)
+                .map((t) => t.task_id);
+            return of(updateTasks(tasks), setSubTaskIds({
+                parentTaskId,
+                subTaskIds: fetchedChildIds,
+            }), updateSubTasks({
+                parentTaskId,
+            }));
+        }
+        else {
+            return of(updateSubTasksFetchStatus({
+                parentTaskId,
+                fetchState: 'Error',
+                error: response.status,
+            }));
+        }
+    }), catchError((error) => {
+        return of(updateSubTasksFetchStatus({
+            parentTaskId,
+            fetchState: 'Error',
+            error: createZeniAPIStatus('Unexpected Error', 'Fetch Sub Tasks REST API call errored out' +
+                JSON.stringify(error)),
+        }));
+    }));
+}));

package/lib/esm/view/taskManager/taskDetailView/epics/initializeTaskToLocalStoreEpic.js

@@ -28,6 +28,7 @@ export const initializeTaskToLocalStoreEpic = (actions$, state$) => actions$.pip
             recurringStartDate: task.recurringStartDate,
             timeSpent: task.timeSpent,
             isPrivate: task.isPrivate,
+            taskGroupId: task.taskGroupIds[0],
         };
         const actions = [
             saveTaskUpdatesToLocalStore({ taskDetailLocalData, taskId }),

package/lib/esm/view/taskManager/taskDetailView/epics/saveTaskDetailEpic.js

@@ -6,23 +6,52 @@ import { openSnackbar } from '../../../../entity/snackbar/snackbarReducer';
 import { updateTasks } from '../../../../entity/task/taskReducer';
 import { getTaskById } from '../../../../entity/task/taskSelector';
 import { createZeniAPIStatus, isSuccessResponse, } from '../../../../responsePayload';
-import { updateTaskListOnNewTaskCreationSuccess } from '../../taskListView/taskListReducer';
+import { removeTaskFromGroupBucket, updateTaskListOnNewTaskCreationSuccess, } from '../../taskListView/taskListReducer';
 import { saveTaskDetail, saveTaskSuccessOrFailure } from '../taskDetailReducer';
 export const saveTaskDetailEpic = (actions$, state$, zeniAPI) => actions$.pipe(filter(saveTaskDetail.match), mergeMap((action) => {
     const { taskId, taskGroupId } = action.payload;
     const state = state$.value;
     const isTaskListFetched = state.taskListState.fetchState === 'Completed';
-    const updatedTaskGroupId = taskId == null
-        ? taskGroupId
-        : getTaskById(state.taskState, taskId)?.taskGroupIds[0];
-    const payload = prepareTaskPayload(state, taskId, updatedTaskGroupId);
+    // On edit, prefer the locally-edited group; fall back to the entity's
+    // current group. On create, use the taskGroupId from the action payload.
+    const localTaskGroupId = taskId != null
+        ? state.taskDetailState.editTaskStateById[taskId]
+            ?.taskDetailLocalData?.taskGroupId
+        : undefined;
+    // groupWasCleared distinguishes "user explicitly cleared the group"
+    // (localTaskGroupId === null → send []) from "user did not touch it"
+    // (undefined → fall back to entity). Without this, the `??` fallback
+    // would resurrect the stale entity value after a clear.
+    const groupWasCleared = taskId != null && localTaskGroupId === null;
+    const entityTaskGroupIds = taskId != null
+        ? (getTaskById(state.taskState, taskId)?.taskGroupIds ?? [])
+        : [];
+    // Distinguish three save shapes:
+    //   - cleared → []
+    //   - user picked a different group locally → [localTaskGroupId]
+    //   - no local edit → entire entityTaskGroupIds (preserves multi-
+    //     group membership; without this, unrelated field edits silently
+    //     drop extra groups).
+    const localGroupChanged = localTaskGroupId != null;
+    const taskGroupIdsForPayload = groupWasCleared
+        ? []
+        : localGroupChanged
+            ? [localTaskGroupId]
+            : taskId != null
+                ? entityTaskGroupIds
+                : taskGroupId != null
+                    ? [taskGroupId]
+                    : [];
+    // Keep `updatedTaskGroupId` (single id) for downstream list-update
+    // dispatches that still bucket against one group at a time.
+    const updatedTaskGroupId = taskGroupIdsForPayload[0];
+    const payload = prepareTaskPayload(state, taskId, taskGroupIdsForPayload);
     const saveTaskApi = taskId != null
         ? zeniAPI.putAndGetJSON(`${zeniAPI.apiEndPoints.taskMicroServiceBaseUrl}/1.0/task-manager/tasks/${taskId}`, payload)
         : zeniAPI.postAndGetJSON(`${zeniAPI.apiEndPoints.taskMicroServiceBaseUrl}/1.0/task-manager/tasks`, payload);
     return saveTaskApi.pipe(mergeMap((response) => {
         if (isSuccessResponse(response) &&
             response.data != null &&
-            updatedTaskGroupId != null &&
             response.data.tasks.length > 0) {
             const newTaskId = response.data.tasks[0].task_id;
             const actions = [
@@ -33,7 +62,19 @@ export const saveTaskDetailEpic = (actions$, state$, zeniAPI) => actions$.pipe(f
                     taskId,
                 }),
             ];
-            if (isTaskListFetched === true) {
+            // Only re-bucket into the active tab's grouping maps when the
+            // saved task's status matches the active tab. Otherwise
+            // doUpdateTaskList writes the row back into the current tab's
+            // grouping arrays even after updateTasks moved it to Completed.
+            const savedTask = response.data.tasks[0];
+            const savedIsCompleted = savedTask.status?.code === 'resolved';
+            const activeTab = state.taskListState.currentTab;
+            const statusMatchesActiveTab = (savedIsCompleted && activeTab === 'completed') ||
+                (!savedIsCompleted && activeTab === 'live');
+            if (isTaskListFetched === true &&
+                groupWasCleared === false &&
+                updatedTaskGroupId != null &&
+                statusMatchesActiveTab === true) {
                 actions.push(updateTaskListOnNewTaskCreationSuccess({
                     taskGroupId: updatedTaskGroupId,
                     task: response.data.tasks[0],
@@ -42,6 +83,21 @@ export const saveTaskDetailEpic = (actions$, state$, zeniAPI) => actions$.pipe(f
                         : undefined,
                 }));
             }
+            else if (isTaskListFetched === true &&
+                groupWasCleared === true &&
+                taskId != null) {
+                // Group was cleared — skip the list-insert action (no
+                // destination bucket) and explicitly drop the row from every
+                // previously-held group so the list re-renders without the
+                // stale entry under the old group until next refetch.
+                const previousTask = getTaskById(state.taskState, taskId);
+                previousTask?.taskGroupIds.forEach((previousGroupId) => {
+                    actions.push(removeTaskFromGroupBucket({
+                        taskId,
+                        taskGroupId: previousGroupId,
+                    }));
+                });
+            }
             return from(actions);
         }
         else {
@@ -67,7 +123,7 @@ export const saveTaskDetailEpic = (actions$, state$, zeniAPI) => actions$.pipe(f
         error: createZeniAPIStatus('Unexpected Error', 'Save Task REST API call errored out' + JSON.stringify(error)),
     }))));
 }));
-const prepareTaskPayload = (state, taskId, taskGroupId) => {
+const prepareTaskPayload = (state, taskId, taskGroupIds) => {
     const { taskDetailState, taskState } = state;
     const syncToken = taskId != null ? (getTaskById(taskState, taskId)?.syncToken ?? '') : '';
     const sourceState = taskId != null
@@ -96,7 +152,7 @@ const prepareTaskPayload = (state, taskId, taskGroupId) => {
             ? (localData.recurringDaysOfWeek ?? [])
             : [],
         sync_token: syncToken,
-        task_group_ids: taskGroupId != null ? [taskGroupId] : [],
+        task_group_ids: taskGroupIds,
         time_spent: convertHHMMStrToMinutes(localData.timeSpent),
         group_assignees: localData.groupAssignees,
         ...(taskId == null ? { is_private: localData.isPrivate ?? false } : {}),