@zeniai/client-epic-state 4.19.60 → 4.19.61

package/lib/view/expenseAutomationView/epics/accountRecon/deleteAccountStatementEpic.js

@@ -10,7 +10,7 @@ const responsePayload_1 = require("../../../../responsePayload");
 const reconciliationViewReducer_1 = require("../../reducers/reconciliationViewReducer");
 const deleteAccountStatementEpic = (actions$, _state$, zeniAPI) => actions$.pipe((0, operators_1.filter)(reconciliationViewReducer_1.deleteAccountStatement.match), (0, operators_1.switchMap)((action) => {
     const { accountId, selectedPeriod, statementUploadId, fileId } = action.payload;
-    const request = zeniAPI.deleteAndGetJSON(`${zeniAPI.apiEndPoints.reconciliationMicroServiceBaseUrl}/1.0/reconciliation/bank-statements/${statementUploadId}`);
+    const request = zeniAPI.deleteAndGetJSON(`${zeniAPI.apiEndPoints.reconciliationMicroServiceBaseUrl}/1.0/reconciliation/statements/${statementUploadId}`);
     return request.pipe((0, operators_1.mergeMap)((response) => {
         if ((0, responsePayload_1.isSuccessResponse)(response)) {
             const actions = [];

package/lib/view/expenseAutomationView/epics/accountRecon/saveReconciliationReviewEpic.js

@@ -36,6 +36,7 @@ const saveReconciliationReviewEpic = (actions$, state$, zeniAPI) => actions$.pip
         reconciliation_id: reconciliationId ?? '',
         ref_account_id: selectedAccountId,
         ref_account_name: reconciliationData?.account.accountName,
+        ref_account_type: reconciliationData?.account.accountType,
     };
     let payload = {};
     if (reconciliationData != null &&

package/lib/view/expenseAutomationView/epics/accountRecon/uploadAccountStatementDocumentAIHelper.js

@@ -8,7 +8,7 @@ const cross_fetch_1 = __importDefault(require("cross-fetch"));
 const init_1 = require("../../../../init");
 async function uploadAccountStatementIntoDocumentAI(accountType, fileBlob, authParams) {
     let statementUpload;
-    const urlEndPoint = `${init_1.zeniAPI.apiEndPoints.documentAIMicroServiceBaseUrl}/1.0/processors/bank-statement`;
+    const urlEndPoint = `${init_1.zeniAPI.apiEndPoints.documentAIMicroServiceBaseUrl}/1.0/processors/statement`;
     const data = new FormData();
     data.append('attachment_file_0', fileBlob);
     const attachment_json = JSON.stringify({

package/lib/view/expenseAutomationView/epics/accountRecon/uploadAccountStatementEpic.js

@@ -21,14 +21,16 @@ const uploadAccountStatementEpic = (actions$, state$, zeniAPI) => actions$.pipe(
             error: (0, responsePayload_1.createZeniAPIStatus)('Unexpected Error', 'Account not found'),
         }));
     }
+    const statementType = accountBase.accountType == 'credit_card' ? 'card' : 'bank';
     const requestPayload = {
         account_id: accountId,
         statement_start_date: start.toString(),
         statement_end_date: end.toString(),
         processor_run_id: payload.processor_run_id,
         file_id: payload.files[0].file_id,
+        statement_type: statementType,
     };
-    const uploadAccountStatementApi$ = zeniAPI.postAndGetJSON(`${zeniAPI.apiEndPoints.reconciliationMicroServiceBaseUrl}/1.0/reconciliation/bank-statements`, requestPayload);
+    const uploadAccountStatementApi$ = zeniAPI.postAndGetJSON(`${zeniAPI.apiEndPoints.reconciliationMicroServiceBaseUrl}/1.0/reconciliation/statements`, requestPayload);
     return uploadAccountStatementApi$.pipe((0, operators_1.mergeMap)((response) => {
         if ((0, responsePayload_1.isSuccessResponse)(response) === true && response.data != null) {
             const actions = [];

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

@@ -7,15 +7,14 @@ const timePeriod_1 = require("../../../../commonStateTypes/timePeriod");
 const tenantSelector_1 = require("../../../../entity/tenant/tenantSelector");
 const transactionsViewReducer_1 = require("../../reducers/transactionsViewReducer");
 const triggerReviewTabRefetchEpic = (actions$, state$) => actions$.pipe((0, operators_1.filter)(transactionsViewReducer_1.syncTransactionCategorizationFromDetailSave.match), (0, operators_1.mergeMap)((action) => {
-    const { pendingReviewLineIds, transactionId, isUncategorizedExpenseCategoryEnabled } = action.payload;
+    const { pendingReviewLineIds, transactionId, isUncategorizedExpenseCategoryEnabled, } = action.payload;
     if (pendingReviewLineIds.length === 0) {
         return rxjs_1.EMPTY;
     }
     const state = state$.value;
     // Only trigger when the transaction was auto-only (not in review tab after reducer ran)
     const reviewLocalData = state.expenseAutomationTransactionsViewState
-        .transactionCategorizationView.review
-        .transactionReviewLocalDataById[transactionId.id];
+        .transactionCategorizationView.review.transactionReviewLocalDataById[transactionId.id];
     if (reviewLocalData != null) {
         return rxjs_1.EMPTY;
     }

package/lib/view/expenseAutomationView/helpers/transactionCategorizationLocalDataHelper.js

@@ -46,8 +46,8 @@ const filterAutoTabLineItems = (tabView, transactionId, updatedTransaction) => {
     if (localData == null) {
         return;
     }
-    const currentAutoLineIds = localData.transactionReviewLocalData.tabSpecificLineItems
-        .autoCategorized ?? [];
+    const currentAutoLineIds = localData.transactionReviewLocalData.tabSpecificLineItems.autoCategorized ??
+        [];
     const linesById = new Map(updatedTransaction.lines?.map((l) => [l.id, l]));
     const retainedLineIds = currentAutoLineIds.filter((lineId) => {
         const line = linesById.get(lineId);

package/lib/view/onboardingView/customerView/onboardingCustomerViewSelector.js

@@ -230,11 +230,11 @@ function isCompanyDetailsSavePending(fileState, company, primaryContact, company
     }
     const { companyInfo, incInfo, taxInfo, questionaire } = company.company.company;
     const { companyDescription, companyLegalName, companyUrl, phone } = companyInfo;
-    const { fileIds, companyIncDate: incDate, companyIncType } = incInfo;
+    const { fileIds, companyIncDate: incDate, companyIncState, companyIncType, companySourceOfFunds, companySourceOfFundsDescription, companySubIndustry, countriesOfOperations, transactionVolume, transactionVolumeDescription, purposeOfAccount, purposeOfAccountDescription, regulatedStatus, regulatedStatusDescription, usNexus, usNexusTypes, } = incInfo;
     const { companyIndustry } = questionaire;
     const { taxId } = taxInfo;
     const companyFileIds = (0, fileSelector_1.getFilesByFileIds)(fileState, fileIds).map((file) => file.fileId);
-    const { companyDescription: companyDescriptionLocalData, companyIndustry: companyIndustryLocalData, companyLegalName: companyLegalNameLocalData, taxIdOrEIN: taxIdLocalData, incDate: incDateLocalData, phone: companyPhoneLocalData, website: companyUrlLocalData, companyFiles: companyFilesLocalData, typeOfIncorporation: companyIncTypeLocalData, primaryContactLocalData, } = companyDetailsLocalData;
+    const { companyDescription: companyDescriptionLocalData, companyIndustry: companyIndustryLocalData, companyLegalName: companyLegalNameLocalData, taxIdOrEIN: taxIdLocalData, incDate: incDateLocalData, phone: companyPhoneLocalData, website: companyUrlLocalData, companyFiles: companyFilesLocalData, stateOfIncorporation: stateOfIncorporationLocalData, typeOfIncorporation: companyIncTypeLocalData, companySourceOfFunds: companySourceOfFundsLocalData, companySourceOfFundsDescription: companySourceOfFundsDescriptionLocalData, countriesOfOperations: countriesOfOperationsLocalData, companySubIndustry: companySubIndustryLocalData, transactionVolume: transactionVolumeLocalData, transactionVolumeDescription: transactionVolumeDescriptionLocalData, purposeOfAccount: purposeOfAccountLocalData, purposeOfAccountDescription: purposeOfAccountDescriptionLocalData, regulatedStatus: regulatedStatusLocalData, regulatedStatusDescription: regulatedStatusDescriptionLocalData, usNexus: usNexusLocalData, usNexusTypes: usNexusTypesLocalData, primaryContactLocalData, } = companyDetailsLocalData;
     const fileIdsLocalData = companyFilesLocalData.map((file) => file.fileId);
     if (primaryContact != null) {
         const { firstName, lastName, email } = primaryContact;
@@ -244,6 +244,10 @@ function isCompanyDetailsSavePending(fileState, company, primaryContact, company
             return true;
         }
     }
+    const countriesOfOperationsMatch = JSON.stringify(countriesOfOperations ?? []) ===
+        JSON.stringify(countriesOfOperationsLocalData ?? []);
+    const usNexusTypesMatch = JSON.stringify(usNexusTypes ?? []) ===
+        JSON.stringify(usNexusTypesLocalData ?? []);
     return (companyDescription != companyDescriptionLocalData ||
         companyIndustry != companyIndustryLocalData ||
         companyLegalName != companyLegalNameLocalData ||
@@ -251,7 +255,21 @@ function isCompanyDetailsSavePending(fileState, company, primaryContact, company
         incDate?.toString() != incDateLocalData?.toString() ||
         phone != companyPhoneLocalData ||
         companyUrl?.toString() != companyUrlLocalData?.toString() ||
+        companyIncState != stateOfIncorporationLocalData ||
+        companySourceOfFunds != companySourceOfFundsLocalData ||
+        companySourceOfFundsDescription !=
+            companySourceOfFundsDescriptionLocalData ||
+        !countriesOfOperationsMatch ||
         companyIncType != companyIncTypeLocalData ||
+        transactionVolume != transactionVolumeLocalData ||
+        transactionVolumeDescription != transactionVolumeDescriptionLocalData ||
+        purposeOfAccount != purposeOfAccountLocalData ||
+        purposeOfAccountDescription != purposeOfAccountDescriptionLocalData ||
+        regulatedStatus != regulatedStatusLocalData ||
+        regulatedStatusDescription != regulatedStatusDescriptionLocalData ||
+        usNexus != usNexusLocalData ||
+        !usNexusTypesMatch ||
+        companySubIndustry != companySubIndustryLocalData ||
         !(fileIdsLocalData.length === companyFileIds.length &&
             companyFileIds.every((fileId) => fileIdsLocalData.includes(fileId))));
 }

package/lib/view/spendManagement/billPay/billPaySetupApproverView/billPaySetupApproverViewReducer.d.ts

@@ -34,6 +34,6 @@ export declare const fetchBillPaySetupApproverView: import("@reduxjs/toolkit").A
     approvalRuleId: string | undefined;
 }, "billPaySetupApproverView/initializeBillPaySetupApproverViewUpdateData", never, never>, saveBillPaySetupApproverViewUpdateData: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[billPaySetupApproverViewUpdateData: Partial<ApprovalRuleUpdateData | ApprovalRuleCreateData>], {
     billPaySetupApproverViewUpdateData: Partial<ApprovalRuleUpdateData | ApprovalRuleCreateData>;
-}, "billPaySetupApproverView/saveBillPaySetupApproverViewUpdateData", never, never>, clearBillPaySetupApproverViewUpdateData: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<"billPaySetupApproverView/clearBillPaySetupApproverViewUpdateData">, clearBillPaySetupApproverView: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<"billPaySetupApproverView/clearBillPaySetupApproverView">;
+}, "billPaySetupApproverView/saveBillPaySetupApproverViewUpdateData", never, never>, clearBillPaySetupApproverViewUpdateData: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<"billPaySetupApproverView/clearBillPaySetupApproverViewUpdateData">, setListeningToPusherEvent: import("@reduxjs/toolkit").ActionCreatorWithPayload<boolean, "billPaySetupApproverView/setListeningToPusherEvent">, clearBillPaySetupApproverView: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<"billPaySetupApproverView/clearBillPaySetupApproverView">;
 declare const _default: import("redux").Reducer<BillPaySetupApproverViewState>;
 export default _default;

package/lib/view/spendManagement/billPay/billPaySetupApproverView/billPaySetupApproverViewReducer.js

@@ -1,11 +1,12 @@
 "use strict";
 var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.clearBillPaySetupApproverView = exports.clearBillPaySetupApproverViewUpdateData = exports.saveBillPaySetupApproverViewUpdateData = exports.initializeBillPaySetupApproverViewUpdateData = exports.saveBillPaySetupApproverViewUpdatesFailure = exports.saveBillPaySetupApproverViewUpdatesSuccess = exports.saveBillPaySetupApproverViewUpdates = exports.deleteBillPayApprovalRuleFailure = exports.deleteBillPayApprovalRuleSuccess = exports.deleteBillPayApprovalRule = exports.fetchBillPayApproversListFailure = exports.fetchBillPayApproversListSuccess = exports.fetchBillPayApproversList = exports.fetchBillPayApproversDetails = exports.fetchBillPaySetupApproverViewFailure = exports.fetchBillPaySetupApproverViewSuccess = exports.fetchBillPaySetupApproverView = exports.initialState = void 0;
+exports.clearBillPaySetupApproverView = exports.setListeningToPusherEvent = exports.clearBillPaySetupApproverViewUpdateData = exports.saveBillPaySetupApproverViewUpdateData = exports.initializeBillPaySetupApproverViewUpdateData = exports.saveBillPaySetupApproverViewUpdatesFailure = exports.saveBillPaySetupApproverViewUpdatesSuccess = exports.saveBillPaySetupApproverViewUpdates = exports.deleteBillPayApprovalRuleFailure = exports.deleteBillPayApprovalRuleSuccess = exports.deleteBillPayApprovalRule = exports.fetchBillPayApproversListFailure = exports.fetchBillPayApproversListSuccess = exports.fetchBillPayApproversList = exports.fetchBillPayApproversDetails = exports.fetchBillPaySetupApproverViewFailure = exports.fetchBillPaySetupApproverViewSuccess = exports.fetchBillPaySetupApproverView = exports.initialState = void 0;
 const toolkit_1 = require("@reduxjs/toolkit");
 exports.initialState = {
     fetchState: 'Not-Started',
     error: undefined,
+    listeningToPusherEvent: false,
     approverListState: {
         approverIds: [],
         attributes: [],
@@ -158,6 +159,12 @@ const billPaySetupApproverView = (0, toolkit_1.createSlice)({
             reducer(draft, action) {
                 const { approvalRuleIds } = action.payload;
                 if (draft.billPaySetupApproverViewUpdateData != null) {
+                    if (draft.billPaySetupApproverViewUpdateData.type ===
+                        'approval_update' &&
+                        draft.billPaySetupApproverViewUpdateData.data
+                            ?.isApplicableOnPendingApprovalEntity === true) {
+                        draft.listeningToPusherEvent = true;
+                    }
                     draft.billPaySetupApproverViewUpdateData.updateStatus = {
                         fetchState: 'Completed',
                         error: undefined,
@@ -218,6 +225,9 @@ const billPaySetupApproverView = (0, toolkit_1.createSlice)({
                 return { payload: { billPaySetupApproverViewUpdateData } };
             },
         },
+        setListeningToPusherEvent(draft, action) {
+            draft.listeningToPusherEvent = action.payload;
+        },
         clearBillPaySetupApproverViewUpdateData(draft) {
             if (draft.billPaySetupApproverViewUpdateData != null) {
                 draft.billPaySetupApproverViewUpdateData.data = undefined;
@@ -228,5 +238,5 @@ const billPaySetupApproverView = (0, toolkit_1.createSlice)({
         },
     },
 });
-_a = billPaySetupApproverView.actions, exports.fetchBillPaySetupApproverView = _a.fetchBillPaySetupApproverView, exports.fetchBillPaySetupApproverViewSuccess = _a.fetchBillPaySetupApproverViewSuccess, exports.fetchBillPaySetupApproverViewFailure = _a.fetchBillPaySetupApproverViewFailure, exports.fetchBillPayApproversDetails = _a.fetchBillPayApproversDetails, exports.fetchBillPayApproversList = _a.fetchBillPayApproversList, exports.fetchBillPayApproversListSuccess = _a.fetchBillPayApproversListSuccess, exports.fetchBillPayApproversListFailure = _a.fetchBillPayApproversListFailure, exports.deleteBillPayApprovalRule = _a.deleteBillPayApprovalRule, exports.deleteBillPayApprovalRuleSuccess = _a.deleteBillPayApprovalRuleSuccess, exports.deleteBillPayApprovalRuleFailure = _a.deleteBillPayApprovalRuleFailure, exports.saveBillPaySetupApproverViewUpdates = _a.saveBillPaySetupApproverViewUpdates, exports.saveBillPaySetupApproverViewUpdatesSuccess = _a.saveBillPaySetupApproverViewUpdatesSuccess, exports.saveBillPaySetupApproverViewUpdatesFailure = _a.saveBillPaySetupApproverViewUpdatesFailure, exports.initializeBillPaySetupApproverViewUpdateData = _a.initializeBillPaySetupApproverViewUpdateData, exports.saveBillPaySetupApproverViewUpdateData = _a.saveBillPaySetupApproverViewUpdateData, exports.clearBillPaySetupApproverViewUpdateData = _a.clearBillPaySetupApproverViewUpdateData, exports.clearBillPaySetupApproverView = _a.clearBillPaySetupApproverView;
+_a = billPaySetupApproverView.actions, exports.fetchBillPaySetupApproverView = _a.fetchBillPaySetupApproverView, exports.fetchBillPaySetupApproverViewSuccess = _a.fetchBillPaySetupApproverViewSuccess, exports.fetchBillPaySetupApproverViewFailure = _a.fetchBillPaySetupApproverViewFailure, exports.fetchBillPayApproversDetails = _a.fetchBillPayApproversDetails, exports.fetchBillPayApproversList = _a.fetchBillPayApproversList, exports.fetchBillPayApproversListSuccess = _a.fetchBillPayApproversListSuccess, exports.fetchBillPayApproversListFailure = _a.fetchBillPayApproversListFailure, exports.deleteBillPayApprovalRule = _a.deleteBillPayApprovalRule, exports.deleteBillPayApprovalRuleSuccess = _a.deleteBillPayApprovalRuleSuccess, exports.deleteBillPayApprovalRuleFailure = _a.deleteBillPayApprovalRuleFailure, exports.saveBillPaySetupApproverViewUpdates = _a.saveBillPaySetupApproverViewUpdates, exports.saveBillPaySetupApproverViewUpdatesSuccess = _a.saveBillPaySetupApproverViewUpdatesSuccess, exports.saveBillPaySetupApproverViewUpdatesFailure = _a.saveBillPaySetupApproverViewUpdatesFailure, exports.initializeBillPaySetupApproverViewUpdateData = _a.initializeBillPaySetupApproverViewUpdateData, exports.saveBillPaySetupApproverViewUpdateData = _a.saveBillPaySetupApproverViewUpdateData, exports.clearBillPaySetupApproverViewUpdateData = _a.clearBillPaySetupApproverViewUpdateData, exports.setListeningToPusherEvent = _a.setListeningToPusherEvent, exports.clearBillPaySetupApproverView = _a.clearBillPaySetupApproverView;
 exports.default = billPaySetupApproverView.reducer;

package/lib/view/spendManagement/billPay/billPaySetupApproverView/billPaySetupApproverViewSelector.js

@@ -12,7 +12,7 @@ const classSelector_1 = require("../../../../entity/class/classSelector");
 const userSelector_1 = require("../../../../entity/user/userSelector");
 const userRoleSelector_1 = require("../../../../entity/userRole/userRoleSelector");
 exports.getBillPaySetupApproverView = (0, toolkit_1.createSelector)((state) => state.billPaySetupApproverViewState, (state) => state.approvalRuleState, (state) => state.userState, (billPaySetupApproverViewState, approvalRuleState, userState) => {
-    const { approvalRulesDeleteStatusById, approvalRuleIds, fetchState, error } = billPaySetupApproverViewState;
+    const { approvalRulesDeleteStatusById, approvalRuleIds, fetchState, error, listeningToPusherEvent, } = billPaySetupApproverViewState;
     const deleteStateList = Object.values(approvalRulesDeleteStatusById);
     const approvalRules = (0, approvalRuleSelector_1.getApprovalRulesByIds)(approvalRuleState, approvalRuleIds);
     const allApprovalRules = approvalRules.map((approvalRule) => {
@@ -46,10 +46,11 @@ exports.getBillPaySetupApproverView = (0, toolkit_1.createSelector)((state) => s
         approvalRulesStatus,
         fetchState,
         error,
+        listeningToPusherEvent,
     };
 });
 exports.getBillPaySetupApproverUpdateDataView = (0, toolkit_1.createSelector)((state) => state.billPaySetupApproverViewState, (state) => state.approvalRuleState, (state) => state.userState, (state) => state.classState, (state) => state.classListState, (state) => state.userRoleState, (billPaySetupApproverViewState, approvalRuleState, userState, classState, classListState, userRoleState) => {
-    const { approvalRuleIds, approverListState, billPaySetupApproverViewUpdateData, fetchState, error, } = billPaySetupApproverViewState;
+    const { approvalRuleIds, approverListState, billPaySetupApproverViewUpdateData, fetchState, error, listeningToPusherEvent, } = billPaySetupApproverViewState;
     const { approverIds, attributes } = approverListState;
     const allApprovalRules = (0, approvalRuleSelector_1.getApprovalRulesByIds)(approvalRuleState, approvalRuleIds);
     const allApprovers = approverIds
@@ -102,5 +103,6 @@ exports.getBillPaySetupApproverUpdateDataView = (0, toolkit_1.createSelector)((s
         fetchState,
         allAccountingClasses,
         error,
+        listeningToPusherEvent,
     };
 });

package/lib/view/spendManagement/billPay/billPaySetupApproverView/billPaySetupApproverViewSelectorTypes.d.ts

@@ -17,6 +17,7 @@ export interface BillPaySetupApproverView extends SelectorView {
     allApprovalRules: ApprovalRuleWithUser[];
     approvalRulesStatus: AllowedValueWithCode;
     deleteStatus: FetchStateAndError;
+    listeningToPusherEvent?: boolean;
 }
 export interface BillPaySetupApproverUpdateDataView extends SelectorView {
     allAccountingClasses: Class[];
@@ -27,4 +28,5 @@ export interface BillPaySetupApproverUpdateDataView extends SelectorView {
     filteredApprovers: UserAndRole[];
     filteredAttributes: AttributeType[];
     billPaySetupApproverViewUpdateData?: ApproverViewUpdateData;
+    listeningToPusherEvent?: boolean;
 }

package/lib/view/spendManagement/billPay/billPaySetupApproverView/billPaySetupApproverViewState.d.ts

@@ -10,4 +10,5 @@ export interface BillPaySetupApproverViewState extends FetchedState {
         fetchStatus: FetchStateAndError;
     };
     billPaySetupApproverViewUpdateData?: ApproverViewUpdateData;
+    listeningToPusherEvent?: boolean;
 }

package/lib/view/spendManagement/billPay/billPaySetupApproverView/types/commonPayload.d.ts

@@ -13,6 +13,7 @@ interface ApproverViewStepPayload extends Omit<StepPayload, 'actors'> {
 interface ApprovalUpdatableInfoPayload {
     approval_rule_id: ID;
     criteria: CriteriaPayload[];
+    is_applicable_on_pending_approval_entity: boolean;
     steps: ApproverViewStepPayload[];
 }
 export declare const toApprovalChangableInfoPayload: (approverViewUpdateData: ApprovalRuleUpdateData | ApprovalRuleCreateData) => Partial<ApprovalUpdatableInfoPayload>;

package/lib/view/spendManagement/billPay/billPaySetupApproverView/types/commonPayload.js

@@ -36,12 +36,15 @@ const toApprovalChangableInfoPayload = (approverViewUpdateData) => {
             }),
         };
     });
+    const isUpdate = approverViewUpdateData.approvalRuleId != null;
     const payload = {
         criteria: criteriaPayload,
         steps,
     };
-    if (approverViewUpdateData.approvalRuleId != null) {
-        payload['approval_rule_id'] = approverViewUpdateData.approvalRuleId;
+    if (isUpdate) {
+        payload.approval_rule_id = approverViewUpdateData.approvalRuleId;
+        payload.is_applicable_on_pending_approval_entity =
+            approverViewUpdateData.isApplicableOnPendingApprovalEntity ?? false;
     }
     return payload;
 };

package/lib/view/spendManagement/billPay/billPaySetupApproverView/types/commonState.d.ts

@@ -10,8 +10,10 @@ export interface ApprovalRuleUpdateData {
     approvalRuleId: ID;
     criteria: Criteria;
     steps: Step[];
+    isApplicableOnPendingApprovalEntity?: boolean;
 }
 export interface ApprovalRuleCreateData {
     criteria: Criteria;
     steps: Step[];
+    isApplicableOnPendingApprovalEntity?: boolean;
 }

package/lib/view/spendManagement/chargeCards/chargeCardPaymentHistory/chargeCardPaymentHistory.d.ts

@@ -0,0 +1,50 @@
+import { FetchState, FetchedState, ID } from '../../../../commonStateTypes/common';
+import { Logo } from '../../../../entity/paymentAccount/paymentAccountState';
+import { ZeniDate } from '../../../../zeniDayJS';
+import { SpendManagementUIState } from '../../billPay/billList/billListState';
+import { CategoryCombinationOperator, FilterCategoryType } from '../../spendManagementFilterHelpers';
+export interface PaymentHistoryAccountInfo {
+    accountId: ID;
+    accountType: 'depositAccount' | 'paymentAccount';
+    depositAccountName: string;
+    accountLogo?: Logo;
+    depositAccountLast4?: string;
+}
+export type PaymentHistorySortKey = 'paymentDate' | 'sourceAccount' | 'paymentStatus' | 'initiatedBy' | 'amount';
+export interface PaymentHistoryUIState extends SpendManagementUIState {
+    sortKey: PaymentHistorySortKey;
+}
+export interface ChargeCardPaymentHistoryDownloadUIState {
+    downloadState: FetchState;
+}
+export interface ChargeCardPaymentHistoryState extends FetchedState {
+    creditAccountId: ID;
+    currencyCode: string;
+    currencySymbol: string;
+    downloadUIState: ChargeCardPaymentHistoryDownloadUIState;
+    filters: PaymentHistoryFilters;
+    isAutoPayEnabled: boolean;
+    repaymentHistoryIds: ID[];
+    repaymentHistoryXlsDownloadUrl: string;
+    searchText: string;
+    totalRepayments: number;
+    uiState: PaymentHistoryUIState;
+}
+export interface PaymentHistoryFilters {
+    categories: PaymentHistoryFilterCategory[];
+    categoryCombinationOperator: CategoryCombinationOperator;
+}
+export interface PaymentHistoryFilterCategory {
+    field: PaymentHistoryFilterCategoryField;
+    matchingOperator: 'equal' | 'not-equal';
+    values: (string | ZeniDate)[];
+    valuesCombinationOperator: 'ANY';
+}
+export type PaymentHistoryFilterCategoryField = 'repaymentDate' | 'sourceAccount' | 'status' | 'initiatedBy';
+export interface PaymentHistoryFilterCategoryDropdownOption {
+    value: PaymentHistoryFilterCategoryField;
+    multiple?: boolean;
+    type?: FilterCategoryType;
+}
+export declare const PAYMENT_HISTORY_FILTER_CATEGORIES: PaymentHistoryFilterCategoryDropdownOption[];
+export declare const initialChargeCardPaymentHistoryState: ChargeCardPaymentHistoryState;

package/lib/view/spendManagement/chargeCards/chargeCardPaymentHistory/chargeCardPaymentHistory.js

@@ -0,0 +1,35 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.initialChargeCardPaymentHistoryState = exports.PAYMENT_HISTORY_FILTER_CATEGORIES = void 0;
+exports.PAYMENT_HISTORY_FILTER_CATEGORIES = [
+    { value: 'repaymentDate', type: 'dateRange', multiple: true },
+    { value: 'sourceAccount', multiple: true, type: 'dropdown' },
+    { value: 'status', multiple: true, type: 'dropdown' },
+    { value: 'initiatedBy', multiple: true, type: 'dropdown' },
+];
+exports.initialChargeCardPaymentHistoryState = {
+    fetchState: 'Not-Started',
+    error: undefined,
+    creditAccountId: '',
+    currencyCode: 'USD',
+    currencySymbol: '$',
+    downloadUIState: {
+        downloadState: 'Not-Started',
+    },
+    filters: {
+        categories: [],
+        categoryCombinationOperator: 'AND',
+    },
+    isAutoPayEnabled: false,
+    repaymentHistoryIds: [],
+    searchText: '',
+    totalRepayments: 0,
+    repaymentHistoryXlsDownloadUrl: '',
+    uiState: {
+        sortKey: 'paymentDate',
+        sortOrder: 'ascending',
+    },
+    hasValidState() {
+        return this.fetchState === 'Completed';
+    },
+};

package/lib/view/spendManagement/chargeCards/chargeCardPaymentHistory/chargeCardPaymentHistoryDownloadSelector.d.ts

@@ -0,0 +1,8 @@
+import { SelectorView } from '../../../../commonStateTypes/viewAndReport/viewAndReport';
+import { RootState } from '../../../../reducer';
+import { ChargeCardRepaymentWithUser } from './chargeCardPaymentHistorySelector';
+export interface ChargeCardPaymentHistoryDownloadReport extends SelectorView {
+    reportTitle: string;
+    transactions: ChargeCardRepaymentWithUser[];
+}
+export declare const getChargeCardPaymentHistoryDownloadReport: (state: RootState) => ChargeCardPaymentHistoryDownloadReport;

package/lib/view/spendManagement/chargeCards/chargeCardPaymentHistory/chargeCardPaymentHistoryDownloadSelector.js

@@ -0,0 +1,26 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getChargeCardPaymentHistoryDownloadReport = void 0;
+const chargeCardRepaymentSelector_1 = require("../../../../entity/chargeCardRepayment/chargeCardRepaymentSelector");
+const userSelector_1 = require("../../../../entity/user/userSelector");
+const chargeCardPaymentHistoryHelpers_1 = require("./chargeCardPaymentHistoryHelpers");
+const getChargeCardPaymentHistoryDownloadReport = (state) => {
+    const { chargeCardPaymentHistoryState, chargeCardRepaymentState, userState } = state;
+    const { filters, repaymentHistoryIds, searchText, uiState, fetchState, error } = chargeCardPaymentHistoryState;
+    const repaymentHistory = (0, chargeCardRepaymentSelector_1.getChargeCardRepaymentByIds)(chargeCardRepaymentState, repaymentHistoryIds);
+    const repaymentHistoryUserIds = Array.from(new Set(repaymentHistory.map((r) => r.paidById)));
+    const repaymentHistoryUsers = (0, userSelector_1.getUsersByUserIds)(userState, repaymentHistoryUserIds);
+    const userMap = new Map(repaymentHistoryUsers.map((user) => [user.userId, user]));
+    const repaymentHistoryWithUsers = repaymentHistory.map((repayment) => ({
+        ...repayment,
+        paidByUser: userMap.get(repayment.paidById),
+    }));
+    const transactions = (0, chargeCardPaymentHistoryHelpers_1.applyPaymentHistoryFiltersSearchAndSort)(repaymentHistoryWithUsers, filters, searchText, uiState);
+    return {
+        reportTitle: 'Card Payment History',
+        fetchState,
+        error,
+        transactions,
+    };
+};
+exports.getChargeCardPaymentHistoryDownloadReport = getChargeCardPaymentHistoryDownloadReport;

package/lib/view/spendManagement/chargeCards/chargeCardPaymentHistory/chargeCardPaymentHistoryHelpers.d.ts

@@ -0,0 +1,7 @@
+import { ID } from '../../../../commonStateTypes/common';
+import { ChargeCardRepaymentStatusCodeType } from '../../../../entity/chargeCardRepayment/chargeCardRepayment';
+import { PaymentHistoryAccountInfo, PaymentHistoryFilters, PaymentHistoryUIState } from './chargeCardPaymentHistory';
+import type { ChargeCardRepaymentWithUser } from './chargeCardPaymentHistorySelector';
+export declare function getPaymentHistorySourceAccountName(repayment: ChargeCardRepaymentWithUser, accountInfoByAccountId?: Record<ID, PaymentHistoryAccountInfo>): string;
+export declare function getPaymentStatusDisplayText(status: ChargeCardRepaymentStatusCodeType): string;
+export declare function applyPaymentHistoryFiltersSearchAndSort(repayments: ChargeCardRepaymentWithUser[], filters: PaymentHistoryFilters, searchText: string, uiState: PaymentHistoryUIState, accountInfoByAccountId?: Record<ID, PaymentHistoryAccountInfo>): ChargeCardRepaymentWithUser[];

package/lib/view/spendManagement/chargeCards/chargeCardPaymentHistory/chargeCardPaymentHistoryHelpers.js

@@ -0,0 +1,87 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getPaymentHistorySourceAccountName = getPaymentHistorySourceAccountName;
+exports.getPaymentStatusDisplayText = getPaymentStatusDisplayText;
+exports.applyPaymentHistoryFiltersSearchAndSort = applyPaymentHistoryFiltersSearchAndSort;
+const orderBy_1 = __importDefault(require("lodash/orderBy"));
+const userSelector_1 = require("../../../../entity/user/userSelector");
+const spendManagementFilterHelpers_1 = require("../../spendManagementFilterHelpers");
+function getPaymentHistorySourceAccountName(repayment, accountInfoByAccountId) {
+    const fromMap = repayment.paymentAccountId != null
+        ? accountInfoByAccountId?.[repayment.paymentAccountId]?.depositAccountName
+        : undefined;
+    return fromMap ?? repayment.paymentAccountName ?? '';
+}
+function getPaymentStatusDisplayText(status) {
+    const statusMap = {
+        PendingReview: 'In Progress',
+        Pending: 'In Progress',
+        Sent: 'Complete',
+        Clear: 'Complete',
+        Rejected: 'Failed',
+        Returned: 'Failed',
+    };
+    return statusMap[status] ?? status;
+}
+function getPaymentHistorySortValue(repayment, sortKey, accountInfoByAccountId) {
+    switch (sortKey) {
+        case 'paymentDate':
+            return repayment.repaymentDate.valueOf();
+        case 'amount':
+            return repayment.amount.amount;
+        case 'paymentStatus':
+            return getPaymentStatusDisplayText(repayment.status);
+        case 'initiatedBy':
+            return repayment.repaymentType === 'scheduled'
+                ? 'autopay'
+                : (0, userSelector_1.getUserName)(repayment.paidByUser);
+        case 'sourceAccount':
+            return getPaymentHistorySourceAccountName(repayment, accountInfoByAccountId);
+        default:
+            return '';
+    }
+}
+function sortPaymentHistory(repayments, sortKey, sortOrder, accountInfoByAccountId) {
+    const getColumnWiseSortOrder = (sortOrder) => {
+        // Note: For date and amount fields, the sort order is intentionally inverted.
+        // This allows the UI to request 'ascending' sort to get the most recent dates
+        // or largest amounts first, which is a more intuitive default for users.
+        switch (sortKey) {
+            case 'sourceAccount':
+            case 'paymentStatus':
+            case 'initiatedBy':
+                return sortOrder === 'ascending' ? 'asc' : 'desc';
+            default:
+                return sortOrder === 'ascending' ? 'desc' : 'asc';
+        }
+    };
+    const order = getColumnWiseSortOrder(sortOrder);
+    return (0, orderBy_1.default)(repayments, (repayment) => getPaymentHistorySortValue(repayment, sortKey, accountInfoByAccountId), [order]);
+}
+function filterPaymentHistoryBySearchText(repayments, searchText, accountInfoByAccountId) {
+    const loweredSearchText = searchText.trim().toLowerCase();
+    if (loweredSearchText.length === 0) {
+        return repayments;
+    }
+    return repayments.filter((repayment) => {
+        const amountString = repayment.amount.amount.toString();
+        const statusString = getPaymentStatusDisplayText(repayment.status).toLowerCase();
+        const initiatedByString = repayment.repaymentType === 'scheduled'
+            ? 'autopay'
+            : (0, userSelector_1.getUserName)(repayment.paidByUser);
+        const accountNameString = getPaymentHistorySourceAccountName(repayment, accountInfoByAccountId).toLowerCase();
+        return (amountString.includes(loweredSearchText) ||
+            statusString.includes(loweredSearchText) ||
+            initiatedByString.toLowerCase().includes(loweredSearchText) ||
+            accountNameString.includes(loweredSearchText));
+    });
+}
+function applyPaymentHistoryFiltersSearchAndSort(repayments, filters, searchText, uiState, accountInfoByAccountId) {
+    let result = (0, spendManagementFilterHelpers_1.applyAdvancedFiltersOnList)('charge_card_payment_history', repayments, filters);
+    result = filterPaymentHistoryBySearchText(result, searchText, accountInfoByAccountId);
+    result = sortPaymentHistory(result, uiState.sortKey, uiState.sortOrder, accountInfoByAccountId);
+    return result;
+}

package/lib/view/spendManagement/chargeCards/chargeCardPaymentHistory/chargeCardPaymentHistoryPayload.d.ts

@@ -0,0 +1,13 @@
+import { ChargeCardRepaymentPayload } from '../../../../entity/chargeCardRepayment/chargeCardRepaymentPayload';
+import { ZeniAPIResponse } from '../../../../responsePayload';
+export interface ChargeCardPaymentHistoryPayload {
+    credit_account_id: string;
+    currency_code: string;
+    currency_symbol: string;
+    is_auto_pay_enabled: boolean;
+    repayment_history: RepaymentHistoryPayload[];
+    total_repayments: number;
+}
+type RepaymentHistoryPayload = Omit<ChargeCardRepaymentPayload, 'is_deleted' | 'provider_counterparty_account_id'>;
+export type FetchChargeCardPaymentHistoryResponse = ZeniAPIResponse<ChargeCardPaymentHistoryPayload>;
+export {};

package/lib/view/spendManagement/chargeCards/chargeCardPaymentHistory/chargeCardPaymentHistoryPayload.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/lib/view/spendManagement/chargeCards/chargeCardPaymentHistory/chargeCardPaymentHistoryReducer.d.ts

@@ -0,0 +1,19 @@
+import { ID } from '../../../../commonStateTypes/common';
+import { ZeniAPIStatus } from '../../../../responsePayload';
+import { ChargeCardPaymentHistoryDownloadUIState, ChargeCardPaymentHistoryState, PaymentHistoryFilters, PaymentHistoryUIState } from './chargeCardPaymentHistory';
+import { ChargeCardPaymentHistoryPayload } from './chargeCardPaymentHistoryPayload';
+export declare const initialState: ChargeCardPaymentHistoryState;
+export declare const addRepaymentToChargeCardPaymentHistory: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
+    cardRepaymentId: ID;
+    zeniCreditAccountId: ID;
+}, "chargeCardPaymentHistory/addRepaymentToChargeCardPaymentHistory">, fetchChargeCardPaymentPage: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[cacheOverride?: any], {
+    cacheOverride: any;
+}, "chargeCardPaymentHistory/fetchChargeCardPaymentPage", never, never>, fetchChargeCardPaymentHistory: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<"chargeCardPaymentHistory/fetchChargeCardPaymentHistory">, updateChargeCardPaymentHistory: import("@reduxjs/toolkit").ActionCreatorWithPayload<ChargeCardPaymentHistoryPayload, "chargeCardPaymentHistory/updateChargeCardPaymentHistory">, updateChargeCardPaymentHistoryFailure: import("@reduxjs/toolkit").ActionCreatorWithPayload<ZeniAPIStatus<Record<string, unknown>>, "chargeCardPaymentHistory/updateChargeCardPaymentHistoryFailure">, clearChargeCardPaymentHistory: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<"chargeCardPaymentHistory/clearChargeCardPaymentHistory">, updatePaymentHistoryFilters: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
+    filters: PaymentHistoryFilters;
+}, "chargeCardPaymentHistory/updatePaymentHistoryFilters">, updatePaymentHistorySearchText: import("@reduxjs/toolkit").ActionCreatorWithPayload<string, "chargeCardPaymentHistory/updatePaymentHistorySearchText">, updatePaymentHistoryDownloadUIState: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
+    uiState: Partial<ChargeCardPaymentHistoryDownloadUIState>;
+}, "chargeCardPaymentHistory/updatePaymentHistoryDownloadUIState">, updatePaymentHistoryUIState: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
+    uiState: Partial<PaymentHistoryUIState>;
+}, "chargeCardPaymentHistory/updatePaymentHistoryUIState">;
+declare const _default: import("redux").Reducer<ChargeCardPaymentHistoryState>;
+export default _default;