@zeniai/client-epic-state 4.19.60 → 4.19.61

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

@@ -0,0 +1,87 @@
+"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.addRepaymentToChargeCardPaymentHistory = exports.initialState = void 0;
+const toolkit_1 = require("@reduxjs/toolkit");
+const chargeCardPaymentHistory_1 = require("./chargeCardPaymentHistory");
+exports.initialState = chargeCardPaymentHistory_1.initialChargeCardPaymentHistoryState;
+const chargeCardPaymentHistory = (0, toolkit_1.createSlice)({
+    name: 'chargeCardPaymentHistory',
+    initialState: exports.initialState,
+    reducers: {
+        fetchChargeCardPaymentPage: {
+            reducer() {
+                // do nothing
+            },
+            prepare(cacheOverride = false) {
+                return {
+                    payload: {
+                        cacheOverride,
+                    },
+                };
+            },
+        },
+        fetchChargeCardPaymentHistory(draft) {
+            draft.fetchState = 'In-Progress';
+            draft.error = undefined;
+        },
+        updateChargeCardPaymentHistory(draft, action) {
+            const payload = action.payload;
+            draft.creditAccountId = payload.credit_account_id;
+            draft.currencyCode = payload.currency_code;
+            draft.currencySymbol = payload.currency_symbol;
+            draft.isAutoPayEnabled = payload.is_auto_pay_enabled;
+            draft.repaymentHistoryIds = payload.repayment_history.map((repayment) => repayment.card_repayment_id);
+            draft.totalRepayments = payload.total_repayments;
+            draft.fetchState = 'Completed';
+            draft.error = undefined;
+        },
+        updateChargeCardPaymentHistoryFailure(draft, action) {
+            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);
+        },
+        updatePaymentHistoryFilters(draft, action) {
+            if (action.payload.filters != null) {
+                draft.filters = action.payload.filters;
+            }
+        },
+        updatePaymentHistorySearchText(draft, action) {
+            if (action.payload != null) {
+                draft.searchText = action.payload;
+            }
+        },
+        updatePaymentHistoryUIState(draft, action) {
+            if (action.payload.uiState.sortKey != null) {
+                draft.uiState.sortKey = action.payload.uiState.sortKey;
+            }
+            if (action.payload.uiState.sortOrder != null) {
+                draft.uiState.sortOrder = action.payload.uiState.sortOrder;
+            }
+            if (action.payload.uiState.scrollYOffset != null) {
+                draft.uiState.scrollYOffset = action.payload.uiState.scrollYOffset;
+            }
+        },
+        updatePaymentHistoryDownloadUIState(draft, action) {
+            if (action.payload.uiState.downloadState != null) {
+                draft.downloadUIState.downloadState =
+                    action.payload.uiState.downloadState;
+            }
+        },
+    },
+});
+_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.d.ts

@@ -0,0 +1,24 @@
+import { ID } from '../../../../commonStateTypes/common';
+import { SelectorView } from '../../../../commonStateTypes/viewAndReport/viewAndReport';
+import { ChargeCardRepayment } from '../../../../entity/chargeCardRepayment/chargeCardRepayment';
+import { User } from '../../../../entity/user/userState';
+import { RootState } from '../../../../reducer';
+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[];
+    repaymentHistoryIds: ID[];
+    repaymentHistoryUsers: User[];
+    searchText: string;
+    totalRepayments: number;
+    uiState: PaymentHistoryUIState;
+}
+export declare const getChargeCardPaymentHistoryView: (state: RootState) => ChargeCardPaymentHistorySelectorView;

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 depositAccountSelector_1 = require("../../../../entity/depositAccount/depositAccountSelector");
+const paymentAccountSelector_1 = require("../../../../entity/paymentAccount/paymentAccountSelector");
+const userSelector_1 = require("../../../../entity/user/userSelector");
+const setupViewSelector_1 = require("../../commonSetup/setupViewSelector");
+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,20 @@ 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,9 @@ 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

@@ -5,6 +5,7 @@ import { updateCompanyPrimaryAccount, updateEnableAutoPayForChargeCard } from '.
 import { RootState } from '../../../../reducer';
 import { ZeniAPI } from '../../../../zeniAPI';
 import { updateCreditAccountRepaymentAmountAndDate } from '../chargeCardList/chargeCardListReducer';
+import { addRepaymentToChargeCardPaymentHistory } from '../chargeCardPaymentHistory/chargeCardPaymentHistoryReducer';
 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

@@ -13,6 +13,7 @@ const helpers_1 = require("../../helpers");
 const depositAccountListSelector_1 = require("../../zeniAccounts/depositAccountList/depositAccountListSelector");
 const paymentAccountListSelector_1 = require("../../zeniAccounts/paymentAccountList/paymentAccountListSelector");
 const chargeCardListReducer_1 = require("../chargeCardList/chargeCardListReducer");
+const chargeCardPaymentHistoryReducer_1 = require("../chargeCardPaymentHistory/chargeCardPaymentHistoryReducer");
 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) => {
     const state = state$.value;
@@ -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/epic/setup/updateBusinessVerificationDetailsEpic.js

@@ -122,8 +122,28 @@ const updateBusinessVerificationDetailsEpic = (actions$, state$, zeniAPI) => act
     }
 }));
 exports.updateBusinessVerificationDetailsEpic = updateBusinessVerificationDetailsEpic;
+/** US Nexus API keys. Form may submit these or display labels; we send keys to API. */
+const US_NEXUS_KEYS = new Set([
+    'employees',
+    'customers',
+    'physical_office',
+    'banking_relationships',
+]);
+/** Maps display label → API key for US nexus types (English labels from strings). */
+const US_NEXUS_LABEL_TO_KEY = {
+    Employees: 'employees',
+    Customers: 'customers',
+    'Physical office or facility': 'physical_office',
+    'Banking relationships': 'banking_relationships',
+};
+function toUsNexusTypeKey(value) {
+    if (US_NEXUS_KEYS.has(value)) {
+        return value;
+    }
+    return US_NEXUS_LABEL_TO_KEY[value] ?? value;
+}
 const toBusinessVerificationCompanyDataPayload = (companyLocalData, sendForVerification, companyAddressData, registeredAddressData, setupViewType) => {
-    const { companyDescription, companyLegalName, companyIndustry, website, incDate, taxIdOrEIN, phone, syncToken, fileIds, typeOfIncorporation, sourceOfFunds, } = companyLocalData;
+    const { companyDescription, companyLegalName, companyIndustry, companySubIndustry, countriesOfOperations, companySourceOfFunds, companySourceOfFundsDescription, transactionVolume, transactionVolumeDescription, purposeOfAccount, purposeOfAccountDescription, regulatedStatus, regulatedStatusDescription, usNexus, usNexusTypes, website, incDate, taxIdOrEIN, phone, syncToken, fileIds, typeOfIncorporation, stateOfIncorporation, sourceOfFunds, } = companyLocalData;
     const company = {
         is_ready_for_verification: sendForVerification,
         file_ids: fileIds,
@@ -174,9 +194,52 @@ const toBusinessVerificationCompanyDataPayload = (companyLocalData, sendForVerif
     if (typeOfIncorporation != null) {
         company['company_inc_type'] = typeOfIncorporation;
     }
+    if (stateOfIncorporation != null) {
+        company['company_inc_state'] = stateOfIncorporation;
+    }
     if (companyIndustry != null) {
         company['company_industry'] = companyIndustry;
     }
+    Object.assign(company, {
+        ...(companySubIndustry != null && {
+            company_industry_sub_type: companySubIndustry,
+        }),
+        ...(countriesOfOperations != null &&
+            countriesOfOperations.length > 0 && {
+            company_countries_of_operations: countriesOfOperations,
+        }),
+        ...(companySourceOfFunds != null && {
+            company_source_of_funds: companySourceOfFunds,
+        }),
+        ...(companySourceOfFundsDescription != null && {
+            company_source_of_funds_desc: companySourceOfFundsDescription,
+        }),
+        ...(transactionVolume != null && {
+            company_transaction_vol_expectations: transactionVolume,
+        }),
+        ...(transactionVolumeDescription != null && {
+            company_transaction_vol_expectations_desc: transactionVolumeDescription,
+        }),
+        ...(purposeOfAccount != null && {
+            company_purpose_of_account: purposeOfAccount,
+        }),
+        ...(purposeOfAccountDescription != null && {
+            company_purpose_of_account_desc: purposeOfAccountDescription,
+        }),
+        ...(regulatedStatus != null && {
+            company_regulated_states: regulatedStatus === 'yes',
+        }),
+        ...(regulatedStatusDescription != null && {
+            company_regulated_states_desc: regulatedStatusDescription,
+        }),
+        ...(usNexus != null && {
+            company_us_nexus: usNexus === 'yes',
+        }),
+        ...(usNexusTypes != null &&
+            usNexusTypes.length > 0 && {
+            company_us_nexus_desc: usNexusTypes.map(toUsNexusTypeKey),
+        }),
+    });
     if (setupViewType === 'zeni_treasury' && sourceOfFunds != null) {
         company['source_of_funds'] = sourceOfFunds;
     }

package/lib/view/spendManagement/commonSetup/epic/setup/updateSetupViewLocalStoreDataEpic.js

@@ -53,7 +53,7 @@ function toSetupViewLocalData(company, users, userRoles, primaryContact) {
     const { companyInfo, incInfo, taxInfo, questionaire, companyBillPayInfo } = company;
     const { companyId, companyDescription, companyLegalName, companyUrl, phone, syncToken, sourceOfFunds, } = companyInfo;
     const { usersSelectedForVerification: usersSelected } = companyBillPayInfo;
-    const { fileIds, companyIncDate: incDate, companyIncType } = incInfo;
+    const { fileIds, companyIncDate: incDate, companyIncType, companyIncState, companySubIndustry, countriesOfOperations, companySourceOfFunds: incCompanySourceOfFunds, companySourceOfFundsDescription, transactionVolume, transactionVolumeDescription, purposeOfAccount, purposeOfAccountDescription, regulatedStatus, regulatedStatusDescription, usNexus, usNexusTypes, } = incInfo;
     const { companyIndustry } = questionaire;
     const { taxId } = taxInfo;
     const companyDetails = {
@@ -61,6 +61,10 @@ function toSetupViewLocalData(company, users, userRoles, primaryContact) {
         companyDescription,
         companyIndustry,
         companyLegalName,
+        companySubIndustry,
+        companySourceOfFunds: incCompanySourceOfFunds,
+        companySourceOfFundsDescription,
+        countriesOfOperations,
         taxIdOrEIN: taxId,
         incDate,
         phone,
@@ -69,6 +73,15 @@ function toSetupViewLocalData(company, users, userRoles, primaryContact) {
         syncToken,
         typeOfIncorporation: companyIncType,
         sourceOfFunds,
+        stateOfIncorporation: companyIncState,
+        transactionVolume,
+        transactionVolumeDescription,
+        purposeOfAccount,
+        purposeOfAccountDescription,
+        regulatedStatus,
+        regulatedStatusDescription,
+        usNexus,
+        usNexusTypes,
     };
     let primaryContactDetails = undefined;
     if (primaryContact != null) {

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';
@@ -70,14 +70,27 @@ export interface CompanyDetails {
     companyDescription?: string;
     companyIndustry?: string;
     companyLegalName?: string;
+    companySourceOfFunds?: string;
+    companySourceOfFundsDescription?: string;
+    companySubIndustry?: string;
+    countriesOfOperations?: string[];
     incDate?: ZeniDate;
     phone?: string;
     primaryContactLocalData?: PrimaryContactLocalData;
+    purposeOfAccount?: string;
+    purposeOfAccountDescription?: string;
     registeredAddressStatus?: NewAddressData;
+    regulatedStatus?: string;
+    regulatedStatusDescription?: string;
     sourceOfFunds?: string;
+    stateOfIncorporation?: string;
     syncToken?: string;
     taxIdOrEIN?: string;
+    transactionVolume?: string;
+    transactionVolumeDescription?: string;
     typeOfIncorporation?: string;
+    usNexus?: string;
+    usNexusTypes?: string[];
     website?: ZeniUrl;
 }
 interface CompanyAndOfficerLocalData {
@@ -94,5 +107,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");
@@ -114,7 +114,7 @@ const getCompanyAndIdentityDetails = (state, companyId, companyAndIdentityDetail
     if (companyDetails.localData != null) {
         const deleteFileStatusById = {};
         const updateFileStatusById = {};
-        const { syncToken, companyDescription, companyLegalName, website, companyIndustry, phone, taxIdOrEIN, incDate, fileIds, typeOfIncorporation, sourceOfFunds, } = companyDetails.localData;
+        const { syncToken, companyDescription, companyLegalName, website, companyIndustry, companySubIndustry, companySourceOfFunds, companySourceOfFundsDescription, countriesOfOperations, phone, taxIdOrEIN, incDate, fileIds, typeOfIncorporation, sourceOfFunds, transactionVolume, transactionVolumeDescription, purposeOfAccount, purposeOfAccountDescription, regulatedStatus, regulatedStatusDescription, stateOfIncorporation, usNexus, usNexusTypes, } = companyDetails.localData;
         fileIds.forEach((fileId) => {
             deleteFileStatusById[fileId] = (0, fileViewSelector_1.getFileDeleteStatusById)(state, fileId);
         });
@@ -128,6 +128,10 @@ const getCompanyAndIdentityDetails = (state, companyId, companyAndIdentityDetail
             companyDescription,
             companyLegalName,
             companyIndustry,
+            companySubIndustry,
+            companySourceOfFunds,
+            companySourceOfFundsDescription,
+            countriesOfOperations,
             website,
             phone,
             taxIdOrEIN,
@@ -141,6 +145,15 @@ const getCompanyAndIdentityDetails = (state, companyId, companyAndIdentityDetail
             primaryContactLocalData,
             typeOfIncorporation,
             sourceOfFunds,
+            transactionVolume,
+            transactionVolumeDescription,
+            purposeOfAccount,
+            purposeOfAccountDescription,
+            regulatedStatus,
+            regulatedStatusDescription,
+            stateOfIncorporation,
+            usNexus,
+            usNexusTypes,
         };
     }
     const companyOfficerLocalData = {
@@ -227,6 +240,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',