@zeniai/client-epic-state 5.3.20 → 5.3.21

package/lib/esm/entity/tenant/tenantReducer.js

@@ -116,12 +116,26 @@ const tenant = createSlice({
                 tenantSummariesById[payload.tenant_id] =
                     mapTenantSummaryPayloadToTenantSummary(payload);
             });
-            draft.tenantSummariesById = tenantSummariesById;
             draft.tenantIds = Object.keys(tenantSummariesById);
-            // A tenant missing from the list is no longer accessible to the user.
+            // A tenant missing from the list is no longer accessible to the user,
+            // except the open one: the list hides companies by status, and the
+            // selected tenant's record was loaded for it on its own. Its summary
+            // stays too (outside `tenantIds`, so not in the switcher), so its ids
+            // are still known while its record loads.
+            const { currentTenantId } = draft;
+            const currentTenantSummary = currentTenantId != null
+                ? draft.tenantSummariesById[currentTenantId]
+                : undefined;
+            if (currentTenantId != null &&
+                currentTenantSummary != null &&
+                tenantSummariesById[currentTenantId] == null) {
+                tenantSummariesById[currentTenantId] = currentTenantSummary;
+            }
+            draft.tenantSummariesById = tenantSummariesById;
             const accessibleTenantsById = {};
             Object.values(draft.tenantsById).forEach((tenant) => {
-                if (tenantSummariesById[tenant.tenantId] != null) {
+                if (tenantSummariesById[tenant.tenantId] != null ||
+                    tenant.tenantId === draft.currentTenantId) {
                     accessibleTenantsById[tenant.tenantId] = tenant;
                 }
             });
@@ -174,6 +188,13 @@ const tenant = createSlice({
                     enabled;
             }
         },
+        updateTenantCustomersTabSetting(draft, action) {
+            const { tenantId, setting, enabled } = action.payload;
+            const tenant = draft.tenantsById[tenantId];
+            if (tenant != null) {
+                tenant.customersTabSettings[setting] = enabled;
+            }
+        },
         // Optimistic per-key merge of the product-family flags after a cockpit
         // "enable services" write succeeds. Only the provided keys are applied so
         // other product settings are preserved.
@@ -953,7 +974,7 @@ const tenant = createSlice({
         });
     },
 });
-export const { updateTenants, fetchAllTenants, updateTenantSummariesSuccess, seedTenantSummary, updateTenantsFailure, fetchActiveTenant, updateTenantSuccess, updateTenantFailure, updateCurrentTenant, fetchExcludedResources, updateExcludedResourcesSuccess, updateExcludedResourcesFailure, doSignIn, doMagicLinkSignIn, magicLinkSignInSuccess, magicLinkSignInFailure, sendEmailMagicLinkToUser, sendEmailMagicLinkToUserSuccess, sendEmailMagicLinkToUserFailure, updateSignInState, doSignOut, signOutSuccess, sendSessionHeartbeat, sessionHeartbeatSuccess, sessionHeartbeatFailure, updateLoggedInUser, fetchExternalConnections, saveExternalConnection, saveExternalConnectionSuccess, saveExternalConnectionFailure, fetchExternalConnectionsFailure, fetchExternalConnectionsSuccess, saveAPIKeyConnection, saveAPIKeyConnectionSuccess, saveAPIKeyConnectionFailure, saveOAuthConnection, saveOAuthConnectionSuccess, saveOAuthConnectionFailure, saveConnectorCredentials, saveConnectorCredentialsSuccess, saveConnectorCredentialsFailure, initEmailConnectOAuth, initEmailConnectOAuthSuccess, initEmailConnectOAuthFailure, deleteConnection, deleteConnectionSuccess, deleteConnectionFailure, fetchSubscriptionSummaryForTenant, updateSubscriptionSummaryForTenantSuccess, updateSubscriptionSummaryForTenantFailure, updateOnboardingTenants, removeOnboardingTenant, updateTenantReimbursementInfo, updateReferViewedForLoggedInUser, resetSignInState, trigger2FA, updateTenantAccountingClassesEnabled, updateTenantAccountingProjectsEnabled, updateTenantAutoReviewIncomeWithoutCustomer, updateTenantProductSettings, updateTenantCapitalizationOnboardingDismissed, updateTenantCapitalizationAccountOverride, updateTenantMasterTOSInfo, verifyDeviceWithTwoFA, verifyDeviceWithTwoFASuccess, verifyDeviceWithTwoFAFailure, updateTreasuryVideoViewedForLoggedInUser, updateTreasuryPromoRemindMeLaterClickedForLoggedInUser, updateTreasuryPromoIntroClosedByOutsideClickForLoggedInUser, resendVerifyDeviceOTP, resendVerifyDeviceOTPSuccess, resendVerifyDeviceOTPFailure, } = tenant.actions;
+export const { updateTenants, fetchAllTenants, updateTenantSummariesSuccess, seedTenantSummary, updateTenantsFailure, fetchActiveTenant, updateTenantSuccess, updateTenantFailure, updateCurrentTenant, fetchExcludedResources, updateExcludedResourcesSuccess, updateExcludedResourcesFailure, doSignIn, doMagicLinkSignIn, magicLinkSignInSuccess, magicLinkSignInFailure, sendEmailMagicLinkToUser, sendEmailMagicLinkToUserSuccess, sendEmailMagicLinkToUserFailure, updateSignInState, doSignOut, signOutSuccess, sendSessionHeartbeat, sessionHeartbeatSuccess, sessionHeartbeatFailure, updateLoggedInUser, fetchExternalConnections, saveExternalConnection, saveExternalConnectionSuccess, saveExternalConnectionFailure, fetchExternalConnectionsFailure, fetchExternalConnectionsSuccess, saveAPIKeyConnection, saveAPIKeyConnectionSuccess, saveAPIKeyConnectionFailure, saveOAuthConnection, saveOAuthConnectionSuccess, saveOAuthConnectionFailure, saveConnectorCredentials, saveConnectorCredentialsSuccess, saveConnectorCredentialsFailure, initEmailConnectOAuth, initEmailConnectOAuthSuccess, initEmailConnectOAuthFailure, deleteConnection, deleteConnectionSuccess, deleteConnectionFailure, fetchSubscriptionSummaryForTenant, updateSubscriptionSummaryForTenantSuccess, updateSubscriptionSummaryForTenantFailure, updateOnboardingTenants, removeOnboardingTenant, updateTenantReimbursementInfo, updateReferViewedForLoggedInUser, resetSignInState, trigger2FA, updateTenantAccountingClassesEnabled, updateTenantAccountingProjectsEnabled, updateTenantAutoReviewIncomeWithoutCustomer, updateTenantCustomersTabSetting, updateTenantProductSettings, updateTenantCapitalizationOnboardingDismissed, updateTenantCapitalizationAccountOverride, updateTenantMasterTOSInfo, verifyDeviceWithTwoFA, verifyDeviceWithTwoFASuccess, verifyDeviceWithTwoFAFailure, updateTreasuryVideoViewedForLoggedInUser, updateTreasuryPromoRemindMeLaterClickedForLoggedInUser, updateTreasuryPromoIntroClosedByOutsideClickForLoggedInUser, resendVerifyDeviceOTP, resendVerifyDeviceOTPSuccess, resendVerifyDeviceOTPFailure, } = tenant.actions;
 export default tenant.reducer;
 /**
  * Applies treasury promo user fields from the tenants API user block when present.
@@ -1012,6 +1033,12 @@ function mapTenantPayloadToTenant(payload, userTenantPayload) {
         isAccountingProjectsEnabled: payload.is_accounting_projects_enabled ?? false,
         isAutoReviewIncomeWithoutCustomerEnabled: payload.accounting_config?.customers
             ?.auto_review_income_without_customer ?? false,
+        customersTabSettings: {
+            includeSubCustomersInTotals: payload.accounting_config?.customers?.include_sub_customers_in_totals ??
+                false,
+            listTopLevelCustomersOnly: payload.accounting_config?.customers?.list_top_level_customers_only ??
+                false,
+        },
         bookCloseDate: payload.book_close_date != null
             ? date(payload.book_close_date)
             : undefined,

package/lib/esm/entity/tenant/tenantSelector.js

@@ -1,4 +1,5 @@
 import { createSelector } from '@reduxjs/toolkit';
+import recordGet from 'lodash/get';
 import orderBy from 'lodash/orderBy';
 import { getCompanyByCompanyId } from '../company/companySelector';
 export function getTenant(tenantState, companyState, tenantId) {
@@ -318,6 +319,7 @@ export const getIsAutoReviewIncomeWithoutCustomerEnabled = (state) => {
     return (tenantsById[currentTenantId]?.isAutoReviewIncomeWithoutCustomerEnabled ??
         false);
 };
+export const getTenantCustomersTabSettings = (tenantState, tenantId) => recordGet(tenantState.tenantsById, [tenantId, 'customersTabSettings'], undefined);
 export const isTenantBookkeepingEnabled = (tenant) => {
     // if the tenants API takes time, tenant can be non null with productSettings as null
     return tenant != null && tenant.productSettings != null

package/lib/esm/entity/tenant/tenantState.js

@@ -1 +1,4 @@
-export {};
+export const DEFAULT_CUSTOMERS_TAB_SETTINGS = {
+    includeSubCustomersInTotals: false,
+    listTopLevelCustomersOnly: false,
+};

package/lib/esm/epic.js

@@ -161,6 +161,7 @@ import { updateCapitalizationAccountThresholdEpic, } from './view/companyView/ep
 import { updateCompanyDetailsEpic, } from './view/companyView/epic/companyPassport/updateCompanyDetailsEpic';
 import { updateCompanyOfficerEpic, } from './view/companyView/epic/companyPassport/updateCompanyOfficerEpic';
 import { updateCompanyPassportLocalStoreDataEpic, } from './view/companyView/epic/companyPassport/updateCompanyPassportLocalStoreDataEpic';
+import { updateCustomersTabSettingEpic, } from './view/companyView/epic/companyPassport/updateCustomersTabSettingEpic';
 import { updatePrimaryContactEpic, } from './view/companyView/epic/companyPassport/updatePrimaryContactEpic';
 import { fetchAllCockpitViewsEpic, } from './view/companyView/epic/fetchAllCockpitViewsEpic';
 import { fetchCompanyManagementViewEpic, } from './view/companyView/epic/fetchCompanyManagementViewEpic';
@@ -1517,6 +1518,7 @@ const ALL_EPICS = [
     updateCompanyProductServicesEpic,
     updateCompanyQboRealmIdEpic,
     updateCompanyTaskManagerViewFiltersEpic,
+    updateCustomersTabSettingEpic,
     updateDashboardLayoutEpic,
     updateDebitCardPinAttemptEpic,
     updateDepositAccountEpic,

package/lib/esm/index.js

@@ -73,7 +73,7 @@ import { getSnackbar } from './entity/snackbar/snackbarSelector';
 import { ALL_WEEK_DAYS, toDayOfWeek, toPriorityCodeType, toTaskStatusCodeType, } from './entity/task/taskState';
 import { getTaskGroupById } from './entity/taskGroup/taskGroupSelector';
 import { deleteConnection, doMagicLinkSignIn, doSignIn, doSignOut, fetchActiveTenant, fetchAllTenants, fetchExcludedResources as fetchExcludedResourcesForTenant, fetchExternalConnections as fetchExternalConnectionsForTenant, fetchSubscriptionSummaryForTenant, initEmailConnectOAuth, resendVerifyDeviceOTP, resetSignInState, saveAPIKeyConnection, saveConnectorCredentials, saveExternalConnection as saveExternalConnectionForTenant, saveOAuthConnection, seedTenantSummary, sendEmailMagicLinkToUser, sendSessionHeartbeat, toExternalIntegrationType, updateCurrentTenant, updateSignInState, verifyDeviceWithTwoFA, } from './entity/tenant/tenantReducer';
-import { DEFAULT_RECEIPTS_EMAIL, getCurrentTenant, getCurrentTenantId, getCurrentTenantIds, getIsAccountingClassesEnabled, getIsAccountingProjectsEnabled, getIsAutoReviewIncomeWithoutCustomerEnabled, getReceiptsEmail, getTenantBaseById, getTenantBaseViewForTenantId, getTenantBaseViewForTenantView, getTenantsBaseByCheckInDateSelector, getTenantsCoreDetailsByCheckInDateSelector, isCurrentTenantLoaded, isOtherProductsEnabledForTenant, isTenantBankingOnly, isTenantBookkeepingEnabled, isTenantCardsOnly, isTenantLoaded, isTenantUsingZeniCOA, isZeniDomainTenant, toTenantCoreDetailsView, } from './entity/tenant/tenantSelector';
+import { DEFAULT_RECEIPTS_EMAIL, getCurrentTenant, getCurrentTenantId, getCurrentTenantIds, getIsAccountingClassesEnabled, getIsAccountingProjectsEnabled, getIsAutoReviewIncomeWithoutCustomerEnabled, getReceiptsEmail, getTenantBaseById, getTenantBaseViewForTenantId, getTenantBaseViewForTenantView, getTenantCustomersTabSettings, getTenantsBaseByCheckInDateSelector, getTenantsCoreDetailsByCheckInDateSelector, isCurrentTenantLoaded, isOtherProductsEnabledForTenant, isTenantBankingOnly, isTenantBookkeepingEnabled, isTenantCardsOnly, isTenantLoaded, isTenantUsingZeniCOA, isZeniDomainTenant, toTenantCoreDetailsView, } from './entity/tenant/tenantSelector';
 import { toExternalSupportedTool } from './entity/tenant/tenantTypes';
 import { pushToastNotification } from './entity/toastNotification/toastNotificationReducer';
 import { getLastNotificationTime, getNotifications, } from './entity/toastNotification/toastNotificationSelector';
@@ -169,11 +169,11 @@ import { fetchCompanyMonthEndReportHistoricData, fetchCompanyMonthEndReportHisto
 import { getCompanyMonthEndReportHistoricData, getCompanyMonthEndReportSelectorView, } from './view/companyMonthEndReportView/companyMonthEndReportViewSelector';
 import { fetchCockpitContext, fetchCompanyTaskManagerView, fetchTaskManagerMetrics, updateCompanyTaskManagerViewFilters, } from './view/companyTaskManagerView/companyTaskManagerViewReducer';
 import { getCompanyTaskManagerView, } from './view/companyTaskManagerView/companyTaskManagerViewSelector';
-import { clearQboProjectsReconnectRequest, companyManagementSaveUpdates, companyPassportClearDataInLocalStore, companyPassportSaveDataInLocalStore, deleteCompanyOfficerInLocalStore, disableAccountingProjects, dismissCapitalizationOnboarding, enableAccountingProjects, fetchAllCockpitViews, fetchCompanyManagementView, fetchCompanyPassportView, fetchCompanyPortfolioView, fetchManagementView, fetchOnboardingView, fetchParentSubsidiaryManagementView, fetchPortfolioView, fetchSubscriptionView, fetchZeniUsers, resumeEnableAccountingProjects, saveCompanyPassportDetails, saveIndustryAndIncDateInCompanyPassportLocalStore, updateAccountingClassesEnabled, updateAutoReviewIncomeWithoutCustomer, updateCapitalizationAccountThreshold, updateCompanyDownloadState, updateCompanyManagementUIState, updateCompanyPassportLocalStoreData, updateCompanyPortfolioUIState, updateCompanyProductServices, updateCompanyQboRealmId, } from './view/companyView/companyViewReducer';
+import { clearQboProjectsReconnectRequest, companyManagementSaveUpdates, companyPassportClearDataInLocalStore, companyPassportSaveDataInLocalStore, deleteCompanyOfficerInLocalStore, disableAccountingProjects, dismissCapitalizationOnboarding, enableAccountingProjects, fetchAllCockpitViews, fetchCompanyManagementView, fetchCompanyPassportView, fetchCompanyPortfolioView, fetchManagementView, fetchOnboardingView, fetchParentSubsidiaryManagementView, fetchPortfolioView, fetchSubscriptionView, fetchZeniUsers, resumeEnableAccountingProjects, saveCompanyPassportDetails, saveIndustryAndIncDateInCompanyPassportLocalStore, updateAccountingClassesEnabled, updateAutoReviewIncomeWithoutCustomer, updateCapitalizationAccountThreshold, updateCompanyDownloadState, updateCompanyManagementUIState, updateCompanyPassportLocalStoreData, updateCompanyPortfolioUIState, updateCompanyProductServices, updateCompanyQboRealmId, updateCustomersTabSetting, } from './view/companyView/companyViewReducer';
 import { canSendMonthEndEmailReport, shouldEnableCalendarPickerForLastReportSent, } from './view/companyView/helpers/cockpitHelpers';
 import { getParentSubsidiaryManagementView } from './view/companyView/parentSubsidiaryView/parentSubsidiaryViewSelector';
 import { getAddonListZeniSku, getCompanyManagementView, getCompanyProductServicesUpdateStatus, getCompanyQboRealmIdUpdateStatus, getPlanListZeniSku, } from './view/companyView/selector/companyManagementViewSelector';
-import { getCompanyPassportLocalStoreData, getCompanyPassportView, isCompanyPassportDataToBeSaved, } from './view/companyView/selector/companyPassportViewSelector';
+import { getCompanyPassportLocalStoreData, getCompanyPassportView, getIsCustomersTabSettingsUpdateInProgress, isCompanyPassportDataToBeSaved, } from './view/companyView/selector/companyPassportViewSelector';
 import { getCompanyPortfolioView, isInfiniteRunway, } from './view/companyView/selector/companyPortfolioViewSelector';
 import { getAllCockpitTabsFilterView, } from './view/companyView/selector/getAllCockpitTabsFilterView';
 import { ALL_COCKPIT_TABS_FILE_TYPES, ALL_COCKPIT_TABS_IDS, toCockpitTabsFileTypeStrict, toCockpitTabsIDStrict, } from './view/companyView/types/cockpitTabsID';
@@ -509,7 +509,7 @@ export { toTimeframeTick, mapTimePeriodtoTimeframeTick, toTimePeriod, toAbsolute
 export { toVendorSpendTrendFilterTabsTypeStrict, } from './entity/vendorExpense/vendorSpendTrendFilterTabType';
 export { getNumberOfPeriods };
 export { SCHEDULE_DAYS_OF_MONTH, toScheduleDaysOfMonth, toMonth, toMonthStrict, toQuarter, toQuarterStrict, };
-export { getTenantBaseById, getCurrentTenant, getCurrentTenantId, getCurrentTenantIds, isCurrentTenantLoaded, isTenantLoaded, getIsAccountingClassesEnabled, getIsAccountingProjectsEnabled, getIsAutoReviewIncomeWithoutCustomerEnabled, getTenantsBaseByCheckInDateSelector, getTenantsCoreDetailsByCheckInDateSelector, toTenantCoreDetailsView, getTenantBaseViewForTenantView, getTenantBaseViewForTenantId, isZeniDomainTenant, isTenantUsingZeniCOA, fetchActiveTenant, fetchAllTenants, seedTenantSummary, updateCurrentTenant, clearAll, doMagicLinkSignIn, verifyDeviceWithTwoFA, resendVerifyDeviceOTP, sendEmailMagicLinkToUser, doSignIn, updateSignInState, doSignOut, sendSessionHeartbeat, resetSignInState, fetchExcludedResourcesForTenant, fetchExternalConnectionsForTenant, saveExternalConnectionForTenant, deleteConnection, saveAPIKeyConnection, saveConnectorCredentials, saveOAuthConnection, initEmailConnectOAuth, toExternalIntegrationType, toExternalSupportedTool, fetchSubscriptionSummaryForTenant, isTenantBankingOnly, isTenantCardsOnly, isTenantBookkeepingEnabled, isOtherProductsEnabledForTenant, DEFAULT_RECEIPTS_EMAIL, getReceiptsEmail, };
+export { getTenantBaseById, getCurrentTenant, getCurrentTenantId, getCurrentTenantIds, isCurrentTenantLoaded, isTenantLoaded, getIsAccountingClassesEnabled, getIsAccountingProjectsEnabled, getIsAutoReviewIncomeWithoutCustomerEnabled, getTenantCustomersTabSettings, getTenantsBaseByCheckInDateSelector, getTenantsCoreDetailsByCheckInDateSelector, toTenantCoreDetailsView, getTenantBaseViewForTenantView, getTenantBaseViewForTenantId, isZeniDomainTenant, isTenantUsingZeniCOA, fetchActiveTenant, fetchAllTenants, seedTenantSummary, updateCurrentTenant, clearAll, doMagicLinkSignIn, verifyDeviceWithTwoFA, resendVerifyDeviceOTP, sendEmailMagicLinkToUser, doSignIn, updateSignInState, doSignOut, sendSessionHeartbeat, resetSignInState, fetchExcludedResourcesForTenant, fetchExternalConnectionsForTenant, saveExternalConnectionForTenant, deleteConnection, saveAPIKeyConnection, saveConnectorCredentials, saveOAuthConnection, initEmailConnectOAuth, toExternalIntegrationType, toExternalSupportedTool, fetchSubscriptionSummaryForTenant, isTenantBankingOnly, isTenantCardsOnly, isTenantBookkeepingEnabled, isOtherProductsEnabledForTenant, DEFAULT_RECEIPTS_EMAIL, getReceiptsEmail, };
 export { toAccountType, toAccountGroupType, getAccountGroupKey, getAllAccounts, getTransactionFilterAccountOptions, };
 export { getAllClasses, getClassById, getClassFilterOptions, } from './entity/class/classSelector';
 export { getForecast };
@@ -599,7 +599,7 @@ export { newAddressInLocalStore, getAddress, getNewAddress, getAllNewAddresses,
 export { toManagementSortKeyType, toOnboardingSortKeyType, toPortfolioSortKeyType, toHealthSortKeyType, toTaskManagerSortKeyType, updateCompanyTaskManagerViewFilters, };
 export { ALL_COCKPIT_TABS_FILE_TYPES, ALL_COCKPIT_TABS_IDS, toCockpitTabsIDStrict, toCockpitTabsFileTypeStrict, };
 export { isAllowedValueWithCode, isAllowedValueWithID, };
-export { fetchCompanyPassportView, getCompanyPassportView, getCompanyPassportLocalStoreData, isCompanyPassportDataToBeSaved, companyPassportSaveDataInLocalStore, saveIndustryAndIncDateInCompanyPassportLocalStore, deleteCompanyOfficerInLocalStore, companyPassportClearDataInLocalStore, updateCompanyPassportLocalStoreData, saveCompanyPassportDetails, updateAccountingClassesEnabled, updateAutoReviewIncomeWithoutCustomer, enableAccountingProjects, resumeEnableAccountingProjects, disableAccountingProjects, clearQboProjectsReconnectRequest, updateCompanyProductServices, getCompanyProductServicesUpdateStatus, updateCompanyQboRealmId, getCompanyQboRealmIdUpdateStatus, updateCapitalizationAccountThreshold, dismissCapitalizationOnboarding, };
+export { fetchCompanyPassportView, getCompanyPassportView, getCompanyPassportLocalStoreData, getIsCustomersTabSettingsUpdateInProgress, isCompanyPassportDataToBeSaved, companyPassportSaveDataInLocalStore, saveIndustryAndIncDateInCompanyPassportLocalStore, deleteCompanyOfficerInLocalStore, companyPassportClearDataInLocalStore, updateCompanyPassportLocalStoreData, saveCompanyPassportDetails, updateAccountingClassesEnabled, updateAutoReviewIncomeWithoutCustomer, updateCustomersTabSetting, enableAccountingProjects, resumeEnableAccountingProjects, disableAccountingProjects, clearQboProjectsReconnectRequest, updateCompanyProductServices, getCompanyProductServicesUpdateStatus, updateCompanyQboRealmId, getCompanyQboRealmIdUpdateStatus, updateCapitalizationAccountThreshold, dismissCapitalizationOnboarding, };
 export { toCompanyPassportLocalData, };
 export { COMPANY_ONBOARDING_INDUSTRY_TYPE_CODES, COMPANY_ONBOARDING_SUB_INDUSTRY_CODES_BY_INDUSTRY, COMPANY_PURPOSE_OF_ACCOUNT_CODES, COMPANY_SOURCE_OF_FUNDS_CODES, COMPANY_TRANSACTION_VOLUME_CODES, COMPANY_US_NEXUS_TYPE_CODES, getCompanyOnboardingSubIndustryCodesForIndustry, };
 export { getUncategorizedAccounts, getNestedAccountListHierarchy, };
@@ -876,5 +876,6 @@ export { getInvoicingOnboardingGateView } from './view/invoicing/invoicingConfig
 export { getExpenseAutomationJEOneTimeAccrualDetailView, getJEScheduleRowType, isAccruedScheduleRow, isAiAccountantSchedule, isExistingTabRow, isOneTimeAccrualRow, isRenderableOneTimeAccrual, isPendingReviewRow, } from './view/expenseAutomationView/selectors/jeSchedulesViewSelector';
 export { getActualMatchingAmount, getActualMatchingReversalDate, getActualMatchingMatchModalConfirmStatus, getCloseMatchAfterIgnoreMatchId, getCloseMatchAfterUndo, getCloseMatchAfterUndoMatchId, parseActualMatchingMatchId, getExpenseAutomationActualMatchingMatchView, getExpenseAutomationActualMatchingView, isAutoReversedAccrual, isManuallyReversedAccrual, isPendingReviewAccrual, } from './view/expenseAutomationView/selectors/actualMatchingViewSelector';
 export { fetchCustomerSummaryDetail, fetchCustomerSummaryList, resetCustomerSummaryDetailUiState, saveCustomerSummaryDetail, updateCustomerAllTransactionsTabData, updateCustomerDetailSelectedTab, updateCustomerSummaryRevenueSelection, updateCustomerSummaryScrollYOffset, updateCustomerSummarySortUiState, updateCustomerTrendFilter, } from './view/customerSummaryView/customerSummaryViewReducer';
-export { getCustomerSummaryAllTransactionsTabData, getCustomerSummaryDetail, getCustomerSummaryList, getCustomerSummarySelectedTabType, getCustomerSummaryTrendFilter, isCustomersTabVisible, } from './view/customerSummaryView/customerSummaryViewSelector';
+export { getCustomerSummaryAllTransactionsTabData, getCustomerSummaryDetail, getCustomerSummaryList, getCustomerSummarySelectedTabType, getCustomerSummaryTrendFilter, getCustomersTabSettings, isCustomersTabVisible, } from './view/customerSummaryView/customerSummaryViewSelector';
 export { CUSTOMER_REVENUE_KEYS } from './view/customerSummaryView/customerSummaryViewState';
+export { fromCustomerEntityId, toCustomerWithSubCustomersId, } from './entity/genericEntity/customerWithSubCustomersId';

package/lib/esm/view/companyView/companyViewReducer.js

@@ -335,6 +335,31 @@ const companyView = createSlice({
                 error: action.payload.status,
             };
         },
+        updateCustomersTabSetting: {
+            reducer(draft, 
+            // eslint-disable-next-line @typescript-eslint/no-unused-vars
+            _action) {
+                draft.passportView.customersTabSettingsUpdateStatus = {
+                    fetchState: 'In-Progress',
+                    error: undefined,
+                };
+            },
+            prepare(companyId, setting, enabled, tenantId) {
+                return { payload: { companyId, enabled, setting, tenantId } };
+            },
+        },
+        updateCustomersTabSettingSuccess(draft) {
+            draft.passportView.customersTabSettingsUpdateStatus = {
+                fetchState: 'Completed',
+                error: undefined,
+            };
+        },
+        updateCustomersTabSettingFailure(draft, action) {
+            draft.passportView.customersTabSettingsUpdateStatus = {
+                fetchState: 'Error',
+                error: action.payload.status,
+            };
+        },
         enableAccountingProjects: {
             reducer(draft, 
             // eslint-disable-next-line @typescript-eslint/no-unused-vars
@@ -779,5 +804,5 @@ const companyView = createSlice({
         });
     },
 });
-export const { fetchCompanyPassportView, fetchAllCockpitViews, fetchOnboardingView, fetchManagementView, fetchSubscriptionView, fetchPortfolioView, fetchCompanyManagementView, companyManagementSaveUpdates, companyManagementSavePendingUpdates, companyManagementDiscardUpdates, companyManagementSaveUpdatesSuccess, companyManagementSaveUpdatesFailure, updateCompanyViewOnSuccess, updateCompanyViewOnFailure, fetchCompanyPortfolioView, fetchZeniUsers, updateZeniUsersOnSuccess, updateZeniUsersOnFailure, updateCompanyPortfolioUIState, updateCompanyManagementUIState, companyPassportSaveDataInLocalStore, deleteCompanyOfficerInLocalStore, companyPassportClearDataInLocalStore, companyPassportUpdateCompanyDetails, companyPassportUpdateCompanyDetailsSuccess, companyPassportUpdateCompanyDetailsFailure, updateAccountingClassesEnabled, updateAccountingClassesEnabledSuccess, updateAccountingClassesEnabledFailure, updateAutoReviewIncomeWithoutCustomer, updateAutoReviewIncomeWithoutCustomerSuccess, updateAutoReviewIncomeWithoutCustomerFailure, updateCompanyProductServices, updateCompanyProductServicesSuccess, updateCompanyProductServicesFailure, updateCompanyQboRealmId, updateCompanyQboRealmIdSuccess, updateCompanyQboRealmIdFailure, enableAccountingProjects, resumeEnableAccountingProjects, disableAccountingProjects, updateAccountingProjectsEnabledSuccess, updateAccountingProjectsEnabledFailure, requestQboProjectsReconnect, clearQboProjectsReconnectRequest, updateCapitalizationAccountThreshold, updateCapitalizationAccountThresholdSuccess, updateCapitalizationAccountThresholdFailure, dismissCapitalizationOnboarding, companyPassportUpdatePrimaryContact, companyPassportUpdatePrimaryContactSuccess, companyPassportUpdatePrimaryContactFailure, companyPassportUpdateCompanyOfficer, companyPassportUpdateCompanyOfficerSuccess, companyPassportUpdateCompanyOfficerFailure, companyPassportCreateCompanyOfficers, companyPassportCreateCompanyOfficersSuccess, companyPassportCreateCompanyOfficersFailure, updateCompanyPassportLocalStoreData, saveIndustryAndIncDateInCompanyPassportLocalStore, saveCompanyPassportDetails, fetchParentSubsidiaryManagementView, updateParentSubsidiaryView, updateParentSubsidiaryViewOnFailure, updateCompanyDownloadState, fetchCompanyMetaData, updateCompanyMetaDataOnSuccess, updateCompanyMetaDataOnFailure, updateMetaDataOnSendMonthEndReport, } = companyView.actions;
+export const { fetchCompanyPassportView, fetchAllCockpitViews, fetchOnboardingView, fetchManagementView, fetchSubscriptionView, fetchPortfolioView, fetchCompanyManagementView, companyManagementSaveUpdates, companyManagementSavePendingUpdates, companyManagementDiscardUpdates, companyManagementSaveUpdatesSuccess, companyManagementSaveUpdatesFailure, updateCompanyViewOnSuccess, updateCompanyViewOnFailure, fetchCompanyPortfolioView, fetchZeniUsers, updateZeniUsersOnSuccess, updateZeniUsersOnFailure, updateCompanyPortfolioUIState, updateCompanyManagementUIState, companyPassportSaveDataInLocalStore, deleteCompanyOfficerInLocalStore, companyPassportClearDataInLocalStore, companyPassportUpdateCompanyDetails, companyPassportUpdateCompanyDetailsSuccess, companyPassportUpdateCompanyDetailsFailure, updateAccountingClassesEnabled, updateAccountingClassesEnabledSuccess, updateAccountingClassesEnabledFailure, updateAutoReviewIncomeWithoutCustomer, updateAutoReviewIncomeWithoutCustomerSuccess, updateAutoReviewIncomeWithoutCustomerFailure, updateCustomersTabSetting, updateCustomersTabSettingSuccess, updateCustomersTabSettingFailure, updateCompanyProductServices, updateCompanyProductServicesSuccess, updateCompanyProductServicesFailure, updateCompanyQboRealmId, updateCompanyQboRealmIdSuccess, updateCompanyQboRealmIdFailure, enableAccountingProjects, resumeEnableAccountingProjects, disableAccountingProjects, updateAccountingProjectsEnabledSuccess, updateAccountingProjectsEnabledFailure, requestQboProjectsReconnect, clearQboProjectsReconnectRequest, updateCapitalizationAccountThreshold, updateCapitalizationAccountThresholdSuccess, updateCapitalizationAccountThresholdFailure, dismissCapitalizationOnboarding, companyPassportUpdatePrimaryContact, companyPassportUpdatePrimaryContactSuccess, companyPassportUpdatePrimaryContactFailure, companyPassportUpdateCompanyOfficer, companyPassportUpdateCompanyOfficerSuccess, companyPassportUpdateCompanyOfficerFailure, companyPassportCreateCompanyOfficers, companyPassportCreateCompanyOfficersSuccess, companyPassportCreateCompanyOfficersFailure, updateCompanyPassportLocalStoreData, saveIndustryAndIncDateInCompanyPassportLocalStore, saveCompanyPassportDetails, fetchParentSubsidiaryManagementView, updateParentSubsidiaryView, updateParentSubsidiaryViewOnFailure, updateCompanyDownloadState, fetchCompanyMetaData, updateCompanyMetaDataOnSuccess, updateCompanyMetaDataOnFailure, updateMetaDataOnSendMonthEndReport, } = companyView.actions;
 export default companyView.reducer;

package/lib/esm/view/companyView/epic/companyPassport/updateCustomersTabSettingEpic.js

@@ -0,0 +1,47 @@
+import { from } from 'rxjs';
+import { catchError, filter, mergeMap } from 'rxjs/operators';
+import { updateCompanies } from '../../../../entity/company/companyReducer';
+import { openSnackbar } from '../../../../entity/snackbar/snackbarReducer';
+import { CUSTOMERS_TAB_SETTING_API_KEYS } from '../../../../entity/tenant/tenantPayload';
+import { updateTenantCustomersTabSetting } from '../../../../entity/tenant/tenantReducer';
+import { createZeniAPIStatus, isSuccessResponse, } from '../../../../responsePayload';
+import { updateCustomersTabSetting, updateCustomersTabSettingFailure, updateCustomersTabSettingSuccess, } from '../../companyViewReducer';
+const failureActions = (status) => [
+    updateCustomersTabSettingFailure({ status }),
+    openSnackbar({
+        messageSection: 'customers_tab_settings_update',
+        messageText: 'failed',
+        type: 'error',
+    }),
+];
+/** Settings › Accounting › Customers: save one Customers tab setting (accounting_config is deep-merged). */
+export const updateCustomersTabSettingEpic = (actions$, _state$, zeniAPI) => actions$.pipe(filter(updateCustomersTabSetting.match), 
+// The two settings are separate keys: a quick second toggle mustn't cancel the first save
+mergeMap((action) => {
+    const { companyId, enabled, setting, tenantId } = action.payload;
+    return zeniAPI
+        .putAndGetJSON(`${zeniAPI.apiEndPoints.tenantMicroServiceBaseUrl}/1.0/companies/${companyId}`, {
+        accounting_config: {
+            customers: { [CUSTOMERS_TAB_SETTING_API_KEYS[setting]]: enabled },
+        },
+    })
+        .pipe(mergeMap((response) => {
+        const companies = response.data?.companies ?? [];
+        if (!isSuccessResponse(response) || companies.length === 0) {
+            return from(failureActions(response.status));
+        }
+        return from([
+            updateCompanies({ payload: companies, schema: {} }),
+            updateTenantCustomersTabSetting({ enabled, setting, tenantId }),
+            updateCustomersTabSettingSuccess(),
+            openSnackbar({
+                messageSection: 'customers_tab_settings_update',
+                messageText: 'success',
+                type: 'success',
+            }),
+        ]);
+    }), catchError((error) => from(failureActions(createZeniAPIStatus('Unexpected Error', 'Update Customers tab setting errored out: ' +
+        (error instanceof Error
+            ? error.message
+            : JSON.stringify(error)))))));
+}));

package/lib/esm/view/companyView/selector/companyPassportViewSelector.js

@@ -153,3 +153,5 @@ export const isCompanyPassportDataToBeSaved = (companyLocalStoreData, companyVie
         .reduce((isDetailsUpdated, isCurDetailsUpdated) => isDetailsUpdated || isCurDetailsUpdated, false);
     return isCompanyDataUpdated;
 };
+export const getIsCustomersTabSettingsUpdateInProgress = (state) => state.companyViewState.passportView.customersTabSettingsUpdateStatus
+    .fetchState === 'In-Progress';

package/lib/esm/view/companyView/types/companyPassport/companyPassportViewState.js

@@ -17,6 +17,10 @@ export const initialCompanyPassportView = {
         fetchState: 'Not-Started',
         error: undefined,
     },
+    customersTabSettingsUpdateStatus: {
+        fetchState: 'Not-Started',
+        error: undefined,
+    },
     needsQboProjectsReconnect: false,
     companyDetails: {
         localData: undefined,

package/lib/esm/view/customerSummaryView/customerSummaryViewReducer.js

@@ -1,4 +1,6 @@
 import { createSlice } from '@reduxjs/toolkit';
+import isEqual from 'lodash/isEqual';
+import { updateTenantCustomersTabSetting } from '../../entity/tenant/tenantReducer';
 import { clearAll } from '../../rootActions';
 import { CUSTOMER_REVENUE_KEYS, } from './customerSummaryViewState';
 export const initialState = {
@@ -20,6 +22,9 @@ export const initialState = {
     detailCustomerId: undefined,
     error: undefined,
 };
+const toReference = (payload) => payload != null
+    ? { id: payload.customer_id, name: payload.customer_name ?? '' }
+    : undefined;
 export const toCustomerSummary = (payload) => ({
     id: payload.customer_id,
     qboId: payload.qbo_id ?? undefined,
@@ -28,6 +33,22 @@ export const toCustomerSummary = (payload) => ({
     currencyCode: payload.currency_code ?? undefined,
     currencySymbol: payload.currency_symbol ?? undefined,
     revenue: Object.fromEntries(CUSTOMER_REVENUE_KEYS.map((key) => [key, payload[key] ?? 0])),
+    hasChildren: payload.has_children === true,
+    isProject: payload.is_project === true,
+    isSubCustomer: payload.is_sub_customer === true,
+    parentId: payload.parent_customer_id ?? undefined,
+    parentPath: (payload.parent_path ?? []).flatMap((parent) => toReference(parent) ?? []),
+    familyTree: payload.family_tree?.map(toCustomerSummary),
+    // Only the details response carries them
+    totals: payload.total_balance != null
+        ? {
+            balance: payload.total_balance,
+            revenue: Object.fromEntries(CUSTOMER_REVENUE_KEYS.map((key) => [
+                key,
+                payload[`total_${key}`] ?? 0,
+            ])),
+        }
+        : undefined,
     account: payload.account?.account_id != null
         ? {
             id: payload.account.account_id,
@@ -73,11 +94,16 @@ const customerSummaryView = createSlice({
             },
         },
         updateCustomerSummaryList: {
-            prepare(response, keepExistingListItems) {
-                return { payload: { keepExistingListItems, response } };
+            prepare(response, keepExistingListItems, settings) {
+                return { payload: { keepExistingListItems, response, settings } };
             },
             reducer(draft, action) {
-                const { response, keepExistingListItems } = action.payload;
+                const { response, keepExistingListItems, settings } = action.payload;
+                // A next page fetched under other settings than the listed rows: drop it, the list refetches
+                if (keepExistingListItems && !isEqual(draft.listSettings, settings)) {
+                    return;
+                }
+                draft.listSettings = settings;
                 const customers = (response.data?.customers ?? []).map(toCustomerSummary);
                 const existingIds = new Set(draft.customers.map(({ id }) => id));
                 draft.customers = keepExistingListItems
@@ -126,12 +152,13 @@ const customerSummaryView = createSlice({
                 detail.customer = toCustomerSummary(action.payload.customer);
                 detail.fetchState = 'Completed';
                 // Keep the list row in sync after an edit.
+                const { account, accountingClass } = detail.customer;
                 const index = draft.customers.findIndex(({ id }) => id === action.payload.customerId);
                 if (index >= 0) {
                     draft.customers[index] = {
                         ...draft.customers[index],
-                        account: detail.customer.account,
-                        accountingClass: detail.customer.accountingClass,
+                        account,
+                        accountingClass,
                     };
                 }
             },
@@ -188,8 +215,14 @@ const customerSummaryView = createSlice({
         },
     },
     extraReducers: (builder) => {
-        builder.addCase(clearAll, (draft) => {
+        builder
+            .addCase(clearAll, (draft) => {
             Object.assign(draft, initialState);
+        })
+            // Totals on / off switch the detail page's All transactions tab to another entity: restart its window.
+            // (The list refetches through `getCustomerSummaryList`; the details carry both figures.)
+            .addCase(updateTenantCustomersTabSetting, (draft) => {
+            draft.allTransactionsTabData = undefined;
         });
     },
 });

package/lib/esm/view/customerSummaryView/customerSummaryViewSelector.js

@@ -1,5 +1,8 @@
 import { createSelector } from '@reduxjs/toolkit';
-import { getIsAccountingClassesEnabled } from '../../entity/tenant/tenantSelector';
+import isEqual from 'lodash/isEqual';
+import { toCustomerWithSubCustomersId } from '../../entity/genericEntity/customerWithSubCustomersId';
+import { getIsAccountingClassesEnabled, getTenantCustomersTabSettings, } from '../../entity/tenant/tenantSelector';
+import { DEFAULT_CUSTOMERS_TAB_SETTINGS, } from '../../entity/tenant/tenantState';
 import { getNestedAccountListHierarchy } from '../accountList/accountListSelector';
 import { getNestedClassListHierarchy } from '../classList/classListSelector';
 const isLoadingFetchState = (fetchState) => fetchState === 'Not-Started' || fetchState === 'In-Progress';
@@ -7,16 +10,43 @@ const NOT_STARTED_DETAIL = {
     fetchState: 'Not-Started',
     saveState: 'Not-Started',
 };
-export const getCustomerSummaryList = (state) => state.customerSummaryViewState;
-export const getCustomerSummaryDetail = createSelector((state, customerId) => state.customerSummaryViewState.detailById[customerId], (state) => state.accountListState, (state) => state.classListState, getIsAccountingClassesEnabled, (detail, accountListState, classListState, isAccountingClassesEnabled) => ({
-    ...(detail ?? NOT_STARTED_DETAIL),
-    accountsHierarchyList: getNestedAccountListHierarchy(accountListState, 'accountList'),
-    classHierarchyList: getNestedClassListHierarchy(classListState),
-    isAccountingClassesEnabled,
-    isReferenceDataLoading: isLoadingFetchState(accountListState.byReportId.accountList.fetchState) ||
-        (isAccountingClassesEnabled &&
-            isLoadingFetchState(classListState.fetchState)),
-}));
+export const getCustomersTabSettings = (state) => {
+    const { currentTenantId } = state.tenantState;
+    return ((currentTenantId != null
+        ? getTenantCustomersTabSettings(state.tenantState, currentTenantId)
+        : undefined) ?? DEFAULT_CUSTOMERS_TAB_SETTINGS);
+};
+/** Rows fetched under other Customers tab settings (however those changed) read as not fetched yet. */
+export const getCustomerSummaryList = createSelector((state) => state.customerSummaryViewState, getCustomersTabSettings, (view, settings) => view.listSettings == null || isEqual(view.listSettings, settings)
+    ? view
+    : {
+        ...view,
+        customers: [],
+        error: undefined,
+        fetchState: 'Not-Started',
+        totalCount: 0,
+        uiState: { ...view.uiState, pageToken: null, scrollYOffset: 0 },
+    });
+export const getCustomerSummaryDetail = createSelector((state, customerId) => state.customerSummaryViewState.detailById[customerId], (state) => state.accountListState, (state) => state.classListState, getIsAccountingClassesEnabled, (state) => getCustomersTabSettings(state).includeSubCustomersInTotals, (_state, customerId) => customerId, (detail, accountListState, classListState, isAccountingClassesEnabled, includeSubCustomersInTotals, customerId) => {
+    const customer = detail?.customer;
+    // Rolled up from the start (in parallel with the details); own figures if the details turn out to have no totals
+    const includesSubCustomers = includeSubCustomersInTotals &&
+        (customer == null || customer.totals != null);
+    return {
+        ...(detail ?? NOT_STARTED_DETAIL),
+        accountsHierarchyList: getNestedAccountListHierarchy(accountListState, 'accountList'),
+        classHierarchyList: getNestedClassListHierarchy(classListState),
+        isAccountingClassesEnabled,
+        isReferenceDataLoading: isLoadingFetchState(accountListState.byReportId.accountList.fetchState) ||
+            (isAccountingClassesEnabled &&
+                isLoadingFetchState(classListState.fetchState)),
+        includesSubCustomers,
+        figures: includesSubCustomers ? customer?.totals : customer,
+        trendEntityId: includesSubCustomers
+            ? toCustomerWithSubCustomersId(customerId)
+            : customerId,
+    };
+});
 export const getCustomerSummarySelectedTabType = (state) => state.customerSummaryViewState.selectedTabType;
 export const getCustomerSummaryAllTransactionsTabData = (state) => state.customerSummaryViewState.allTransactionsTabData;
 export const getCustomerSummaryTrendFilter = (state) => state.customerSummaryViewState.trendFilter;

package/lib/esm/view/customerSummaryView/epic/fetchCustomerSummaryListEpic.js

@@ -2,21 +2,26 @@ import { of } from 'rxjs';
 import { catchError, exhaustMap, filter, map, startWith, switchMap, } from 'rxjs/operators';
 import { createZeniAPIStatus, isSuccessResponse } from '../../../responsePayload';
 import { fetchCustomerSummaryList, updateCustomerSummaryList, updateCustomerSummaryListFailure, } from '../customerSummaryViewReducer';
+import { getCustomersTabSettings } from '../customerSummaryViewSelector';
 export const fetchCustomerSummaryListEpic = (actions$, state$, zeniAPI) => {
     const fetch$ = actions$.pipe(filter(fetchCustomerSummaryList.match));
     const fetchPage = (action) => {
         const { keepExistingListItems, pageToken, searchString } = action.payload;
         const { uiState } = state$.value.customerSummaryViewState;
+        const settings = getCustomersTabSettings(state$.value);
         const query = {
             page_token: pageToken,
             sort_by: uiState.sortKey,
             sort_order: uiState.sortOrder === 'ascending' ? 'asc' : 'desc',
             search_text: searchString,
+            // Top-level only: a search also finds a customer by its sub-customers' and projects' names
+            top_level_only: settings.listTopLevelCustomersOnly,
+            include_sub_customers: settings.includeSubCustomersInTotals,
         };
         return zeniAPI
             .getJSON(`${zeniAPI.apiEndPoints.accountMicroServiceBaseUrl}/1.0/customers/summary?query=${encodeURIComponent(JSON.stringify(query))}`)
             .pipe(map((response) => isSuccessResponse(response)
-            ? updateCustomerSummaryList(response, keepExistingListItems)
+            ? updateCustomerSummaryList(response, keepExistingListItems, settings)
             : updateCustomerSummaryListFailure(response.status)), catchError((error) => of(updateCustomerSummaryListFailure(createZeniAPIStatus('Unexpected Error', 'Fetch customer summary list REST API call errored out' +
             JSON.stringify(error))))));
     };

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

@@ -2,6 +2,7 @@ import lodashGet from 'lodash/get';
 import { from, of } from 'rxjs';
 import { catchError, filter, mergeMap } from 'rxjs/operators';
 import { toString } from '../../commonStateTypes/timePeriod';
+import { fromCustomerEntityId } from '../../entity/genericEntity/customerWithSubCustomersId';
 import { updateTransactions } from '../../entity/transaction/transactionReducer';
 import { createZeniAPIStatus, isSuccessResponse } from '../../responsePayload';
 import { fetchEntityTransactionList, updateTransactionListByEntity, updateTransactionListByEntityFailure, } from './transactionListReducer';
@@ -13,12 +14,20 @@ export const fetchTransactionListByEntityEpic = (actions$, state$, zeniAPI) => a
     if (action.payload.cacheOverride === true ||
         entityTransactions == null ||
         entityTransactions.hasValidState() === false) {
+        // Customers tab rolled-up view: cached under its own id, sent as the customer id plus the flag
+        const { customerId: entityId, includeSubCustomers } = action.payload.entity.type === 'customer'
+            ? fromCustomerEntityId(action.payload.entity.id)
+            : {
+                customerId: action.payload.entity.id,
+                includeSubCustomers: false,
+            };
         const queryParam = {
             start_date: toString(action.payload.period.start),
             end_date: toString(action.payload.period.end),
             sort_by: 'create_time',
             sort_order: 'desc',
-            entity_id: action.payload.entity.id,
+            entity_id: entityId,
+            ...(includeSubCustomers ? { include_sub_customers: true } : {}),
             entity_name: action.payload.entity.name,
             entity_type: action.payload.entity.type,
             is_fetch_all_transactions: action.payload.isFetchAllTransactions === true
@@ -31,7 +40,7 @@ export const fetchTransactionListByEntityEpic = (actions$, state$, zeniAPI) => a
             if (isSuccessResponse(response) && response.data != null) {
                 const updateActions = [];
                 updateActions.push(updateTransactions(response.data.transactions, (value) => value.transaction_id));
-                updateActions.push(updateTransactionListByEntity(response.data));
+                updateActions.push(updateTransactionListByEntity(response.data, action.payload.entity.id));
                 return from(updateActions);
             }
             else {

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

@@ -164,21 +164,30 @@ const transactionList = createSlice({
                 };
             },
         },
-        updateTransactionListByEntity(draft, action) {
-            const transactionIDs = action.payload.transactions.map((transactionPayload) => transactionPayload.transaction_id);
-            /* eslint-disable @typescript-eslint/no-non-null-assertion */
-            const entity = mapTransactionQueryMetaDataToEntity(action.payload.query);
-            const key = getEntityTranKey(entity, {
-                start: toAbsoluteDay(action.payload.query.start_date),
-                end: toAbsoluteDay(action.payload.query.end_date),
-            });
-            draft.byEntity.transactionListByEntityKey[key] = {
-                ...initialEntityTransactionState,
-                fetchState: 'Completed',
-                error: undefined,
-                entity: entity,
-                transactionIDs,
-            };
+        updateTransactionListByEntity: {
+            // `entityId`: the requested entity's id when it differs from the query's (a rolled-up customer)
+            prepare(payload, entityId) {
+                return { payload, meta: { entityId } };
+            },
+            reducer(draft, action) {
+                const transactionIDs = action.payload.transactions.map((transactionPayload) => transactionPayload.transaction_id);
+                /* eslint-disable @typescript-eslint/no-non-null-assertion */
+                const entity = {
+                    ...mapTransactionQueryMetaDataToEntity(action.payload.query),
+                    ...(action.meta.entityId != null && { id: action.meta.entityId }),
+                };
+                const key = getEntityTranKey(entity, {
+                    start: toAbsoluteDay(action.payload.query.start_date),
+                    end: toAbsoluteDay(action.payload.query.end_date),
+                });
+                draft.byEntity.transactionListByEntityKey[key] = {
+                    ...initialEntityTransactionState,
+                    fetchState: 'Completed',
+                    error: undefined,
+                    entity: entity,
+                    transactionIDs,
+                };
+            },
         },
         updateTransactionListByEntityFailure: {
             reducer(draft, action) {

package/lib/esm/view/trend/fetchIncomeTrendEpic.js

@@ -3,6 +3,7 @@ import { catchError, filter, mergeMap, switchMap } from 'rxjs/operators';
 import { toTimePeriod, } from '../../commonStateTypes/timeframeTick';
 import { getCustomerIncomeTrendKey } from '../../entity/customerIncome/customerIncomeTrendKey';
 import { updateCustomerIncomeTrend } from '../../entity/customerIncome/customerIncomeTrendReducer';
+import { fromCustomerEntityId } from '../../entity/genericEntity/customerWithSubCustomersId';
 import { createZeniAPIStatus, isSuccessResponse } from '../../responsePayload';
 import { date as zeniDate } from '../../zeniDayJS';
 import { fetchIncomeTrend, updateTrendFailure, updateTrendSuccess, } from './trendReducer';
@@ -25,11 +26,14 @@ switchMap((action) => {
             return of(updateTrendSuccess(requestedPeriod));
         }
     }
+    // The rolled-up view is cached under its own id; the API takes the customer id plus the flag
+    const { customerId: apiCustomerId, includeSubCustomers } = fromCustomerEntityId(customerId);
     const query = {
-        entity_id: customerId,
+        entity_id: apiCustomerId,
         entity_type: 'customer',
-        customer_id: customerId,
+        customer_id: apiCustomerId,
         customer_name: customerName,
+        ...(includeSubCustomers ? { include_sub_customers: true } : {}),
         ...(dateRange != null
             ? { start_date: dateRange.startDate, end_date: dateRange.endDate }
             : {}),