@zeniai/client-epic-state 4.19.24-betaRR13 → 4.19.24-betaRR15

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

@@ -1,11 +1,7 @@
 import { ID } from '../../../../commonStateTypes/common';
 import { ChargeCardRepaymentStatusCodeType } from '../../../../entity/chargeCardRepayment/chargeCardRepayment';
+import { PaymentHistoryAccountInfo, PaymentHistoryFilters, PaymentHistoryUIState } from './chargeCardPaymentHistory';
 import type { ChargeCardRepaymentWithUser } from './chargeCardPaymentHistorySelector';
-import { PaymentHistoryFilters, PaymentHistoryUIState } from './chargeCardPaymentHistory';
-export declare function getPaymentHistorySourceAccountName(repayment: ChargeCardRepaymentWithUser, accountInfoMap?: Map<ID, {
-    depositAccountName?: string;
-}>): string;
+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, accountInfoMap?: Map<ID, {
-    depositAccountName?: string;
-}>): ChargeCardRepaymentWithUser[];
+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

@@ -9,9 +9,12 @@ exports.applyPaymentHistoryFiltersSearchAndSort = applyPaymentHistoryFiltersSear
 const orderBy_1 = __importDefault(require("lodash/orderBy"));
 const userSelector_1 = require("../../../../entity/user/userSelector");
 const spendManagementFilterHelpers_1 = require("../../spendManagementFilterHelpers");
-function getPaymentHistorySourceAccountName(repayment, accountInfoMap) {
-    var _a, _b, _c;
-    return ((_c = (_b = (_a = accountInfoMap === null || accountInfoMap === void 0 ? void 0 : accountInfoMap.get(repayment.providerDepositAccountId)) === null || _a === void 0 ? void 0 : _a.depositAccountName) !== null && _b !== void 0 ? _b : repayment.paymentAccountName) !== null && _c !== void 0 ? _c : '');
+function getPaymentHistorySourceAccountName(repayment, accountInfoByAccountId) {
+    var _a, _b;
+    const fromMap = repayment.paymentAccountId != null
+        ? (_a = accountInfoByAccountId === null || accountInfoByAccountId === void 0 ? void 0 : accountInfoByAccountId[repayment.paymentAccountId]) === null || _a === void 0 ? void 0 : _a.depositAccountName
+        : undefined;
+    return (_b = fromMap !== null && fromMap !== void 0 ? fromMap : repayment.paymentAccountName) !== null && _b !== void 0 ? _b : '';
 }
 function getPaymentStatusDisplayText(status) {
     var _a;
@@ -25,7 +28,7 @@ function getPaymentStatusDisplayText(status) {
     };
     return (_a = statusMap[status]) !== null && _a !== void 0 ? _a : status;
 }
-function getPaymentHistorySortValue(repayment, sortKey, accountInfoMap) {
+function getPaymentHistorySortValue(repayment, sortKey, accountInfoByAccountId) {
     switch (sortKey) {
         case 'paymentDate':
             return repayment.repaymentDate.valueOf();
@@ -38,12 +41,12 @@ function getPaymentHistorySortValue(repayment, sortKey, accountInfoMap) {
                 ? 'autopay'
                 : (0, userSelector_1.getUserName)(repayment.paidByUser);
         case 'sourceAccount':
-            return getPaymentHistorySourceAccountName(repayment, accountInfoMap);
+            return getPaymentHistorySourceAccountName(repayment, accountInfoByAccountId);
         default:
             return '';
     }
 }
-function sortPaymentHistory(repayments, sortKey, sortOrder, accountInfoMap) {
+function sortPaymentHistory(repayments, sortKey, sortOrder, accountInfoByAccountId) {
     const getColumnWiseSortOrder = (sortOrder) => {
         switch (sortKey) {
             case 'sourceAccount':
@@ -55,9 +58,9 @@ function sortPaymentHistory(repayments, sortKey, sortOrder, accountInfoMap) {
         }
     };
     const order = getColumnWiseSortOrder(sortOrder);
-    return (0, orderBy_1.default)(repayments, (repayment) => getPaymentHistorySortValue(repayment, sortKey, accountInfoMap), [order]);
+    return (0, orderBy_1.default)(repayments, (repayment) => getPaymentHistorySortValue(repayment, sortKey, accountInfoByAccountId), [order]);
 }
-function filterPaymentHistoryBySearchText(repayments, searchText, accountInfoMap) {
+function filterPaymentHistoryBySearchText(repayments, searchText, accountInfoByAccountId) {
     const loweredSearchText = searchText.trim().toLowerCase();
     if (loweredSearchText.length === 0) {
         return repayments;
@@ -68,16 +71,16 @@ function filterPaymentHistoryBySearchText(repayments, searchText, accountInfoMap
         const initiatedByString = repayment.repaymentType === 'scheduled'
             ? 'autopay'
             : (0, userSelector_1.getUserName)(repayment.paidByUser);
-        const accountNameString = getPaymentHistorySourceAccountName(repayment, accountInfoMap).toLowerCase();
+        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, accountInfoMap) {
+function applyPaymentHistoryFiltersSearchAndSort(repayments, filters, searchText, uiState, accountInfoByAccountId) {
     let result = (0, spendManagementFilterHelpers_1.applyAdvancedFiltersOnList)('charge_card_payment_history', repayments, filters);
-    result = filterPaymentHistoryBySearchText(result, searchText, accountInfoMap);
-    result = sortPaymentHistory(result, uiState.sortKey, uiState.sortOrder, accountInfoMap);
+    result = filterPaymentHistoryBySearchText(result, searchText, accountInfoByAccountId);
+    result = sortPaymentHistory(result, uiState.sortKey, uiState.sortOrder, accountInfoByAccountId);
     return result;
 }

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

@@ -3,25 +3,22 @@ import { SelectorView } from '../../../../commonStateTypes/viewAndReport/viewAnd
 import { ChargeCardRepayment } from '../../../../entity/chargeCardRepayment/chargeCardRepayment';
 import { User } from '../../../../entity/user/userState';
 import { RootState } from '../../../../reducer';
-import { FundingAccount } from '../../commonSetup/setupViewSelector';
-import { PaymentHistoryFilters, PaymentHistoryUIState } from './chargeCardPaymentHistory';
+import { PaymentHistoryAccountInfo, PaymentHistoryFilters, PaymentHistoryUIState } from './chargeCardPaymentHistory';
 export interface ChargeCardRepaymentWithUser extends ChargeCardRepayment {
     paidByUser?: User;
 }
 export interface ChargeCardPaymentHistorySelectorView extends SelectorView {
+    accountInfoByAccountId: Record<ID, PaymentHistoryAccountInfo>;
     creditAccountId: ID;
     currencyCode: string;
     currencySymbol: string;
     filters: PaymentHistoryFilters;
     isAutoPayEnabled: boolean;
     repaymentHistory: ChargeCardRepaymentWithUser[];
-    repaymentHistoryFundingAccounts: FundingAccount[];
     repaymentHistoryIds: ID[];
     repaymentHistoryUsers: User[];
     searchText: string;
     totalRepayments: number;
     uiState: PaymentHistoryUIState;
 }
-export declare const getChargeCardPaymentHistoryView: (state: RootState, accountInfoMap?: Map<ID, {
-    depositAccountName?: string;
-}>) => ChargeCardPaymentHistorySelectorView;
+export declare const getChargeCardPaymentHistoryView: (state: RootState) => ChargeCardPaymentHistorySelectorView;

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

@@ -5,10 +5,12 @@ const reduceFetchState_1 = require("../../../../commonStateTypes/reduceFetchStat
 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, accountInfoMap) => {
+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
@@ -23,26 +25,59 @@ const getChargeCardPaymentHistoryView = (state, accountInfoMap) => {
     });
     // Enrich repayments with paidByUser details
     let repaymentHistoryWithUsers = repaymentHistory.map((repayment) => (Object.assign(Object.assign({}, repayment), { paidByUser: userMap.get(repayment.paidById) })));
-    repaymentHistoryWithUsers = (0, chargeCardPaymentHistoryHelpers_1.applyPaymentHistoryFiltersSearchAndSort)(repaymentHistoryWithUsers, filters, searchText, uiState, accountInfoMap);
-    // Extract unique funding account IDs from repayment history
-    const repaymentHistoryFundingAccountIds = Array.from(new Set(repaymentHistoryWithUsers
-        .map((repayment) => repayment.paymentAccountId)
-        .filter((id) => id !== undefined && id !== null)));
-    // Get deposit and payment accounts views for fetch state reduction
+    // 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);
-    // Get funding accounts linked to payments
-    let repaymentHistoryFundingAccounts = [];
-    if (repaymentHistoryFundingAccountIds.length > 0 &&
-        depositAccountsView.fetchState === 'Completed' &&
-        paymentAccountsView.fetchState === 'Completed') {
-        // Filter deposit accounts that match providerDepositAccountIds (by id)
-        const matchingDepositAccounts = depositAccountsView.depositAccounts.filter((depositAccount) => repaymentHistoryFundingAccountIds.includes(depositAccount.id));
-        // Filter payment accounts that match providerDepositAccountIds (by providerAccountId)
-        const matchingPaymentAccounts = paymentAccountsView.paymentAccounts.filter((paymentAccount) => repaymentHistoryFundingAccountIds.includes(paymentAccount.paymentAccountId));
-        // Convert to FundingAccount[] format
-        repaymentHistoryFundingAccounts = (0, setupViewSelector_1.getAllFundingAccounts)(matchingDepositAccounts, matchingPaymentAccounts, paymentAccountListState.paymentAccountBalanceFetchStatus, false);
+    // 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,
@@ -50,13 +85,13 @@ const getChargeCardPaymentHistoryView = (state, accountInfoMap) => {
         ...Object.values(paymentAccountListState.paymentAccountBalanceFetchStatus),
     ]);
     return {
+        accountInfoByAccountId,
         creditAccountId,
         currencyCode,
         currencySymbol,
         filters,
         isAutoPayEnabled,
         repaymentHistory: repaymentHistoryWithUsers,
-        repaymentHistoryFundingAccounts,
         repaymentHistoryIds,
         repaymentHistoryUsers,
         searchText,

package/package.json

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