@zeniai/client-epic-state 4.11.47 → 4.11.48

package/lib/view/spendManagement/billPay/editBillView/editBillViewSelector.js

@@ -32,7 +32,7 @@ const depositAccountSelector_1 = require("../../../../entity/depositAccount/depo
 const setupViewSelector_1 = require("../../commonSetup/setupViewSelector");
 const getEditBillDetail = (state, isVendorRecommendationFeatureEnabled, isZeniAccountsEnabled, billId) => {
     var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2, _3, _4, _5, _6, _7;
-    const { accountListState, accountState, bankAccountState, billDetailViewState, paymentAccountListState, billTransactionState, billPayConfigState, classListState, classState, editBillDetailViewState, paymentAccountState, vendorState, tenantState, companyState, userState, commonHistoryState, contactState, paymentInstrumentState, recurringBillState, depositAccountListState, depositAccountState, } = state;
+    const { accountListState, accountState, bankAccountState, billDetailViewState, plaidAccountViewState, billTransactionState, billPayConfigState, classListState, classState, editBillDetailViewState, paymentAccountState, vendorState, tenantState, companyState, userState, commonHistoryState, contactState, paymentInstrumentState, recurringBillState, depositAccountListState, depositAccountState, } = state;
     const transaction = (0, get_1.default)(billTransactionState.transactionById, billId !== null && billId !== void 0 ? billId : '', undefined);
     let recommendations = {};
     if (billId != null) {
@@ -70,7 +70,8 @@ const getEditBillDetail = (state, isVendorRecommendationFeatureEnabled, isZeniAc
           we need to pick payment ids from billPayInfo object
       */
             [transaction.billPayInfo.fromAccount.billAccountId]
-        : paymentAccountListState.paymentAccountIds);
+        : plaidAccountViewState['spend_management_setup'].accountDetails
+            .paymentAccountIds);
     const fromDepositAccount = (transaction === null || transaction === void 0 ? void 0 : transaction.billPayInfo.fromAccount.billAccountType) === 'depositAccount' &&
         (transaction === null || transaction === void 0 ? void 0 : transaction.billPayInfo.fromAccount.billAccountId) != null
         ? (0, depositAccountSelector_1.getDepositAccountByDepositAccountId)(depositAccountState, transaction === null || transaction === void 0 ? void 0 : transaction.billPayInfo.fromAccount.billAccountId)

package/lib/view/spendManagement/billPay/editBillView/epics/initializeBillToLocalStoreEpic.d.ts

@@ -3,12 +3,13 @@ import { Observable } from 'rxjs';
 import { convertAmountToHomeCurrency, initializeBillToLocalStore, saveBillUpdatesToLocalStore, updateEditBillFetchStateCompleted } from '../editBillViewReducer';
 import { RootState } from '../../../../../reducer';
 import { fetchClassList } from '../../../../classList/classListReducer';
+import { getPaymentAccounts } from '../../../plaidAccount/plaidAccountViewReducer';
 import { LineItemRecommendationsLocalData } from '../editBillViewSelector';
 import { RecommendationByLineId } from '../../../../../entity/transaction/stateTypes/transaction';
 import { Vendor } from '../../../../../entity/vendor/vendorState';
 import { AccountListSelectorView } from '../../../../accountList/accountListSelector';
 import { ClassListSelectorView } from '../../../../classList/classListSelector';
 import Line from '../../../../../entity/transaction/stateTypes/transactionLine';
-export declare type ActionType = ReturnType<typeof initializeBillToLocalStore> | ReturnType<typeof saveBillUpdatesToLocalStore> | ReturnType<typeof fetchClassList> | ReturnType<typeof updateEditBillFetchStateCompleted> | ReturnType<typeof convertAmountToHomeCurrency>;
+export declare type ActionType = ReturnType<typeof initializeBillToLocalStore> | ReturnType<typeof saveBillUpdatesToLocalStore> | ReturnType<typeof fetchClassList> | ReturnType<typeof updateEditBillFetchStateCompleted> | ReturnType<typeof getPaymentAccounts> | ReturnType<typeof convertAmountToHomeCurrency>;
 export declare const getLineRecommendationsLocalData: (lineId: string, line: Line, recommendations: RecommendationByLineId | undefined, accountList: AccountListSelectorView, classList: ClassListSelectorView, vendorDetails?: Vendor | undefined) => LineItemRecommendationsLocalData;
 export declare const initializeBillToLocalStoreEpic: (actions$: ActionsObservable<ActionType>, state$: StateObservable<RootState>) => Observable<ActionType>;

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

@@ -5,7 +5,7 @@ const getCompanyView_1 = require("../../../companyView/selectorHelpers/getCompan
 const setupViewSelector_1 = require("../../commonSetup/setupViewSelector");
 const helpers_1 = require("../../helpers");
 function getChargeCardSetupViewDetails(state, companyId) {
-    const chargeCardSetupViewDetails = (0, setupViewSelector_1.getCommonSetupViewDetails)(state, companyId, 'charge_cards', 'charge_card_setup');
+    const chargeCardSetupViewDetails = (0, setupViewSelector_1.getCommonSetupViewDetails)(state, companyId, 'charge_cards', 'spend_management_setup');
     const companyView = (0, getCompanyView_1.getCompanyView)(state, companyId, []);
     const companyChargeCardInfo = companyView === null || companyView === void 0 ? void 0 : companyView.company.company.companyChargeCardInfo;
     const { chargeCardSetupViewState, setupViewState } = state;

package/lib/view/spendManagement/chargeCards/chargeCardSetUp/epic/fetchChargeCardSetupViewEpic.d.ts

@@ -13,8 +13,5 @@ import { ZeniAPI } from '../../../../../zeniAPI';
 import { updateSetupViewLocalStoreData } from '../../../commonSetup/setupViewReducer';
 import { fetchChargeCardSetupView, fetchChargeCardSetupViewFailure, fetchChargeCardSetupViewSuccess } from '../chargeCardSetUpViewReducer';
 import { updatePlaidAccountViewAccountDetails } from '../../../plaidAccount/plaidAccountViewReducer';
-import { updatePaymentAccountList } from '../../../zeniAccounts/paymentAccountList/paymentAccountListReducer';
-import { updateDepositAccounts } from '../../../../../entity/depositAccount/depositAccountReducer';
-import { updateDepositAccountList } from '../../../zeniAccounts/depositAccountList/depositAccountListReducer';
-export declare type ActionType = ReturnType<typeof fetchChargeCardSetupView> | ReturnType<typeof updateAllUsers> | ReturnType<typeof updateUserRoles> | ReturnType<typeof updateCompanies> | ReturnType<typeof updateFiles> | ReturnType<typeof updateAccounts> | ReturnType<typeof updateAddresses> | ReturnType<typeof updatePaymentAccounts> | ReturnType<typeof updatePaymentAccountList> | ReturnType<typeof updateDepositAccounts> | ReturnType<typeof updateDepositAccountList> | ReturnType<typeof updatePlaidAccountViewAccountDetails> | ReturnType<typeof updateSetupViewLocalStoreData> | ReturnType<typeof openSnackbar> | ReturnType<typeof fetchChargeCardSetupViewSuccess> | ReturnType<typeof fetchChargeCardSetupViewFailure>;
+export declare type ActionType = ReturnType<typeof fetchChargeCardSetupView> | ReturnType<typeof updateAllUsers> | ReturnType<typeof updateUserRoles> | ReturnType<typeof updateCompanies> | ReturnType<typeof updateFiles> | ReturnType<typeof updateAccounts> | ReturnType<typeof updateAddresses> | ReturnType<typeof updatePaymentAccounts> | ReturnType<typeof updatePlaidAccountViewAccountDetails> | ReturnType<typeof updateSetupViewLocalStoreData> | ReturnType<typeof openSnackbar> | ReturnType<typeof fetchChargeCardSetupViewSuccess> | ReturnType<typeof fetchChargeCardSetupViewFailure>;
 export declare const fetchChargeCardSetupViewEpic: (actions$: ActionsObservable<ActionType>, state$: StateObservable<RootState>, zeniAPI: ZeniAPI) => Observable<ActionType>;

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

@@ -16,9 +16,6 @@ const responsePayload_1 = require("../../../../../responsePayload");
 const setupViewReducer_1 = require("../../../commonSetup/setupViewReducer");
 const chargeCardSetUpViewReducer_1 = require("../chargeCardSetUpViewReducer");
 const plaidAccountViewReducer_1 = require("../../../plaidAccount/plaidAccountViewReducer");
-const paymentAccountListReducer_1 = require("../../../zeniAccounts/paymentAccountList/paymentAccountListReducer");
-const depositAccountReducer_1 = require("../../../../../entity/depositAccount/depositAccountReducer");
-const depositAccountListReducer_1 = require("../../../zeniAccounts/depositAccountList/depositAccountListReducer");
 const fetchChargeCardSetupViewEpic = (actions$, state$, zeniAPI) => actions$.pipe((0, operators_1.filter)(chargeCardSetUpViewReducer_1.fetchChargeCardSetupView.match), (0, operators_1.switchMap)((action) => {
     var _a;
     const { companyId, cacheOverride, refreshViewInBackground } = action.payload;
@@ -32,9 +29,9 @@ const fetchChargeCardSetupViewEpic = (actions$, state$, zeniAPI) => actions$.pip
         return zeniAPI
             .getJSON(`${zeniAPI.apiEndPoints.tenantMicroServiceBaseUrl}/1.0/companies/${companyId}?query={"view":"charge_cards_setup"}`)
             .pipe((0, operators_1.mergeMap)((response) => {
-            var _a, _b, _c;
             if ((0, responsePayload_1.isSuccessStatus)(response) && response.data != null) {
                 const allBankAccountIds = response.data.accounts.map((account) => account.account_id);
+                const paymentAccountIds = response.data.payment_accounts.map((paymentAccount) => paymentAccount.payment_account_id);
                 const actions = [
                     (0, userReducer_1.updateAllUsers)({ users: response.data.users }),
                     (0, userRoleReducer_1.updateUserRoles)(response.data.user_roles),
@@ -46,19 +43,10 @@ const fetchChargeCardSetupViewEpic = (actions$, state$, zeniAPI) => actions$.pip
                     (0, fileReducer_1.updateFiles)({ files: response.data.files }),
                     (0, accountReducer_1.updateAccounts)(response.data.accounts, 'charge_cards'),
                     (0, paymentAccountReducer_1.updatePaymentAccounts)(response.data.payment_accounts),
-                    (0, paymentAccountListReducer_1.updatePaymentAccountList)({
-                        data: response.data.payment_accounts,
-                        updateType: 'replace',
-                    }),
-                    (0, depositAccountReducer_1.updateDepositAccounts)((_a = response.data.deposit_accounts) !== null && _a !== void 0 ? _a : []),
-                    (0, depositAccountListReducer_1.updateDepositAccountList)({
-                        data: (_c = (_b = response.data) === null || _b === void 0 ? void 0 : _b.deposit_accounts) !== null && _c !== void 0 ? _c : [],
-                        updateType: 'replace',
-                    }),
                     (0, setupViewReducer_1.updateSetupViewLocalStoreData)({
                         companyId: response.data.companies[0].company_id,
                     }),
-                    (0, plaidAccountViewReducer_1.updatePlaidAccountViewAccountDetails)(allBankAccountIds, 'charge_card_setup'),
+                    (0, plaidAccountViewReducer_1.updatePlaidAccountViewAccountDetails)(allBankAccountIds, paymentAccountIds, 'spend_management_setup'),
                     (0, chargeCardSetUpViewReducer_1.fetchChargeCardSetupViewSuccess)(),
                 ];
                 return (0, rxjs_1.from)(actions);
@@ -74,10 +62,10 @@ const fetchChargeCardSetupViewEpic = (actions$, state$, zeniAPI) => actions$.pip
             JSON.stringify(error))))));
     }
     else {
-        const { allBankAccountIds } = plaidAccountViewState['spend_management_setup'].accountDetails;
+        const { allBankAccountIds, paymentAccountIds } = plaidAccountViewState['spend_management_setup'].accountDetails;
         return (0, rxjs_1.of)((0, setupViewReducer_1.updateSetupViewLocalStoreData)({
             companyId,
-        }), (0, plaidAccountViewReducer_1.updatePlaidAccountViewAccountDetails)(allBankAccountIds, 'charge_card_setup'), (0, chargeCardSetUpViewReducer_1.fetchChargeCardSetupViewSuccess)());
+        }), (0, plaidAccountViewReducer_1.updatePlaidAccountViewAccountDetails)(allBankAccountIds, paymentAccountIds, 'spend_management_setup'), (0, chargeCardSetUpViewReducer_1.fetchChargeCardSetupViewSuccess)());
     }
 }));
 exports.fetchChargeCardSetupViewEpic = fetchChargeCardSetupViewEpic;

package/lib/view/spendManagement/commonSetup/setupViewSelector.d.ts

@@ -77,10 +77,6 @@ export interface BusinessVerificationDetails extends CompanyAndOfficerLocalData
     updateStatus: FetchStateAndError;
 }
 export declare function getCommonSetupViewDetails(state: RootState, companyId: ID, setupViewType: SetupViewType, plaidAccountKeyType: PlaidAccountKeyType): SetupView;
-export declare function getPrimaryAccountForTheProduct(state: RootState, companyId: ID, setupViewType: SetupViewType): {
-    accountId: ID;
-    accountType: AccountTypeSubConfigCodeKeyType;
-} | undefined;
 export declare function getBusinessVerificationDetails(state: RootState, companyId: ID): BusinessVerificationDetails;
 export declare const getCompanyAndIdentityDetails: (state: RootState, companyId: ID, companyAndIdentityDetails: CompanyAndIdentityDetails) => CompanyAndOfficerLocalData;
 export declare const getAllFundingAccounts: (depositAccounts: DepositAccount[], paymentAccounts: PaymentAccount[], includeOnlyVerifiedAccounts?: boolean) => FundingAccount[];

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 = exports.getBusinessVerificationDetails = exports.getPrimaryAccountForTheProduct = exports.getCommonSetupViewDetails = void 0;
+exports.mapPaymentAccToFundingAccount = exports.mapDepositAccToFundingAccount = exports.getAllFundingAccounts = exports.getCompanyAndIdentityDetails = exports.getBusinessVerificationDetails = exports.getCommonSetupViewDetails = void 0;
 const accountSelector_1 = require("../../../entity/account/accountSelector");
 const fileSelector_1 = require("../../../entity/file/fileSelector");
 const fileViewSelector_1 = require("../../fileView/fileViewSelector");
@@ -10,72 +10,62 @@ const paymentAccountSelector_1 = require("../../../entity/paymentAccount/payment
 const depositAccountSelector_1 = require("../../../entity/depositAccount/depositAccountSelector");
 const depositAccountPayload_1 = require("../../../entity/depositAccount/depositAccountPayload");
 function getCommonSetupViewDetails(state, companyId, setupViewType, plaidAccountKeyType) {
-    var _a, _b, _c;
+    var _a, _b, _c, _d;
     const { accountState, setupViewState, paymentAccountState, paymentAccountListState, depositAccountState, depositAccountListState, plaidAccountViewState, } = state;
     const { updateStatus } = setupViewState;
     const { accountDetails, plaidConnectionDetails } = (0, plaidAccountViewSelector_1.getPlaidAccountDetails)(plaidAccountViewState, plaidAccountKeyType);
-    const { allBankAccountIds } = accountDetails;
+    const { allBankAccountIds, primaryFundingAccount } = accountDetails;
     const { paymentAccountIds } = paymentAccountListState;
     const { accountIds: depositAccountIds } = depositAccountListState;
     const allBankAccounts = (_a = allBankAccountIds === null || allBankAccountIds === void 0 ? void 0 : allBankAccountIds.map((accountId) => (0, accountSelector_1.getAccountBase)(accountState, accountId, setupViewType)).filter((account) => account != null)) !== null && _a !== void 0 ? _a : [];
     const paymentAccounts = (_b = (0, paymentAccountSelector_1.getPaymentAccountsByPaymentAccountIds)(paymentAccountState, paymentAccountIds).filter((account) => account != null)) !== null && _b !== void 0 ? _b : [];
     const depositAccounts = (_c = (0, depositAccountSelector_1.getDepositAccountsByDepositAccountIds)(depositAccountState, depositAccountIds).filter((account) => account != null)) !== null && _c !== void 0 ? _c : [];
-    const allFundingAccounts = (0, exports.getAllFundingAccounts)(setupViewType === 'zeni_accounts' ? [] : depositAccounts, // only external acct can be made primary for accounts setup
-    paymentAccounts, false);
+    const allFundingAccounts = (0, exports.getAllFundingAccounts)(depositAccounts, paymentAccounts, false);
     const companyView = (0, getCompanyView_1.getCompanyView)(state, companyId, []);
     const companyBillPayInfo = companyView === null || companyView === void 0 ? void 0 : companyView.company.company.companyBillPayInfo;
-    const primaryAccount = getPrimaryAccountForTheProduct(state, companyId, setupViewType);
-    let primaryFundingAccount;
-    if ((primaryAccount === null || primaryAccount === void 0 ? void 0 : primaryAccount.accountType) === 'depositAccount') {
-        const depositAccount = (0, depositAccountSelector_1.getDepositAccountByDepositAccountId)(depositAccountState, primaryAccount.accountId);
-        if (depositAccount != null) {
-            primaryFundingAccount = (0, exports.mapDepositAccToFundingAccount)(depositAccount);
+    let paymentAccount;
+    let primaryAccount = undefined;
+    if (((_d = accountDetails.paymentAccountIds) === null || _d === void 0 ? void 0 : _d.length) > 0) {
+        // paymentAccount is used for products other than reimbursement
+        const paymentAccountId = accountDetails.paymentAccountIds[0];
+        paymentAccount = (0, paymentAccountSelector_1.getPaymentAccountByPaymentAccountId)(paymentAccountState, paymentAccountId);
+    }
+    // For reimbursement setup, use primaryFundingAccount as the payment account.
+    // For other setup pages, continue using first payment account
+    if (plaidAccountKeyType === 'reimbursement_setup') {
+        if ((primaryFundingAccount === null || primaryFundingAccount === void 0 ? void 0 : primaryFundingAccount.accountType) === 'depositAccount') {
+            const depositAccount = (0, depositAccountSelector_1.getDepositAccountByDepositAccountId)(depositAccountState, primaryFundingAccount.accountId);
+            if (depositAccount != null) {
+                primaryAccount = (0, exports.mapDepositAccToFundingAccount)(depositAccount);
+            }
+        }
+        else if ((primaryFundingAccount === null || primaryFundingAccount === void 0 ? void 0 : primaryFundingAccount.accountType) === 'paymentAccount') {
+            const paymentAccount = (0, paymentAccountSelector_1.getPaymentAccountByPaymentAccountId)(paymentAccountState, primaryFundingAccount.accountId);
+            if (paymentAccount != null) {
+                primaryAccount = (0, exports.mapPaymentAccToFundingAccount)(paymentAccount);
+            }
         }
     }
-    else if ((primaryAccount === null || primaryAccount === void 0 ? void 0 : primaryAccount.accountType) === 'paymentAccount') {
-        const paymentAccount = (0, paymentAccountSelector_1.getPaymentAccountByPaymentAccountId)(paymentAccountState, primaryAccount.accountId);
+    else if ((paymentAccountIds === null || paymentAccountIds === void 0 ? void 0 : paymentAccountIds.length) > 0) {
+        const paymentAccountId = paymentAccountIds[0];
+        const paymentAccount = (0, paymentAccountSelector_1.getPaymentAccountByPaymentAccountId)(paymentAccountState, paymentAccountId);
         if (paymentAccount != null) {
-            primaryFundingAccount = (0, exports.mapPaymentAccToFundingAccount)(paymentAccount);
+            primaryAccount = (0, exports.mapPaymentAccToFundingAccount)(paymentAccount);
         }
     }
     return {
         companyBillPayInfo,
-        primaryFundingAccount,
+        paymentAccount,
+        primaryFundingAccount: primaryAccount,
         allFundingAccounts,
         allBankAccounts,
         plaidConnectionDetails,
-        accountUpdateStatus: accountDetails.cashAccountUpdateStatus,
+        accountUpdateStatus: accountDetails.updateStatus,
         accountFetchStatus: accountDetails.fetchStatus,
         updateStatus,
     };
 }
 exports.getCommonSetupViewDetails = getCommonSetupViewDetails;
-function getPrimaryAccountForTheProduct(state, companyId, setupViewType) {
-    const companyView = (0, getCompanyView_1.getCompanyView)(state, companyId, []);
-    if (companyView == null) {
-        return undefined;
-    }
-    let primaryFundingAccount;
-    if (setupViewType === 'bill_pay') {
-        primaryFundingAccount =
-            companyView.company.company.companyBillPayInfo.primaryFundingAccount;
-    }
-    else if (setupViewType === 'reimbursement') {
-        primaryFundingAccount =
-            companyView.company.company.companyReimbursementInfo
-                .primaryFundingAccount;
-    }
-    else if (setupViewType === 'charge_cards') {
-        primaryFundingAccount =
-            companyView.company.company.companyChargeCardInfo.primaryFundingAccount;
-    }
-    else if (setupViewType === 'zeni_accounts') {
-        primaryFundingAccount =
-            companyView.company.company.companyZeniAccountInfo.primaryFundingAccount;
-    }
-    return primaryFundingAccount;
-}
-exports.getPrimaryAccountForTheProduct = getPrimaryAccountForTheProduct;
 function getBusinessVerificationDetails(state, companyId) {
     const { setupViewState } = state;
     const { companyDetails, companyOfficerUpdateStatus, primaryContactDetails, updateStatus, } = setupViewState;

package/lib/view/spendManagement/plaidAccount/epic/paymentAccounts/getPaymentAccountsEpic.js

@@ -24,10 +24,11 @@ const getPaymentAccountsEpic = (actions$, _state$, zeniAPI) => actions$.pipe((0,
         .getJSON(`${zeniAPI.apiEndPoints.payMicroServiceBaseUrl}/1.0/payment-accounts?query=${encodeURIComponent(JSON.stringify(queryParams))}`)
         .pipe((0, operators_1.mergeMap)((response) => {
         if ((0, responsePayload_1.isSuccessResponse)(response) && response.data != null) {
+            const paymentAccountIds = response.data.payment_accounts.map((paymentAccount) => paymentAccount.payment_account_id);
             const actions = [
                 (0, accountReducer_1.updateAccounts)(response.data.accounts, setupViewType),
                 (0, paymentAccountReducer_1.updatePaymentAccounts)(response.data.payment_accounts),
-                (0, plaidAccountViewReducer_1.getPaymentAccountsSuccess)(plaidAccountKeyType),
+                (0, plaidAccountViewReducer_1.getPaymentAccountsSuccess)(paymentAccountIds, plaidAccountKeyType),
             ];
             return (0, rxjs_1.from)(actions);
         }

package/lib/view/spendManagement/plaidAccount/epic/paymentAccounts/updateMappedCashAccountEpic.js

@@ -7,7 +7,7 @@ const responsePayload_1 = require("../../../../../responsePayload");
 const plaidAccountViewReducer_1 = require("../../plaidAccountViewReducer");
 const depositAccountReducer_1 = require("../../../../../entity/depositAccount/depositAccountReducer");
 const updateMappedCashAccountEpic = (actions$, _state$, zeniAPI) => actions$.pipe((0, operators_1.filter)(plaidAccountViewReducer_1.updateMappedCashAccount.match), (0, operators_1.mergeMap)((action) => {
-    const { plaidAccountKeyType, accountId, depositAccountId } = action.payload;
+    const { accountId, depositAccountId } = action.payload;
     return zeniAPI
         .putAndGetJSON(`${zeniAPI.apiEndPoints.payMicroServiceBaseUrl}/1.0/deposit-accounts/${depositAccountId}`, {
         zeni_mapped_account_id: accountId,
@@ -15,16 +15,17 @@ const updateMappedCashAccountEpic = (actions$, _state$, zeniAPI) => actions$.pip
         .pipe((0, operators_1.mergeMap)((response) => {
         var _a, _b;
         if ((0, responsePayload_1.isSuccessResponse)(response) && response.data != null) {
+            const depositAccountIds = response.data.deposit_accounts.map((depositAccount) => depositAccount.deposit_account_id);
             const actions = [
                 (0, depositAccountReducer_1.updateDepositAccounts)((_b = (_a = response.data) === null || _a === void 0 ? void 0 : _a.deposit_accounts) !== null && _b !== void 0 ? _b : []),
-                (0, plaidAccountViewReducer_1.updateMappedCashAccountSuccess)(plaidAccountKeyType),
+                (0, plaidAccountViewReducer_1.updateMappedCashAccountSuccess)(depositAccountIds),
             ];
             return (0, rxjs_1.from)(actions);
         }
         else {
-            return (0, rxjs_1.of)((0, plaidAccountViewReducer_1.updateMappedCashAccountFailure)(plaidAccountKeyType, response.status));
+            return (0, rxjs_1.of)((0, plaidAccountViewReducer_1.updateMappedCashAccountFailure)(response.status));
         }
-    }), (0, operators_1.catchError)((error) => (0, rxjs_1.of)((0, plaidAccountViewReducer_1.updateMappedCashAccountFailure)(plaidAccountKeyType, (0, responsePayload_1.createZeniAPIStatus)('Unexpected Error', 'Update Mapped Cash Account errored out' +
+    }), (0, operators_1.catchError)((error) => (0, rxjs_1.of)((0, plaidAccountViewReducer_1.updateMappedCashAccountFailure)((0, responsePayload_1.createZeniAPIStatus)('Unexpected Error', 'Update Mapped Cash Account errored out' +
         JSON.stringify(error))))));
 }));
 exports.updateMappedCashAccountEpic = updateMappedCashAccountEpic;

package/lib/view/spendManagement/plaidAccount/epic/paymentAccounts/updatePaymentAccountEpic.js

@@ -15,10 +15,11 @@ const updatePaymentAccountEpic = (actions$, _state$, zeniAPI) => actions$.pipe((
     })
         .pipe((0, operators_1.mergeMap)((response) => {
         if ((0, responsePayload_1.isSuccessResponse)(response) && response.data != null) {
+            const paymentAccountIds = response.data.payment_accounts.map((paymentAccount) => paymentAccount.payment_account_id);
             const actions = [
                 (0, accountReducer_1.updateAccounts)(response.data.accounts, setupViewType),
                 (0, paymentAccountReducer_1.updatePaymentAccounts)(response.data.payment_accounts),
-                (0, plaidAccountViewReducer_1.updatePaymentAccountSuccess)(plaidAccountKeyType),
+                (0, plaidAccountViewReducer_1.updatePaymentAccountSuccess)(paymentAccountIds, plaidAccountKeyType),
             ];
             return (0, rxjs_1.from)(actions);
         }

package/lib/view/spendManagement/plaidAccount/epic/paymentAccounts/updatePaymentAccountStatusEpic.js

@@ -16,10 +16,11 @@ const updatePaymentAccountStatusEpic = (actions$, _state$, zeniAPI) => actions$.
     })
         .pipe((0, operators_1.mergeMap)((response) => {
         if ((0, responsePayload_1.isSuccessResponse)(response) && response.data != null) {
+            const paymentAccountIds = response.data.payment_accounts.map((paymentAccount) => paymentAccount.payment_account_id);
             const actions = [
                 (0, accountReducer_1.updateAccounts)(response.data.accounts, setupViewType),
                 (0, paymentAccountReducer_1.updatePaymentAccounts)(response.data.payment_accounts),
-                (0, plaidAccountViewReducer_1.updatePaymentAccountStatusSuccess)(linkTokenType, plaidAccountKeyType),
+                (0, plaidAccountViewReducer_1.updatePaymentAccountStatusSuccess)(paymentAccountIds, linkTokenType, plaidAccountKeyType),
             ];
             return (0, rxjs_1.from)(actions);
         }

package/lib/view/spendManagement/plaidAccount/epic/paymentAccounts/updatePrimaryFundingAccountEpic.js

@@ -8,54 +8,32 @@ const plaidAccountViewReducer_1 = require("../../plaidAccountViewReducer");
 const companyReducer_1 = require("../../../../../entity/company/companyReducer");
 const helpers_1 = require("../../../helpers");
 const billPayConfigState_1 = require("../../../billPay/billPayConfig/billPayConfigState");
+const billPayConfigPayload_1 = require("../../../billPay/billPayConfig/billPayConfigPayload");
 const updatePrimaryFundingAccountEpic = (actions$, _state$, zeniAPI) => actions$.pipe((0, operators_1.filter)(plaidAccountViewReducer_1.updatePrimaryFundingAccount.match), (0, operators_1.mergeMap)((action) => {
-    const { companyId, plaidAccountKeyType, accountId, accountType } = action.payload;
+    const { companyId, accountId, accountType } = action.payload;
     return zeniAPI
-        .putAndGetJSON(`${zeniAPI.apiEndPoints.tenantMicroServiceBaseUrl}/1.0/companies/${companyId}`, toPayload(plaidAccountKeyType, accountId, accountType))
+        .putAndGetJSON(`${zeniAPI.apiEndPoints.tenantMicroServiceBaseUrl}/1.0/companies/${companyId}`, {
+        reimbursement_primary_funding_account_id: accountId,
+        reimbursement_primary_funding_account_type: (0, helpers_1.accountTypeSubConfigCodeToAccType)(accountType),
+    })
         .pipe((0, operators_1.mergeMap)((response) => {
-        var _a;
+        var _a, _b, _c;
         if ((0, responsePayload_1.isSuccessResponse)(response) && response.data != null) {
             const actions = [
                 (0, companyReducer_1.updateCompanies)({
                     payload: (_a = response.data.companies) !== null && _a !== void 0 ? _a : [],
                     schema: {},
                 }),
-                (0, plaidAccountViewReducer_1.updatePrimaryFundingAccountSuccess)(plaidAccountKeyType),
+                (0, plaidAccountViewReducer_1.updatePrimaryFundingAccountSuccess)((_b = response.data.companies[0].reimbursement_info
+                    .primary_funding_account.account_id) !== null && _b !== void 0 ? _b : '', (0, billPayConfigPayload_1.getAccountTypeSubConfigCodeKey)((0, billPayConfigState_1.toAccType)((_c = response.data.companies[0].reimbursement_info
+                    .primary_funding_account.account_type) !== null && _c !== void 0 ? _c : ''))),
             ];
             return (0, rxjs_1.from)(actions);
         }
         else {
-            return (0, rxjs_1.of)((0, plaidAccountViewReducer_1.updatePrimaryFundingAccountFailure)(plaidAccountKeyType, response.status));
+            return (0, rxjs_1.of)((0, plaidAccountViewReducer_1.updatePrimaryFundingAccountFailure)(response.status));
         }
-    }), (0, operators_1.catchError)((error) => (0, rxjs_1.of)((0, plaidAccountViewReducer_1.updatePrimaryFundingAccountFailure)(plaidAccountKeyType, (0, responsePayload_1.createZeniAPIStatus)('Unexpected Error', 'Update Primary Funding Account errored out' +
+    }), (0, operators_1.catchError)((error) => (0, rxjs_1.of)((0, plaidAccountViewReducer_1.updatePrimaryFundingAccountFailure)((0, responsePayload_1.createZeniAPIStatus)('Unexpected Error', 'Update Primary Funding Account errored out' +
         JSON.stringify(error))))));
 }));
 exports.updatePrimaryFundingAccountEpic = updatePrimaryFundingAccountEpic;
-function toPayload(plaidAccountKeyType, accountId, accountType) {
-    switch (plaidAccountKeyType) {
-        case 'bill_pay_setup': {
-            return {
-                bill_pay_primary_funding_account_id: accountId,
-                bill_pay_primary_funding_account_type: (0, helpers_1.accountTypeSubConfigCodeToAccType)((0, billPayConfigState_1.toAccountTypeSubConfigCodeKeyType)(accountType)),
-            };
-        }
-        case 'reimbursement_setup': {
-            return {
-                reimbursement_primary_funding_account_id: accountId,
-                reimbursement_primary_funding_account_type: (0, helpers_1.accountTypeSubConfigCodeToAccType)((0, billPayConfigState_1.toAccountTypeSubConfigCodeKeyType)(accountType)),
-            };
-        }
-        case 'charge_card_setup': {
-            return {
-                charge_cards_primary_funding_account_id: accountId,
-                charge_cards_primary_funding_account_type: (0, helpers_1.accountTypeSubConfigCodeToAccType)((0, billPayConfigState_1.toAccountTypeSubConfigCodeKeyType)(accountType)),
-            };
-        }
-        default: {
-            return {
-                deposit_accounts_primary_funding_account_id: accountId,
-                deposit_accounts_primary_funding_account_type: (0, helpers_1.accountTypeSubConfigCodeToAccType)((0, billPayConfigState_1.toAccountTypeSubConfigCodeKeyType)(accountType)),
-            };
-        }
-    }
-}

package/lib/view/spendManagement/plaidAccount/epic/plaidConnection/establishPlaidConnectionEpic.d.ts

@@ -9,6 +9,5 @@ import { establishPlaidConnection, establishPlaidConnectionSuccess, establishPla
 import { updateBankAccounts } from '../../../../../entity/bankAccount/bankAccountReducer';
 import { updateUserBankAccount } from '../../../../userFinancialAccount/userFinancialAccountReducer';
 import { updatePaymentAccountList } from '../../../zeniAccounts/paymentAccountList/paymentAccountListReducer';
-import { updateCompanyPrimaryAccount } from '../../../../../entity/company/companyReducer';
-export declare type ActionType = ReturnType<typeof establishPlaidConnection> | ReturnType<typeof updateAccounts> | ReturnType<typeof updateBankAccounts> | ReturnType<typeof updateUserBankAccount> | ReturnType<typeof updatePaymentAccounts> | ReturnType<typeof openSnackbar> | ReturnType<typeof updatePaymentAccountList> | ReturnType<typeof establishPlaidConnectionSuccess> | ReturnType<typeof establishPlaidConnectionFailure> | ReturnType<typeof updateCompanyPrimaryAccount>;
+export declare type ActionType = ReturnType<typeof establishPlaidConnection> | ReturnType<typeof updateAccounts> | ReturnType<typeof updateBankAccounts> | ReturnType<typeof updateUserBankAccount> | ReturnType<typeof updatePaymentAccounts> | ReturnType<typeof openSnackbar> | ReturnType<typeof updatePaymentAccountList> | ReturnType<typeof establishPlaidConnectionSuccess> | ReturnType<typeof establishPlaidConnectionFailure>;
 export declare const establishPlaidConnectionEpic: (actions$: ActionsObservable<ActionType>, state: StateObservable<RootState>, zeniAPI: ZeniAPI) => Observable<ActionType>;

package/lib/view/spendManagement/plaidAccount/epic/plaidConnection/establishPlaidConnectionEpic.js

@@ -11,10 +11,9 @@ const plaidAccountViewReducer_1 = require("../../plaidAccountViewReducer");
 const bankAccountReducer_1 = require("../../../../../entity/bankAccount/bankAccountReducer");
 const userFinancialAccountReducer_1 = require("../../../../userFinancialAccount/userFinancialAccountReducer");
 const paymentAccountListReducer_1 = require("../../../zeniAccounts/paymentAccountList/paymentAccountListReducer");
-const companyReducer_1 = require("../../../../../entity/company/companyReducer");
 const establishPlaidConnectionEpic = (actions$, state, zeniAPI) => actions$.pipe((0, operators_1.filter)(plaidAccountViewReducer_1.establishPlaidConnection.match), (0, operators_1.mergeMap)((action) => {
     var _a, _b;
-    const { publicToken, companyId, setupViewType, linkTokenType, plaidAccountKeyType, } = action.payload;
+    const { publicToken, setupViewType, linkTokenType, plaidAccountKeyType } = action.payload;
     const requestPayload = {
         public_token: publicToken,
     };
@@ -24,74 +23,39 @@ const establishPlaidConnectionEpic = (actions$, state, zeniAPI) => actions$.pipe
         if (setupViewType == null) {
             requestPayload.is_user_account = true;
         }
-        else if (plaidAccountKeyType === 'bill_pay_setup') {
-            requestPayload.is_primary_for_bill_pay = true;
-        }
         else if (plaidAccountKeyType === 'reimbursement_setup') {
             requestPayload.is_primary_for_reimbursements = true;
         }
-        else if (plaidAccountKeyType === 'charge_card_setup') {
-            requestPayload.is_primary_for_charge_cards = true;
-        }
-        else if (plaidAccountKeyType === 'account_setup') {
-            requestPayload.is_primary_for_deposit_accounts = true;
-        }
         else if (plaidAccountKeyType === 'billing_setup') {
             requestPayload.is_primary_for_onboarding = true;
         }
+        else {
+            requestPayload.is_primary_for_bill_pay = true;
+        }
     }
     return zeniAPI
         .postAndGetJSON(`${zeniAPI.apiEndPoints.payMicroServiceBaseUrl}/1.0/plaid/public-token`, requestPayload)
         .pipe((0, operators_1.mergeMap)((response) => {
         if ((0, responsePayload_1.isSuccessResponse)(response) && response.data != null) {
-            const paymentAccount = response.data.payment_accounts[0];
+            const paymentAccountIds = response.data.payment_accounts.map((paymentAccount) => paymentAccount.payment_account_id);
+            // the payment account received in the response is the new primary funding account
+            const primaryFundingAccountId = paymentAccountIds[0];
+            const existingPaymentAccountIds = state.value.plaidAccountViewState['reimbursement_setup']
+                .accountDetails.paymentAccountIds;
             const actions = [
                 (0, paymentAccountReducer_1.updatePaymentAccounts)(response.data.payment_accounts),
                 (0, paymentAccountListReducer_1.updatePaymentAccountList)({
                     data: response.data.payment_accounts,
                     updateType: 'merge',
                 }),
-                (0, plaidAccountViewReducer_1.establishPlaidConnectionSuccess)(linkTokenType, plaidAccountKeyType),
+                (0, plaidAccountViewReducer_1.establishPlaidConnectionSuccess)(primaryFundingAccountId, [...paymentAccountIds, ...existingPaymentAccountIds], linkTokenType, plaidAccountKeyType),
             ];
-            if (setupViewType != null) {
-                const primaryAccountForProducts = [];
-                // if the account added is primary for any product, it should be reflected on that setup page without refresh also
-                // this happens when the first external account is added - it becomes primary for rest of the products also
-                if (paymentAccount.is_primary_for_bill_pay === true) {
-                    primaryAccountForProducts.push('bill_pay');
-                }
-                if (paymentAccount.is_primary_for_bill_pay === true) {
-                    actions.push((0, companyReducer_1.updateCompanyPrimaryAccount)({
-                        companyId: companyId,
-                        primaryFundingAccountId: paymentAccount.payment_account_id,
-                        accountType: 'paymentAccount',
-                        productType: 'bill_pay',
-                    }));
-                }
-                if (paymentAccount.is_primary_for_reimbursements === true) {
-                    actions.push((0, companyReducer_1.updateCompanyPrimaryAccount)({
-                        companyId: companyId,
-                        primaryFundingAccountId: paymentAccount.payment_account_id,
-                        accountType: 'paymentAccount',
-                        productType: 'reimbursement',
-                    }));
-                }
-                if (paymentAccount.is_primary_for_charge_cards === true) {
-                    actions.push((0, companyReducer_1.updateCompanyPrimaryAccount)({
-                        companyId: companyId,
-                        primaryFundingAccountId: paymentAccount.payment_account_id,
-                        accountType: 'paymentAccount',
-                        productType: 'charge_cards',
-                    }));
-                }
-                if (paymentAccount.is_primary_for_deposit_accounts === true) {
-                    actions.push((0, companyReducer_1.updateCompanyPrimaryAccount)({
-                        companyId: companyId,
-                        primaryFundingAccountId: paymentAccount.payment_account_id,
-                        accountType: 'paymentAccount',
-                        productType: 'zeni_accounts',
-                    }));
-                }
+            // if plaidAccountKeyType is not reimbursement_setup but the account added is primary for reimbursement
+            // it should be reflected on remi setup page without refresh also
+            if (plaidAccountKeyType !== 'reimbursement_setup' &&
+                response.data.payment_accounts[0]
+                    .is_primary_for_reimbursements === true) {
+                actions.push((0, plaidAccountViewReducer_1.establishPlaidConnectionSuccess)(primaryFundingAccountId, [...paymentAccountIds, ...existingPaymentAccountIds], linkTokenType, 'reimbursement_setup'));
             }
             if (response.data.bank_accounts != null) {
                 const bankAccountIds = response.data.bank_accounts.map((bank_account) => bank_account.bank_account_id);

package/lib/view/spendManagement/plaidAccount/epic/plaidConnection/getPlaidLinkTokenEpic.js

@@ -6,7 +6,7 @@ const operators_1 = require("rxjs/operators");
 const responsePayload_1 = require("../../../../../responsePayload");
 const snackbarReducer_1 = require("../../../../../entity/snackbar/snackbarReducer");
 const plaidAccountViewReducer_1 = require("../../plaidAccountViewReducer");
-const getPlaidLinkTokenEpic = (actions$, _state$, zeniAPI) => actions$.pipe((0, operators_1.filter)(plaidAccountViewReducer_1.getPlaidLinkToken.match), (0, operators_1.mergeMap)((action) => {
+const getPlaidLinkTokenEpic = (actions$, _state$, zeniAPI) => actions$.pipe((0, operators_1.filter)(plaidAccountViewReducer_1.getPlaidLinkToken.match), (0, operators_1.switchMap)((action) => {
     const { linkTokenType, paymentAccountId, plaidAccountKeyType } = action.payload;
     return zeniAPI
         .getJSON(`${zeniAPI.apiEndPoints.payMicroServiceBaseUrl}/1.0/plaid/link-token?query=${JSON.stringify((0, exports.toLinkTokenPayload)(linkTokenType, paymentAccountId))}`)