@zeniai/client-epic-state 4.19.54 → 4.19.55

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

@@ -0,0 +1,108 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getChargeCardPaymentHistoryView = void 0;
+const reduceFetchState_1 = require("../../../../commonStateTypes/reduceFetchState");
+const chargeCardRepaymentSelector_1 = require("../../../../entity/chargeCardRepayment/chargeCardRepaymentSelector");
+const userSelector_1 = require("../../../../entity/user/userSelector");
+const setupViewSelector_1 = require("../../commonSetup/setupViewSelector");
+const depositAccountSelector_1 = require("../../../../entity/depositAccount/depositAccountSelector");
+const paymentAccountSelector_1 = require("../../../../entity/paymentAccount/paymentAccountSelector");
+const depositAccountListSelector_1 = require("../../zeniAccounts/depositAccountList/depositAccountListSelector");
+const paymentAccountListSelector_1 = require("../../zeniAccounts/paymentAccountList/paymentAccountListSelector");
+const chargeCardPaymentHistoryHelpers_1 = require("./chargeCardPaymentHistoryHelpers");
+const getChargeCardPaymentHistoryView = (state) => {
+    const { chargeCardPaymentHistoryState, chargeCardRepaymentState, userState, depositAccountState, paymentAccountState, depositAccountListState, paymentAccountListState, } = state;
+    const { creditAccountId, currencyCode, currencySymbol, filters, isAutoPayEnabled, repaymentHistoryIds, searchText, totalRepayments, uiState, fetchState, error, } = chargeCardPaymentHistoryState;
+    // Get the full repayment details from the entity state
+    const repaymentHistory = (0, chargeCardRepaymentSelector_1.getChargeCardRepaymentByIds)(chargeCardRepaymentState, repaymentHistoryIds);
+    const repaymentHistoryUserIds = Array.from(new Set(repaymentHistory.map((r) => r.paidById)));
+    // Get users first to enrich repayments
+    const repaymentHistoryUsers = (0, userSelector_1.getUsersByUserIds)(userState, repaymentHistoryUserIds);
+    // Create a map of userId -> User for quick lookup
+    const userMap = new Map();
+    repaymentHistoryUsers.forEach((user) => {
+        userMap.set(user.userId, user);
+    });
+    // Enrich repayments with paidByUser details
+    let repaymentHistoryWithUsers = repaymentHistory.map((repayment) => ({
+        ...repayment,
+        paidByUser: userMap.get(repayment.paidById),
+    }));
+    // Get deposit and payment accounts views (used for funding accounts and fetch state)
+    const depositAccountsView = (0, depositAccountListSelector_1.getAllDepositAccounts)(depositAccountState, depositAccountListState);
+    const paymentAccountsView = (0, paymentAccountListSelector_1.getAllPaymentAccounts)(paymentAccountState, paymentAccountListState);
+    // Extract unique funding account IDs from unfiltered repayment history (for accountInfoMap used in filter/sort)
+    const repaymentHistoryFundingAccountIdsForMap = Array.from(new Set(repaymentHistory
+        .map((repayment) => repayment.paymentAccountId)
+        .filter((id) => id !== undefined && id !== null)));
+    let fundingAccountsForMap = [];
+    if (repaymentHistoryFundingAccountIdsForMap.length > 0) {
+        const hasDepositData = depositAccountsView.fetchState === 'Completed';
+        const hasPaymentData = paymentAccountsView.fetchState === 'Completed';
+        if (hasDepositData || hasPaymentData) {
+            const matchingDepositAccountsForMap = hasDepositData
+                ? depositAccountsView.depositAccounts.filter((depositAccount) => repaymentHistoryFundingAccountIdsForMap.includes(depositAccount.id))
+                : [];
+            const matchingPaymentAccountsForMap = hasPaymentData
+                ? paymentAccountsView.paymentAccounts.filter((paymentAccount) => repaymentHistoryFundingAccountIdsForMap.includes(paymentAccount.paymentAccountId))
+                : [];
+            fundingAccountsForMap = (0, setupViewSelector_1.getAllFundingAccounts)(matchingDepositAccountsForMap, matchingPaymentAccountsForMap, paymentAccountListState.paymentAccountBalanceFetchStatus, false);
+            // Fallback: look up repayment-referenced accounts directly from entity stores
+            // in case they're not in the list state (e.g. race condition, stale list)
+            const existingIds = new Set(fundingAccountsForMap.map((fa) => fa.id).filter(Boolean));
+            for (const accountId of repaymentHistoryFundingAccountIdsForMap) {
+                if (existingIds.has(accountId)) {
+                    continue;
+                }
+                const depositAccount = (0, depositAccountSelector_1.getDepositAccountByDepositAccountId)(depositAccountState, accountId);
+                if (depositAccount != null) {
+                    fundingAccountsForMap.push((0, setupViewSelector_1.mapDepositAccToFundingAccount)(depositAccount));
+                    existingIds.add(accountId);
+                    continue;
+                }
+                const paymentAccount = (0, paymentAccountSelector_1.getPaymentAccountByPaymentAccountId)(paymentAccountState, accountId);
+                if (paymentAccount != null) {
+                    fundingAccountsForMap.push((0, setupViewSelector_1.mapPaymentAccToFundingAccount)(paymentAccount, paymentAccountListState.paymentAccountBalanceFetchStatus));
+                    existingIds.add(accountId);
+                }
+            }
+        }
+    }
+    const accountInfoByAccountId = {};
+    fundingAccountsForMap.forEach((fa) => {
+        if (fa.id != null) {
+            accountInfoByAccountId[fa.id] = {
+                accountId: fa.id,
+                accountLogo: fa.logo,
+                accountType: fa.accType === 'depositAccount' ? 'depositAccount' : 'paymentAccount',
+                depositAccountLast4: fa.accountLast4,
+                depositAccountName: fa.label,
+            };
+        }
+    });
+    repaymentHistoryWithUsers = (0, chargeCardPaymentHistoryHelpers_1.applyPaymentHistoryFiltersSearchAndSort)(repaymentHistoryWithUsers, filters, searchText, uiState, accountInfoByAccountId);
+    const reducedFetchState = (0, reduceFetchState_1.reduceAllFetchState)([
+        { fetchState, error },
+        depositAccountsView,
+        paymentAccountsView,
+        ...Object.values(paymentAccountListState.paymentAccountBalanceFetchStatus),
+    ]);
+    return {
+        accountInfoByAccountId,
+        creditAccountId,
+        currencyCode,
+        currencySymbol,
+        filters,
+        isAutoPayEnabled,
+        repaymentHistory: repaymentHistoryWithUsers,
+        repaymentHistoryIds,
+        repaymentHistoryUsers,
+        searchText,
+        totalRepayments,
+        uiState,
+        fetchState: reducedFetchState.fetchState,
+        error: reducedFetchState.error,
+        version: 0,
+    };
+};
+exports.getChargeCardPaymentHistoryView = getChargeCardPaymentHistoryView;

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

@@ -0,0 +1,9 @@
+import { ActionsObservable, StateObservable } from 'redux-observable';
+import { Observable } from 'rxjs';
+import { updateChargeCardRepayments } from '../../../../entity/chargeCardRepayment/chargeCardRepaymentReducer';
+import { updateAllUsers } from '../../../../entity/user/userReducer';
+import { RootState } from '../../../../reducer';
+import { ZeniAPI } from '../../../../zeniAPI';
+import { fetchChargeCardPaymentHistory, updateChargeCardPaymentHistory, updateChargeCardPaymentHistoryFailure } from './chargeCardPaymentHistoryReducer';
+export type ActionType = ReturnType<typeof fetchChargeCardPaymentHistory> | ReturnType<typeof updateChargeCardPaymentHistory> | ReturnType<typeof updateChargeCardPaymentHistoryFailure> | ReturnType<typeof updateChargeCardRepayments> | ReturnType<typeof updateAllUsers>;
+export declare const fetchChargeCardPaymentHistoryEpic: (actions$: ActionsObservable<ActionType>, _state$: StateObservable<RootState>, zeniAPI: ZeniAPI) => Observable<ActionType>;

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

@@ -0,0 +1,35 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.fetchChargeCardPaymentHistoryEpic = void 0;
+const rxjs_1 = require("rxjs");
+const operators_1 = require("rxjs/operators");
+const chargeCardRepaymentReducer_1 = require("../../../../entity/chargeCardRepayment/chargeCardRepaymentReducer");
+const userReducer_1 = require("../../../../entity/user/userReducer");
+const responsePayload_1 = require("../../../../responsePayload");
+const chargeCardPaymentHistoryReducer_1 = require("./chargeCardPaymentHistoryReducer");
+const fetchChargeCardPaymentHistoryEpic = (actions$, _state$, zeniAPI) => actions$.pipe((0, operators_1.filter)(chargeCardPaymentHistoryReducer_1.fetchChargeCardPaymentHistory.match), (0, operators_1.switchMap)(() => {
+    const queryParams = { include_history: true };
+    const queryString = encodeURIComponent(JSON.stringify(queryParams));
+    return zeniAPI
+        .getJSON(`${zeniAPI.apiEndPoints.cardMicroServiceBaseUrl}/1.0/cards/repayments?query=${queryString}`)
+        .pipe((0, operators_1.mergeMap)((response) => {
+        if ((0, responsePayload_1.isSuccessStatus)(response) && response.data != null) {
+            return (0, rxjs_1.of)(
+            // Store repayments FIRST before marking as completed
+            (0, chargeCardRepaymentReducer_1.updateChargeCardRepayments)(response.data.repayment_history), (0, userReducer_1.updateAllUsers)({
+                users: response.data.repayment_history
+                    .map((repayment) => repayment.paid_by_user)
+                    .filter((user) => user != null),
+            }), 
+            // Mark as completed LAST, after all data is stored
+            (0, chargeCardPaymentHistoryReducer_1.updateChargeCardPaymentHistory)(response.data));
+        }
+        else {
+            return (0, rxjs_1.of)((0, chargeCardPaymentHistoryReducer_1.updateChargeCardPaymentHistoryFailure)(response.status));
+        }
+    }), (0, operators_1.catchError)((error) => {
+        return (0, rxjs_1.of)((0, chargeCardPaymentHistoryReducer_1.updateChargeCardPaymentHistoryFailure)((0, responsePayload_1.createZeniAPIStatus)('Unexpected Error', 'Fetch charge card payment history REST API call errored out' +
+            JSON.stringify(error))));
+    }));
+}));
+exports.fetchChargeCardPaymentHistoryEpic = fetchChargeCardPaymentHistoryEpic;

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

@@ -0,0 +1,7 @@
+import { ActionsObservable, StateObservable } from 'redux-observable';
+import { Observable } from 'rxjs';
+import { RootState } from '../../../../reducer';
+import { fetchChargeCardRepaymentDetail } from '../chargeCardRepaymentDetail/chargeCardRepaymentDetailReducer';
+import { fetchChargeCardPaymentHistory, fetchChargeCardPaymentPage } from './chargeCardPaymentHistoryReducer';
+export type ActionType = ReturnType<typeof fetchChargeCardPaymentPage> | ReturnType<typeof fetchChargeCardPaymentHistory> | ReturnType<typeof fetchChargeCardRepaymentDetail>;
+export declare const fetchChargeCardPaymentPageEpic: (actions$: ActionsObservable<ActionType>, state$: StateObservable<RootState>) => Observable<ActionType>;

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

@@ -0,0 +1,35 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.fetchChargeCardPaymentPageEpic = void 0;
+const rxjs_1 = require("rxjs");
+const operators_1 = require("rxjs/operators");
+const chargeCardRepaymentDetailReducer_1 = require("../chargeCardRepaymentDetail/chargeCardRepaymentDetailReducer");
+const chargeCardPaymentHistoryReducer_1 = require("./chargeCardPaymentHistoryReducer");
+const fetchChargeCardPaymentPageEpic = (actions$, state$) => actions$.pipe((0, operators_1.filter)(chargeCardPaymentHistoryReducer_1.fetchChargeCardPaymentPage.match), (0, operators_1.mergeMap)((action) => {
+    const { cacheOverride } = action.payload;
+    const chargeCardPaymentPageActions = [];
+    const state = state$.value;
+    const chargeCardPaymentHistoryState = state.chargeCardPaymentHistoryState;
+    if (cacheOverride === true) {
+        chargeCardPaymentPageActions.push((0, chargeCardPaymentHistoryReducer_1.fetchChargeCardPaymentHistory)());
+    }
+    else {
+        if (chargeCardPaymentHistoryState.fetchState !== 'Completed' &&
+            chargeCardPaymentHistoryState.fetchState !== 'In-Progress') {
+            chargeCardPaymentPageActions.push((0, chargeCardPaymentHistoryReducer_1.fetchChargeCardPaymentHistory)());
+        }
+    }
+    // Fetch repayment detail if deposit or payment accounts are not fetched
+    //These are needed to get the transfer from accounts for the repayment history
+    const depositAccountListState = state.depositAccountListState;
+    const paymentAccountListState = state.paymentAccountListState;
+    const needsRepaymentDetailFetch = (depositAccountListState.fetchState !== 'Completed' &&
+        depositAccountListState.fetchState !== 'In-Progress') ||
+        (paymentAccountListState.fetchState !== 'Completed' &&
+            paymentAccountListState.fetchState !== 'In-Progress');
+    if (needsRepaymentDetailFetch) {
+        chargeCardPaymentPageActions.push((0, chargeCardRepaymentDetailReducer_1.fetchChargeCardRepaymentDetail)());
+    }
+    return (0, rxjs_1.concat)((0, rxjs_1.from)(chargeCardPaymentPageActions));
+}));
+exports.fetchChargeCardPaymentPageEpic = fetchChargeCardPaymentPageEpic;

package/lib/view/spendManagement/chargeCards/chargeCardRepaymentDetail/chargeCardRepaymentDetailSelector.js

@@ -11,11 +11,17 @@ const getChargeCardRepaymentDetail = (state) => {
     const depositAccountsView = (0, depositAccountListSelector_1.getAllDepositAccounts)(depositAccountState, depositAccountListState);
     const paymentAccountsView = (0, paymentAccountListSelector_1.getAllPaymentAccounts)(paymentAccountState, paymentAccountListState);
     let transferFromAccounts = [];
-    if (depositAccountsView.fetchState === 'Completed' &&
-        paymentAccountsView.fetchState === 'Completed') {
-        transferFromAccounts = (0, setupViewSelector_1.getAllFundingAccounts)(depositAccountsView.depositAccounts, paymentAccountsView.paymentAccounts, paymentAccountListState.paymentAccountBalanceFetchStatus);
+    if (paymentAccountsView.fetchState === 'Completed') {
+        if (depositAccountsView.fetchState === 'Completed') {
+            transferFromAccounts = (0, setupViewSelector_1.getAllFundingAccounts)(depositAccountsView.depositAccounts, paymentAccountsView.paymentAccounts, paymentAccountListState.paymentAccountBalanceFetchStatus);
+        }
+        else {
+            const depositFundingFromLimit = Object.values(depositAccountState.depositAccountLimitForChargeCardByID ?? {}).map(setupViewSelector_1.mapDepositAccountWithLimitToFundingAccount);
+            const paymentFundingAccounts = (0, setupViewSelector_1.getAllFundingAccounts)([], paymentAccountsView.paymentAccounts, paymentAccountListState.paymentAccountBalanceFetchStatus);
+            transferFromAccounts = [...depositFundingFromLimit, ...paymentFundingAccounts];
+        }
     }
-    const reducedFetchState = (0, reduceFetchState_1.reduceAllFetchState)([
+    const reducedFetchState = (0, reduceFetchState_1.reduceAnyCompletedFetchState)([
         depositAccountsView,
         paymentAccountsView,
         ...Object.values(paymentAccountListState.paymentAccountBalanceFetchStatus),

package/lib/view/spendManagement/chargeCards/chargeCardRepaymentDetail/fetchChargeCardRepaymentDetailEpic.js

@@ -10,8 +10,8 @@ const fetchChargeCardRepaymentDetailEpic = (actions$, state$) => actions$.pipe((
     const fetchChargeCardRepaymentDetailActions = [];
     const state = state$.value;
     const depositAccounts = state.depositAccountListState;
-    if (depositAccounts.fetchState !== 'In-Progress' &&
-        depositAccounts.fetchState !== 'Completed') {
+    const willFetchDeposit = depositAccounts.fetchState !== 'In-Progress' && depositAccounts.fetchState !== 'Completed';
+    if (willFetchDeposit) {
         fetchChargeCardRepaymentDetailActions.push((0, depositAccountListReducer_1.fetchDepositAccountList)());
     }
     const paymentAccounts = state.paymentAccountListState;

package/lib/view/spendManagement/chargeCards/chargeCardRepaymentDetail/initiateChargeCardRepaymentEpic.d.ts

@@ -4,7 +4,8 @@ import { updateChargeCardRepayment } from '../../../../entity/chargeCardRepaymen
 import { updateCompanyPrimaryAccount, updateEnableAutoPayForChargeCard } from '../../../../entity/company/companyReducer';
 import { RootState } from '../../../../reducer';
 import { ZeniAPI } from '../../../../zeniAPI';
+import { addRepaymentToChargeCardPaymentHistory } from '../chargeCardPaymentHistory/chargeCardPaymentHistoryReducer';
 import { updateCreditAccountRepaymentAmountAndDate } from '../chargeCardList/chargeCardListReducer';
 import { initiateChargeCardRepayment, updateChargeCardRepaymentStatus } from './chargeCardRepaymentDetailReducer';
-export type ActionType = ReturnType<typeof initiateChargeCardRepayment> | ReturnType<typeof updateChargeCardRepayment> | ReturnType<typeof updateCreditAccountRepaymentAmountAndDate> | ReturnType<typeof updateChargeCardRepaymentStatus> | ReturnType<typeof updateCompanyPrimaryAccount> | ReturnType<typeof updateEnableAutoPayForChargeCard>;
+export type ActionType = ReturnType<typeof addRepaymentToChargeCardPaymentHistory> | ReturnType<typeof initiateChargeCardRepayment> | ReturnType<typeof updateChargeCardRepayment> | ReturnType<typeof updateCreditAccountRepaymentAmountAndDate> | ReturnType<typeof updateChargeCardRepaymentStatus> | ReturnType<typeof updateCompanyPrimaryAccount> | ReturnType<typeof updateEnableAutoPayForChargeCard>;
 export declare const initiateChargeCardRepaymentEpic: (actions$: ActionsObservable<ActionType>, state$: StateObservable<RootState>, zeniAPI: ZeniAPI) => Observable<ActionType>;

package/lib/view/spendManagement/chargeCards/chargeCardRepaymentDetail/initiateChargeCardRepaymentEpic.js

@@ -12,6 +12,7 @@ const setupViewSelector_1 = require("../../commonSetup/setupViewSelector");
 const helpers_1 = require("../../helpers");
 const depositAccountListSelector_1 = require("../../zeniAccounts/depositAccountList/depositAccountListSelector");
 const paymentAccountListSelector_1 = require("../../zeniAccounts/paymentAccountList/paymentAccountListSelector");
+const chargeCardPaymentHistoryReducer_1 = require("../chargeCardPaymentHistory/chargeCardPaymentHistoryReducer");
 const chargeCardListReducer_1 = require("../chargeCardList/chargeCardListReducer");
 const chargeCardRepaymentDetailReducer_1 = require("./chargeCardRepaymentDetailReducer");
 const initiateChargeCardRepaymentEpic = (actions$, state$, zeniAPI) => actions$.pipe((0, operators_1.filter)(chargeCardRepaymentDetailReducer_1.initiateChargeCardRepayment.match), (0, operators_1.switchMap)((action) => {
@@ -39,6 +40,10 @@ const initiateChargeCardRepaymentEpic = (actions$, state$, zeniAPI) => actions$.
             if ((0, responsePayload_1.isSuccessResponse)(response) && response.data != null) {
                 const actions = [
                     (0, chargeCardRepaymentReducer_1.updateChargeCardRepayment)(response.data.card_repayment),
+                    (0, chargeCardPaymentHistoryReducer_1.addRepaymentToChargeCardPaymentHistory)({
+                        cardRepaymentId: response.data.card_repayment.card_repayment_id,
+                        zeniCreditAccountId: response.data.card_repayment.zeni_credit_account_id,
+                    }),
                     (0, chargeCardListReducer_1.updateCreditAccountRepaymentAmountAndDate)({
                         amount: (0, amount_1.toAmount)(response.data.card_repayment.amount, response.data.card_repayment.currency_code, response.data.card_repayment.currency_symbol),
                         date: (0, zeniDayJS_1.date)(response.data.card_repayment.repayment_date),

package/lib/view/spendManagement/chargeCards/chargeCardSetUp/epic/fetchChargeCardSetupViewEpic.js

@@ -51,7 +51,7 @@ const fetchChargeCardSetupViewEpic = (actions$, state$, zeniAPI) => actions$.pip
                     (0, depositAccountReducer_1.updateDepositAccounts)(response.data.deposit_accounts ?? []),
                     (0, depositAccountListReducer_1.updateDepositAccountList)({
                         data: response.data?.deposit_accounts ?? [],
-                        updateType: 'replace',
+                        updateType: 'merge',
                     }),
                     (0, setupViewReducer_1.updateSetupViewLocalStoreData)({
                         companyId: response.data.companies[0].company_id,

package/lib/view/spendManagement/commonSetup/setupViewSelector.d.ts

@@ -5,7 +5,7 @@ import { FetchStateAndError, ID } from '../../../commonStateTypes/common';
 import { AccountBase } from '../../../entity/account/accountState';
 import { CompanyBillPayInfo } from '../../../entity/company/companyStateTypes';
 import { Country } from '../../../entity/countryList/countryListState';
-import { DepositAccount } from '../../../entity/depositAccount/depositAccount';
+import { DepositAccount, DepositAccountWithLimit } from '../../../entity/depositAccount/depositAccount';
 import { File } from '../../../entity/file/fileState';
 import { InstitutionDetails, Logo, PaymentAccount } from '../../../entity/paymentAccount/paymentAccountState';
 import { RootState } from '../../../reducer';
@@ -94,5 +94,6 @@ export declare function getBusinessVerificationDetails(state: RootState, company
 export declare const getCompanyAndIdentityDetails: (state: RootState, companyId: ID, companyAndIdentityDetails: CompanyAndIdentityDetails) => CompanyAndOfficerLocalData;
 export declare const getAllFundingAccounts: (depositAccounts: DepositAccount[], paymentAccounts: PaymentAccount[], paymentAccountBalanceFetchStatus: Record<ID, FetchStateAndError>, includeOnlyVerifiedAccounts?: boolean) => FundingAccount[];
 export declare const mapDepositAccToFundingAccount: (depositAcc: DepositAccount) => FundingAccount;
+export declare const mapDepositAccountWithLimitToFundingAccount: (depositAcc: DepositAccountWithLimit) => FundingAccount;
 export declare const mapPaymentAccToFundingAccount: (paymentAcc: PaymentAccount, paymentAccountBalanceFetchStatus: Record<ID, FetchStateAndError>) => FundingAccount;
 export {};

package/lib/view/spendManagement/commonSetup/setupViewSelector.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.mapPaymentAccToFundingAccount = exports.mapDepositAccToFundingAccount = exports.getAllFundingAccounts = exports.getCompanyAndIdentityDetails = void 0;
+exports.mapPaymentAccToFundingAccount = exports.mapDepositAccountWithLimitToFundingAccount = exports.mapDepositAccToFundingAccount = exports.getAllFundingAccounts = exports.getCompanyAndIdentityDetails = void 0;
 exports.getCommonSetupViewDetails = getCommonSetupViewDetails;
 exports.getBusinessVerificationDetails = getBusinessVerificationDetails;
 const accountSelector_1 = require("../../../entity/account/accountSelector");
@@ -227,6 +227,22 @@ const mapDepositAccToFundingAccount = (depositAcc) => ({
     accountLast4: depositAcc.accountLast4,
 });
 exports.mapDepositAccToFundingAccount = mapDepositAccToFundingAccount;
+const mapDepositAccountWithLimitToFundingAccount = (depositAcc) => ({
+    id: depositAcc.id,
+    accType: 'depositAccount',
+    label: depositAcc.accountName,
+    maskedAccountNumber: depositAcc.maskedAccountNumber,
+    accountBalance: depositAcc.accountBalance,
+    logo: undefined,
+    zeniAccountId: depositAcc.zeniAccountId,
+    balanceFetchStatus: {
+        fetchState: 'Completed',
+        error: undefined,
+    },
+    createTime: depositAcc.createTime,
+    accountLast4: depositAcc.maskedAccountNumber.match(/(\d{4})$/)?.[1] ?? undefined,
+});
+exports.mapDepositAccountWithLimitToFundingAccount = mapDepositAccountWithLimitToFundingAccount;
 const mapPaymentAccToFundingAccount = (paymentAcc, paymentAccountBalanceFetchStatus) => ({
     id: paymentAcc.paymentAccountId,
     accType: 'paymentAccount',

package/lib/view/spendManagement/reimbursement/remiSetupApproverView/remiSetupApproverViewReducer.d.ts

@@ -40,6 +40,6 @@ export declare const fetchRemiSetupApproverView: import("@reduxjs/toolkit").Acti
     approvalRuleId: string | undefined;
 }, "remiSetupApproverView/initializeRemiSetupApproverViewUpdateData", never, never>, saveRemiSetupApproverViewUpdateData: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[remiSetupApproverViewUpdateData: Partial<ApprovalRuleUpdateData | ApprovalRuleCreateData>], {
     remiSetupApproverViewUpdateData: Partial<ApprovalRuleUpdateData | ApprovalRuleCreateData>;
-}, "remiSetupApproverView/saveRemiSetupApproverViewUpdateData", never, never>, clearRemiSetupApproverViewUpdateData: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<"remiSetupApproverView/clearRemiSetupApproverViewUpdateData">, clearRemiSetupApproverView: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<"remiSetupApproverView/clearRemiSetupApproverView">;
+}, "remiSetupApproverView/saveRemiSetupApproverViewUpdateData", never, never>, setListeningToPusherEvent: import("@reduxjs/toolkit").ActionCreatorWithPayload<boolean, "remiSetupApproverView/setListeningToPusherEvent">, clearRemiSetupApproverViewUpdateData: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<"remiSetupApproverView/clearRemiSetupApproverViewUpdateData">, clearRemiSetupApproverView: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<"remiSetupApproverView/clearRemiSetupApproverView">;
 declare const _default: import("redux").Reducer<RemiSetupApproverViewState>;
 export default _default;

package/lib/view/spendManagement/reimbursement/remiSetupApproverView/remiSetupApproverViewReducer.js

@@ -1,11 +1,12 @@
 "use strict";
 var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.clearRemiSetupApproverView = exports.clearRemiSetupApproverViewUpdateData = exports.saveRemiSetupApproverViewUpdateData = exports.initializeRemiSetupApproverViewUpdateData = exports.saveRemiSetupApproverViewUpdatesFailure = exports.saveRemiSetupApproverViewUpdatesSuccess = exports.saveRemiSetupApproverViewUpdates = exports.deleteRemiApprovalRuleFailure = exports.deleteRemiApprovalRuleSuccess = exports.deleteRemiApprovalRule = exports.fetchRemiApproversListFailure = exports.fetchRemiApproversListSuccess = exports.fetchRemiApproversList = exports.fetchRemiApproversDetails = exports.fetchRemiSetupApproverViewFailure = exports.fetchRemiSetupApproverViewSuccess = exports.fetchRemiSetupApproverView = exports.initialState = void 0;
+exports.clearRemiSetupApproverView = exports.clearRemiSetupApproverViewUpdateData = exports.setListeningToPusherEvent = exports.saveRemiSetupApproverViewUpdateData = exports.initializeRemiSetupApproverViewUpdateData = exports.saveRemiSetupApproverViewUpdatesFailure = exports.saveRemiSetupApproverViewUpdatesSuccess = exports.saveRemiSetupApproverViewUpdates = exports.deleteRemiApprovalRuleFailure = exports.deleteRemiApprovalRuleSuccess = exports.deleteRemiApprovalRule = exports.fetchRemiApproversListFailure = exports.fetchRemiApproversListSuccess = exports.fetchRemiApproversList = exports.fetchRemiApproversDetails = exports.fetchRemiSetupApproverViewFailure = exports.fetchRemiSetupApproverViewSuccess = exports.fetchRemiSetupApproverView = exports.initialState = void 0;
 const toolkit_1 = require("@reduxjs/toolkit");
 exports.initialState = {
     fetchState: 'Not-Started',
     error: undefined,
+    listeningToPusherEvent: false,
     approverListState: {
         approverIds: [],
         attributes: [],
@@ -180,6 +181,11 @@ const remiSetupApproverView = (0, toolkit_1.createSlice)({
             reducer(draft, action) {
                 const { approvalRuleIds } = action.payload;
                 if (draft.remiSetupApproverViewUpdateData != null) {
+                    if (draft.remiSetupApproverViewUpdateData.type === 'approval_update' &&
+                        draft.remiSetupApproverViewUpdateData.data
+                            ?.isApplicableOnPendingApprovalEntity === true) {
+                        draft.listeningToPusherEvent = true;
+                    }
                     draft.remiSetupApproverViewUpdateData.updateStatus = {
                         fetchState: 'Completed',
                         error: undefined,
@@ -240,6 +246,9 @@ const remiSetupApproverView = (0, toolkit_1.createSlice)({
                 return { payload: { remiSetupApproverViewUpdateData } };
             },
         },
+        setListeningToPusherEvent(draft, action) {
+            draft.listeningToPusherEvent = action.payload;
+        },
         clearRemiSetupApproverViewUpdateData(draft) {
             if (draft.remiSetupApproverViewUpdateData != null) {
                 draft.remiSetupApproverViewUpdateData.data = undefined;
@@ -250,5 +259,5 @@ const remiSetupApproverView = (0, toolkit_1.createSlice)({
         },
     },
 });
-_a = remiSetupApproverView.actions, exports.fetchRemiSetupApproverView = _a.fetchRemiSetupApproverView, exports.fetchRemiSetupApproverViewSuccess = _a.fetchRemiSetupApproverViewSuccess, exports.fetchRemiSetupApproverViewFailure = _a.fetchRemiSetupApproverViewFailure, exports.fetchRemiApproversDetails = _a.fetchRemiApproversDetails, exports.fetchRemiApproversList = _a.fetchRemiApproversList, exports.fetchRemiApproversListSuccess = _a.fetchRemiApproversListSuccess, exports.fetchRemiApproversListFailure = _a.fetchRemiApproversListFailure, exports.deleteRemiApprovalRule = _a.deleteRemiApprovalRule, exports.deleteRemiApprovalRuleSuccess = _a.deleteRemiApprovalRuleSuccess, exports.deleteRemiApprovalRuleFailure = _a.deleteRemiApprovalRuleFailure, exports.saveRemiSetupApproverViewUpdates = _a.saveRemiSetupApproverViewUpdates, exports.saveRemiSetupApproverViewUpdatesSuccess = _a.saveRemiSetupApproverViewUpdatesSuccess, exports.saveRemiSetupApproverViewUpdatesFailure = _a.saveRemiSetupApproverViewUpdatesFailure, exports.initializeRemiSetupApproverViewUpdateData = _a.initializeRemiSetupApproverViewUpdateData, exports.saveRemiSetupApproverViewUpdateData = _a.saveRemiSetupApproverViewUpdateData, exports.clearRemiSetupApproverViewUpdateData = _a.clearRemiSetupApproverViewUpdateData, exports.clearRemiSetupApproverView = _a.clearRemiSetupApproverView;
+_a = remiSetupApproverView.actions, exports.fetchRemiSetupApproverView = _a.fetchRemiSetupApproverView, exports.fetchRemiSetupApproverViewSuccess = _a.fetchRemiSetupApproverViewSuccess, exports.fetchRemiSetupApproverViewFailure = _a.fetchRemiSetupApproverViewFailure, exports.fetchRemiApproversDetails = _a.fetchRemiApproversDetails, exports.fetchRemiApproversList = _a.fetchRemiApproversList, exports.fetchRemiApproversListSuccess = _a.fetchRemiApproversListSuccess, exports.fetchRemiApproversListFailure = _a.fetchRemiApproversListFailure, exports.deleteRemiApprovalRule = _a.deleteRemiApprovalRule, exports.deleteRemiApprovalRuleSuccess = _a.deleteRemiApprovalRuleSuccess, exports.deleteRemiApprovalRuleFailure = _a.deleteRemiApprovalRuleFailure, exports.saveRemiSetupApproverViewUpdates = _a.saveRemiSetupApproverViewUpdates, exports.saveRemiSetupApproverViewUpdatesSuccess = _a.saveRemiSetupApproverViewUpdatesSuccess, exports.saveRemiSetupApproverViewUpdatesFailure = _a.saveRemiSetupApproverViewUpdatesFailure, exports.initializeRemiSetupApproverViewUpdateData = _a.initializeRemiSetupApproverViewUpdateData, exports.saveRemiSetupApproverViewUpdateData = _a.saveRemiSetupApproverViewUpdateData, exports.setListeningToPusherEvent = _a.setListeningToPusherEvent, exports.clearRemiSetupApproverViewUpdateData = _a.clearRemiSetupApproverViewUpdateData, exports.clearRemiSetupApproverView = _a.clearRemiSetupApproverView;
 exports.default = remiSetupApproverView.reducer;

package/lib/view/spendManagement/reimbursement/remiSetupApproverView/remiSetupApproverViewSelector.js

@@ -13,7 +13,7 @@ const userSelector_1 = require("../../../../entity/user/userSelector");
 const userRoleSelector_1 = require("../../../../entity/userRole/userRoleSelector");
 const getRemiSetupApproverView = (state, filterAdmins = true) => {
     const { remiSetupApproverViewState, approvalRuleState, userState } = state;
-    const { approvalRulesDeleteStatusById, approvalRuleIds, fetchState, error } = remiSetupApproverViewState;
+    const { approvalRulesDeleteStatusById, approvalRuleIds, fetchState, error, listeningToPusherEvent, } = remiSetupApproverViewState;
     const deleteStateList = Object.values(approvalRulesDeleteStatusById);
     const approvalRules = (0, approvalRuleSelector_1.getApprovalRulesByIds)(approvalRuleState, approvalRuleIds);
     const allApprovalRules = approvalRules.map((approvalRule) => {
@@ -48,11 +48,12 @@ const getRemiSetupApproverView = (state, filterAdmins = true) => {
         approvalRulesStatus,
         fetchState,
         error,
+        listeningToPusherEvent,
     };
 };
 exports.getRemiSetupApproverView = getRemiSetupApproverView;
 exports.getRemiSetupApproverUpdateDataView = (0, toolkit_1.createSelector)((state) => state.remiSetupApproverViewState, (state) => state.approvalRuleState, (state) => state.classState, (state) => state.classListState, (state) => state.userState, (state) => state.userRoleState, (remiSetupApproverViewState, approvalRuleState, classState, classListState, userState, userRoleState) => {
-    const { approvalRuleIds, approverListState, remiSetupApproverViewUpdateData, fetchState, error, } = remiSetupApproverViewState;
+    const { approvalRuleIds, approverListState, remiSetupApproverViewUpdateData, fetchState, error, listeningToPusherEvent, } = remiSetupApproverViewState;
     const { approverIds, attributes, fetchStatus } = approverListState;
     const { fetchState: classListFetchState, error: classListFetchStateError, classIds, } = classListState;
     const allApprovalRules = (0, approvalRuleSelector_1.getApprovalRulesByIds)(approvalRuleState, approvalRuleIds).map((approvalRule) => {
@@ -120,5 +121,6 @@ exports.getRemiSetupApproverUpdateDataView = (0, toolkit_1.createSelector)((stat
         ]),
         fetchState,
         error,
+        listeningToPusherEvent,
     };
 });

package/lib/view/spendManagement/reimbursement/remiSetupApproverView/remiSetupApproverViewSelectorTypes.d.ts

@@ -17,6 +17,7 @@ export interface RemiSetupApproverView extends SelectorView {
     allApprovalRules: ApprovalRuleWithUser[];
     approvalRulesStatus: AllowedValueWithCode;
     deleteStatus: FetchStateAndError;
+    listeningToPusherEvent?: boolean;
 }
 export interface RemiSetupApproverUpdateDataView extends SelectorView {
     allAccountingClasses: Class[];
@@ -26,5 +27,6 @@ export interface RemiSetupApproverUpdateDataView extends SelectorView {
     approversDetailsFetchStatus: FetchStateAndError;
     filteredApprovers: UserAndRole[];
     filteredAttributes: AttributeType[];
+    listeningToPusherEvent?: boolean;
     remiSetupApproverViewUpdateData?: ApproverViewUpdateData;
 }

package/lib/view/spendManagement/reimbursement/remiSetupApproverView/remiSetupApproverViewState.d.ts

@@ -10,5 +10,6 @@ export interface RemiSetupApproverViewState extends FetchedState {
         fetchStatus: FetchStateAndError;
         attributeSubTypeToUserIdMapping?: Record<AttributeType, ID>;
     };
+    listeningToPusherEvent?: boolean;
     remiSetupApproverViewUpdateData?: ApproverViewUpdateData;
 }

package/lib/view/spendManagement/spendManagementFilterHelpers.d.ts

@@ -6,10 +6,12 @@ import { TaskListFilterCategoryField, TaskListFilters } from '../taskManager/tas
 import { TaskWithUserDetails } from '../taskManager/taskListView/taskListSelector';
 import { BillTransactionView } from './billPay/billList/billListSelector';
 import { BillListViewFilterCategoryField, BillPayFilters } from './billPay/billList/billListState';
+import { PaymentHistoryFilterCategoryDropdownOption, PaymentHistoryFilters } from './chargeCards/chargeCardPaymentHistory/chargeCardPaymentHistory';
+import { ChargeCardRepaymentWithUser } from './chargeCards/chargeCardPaymentHistory/chargeCardPaymentHistorySelector';
 import { ReimbursementView } from './reimbursement/remiListView/remiListSelector';
 import { ReimbursementFilters, RemiListViewFilterCategoryField } from './reimbursement/remiListView/remiListState';
-export type SpendManagementFiltersType = BillPayFilters | ReimbursementFilters | TaskListFilters;
-export type SpendManagementFilterEntityType = 'bill_pay' | 'reimbursement' | 'task_management';
+export type SpendManagementFiltersType = BillPayFilters | ReimbursementFilters | TaskListFilters | PaymentHistoryFilters;
+export type SpendManagementFilterEntityType = 'bill_pay' | 'reimbursement' | 'task_management' | 'charge_card_payment_history';
 export type FilterCategoryType = 'searchAutocomplete' | 'user' | 'dateRange' | 'numberRange' | 'dropdown';
 export interface MatchingOperatorDropdownOption {
     label: 'is' | 'is not';
@@ -31,9 +33,9 @@ export interface TaskFilterCategoryDropdownOption {
     multiple?: boolean;
     type?: FilterCategoryType;
 }
-export type SpendManagementFilterCategoryDropdownOption = BillPayFilterCategoryDropdownOption | ReimbursementFilterCategoryDropdownOption | TaskFilterCategoryDropdownOption;
+export type SpendManagementFilterCategoryDropdownOption = BillPayFilterCategoryDropdownOption | ReimbursementFilterCategoryDropdownOption | TaskFilterCategoryDropdownOption | PaymentHistoryFilterCategoryDropdownOption;
 export type FilterCategoryValueType = string | number | ZeniDate;
-export declare const applyAdvancedFiltersOnList: (entity: SpendManagementFilterEntityType, allItems: BillTransactionView[] | ReimbursementView[] | TaskWithUserDetails[], filters?: BillPayFilters | ReimbursementFilters | TaskListFilters, filteredItems?: (BillTransactionView | ReimbursementView | TaskWithUserDetails)[], index?: number) => (BillTransactionView | ReimbursementView | TaskWithUserDetails)[];
+export declare const applyAdvancedFiltersOnList: (entity: SpendManagementFilterEntityType, allItems: BillTransactionView[] | ReimbursementView[] | TaskWithUserDetails[] | ChargeCardRepaymentWithUser[], filters?: BillPayFilters | ReimbursementFilters | TaskListFilters | PaymentHistoryFilters, filteredItems?: (BillTransactionView | ReimbursementView | TaskWithUserDetails | ChargeCardRepaymentWithUser)[], index?: number) => (BillTransactionView | ReimbursementView | TaskWithUserDetails | ChargeCardRepaymentWithUser)[];
 export declare const isBillListDownloadable: (state: RootState, currentTimePeriod: TimePeriod) => boolean;
 export declare const isRemiListDownloadable: (state: RootState, currentTimePeriod: TimePeriod) => boolean;
 export declare const hideCreatedByFilter: (userRole: UserRoleType[]) => boolean;

package/lib/view/spendManagement/spendManagementFilterHelpers.js

@@ -72,10 +72,17 @@ const filterItemOnCategoriesWithMultipleValues = (categoryValue, currentFilter)
         return true;
     }
 };
+const getItemId = (item) => {
+    if ('cardRepaymentId' in item) {
+        return item.cardRepaymentId;
+    }
+    return item
+        .id;
+};
 const removeDuplicatesFromList = (list) => {
     const foundIds = [];
     return list.filter((item) => {
-        const itemId = item.id;
+        const itemId = getItemId(item);
         if (foundIds.indexOf(itemId) === -1) {
             foundIds.push(itemId);
             return true;
@@ -110,7 +117,9 @@ const applyAdvancedFiltersOnList = (entity, allItems, filters, filteredItems = [
             ? getCategoryValueForBill(key, item)
             : entity === 'reimbursement'
                 ? getCategoryValueForReimbursement(key, item)
-                : getCategoryValueForTaskList(key, item);
+                : entity === 'task_management'
+                    ? getCategoryValueForTaskList(key, item)
+                    : getCategoryValueForPaymentHistory(key, item);
         if (categoryValue == null) {
             if (currentFilter.matchingOperator === 'not-equal') {
                 return true;
@@ -130,6 +139,7 @@ const applyAdvancedFiltersOnList = (entity, allItems, filters, filteredItems = [
                 'dueDate',
                 'creationDate',
                 'receiptDate',
+                'repaymentDate',
             ]);
         }
     });
@@ -231,6 +241,23 @@ const getCategoryValueForReimbursement = (key, reimbursement) => {
             return undefined;
     }
 };
+const getCategoryValueForPaymentHistory = (key, repayment) => {
+    switch (key) {
+        case 'repaymentDate':
+            return repayment.repaymentDate;
+        case 'sourceAccount': {
+            return repayment.paymentAccountId;
+        }
+        case 'status':
+            return repayment.status;
+        case 'initiatedBy':
+            return repayment.repaymentType === 'scheduled'
+                ? 'autopay'
+                : repayment.paidById;
+        default:
+            return undefined;
+    }
+};
 const isBillListDownloadable = (state, currentTimePeriod) => {
     const { billListState, billTransactionState, entityApprovalStatusState, userState, } = state;
     const keys = billListState_1.ALL_BILL_TABS.filter((tab) => tab !== 'draft').map((tab) => (0, billListState_1.getBillListKey)(currentTimePeriod, tab));

package/lib/view/spendManagement/zeniAccounts/depositAccountList/fetchDepositAccountListEpic.js

@@ -11,11 +11,13 @@ const fetchDepositAccountListEpic = (actions$, _state$, zeniAPI) => actions$.pip
     return zeniAPI
         .getJSON(`${zeniAPI.apiEndPoints.bankingMicroServiceBaseUrl}/1.0/deposit-accounts?query=${encodeURIComponent(`{"is_include_deposit_accounts_summary":true}`)}`)
         .pipe((0, operators_1.mergeMap)((response) => {
-        if ((0, responsePayload_1.isSuccessResponse)(response)) {
-            return (0, rxjs_1.of)((0, depositAccountReducer_1.updateDepositAccounts)(response.data?.deposit_accounts ?? []), (0, zeniAccountListReducer_1.updateZeniAccountsSummary)({
+        const isSuccess = (0, responsePayload_1.isSuccessResponse)(response);
+        if (isSuccess) {
+            const depositAccounts = response.data?.deposit_accounts ?? [];
+            return (0, rxjs_1.of)((0, depositAccountReducer_1.updateDepositAccounts)(depositAccounts), (0, zeniAccountListReducer_1.updateZeniAccountsSummary)({
                 summaryPayload: response.data?.all_deposit_accounts_summary,
             }), (0, depositAccountListReducer_1.updateDepositAccountList)({
-                data: response.data?.deposit_accounts ?? [],
+                data: depositAccounts,
                 updateType: 'replace',
             }));
         }

package/package.json

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