@zeniai/client-epic-state 4.19.24-betaRR14 → 4.19.24-betaRR16

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

@@ -1,8 +1,12 @@
+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 fetchChargeCardPaymentPage: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[cacheOverride?: any], {
+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;

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

@@ -1,7 +1,7 @@
 "use strict";
 var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.updatePaymentHistoryUIState = exports.updatePaymentHistoryDownloadUIState = exports.updatePaymentHistorySearchText = exports.updatePaymentHistoryFilters = exports.clearChargeCardPaymentHistory = exports.updateChargeCardPaymentHistoryFailure = exports.updateChargeCardPaymentHistory = exports.fetchChargeCardPaymentHistory = exports.fetchChargeCardPaymentPage = exports.initialState = void 0;
+exports.updatePaymentHistoryUIState = exports.updatePaymentHistoryDownloadUIState = exports.updatePaymentHistorySearchText = exports.updatePaymentHistoryFilters = exports.clearChargeCardPaymentHistory = exports.updateChargeCardPaymentHistoryFailure = exports.updateChargeCardPaymentHistory = exports.fetchChargeCardPaymentHistory = exports.fetchChargeCardPaymentPage = exports.addRepaymentToChargeCardPaymentHistory = exports.initialState = void 0;
 const toolkit_1 = require("@reduxjs/toolkit");
 const chargeCardPaymentHistory_1 = require("./chargeCardPaymentHistory");
 exports.initialState = chargeCardPaymentHistory_1.initialChargeCardPaymentHistoryState;
@@ -40,6 +40,17 @@ const chargeCardPaymentHistory = (0, toolkit_1.createSlice)({
             draft.fetchState = 'Error';
             draft.error = action.payload;
         },
+        addRepaymentToChargeCardPaymentHistory(draft, action) {
+            const { cardRepaymentId, zeniCreditAccountId } = action.payload;
+            if (draft.creditAccountId !== zeniCreditAccountId) {
+                return;
+            }
+            if (draft.repaymentHistoryIds.includes(cardRepaymentId)) {
+                return;
+            }
+            draft.repaymentHistoryIds.unshift(cardRepaymentId);
+            draft.totalRepayments += 1;
+        },
         clearChargeCardPaymentHistory(draft) {
             Object.assign(draft, exports.initialState);
         },
@@ -72,5 +83,5 @@ const chargeCardPaymentHistory = (0, toolkit_1.createSlice)({
         },
     },
 });
-_a = chargeCardPaymentHistory.actions, exports.fetchChargeCardPaymentPage = _a.fetchChargeCardPaymentPage, exports.fetchChargeCardPaymentHistory = _a.fetchChargeCardPaymentHistory, exports.updateChargeCardPaymentHistory = _a.updateChargeCardPaymentHistory, exports.updateChargeCardPaymentHistoryFailure = _a.updateChargeCardPaymentHistoryFailure, exports.clearChargeCardPaymentHistory = _a.clearChargeCardPaymentHistory, exports.updatePaymentHistoryFilters = _a.updatePaymentHistoryFilters, exports.updatePaymentHistorySearchText = _a.updatePaymentHistorySearchText, exports.updatePaymentHistoryDownloadUIState = _a.updatePaymentHistoryDownloadUIState, exports.updatePaymentHistoryUIState = _a.updatePaymentHistoryUIState;
+_a = chargeCardPaymentHistory.actions, exports.addRepaymentToChargeCardPaymentHistory = _a.addRepaymentToChargeCardPaymentHistory, exports.fetchChargeCardPaymentPage = _a.fetchChargeCardPaymentPage, exports.fetchChargeCardPaymentHistory = _a.fetchChargeCardPaymentHistory, exports.updateChargeCardPaymentHistory = _a.updateChargeCardPaymentHistory, exports.updateChargeCardPaymentHistoryFailure = _a.updateChargeCardPaymentHistoryFailure, exports.clearChargeCardPaymentHistory = _a.clearChargeCardPaymentHistory, exports.updatePaymentHistoryFilters = _a.updatePaymentHistoryFilters, exports.updatePaymentHistorySearchText = _a.updatePaymentHistorySearchText, exports.updatePaymentHistoryDownloadUIState = _a.updatePaymentHistoryDownloadUIState, exports.updatePaymentHistoryUIState = _a.updatePaymentHistoryUIState;
 exports.default = chargeCardPaymentHistory.reducer;

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

@@ -5,6 +5,8 @@ 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");
@@ -31,12 +33,37 @@ const getChargeCardPaymentHistoryView = (state) => {
         .map((repayment) => repayment.paymentAccountId)
         .filter((id) => id !== undefined && id !== null)));
     let fundingAccountsForMap = [];
-    if (repaymentHistoryFundingAccountIdsForMap.length > 0 &&
-        depositAccountsView.fetchState === 'Completed' &&
-        paymentAccountsView.fetchState === 'Completed') {
-        const matchingDepositAccountsForMap = depositAccountsView.depositAccounts.filter((depositAccount) => repaymentHistoryFundingAccountIdsForMap.includes(depositAccount.id));
-        const matchingPaymentAccountsForMap = paymentAccountsView.paymentAccounts.filter((paymentAccount) => repaymentHistoryFundingAccountIdsForMap.includes(paymentAccount.paymentAccountId));
-        fundingAccountsForMap = (0, setupViewSelector_1.getAllFundingAccounts)(matchingDepositAccountsForMap, matchingPaymentAccountsForMap, paymentAccountListState.paymentAccountBalanceFetchStatus, false);
+    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) => {

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

@@ -6,6 +6,7 @@ const setupViewSelector_1 = require("../../commonSetup/setupViewSelector");
 const depositAccountListSelector_1 = require("../../zeniAccounts/depositAccountList/depositAccountListSelector");
 const paymentAccountListSelector_1 = require("../../zeniAccounts/paymentAccountList/paymentAccountListSelector");
 const getChargeCardRepaymentDetail = (state) => {
+    var _a;
     const { chargeCardRepaymentDetailState, depositAccountState, paymentAccountState, depositAccountListState, paymentAccountListState, } = state;
     const { localData, fetchState, error } = chargeCardRepaymentDetailState;
     const depositAccountsView = (0, depositAccountListSelector_1.getAllDepositAccounts)(depositAccountState, depositAccountListState);
@@ -15,6 +16,9 @@ const getChargeCardRepaymentDetail = (state) => {
         paymentAccountsView.fetchState === 'Completed') {
         transferFromAccounts = (0, setupViewSelector_1.getAllFundingAccounts)(depositAccountsView.depositAccounts, paymentAccountsView.paymentAccounts, paymentAccountListState.paymentAccountBalanceFetchStatus);
     }
+    // #region agent log
+    fetch('http://127.0.0.1:7242/ingest/3d86d94d-63fc-405c-92bd-d68a0fc3a8c8', { method: 'POST', headers: { 'Content-Type': 'application/json', 'X-Debug-Session-Id': '88d521' }, body: JSON.stringify({ sessionId: '88d521', location: 'chargeCardRepaymentDetailSelector.ts:selector', message: 'transferFromAccounts data flow', data: { depositFetchState: depositAccountsView.fetchState, paymentFetchState: paymentAccountsView.fetchState, depositAccountsCount: depositAccountsView.depositAccounts.length, paymentAccountsCount: paymentAccountsView.paymentAccounts.length, transferFromAccountsCount: transferFromAccounts.length, enteredIfBlock: depositAccountsView.fetchState === 'Completed' && paymentAccountsView.fetchState === 'Completed', accountIdsLength: (_a = depositAccountListState.accountIds) === null || _a === void 0 ? void 0 : _a.length, depositAccTypes: transferFromAccounts.map(a => a.accType) }, timestamp: Date.now(), hypothesisId: 'H1' }) }).catch(() => { });
+    // #endregion
     const reducedFetchState = (0, reduceFetchState_1.reduceAllFetchState)([
         depositAccountsView,
         paymentAccountsView,

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

@@ -7,13 +7,17 @@ const depositAccountListReducer_1 = require("../../zeniAccounts/depositAccountLi
 const paymentAccountListReducer_1 = require("../../zeniAccounts/paymentAccountList/paymentAccountListReducer");
 const chargeCardRepaymentDetailReducer_1 = require("./chargeCardRepaymentDetailReducer");
 const fetchChargeCardRepaymentDetailEpic = (actions$, state$) => actions$.pipe((0, operators_1.filter)(chargeCardRepaymentDetailReducer_1.fetchChargeCardRepaymentDetail.match), (0, operators_1.mergeMap)(() => {
+    var _a;
     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)());
     }
+    // #region agent log
+    fetch('http://127.0.0.1:7242/ingest/3d86d94d-63fc-405c-92bd-d68a0fc3a8c8', { method: 'POST', headers: { 'Content-Type': 'application/json', 'X-Debug-Session-Id': '88d521' }, body: JSON.stringify({ sessionId: '88d521', location: 'fetchChargeCardRepaymentDetailEpic.ts:epic', message: 'fetchChargeCardRepaymentDetailEpic dispatch', data: { depositListFetchState: depositAccounts.fetchState, willFetchDeposit, accountIdsLength: (_a = depositAccounts.accountIds) === null || _a === void 0 ? void 0 : _a.length }, timestamp: Date.now(), hypothesisId: 'H3' }) }).catch(() => { });
+    // #endregion
     const paymentAccounts = state.paymentAccountListState;
     if (paymentAccounts.fetchState !== 'In-Progress' &&
         paymentAccounts.fetchState !== 'Completed') {

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) => {
@@ -40,6 +41,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/zeniAccounts/depositAccountList/fetchDepositAccountListEpic.js

@@ -11,12 +11,16 @@ 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) => {
-        var _a, _b, _c, _d, _e;
+        var _a, _b, _c, _d, _e, _f, _g;
         if ((0, responsePayload_1.isSuccessResponse)(response)) {
-            return (0, rxjs_1.of)((0, depositAccountReducer_1.updateDepositAccounts)((_b = (_a = response.data) === null || _a === void 0 ? void 0 : _a.deposit_accounts) !== null && _b !== void 0 ? _b : []), (0, zeniAccountListReducer_1.updateZeniAccountsSummary)({
-                summaryPayload: (_c = response.data) === null || _c === void 0 ? void 0 : _c.all_deposit_accounts_summary,
+            // #region agent log
+            const depositAccounts = (_b = (_a = response.data) === null || _a === void 0 ? void 0 : _a.deposit_accounts) !== null && _b !== void 0 ? _b : [];
+            fetch('http://127.0.0.1:7242/ingest/3d86d94d-63fc-405c-92bd-d68a0fc3a8c8', { method: 'POST', headers: { 'Content-Type': 'application/json', 'X-Debug-Session-Id': '88d521' }, body: JSON.stringify({ sessionId: '88d521', location: 'fetchDepositAccountListEpic.ts:epic', message: 'deposit-accounts API response', data: { depositAccountsCount: depositAccounts.length, accountIds: depositAccounts.map((a) => a === null || a === void 0 ? void 0 : a.deposit_account_id) }, timestamp: Date.now(), hypothesisId: 'H5' }) }).catch(() => { });
+            // #endregion
+            return (0, rxjs_1.of)((0, depositAccountReducer_1.updateDepositAccounts)((_d = (_c = response.data) === null || _c === void 0 ? void 0 : _c.deposit_accounts) !== null && _d !== void 0 ? _d : []), (0, zeniAccountListReducer_1.updateZeniAccountsSummary)({
+                summaryPayload: (_e = response.data) === null || _e === void 0 ? void 0 : _e.all_deposit_accounts_summary,
             }), (0, depositAccountListReducer_1.updateDepositAccountList)({
-                data: (_e = (_d = response.data) === null || _d === void 0 ? void 0 : _d.deposit_accounts) !== null && _e !== void 0 ? _e : [],
+                data: (_g = (_f = response.data) === null || _f === void 0 ? void 0 : _f.deposit_accounts) !== null && _g !== void 0 ? _g : [],
                 updateType: 'replace',
             }));
         }

package/package.json

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