@zeniai/client-epic-state 4.11.46 → 4.11.48

package/lib/view/referralView/referralState.d.ts

@@ -46,7 +46,7 @@ export declare const REFERRAL_LIST_VIEW_SORT_KEYS: readonly ["invitee_email", "a
 export declare const toReferralListViewSortKeyType: (v: string) => "status" | "amount" | "invitee_email" | "referral_date";
 export declare type ReferralListViewSortKey = ReturnType<typeof toReferralListViewSortKeyType>;
 export declare const ALL_REFERRAL_STATUSES: readonly ["invite_processing", "invite_sent", "onboarding", "active", "declined", "resend_invite", "reward_sent"];
-export declare const toReferralStatusType: (v: string) => "active" | "onboarding" | "invite_processing" | "invite_sent" | "declined" | "resend_invite" | "reward_sent";
+export declare const toReferralStatusType: (v: string) => "active" | "onboarding" | "declined" | "invite_processing" | "invite_sent" | "resend_invite" | "reward_sent";
 export declare type ReferralStatus = ReturnType<typeof toReferralStatusType>;
 export declare const StatusTypes: Record<ReferralStatus, string>;
 export declare const ALL_REFERRAL_AMOUNT_STATUSES: readonly ["received", "to_be_received"];

package/lib/view/scheduleView/scheduleListView/scheduleListTypes.d.ts

@@ -10,7 +10,7 @@ export declare const ALL_SCHEDULES_SUB_TABS: readonly ["all", "new", "ongoing",
 export declare const toScheduleSubTabType: (v: string) => "all" | "new" | "completed" | "ongoing";
 export declare type ScheduleSubTabType = ReturnType<typeof toScheduleSubTabType>;
 export declare const ALL_SCHEDULES_PAY_SORT_KEYS: readonly ["transactionDate", "vendor", "scheduleCategory", "expenseCategory", "accumulatedDepreciationCategory", "class", "amount", "balanceAsOfToday", "memo", "startMonth", "endMonth", "months", "transactionType", "status", "assetId", "user"];
-export declare const toScheduleSortKeyType: (v: string) => "status" | "user" | "months" | "amount" | "vendor" | "class" | "memo" | "transactionDate" | "transactionType" | "balanceAsOfToday" | "scheduleCategory" | "expenseCategory" | "accumulatedDepreciationCategory" | "startMonth" | "endMonth" | "assetId";
+export declare const toScheduleSortKeyType: (v: string) => "status" | "user" | "months" | "amount" | "vendor" | "class" | "memo" | "transactionDate" | "scheduleCategory" | "expenseCategory" | "accumulatedDepreciationCategory" | "balanceAsOfToday" | "startMonth" | "endMonth" | "transactionType" | "assetId";
 export declare type ScheduleListSortKey = ReturnType<typeof toScheduleSortKeyType>;
 export interface DownloadJEScheduleTabOptions {
     timezone: string;

package/lib/view/settingsView/epic/saveNotificationSettingsEpic.d.ts

@@ -18,7 +18,7 @@ export declare const saveNotificationSettingsEpic: (actions$: ActionsObservable<
     type: string;
 } | {
     payload: {
-        messageSection: "bill_pay_setup" | "reimbursement_setup" | "charge_card_setup" | "common" | "transactionDetails_updatingPastTransactions" | "transactionDetails_transactionUpdated" | "cockpit_month_end_email_sent" | "cockpit_month_end_email_save" | "cockpit_month_end_email_attachment_upload" | "audit_score_updated" | "people_invite_people" | "people_invite_multiple_people" | "people_delete_person" | "people_update_person" | "reimbursement_updated" | "reimbursement_deleted" | "reimbursement_cancelled_deleted" | "reimbursement_cancelled" | "reimbursement_approved" | "reimbursement_rejected" | "reimbursement_sent_for_approval" | "account_added" | "business_verification_save" | "business_verification_submit" | "business_verification_from_bills_submit" | "plaid_connection" | "unlink_deposit_account" | "reimbursement_approval_create" | "reimbursement_duplicate_approval_create" | "reimbursement_approval_update" | "reimbursement_duplicate_approval_update" | "reimbursement_approval_delete" | "reimbursement_create_mileage" | "reimbursement_update_mileage" | "reimbursement_accept_term" | "reimbursement_accept_employee_term" | "zeni_accounts_setup" | "bill_pay_approval_create" | "bill_pay_duplicate_approval_create" | "bill_pay_approval_update" | "bill_pay_duplicate_approval_update" | "bill_pay_approval_delete" | "bill_pay_updated" | "bill_pay_deleted" | "bill_pay_cancelled_deleted" | "bill_pay_cancelled" | "bill_pay_approved" | "real_time_approver_added" | "bill_pay_rejected" | "bill_pay_sent_for_approval" | "bill_pay_accept_term" | "bill_pay_bulk_submit" | "bill_pay_bulk_processed" | "zeni_account_accept_term" | "update_vendor" | "data_refresh_update" | "delete_bank_account" | "create_bank_account" | "create_bank_account_ach" | "create_bank_account_wire" | "create_bank_account_international" | "transfer_money" | "update_zeni_account_nickname" | "create_checking_account" | "deposit_check" | "create_vendor" | "onboarding_customer_view" | "onboarding_customer_view_complete" | "onboarding_customer_identity_verification_save" | "onboarding_customer_identity_verification_submit" | "onboarding_customer_business_verification_save" | "onboarding_customer_business_verification_submit" | "retry_bank_account_connection" | "dashboard_invite_sent" | "onboarding_info_saved" | "approve_original_merchant" | "approve_global_merchant" | "reject_global_merchant" | "create_global_merchant" | "fetch_global_merchant_no_recommendation" | "save_vendor_renamed" | "save_vendor_sent_for_review" | "save_vendor_marked_as_employee" | "save_vendor_marked_as_local_contractor" | "charge_card_accept_term" | "create_schedule" | "save_schedule" | "delete_schedule" | "save_task_detail" | "fetch_task_detail" | "delete_task" | "archive_task" | "create_tag" | "delete_tag" | "update_charge_card" | "issue_charge_card" | "notification_settings_saved" | "referral_invite_sent" | "notification_mark_as_read" | "mark_as_complete_schedule" | "settings_accounting_accounts_updated" | "create_card_setup" | "confirm_card_setup" | "add_card_payment_source" | "fetch_payment_sources" | "task_assigned_toast_notification" | "task_due_tomorrow_toast_notification" | "task_deleted_toast_notification" | "task_archived_toast_notification" | "task_overdue_toast_notification" | "task_overdue_toast_notification_creator" | "task_notification_count" | "task_activities_toast_notification" | "task_created_toast_notification" | "task_group_creation_success" | "task_group_deletion_success" | "task_group_update_success";
+        messageSection: "reimbursement_setup" | "common" | "transactionDetails_updatingPastTransactions" | "transactionDetails_transactionUpdated" | "cockpit_month_end_email_sent" | "cockpit_month_end_email_save" | "cockpit_month_end_email_attachment_upload" | "audit_score_updated" | "people_invite_people" | "people_invite_multiple_people" | "people_delete_person" | "people_update_person" | "reimbursement_updated" | "reimbursement_deleted" | "reimbursement_cancelled_deleted" | "reimbursement_cancelled" | "reimbursement_approved" | "reimbursement_rejected" | "reimbursement_sent_for_approval" | "account_added" | "business_verification_save" | "business_verification_submit" | "business_verification_from_bills_submit" | "plaid_connection" | "unlink_deposit_account" | "reimbursement_approval_create" | "reimbursement_duplicate_approval_create" | "reimbursement_approval_update" | "reimbursement_duplicate_approval_update" | "reimbursement_approval_delete" | "reimbursement_create_mileage" | "reimbursement_update_mileage" | "reimbursement_accept_term" | "reimbursement_accept_employee_term" | "bill_pay_setup" | "zeni_accounts_setup" | "bill_pay_approval_create" | "bill_pay_duplicate_approval_create" | "bill_pay_approval_update" | "bill_pay_duplicate_approval_update" | "bill_pay_approval_delete" | "bill_pay_updated" | "bill_pay_deleted" | "bill_pay_cancelled_deleted" | "bill_pay_cancelled" | "bill_pay_approved" | "real_time_approver_added" | "bill_pay_rejected" | "bill_pay_sent_for_approval" | "bill_pay_accept_term" | "bill_pay_bulk_submit" | "bill_pay_bulk_processed" | "zeni_account_accept_term" | "update_vendor" | "data_refresh_update" | "delete_bank_account" | "create_bank_account" | "create_bank_account_ach" | "create_bank_account_wire" | "create_bank_account_international" | "transfer_money" | "update_zeni_account_nickname" | "create_checking_account" | "deposit_check" | "create_vendor" | "onboarding_customer_view" | "onboarding_customer_view_complete" | "onboarding_customer_identity_verification_save" | "onboarding_customer_identity_verification_submit" | "onboarding_customer_business_verification_save" | "onboarding_customer_business_verification_submit" | "retry_bank_account_connection" | "dashboard_invite_sent" | "onboarding_info_saved" | "approve_original_merchant" | "approve_global_merchant" | "reject_global_merchant" | "create_global_merchant" | "fetch_global_merchant_no_recommendation" | "save_vendor_renamed" | "save_vendor_sent_for_review" | "save_vendor_marked_as_employee" | "save_vendor_marked_as_local_contractor" | "charge_card_setup" | "charge_card_accept_term" | "create_schedule" | "save_schedule" | "delete_schedule" | "save_task_detail" | "fetch_task_detail" | "delete_task" | "archive_task" | "create_tag" | "delete_tag" | "update_charge_card" | "issue_charge_card" | "notification_settings_saved" | "referral_invite_sent" | "notification_mark_as_read" | "mark_as_complete_schedule" | "settings_accounting_accounts_updated" | "create_card_setup" | "confirm_card_setup" | "add_card_payment_source" | "fetch_payment_sources" | "task_assigned_toast_notification" | "task_due_tomorrow_toast_notification" | "task_deleted_toast_notification" | "task_archived_toast_notification" | "task_overdue_toast_notification" | "task_overdue_toast_notification_creator" | "task_notification_count" | "task_activities_toast_notification" | "task_created_toast_notification" | "task_group_creation_success" | "task_group_deletion_success" | "task_group_update_success";
         messageText: "failed" | "success" | "notification";
         type: import("../../..").SnackbarMessageType;
         showStatusIcon?: boolean | undefined;

package/lib/view/settingsView/settingsViewHelpers.js

@@ -11,7 +11,8 @@ const isAccountingTabVisible = (userRole, currentTenant, userRoleMap) => {
         return (((0, userRoleType_1.hasBillPayAccessible)(currentTenant, userRoleMap) ||
             (0, userRoleType_1.hasReimbursementAccessible)(currentTenant, userRoleMap) ||
             (0, userRoleType_1.hasFullOrAdminLevelAccess)(userRole)) &&
-            (0, tenantSelector_1.isTenantBankingOnly)(currentTenant) === false);
+            (0, tenantSelector_1.isTenantBankingOnly)(currentTenant) === false &&
+            (0, tenantSelector_1.isTenantCardsOnly)(currentTenant) === false);
     }
     else {
         return false;
@@ -30,7 +31,8 @@ const isApprovalRulesTabVisible = (userRole, currentTenant, userRoleMap) => {
             (0, userRoleType_1.hasReimbursementAccessible)(currentTenant, userRoleMap) ||
             ((isBillPayTOSAccepted || isReimbursementTOSAccepted) &&
                 (0, userRoleType_1.hasFullOrAdminLevelAccess)(userRole))) &&
-            (0, tenantSelector_1.isTenantBankingOnly)(currentTenant) === false);
+            (0, tenantSelector_1.isTenantBankingOnly)(currentTenant) === false &&
+            (0, tenantSelector_1.isTenantCardsOnly)(currentTenant) === false);
     }
     else {
         return false;
@@ -46,7 +48,8 @@ const isBankConnectionsTabVisible = (currentTenant, userRoleMap) => {
             (0, userRoleType_1.hasReimbursementAccessible)(currentTenant, userRoleMap) ||
             (0, userRoleType_1.hasZeniAccountsAccessible)(currentTenant, userRoleMap) ||
             (0, userRoleType_1.hasChargeCardAccessible)(currentTenant, userRoleMap)) &&
-            (0, tenantSelector_1.isTenantBankingOnly)(currentTenant) === false);
+            (0, tenantSelector_1.isTenantBankingOnly)(currentTenant) === false &&
+            (0, tenantSelector_1.isTenantCardsOnly)(currentTenant) === false);
     }
     else {
         return false;
@@ -62,7 +65,8 @@ const isBusinessVerificationTabVisible = (currentTenant, userRoleMap) => {
             (0, userRoleType_1.hasReimbursementAccessible)(currentTenant, userRoleMap) ||
             (0, userRoleType_1.hasZeniAccountsAccessible)(currentTenant, userRoleMap) ||
             (0, userRoleType_1.hasChargeCardAccessible)(currentTenant, userRoleMap)) &&
-            (0, tenantSelector_1.isTenantBankingOnly)(currentTenant) === false);
+            (0, tenantSelector_1.isTenantBankingOnly)(currentTenant) === false &&
+            (0, tenantSelector_1.isTenantCardsOnly)(currentTenant) === false);
     }
     else {
         return false;
@@ -88,7 +92,8 @@ const isIntegrationsTabVisible = (userRole, currentTenant) => {
         return false;
     }
     if ((0, exports.isSettingsVisible)(currentTenant)) {
-        return ((0, userRoleType_1.hasFullOrAdminLevelAccess)(userRole) && !(0, tenantSelector_1.isTenantBankingOnly)(currentTenant));
+        return ((0, userRoleType_1.hasFullOrAdminLevelAccess)(userRole) &&
+            !((0, tenantSelector_1.isTenantBankingOnly)(currentTenant) || (0, tenantSelector_1.isTenantCardsOnly)(currentTenant)));
     }
     else {
         return false;
@@ -137,6 +142,7 @@ const isNotificationsTabVisible = (notificationSettings, signedInUseEmail, curre
     const { reminderNotificationSettings, monthEndInsightsNotificationSettings } = notificationSettings;
     return (((0, exports.isRemindersSectionVisibleOnSettingsPage)(reminderNotificationSettings) ||
         (0, exports.isMonthEndNotificationsSectionVisibleOnSettingsPage)(monthEndInsightsNotificationSettings, signedInUseEmail)) &&
-        (0, tenantSelector_1.isTenantBankingOnly)(currentTenant) === false);
+        (0, tenantSelector_1.isTenantBankingOnly)(currentTenant) === false &&
+        (0, tenantSelector_1.isTenantCardsOnly)(currentTenant) === false);
 };
 exports.isNotificationsTabVisible = isNotificationsTabVisible;

package/lib/view/spendManagement/billPay/billPayReview/billPayReviewSelector.js

@@ -37,7 +37,7 @@ const getDuplicateBills = (state, billId) => {
 exports.getDuplicateBills = getDuplicateBills;
 const getReviewPageBillDetail = (state, 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;
-    const { accountListState, accountState, billTransactionState, classListState, editBillDetailViewState, paymentAccountState, vendorState, contactState, billPayConfigState, recurringBillState, depositAccountState, depositAccountListState, paymentAccountListState, } = state;
+    const { accountListState, accountState, plaidAccountViewState, billTransactionState, classListState, editBillDetailViewState, paymentAccountState, vendorState, contactState, billPayConfigState, recurringBillState, depositAccountState, depositAccountListState, } = state;
     const key = (0, billDetailViewState_1.getBillTransactionDetailKey)(billId !== null && billId !== void 0 ? billId : '');
     const sourceBillDetail = billId != null
         ? (_a = editBillDetailViewState.editBillStateById) === null || _a === void 0 ? void 0 : _a[key]
@@ -47,7 +47,8 @@ const getReviewPageBillDetail = (state, billId) => {
     let paymentDetailsSection;
     let file;
     let contactDetails = [];
-    const primaryPaymentAccount = (0, paymentAccountSelector_1.getPaymentAccountsByPaymentAccountIds)(paymentAccountState, paymentAccountListState.paymentAccountIds);
+    const primaryPaymentAccount = (0, paymentAccountSelector_1.getPaymentAccountsByPaymentAccountIds)(paymentAccountState, plaidAccountViewState['spend_management_setup'].accountDetails
+        .paymentAccountIds);
     const allDepositAccounts = (0, depositAccountListSelector_1.getAllDepostAccounts)(depositAccountState, depositAccountListState).depositAccounts;
     const withdrawFromList = (0, setupViewSelector_1.getAllFundingAccounts)(allDepositAccounts, primaryPaymentAccount);
     let fetchState = 'Not-Started';

package/lib/view/spendManagement/billPay/billPaySetupView/billPaySetupViewSelector.js

@@ -4,7 +4,7 @@ exports.getBillPayBusinessVerificationDetails = exports.getBillPaySetupViewDetai
 const setupViewSelector_1 = require("../../commonSetup/setupViewSelector");
 const helpers_1 = require("../../helpers");
 function getBillPaySetupViewDetails(state, companyId) {
-    const billPaySetupViewDetails = (0, setupViewSelector_1.getCommonSetupViewDetails)(state, companyId, 'bill_pay', 'bill_pay_setup');
+    const billPaySetupViewDetails = (0, setupViewSelector_1.getCommonSetupViewDetails)(state, companyId, 'bill_pay', 'spend_management_setup');
     const businessVerificationDetails = getBillPayBusinessVerificationDetails(state, companyId);
     const selectedCompanyOfficer = (0, helpers_1.getSelectedCompanyOfficer)(businessVerificationDetails);
     const { billPaySetupViewState, setupViewState } = state;

package/lib/view/spendManagement/billPay/billPaySetupView/epic/billPaySetup/fetchBillPaySetupViewEpic.d.ts

@@ -13,8 +13,5 @@ import { openSnackbar } from '../../../../../../entity/snackbar/snackbarReducer'
 import { updateSetupViewLocalStoreData } from '../../../../commonSetup/setupViewReducer';
 import { fetchBillPaySetupView, fetchBillPaySetupViewSuccess, fetchBillPaySetupViewFailure } from '../../billPaySetupViewReducer';
 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 fetchBillPaySetupView> | 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 fetchBillPaySetupViewSuccess> | ReturnType<typeof fetchBillPaySetupViewFailure>;
+export declare type ActionType = ReturnType<typeof fetchBillPaySetupView> | 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 fetchBillPaySetupViewSuccess> | ReturnType<typeof fetchBillPaySetupViewFailure>;
 export declare const fetchBillPaySetupViewEpic: (actions$: ActionsObservable<ActionType>, state$: StateObservable<RootState>, zeniAPI: ZeniAPI) => Observable<ActionType>;

package/lib/view/spendManagement/billPay/billPaySetupView/epic/billPaySetup/fetchBillPaySetupViewEpic.js

@@ -16,9 +16,6 @@ const snackbarReducer_1 = require("../../../../../../entity/snackbar/snackbarRed
 const setupViewReducer_1 = require("../../../../commonSetup/setupViewReducer");
 const billPaySetupViewReducer_1 = require("../../billPaySetupViewReducer");
 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 fetchBillPaySetupViewEpic = (actions$, state$, zeniAPI) => actions$.pipe((0, operators_1.filter)(billPaySetupViewReducer_1.fetchBillPaySetupView.match), (0, operators_1.switchMap)((action) => {
     var _a;
     const { companyId, cacheOverride, refreshViewInBackground } = action.payload;
@@ -32,9 +29,9 @@ const fetchBillPaySetupViewEpic = (actions$, state$, zeniAPI) => actions$.pipe((
         return zeniAPI
             .getJSON(`${zeniAPI.apiEndPoints.tenantMicroServiceBaseUrl}/1.0/companies/${companyId}?query={"view":"bill_pay_setup"}`)
             .pipe((0, operators_1.mergeMap)((response) => {
-            var _a, _b, _c;
             if ((0, responsePayload_1.isSuccessResponse)(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 fetchBillPaySetupViewEpic = (actions$, state$, zeniAPI) => actions$.pipe((
                     (0, fileReducer_1.updateFiles)({ files: response.data.files }),
                     (0, accountReducer_1.updateAccounts)(response.data.accounts, 'bill_pay'),
                     (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, 'bill_pay_setup'),
+                    (0, plaidAccountViewReducer_1.updatePlaidAccountViewAccountDetails)(allBankAccountIds, paymentAccountIds, 'spend_management_setup'),
                     (0, billPaySetupViewReducer_1.fetchBillPaySetupViewSuccess)(),
                 ];
                 return (0, rxjs_1.from)(actions);
@@ -74,10 +62,10 @@ const fetchBillPaySetupViewEpic = (actions$, state$, zeniAPI) => actions$.pipe((
             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, 'bill_pay_setup'), (0, billPaySetupViewReducer_1.fetchBillPaySetupViewSuccess)());
+        }), (0, plaidAccountViewReducer_1.updatePlaidAccountViewAccountDetails)(allBankAccountIds, paymentAccountIds, 'spend_management_setup'), (0, billPaySetupViewReducer_1.fetchBillPaySetupViewSuccess)());
     }
 }));
 exports.fetchBillPaySetupViewEpic = fetchBillPaySetupViewEpic;

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/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>;