@zeniai/client-epic-state 4.19.24-betaRR10 → 4.19.24-betaRR11

package/lib/entity/chargeCardRepayment/chargeCardRepayment.d.ts

@@ -22,6 +22,7 @@ export interface ChargeCardRepayment {
     updateTime: ZeniDate;
     zeniCreditAccountId: ID;
     isAutoPayEnabled?: boolean;
+    paymentAccountId?: string | null;
     paymentAccountName?: string;
     providerCounterpartyAccountId?: ID;
     providerCounterpartyId?: ID;

package/lib/entity/chargeCardRepayment/chargeCardRepaymentPayload.d.ts

@@ -25,6 +25,7 @@ export interface ChargeCardRepaymentPayload {
     is_auto_pay_enabled?: boolean;
     is_deleted?: boolean;
     paid_by_user?: UserPayload | null;
+    payment_account_id?: string | null;
     payment_account_name?: string | null;
     provider_counterparty_account_id?: string | null;
     provider_counterparty_id?: string;

package/lib/entity/chargeCardRepayment/chargeCardRepaymentPayload.js

@@ -5,7 +5,7 @@ const amount_1 = require("../../commonStateTypes/amount");
 const zeniDayJS_1 = require("../../zeniDayJS");
 const chargeCardRepayment_1 = require("./chargeCardRepayment");
 const mapChargeCardRepaymentPayloadToChargeCardRepayment = (payload) => {
-    var _a, _b, _c, _d, _e;
+    var _a, _b, _c, _d, _e, _f;
     return ({
         amount: (0, amount_1.toAmount)(payload.amount, payload.currency_code, payload.currency_symbol),
         cardRepaymentId: payload.card_repayment_id,
@@ -17,7 +17,8 @@ const mapChargeCardRepaymentPayloadToChargeCardRepayment = (payload) => {
         paidById: payload.paid_by_user_id,
         paymentMethod: payload.payment_method,
         paymentAccountName: (_b = payload.payment_account_name) !== null && _b !== void 0 ? _b : undefined,
-        providerCounterpartyId: (_c = payload.provider_counterparty_id) !== null && _c !== void 0 ? _c : undefined,
+        paymentAccountId: (_c = payload.payment_account_id) !== null && _c !== void 0 ? _c : undefined,
+        providerCounterpartyId: (_d = payload.provider_counterparty_id) !== null && _d !== void 0 ? _d : undefined,
         providerCreditAccountId: payload.provider_credit_account_id,
         providerDepositAccountId: payload.provider_deposit_account_id,
         providerId: payload.provider_id,
@@ -29,8 +30,8 @@ const mapChargeCardRepaymentPayloadToChargeCardRepayment = (payload) => {
         updateTime: (0, zeniDayJS_1.date)(payload.update_time),
         zeniCreditAccountId: payload.zeni_credit_account_id,
         repaymentType: (0, chargeCardRepayment_1.toChargeCardRepaymentType)(payload.repayment_type),
-        providerCounterpartyAccountId: (_d = payload.provider_counterparty_account_id) !== null && _d !== void 0 ? _d : undefined,
-        thirdPartyTransactionId: (_e = payload.third_party_transaction_id) !== null && _e !== void 0 ? _e : undefined,
+        providerCounterpartyAccountId: (_e = payload.provider_counterparty_account_id) !== null && _e !== void 0 ? _e : undefined,
+        thirdPartyTransactionId: (_f = payload.third_party_transaction_id) !== null && _f !== void 0 ? _f : undefined,
     });
 };
 exports.mapChargeCardRepaymentPayloadToChargeCardRepayment = mapChargeCardRepaymentPayloadToChargeCardRepayment;

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

@@ -17,7 +17,6 @@ export interface ChargeCardPaymentHistoryState extends FetchedState {
     filters: PaymentHistoryFilters;
     isAutoPayEnabled: boolean;
     repaymentHistoryIds: ID[];
-    repaymentHistoryUserIds: ID[];
     repaymentHistoryXlsDownloadUrl: string;
     searchText: string;
     totalRepayments: number;

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

@@ -22,7 +22,6 @@ exports.initialChargeCardPaymentHistoryState = {
     },
     isAutoPayEnabled: false,
     repaymentHistoryIds: [],
-    repaymentHistoryUserIds: [],
     searchText: '',
     totalRepayments: 0,
     repaymentHistoryXlsDownloadUrl: '',

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

@@ -6,8 +6,9 @@ const userSelector_1 = require("../../../../entity/user/userSelector");
 const chargeCardPaymentHistoryHelpers_1 = require("./chargeCardPaymentHistoryHelpers");
 const getChargeCardPaymentHistoryDownloadReport = (state) => {
     const { chargeCardPaymentHistoryState, chargeCardRepaymentState, userState, } = state;
-    const { filters, repaymentHistoryIds, repaymentHistoryUserIds, searchText, uiState, fetchState, error, } = chargeCardPaymentHistoryState;
+    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) => (Object.assign(Object.assign({}, repayment), { paidByUser: userMap.get(repayment.paidById) })));

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

@@ -32,9 +32,6 @@ const chargeCardPaymentHistory = (0, toolkit_1.createSlice)({
             draft.currencySymbol = payload.currency_symbol;
             draft.isAutoPayEnabled = payload.is_auto_pay_enabled;
             draft.repaymentHistoryIds = payload.repayment_history.map((repayment) => repayment.card_repayment_id);
-            draft.repaymentHistoryUserIds = payload.repayment_history
-                .map((repayment) => { var _a; return (_a = repayment.paid_by_user) === null || _a === void 0 ? void 0 : _a.user_id; })
-                .filter((userId) => userId != null);
             draft.totalRepayments = payload.total_repayments;
             draft.fetchState = 'Completed';
             draft.error = undefined;

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

@@ -10,9 +10,10 @@ const paymentAccountListSelector_1 = require("../../zeniAccounts/paymentAccountL
 const chargeCardPaymentHistoryHelpers_1 = require("./chargeCardPaymentHistoryHelpers");
 const getChargeCardPaymentHistoryView = (state, accountInfoMap) => {
     const { chargeCardPaymentHistoryState, chargeCardRepaymentState, userState, depositAccountState, paymentAccountState, depositAccountListState, paymentAccountListState, } = state;
-    const { creditAccountId, currencyCode, currencySymbol, filters, isAutoPayEnabled, repaymentHistoryIds, repaymentHistoryUserIds, searchText, totalRepayments, uiState, fetchState, error, } = chargeCardPaymentHistoryState;
+    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
@@ -25,7 +26,7 @@ const getChargeCardPaymentHistoryView = (state, accountInfoMap) => {
     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.providerDepositAccountId)
+        .map((repayment) => repayment.paymentAccountId)
         .filter((id) => id !== undefined && id !== null)));
     // Get deposit and payment accounts views for fetch state reduction
     const depositAccountsView = (0, depositAccountListSelector_1.getAllDepositAccounts)(depositAccountState, depositAccountListState);
@@ -38,7 +39,7 @@ const getChargeCardPaymentHistoryView = (state, accountInfoMap) => {
         // 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.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);
     }

package/package.json

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