@zeniai/client-epic-state 5.3.19 → 5.3.21-beta0KB

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

@@ -5,21 +5,26 @@ const rxjs_1 = require("rxjs");
 const operators_1 = require("rxjs/operators");
 const responsePayload_1 = require("../../../responsePayload");
 const customerSummaryViewReducer_1 = require("../customerSummaryViewReducer");
+const customerSummaryViewSelector_1 = require("../customerSummaryViewSelector");
 const fetchCustomerSummaryListEpic = (actions$, state$, zeniAPI) => {
     const fetch$ = actions$.pipe((0, operators_1.filter)(customerSummaryViewReducer_1.fetchCustomerSummaryList.match));
     const fetchPage = (action) => {
         const { keepExistingListItems, pageToken, searchString } = action.payload;
         const { uiState } = state$.value.customerSummaryViewState;
+        const settings = (0, customerSummaryViewSelector_1.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((0, operators_1.map)((response) => (0, responsePayload_1.isSuccessResponse)(response)
-            ? (0, customerSummaryViewReducer_1.updateCustomerSummaryList)(response, keepExistingListItems)
+            ? (0, customerSummaryViewReducer_1.updateCustomerSummaryList)(response, keepExistingListItems, settings)
             : (0, customerSummaryViewReducer_1.updateCustomerSummaryListFailure)(response.status)), (0, operators_1.catchError)((error) => (0, rxjs_1.of)((0, customerSummaryViewReducer_1.updateCustomerSummaryListFailure)((0, responsePayload_1.createZeniAPIStatus)('Unexpected Error', 'Fetch customer summary list REST API call errored out' +
             JSON.stringify(error))))));
     };

package/lib/view/expenseAutomationView/helpers/transactionCategorizationLocalDataHelper.d.ts

@@ -39,7 +39,7 @@ export declare const getLineItemsByTransactionsIdsFromResponse: (transactions: S
 export declare const getLineItemsByTransactionIdsFromLocalData: (transactionLocalData: TransactionReviewLocalDataSelectorView[], selectedTab: TransactionsTab) => Record<ID, string[]>;
 export declare const mergeTabSpecificLineItems: (currentTabSpecificLineItems: TabSpecificLineItems, selectedTab: TransactionsTab, newLineItems: TabSpecificLineItems) => TabSpecificLineItems;
 export declare const getSnackbarMessageForTransactionReview: (updatedCount: number, failedCount: number, categorizedCount: number) => {
-    messageSection: "common" | "recommendation_feedback" | "transactionDetails_updatingPastTransactions" | "transactionDetails_transactionUpdated" | "cockpit_month_end_email_sent" | "cockpit_month_end_email_save" | "cockpit_month_end_email_attachment_upload" | "je_bill_link" | "je_posted" | "actual_matching_match_and_reverse" | "actual_matching_undo_reversal" | "actual_matching_ignore_suggestion" | "audit_score_updated" | "people_invite_people" | "people_invite_multiple_people" | "people_delete_person" | "people_update_person" | "reimbursement_updated" | "reimbursement_deleted" | "reimbursement_cancelled_deleted" | "reimbursement_cancelled" | "reimbursement_approved" | "reimbursement_rejected" | "reimbursement_sent_for_approval" | "account_added" | "business_verification_save" | "business_verification_submit" | "business_verification_from_bills_submit" | "plaid_connection" | "unlink_deposit_account" | "reimbursement_setup" | "reimbursement_approval_create" | "reimbursement_duplicate_approval_create" | "reimbursement_approval_update" | "reimbursement_duplicate_approval_update" | "reimbursement_approval_delete" | "reimbursement_approval_reorder" | "reimbursement_create_mileage" | "reimbursement_update_mileage" | "reimbursement_accept_term" | "reimbursement_accept_employee_term" | "reimbursement_bulk_submit" | "reimbursement_bulk_processed" | "bill_pay_setup" | "zeni_accounts_setup" | "bill_pay_approval_create" | "bill_pay_duplicate_approval_create" | "bill_pay_approval_update" | "bill_pay_duplicate_approval_update" | "bill_pay_approval_delete" | "bill_pay_approval_reorder" | "bill_pay_updated" | "bill_pay_deleted" | "bill_pay_cancelled_deleted" | "bill_pay_cancelled" | "bill_pay_approved" | "real_time_approver_added" | "bill_pay_rejected" | "bill_pay_sent_for_approval" | "bill_pay_accept_term" | "bill_pay_bulk_submit" | "bill_pay_bulk_processed" | "bill_pay_refund" | "bill_pay_retry" | "bill_pay_marked_as_paid" | "zeni_account_accept_term" | "update_vendor" | "update_customer" | "data_refresh_update" | "delete_bank_account" | "create_bank_account" | "create_bank_account_ach" | "create_bank_account_wire" | "create_bank_account_international" | "transfer_money" | "update_zeni_account_nickname" | "create_checking_account" | "deposit_check" | "create_vendor" | "onboarding_customer_view" | "onboarding_customer_view_complete" | "onboarding_customer_identity_verification_save" | "onboarding_customer_identity_verification_submit" | "onboarding_customer_business_verification_save" | "onboarding_customer_business_verification_submit" | "retry_bank_account_connection" | "dashboard_invite_sent" | "onboarding_info_saved" | "approve_original_merchant" | "approve_global_merchant" | "reject_global_merchant" | "create_global_merchant" | "fetch_global_merchant_no_recommendation" | "save_vendor_renamed" | "save_vendor_sent_for_review" | "save_vendor_marked_as_employee" | "save_vendor_marked_as_local_contractor" | "charge_card_setup" | "charge_card_accept_term" | "charge_card_receipt_upload" | "charge_card_resend_invite" | "charge_card_revoke_invite" | "card_policy_created" | "card_policy_updated" | "card_policy_deleted" | "charge_card_update_limit" | "charge_cards_update_limit" | "close_charge_card" | "lock_charge_card" | "lock_charge_card_card_user" | "lock_charge_cards" | "unlock_charge_card" | "unlock_charge_card_card_user" | "unlock_charge_cards" | "close_charge_cards" | "revoke_invite_charge_cards" | "charge_card_express_interest" | "create_schedule" | "save_schedule" | "delete_schedule" | "ignore_schedule" | "revert_schedule" | "ignore_accrual" | "revert_accrual" | "save_task_detail" | "fetch_task_detail" | "delete_task" | "archive_task" | "snooze_task" | "unsnooze_task" | "create_tag" | "delete_tag" | "update_charge_card" | "update_charge_card_name" | "update_charge_card_name_card_user" | "issue_charge_card" | "issue_charge_cards" | "notification_settings_saved" | "referral_invite_sent" | "notification_mark_as_read" | "mark_as_complete_schedule" | "cancel_journal_entry" | "settings_accounting_accounts_updated" | "create_card_setup" | "confirm_card_setup" | "add_card_payment_source" | "fetch_payment_sources" | "task_assigned_toast_notification" | "task_due_tomorrow_toast_notification" | "task_deleted_toast_notification" | "task_archived_toast_notification" | "task_overdue_toast_notification" | "task_overdue_toast_notification_creator" | "task_notification_count" | "task_activities_toast_notification" | "task_created_toast_notification" | "task_group_creation_success" | "task_group_deletion_success" | "task_group_update_success" | "primary_funding_account_updated" | "task_time_spent_validation" | "missing_receipts_attachment" | "flux_analysis_unreviewed" | "flux_analysis_reviewed" | "receipt_match" | "receipts_upload" | "receipts_bulk_match" | "billing_address_view" | "express_pay_submit" | "exclude_transaction" | "reconcile" | "save_reconcile_for_later" | "recon_transaction_categorize" | "recon_transaction_match" | "update_debit_card_pin_attempt" | "set_debit_card_pin" | "ai_cfo_create_session_and_submit" | "ai_cfo_chat_session_deleted" | "charge_card_auto_pay_enable" | "charge_card_auto_pay_disable" | "treasury_setup" | "treasury_accept_term" | "treasury_transfer_money" | "treasury_transfer_money_failed" | "auto_transfer_rule_create" | "auto_transfer_rule_update" | "auto_transfer_rule_delete" | "auto_transfer_rule_pause" | "auto_transfer_rule_resume" | "treasury_update_portfolio_allocation" | "send_email_magic_link_to_user" | "complete_profile_done" | "create_transfer_entry" | "create_transaction" | "reports_resync" | "invalid_phone_number" | "transactions_categorized_updated_failed" | "transaction_categorized_updated_failed" | "transactionsCategorized_transactionsUpdated" | "transactionsCategorized_transactionUpdated" | "transactionCategorized_transactionsUpdated" | "transactionCategorized_transactionUpdated" | "transactionsCategorized_transactionsFailed" | "transactionsCategorized_transactionFailed" | "transactionCategorized_transactionsFailed" | "transactionCategorized_transactionFailed" | "transactionsUpdated_transactionsFailed" | "transactionsUpdated_transactionFailed" | "transactionUpdated_transactionsFailed" | "transactionUpdated_transactionFailed" | "transactionsCategorized_transactionsUpdated_transactionsFailed" | "transactionsCategorized_transactionsUpdated_transactionFailed" | "transactionsCategorized_transactionUpdated_transactionsFailed" | "transactionCategorized_transactionsUpdated_transactionsFailed" | "transactionsCategorized_transactionUpdated_transactionFailed" | "transactionCategorized_transactionsUpdated_transactionFailed" | "transactionCategorized_transactionUpdated_transactionsFailed" | "transactionCategorized_transactionUpdated_transactionFailed" | "accounting_classes_enabled_update" | "accounting_projects_enabled_update" | "auto_review_income_without_customer_update" | "accounting_projects_qbo_not_enabled" | "capitalization_threshold_update" | "account_excluded_from_reconciliation" | "account_included_in_reconciliation" | "confirm_statement_mapping" | "statement_parsing_in_progress" | "statement_parsing_complete" | "ai_accountant_trigger_job" | "oauth_consent_approve" | "oauth_consent_invalid_request" | "credit_agent_update_profile" | "credit_agent_save_macro" | "credit_agent_schedule_cron" | "create_sub_task" | "qbo_connection_already_linked" | "qbo_connection_failed" | "accounting_projects_qbo_reconnect_failed" | "product_services_update" | "qbo_realm_id_update" | "kyc_kyb_reset" | "invoicing_dunning_case_resolved" | "invoicing_dunning_retry" | "invoicing_dunning_cancel" | "invoicing_dunning_settings_save" | "invoicing_qbo_backfill" | "invoicing_qbo_sync_health_retry" | "invoicing_qbo_settings_save" | "invoicing_branding_save" | "invoicing_discount_archive" | "invoicing_discount_unarchive" | "invoicing_discount_delete" | "invoicing_invoice_reminder_sent" | "invoicing_invoice_regenerated" | "invoicing_invoice_voided" | "invoicing_catalog_item_saved" | "invoicing_customer_saved" | "invoicing_subscription_saved" | "invoicing_coupon_saved" | "invoicing_invoice_saved" | "invoicing_credit_note_saved" | "invoicing_payment_recorded" | "invoicing_subscription_activated" | "invoicing_subscription_cancellation_removed" | "invoicing_subscription_cancelled" | "invoicing_subscription_non_renewing" | "invoicing_subscription_paused" | "invoicing_subscription_reactivated" | "invoicing_subscription_resumed" | "invoicing_subscription_term_end_changed" | "invoicing_data_import_download";
+    messageSection: "common" | "recommendation_feedback" | "transactionDetails_updatingPastTransactions" | "transactionDetails_transactionUpdated" | "cockpit_month_end_email_sent" | "cockpit_month_end_email_save" | "cockpit_month_end_email_attachment_upload" | "je_bill_link" | "je_posted" | "actual_matching_match_and_reverse" | "actual_matching_undo_reversal" | "actual_matching_ignore_suggestion" | "audit_score_updated" | "people_invite_people" | "people_invite_multiple_people" | "people_delete_person" | "people_update_person" | "reimbursement_updated" | "reimbursement_deleted" | "reimbursement_cancelled_deleted" | "reimbursement_cancelled" | "reimbursement_approved" | "reimbursement_rejected" | "reimbursement_sent_for_approval" | "account_added" | "business_verification_save" | "business_verification_submit" | "business_verification_from_bills_submit" | "plaid_connection" | "unlink_deposit_account" | "reimbursement_setup" | "reimbursement_approval_create" | "reimbursement_duplicate_approval_create" | "reimbursement_approval_update" | "reimbursement_duplicate_approval_update" | "reimbursement_approval_delete" | "reimbursement_approval_reorder" | "reimbursement_create_mileage" | "reimbursement_update_mileage" | "reimbursement_accept_term" | "reimbursement_accept_employee_term" | "reimbursement_bulk_submit" | "reimbursement_bulk_processed" | "bill_pay_setup" | "zeni_accounts_setup" | "bill_pay_approval_create" | "bill_pay_duplicate_approval_create" | "bill_pay_approval_update" | "bill_pay_duplicate_approval_update" | "bill_pay_approval_delete" | "bill_pay_approval_reorder" | "bill_pay_updated" | "bill_pay_deleted" | "bill_pay_cancelled_deleted" | "bill_pay_cancelled" | "bill_pay_approved" | "real_time_approver_added" | "bill_pay_rejected" | "bill_pay_sent_for_approval" | "bill_pay_accept_term" | "bill_pay_bulk_submit" | "bill_pay_bulk_processed" | "bill_pay_refund" | "bill_pay_retry" | "bill_pay_marked_as_paid" | "zeni_account_accept_term" | "update_vendor" | "update_customer" | "data_refresh_update" | "delete_bank_account" | "create_bank_account" | "create_bank_account_ach" | "create_bank_account_wire" | "create_bank_account_international" | "transfer_money" | "update_zeni_account_nickname" | "create_checking_account" | "deposit_check" | "create_vendor" | "onboarding_customer_view" | "onboarding_customer_view_complete" | "onboarding_customer_identity_verification_save" | "onboarding_customer_identity_verification_submit" | "onboarding_customer_business_verification_save" | "onboarding_customer_business_verification_submit" | "retry_bank_account_connection" | "dashboard_invite_sent" | "onboarding_info_saved" | "approve_original_merchant" | "approve_global_merchant" | "reject_global_merchant" | "create_global_merchant" | "fetch_global_merchant_no_recommendation" | "save_vendor_renamed" | "save_vendor_sent_for_review" | "save_vendor_marked_as_employee" | "save_vendor_marked_as_local_contractor" | "charge_card_setup" | "charge_card_accept_term" | "charge_card_receipt_upload" | "charge_card_resend_invite" | "charge_card_revoke_invite" | "card_policy_created" | "card_policy_updated" | "card_policy_deleted" | "charge_card_update_limit" | "charge_cards_update_limit" | "close_charge_card" | "lock_charge_card" | "lock_charge_card_card_user" | "lock_charge_cards" | "unlock_charge_card" | "unlock_charge_card_card_user" | "unlock_charge_cards" | "close_charge_cards" | "revoke_invite_charge_cards" | "charge_card_express_interest" | "create_schedule" | "save_schedule" | "delete_schedule" | "ignore_schedule" | "revert_schedule" | "ignore_accrual" | "revert_accrual" | "save_task_detail" | "fetch_task_detail" | "delete_task" | "archive_task" | "snooze_task" | "unsnooze_task" | "create_tag" | "delete_tag" | "update_charge_card" | "update_charge_card_name" | "update_charge_card_name_card_user" | "issue_charge_card" | "issue_charge_cards" | "notification_settings_saved" | "referral_invite_sent" | "notification_mark_as_read" | "mark_as_complete_schedule" | "cancel_journal_entry" | "settings_accounting_accounts_updated" | "create_card_setup" | "confirm_card_setup" | "add_card_payment_source" | "fetch_payment_sources" | "task_assigned_toast_notification" | "task_due_tomorrow_toast_notification" | "task_deleted_toast_notification" | "task_archived_toast_notification" | "task_overdue_toast_notification" | "task_overdue_toast_notification_creator" | "task_notification_count" | "task_activities_toast_notification" | "task_created_toast_notification" | "task_group_creation_success" | "task_group_deletion_success" | "task_group_update_success" | "primary_funding_account_updated" | "task_time_spent_validation" | "missing_receipts_attachment" | "flux_analysis_unreviewed" | "flux_analysis_reviewed" | "receipt_match" | "receipts_upload" | "receipts_bulk_match" | "billing_address_view" | "express_pay_submit" | "exclude_transaction" | "reconcile" | "save_reconcile_for_later" | "recon_transaction_categorize" | "recon_transaction_match" | "update_debit_card_pin_attempt" | "set_debit_card_pin" | "ai_cfo_create_session_and_submit" | "ai_cfo_chat_session_deleted" | "charge_card_auto_pay_enable" | "charge_card_auto_pay_disable" | "treasury_setup" | "treasury_accept_term" | "treasury_transfer_money" | "treasury_transfer_money_failed" | "auto_transfer_rule_create" | "auto_transfer_rule_update" | "auto_transfer_rule_delete" | "auto_transfer_rule_pause" | "auto_transfer_rule_resume" | "treasury_update_portfolio_allocation" | "send_email_magic_link_to_user" | "complete_profile_done" | "create_transfer_entry" | "create_transaction" | "reports_resync" | "invalid_phone_number" | "transactions_categorized_updated_failed" | "transaction_categorized_updated_failed" | "transactionsCategorized_transactionsUpdated" | "transactionsCategorized_transactionUpdated" | "transactionCategorized_transactionsUpdated" | "transactionCategorized_transactionUpdated" | "transactionsCategorized_transactionsFailed" | "transactionsCategorized_transactionFailed" | "transactionCategorized_transactionsFailed" | "transactionCategorized_transactionFailed" | "transactionsUpdated_transactionsFailed" | "transactionsUpdated_transactionFailed" | "transactionUpdated_transactionsFailed" | "transactionUpdated_transactionFailed" | "transactionsCategorized_transactionsUpdated_transactionsFailed" | "transactionsCategorized_transactionsUpdated_transactionFailed" | "transactionsCategorized_transactionUpdated_transactionsFailed" | "transactionCategorized_transactionsUpdated_transactionsFailed" | "transactionsCategorized_transactionUpdated_transactionFailed" | "transactionCategorized_transactionsUpdated_transactionFailed" | "transactionCategorized_transactionUpdated_transactionsFailed" | "transactionCategorized_transactionUpdated_transactionFailed" | "accounting_classes_enabled_update" | "accounting_projects_enabled_update" | "auto_review_income_without_customer_update" | "customers_tab_settings_update" | "accounting_projects_qbo_not_enabled" | "capitalization_threshold_update" | "account_excluded_from_reconciliation" | "account_included_in_reconciliation" | "confirm_statement_mapping" | "statement_parsing_in_progress" | "statement_parsing_complete" | "ai_accountant_trigger_job" | "oauth_consent_approve" | "oauth_consent_invalid_request" | "credit_agent_update_profile" | "credit_agent_save_macro" | "credit_agent_schedule_cron" | "create_sub_task" | "qbo_connection_already_linked" | "qbo_connection_failed" | "accounting_projects_qbo_reconnect_failed" | "product_services_update" | "qbo_realm_id_update" | "kyc_kyb_reset" | "invoicing_dunning_case_resolved" | "invoicing_dunning_retry" | "invoicing_dunning_cancel" | "invoicing_dunning_settings_save" | "invoicing_qbo_backfill" | "invoicing_qbo_sync_health_retry" | "invoicing_qbo_settings_save" | "invoicing_branding_save" | "invoicing_discount_archive" | "invoicing_discount_unarchive" | "invoicing_discount_delete" | "invoicing_invoice_reminder_sent" | "invoicing_invoice_regenerated" | "invoicing_invoice_voided" | "invoicing_catalog_item_saved" | "invoicing_customer_saved" | "invoicing_subscription_saved" | "invoicing_coupon_saved" | "invoicing_invoice_saved" | "invoicing_credit_note_saved" | "invoicing_payment_recorded" | "invoicing_subscription_activated" | "invoicing_subscription_cancellation_removed" | "invoicing_subscription_cancelled" | "invoicing_subscription_non_renewing" | "invoicing_subscription_paused" | "invoicing_subscription_reactivated" | "invoicing_subscription_resumed" | "invoicing_subscription_term_end_changed" | "invoicing_data_import_download";
     messageText: "notification" | "failed" | "success";
     type: "error" | "success" | "info";
     variables: {

package/lib/view/financeStatement/financeStatementSelector.d.ts

@@ -36,5 +36,13 @@ export interface FinanceStatementReport extends SelectorReport {
     selectedReportAndTimeframeFetchState: FetchStateAndError;
     selectedReportId: ReportID;
     dataAvailable?: DataAvailable;
+    /**
+     * Custom start/end the selected report (Accounts view only) was last fetched with for the
+     * selected timeframe; undefined when that fetch used the default periods.
+     */
+    selectedReportCustomDateRange?: {
+        endDate: string;
+        startDate: string;
+    };
 }
 export declare const getFinanceStatement: (state: RootState) => FinanceStatementReport;

package/lib/view/financeStatement/financeStatementSelector.js

@@ -164,6 +164,23 @@ exports.getFinanceStatement = (0, toolkit_1.createSelector)((state) => state.acc
         default:
             break;
     }
+    let customDateRangeByTimeframe;
+    switch (financeStatementState.selectedReportId) {
+        case 'profit_and_loss':
+            customDateRangeByTimeframe =
+                profitAndLossState.pandL.customDateRangeByTimeframe;
+            break;
+        case 'balance_sheet':
+            customDateRangeByTimeframe =
+                balanceSheetState.customDateRangeByTimeframe;
+            break;
+        case 'cash_flow':
+            customDateRangeByTimeframe = cashFlowState.customDateRangeByTimeframe;
+            break;
+        default:
+            break;
+    }
+    const selectedReportCustomDateRange = customDateRangeByTimeframe?.[financeStatementState.timeframe];
     return {
         reportId: 'finance_statement',
         reportTitle: '',
@@ -173,6 +190,7 @@ exports.getFinanceStatement = (0, toolkit_1.createSelector)((state) => state.acc
         allTimeframeTicks,
         balancesInTimeframe,
         selectedReportAndTimeframeFetchState,
+        selectedReportCustomDateRange,
         displayOrder: financeStatementState.displayOrder,
         reportFormat: financeStatementState.reportFormat,
         firstMonthOfFY,

package/lib/view/profitAndLoss/profitAndLossForTimeframeEpic.js

@@ -10,7 +10,11 @@ const reportIdUniqueKey = (forecastId) => forecastId != null
     ? `profit_and_loss+${forecastId}`
     : 'profit_and_loss';
 exports.reportIdUniqueKey = reportIdUniqueKey;
-const fetchProfitAndLossForTimeframeEpic = (actions$, _, zeniAPI) => actions$.pipe((0, operators_1.filter)(profitAndLossReducer_1.fetchProfitAndLossForTimeframe.match), (0, operators_1.mergeMap)((action) => {
+const fetchProfitAndLossForTimeframeEpic = (actions$, _, zeniAPI) => actions$.pipe((0, operators_1.filter)(profitAndLossReducer_1.fetchProfitAndLossForTimeframe.match), 
+// One stream per timeframe: a newer request for the same timeframe (e.g. a
+// custom-date-range change, or a dated fetch right after a default one)
+// cancels the older in-flight request so a stale response can't land last.
+(0, operators_1.groupBy)((action) => `${action.payload.forecastId ?? ''}_${action.payload.timeframe}`), (0, operators_1.mergeMap)((group$) => group$.pipe((0, operators_1.switchMap)((action) => {
     const getTimeSeriesGroup = (timeframe) => {
         switch (timeframe) {
             case 'month':
@@ -29,7 +33,8 @@ const fetchProfitAndLossForTimeframeEpic = (actions$, _, zeniAPI) => actions$.pi
         queryValue.forecast_id = action.payload.forecastId;
         queryValue.is_forecast_vs_actual = true;
     }
-    if (action.payload.startDate != null && action.payload.endDate != null) {
+    if (action.payload.startDate != null &&
+        action.payload.endDate != null) {
         queryValue.custom_start_date = action.payload.startDate;
         queryValue.custom_end_date = action.payload.endDate;
     }
@@ -59,5 +64,5 @@ const fetchProfitAndLossForTimeframeEpic = (actions$, _, zeniAPI) => actions$.pi
             return (0, rxjs_1.of)((0, profitAndLossReducer_1.updateProfitAndLossForTimeframeFailure)(response.status, action.payload.forecastId, action.payload.timeframe));
         }
     }), (0, operators_1.catchError)((error) => (0, rxjs_1.of)((0, profitAndLossReducer_1.updateProfitAndLossForTimeframeFailure)((0, responsePayload_1.createZeniAPIStatus)('Unexpected Error', 'P&L REST API call errored out' + JSON.stringify(error)), action.payload.forecastId, action.payload.timeframe))));
-}));
+}))));
 exports.fetchProfitAndLossForTimeframeEpic = fetchProfitAndLossForTimeframeEpic;

package/lib/view/profitAndLoss/profitAndLossReducer.js

@@ -5,6 +5,7 @@ exports.resetProfitAndLossNodeCollapseState = exports.updateProfitAndLossUIState
 exports.getState = getState;
 const toolkit_1 = require("@reduxjs/toolkit");
 const viewAndReportPayloadv2_1 = require("../../commonPayloadTypes/v2/viewAndReportPayloadv2");
+const coaBalance_1 = require("../../commonStateTypes/coaBalance/coaBalance");
 const rootActions_1 = require("../../rootActions");
 exports.initialPandLState = {
     bookCloseDate: undefined,
@@ -76,7 +77,10 @@ const profitAndLoss = (0, toolkit_1.createSlice)({
                     fetchState: 'In-Progress',
                     error: undefined,
                 };
-                updateState(draft, action.payload.forecastId, { fetchState });
+                updateState(draft, action.payload.forecastId, {
+                    fetchState,
+                    customDateRangeByTimeframe: (0, coaBalance_1.withFetchedCustomDateRange)(pAndLState.customDateRangeByTimeframe, timeframe, action.payload.startDate, action.payload.endDate),
+                });
             },
         },
         updateProfitAndLossForTimeframe(draft, action) {

package/lib/view/profitAndLoss/profitAndLossState.d.ts

@@ -1,4 +1,4 @@
-import { FetchStateByTimeframe } from '../../commonStateTypes/coaBalance/coaBalance';
+import { CustomDateRangeByTimeframe, FetchStateByTimeframe } from '../../commonStateTypes/coaBalance/coaBalance';
 import { ID } from '../../commonStateTypes/common';
 import { Report } from '../../commonStateTypes/viewAndReport/viewAndReport';
 export interface ProfitAndLossUIState {
@@ -11,6 +11,7 @@ export interface ProfitAndLossUIState {
 export interface ProfitAndLossState extends Report {
     fetchState: FetchStateByTimeframe;
     uiState: ProfitAndLossUIState;
+    customDateRangeByTimeframe?: CustomDateRangeByTimeframe;
     forecastId?: ID;
 }
 export interface ProfitAndLossWithForecastState {

package/lib/view/spendManagement/reimbursement/editRemiView/editRemiViewReducer.d.ts

@@ -69,7 +69,10 @@ export declare const fetchEditRemiDetailPage: import("@reduxjs/toolkit").ActionC
     reimbursementId?: ID;
 }, "editRemiView/currencyConversionValueSuccessOrFailure">, waitForRemiDetailThenInitializeLocalStore: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[reimbursementId: string], {
     reimbursementId: string;
-}, "editRemiView/waitForRemiDetailThenInitializeLocalStore", never, never>, waitForMerchantRecommendationFetchThenUpdateRecommendationInMerchant: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[lineId: string, reimbursementId?: string | undefined, merchantId?: string | undefined, merchantName?: string | undefined], {
+}, "editRemiView/waitForRemiDetailThenInitializeLocalStore", never, never>, initializeRemiToLocalStoreFailure: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[reimbursementId: string, error?: ZeniAPIStatus<Record<string, unknown>> | undefined], {
+    reimbursementId: string;
+    error: ZeniAPIStatus<Record<string, unknown>> | undefined;
+}, "editRemiView/initializeRemiToLocalStoreFailure", never, never>, waitForMerchantRecommendationFetchThenUpdateRecommendationInMerchant: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[lineId: string, reimbursementId?: string | undefined, merchantId?: string | undefined, merchantName?: string | undefined], {
     lineId: string;
     reimbursementId: string | undefined;
     merchantId: string | undefined;
@@ -77,7 +80,9 @@ export declare const fetchEditRemiDetailPage: import("@reduxjs/toolkit").ActionC
 }, "editRemiView/waitForMerchantRecommendationFetchThenUpdateRecommendationInMerchant", never, never>, updateAddRemiAutoFields: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
     addRemiAutoFields: Record<ID, AutoFields>;
     reimbursementId?: ID;
-}, "editRemiView/updateAddRemiAutoFields">, indicateReadyToInitializeRemiLocalStore: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<"editRemiView/indicateReadyToInitializeRemiLocalStore">, updateUploadFetchState: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
+}, "editRemiView/updateAddRemiAutoFields">, indicateReadyToInitializeRemiLocalStore: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[reimbursementId: string], {
+    reimbursementId: string;
+}, "editRemiView/indicateReadyToInitializeRemiLocalStore", never, never>, updateUploadFetchState: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
     fetchState: FetchState;
     reimbursementId?: ID;
 }, "editRemiView/updateUploadFetchState">, updateRecommendationInMerchant: import("@reduxjs/toolkit").ActionCreatorWithPayload<{

package/lib/view/spendManagement/reimbursement/editRemiView/editRemiViewReducer.js

@@ -1,7 +1,7 @@
 "use strict";
 var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.clearAddRemiAutoFields = exports.clearTentativeMerchantName = exports.updateTentativeMerchantNames = exports.updateRecommendationInMerchant = exports.updateUploadFetchState = exports.indicateReadyToInitializeRemiLocalStore = exports.updateAddRemiAutoFields = exports.waitForMerchantRecommendationFetchThenUpdateRecommendationInMerchant = exports.waitForRemiDetailThenInitializeLocalStore = exports.currencyConversionValueSuccessOrFailure = exports.updateHomeCurrencyConversion = exports.updateReimbursementType = exports.fetchCurrencyConversionValue = exports.parseReceiptsToRemi = exports.saveRemiSuccessOrFailure = exports.saveRemiDetail = exports.removeFileFromRemiUpdatesInLocalStore = exports.discardRemiUpdatesInLocalStore = exports.updatesPaymentToInLocalStore = exports.saveRemiUpdatesToLocalStore = exports.fetchRecommendationsAndUpdateMerchantRecommendations = exports.initializeRemiToLocalStore = exports.fetchRemiAndInitializeLocalStore = exports.fetchEditRemiDetailPage = exports.initialState = void 0;
+exports.clearAddRemiAutoFields = exports.clearTentativeMerchantName = exports.updateTentativeMerchantNames = exports.updateRecommendationInMerchant = exports.updateUploadFetchState = exports.indicateReadyToInitializeRemiLocalStore = exports.updateAddRemiAutoFields = exports.waitForMerchantRecommendationFetchThenUpdateRecommendationInMerchant = exports.initializeRemiToLocalStoreFailure = exports.waitForRemiDetailThenInitializeLocalStore = exports.currencyConversionValueSuccessOrFailure = exports.updateHomeCurrencyConversion = exports.updateReimbursementType = exports.fetchCurrencyConversionValue = exports.parseReceiptsToRemi = exports.saveRemiSuccessOrFailure = exports.saveRemiDetail = exports.removeFileFromRemiUpdatesInLocalStore = exports.discardRemiUpdatesInLocalStore = exports.updatesPaymentToInLocalStore = exports.saveRemiUpdatesToLocalStore = exports.fetchRecommendationsAndUpdateMerchantRecommendations = exports.initializeRemiToLocalStore = exports.fetchRemiAndInitializeLocalStore = exports.fetchEditRemiDetailPage = exports.initialState = void 0;
 const toolkit_1 = require("@reduxjs/toolkit");
 const amount_1 = require("../../../../commonStateTypes/amount");
 const rootActions_1 = require("../../../../rootActions");
@@ -34,8 +34,13 @@ const editRemiView = (0, toolkit_1.createSlice)({
                 };
             },
         },
-        indicateReadyToInitializeRemiLocalStore() {
-            // do nothing
+        indicateReadyToInitializeRemiLocalStore: {
+            reducer() {
+                // do nothing
+            },
+            prepare(reimbursementId) {
+                return { payload: { reimbursementId } };
+            },
         },
         fetchRecommendationsAndUpdateMerchantRecommendations: {
             reducer() {
@@ -141,6 +146,21 @@ const editRemiView = (0, toolkit_1.createSlice)({
                 return { payload: { reimbursementId } };
             },
         },
+        initializeRemiToLocalStoreFailure: {
+            reducer(draft, action) {
+                const { reimbursementId, error } = action.payload;
+                draft.editRemiStateById[reimbursementId] = {
+                    ...draft.editRemiStateById[reimbursementId],
+                    fetchStatus: {
+                        fetchState: 'Error',
+                        error,
+                    },
+                };
+            },
+            prepare(reimbursementId, error) {
+                return { payload: { reimbursementId, error } };
+            },
+        },
         saveRemiUpdatesToLocalStore(draft, action) {
             if (action.payload.reimbursementId != null) {
                 const reimbursementId = action.payload.reimbursementId;
@@ -391,7 +411,7 @@ const editRemiView = (0, toolkit_1.createSlice)({
         });
     },
 });
-_a = editRemiView.actions, exports.fetchEditRemiDetailPage = _a.fetchEditRemiDetailPage, exports.fetchRemiAndInitializeLocalStore = _a.fetchRemiAndInitializeLocalStore, exports.initializeRemiToLocalStore = _a.initializeRemiToLocalStore, exports.fetchRecommendationsAndUpdateMerchantRecommendations = _a.fetchRecommendationsAndUpdateMerchantRecommendations, exports.saveRemiUpdatesToLocalStore = _a.saveRemiUpdatesToLocalStore, exports.updatesPaymentToInLocalStore = _a.updatesPaymentToInLocalStore, exports.discardRemiUpdatesInLocalStore = _a.discardRemiUpdatesInLocalStore, exports.removeFileFromRemiUpdatesInLocalStore = _a.removeFileFromRemiUpdatesInLocalStore, exports.saveRemiDetail = _a.saveRemiDetail, exports.saveRemiSuccessOrFailure = _a.saveRemiSuccessOrFailure, exports.parseReceiptsToRemi = _a.parseReceiptsToRemi, exports.fetchCurrencyConversionValue = _a.fetchCurrencyConversionValue, exports.updateReimbursementType = _a.updateReimbursementType, exports.updateHomeCurrencyConversion = _a.updateHomeCurrencyConversion, exports.currencyConversionValueSuccessOrFailure = _a.currencyConversionValueSuccessOrFailure, exports.waitForRemiDetailThenInitializeLocalStore = _a.waitForRemiDetailThenInitializeLocalStore, exports.waitForMerchantRecommendationFetchThenUpdateRecommendationInMerchant = _a.waitForMerchantRecommendationFetchThenUpdateRecommendationInMerchant, exports.updateAddRemiAutoFields = _a.updateAddRemiAutoFields, exports.indicateReadyToInitializeRemiLocalStore = _a.indicateReadyToInitializeRemiLocalStore, exports.updateUploadFetchState = _a.updateUploadFetchState, exports.updateRecommendationInMerchant = _a.updateRecommendationInMerchant, exports.updateTentativeMerchantNames = _a.updateTentativeMerchantNames, exports.clearTentativeMerchantName = _a.clearTentativeMerchantName, exports.clearAddRemiAutoFields = _a.clearAddRemiAutoFields;
+_a = editRemiView.actions, exports.fetchEditRemiDetailPage = _a.fetchEditRemiDetailPage, exports.fetchRemiAndInitializeLocalStore = _a.fetchRemiAndInitializeLocalStore, exports.initializeRemiToLocalStore = _a.initializeRemiToLocalStore, exports.fetchRecommendationsAndUpdateMerchantRecommendations = _a.fetchRecommendationsAndUpdateMerchantRecommendations, exports.saveRemiUpdatesToLocalStore = _a.saveRemiUpdatesToLocalStore, exports.updatesPaymentToInLocalStore = _a.updatesPaymentToInLocalStore, exports.discardRemiUpdatesInLocalStore = _a.discardRemiUpdatesInLocalStore, exports.removeFileFromRemiUpdatesInLocalStore = _a.removeFileFromRemiUpdatesInLocalStore, exports.saveRemiDetail = _a.saveRemiDetail, exports.saveRemiSuccessOrFailure = _a.saveRemiSuccessOrFailure, exports.parseReceiptsToRemi = _a.parseReceiptsToRemi, exports.fetchCurrencyConversionValue = _a.fetchCurrencyConversionValue, exports.updateReimbursementType = _a.updateReimbursementType, exports.updateHomeCurrencyConversion = _a.updateHomeCurrencyConversion, exports.currencyConversionValueSuccessOrFailure = _a.currencyConversionValueSuccessOrFailure, exports.waitForRemiDetailThenInitializeLocalStore = _a.waitForRemiDetailThenInitializeLocalStore, exports.initializeRemiToLocalStoreFailure = _a.initializeRemiToLocalStoreFailure, exports.waitForMerchantRecommendationFetchThenUpdateRecommendationInMerchant = _a.waitForMerchantRecommendationFetchThenUpdateRecommendationInMerchant, exports.updateAddRemiAutoFields = _a.updateAddRemiAutoFields, exports.indicateReadyToInitializeRemiLocalStore = _a.indicateReadyToInitializeRemiLocalStore, exports.updateUploadFetchState = _a.updateUploadFetchState, exports.updateRecommendationInMerchant = _a.updateRecommendationInMerchant, exports.updateTentativeMerchantNames = _a.updateTentativeMerchantNames, exports.clearTentativeMerchantName = _a.clearTentativeMerchantName, exports.clearAddRemiAutoFields = _a.clearAddRemiAutoFields;
 exports.default = editRemiView.reducer;
 const doUpdateRecommendationForEntity = (draft, lineId, recommendations, shouldAutofill, reimbursementId, reimbursementStageCode) => {
     if (reimbursementId != null) {

package/lib/view/spendManagement/reimbursement/editRemiView/epics/fetchRemiAndInitializeLocalStoreEpic.d.ts

@@ -1,6 +1,9 @@
 import { ActionsObservable, StateObservable } from 'redux-observable';
+import { Observable } from 'rxjs';
+import { clearAll } from '../../../../../rootActions';
 import { RootState } from '../../../../../rootStateTypes';
-import { fetchRemiDetail, updateRemiDetail } from '../../remiDetailView/remiDetailViewReducer';
-import { fetchRemiAndInitializeLocalStore, initializeRemiToLocalStore, waitForRemiDetailThenInitializeLocalStore } from '../editRemiViewReducer';
-export type ActionType = ReturnType<typeof waitForRemiDetailThenInitializeLocalStore> | ReturnType<typeof fetchRemiDetail> | ReturnType<typeof updateRemiDetail> | ReturnType<typeof initializeRemiToLocalStore> | ReturnType<typeof fetchRemiAndInitializeLocalStore>;
-export declare const fetchRemiAndInitializeLocalStoreEpic: (actions$: ActionsObservable<ActionType>, state$: StateObservable<RootState>) => import("rxjs").Observable<ActionType>;
+import { fetchRemiDetail, updateRemiDetail, updateRemiDetailFetchState } from '../../remiDetailView/remiDetailViewReducer';
+import { fetchRemiAndInitializeLocalStore, indicateReadyToInitializeRemiLocalStore, initializeRemiToLocalStore, initializeRemiToLocalStoreFailure, waitForRemiDetailThenInitializeLocalStore } from '../editRemiViewReducer';
+export type ActionType = ReturnType<typeof waitForRemiDetailThenInitializeLocalStore> | ReturnType<typeof fetchRemiDetail> | ReturnType<typeof updateRemiDetail> | ReturnType<typeof updateRemiDetailFetchState> | ReturnType<typeof initializeRemiToLocalStore> | ReturnType<typeof fetchRemiAndInitializeLocalStore> | ReturnType<typeof indicateReadyToInitializeRemiLocalStore> | ReturnType<typeof initializeRemiToLocalStoreFailure> | ReturnType<typeof clearAll>;
+export declare const fetchRemiAndInitializeLocalStoreEpic: (actions$: ActionsObservable<ActionType>, state$: StateObservable<RootState>) => Observable<ActionType>;
+export declare const waitForRemiDetailThenInitializeLocalStoreEpic: (actions$: ActionsObservable<ActionType>) => Observable<ActionType>;

package/lib/view/spendManagement/reimbursement/editRemiView/epics/fetchRemiAndInitializeLocalStoreEpic.js

@@ -3,10 +3,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.fetchRemiAndInitializeLocalStoreEpic = void 0;
+exports.waitForRemiDetailThenInitializeLocalStoreEpic = exports.fetchRemiAndInitializeLocalStoreEpic = void 0;
 const get_1 = __importDefault(require("lodash/get"));
 const rxjs_1 = require("rxjs");
 const operators_1 = require("rxjs/operators");
+const rootActions_1 = require("../../../../../rootActions");
 const remiDetailViewReducer_1 = require("../../remiDetailView/remiDetailViewReducer");
 const editRemiViewReducer_1 = require("../editRemiViewReducer");
 const fetchRemiAndInitializeLocalStoreEpic = (actions$, state$) => actions$.pipe((0, operators_1.filter)(editRemiViewReducer_1.fetchRemiAndInitializeLocalStore.match), (0, operators_1.mergeMap)((action) => {
@@ -42,3 +43,16 @@ const fetchRemiAndInitializeLocalStoreEpic = (actions$, state$) => actions$.pipe
     return (0, rxjs_1.from)(remiDetailActions);
 }));
 exports.fetchRemiAndInitializeLocalStoreEpic = fetchRemiAndInitializeLocalStoreEpic;
+const waitForRemiDetailThenInitializeLocalStoreEpic = (actions$) => actions$.pipe((0, operators_1.filter)(editRemiViewReducer_1.waitForRemiDetailThenInitializeLocalStore.match), (0, operators_1.mergeMap)((action) => {
+    const { reimbursementId } = action.payload;
+    const ready$ = actions$.pipe((0, operators_1.filter)(editRemiViewReducer_1.indicateReadyToInitializeRemiLocalStore.match), (0, operators_1.filter)((readyAction) => readyAction.payload.reimbursementId === reimbursementId), (0, operators_1.take)(1), (0, operators_1.map)(() => (0, editRemiViewReducer_1.initializeRemiToLocalStore)(reimbursementId)));
+    const failed$ = actions$.pipe((0, operators_1.filter)(remiDetailViewReducer_1.updateRemiDetailFetchState.match), (0, operators_1.filter)((fetchStateAction) => fetchStateAction.payload.reimbursementId === reimbursementId &&
+        fetchStateAction.payload.fetchState === 'Error'), (0, operators_1.map)((fetchStateAction) => (0, editRemiViewReducer_1.initializeRemiToLocalStoreFailure)(reimbursementId, fetchStateAction.payload.error)));
+    const supersededOrCleared$ = actions$.pipe((0, operators_1.filter)((nextAction) => rootActions_1.clearAll.match(nextAction) ||
+        (editRemiViewReducer_1.waitForRemiDetailThenInitializeLocalStore.match(nextAction) &&
+            nextAction.payload.reimbursementId === reimbursementId)));
+    // An Error does not end the wait: a newer request for the same id may still succeed.
+    // After an Error, supersededOrCleared$ is what ends it.
+    return (0, rxjs_1.merge)(ready$, failed$).pipe((0, operators_1.takeWhile)((resultAction) => !editRemiViewReducer_1.initializeRemiToLocalStore.match(resultAction), true), (0, operators_1.takeUntil)(supersededOrCleared$));
+}));
+exports.waitForRemiDetailThenInitializeLocalStoreEpic = waitForRemiDetailThenInitializeLocalStoreEpic;

package/lib/view/spendManagement/reimbursement/remiDetailView/epics/fetchRemiDetailEpic.js

@@ -81,7 +81,7 @@ const fetchRemiDetailEpic = (actions$, state$, zeniAPI) => actions$.pipe((0, ope
                         }));
                     }
                 });
-                actions.push((0, editRemiViewReducer_1.indicateReadyToInitializeRemiLocalStore)()); // add dummy action
+                actions.push((0, editRemiViewReducer_1.indicateReadyToInitializeRemiLocalStore)(reimbursementId));
                 if (response.data.transaction?.lines != null &&
                     response.data.transaction.lines.length > 0) {
                     actions.push((0, remiDetailViewReducer_1.fetchDuplicateReimbursement)(response.data.transaction.created_by_user_id, false, response.data.transaction.transaction_id));

package/lib/view/transactionDetail/createTransaction/epics/createTransactionEpic.js

@@ -55,15 +55,11 @@ const createTransactionEpic = (actions$, state$, zeniAPI) => actions$.pipe((0, o
             // the working copy on unmount instead.
             // Before the local-data init: it seeds the detail entry that init writes into.
             (0, transactionDetailReducer_1.createTransactionSuccessOrFailure)('Completed', newTransactionId),
+            // No success snackbar here: the screen raises it once pending attachments upload.
             (0, transactionDetailReducer_1.initializeTransactionDetailLocalData)({
                 transactionId: newTransactionId,
                 vendorId: created.vendor_id ?? undefined,
             }),
-            (0, snackbarReducer_1.openSnackbar)({
-                messageSection: 'create_transaction',
-                messageText: 'success',
-                type: 'success',
-            }),
         ]);
     }), (0, operators_1.catchError)((error) => {
         const message = error instanceof createTransactionPayload_1.UnresolvedCreateTransactionIdError

package/lib/view/transactionList/fetchTransactionListByEntityEpic.js

@@ -8,6 +8,7 @@ const get_1 = __importDefault(require("lodash/get"));
 const rxjs_1 = require("rxjs");
 const operators_1 = require("rxjs/operators");
 const timePeriod_1 = require("../../commonStateTypes/timePeriod");
+const customerWithSubCustomersId_1 = require("../../entity/genericEntity/customerWithSubCustomersId");
 const transactionReducer_1 = require("../../entity/transaction/transactionReducer");
 const responsePayload_1 = require("../../responsePayload");
 const transactionListReducer_1 = require("./transactionListReducer");
@@ -19,12 +20,20 @@ const fetchTransactionListByEntityEpic = (actions$, state$, zeniAPI) => actions$
     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'
+            ? (0, customerWithSubCustomersId_1.fromCustomerEntityId)(action.payload.entity.id)
+            : {
+                customerId: action.payload.entity.id,
+                includeSubCustomers: false,
+            };
         const queryParam = {
             start_date: (0, timePeriod_1.toString)(action.payload.period.start),
             end_date: (0, timePeriod_1.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
@@ -37,7 +46,7 @@ const fetchTransactionListByEntityEpic = (actions$, state$, zeniAPI) => actions$
             if ((0, responsePayload_1.isSuccessResponse)(response) && response.data != null) {
                 const updateActions = [];
                 updateActions.push((0, transactionReducer_1.updateTransactions)(response.data.transactions, (value) => value.transaction_id));
-                updateActions.push((0, transactionListReducer_1.updateTransactionListByEntity)(response.data));
+                updateActions.push((0, transactionListReducer_1.updateTransactionListByEntity)(response.data, action.payload.entity.id));
                 return (0, rxjs_1.from)(updateActions);
             }
             else {

package/lib/view/transactionList/filterTransactionsByTimePeriod.d.ts

@@ -0,0 +1,15 @@
+import { TimePeriod } from '../../commonStateTypes/timePeriod';
+import { ZeniDate } from '../../zeniDayJS';
+/**
+ * Transaction lists are fetched and cached in month buckets: `splitPeriod`
+ * snaps the first bucket back to the 1st of the month, while the last bucket
+ * is fetched with the real end date. So a period that starts mid-month (e.g. a
+ * drill-down from the custom-date-range column "Jun 17-30 2026") pulls in the
+ * days before its start. Drop those so the list reconciles to the clicked
+ * figure. Periods starting on the 1st (every pre-existing caller) are returned
+ * untouched. Compares calendar days as `YYYY-MM-DD` strings so the viewer's
+ * timezone can't shift the boundary.
+ */
+export declare const filterTransactionsByTimePeriod: <T extends {
+    date: ZeniDate;
+}>(transactions: T[], period: TimePeriod) => T[];

package/lib/view/transactionList/filterTransactionsByTimePeriod.js

@@ -0,0 +1,22 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.filterTransactionsByTimePeriod = void 0;
+const timePeriod_1 = require("../../commonStateTypes/timePeriod");
+/**
+ * Transaction lists are fetched and cached in month buckets: `splitPeriod`
+ * snaps the first bucket back to the 1st of the month, while the last bucket
+ * is fetched with the real end date. So a period that starts mid-month (e.g. a
+ * drill-down from the custom-date-range column "Jun 17-30 2026") pulls in the
+ * days before its start. Drop those so the list reconciles to the clicked
+ * figure. Periods starting on the 1st (every pre-existing caller) are returned
+ * untouched. Compares calendar days as `YYYY-MM-DD` strings so the viewer's
+ * timezone can't shift the boundary.
+ */
+const filterTransactionsByTimePeriod = (transactions, period) => {
+    if (period.start.day === 1) {
+        return transactions;
+    }
+    const start = (0, timePeriod_1.toString)(period.start);
+    return transactions.filter((transaction) => transaction.date.format(timePeriod_1.DEFAULT_DATE_FORMAT) >= start);
+};
+exports.filterTransactionsByTimePeriod = filterTransactionsByTimePeriod;

package/lib/view/transactionList/transactionListByAccountSelector.js

@@ -8,6 +8,7 @@ const flatMap_1 = __importDefault(require("lodash/flatMap"));
 const get_1 = __importDefault(require("lodash/get"));
 const orderBy_1 = __importDefault(require("lodash/orderBy"));
 const transactionSelector_1 = require("../../entity/transaction/transactionSelector");
+const filterTransactionsByTimePeriod_1 = require("./filterTransactionsByTimePeriod");
 const parallelFetchAccountTransactionListEpic_1 = require("./parallelFetchAccountTransactionListEpic");
 const reduceTransactionListFetchState_1 = require("./reduceTransactionListFetchState");
 const transactionListState_1 = require("./transactionListState");
@@ -35,7 +36,7 @@ const getTransactionListByAccount = (transactionState, transactionListState, acc
             }
             return value != null;
         });
-        transactions = (0, orderBy_1.default)(transactionsUnsorted, (value) => value.date.valueOf(), 'desc');
+        transactions = (0, orderBy_1.default)((0, filterTransactionsByTimePeriod_1.filterTransactionsByTimePeriod)(transactionsUnsorted, filterByTimePeriod), (value) => value.date.valueOf(), 'desc');
     }
     const key = (0, transactionListState_1.getAcKey)(accountId, accountType);
     const uiState = (0, get_1.default)(transactionListState.byAccount.transactionListUIStateByAccountKey, key, {});

package/lib/view/transactionList/transactionListByCategoryTypeSelector.js

@@ -8,6 +8,7 @@ const flatMap_1 = __importDefault(require("lodash/flatMap"));
 const get_1 = __importDefault(require("lodash/get"));
 const orderBy_1 = __importDefault(require("lodash/orderBy"));
 const transactionSelector_1 = require("../../entity/transaction/transactionSelector");
+const filterTransactionsByTimePeriod_1 = require("./filterTransactionsByTimePeriod");
 const parallelFetchAccountTransactionListEpic_1 = require("./parallelFetchAccountTransactionListEpic");
 const reduceTransactionListFetchState_1 = require("./reduceTransactionListFetchState");
 const transactionListState_1 = require("./transactionListState");
@@ -32,7 +33,7 @@ const getTransactionsListByCategoryType = (transactionState, transactionListStat
             }
             return value != null;
         });
-        transactions = (0, orderBy_1.default)(transactionsUnsorted, (value) => value.date.valueOf(), 'desc');
+        transactions = (0, orderBy_1.default)((0, filterTransactionsByTimePeriod_1.filterTransactionsByTimePeriod)(transactionsUnsorted, filterByTimePeriod), (value) => value.date.valueOf(), 'desc');
     }
     const uiState = transactionListState.byType[transactionCategoryType].transactionListUIState;
     return {

package/lib/view/transactionList/transactionListByClassSelector.js

@@ -8,6 +8,7 @@ const flatMap_1 = __importDefault(require("lodash/flatMap"));
 const get_1 = __importDefault(require("lodash/get"));
 const orderBy_1 = __importDefault(require("lodash/orderBy"));
 const transactionSelector_1 = require("../../entity/transaction/transactionSelector");
+const filterTransactionsByTimePeriod_1 = require("./filterTransactionsByTimePeriod");
 const parallelFetchAccountTransactionListEpic_1 = require("./parallelFetchAccountTransactionListEpic");
 const reduceTransactionListFetchState_1 = require("./reduceTransactionListFetchState");
 const transactionListState_1 = require("./transactionListState");
@@ -35,7 +36,7 @@ const getTransactionListByClass = (transactionState, transactionListState, accou
             }
             return value != null;
         });
-        transactions = (0, orderBy_1.default)(transactionsUnsorted, (value) => value.date.valueOf(), 'desc');
+        transactions = (0, orderBy_1.default)((0, filterTransactionsByTimePeriod_1.filterTransactionsByTimePeriod)(transactionsUnsorted, filterByTimePeriod), (value) => value.date.valueOf(), 'desc');
     }
     const key = (0, transactionListState_1.getClassAcKey)(accountId, accountType, classId);
     const uiState = (0, get_1.default)(transactionListState.byClass.transactionListUIStateByClassKey, key, {});

package/lib/view/transactionList/transactionListByProjectSelector.js

@@ -8,6 +8,7 @@ const flatMap_1 = __importDefault(require("lodash/flatMap"));
 const get_1 = __importDefault(require("lodash/get"));
 const orderBy_1 = __importDefault(require("lodash/orderBy"));
 const transactionSelector_1 = require("../../entity/transaction/transactionSelector");
+const filterTransactionsByTimePeriod_1 = require("./filterTransactionsByTimePeriod");
 const parallelFetchAccountTransactionListEpic_1 = require("./parallelFetchAccountTransactionListEpic");
 const reduceTransactionListFetchState_1 = require("./reduceTransactionListFetchState");
 const transactionListState_1 = require("./transactionListState");
@@ -35,7 +36,7 @@ const getTransactionListByProject = (transactionState, transactionListState, acc
             }
             return value != null;
         });
-        transactions = (0, orderBy_1.default)(transactionsUnsorted, (value) => value.date.valueOf(), 'desc');
+        transactions = (0, orderBy_1.default)((0, filterTransactionsByTimePeriod_1.filterTransactionsByTimePeriod)(transactionsUnsorted, filterByTimePeriod), (value) => value.date.valueOf(), 'desc');
     }
     const key = (0, transactionListState_1.getProjectAcKey)(accountId, accountType, projectId);
     const uiState = (0, get_1.default)(transactionListState.byProject.transactionListUIStateByProjectKey, key, {});

package/lib/view/transactionList/transactionListReducer.d.ts

@@ -38,7 +38,9 @@ export declare const parallelFetchAccountTransactionList: import("@reduxjs/toolk
     period: TimePeriod;
     cacheOverride: any;
     isFetchAllTransactions: any;
-}, "transactionList/fetchEntityTransactionList", never, never>, updateTransactionListByEntity: import("@reduxjs/toolkit").ActionCreatorWithPayload<TransactionListByEntityPayload, "transactionList/updateTransactionListByEntity">, updateTransactionListByEntityFailure: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[entity: Entity, period: TimePeriod, error: ZeniAPIStatus<Record<string, unknown>>], {
+}, "transactionList/fetchEntityTransactionList", never, never>, updateTransactionListByEntity: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[payload: TransactionListByEntityPayload, entityId?: string | undefined], TransactionListByEntityPayload, "transactionList/updateTransactionListByEntity", never, {
+    entityId: string | undefined;
+}>, updateTransactionListByEntityFailure: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[entity: Entity, period: TimePeriod, error: ZeniAPIStatus<Record<string, unknown>>], {
     entity: Entity;
     period: TimePeriod;
     error: ZeniAPIStatus<Record<string, unknown>>;

package/lib/view/transactionList/transactionListReducer.js

@@ -168,21 +168,30 @@ const transactionList = (0, toolkit_1.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 = (0, transactionListState_1.getEntityTranKey)(entity, {
-                start: (0, timePeriod_1.toAbsoluteDay)(action.payload.query.start_date),
-                end: (0, timePeriod_1.toAbsoluteDay)(action.payload.query.end_date),
-            });
-            draft.byEntity.transactionListByEntityKey[key] = {
-                ...transactionListState_1.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 = (0, transactionListState_1.getEntityTranKey)(entity, {
+                    start: (0, timePeriod_1.toAbsoluteDay)(action.payload.query.start_date),
+                    end: (0, timePeriod_1.toAbsoluteDay)(action.payload.query.end_date),
+                });
+                draft.byEntity.transactionListByEntityKey[key] = {
+                    ...transactionListState_1.initialEntityTransactionState,
+                    fetchState: 'Completed',
+                    error: undefined,
+                    entity: entity,
+                    transactionIDs,
+                };
+            },
         },
         updateTransactionListByEntityFailure: {
             reducer(draft, action) {

package/lib/view/trend/fetchIncomeTrendEpic.js

@@ -6,6 +6,7 @@ const operators_1 = require("rxjs/operators");
 const timeframeTick_1 = require("../../commonStateTypes/timeframeTick");
 const customerIncomeTrendKey_1 = require("../../entity/customerIncome/customerIncomeTrendKey");
 const customerIncomeTrendReducer_1 = require("../../entity/customerIncome/customerIncomeTrendReducer");
+const customerWithSubCustomersId_1 = require("../../entity/genericEntity/customerWithSubCustomersId");
 const responsePayload_1 = require("../../responsePayload");
 const zeniDayJS_1 = require("../../zeniDayJS");
 const trendReducer_1 = require("./trendReducer");
@@ -28,11 +29,14 @@ const fetchIncomeTrendEpic = (actions$, state$, zeniAPI) => actions$.pipe((0, op
             return (0, rxjs_1.of)((0, trendReducer_1.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 } = (0, customerWithSubCustomersId_1.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 }
             : {}),