@zeniai/client-epic-state 5.2.35-beta4MM → 5.2.35-beta5MM

package/lib/entity/jeSchedules/jeSchedulesPayload.d.ts

@@ -131,6 +131,7 @@ export interface JEOneTimeAccrualClearedPayload {
     accrual_ids?: string[] | null;
     consumed_line_ids?: string[] | null;
     group_sum?: number | null;
+    intended_accrual_ids?: string[] | null;
     match_shape?: string | null;
     match_tier?: string | null;
     matched_amount?: number | null;

package/lib/entity/jeSchedules/jeSchedulesPayload.js

@@ -472,6 +472,7 @@ function toJEOneTimeAccrualCleared(payload, currencyCode) {
             ? toOneTimeAccrualAmount(payload.group_sum, currencyCode)
             : undefined,
         accrualIds: payload.accrual_ids ?? undefined,
+        intendedAccrualIds: payload.intended_accrual_ids ?? undefined,
         reversedAt: payload.reversed_at != null ? (0, zeniDayJS_1.date)(payload.reversed_at) : undefined,
         matchedTransactionDate: payload.matched_transaction_date != null
             ? (0, zeniDayJS_1.date)(payload.matched_transaction_date)

package/lib/entity/jeSchedules/jeSchedulesState.d.ts

@@ -209,6 +209,7 @@ export interface JEOneTimeAccrualCleared {
     accrualIds?: ID[];
     consumedLineIds?: string[];
     groupSum?: Amount;
+    intendedAccrualIds?: ID[];
     matchedAmount?: Amount;
     matchedLineId?: string;
     matchedTransactionDate?: ZeniDate;

package/lib/entity/snackbar/snackbarTypes.d.ts

@@ -1,4 +1,4 @@
-export declare const toSnackbarMessageSection: (v: string) => "common" | "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" | "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" | "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" | "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" | "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" | "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";
+export declare const toSnackbarMessageSection: (v: string) => "common" | "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" | "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" | "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" | "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" | "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" | "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";
 export type SnackbarMessageSections = ReturnType<typeof toSnackbarMessageSection>;
 export declare const toSnackbarMessageSectionTexts: (v: string) => "notification" | "failed" | "success";
 export type SnackbarMessageSectionTexts = ReturnType<typeof toSnackbarMessageSectionTexts>;

package/lib/entity/snackbar/snackbarTypes.js

@@ -11,6 +11,8 @@ const ALL_SNACKBAR_MESSAGE_SECTIONS = [
     'cockpit_month_end_email_attachment_upload',
     'je_bill_link',
     'je_posted',
+    'actual_matching_match_and_reverse',
+    'actual_matching_undo_reversal',
     'audit_score_updated',
     'people_invite_people',
     'people_invite_multiple_people',

package/lib/esm/entity/jeSchedules/jeSchedulesPayload.js

@@ -461,6 +461,7 @@ function toJEOneTimeAccrualCleared(payload, currencyCode) {
             ? toOneTimeAccrualAmount(payload.group_sum, currencyCode)
             : undefined,
         accrualIds: payload.accrual_ids ?? undefined,
+        intendedAccrualIds: payload.intended_accrual_ids ?? undefined,
         reversedAt: payload.reversed_at != null ? date(payload.reversed_at) : undefined,
         matchedTransactionDate: payload.matched_transaction_date != null
             ? date(payload.matched_transaction_date)

package/lib/esm/entity/snackbar/snackbarTypes.js

@@ -8,6 +8,8 @@ const ALL_SNACKBAR_MESSAGE_SECTIONS = [
     'cockpit_month_end_email_attachment_upload',
     'je_bill_link',
     'je_posted',
+    'actual_matching_match_and_reverse',
+    'actual_matching_undo_reversal',
     'audit_score_updated',
     'people_invite_people',
     'people_invite_multiple_people',

package/lib/esm/view/expenseAutomationView/epics/actualMatching/matchAndReverseAccrualsEpic.js

@@ -1,48 +1,87 @@
 import { from, of } from 'rxjs';
 import { catchError, exhaustMap, filter, mergeMap, takeUntil } from 'rxjs/operators';
+import { getActualMatchingMatchById } from '../../../../entity/actualMatching/actualMatchingSelector';
+import { openSnackbar } from '../../../../entity/snackbar/snackbarReducer';
 import { createZeniAPIStatus, isSuccessResponse } from '../../../../responsePayload';
 import { clearAll } from '../../../../rootActions';
-import { toMatchAndReverseResult } from '../../payload/actualMatchingPayload';
-import { clearMatchNewModal, matchAndReverseAccruals, matchAndReverseAccrualsFailure, matchAndReverseAccrualsSuccess } from '../../reducers/actualMatchingViewReducer';
+import { toMatchAndReverseResult, } from '../../payload/actualMatchingPayload';
+import { clearMatchNewModal, matchAndReverseAccruals, matchAndReverseAccrualsFailure, matchAndReverseAccrualsSuccess, } from '../../reducers/actualMatchingViewReducer';
 import { refreshActualMatchingList } from './refreshActualMatchingList';
+function isMatchCompleteStatus(status) {
+    return status === 'reversed' || status === 'noop';
+}
+function matchAndReverseSnackbar(results, vendorName) {
+    const completeCount = results.filter((result) => isMatchCompleteStatus(result.status)).length;
+    const failedCount = results.length - completeCount;
+    const variables = [
+        { variableName: '_count_', variableValue: String(completeCount) },
+        { variableName: '_vendor_name_', variableValue: vendorName },
+    ];
+    if (results.length > 0 && failedCount === 0) {
+        return openSnackbar({
+            messageSection: 'actual_matching_match_and_reverse',
+            messageText: 'success',
+            type: 'success',
+            variables,
+        });
+    }
+    if (completeCount > 0 && failedCount > 0) {
+        return openSnackbar({
+            messageSection: 'actual_matching_match_and_reverse',
+            messageText: 'notification',
+            type: 'warning',
+            variables,
+        });
+    }
+    return openSnackbar({
+        messageSection: 'actual_matching_match_and_reverse',
+        messageText: 'failed',
+        type: 'error',
+        variables,
+    });
+}
+function matchVendorName(state, matchId) {
+    return getActualMatchingMatchById(state.actualMatchingState, matchId)?.vendorName ?? '';
+}
 export const matchAndReverseAccrualsEpic = (actions$, state$, zeniAPI) => actions$.pipe(filter(matchAndReverseAccruals.match), 
 // Posts reversing JEs; drop duplicate clicks while a request is in flight.
 exhaustMap((action) => {
-    const { transactionId, transactionIntegrationId, transactionType, lineId, accrualIds, transactionSyncToken, } = action.payload;
+    const { transactionId, transactionIntegrationId, transactionType, lineIds, accrualIds, transactionSyncToken, } = action.payload;
     const body = {
         transaction_id: transactionId,
         transaction_integration_id: transactionIntegrationId,
         transaction_type: transactionType,
-        line_id: lineId,
+        line_ids: lineIds,
         transaction_sync_token: transactionSyncToken,
         accrual_ids: accrualIds,
     };
+    const openedFromMatchId = state$.value.expenseAutomationActualMatchingViewState.matchModal
+        .openedFromMatchId;
+    const matchId = openedFromMatchId ?? `${transactionType}:${transactionIntegrationId}`;
+    const vendorName = matchVendorName(state$.value, matchId);
     return zeniAPI
         .postAndGetJSON(`${zeniAPI.apiEndPoints.accountMicroServiceBaseUrl}/1.0/accruals/match-and-reverse`, body)
         .pipe(mergeMap((response) => {
         if (isSuccessResponse(response) && response.data != null) {
             const results = response.data.results.map(toMatchAndReverseResult);
-            const openedFromMatchId = state$.value.expenseAutomationActualMatchingViewState.matchModal
-                .openedFromMatchId;
-            const matchId = openedFromMatchId ??
-                `${transactionType}:${transactionIntegrationId}`;
             const successActions = [
                 matchAndReverseAccrualsSuccess({ matchId, results }),
             ];
-            const occupancyChanged = results.some((result) => result.status === 'reversed' || result.status === 'noop');
+            const occupancyChanged = results.some((result) => isMatchCompleteStatus(result.status));
             const allComplete = results.length > 0 &&
-                results.every((result) => result.status === 'reversed' || result.status === 'noop');
+                results.every((result) => isMatchCompleteStatus(result.status));
             if (occupancyChanged) {
                 successActions.push(...refreshActualMatchingList(state$.value));
             }
+            successActions.push(matchAndReverseSnackbar(results, vendorName));
             if (allComplete) {
                 successActions.push(clearMatchNewModal());
             }
             return from(successActions);
         }
-        return of(matchAndReverseAccrualsFailure({ status: response.status }));
+        return of(matchAndReverseAccrualsFailure({ status: response.status }), matchAndReverseSnackbar([], vendorName));
     }), catchError((error) => of(matchAndReverseAccrualsFailure({
         status: createZeniAPIStatus('Unexpected Error', 'Match and reverse accruals REST API call errored out' +
             JSON.stringify(error)),
-    }))), takeUntil(actions$.pipe(filter(clearAll.match))));
+    }), matchAndReverseSnackbar([], vendorName))), takeUntil(actions$.pipe(filter(clearAll.match))));
 }));

package/lib/esm/view/expenseAutomationView/epics/actualMatching/undoReversalAccrualsEpic.js

@@ -1,17 +1,54 @@
 import { from, of } from 'rxjs';
 import { catchError, exhaustMap, filter, mergeMap, takeUntil, } from 'rxjs/operators';
+import { getActualMatchingMatchById } from '../../../../entity/actualMatching/actualMatchingSelector';
+import { openSnackbar } from '../../../../entity/snackbar/snackbarReducer';
 import { createZeniAPIStatus, isSuccessResponse, } from '../../../../responsePayload';
 import { clearAll } from '../../../../rootActions';
 import { toUndoReversalResult, } from '../../payload/actualMatchingPayload';
 import { fetchActualMatchingMatch, undoReversalAccruals, undoReversalAccrualsFailure, undoReversalAccrualsSuccess, } from '../../reducers/actualMatchingViewReducer';
 import { refreshActualMatchingList } from './refreshActualMatchingList';
+function undoReversalSnackbar(results, vendorName) {
+    const undoneCount = results.filter((result) => result.status === 'undone').length;
+    const failedCount = results.length - undoneCount;
+    const variables = [
+        { variableName: '_count_', variableValue: String(undoneCount) },
+        { variableName: '_vendor_name_', variableValue: vendorName },
+    ];
+    if (results.length > 0 && failedCount === 0) {
+        return openSnackbar({
+            messageSection: 'actual_matching_undo_reversal',
+            messageText: 'success',
+            type: 'success',
+            variables,
+        });
+    }
+    if (undoneCount > 0 && failedCount > 0) {
+        return openSnackbar({
+            messageSection: 'actual_matching_undo_reversal',
+            messageText: 'notification',
+            type: 'warning',
+            variables,
+        });
+    }
+    return openSnackbar({
+        messageSection: 'actual_matching_undo_reversal',
+        messageText: 'failed',
+        type: 'error',
+        variables,
+    });
+}
+function matchVendorName(state, matchId) {
+    return (getActualMatchingMatchById(state.actualMatchingState, matchId)?.vendorName ??
+        '');
+}
 export const undoReversalAccrualsEpic = (actions$, state$, zeniAPI) => actions$.pipe(filter(undoReversalAccruals.match), 
-// Posts QBO deletes; drop duplicate clicks while a request is in flight.
+// Posts QBO deletes; drop duplicate clicks while the first request is in flight.
 exhaustMap((action) => {
     const { accrualIds, matchId } = action.payload;
     const body = {
         accrual_ids: accrualIds,
     };
+    const vendorName = matchVendorName(state$.value, matchId);
     return zeniAPI
         .postAndGetJSON(`${zeniAPI.apiEndPoints.accountMicroServiceBaseUrl}/1.0/accruals/undo-reversal`, body)
         .pipe(mergeMap((response) => {
@@ -24,15 +61,16 @@ exhaustMap((action) => {
             if (anyUndone) {
                 successActions.push(...refreshActualMatchingList(state$.value), fetchActualMatchingMatch(matchId, true));
             }
+            successActions.push(undoReversalSnackbar(results, vendorName));
             return from(successActions);
         }
         return of(undoReversalAccrualsFailure({
             matchId,
             status: response.status,
-        }));
+        }), undoReversalSnackbar([], vendorName));
     }), catchError((error) => of(undoReversalAccrualsFailure({
         matchId,
         status: createZeniAPIStatus('Unexpected Error', 'Undo reversal accruals REST API call errored out' +
             JSON.stringify(error)),
-    }))), takeUntil(actions$.pipe(filter(clearAll.match))));
+    }), undoReversalSnackbar([], vendorName))), takeUntil(actions$.pipe(filter(clearAll.match))));
 }));

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

@@ -315,13 +315,13 @@ const expenseAutomationActualMatchingView = createSlice({
                     error: undefined,
                 };
             },
-            prepare(transactionId, transactionIntegrationId, transactionType, lineId, transactionSyncToken, accrualIds) {
+            prepare(transactionId, transactionIntegrationId, transactionType, lineIds, transactionSyncToken, accrualIds) {
                 return {
                     payload: {
                         transactionId,
                         transactionIntegrationId,
                         transactionType,
-                        lineId,
+                        lineIds,
                         transactionSyncToken,
                         accrualIds,
                     },

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

@@ -110,12 +110,32 @@ function collectGroupedMembers(members) {
         serviceMonth: member.serviceMonth,
     }));
 }
+function collectLeftoverMembers(leftovers) {
+    if (leftovers == null || leftovers.length === 0) {
+        return undefined;
+    }
+    return leftovers.map((member) => ({
+        accrualId: member.accrualId,
+        estimatedAmount: member.estimatedAmount,
+        jeDebitAccountName: member.jeDebitAccountName,
+        memo: member.memo,
+        serviceMonth: member.serviceMonth,
+    }));
+}
 function toActualMatchingRow(match) {
     const firstMember = match.members[0];
     if (firstMember == null) {
         throw new Error('Actual matching row requires at least one member');
     }
     const first = toMatchModalAccrual(firstMember);
+    const leftoverMembers = match.leftovers ?? [];
+    const fromCleared = firstMember.cleared?.intendedAccrualIds;
+    const intendedAccrualIds = fromCleared != null && fromCleared.length > 0
+        ? fromCleared
+        : [
+            ...match.members.map((member) => member.accrualId),
+            ...leftoverMembers.map((leftover) => leftover.accrualId),
+        ];
     return {
         ...first,
         matchId: match.matchId,
@@ -128,6 +148,8 @@ function toActualMatchingRow(match) {
         transactionDate: match.transactionDate,
         groupedAccrualIds: match.members.map((member) => member.accrualId),
         groupedMembers: collectGroupedMembers(match.members),
+        intendedAccrualIds,
+        leftovers: collectLeftoverMembers(match.leftovers),
         reversalDate: getActualMatchingReversalDate(first),
         vendorName: match.vendorName != null && match.vendorName !== ''
             ? match.vendorName
@@ -320,7 +342,11 @@ export function getExpenseAutomationActualMatchingView(state) {
         ...(openedMatch?.members ?? []),
         ...(openedMatch?.leftovers ?? []),
     ].map(toMatchModalAccrual);
-    const firstSuggestion = openedMatch?.members[0]?.matchSuggestion;
+    const firstMember = openedMatch?.members[0];
+    const cleared = firstMember?.cleared;
+    const suggestion = firstMember?.matchSuggestion;
+    const stamp = cleared ?? suggestion;
+    const consumedLineIds = cleared?.consumedLineIds;
     const prefill = openedMatch == null
         ? undefined
         : {
@@ -329,8 +355,11 @@ export function getExpenseAutomationActualMatchingView(state) {
                 ...(openedMatch.leftovers ?? []).map((leftover) => leftover.accrualId),
             ],
             actualAmount: openedMatch.actualAmount.amount,
-            matchedLineId: firstSuggestion?.matchedLineId,
-            matchedTransactionId: firstSuggestion?.matchedTransactionId,
+            matchedTransactionId: stamp?.matchedTransactionId,
+            matchedLineId: cleared == null ? suggestion?.matchedLineId : undefined,
+            ...(consumedLineIds != null && consumedLineIds.length > 0
+                ? { consumedLineIds }
+                : {}),
         };
     return {
         fetchState,

package/lib/view/expenseAutomationView/epics/actualMatching/matchAndReverseAccrualsEpic.d.ts

@@ -1,8 +1,9 @@
 import { ActionsObservable, StateObservable } from 'redux-observable';
 import { Observable } from 'rxjs';
+import { openSnackbar } from '../../../../entity/snackbar/snackbarReducer';
 import { clearAll } from '../../../../rootActions';
 import { RootState } from '../../../../rootStateTypes';
 import { ZeniAPI } from '../../../../zeniAPI';
 import { clearMatchNewModal, fetchActualMatching, matchAndReverseAccruals, matchAndReverseAccrualsFailure, matchAndReverseAccrualsSuccess } from '../../reducers/actualMatchingViewReducer';
-export type ActionType = ReturnType<typeof clearAll> | ReturnType<typeof clearMatchNewModal> | ReturnType<typeof fetchActualMatching> | ReturnType<typeof matchAndReverseAccruals> | ReturnType<typeof matchAndReverseAccrualsFailure> | ReturnType<typeof matchAndReverseAccrualsSuccess>;
+export type ActionType = ReturnType<typeof clearAll> | ReturnType<typeof clearMatchNewModal> | ReturnType<typeof fetchActualMatching> | ReturnType<typeof matchAndReverseAccruals> | ReturnType<typeof matchAndReverseAccrualsFailure> | ReturnType<typeof matchAndReverseAccrualsSuccess> | ReturnType<typeof openSnackbar>;
 export declare const matchAndReverseAccrualsEpic: (actions$: ActionsObservable<ActionType>, state$: StateObservable<RootState>, zeniAPI: ZeniAPI) => Observable<ActionType>;

package/lib/view/expenseAutomationView/epics/actualMatching/matchAndReverseAccrualsEpic.js

@@ -3,50 +3,89 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.matchAndReverseAccrualsEpic = void 0;
 const rxjs_1 = require("rxjs");
 const operators_1 = require("rxjs/operators");
+const actualMatchingSelector_1 = require("../../../../entity/actualMatching/actualMatchingSelector");
+const snackbarReducer_1 = require("../../../../entity/snackbar/snackbarReducer");
 const responsePayload_1 = require("../../../../responsePayload");
 const rootActions_1 = require("../../../../rootActions");
 const actualMatchingPayload_1 = require("../../payload/actualMatchingPayload");
 const actualMatchingViewReducer_1 = require("../../reducers/actualMatchingViewReducer");
 const refreshActualMatchingList_1 = require("./refreshActualMatchingList");
+function isMatchCompleteStatus(status) {
+    return status === 'reversed' || status === 'noop';
+}
+function matchAndReverseSnackbar(results, vendorName) {
+    const completeCount = results.filter((result) => isMatchCompleteStatus(result.status)).length;
+    const failedCount = results.length - completeCount;
+    const variables = [
+        { variableName: '_count_', variableValue: String(completeCount) },
+        { variableName: '_vendor_name_', variableValue: vendorName },
+    ];
+    if (results.length > 0 && failedCount === 0) {
+        return (0, snackbarReducer_1.openSnackbar)({
+            messageSection: 'actual_matching_match_and_reverse',
+            messageText: 'success',
+            type: 'success',
+            variables,
+        });
+    }
+    if (completeCount > 0 && failedCount > 0) {
+        return (0, snackbarReducer_1.openSnackbar)({
+            messageSection: 'actual_matching_match_and_reverse',
+            messageText: 'notification',
+            type: 'warning',
+            variables,
+        });
+    }
+    return (0, snackbarReducer_1.openSnackbar)({
+        messageSection: 'actual_matching_match_and_reverse',
+        messageText: 'failed',
+        type: 'error',
+        variables,
+    });
+}
+function matchVendorName(state, matchId) {
+    return (0, actualMatchingSelector_1.getActualMatchingMatchById)(state.actualMatchingState, matchId)?.vendorName ?? '';
+}
 const matchAndReverseAccrualsEpic = (actions$, state$, zeniAPI) => actions$.pipe((0, operators_1.filter)(actualMatchingViewReducer_1.matchAndReverseAccruals.match), 
 // Posts reversing JEs; drop duplicate clicks while a request is in flight.
 (0, operators_1.exhaustMap)((action) => {
-    const { transactionId, transactionIntegrationId, transactionType, lineId, accrualIds, transactionSyncToken, } = action.payload;
+    const { transactionId, transactionIntegrationId, transactionType, lineIds, accrualIds, transactionSyncToken, } = action.payload;
     const body = {
         transaction_id: transactionId,
         transaction_integration_id: transactionIntegrationId,
         transaction_type: transactionType,
-        line_id: lineId,
+        line_ids: lineIds,
         transaction_sync_token: transactionSyncToken,
         accrual_ids: accrualIds,
     };
+    const openedFromMatchId = state$.value.expenseAutomationActualMatchingViewState.matchModal
+        .openedFromMatchId;
+    const matchId = openedFromMatchId ?? `${transactionType}:${transactionIntegrationId}`;
+    const vendorName = matchVendorName(state$.value, matchId);
     return zeniAPI
         .postAndGetJSON(`${zeniAPI.apiEndPoints.accountMicroServiceBaseUrl}/1.0/accruals/match-and-reverse`, body)
         .pipe((0, operators_1.mergeMap)((response) => {
         if ((0, responsePayload_1.isSuccessResponse)(response) && response.data != null) {
             const results = response.data.results.map(actualMatchingPayload_1.toMatchAndReverseResult);
-            const openedFromMatchId = state$.value.expenseAutomationActualMatchingViewState.matchModal
-                .openedFromMatchId;
-            const matchId = openedFromMatchId ??
-                `${transactionType}:${transactionIntegrationId}`;
             const successActions = [
                 (0, actualMatchingViewReducer_1.matchAndReverseAccrualsSuccess)({ matchId, results }),
             ];
-            const occupancyChanged = results.some((result) => result.status === 'reversed' || result.status === 'noop');
+            const occupancyChanged = results.some((result) => isMatchCompleteStatus(result.status));
             const allComplete = results.length > 0 &&
-                results.every((result) => result.status === 'reversed' || result.status === 'noop');
+                results.every((result) => isMatchCompleteStatus(result.status));
             if (occupancyChanged) {
                 successActions.push(...(0, refreshActualMatchingList_1.refreshActualMatchingList)(state$.value));
             }
+            successActions.push(matchAndReverseSnackbar(results, vendorName));
             if (allComplete) {
                 successActions.push((0, actualMatchingViewReducer_1.clearMatchNewModal)());
             }
             return (0, rxjs_1.from)(successActions);
         }
-        return (0, rxjs_1.of)((0, actualMatchingViewReducer_1.matchAndReverseAccrualsFailure)({ status: response.status }));
+        return (0, rxjs_1.of)((0, actualMatchingViewReducer_1.matchAndReverseAccrualsFailure)({ status: response.status }), matchAndReverseSnackbar([], vendorName));
     }), (0, operators_1.catchError)((error) => (0, rxjs_1.of)((0, actualMatchingViewReducer_1.matchAndReverseAccrualsFailure)({
         status: (0, responsePayload_1.createZeniAPIStatus)('Unexpected Error', 'Match and reverse accruals REST API call errored out' +
             JSON.stringify(error)),
-    }))), (0, operators_1.takeUntil)(actions$.pipe((0, operators_1.filter)(rootActions_1.clearAll.match))));
+    }), matchAndReverseSnackbar([], vendorName))), (0, operators_1.takeUntil)(actions$.pipe((0, operators_1.filter)(rootActions_1.clearAll.match))));
 }));
 exports.matchAndReverseAccrualsEpic = matchAndReverseAccrualsEpic;

package/lib/view/expenseAutomationView/epics/actualMatching/undoReversalAccrualsEpic.d.ts

@@ -1,8 +1,9 @@
 import { ActionsObservable, StateObservable } from 'redux-observable';
 import { Observable } from 'rxjs';
+import { openSnackbar } from '../../../../entity/snackbar/snackbarReducer';
 import { clearAll } from '../../../../rootActions';
 import { RootState } from '../../../../rootStateTypes';
 import { ZeniAPI } from '../../../../zeniAPI';
 import { fetchActualMatching, fetchActualMatchingMatch, undoReversalAccruals, undoReversalAccrualsFailure, undoReversalAccrualsSuccess } from '../../reducers/actualMatchingViewReducer';
-export type ActionType = ReturnType<typeof clearAll> | ReturnType<typeof fetchActualMatching> | ReturnType<typeof fetchActualMatchingMatch> | ReturnType<typeof undoReversalAccruals> | ReturnType<typeof undoReversalAccrualsFailure> | ReturnType<typeof undoReversalAccrualsSuccess>;
+export type ActionType = ReturnType<typeof clearAll> | ReturnType<typeof fetchActualMatching> | ReturnType<typeof fetchActualMatchingMatch> | ReturnType<typeof openSnackbar> | ReturnType<typeof undoReversalAccruals> | ReturnType<typeof undoReversalAccrualsFailure> | ReturnType<typeof undoReversalAccrualsSuccess>;
 export declare const undoReversalAccrualsEpic: (actions$: ActionsObservable<ActionType>, state$: StateObservable<RootState>, zeniAPI: ZeniAPI) => Observable<ActionType>;

package/lib/view/expenseAutomationView/epics/actualMatching/undoReversalAccrualsEpic.js

@@ -3,18 +3,55 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.undoReversalAccrualsEpic = void 0;
 const rxjs_1 = require("rxjs");
 const operators_1 = require("rxjs/operators");
+const actualMatchingSelector_1 = require("../../../../entity/actualMatching/actualMatchingSelector");
+const snackbarReducer_1 = require("../../../../entity/snackbar/snackbarReducer");
 const responsePayload_1 = require("../../../../responsePayload");
 const rootActions_1 = require("../../../../rootActions");
 const actualMatchingPayload_1 = require("../../payload/actualMatchingPayload");
 const actualMatchingViewReducer_1 = require("../../reducers/actualMatchingViewReducer");
 const refreshActualMatchingList_1 = require("./refreshActualMatchingList");
+function undoReversalSnackbar(results, vendorName) {
+    const undoneCount = results.filter((result) => result.status === 'undone').length;
+    const failedCount = results.length - undoneCount;
+    const variables = [
+        { variableName: '_count_', variableValue: String(undoneCount) },
+        { variableName: '_vendor_name_', variableValue: vendorName },
+    ];
+    if (results.length > 0 && failedCount === 0) {
+        return (0, snackbarReducer_1.openSnackbar)({
+            messageSection: 'actual_matching_undo_reversal',
+            messageText: 'success',
+            type: 'success',
+            variables,
+        });
+    }
+    if (undoneCount > 0 && failedCount > 0) {
+        return (0, snackbarReducer_1.openSnackbar)({
+            messageSection: 'actual_matching_undo_reversal',
+            messageText: 'notification',
+            type: 'warning',
+            variables,
+        });
+    }
+    return (0, snackbarReducer_1.openSnackbar)({
+        messageSection: 'actual_matching_undo_reversal',
+        messageText: 'failed',
+        type: 'error',
+        variables,
+    });
+}
+function matchVendorName(state, matchId) {
+    return ((0, actualMatchingSelector_1.getActualMatchingMatchById)(state.actualMatchingState, matchId)?.vendorName ??
+        '');
+}
 const undoReversalAccrualsEpic = (actions$, state$, zeniAPI) => actions$.pipe((0, operators_1.filter)(actualMatchingViewReducer_1.undoReversalAccruals.match), 
-// Posts QBO deletes; drop duplicate clicks while a request is in flight.
+// Posts QBO deletes; drop duplicate clicks while the first request is in flight.
 (0, operators_1.exhaustMap)((action) => {
     const { accrualIds, matchId } = action.payload;
     const body = {
         accrual_ids: accrualIds,
     };
+    const vendorName = matchVendorName(state$.value, matchId);
     return zeniAPI
         .postAndGetJSON(`${zeniAPI.apiEndPoints.accountMicroServiceBaseUrl}/1.0/accruals/undo-reversal`, body)
         .pipe((0, operators_1.mergeMap)((response) => {
@@ -27,16 +64,17 @@ const undoReversalAccrualsEpic = (actions$, state$, zeniAPI) => actions$.pipe((0
             if (anyUndone) {
                 successActions.push(...(0, refreshActualMatchingList_1.refreshActualMatchingList)(state$.value), (0, actualMatchingViewReducer_1.fetchActualMatchingMatch)(matchId, true));
             }
+            successActions.push(undoReversalSnackbar(results, vendorName));
             return (0, rxjs_1.from)(successActions);
         }
         return (0, rxjs_1.of)((0, actualMatchingViewReducer_1.undoReversalAccrualsFailure)({
             matchId,
             status: response.status,
-        }));
+        }), undoReversalSnackbar([], vendorName));
     }), (0, operators_1.catchError)((error) => (0, rxjs_1.of)((0, actualMatchingViewReducer_1.undoReversalAccrualsFailure)({
         matchId,
         status: (0, responsePayload_1.createZeniAPIStatus)('Unexpected Error', 'Undo reversal accruals REST API call errored out' +
             JSON.stringify(error)),
-    }))), (0, operators_1.takeUntil)(actions$.pipe((0, operators_1.filter)(rootActions_1.clearAll.match))));
+    }), undoReversalSnackbar([], vendorName))), (0, operators_1.takeUntil)(actions$.pipe((0, operators_1.filter)(rootActions_1.clearAll.match))));
 }));
 exports.undoReversalAccrualsEpic = undoReversalAccrualsEpic;

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" | "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" | "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" | "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" | "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" | "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" | "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";
+    messageSection: "common" | "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" | "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" | "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" | "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" | "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" | "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";
     messageText: "notification" | "failed" | "success";
     type: "error" | "success" | "info";
     variables: {

package/lib/view/expenseAutomationView/payload/actualMatchingPayload.d.ts

@@ -50,7 +50,7 @@ export type MatchTransactionSearchResponse = ZeniAPIResponse<MatchTransactionSea
 export declare function toActualMatchingTransactionSearchResult(payload: MatchTransactionSearchResultPayload, fallbackCurrency?: DisplayCurrencyFallback): ActualMatchingTransactionSearchResult;
 export interface MatchAndReverseRequestPayload {
     accrual_ids: ID[];
-    line_id: string;
+    line_ids: ID[];
     transaction_id: ID;
     transaction_integration_id: string;
     transaction_sync_token: string;

package/lib/view/expenseAutomationView/reducers/actualMatchingViewReducer.d.ts

@@ -31,11 +31,11 @@ export declare const clearActualMatchingView: import("@reduxjs/toolkit").ActionC
     matchIds: ActualMatchingMatchId[];
     refreshViewInBackground: boolean;
     selectedPeriod: MonthYearPeriod;
-}, "expenseAutomationActualMatchingView/fetchActualMatchingSuccess">, matchAndReverseAccruals: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[transactionId: string, transactionIntegrationId: string, transactionType: string, lineId: string, transactionSyncToken: string, accrualIds: string[]], {
+}, "expenseAutomationActualMatchingView/fetchActualMatchingSuccess">, matchAndReverseAccruals: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[transactionId: string, transactionIntegrationId: string, transactionType: string, lineIds: string[], transactionSyncToken: string, accrualIds: string[]], {
     transactionId: string;
     transactionIntegrationId: string;
     transactionType: string;
-    lineId: string;
+    lineIds: string[];
     transactionSyncToken: string;
     accrualIds: string[];
 }, "expenseAutomationActualMatchingView/matchAndReverseAccruals", never, never>, matchAndReverseAccrualsFailure: import("@reduxjs/toolkit").ActionCreatorWithPayload<{

package/lib/view/expenseAutomationView/reducers/actualMatchingViewReducer.js

@@ -319,13 +319,13 @@ const expenseAutomationActualMatchingView = (0, toolkit_1.createSlice)({
                     error: undefined,
                 };
             },
-            prepare(transactionId, transactionIntegrationId, transactionType, lineId, transactionSyncToken, accrualIds) {
+            prepare(transactionId, transactionIntegrationId, transactionType, lineIds, transactionSyncToken, accrualIds) {
                 return {
                     payload: {
                         transactionId,
                         transactionIntegrationId,
                         transactionType,
-                        lineId,
+                        lineIds,
                         transactionSyncToken,
                         accrualIds,
                     },

package/lib/view/expenseAutomationView/selectorTypes/actualMatchingViewSelectorTypes.d.ts

@@ -19,6 +19,8 @@ export interface ActualMatchingRow extends JEOneTimeAccrual {
     matchId: string;
     groupedAccrualIds?: ID[];
     groupedMembers?: ActualMatchingGroupedAccrual[];
+    intendedAccrualIds?: ID[];
+    leftovers?: ActualMatchingGroupedAccrual[];
     matchShape?: string;
     matchTier?: string;
     reversalDate?: ZeniDate;
@@ -69,6 +71,7 @@ export interface ActualMatchingMatchModalView {
     prefill?: {
         selectedAccrualIds: ID[];
         actualAmount?: number;
+        consumedLineIds?: ID[];
         matchedLineId?: string;
         matchedTransactionId?: string;
     };

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

@@ -128,12 +128,32 @@ function collectGroupedMembers(members) {
         serviceMonth: member.serviceMonth,
     }));
 }
+function collectLeftoverMembers(leftovers) {
+    if (leftovers == null || leftovers.length === 0) {
+        return undefined;
+    }
+    return leftovers.map((member) => ({
+        accrualId: member.accrualId,
+        estimatedAmount: member.estimatedAmount,
+        jeDebitAccountName: member.jeDebitAccountName,
+        memo: member.memo,
+        serviceMonth: member.serviceMonth,
+    }));
+}
 function toActualMatchingRow(match) {
     const firstMember = match.members[0];
     if (firstMember == null) {
         throw new Error('Actual matching row requires at least one member');
     }
     const first = toMatchModalAccrual(firstMember);
+    const leftoverMembers = match.leftovers ?? [];
+    const fromCleared = firstMember.cleared?.intendedAccrualIds;
+    const intendedAccrualIds = fromCleared != null && fromCleared.length > 0
+        ? fromCleared
+        : [
+            ...match.members.map((member) => member.accrualId),
+            ...leftoverMembers.map((leftover) => leftover.accrualId),
+        ];
     return {
         ...first,
         matchId: match.matchId,
@@ -146,6 +166,8 @@ function toActualMatchingRow(match) {
         transactionDate: match.transactionDate,
         groupedAccrualIds: match.members.map((member) => member.accrualId),
         groupedMembers: collectGroupedMembers(match.members),
+        intendedAccrualIds,
+        leftovers: collectLeftoverMembers(match.leftovers),
         reversalDate: getActualMatchingReversalDate(first),
         vendorName: match.vendorName != null && match.vendorName !== ''
             ? match.vendorName
@@ -338,7 +360,11 @@ function getExpenseAutomationActualMatchingView(state) {
         ...(openedMatch?.members ?? []),
         ...(openedMatch?.leftovers ?? []),
     ].map(toMatchModalAccrual);
-    const firstSuggestion = openedMatch?.members[0]?.matchSuggestion;
+    const firstMember = openedMatch?.members[0];
+    const cleared = firstMember?.cleared;
+    const suggestion = firstMember?.matchSuggestion;
+    const stamp = cleared ?? suggestion;
+    const consumedLineIds = cleared?.consumedLineIds;
     const prefill = openedMatch == null
         ? undefined
         : {
@@ -347,8 +373,11 @@ function getExpenseAutomationActualMatchingView(state) {
                 ...(openedMatch.leftovers ?? []).map((leftover) => leftover.accrualId),
             ],
             actualAmount: openedMatch.actualAmount.amount,
-            matchedLineId: firstSuggestion?.matchedLineId,
-            matchedTransactionId: firstSuggestion?.matchedTransactionId,
+            matchedTransactionId: stamp?.matchedTransactionId,
+            matchedLineId: cleared == null ? suggestion?.matchedLineId : undefined,
+            ...(consumedLineIds != null && consumedLineIds.length > 0
+                ? { consumedLineIds }
+                : {}),
         };
     return {
         fetchState,

package/lib/view/expenseAutomationView/types/actualMatchingViewState.d.ts

@@ -51,7 +51,7 @@ export interface MatchAndReverseResult {
 }
 export interface MatchAndReverseAccrualsParams {
     accrualIds: ID[];
-    lineId: string;
+    lineIds: ID[];
     transactionId: ID;
     transactionIntegrationId: string;
     transactionSyncToken: string;

package/package.json

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