@zeniai/client-epic-state 4.19.8-betaRR2 → 4.19.8-betaRR4

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

@@ -16,6 +16,7 @@ export interface ChargeCardRepayment {
     providerPaymentId: ID;
     providerRepaymentId: ID;
     repaymentDate: ZeniDate;
+    repaymentType: ChargeCardRepaymentType;
     status: ChargeCardRepaymentStatusCodeType;
     statusDescription: string;
     updateTime: ZeniDate;
@@ -30,3 +31,5 @@ export interface ChargeCardRepaymentState {
 }
 export declare const toChargeCardRepaymentStatusCodeType: (v: string) => "PendingReview" | "Pending" | "Sent" | "Clear" | "Rejected" | "Returned";
 export type ChargeCardRepaymentStatusCodeType = ReturnType<typeof toChargeCardRepaymentStatusCodeType>;
+export declare const toChargeCardRepaymentType: (v: string) => "scheduled" | "onDemand";
+export type ChargeCardRepaymentType = ReturnType<typeof toChargeCardRepaymentType>;

package/lib/entity/chargeCardRepayment/chargeCardRepayment.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.toChargeCardRepaymentStatusCodeType = void 0;
+exports.toChargeCardRepaymentType = exports.toChargeCardRepaymentStatusCodeType = void 0;
 const stringToUnion_1 = require("../../commonStateTypes/stringToUnion");
 const ALL_CHARGE_CARD_REPAYMENT_STATUS_CODE = [
     'PendingReview',
@@ -12,3 +12,6 @@ const ALL_CHARGE_CARD_REPAYMENT_STATUS_CODE = [
 ];
 const toChargeCardRepaymentStatusCodeType = (v) => (0, stringToUnion_1.stringToUnion)(v, ALL_CHARGE_CARD_REPAYMENT_STATUS_CODE);
 exports.toChargeCardRepaymentStatusCodeType = toChargeCardRepaymentStatusCodeType;
+const ALL_CHARGE_CARD_REPAYMENT_TYPE = ['scheduled', 'onDemand'];
+const toChargeCardRepaymentType = (v) => (0, stringToUnion_1.stringToUnion)(v, ALL_CHARGE_CARD_REPAYMENT_TYPE);
+exports.toChargeCardRepaymentType = toChargeCardRepaymentType;

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

@@ -16,6 +16,7 @@ export interface ChargeCardRepaymentPayload {
     provider_payment_id: string;
     provider_repayment_id: string;
     repayment_date: string;
+    repayment_type: string;
     status: string;
     status_description: string;
     third_party_transaction_id: string | null;

package/lib/entity/chargeCardRepayment/chargeCardRepaymentPayload.js

@@ -27,6 +27,7 @@ const mapChargeCardRepaymentPayloadToChargeCardRepayment = (payload) => {
         statusDescription: payload.status_description,
         updateTime: (0, zeniDayJS_1.date)(payload.update_time),
         zeniCreditAccountId: payload.zeni_credit_account_id,
+        repaymentType: (0, chargeCardRepayment_1.toChargeCardRepaymentType)(payload.repayment_type),
         providerCounterpartyAccountId: (_c = payload.provider_counterparty_account_id) !== null && _c !== void 0 ? _c : undefined,
         thirdPartyTransactionId: (_d = payload.third_party_transaction_id) !== null && _d !== void 0 ? _d : undefined,
     });

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

@@ -4,13 +4,16 @@ import { ChargeCardRepayment } from '../../../../entity/chargeCardRepayment/char
 import { User } from '../../../../entity/user/userState';
 import { RootState } from '../../../../reducer';
 import { PaymentHistoryFilters, PaymentHistoryUIState } from './chargeCardPaymentHistory';
+export interface ChargeCardRepaymentWithUser extends ChargeCardRepayment {
+    paidByUser?: User;
+}
 export interface ChargeCardPaymentHistorySelectorView extends SelectorView {
     creditAccountId: ID;
     currencyCode: string;
     currencySymbol: string;
     filters: PaymentHistoryFilters;
     isAutoPayEnabled: boolean;
-    repaymentHistory: ChargeCardRepayment[];
+    repaymentHistory: ChargeCardRepaymentWithUser[];
     repaymentHistoryIds: ID[];
     repaymentHistoryUsers: User[];
     searchText: string;

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

@@ -35,35 +35,45 @@ const getChargeCardPaymentHistoryView = (state, accountInfoMap) => {
     const { chargeCardPaymentHistoryState, chargeCardRepaymentState, userState } = state;
     const { creditAccountId, currencyCode, currencySymbol, filters, isAutoPayEnabled, repaymentHistoryIds, repaymentHistoryUserIds, searchText, totalRepayments, uiState, fetchState, error, } = chargeCardPaymentHistoryState;
     // Get the full repayment details from the entity state
-    let repaymentHistory = (0, chargeCardRepaymentSelector_1.getChargeCardRepaymentByIds)(chargeCardRepaymentState, repaymentHistoryIds);
+    const repaymentHistory = (0, chargeCardRepaymentSelector_1.getChargeCardRepaymentByIds)(chargeCardRepaymentState, repaymentHistoryIds);
+    // 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) => (Object.assign(Object.assign({}, repayment), { paidByUser: userMap.get(repayment.paidById) })));
     // Apply filters
-    repaymentHistory = (0, spendManagementFilterHelpers_1.applyAdvancedFiltersOnList)('charge_card_payment_history', repaymentHistory, filters);
+    repaymentHistoryWithUsers = (0, spendManagementFilterHelpers_1.applyAdvancedFiltersOnList)('charge_card_payment_history', repaymentHistoryWithUsers, filters);
     // Apply search text filtering
     const loweredSearchText = searchText.trim().toLowerCase();
     if (loweredSearchText.length > 0) {
-        repaymentHistory = repaymentHistory.filter((repayment) => {
+        repaymentHistoryWithUsers = repaymentHistoryWithUsers.filter((repayment) => {
             var _a, _b;
             const amountString = repayment.amount.amount.toString();
             const statusString = repayment.status.toLowerCase();
-            const initiatedByString = repayment.isAutoPayEnabled === true ? 'autopay' : 'manual';
+            const initiatedByString = repayment.repaymentType === 'scheduled'
+                ? 'autopay'
+                : (0, userSelector_1.getUserName)(repayment.paidByUser);
             const accountInfo = accountInfoMap === null || accountInfoMap === void 0 ? void 0 : accountInfoMap.get(repayment.providerDepositAccountId);
             const accountNameString = (_b = (_a = accountInfo === null || accountInfo === void 0 ? void 0 : accountInfo.depositAccountName) === null || _a === void 0 ? void 0 : _a.toLowerCase()) !== null && _b !== void 0 ? _b : '';
             return (amountString.includes(loweredSearchText) ||
                 statusString.includes(loweredSearchText) ||
-                initiatedByString.includes(loweredSearchText) ||
+                initiatedByString.toLowerCase().includes(loweredSearchText) ||
                 accountNameString.includes(loweredSearchText));
         });
     }
     // Apply sorting
-    repaymentHistory = sortPaymentHistory(repaymentHistory, uiState.sortKey, uiState.sortOrder, accountInfoMap);
-    const repaymentHistoryUsers = (0, userSelector_1.getUsersByUserIds)(userState, repaymentHistoryUserIds);
+    repaymentHistoryWithUsers = sortPaymentHistory(repaymentHistoryWithUsers, uiState.sortKey, uiState.sortOrder, accountInfoMap);
     return {
         creditAccountId,
         currencyCode,
         currencySymbol,
         filters,
         isAutoPayEnabled,
-        repaymentHistory,
+        repaymentHistory: repaymentHistoryWithUsers,
         repaymentHistoryIds,
         repaymentHistoryUsers,
         searchText,

package/package.json

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