@zeniai/client-epic-state 4.16.3 → 4.16.4

package/lib/view/spendManagement/chargeCards/chargeCardList/fetchChargeCardListPageEpic.js

@@ -9,19 +9,13 @@ const cashbackDetailReducer_1 = require("../cashbackDetail/cashbackDetailReducer
 const chargeCardConfigReducer_1 = require("../chargeCardConfig/chargeCardConfigReducer");
 const chargeCardListReducer_1 = require("./chargeCardListReducer");
 const fetchChargeCardListPageEpic = (actions$, state$) => actions$.pipe((0, operators_1.filter)(chargeCardListReducer_1.fetchChargeCardListPage.match), (0, operators_1.mergeMap)((action) => {
-    const { doFetchCreditAccountsDebitSummaryAndCashback, isDebitCardEnabled, isCreditCardEnabled, cacheOverride, } = action.payload;
+    const { doFetchCreditAccountsAndCashback, cacheOverride } = action.payload;
     const chargeCardListPageAction = [];
     const state = state$.value;
     const cashbackDetailState = state.cashbackDetailState;
     if (cacheOverride === true) {
-        if (doFetchCreditAccountsDebitSummaryAndCashback === true) {
-            if (isCreditCardEnabled) {
-                chargeCardListPageAction.push((0, chargeCardListReducer_1.fetchCreditAccount)());
-            }
-            if (isDebitCardEnabled) {
-                chargeCardListPageAction.push((0, chargeCardListReducer_1.fetchDebitCardSummary)());
-            }
-            chargeCardListPageAction.push((0, cashbackDetailReducer_1.fetchCashbackDetail)());
+        if (doFetchCreditAccountsAndCashback === true) {
+            chargeCardListPageAction.push((0, chargeCardListReducer_1.fetchCreditAccount)(), (0, cashbackDetailReducer_1.fetchCashbackDetail)());
         }
         chargeCardListPageAction.push((0, chargeCardListReducer_1.fetchChargeCardList)());
         chargeCardListPageAction.push((0, chargeCardConfigReducer_1.fetchChargeCardConfig)());
@@ -31,13 +25,12 @@ const fetchChargeCardListPageEpic = (actions$, state$) => actions$.pipe((0, oper
     }
     else {
         const chargeCardList = state.chargeCardListState;
-        if (doFetchCreditAccountsDebitSummaryAndCashback === true &&
-            isCreditCardEnabled &&
+        if (doFetchCreditAccountsAndCashback === true &&
             chargeCardList.creditAccount.fetchState !== 'Completed' &&
             chargeCardList.creditAccount.fetchState !== 'In-Progress') {
             chargeCardListPageAction.push((0, chargeCardListReducer_1.fetchCreditAccount)());
         }
-        if (doFetchCreditAccountsDebitSummaryAndCashback &&
+        if (doFetchCreditAccountsAndCashback &&
             cashbackDetailState.fetchState !== 'In-Progress' &&
             cashbackDetailState.hasValidState() === false) {
             chargeCardListPageAction.push((0, cashbackDetailReducer_1.fetchCashbackDetail)());
@@ -65,14 +58,6 @@ const fetchChargeCardListPageEpic = (actions$, state$) => actions$.pipe((0, oper
             state.classListState.fetchState !== 'In-Progress') {
             chargeCardListPageAction.push((0, classListReducer_1.fetchClassList)());
         }
-        if (doFetchCreditAccountsDebitSummaryAndCashback &&
-            isDebitCardEnabled &&
-            state.chargeCardListState.debitCardSummaries.fetchState !==
-                'In-Progress' &&
-            state.chargeCardListState.debitCardSummaries.fetchState !==
-                'Completed') {
-            chargeCardListPageAction.push((0, chargeCardListReducer_1.fetchDebitCardSummary)());
-        }
     }
     return (0, rxjs_1.concat)((0, rxjs_1.from)(chargeCardListPageAction));
 }));

package/lib/view/spendManagement/chargeCards/chargeCardSetUp/chargeCardSetUpViewReducer.d.ts

@@ -5,10 +5,9 @@ export declare const fetchChargeCardSetupView: import("@reduxjs/toolkit").Action
     companyId: string;
     cacheOverride: any;
     refreshViewInBackground: any;
-}, "chargeCardSetupView/fetchChargeCardSetupView", never, never>, fetchChargeCardSetupViewSuccess: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<"chargeCardSetupView/fetchChargeCardSetupViewSuccess">, fetchChargeCardSetupViewFailure: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[error: ZeniAPIStatus<Record<string, unknown>>], ZeniAPIStatus<Record<string, unknown>>, "chargeCardSetupView/fetchChargeCardSetupViewFailure", never, never>, acceptChargeCardTerms: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[companyId: string, enableChargeCard: boolean, chargeCardSetupViewType: "charge_cards" | "debit_cards" | "charge_cards__debit_cards"], {
+}, "chargeCardSetupView/fetchChargeCardSetupView", never, never>, fetchChargeCardSetupViewSuccess: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<"chargeCardSetupView/fetchChargeCardSetupViewSuccess">, fetchChargeCardSetupViewFailure: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[error: ZeniAPIStatus<Record<string, unknown>>], ZeniAPIStatus<Record<string, unknown>>, "chargeCardSetupView/fetchChargeCardSetupViewFailure", never, never>, acceptChargeCardTerms: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[companyId: string, enableChargeCard: boolean], {
     companyId: string;
     enableChargeCard: boolean;
-    chargeCardSetupViewType: "charge_cards" | "debit_cards" | "charge_cards__debit_cards";
 }, "chargeCardSetupView/acceptChargeCardTerms", never, never>, acceptChargeCardTermsSuccess: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<"chargeCardSetupView/acceptChargeCardTermsSuccess">, acceptChargeCardTermsFailure: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[error: ZeniAPIStatus<Record<string, unknown>>], ZeniAPIStatus<Record<string, unknown>>, "chargeCardSetupView/acceptChargeCardTermsFailure", never, never>, clearChargeCardSetupView: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<"chargeCardSetupView/clearChargeCardSetupView">;
 declare const _default: import("redux").Reducer<ChargeCardSetupViewState>;
 export default _default;

package/lib/view/spendManagement/chargeCards/chargeCardSetUp/chargeCardSetUpViewReducer.js

@@ -57,10 +57,8 @@ const chargeCardSetupView = (0, toolkit_1.createSlice)({
                     },
                 });
             },
-            prepare(companyId, enableChargeCard, chargeCardSetupViewType) {
-                return {
-                    payload: { companyId, enableChargeCard, chargeCardSetupViewType },
-                };
+            prepare(companyId, enableChargeCard) {
+                return { payload: { companyId, enableChargeCard } };
             },
         },
         acceptChargeCardTermsSuccess(draft) {

package/lib/view/spendManagement/chargeCards/chargeCardSetUp/chargeCardSetUpViewSelector.d.ts

@@ -1,11 +1,10 @@
 import { FetchStateAndError, ID } from '../../../../commonStateTypes/common';
 import { SelectorView } from '../../../../commonStateTypes/viewAndReport/viewAndReport';
-import { CompanyChargeCardInfo, CompanyDebitCardInfo, CompanyLocaleInfo } from '../../../../entity/company/companyStateTypes';
+import { CompanyChargeCardInfo, CompanyLocaleInfo } from '../../../../entity/company/companyStateTypes';
 import { RootState } from '../../../../reducer';
 import { BusinessVerificationDetails, CompanyOfficersDetails, SetupView } from '../../commonSetup/setupViewSelector';
 export interface ChargeCardSetupView extends SetupView, SelectorView {
     companyChargeCardInfo?: CompanyChargeCardInfo;
-    companyDebitCardInfo?: CompanyDebitCardInfo;
     companyLocaleInfo?: CompanyLocaleInfo;
     chargeCardTermsDetails?: {
         fetchStatus: FetchStateAndError;

package/lib/view/spendManagement/chargeCards/chargeCardSetUp/chargeCardSetUpViewSelector.js

@@ -9,7 +9,6 @@ function getChargeCardSetupViewDetails(state, companyId) {
     const chargeCardSetupViewDetails = (0, setupViewSelector_1.getCommonSetupViewDetails)(state, companyId, 'charge_cards', 'charge_card_setup');
     const companyView = (0, getCompanyView_1.getCompanyView)(state, companyId, []);
     const companyChargeCardInfo = companyView === null || companyView === void 0 ? void 0 : companyView.company.company.companyChargeCardInfo;
-    const companyDebitCardInfo = companyView === null || companyView === void 0 ? void 0 : companyView.company.company.companyDebitCardInfo;
     const companyLocaleInfo = companyView === null || companyView === void 0 ? void 0 : companyView.company.company.companyLocaleInfo;
     const { chargeCardSetupViewState, setupViewState } = state;
     const { chargeCardTermsDetails, isRefreshingViewInBackground } = chargeCardSetupViewState;
@@ -19,7 +18,6 @@ function getChargeCardSetupViewDetails(state, companyId) {
     const selectedCompanyOfficer = (0, helpers_1.getSelectedCompanyOfficer)(businessVerificationDetails);
     return Object.assign(Object.assign({}, chargeCardSetupViewDetails), { chargeCardTermsDetails,
         companyChargeCardInfo,
-        companyDebitCardInfo,
         companyLocaleInfo, version: 1, fetchState,
         error,
         updateStatus,

package/lib/view/spendManagement/chargeCards/chargeCardSetUp/epic/acceptChargeCardTermsEpic.js

@@ -10,26 +10,9 @@ const userRoleReducer_1 = require("../../../../../entity/userRole/userRoleReduce
 const responsePayload_1 = require("../../../../../responsePayload");
 const chargeCardSetUpViewReducer_1 = require("../chargeCardSetUpViewReducer");
 const acceptChargeCardTermsEpic = (actions$, _state$, zeniAPI) => actions$.pipe((0, operators_1.filter)(chargeCardSetUpViewReducer_1.acceptChargeCardTerms.match), (0, operators_1.mergeMap)((action) => {
-    const { companyId, enableChargeCard, chargeCardSetupViewType } = action.payload;
-    let payload;
-    switch (chargeCardSetupViewType) {
-        case 'charge_cards':
-            payload = Object.assign({ is_charge_cards_tos_accepted: true }, (enableChargeCard && { is_charge_cards_enabled: true }));
-            break;
-        case 'charge_cards__debit_cards':
-            payload = Object.assign({ is_charge_cards_tos_accepted: true, is_debit_cards_tos_accepted: true }, (enableChargeCard && {
-                is_charge_cards_enabled: true,
-                is_debit_cards_enabled: true,
-            }));
-            break;
-        case 'debit_cards':
-            payload = Object.assign({ is_debit_cards_tos_accepted: true }, (enableChargeCard && { is_debit_cards_enabled: true }));
-            break;
-        default:
-            payload = {};
-    }
+    const { companyId, enableChargeCard } = action.payload;
     return zeniAPI
-        .putAndGetJSON(`${zeniAPI.apiEndPoints.tenantMicroServiceBaseUrl}/1.0/companies/${companyId}`, payload)
+        .putAndGetJSON(`${zeniAPI.apiEndPoints.tenantMicroServiceBaseUrl}/1.0/companies/${companyId}`, Object.assign({ is_charge_cards_tos_accepted: true }, (enableChargeCard && { is_charge_cards_enabled: true })))
         .pipe((0, operators_1.mergeMap)((response) => {
         if ((0, responsePayload_1.isSuccessStatus)(response) && response.data != null) {
             const actions = [

package/lib/view/spendManagement/chargeCards/issueChargeCard/fetchIssueCardPageEpic.d.ts

@@ -5,6 +5,6 @@ import { fetchClassList } from '../../../classList/classListReducer';
 import { fetchUserListByType } from '../../../userListView/userListViewReducer';
 import { fetchChargeCardConfig } from '../chargeCardConfig/chargeCardConfigReducer';
 import { fetchChargeCardList, fetchCreditAccount } from '../chargeCardList/chargeCardListReducer';
-import { fetchDepositAccountListForCards, fetchIssueCardPage } from './issueChargeCardReducer';
-export type ActionType = ReturnType<typeof fetchIssueCardPage> | ReturnType<typeof fetchChargeCardConfig> | ReturnType<typeof fetchUserListByType> | ReturnType<typeof fetchDepositAccountListForCards> | ReturnType<typeof fetchChargeCardList> | ReturnType<typeof fetchClassList> | ReturnType<typeof fetchCreditAccount>;
+import { fetchIssueCardPage } from './issueChargeCardReducer';
+export type ActionType = ReturnType<typeof fetchIssueCardPage> | ReturnType<typeof fetchChargeCardConfig> | ReturnType<typeof fetchUserListByType> | ReturnType<typeof fetchChargeCardList> | ReturnType<typeof fetchClassList> | ReturnType<typeof fetchCreditAccount>;
 export declare const fetchIssueCardPageEpic: (actions$: ActionsObservable<ActionType>, state$: StateObservable<RootState>) => Observable<ActionType>;

package/lib/view/spendManagement/chargeCards/issueChargeCard/fetchIssueCardPageEpic.js

@@ -9,20 +9,15 @@ const chargeCardConfigReducer_1 = require("../chargeCardConfig/chargeCardConfigR
 const chargeCardListReducer_1 = require("../chargeCardList/chargeCardListReducer");
 const issueChargeCardReducer_1 = require("./issueChargeCardReducer");
 const fetchIssueCardPageEpic = (actions$, state$) => actions$.pipe((0, operators_1.filter)(issueChargeCardReducer_1.fetchIssueCardPage.match), (0, operators_1.mergeMap)((action) => {
-    const { cacheOverride, isDebitCardFlagEnabled, isCreditCardFlagEnabled } = action.payload;
+    const { cacheOverride } = action.payload;
     const issueCardPageAction = [];
     const state = state$.value;
     if (cacheOverride === true) {
         issueCardPageAction.push((0, chargeCardConfigReducer_1.fetchChargeCardConfig)());
-        if (isCreditCardFlagEnabled) {
-            issueCardPageAction.push((0, chargeCardListReducer_1.fetchCreditAccount)());
-        }
+        issueCardPageAction.push((0, chargeCardListReducer_1.fetchCreditAccount)());
         issueCardPageAction.push((0, userListViewReducer_1.fetchUserListByType)('cardHolderCandidate', true));
         issueCardPageAction.push((0, classListReducer_1.fetchClassList)());
         issueCardPageAction.push((0, chargeCardListReducer_1.fetchChargeCardList)());
-        if (isDebitCardFlagEnabled) {
-            issueCardPageAction.push((0, issueChargeCardReducer_1.fetchDepositAccountListForCards)());
-        }
     }
     else {
         const chargeCardConfig = state.chargeCardConfigState;
@@ -32,8 +27,7 @@ const fetchIssueCardPageEpic = (actions$, state$) => actions$.pipe((0, operators
         }
         const chargeCardList = state.chargeCardListState;
         if (chargeCardList.creditAccount.fetchState !== 'Completed' &&
-            chargeCardList.creditAccount.fetchState !== 'In-Progress' &&
-            isCreditCardFlagEnabled) {
+            chargeCardList.creditAccount.fetchState !== 'In-Progress') {
             issueCardPageAction.push((0, chargeCardListReducer_1.fetchCreditAccount)());
         }
         const userList = state.userListViewState.userListByType.cardHolderCandidate;
@@ -49,12 +43,6 @@ const fetchIssueCardPageEpic = (actions$, state$) => actions$.pipe((0, operators
             chargeCardList.fetchState !== 'In-Progress') {
             issueCardPageAction.push((0, chargeCardListReducer_1.fetchChargeCardList)());
         }
-        const depositAccountsFetchState = state.issueChargeCardState.depositAccountsFetchState;
-        if (isDebitCardFlagEnabled &&
-            depositAccountsFetchState.fetchState !== 'Completed' &&
-            depositAccountsFetchState.fetchState !== 'In-Progress') {
-            issueCardPageAction.push((0, issueChargeCardReducer_1.fetchDepositAccountListForCards)());
-        }
     }
     return (0, rxjs_1.concat)((0, rxjs_1.from)(issueCardPageAction));
 }));

package/lib/view/spendManagement/chargeCards/issueChargeCard/issueChargeCardEpic.d.ts

@@ -8,6 +8,6 @@ import { updateUserRoles } from '../../../../entity/userRole/userRoleReducer';
 import { RootState } from '../../../../reducer';
 import { ZeniAPI } from '../../../../zeniAPI';
 import { updateChargeCardList } from '../chargeCardList/chargeCardListReducer';
-import { issueChargeCardSuccessOrFailure, issueChargeCards, updateChargeCardCount, updateDebitCardCount } from './issueChargeCardReducer';
-export type ActionType = ReturnType<typeof issueChargeCards> | ReturnType<typeof updateChargeCards> | ReturnType<typeof updateAllUsers> | ReturnType<typeof updateUserRoles> | ReturnType<typeof openSnackbar> | ReturnType<typeof updateChargeCardList> | ReturnType<typeof updateChargeCardCount> | ReturnType<typeof updateDebitCardCount> | ReturnType<typeof issueChargeCardSuccessOrFailure> | ReturnType<typeof updateAddresses>;
+import { issueChargeCardSuccessOrFailure, issueChargeCards, updateCardCount } from './issueChargeCardReducer';
+export type ActionType = ReturnType<typeof issueChargeCards> | ReturnType<typeof updateChargeCards> | ReturnType<typeof updateAllUsers> | ReturnType<typeof updateUserRoles> | ReturnType<typeof openSnackbar> | ReturnType<typeof updateChargeCardList> | ReturnType<typeof updateCardCount> | ReturnType<typeof issueChargeCardSuccessOrFailure> | ReturnType<typeof updateAddresses>;
 export declare const issueChargeCardEpic: (actions$: ActionsObservable<ActionType>, state$: StateObservable<RootState>, zeniAPI: ZeniAPI) => Observable<ActionType>;

package/lib/view/spendManagement/chargeCards/issueChargeCard/issueChargeCardEpic.js

@@ -15,82 +15,42 @@ const issueChargeCardEpic = (actions$, state$, zeniAPI) => actions$.pipe((0, ope
     const state = state$.value;
     const localData = state.issueChargeCardState.localData;
     const payload = localData.map((data) => {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r;
-        if (data.chargeCardType === 'credit_card') {
-            if (data.creditCard.cardType === 'business_physical_credit_card') {
-                return {
-                    card_holder_user_ids: data.creditCard.physicalCard.userId != null
-                        ? [data.creditCard.physicalCard.userId]
-                        : [],
-                    card_name: data.creditCard.physicalCard.cardName,
-                    purchase_limit: (_b = (_a = data.creditCard.physicalCard.amount) === null || _a === void 0 ? void 0 : _a.amount) !== null && _b !== void 0 ? _b : 0,
-                    currency_code: (_d = (_c = data.creditCard.physicalCard.amount) === null || _c === void 0 ? void 0 : _c.currencyCode) !== null && _d !== void 0 ? _d : 'USD',
-                    purchase_limit_frequency: {
-                        code: data.creditCard.physicalCard.frequency,
-                    },
-                    card_type: data.creditCard.cardType,
-                    shipping_address_type: data.creditCard.physicalCard.addressType,
-                    shipping_address_id: data.creditCard.physicalCard.addressId,
-                };
-            }
-            {
-                return {
-                    card_holder_user_ids: data.creditCard.virtualCard.userIds,
-                    card_name: data.creditCard.virtualCard.cardName,
-                    purchase_limit: (_f = (_e = data.creditCard.virtualCard.amount) === null || _e === void 0 ? void 0 : _e.amount) !== null && _f !== void 0 ? _f : 0,
-                    currency_code: (_h = (_g = data.creditCard.virtualCard.amount) === null || _g === void 0 ? void 0 : _g.currencyCode) !== null && _h !== void 0 ? _h : 'USD',
-                    purchase_limit_frequency: {
-                        code: data.creditCard.virtualCard.frequency,
-                    },
-                    card_type: data.creditCard.cardType,
-                };
-            }
+        var _a, _b, _c, _d, _e, _f, _g, _h;
+        if (data.cardType === 'business_physical_credit_card') {
+            return {
+                card_holder_user_ids: data.physicalCard.userId != null
+                    ? [data.physicalCard.userId]
+                    : [],
+                card_name: data.physicalCard.cardName,
+                credit_limit: (_b = (_a = data.physicalCard.amount) === null || _a === void 0 ? void 0 : _a.amount) !== null && _b !== void 0 ? _b : 0,
+                currency_code: (_d = (_c = data.physicalCard.amount) === null || _c === void 0 ? void 0 : _c.currencyCode) !== null && _d !== void 0 ? _d : 'USD',
+                credit_limit_frequency: { code: data.physicalCard.frequency },
+                card_type: data.cardType,
+                shipping_address_type: data.physicalCard.addressType,
+                shipping_address_id: data.physicalCard.addressId,
+            };
         }
         else {
-            if (data.debitCard.cardType === 'business_physical_debit_card') {
-                return {
-                    card_holder_user_ids: data.debitCard.physicalCard.userId != null
-                        ? [data.debitCard.physicalCard.userId]
-                        : [],
-                    card_name: data.debitCard.physicalCard.cardName,
-                    purchase_limit: (_k = (_j = data.debitCard.physicalCard.amount) === null || _j === void 0 ? void 0 : _j.amount) !== null && _k !== void 0 ? _k : 0,
-                    currency_code: (_m = (_l = data.debitCard.physicalCard.amount) === null || _l === void 0 ? void 0 : _l.currencyCode) !== null && _m !== void 0 ? _m : 'USD',
-                    purchase_limit_frequency: {
-                        code: data.debitCard.physicalCard.frequency,
-                    },
-                    card_type: data.debitCard.cardType,
-                    shipping_address_type: data.debitCard.physicalCard.addressType,
-                    shipping_address_id: data.debitCard.physicalCard.addressId,
-                    connected_account_id: data.debitCard.physicalCard.connectedAccountId,
-                    connected_account_type: 'deposit_account',
-                };
-            }
-            else {
-                return {
-                    card_holder_user_ids: data.debitCard.virtualCard.userIds,
-                    card_name: data.debitCard.virtualCard.cardName,
-                    purchase_limit: (_p = (_o = data.debitCard.virtualCard.amount) === null || _o === void 0 ? void 0 : _o.amount) !== null && _p !== void 0 ? _p : 0,
-                    currency_code: (_r = (_q = data.debitCard.virtualCard.amount) === null || _q === void 0 ? void 0 : _q.currencyCode) !== null && _r !== void 0 ? _r : 'USD',
-                    purchase_limit_frequency: {
-                        code: data.debitCard.virtualCard.frequency,
-                    },
-                    connected_account_id: data.debitCard.virtualCard.connectedAccountId,
-                    card_type: data.debitCard.cardType,
-                    connected_account_type: 'deposit_account',
-                };
-            }
+            return {
+                card_holder_user_ids: data.virtualCard.userIds,
+                card_name: data.virtualCard.cardName,
+                credit_limit: (_f = (_e = data.virtualCard.amount) === null || _e === void 0 ? void 0 : _e.amount) !== null && _f !== void 0 ? _f : 0,
+                currency_code: (_h = (_g = data.virtualCard.amount) === null || _g === void 0 ? void 0 : _g.currencyCode) !== null && _h !== void 0 ? _h : 'USD',
+                credit_limit_frequency: { code: data.virtualCard.frequency },
+                card_type: data.cardType,
+            };
         }
     });
     return zeniAPI
         .postAndGetJSON(`${zeniAPI.apiEndPoints.cardMicroServiceBaseUrl}/1.0/cards`, { cards: payload })
         .pipe((0, operators_1.mergeMap)((response) => {
-        var _a, _b, _c, _d, _e;
+        var _a, _b, _c;
         if ((0, responsePayload_1.isSuccessStatus)(response) && response.data != null) {
             const actions = [];
             actions.push((0, chargeCardReducer_1.updateChargeCards)(response.data.cards), (0, userReducer_1.updateAllUsers)({ users: response.data.users }), (0, userRoleReducer_1.updateUserRoles)(response.data.user_roles), (0, chargeCardListReducer_1.updateChargeCardList)({
                 chargeCardListPayload: response.data,
                 keepExistingListItems: true,
-            }), (0, addressReducer_1.updateAddresses)(response.data.addresses), (0, issueChargeCardReducer_1.updateChargeCardCount)((_b = (_a = response.data) === null || _a === void 0 ? void 0 : _a.cards_count_by_user_id) !== null && _b !== void 0 ? _b : []), (0, issueChargeCardReducer_1.updateDebitCardCount)((_d = (_c = response.data) === null || _c === void 0 ? void 0 : _c.debit_cards_count_by_deposit_account_id) !== null && _d !== void 0 ? _d : {}), (0, issueChargeCardReducer_1.issueChargeCardSuccessOrFailure)({ fetchState: 'Completed' }));
+            }), (0, addressReducer_1.updateAddresses)(response.data.addresses), (0, issueChargeCardReducer_1.updateCardCount)((_b = (_a = response.data) === null || _a === void 0 ? void 0 : _a.cards_count_by_user_id) !== null && _b !== void 0 ? _b : []), (0, issueChargeCardReducer_1.issueChargeCardSuccessOrFailure)({ fetchState: 'Completed' }));
             const cardHolderIds = response.data.cards.map((card) => card.holder_user_id);
             const namesList = response.data.users
                 .filter((user) => cardHolderIds.includes(user.user_id))
@@ -105,7 +65,7 @@ const issueChargeCardEpic = (actions$, state$, zeniAPI) => actions$.pipe((0, ope
                     variables: [
                         {
                             variableName: '_user-name_',
-                            variableValue: (_e = namesList[0]) !== null && _e !== void 0 ? _e : '',
+                            variableValue: (_c = namesList[0]) !== null && _c !== void 0 ? _c : '',
                         },
                         {
                             variableName: '_card_',

package/lib/view/spendManagement/chargeCards/issueChargeCard/issueChargeCardReducer.d.ts

@@ -1,8 +1,6 @@
 import { FetchState, ID } from '../../../../commonStateTypes/common';
-import { CardCodeType } from '../../../../entity/chargeCard/chargeCard';
-import { DepositAccountWithLimitPayload } from '../../../../entity/depositAccount/depositAccountPayload';
 import { ZeniAPIStatus } from '../../../../responsePayload';
-import { ActiveChargeCardCountPayload, ActiveDebitCardCountByUserIdPayload } from '../../../userListView/userListViewPayload';
+import { ActiveChargeCardCountPayload } from '../../../userListView/userListViewPayload';
 import { IssueChargeCardLocalData, IssueChargeCardState } from './issueChargeCardState';
 export declare const initialState: IssueChargeCardState;
 export declare const issueChargeCards: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[], {}, "issueChargeCard/issueChargeCards", never, never>, updateChargeCardsLocalStore: import("@reduxjs/toolkit").ActionCreatorWithPayload<IssueChargeCardLocalData[], "issueChargeCard/updateChargeCardsLocalStore">, issueChargeCardSuccessOrFailure: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
@@ -11,14 +9,8 @@ export declare const issueChargeCards: import("@reduxjs/toolkit").ActionCreatorW
 }, "issueChargeCard/issueChargeCardSuccessOrFailure">, resetIssueChargeCardForm: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<"issueChargeCard/resetIssueChargeCardForm">, updateCustomAddressId: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
     addressId: ID;
     cardLineId: ID;
-    cardType: CardCodeType;
-}, "issueChargeCard/updateCustomAddressId">, updateChargeCardCount: import("@reduxjs/toolkit").ActionCreatorWithPayload<ActiveChargeCardCountPayload[], "issueChargeCard/updateChargeCardCount">, updateDebitCardCount: import("@reduxjs/toolkit").ActionCreatorWithPayload<Record<string, ActiveDebitCardCountByUserIdPayload>, "issueChargeCard/updateDebitCardCount">, fetchIssueCardPage: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[isDebitCardFlagEnabled: boolean, isCreditCardFlagEnabled: boolean, cacheOverride?: any], {
-    isDebitCardFlagEnabled: boolean;
-    isCreditCardFlagEnabled: boolean;
+}, "issueChargeCard/updateCustomAddressId">, updateCardCount: import("@reduxjs/toolkit").ActionCreatorWithPayload<ActiveChargeCardCountPayload[], "issueChargeCard/updateCardCount">, fetchIssueCardPage: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[cacheOverride?: any], {
     cacheOverride: any;
-}, "issueChargeCard/fetchIssueCardPage", never, never>, updateDepositAccountsInCards: import("@reduxjs/toolkit").ActionCreatorWithPayload<DepositAccountWithLimitPayload[], "issueChargeCard/updateDepositAccountsInCards">, fetchDepositAccountListForCards: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<"issueChargeCard/fetchDepositAccountListForCards">, updateDepositAccountListForCardsFetchStatus: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
-    fetchState: FetchState;
-    error?: ZeniAPIStatus;
-}, "issueChargeCard/updateDepositAccountListForCardsFetchStatus">, clearIssueChargeCard: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<"issueChargeCard/clearIssueChargeCard">;
+}, "issueChargeCard/fetchIssueCardPage", never, never>, clearIssueChargeCard: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<"issueChargeCard/clearIssueChargeCard">;
 declare const _default: import("redux").Reducer<IssueChargeCardState>;
 export default _default;

package/lib/view/spendManagement/chargeCards/issueChargeCard/issueChargeCardReducer.js

@@ -1,12 +1,11 @@
 "use strict";
 var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.clearIssueChargeCard = exports.updateDepositAccountListForCardsFetchStatus = exports.fetchDepositAccountListForCards = exports.updateDepositAccountsInCards = exports.fetchIssueCardPage = exports.updateDebitCardCount = exports.updateChargeCardCount = exports.updateCustomAddressId = exports.resetIssueChargeCardForm = exports.issueChargeCardSuccessOrFailure = exports.updateChargeCardsLocalStore = exports.issueChargeCards = exports.initialState = void 0;
+exports.clearIssueChargeCard = exports.fetchIssueCardPage = exports.updateCardCount = exports.updateCustomAddressId = exports.resetIssueChargeCardForm = exports.issueChargeCardSuccessOrFailure = exports.updateChargeCardsLocalStore = exports.issueChargeCards = exports.initialState = void 0;
 const toolkit_1 = require("@reduxjs/toolkit");
+const issueChargeCardState_1 = require("./issueChargeCardState");
 exports.initialState = {
-    depositAccountIds: [],
-    depositAccountsFetchState: { fetchState: 'Not-Started', error: undefined },
-    localData: [],
+    localData: issueChargeCardState_1.initialIssueChargeCardLocalData,
     fetchState: 'Not-Started',
     error: undefined,
     saveStatus: {
@@ -16,8 +15,7 @@ exports.initialState = {
     hasValidState() {
         return this.fetchState == 'Completed';
     },
-    activeChargeCardCount: {},
-    activeDebitCardCountByDepositAccountId: {},
+    activeCardCount: {},
 };
 const issueChargeCard = (0, toolkit_1.createSlice)({
     name: 'issueChargeCard',
@@ -27,13 +25,9 @@ const issueChargeCard = (0, toolkit_1.createSlice)({
             reducer() {
                 //do nothing
             },
-            prepare(isDebitCardFlagEnabled, isCreditCardFlagEnabled, cacheOverride = false) {
+            prepare(cacheOverride = false) {
                 return {
-                    payload: {
-                        isDebitCardFlagEnabled,
-                        isCreditCardFlagEnabled,
-                        cacheOverride,
-                    },
+                    payload: { cacheOverride },
                 };
             },
         },
@@ -58,52 +52,24 @@ const issueChargeCard = (0, toolkit_1.createSlice)({
             draft.saveStatus.error = action.payload.error;
         },
         updateCustomAddressId(draft, action) {
-            const { addressId, cardLineId, cardType } = action.payload;
+            const { addressId, cardLineId } = action.payload;
             const targetIndex = draft.localData.findIndex((lineItem) => lineItem.lineId === cardLineId);
             if (targetIndex > -1) {
-                if (cardType === 'business_physical_credit_card') {
-                    draft.localData[targetIndex] = Object.assign(Object.assign({}, draft.localData[targetIndex]), { creditCard: Object.assign(Object.assign({}, draft.localData[targetIndex].creditCard), { physicalCard: Object.assign(Object.assign({}, draft.localData[targetIndex].creditCard.physicalCard), { addressId: addressId }) }) });
-                }
-                else if (cardType === 'business_physical_debit_card') {
-                    draft.localData[targetIndex] = Object.assign(Object.assign({}, draft.localData[targetIndex]), { debitCard: Object.assign(Object.assign({}, draft.localData[targetIndex].debitCard), { physicalCard: Object.assign(Object.assign({}, draft.localData[targetIndex].debitCard.physicalCard), { addressId: addressId }) }) });
-                }
+                draft.localData[targetIndex] = Object.assign(Object.assign({}, draft.localData[targetIndex]), { physicalCard: Object.assign(Object.assign({}, draft.localData[targetIndex].physicalCard), { addressId: addressId }) });
             }
         },
-        updateChargeCardCount(draft, action) {
+        updateCardCount(draft, action) {
             action.payload.forEach((activeChargeCardCountPayload) => {
-                draft.activeChargeCardCount[activeChargeCardCountPayload.user_id] = {
+                draft.activeCardCount[activeChargeCardCountPayload.user_id] = {
                     physicalCardCount: activeChargeCardCountPayload.business_physical_credit_card_count,
                     virtualCardCount: activeChargeCardCountPayload.business_virtual_credit_card_count,
                 };
             });
         },
-        updateDebitCardCount(draft, action) {
-            Object.entries(action.payload).forEach(([depositAccountId, activeDebitCardCountByUserIdPayload]) => {
-                Object.entries(activeDebitCardCountByUserIdPayload).forEach(([userId, activeDebitCardCount]) => {
-                    draft.activeDebitCardCountByDepositAccountId = Object.assign(Object.assign({}, draft.activeDebitCardCountByDepositAccountId), { [depositAccountId]: Object.assign(Object.assign({}, draft.activeDebitCardCountByDepositAccountId[depositAccountId]), { [userId]: {
-                                physicalCardCount: activeDebitCardCount.business_physical_debit_card_count,
-                                virtualCardCount: activeDebitCardCount.business_virtual_debit_card_count,
-                            } }) });
-                });
-            });
-        },
-        fetchDepositAccountListForCards(draft) {
-            draft.depositAccountsFetchState.error = undefined;
-            draft.depositAccountsFetchState.fetchState = 'In-Progress';
-        },
-        updateDepositAccountsInCards(draft, action) {
-            draft.depositAccountIds = action.payload.map((depositAccountWithLimitPayload) => depositAccountWithLimitPayload.deposit_account_id);
-            draft.depositAccountsFetchState.fetchState = 'Completed';
-            draft.depositAccountsFetchState.error = undefined;
-        },
-        updateDepositAccountListForCardsFetchStatus(draft, action) {
-            draft.depositAccountsFetchState.fetchState = action.payload.fetchState;
-            draft.depositAccountsFetchState.error = action.payload.error;
-        },
         clearIssueChargeCard(draft) {
             Object.assign(draft, exports.initialState);
         },
     },
 });
-_a = issueChargeCard.actions, exports.issueChargeCards = _a.issueChargeCards, exports.updateChargeCardsLocalStore = _a.updateChargeCardsLocalStore, exports.issueChargeCardSuccessOrFailure = _a.issueChargeCardSuccessOrFailure, exports.resetIssueChargeCardForm = _a.resetIssueChargeCardForm, exports.updateCustomAddressId = _a.updateCustomAddressId, exports.updateChargeCardCount = _a.updateChargeCardCount, exports.updateDebitCardCount = _a.updateDebitCardCount, exports.fetchIssueCardPage = _a.fetchIssueCardPage, exports.updateDepositAccountsInCards = _a.updateDepositAccountsInCards, exports.fetchDepositAccountListForCards = _a.fetchDepositAccountListForCards, exports.updateDepositAccountListForCardsFetchStatus = _a.updateDepositAccountListForCardsFetchStatus, exports.clearIssueChargeCard = _a.clearIssueChargeCard;
+_a = issueChargeCard.actions, exports.issueChargeCards = _a.issueChargeCards, exports.updateChargeCardsLocalStore = _a.updateChargeCardsLocalStore, exports.issueChargeCardSuccessOrFailure = _a.issueChargeCardSuccessOrFailure, exports.resetIssueChargeCardForm = _a.resetIssueChargeCardForm, exports.updateCustomAddressId = _a.updateCustomAddressId, exports.updateCardCount = _a.updateCardCount, exports.fetchIssueCardPage = _a.fetchIssueCardPage, exports.clearIssueChargeCard = _a.clearIssueChargeCard;
 exports.default = issueChargeCard.reducer;

package/lib/view/spendManagement/chargeCards/issueChargeCard/issueChargeCardSelector.d.ts

@@ -2,25 +2,22 @@ import { FetchStateAndError, ID } from '../../../../commonStateTypes/common';
 import { SelectorView } from '../../../../commonStateTypes/viewAndReport/viewAndReport';
 import { Address } from '../../../../entity/address/addressState';
 import { Class } from '../../../../entity/class/classState';
-import { DepositAccountWithLimit } from '../../../../entity/depositAccount/depositAccount';
 import { RootState } from '../../../../reducer';
 import { Person } from '../../../people/peopleSelectorTypes';
 import { ChargeCardConfigState } from '../chargeCardConfig/chargeCardConfigState';
 import { CreditAccount } from '../chargeCardList/chargeCardList';
-import { ActiveChargeCardCount, ActiveDebitCardCountByUserId, IssueChargeCardLocalData } from './issueChargeCardState';
+import { ActiveChargeCardCount, IssueChargeCardLocalData } from './issueChargeCardState';
 export interface IssueChargeCardSelectorView extends SelectorView {
     localData: IssueChargeCardLocalData[];
     issueCardStatus: FetchStateAndError;
     userList: Person[];
-    depositAccounts: DepositAccountWithLimit[];
     allAccountingClasses: Class[];
     chargeCardConfig: ChargeCardConfigState;
     creditAccount: CreditAccount;
     customAddress: Record<ID, Address>;
     customAddressStatus: Record<ID, FetchStateAndError>;
     userAddress: Record<ID, Address>;
-    activeChargeCardCount: Record<ID, ActiveChargeCardCount>;
-    activeDebitCardCountByDepositAccountId: Record<ID, ActiveDebitCardCountByUserId>;
+    activeCardCountByUser: Record<ID, ActiveChargeCardCount>;
     companyAddress?: Address;
 }
-export declare const getIssueChargeCardView: (state: RootState, isCreditCardEnabled: boolean, isDebitCardEnabled: boolean) => IssueChargeCardSelectorView;
+export declare const getIssueChargeCardView: (state: RootState) => IssueChargeCardSelectorView;

package/lib/view/spendManagement/chargeCards/issueChargeCard/issueChargeCardSelector.js

@@ -4,16 +4,14 @@ exports.getIssueChargeCardView = void 0;
 const reduceFetchState_1 = require("../../../../commonStateTypes/reduceFetchState");
 const addressSelector_1 = require("../../../../entity/address/addressSelector");
 const classSelector_1 = require("../../../../entity/class/classSelector");
-const depositAccountSelector_1 = require("../../../../entity/depositAccount/depositAccountSelector");
 const tenantSelector_1 = require("../../../../entity/tenant/tenantSelector");
 const addressViewSelector_1 = require("../../../addressView/addressViewSelector");
 const userListViewSelector_1 = require("../../../userListView/userListViewSelector");
-const getIssueChargeCardView = (state, isCreditCardEnabled, isDebitCardEnabled) => {
+const getIssueChargeCardView = (state) => {
     var _a;
-    const { issueChargeCardState, userState, userRoleState, userListViewState, chargeCardConfigState, chargeCardListState, addressState, classState, depositAccountState, classListState, } = state;
+    const { issueChargeCardState, userState, userRoleState, userListViewState, chargeCardConfigState, chargeCardListState, addressState, classState, classListState, } = state;
     const userListSelectorView = (0, userListViewSelector_1.getUserList)(userState, userRoleState, userListViewState, 'cardHolderCandidate');
     const userList = userListSelectorView.users;
-    const depositAccounts = (0, depositAccountSelector_1.getDepositAccountLimitsForChargeCardByDepositAccountIds)(depositAccountState, issueChargeCardState.depositAccountIds);
     let selectedUserAddress = {};
     userList.forEach((user) => {
         var _a, _b;
@@ -33,23 +31,17 @@ const getIssueChargeCardView = (state, isCreditCardEnabled, isDebitCardEnabled)
     };
     issueChargeCardState.localData.forEach((lineItem) => {
         var _a;
-        let newlyAddedAddress;
-        const targetLineId = lineItem.lineId;
-        if (lineItem.chargeCardType === 'credit_card' &&
-            lineItem.creditCard.cardType === 'business_physical_credit_card') {
-            newlyAddedAddress = (0, addressViewSelector_1.getNewAddress)(`credit_custom_shipping_${targetLineId}_address`, state);
-        }
-        else if (lineItem.chargeCardType === 'debit_card' &&
-            lineItem.debitCard.cardType === 'business_physical_debit_card') {
-            newlyAddedAddress = (0, addressViewSelector_1.getNewAddress)(`debit_custom_shipping_${targetLineId}_address`, state);
-        }
-        customAddressStatus = Object.assign(Object.assign({}, customAddressStatus), { [targetLineId]: (_a = newlyAddedAddress === null || newlyAddedAddress === void 0 ? void 0 : newlyAddedAddress.status) !== null && _a !== void 0 ? _a : defaultFetchState });
-        if (newlyAddedAddress != null &&
-            newlyAddedAddress.status.fetchState === 'Completed' &&
-            newlyAddedAddress.newAddressId != null) {
-            const addressFromEntity = (0, addressSelector_1.getAddressByAddressId)(addressState, newlyAddedAddress.newAddressId);
-            if (addressFromEntity != null) {
-                customAddress = Object.assign(Object.assign({}, customAddress), { [targetLineId]: addressFromEntity });
+        if (lineItem.cardType === 'business_physical_credit_card') {
+            const targetLineId = lineItem.lineId;
+            const newlyAddedAddress = (0, addressViewSelector_1.getNewAddress)(`custom_shipping_${targetLineId}_address`, state);
+            customAddressStatus = Object.assign(Object.assign({}, customAddressStatus), { [targetLineId]: (_a = newlyAddedAddress === null || newlyAddedAddress === void 0 ? void 0 : newlyAddedAddress.status) !== null && _a !== void 0 ? _a : defaultFetchState });
+            if (newlyAddedAddress != null &&
+                newlyAddedAddress.status.fetchState === 'Completed' &&
+                newlyAddedAddress.newAddressId != null) {
+                const addressFromEntity = (0, addressSelector_1.getAddressByAddressId)(addressState, newlyAddedAddress.newAddressId);
+                if (addressFromEntity != null) {
+                    customAddress = Object.assign(Object.assign({}, customAddress), { [targetLineId]: addressFromEntity });
+                }
             }
         }
     });
@@ -58,26 +50,20 @@ const getIssueChargeCardView = (state, isCreditCardEnabled, isDebitCardEnabled)
         classIds: classIds,
         reportId: 'class_list',
     });
-    const requiredFetchStates = [
+    const issueCardPageFetchState = (0, reduceFetchState_1.reduceFetchState)([
         chargeCardConfigState,
         userListViewState.userListByType.cardHolderCandidate,
         userListSelectorView,
+        chargeCardListState.creditAccount,
         classListState,
-    ];
-    if (isDebitCardEnabled) {
-        requiredFetchStates.push(issueChargeCardState.depositAccountsFetchState);
-    }
-    if (isCreditCardEnabled) {
-        requiredFetchStates.push(chargeCardListState.creditAccount);
-    }
-    const issueCardPageFetchState = (0, reduceFetchState_1.reduceFetchState)(requiredFetchStates);
+        chargeCardListState,
+    ]);
     return {
         fetchState: issueCardPageFetchState.fetchState,
         error: issueCardPageFetchState.error,
         issueCardStatus: issueChargeCardState.saveStatus,
         localData: issueChargeCardState.localData,
         userList,
-        depositAccounts,
         chargeCardConfig: chargeCardConfigState,
         creditAccount: chargeCardListState.creditAccount,
         companyAddress: companyAddress,
@@ -85,8 +71,7 @@ const getIssueChargeCardView = (state, isCreditCardEnabled, isDebitCardEnabled)
         customAddressStatus,
         userAddress: selectedUserAddress,
         allAccountingClasses,
-        activeChargeCardCount: issueChargeCardState.activeChargeCardCount,
-        activeDebitCardCountByDepositAccountId: issueChargeCardState.activeDebitCardCountByDepositAccountId,
+        activeCardCountByUser: issueChargeCardState.activeCardCount,
     };
 };
 exports.getIssueChargeCardView = getIssueChargeCardView;