@zeniai/client-epic-state 4.11.58 → 4.11.59

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

@@ -11,9 +11,10 @@ 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, setupViewType, linkTokenType, plaidAccountKeyType } = action.payload;
+    const { publicToken, companyId, setupViewType, linkTokenType, plaidAccountKeyType, } = action.payload;
     const requestPayload = {
         public_token: publicToken,
     };
@@ -23,39 +24,74 @@ 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 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 paymentAccount = response.data.payment_accounts[0];
             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)(primaryFundingAccountId, [...paymentAccountIds, ...existingPaymentAccountIds], linkTokenType, plaidAccountKeyType),
+                (0, plaidAccountViewReducer_1.establishPlaidConnectionSuccess)(linkTokenType, plaidAccountKeyType),
             ];
-            // 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 (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 (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.switchMap)((action) => {
+const getPlaidLinkTokenEpic = (actions$, _state$, zeniAPI) => actions$.pipe((0, operators_1.filter)(plaidAccountViewReducer_1.getPlaidLinkToken.match), (0, operators_1.mergeMap)((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))}`)

package/lib/view/spendManagement/plaidAccount/plaidAccountViewReducer.d.ts

@@ -1,4 +1,3 @@
-import { ID } from '../../../commonStateTypes/common';
 import { ZeniAPIStatus } from '../../../responsePayload';
 import { PlaidAccountKeyType, PlaidAccountViewState, PlaidLinkTokenType } from './plaidAccountViewState';
 export declare const initialState: PlaidAccountViewState;
@@ -17,8 +16,7 @@ export declare const getPaymentAccounts: import("@reduxjs/toolkit").ActionCreato
     paymentAccountId: string;
     setupViewType: "bill_pay" | "reimbursement" | "zeni_accounts" | "charge_cards" | "billing";
     plaidAccountKeyType: PlaidAccountKeyType;
-}, string, never, never>, updatePaymentAccountSuccess: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[paymentAccountIds: string[], plaidAccountKeyType: PlaidAccountKeyType], {
-    paymentAccountIds: string[];
+}, string, never, never>, updatePaymentAccountSuccess: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[plaidAccountKeyType: PlaidAccountKeyType], {
     plaidAccountKeyType: PlaidAccountKeyType;
 }, string, never, never>, updatePaymentAccountFailure: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[error: ZeniAPIStatus<Record<string, unknown>>, plaidAccountKeyType: PlaidAccountKeyType], {
     error: ZeniAPIStatus<Record<string, unknown>>;
@@ -29,8 +27,7 @@ export declare const getPaymentAccounts: import("@reduxjs/toolkit").ActionCreato
     setupViewType: "bill_pay" | "reimbursement" | "zeni_accounts" | "charge_cards" | "billing";
     plaidAccountKeyType: PlaidAccountKeyType;
     linkTokenType: PlaidLinkTokenType;
-}, string, never, never>, updatePaymentAccountStatusSuccess: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[paymentAccountIds: string[], linkTokenType: PlaidLinkTokenType, plaidAccountKeyType: PlaidAccountKeyType], {
-    paymentAccountIds: string[];
+}, string, never, never>, updatePaymentAccountStatusSuccess: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[linkTokenType: PlaidLinkTokenType, plaidAccountKeyType: PlaidAccountKeyType], {
     linkTokenType: PlaidLinkTokenType;
     plaidAccountKeyType: PlaidAccountKeyType;
 }, string, never, never>, updatePaymentAccountStatusFailure: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[error: ZeniAPIStatus<Record<string, unknown>>, linkTokenType: PlaidLinkTokenType, plaidAccountKeyType: PlaidAccountKeyType], {
@@ -64,44 +61,41 @@ export declare const getPaymentAccounts: import("@reduxjs/toolkit").ActionCreato
     error: ZeniAPIStatus<Record<string, unknown>>;
     linkTokenType: PlaidLinkTokenType;
     plaidAccountKeyType: PlaidAccountKeyType;
-}, string, never, never>, establishPlaidConnection: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[publicToken: string, plaidAccountKeyType: PlaidAccountKeyType, setupViewType?: "bill_pay" | "reimbursement" | "zeni_accounts" | "charge_cards" | "billing" | undefined, linkTokenType?: PlaidLinkTokenType | undefined], {
+}, string, never, never>, establishPlaidConnection: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[publicToken: string, companyId: string, plaidAccountKeyType: PlaidAccountKeyType, setupViewType?: "bill_pay" | "reimbursement" | "zeni_accounts" | "charge_cards" | "billing" | undefined, linkTokenType?: PlaidLinkTokenType | undefined], {
     publicToken: string;
+    companyId: string;
     setupViewType: "bill_pay" | "reimbursement" | "zeni_accounts" | "charge_cards" | "billing" | undefined;
     linkTokenType: PlaidLinkTokenType;
     plaidAccountKeyType: PlaidAccountKeyType;
-}, string, never, never>, establishPlaidConnectionSuccess: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[primaryFundingAccountId: string, paymentAccountIds: string[], linkTokenType: PlaidLinkTokenType, plaidAccountKeyType: PlaidAccountKeyType], {
-    primaryFundingAccountId: string;
-    paymentAccountIds: string[];
+}, string, never, never>, establishPlaidConnectionSuccess: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[linkTokenType: PlaidLinkTokenType, plaidAccountKeyType: PlaidAccountKeyType], {
     linkTokenType: PlaidLinkTokenType;
     plaidAccountKeyType: PlaidAccountKeyType;
 }, string, never, never>, establishPlaidConnectionFailure: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[error: ZeniAPIStatus<Record<string, unknown>>, linkTokenType: PlaidLinkTokenType, plaidAccountKeyType: PlaidAccountKeyType], {
     error: ZeniAPIStatus<Record<string, unknown>>;
     linkTokenType: PlaidLinkTokenType;
     plaidAccountKeyType: PlaidAccountKeyType;
-}, string, never, never>, updatePlaidAccountViewAccountDetails: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[allBankAccountIds: string[], paymentAccountIds: string[], plaidAccountKeyType: PlaidAccountKeyType, depositAccountIds?: string[] | undefined, primaryFundingAccount?: {
-    accountId: ID;
-    accountType: string;
-} | undefined], {
+}, string, never, never>, updatePlaidAccountViewAccountDetails: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[allBankAccountIds: string[], plaidAccountKeyType: PlaidAccountKeyType], {
     allBankAccountIds: string[];
-    paymentAccountIds: string[];
     plaidAccountKeyType: PlaidAccountKeyType;
-    depositAccountIds: string[] | undefined;
-    primaryFundingAccount: {
-        accountId: ID;
-        accountType: string;
-    } | undefined;
-}, string, never, never>, updatePrimaryFundingAccount: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[companyId: string, accountId: string, accountType: string], {
+}, string, never, never>, updatePrimaryFundingAccount: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[companyId: string, plaidAccountKeyType: PlaidAccountKeyType, accountId: string, accountType: string], {
     companyId: string;
+    plaidAccountKeyType: PlaidAccountKeyType;
     accountId: string;
     accountType: string;
-}, string, never, never>, updatePrimaryFundingAccountSuccess: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[accountId: string, accountType: string], {
-    accountId: string;
-    accountType: string;
-}, string, never, never>, updatePrimaryFundingAccountFailure: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[error: ZeniAPIStatus<Record<string, unknown>>], ZeniAPIStatus<Record<string, unknown>>, string, never, never>, updateMappedCashAccount: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[accountId: string, depositAccountId: string], {
+}, string, never, never>, updatePrimaryFundingAccountSuccess: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[plaidAccountKeyType: PlaidAccountKeyType], {
+    plaidAccountKeyType: PlaidAccountKeyType;
+}, string, never, never>, updatePrimaryFundingAccountFailure: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[plaidAccountKeyType: PlaidAccountKeyType, error: ZeniAPIStatus<Record<string, unknown>>], {
+    error: ZeniAPIStatus<Record<string, unknown>>;
+    plaidAccountKeyType: PlaidAccountKeyType;
+}, string, never, never>, updateMappedCashAccount: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[plaidAccountKeyType: PlaidAccountKeyType, accountId: string, depositAccountId: string], {
+    plaidAccountKeyType: PlaidAccountKeyType;
     accountId: string;
     depositAccountId: string;
-}, string, never, never>, updateMappedCashAccountSuccess: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[depositAccountIds: string[]], {
-    depositAccountIds: string[];
-}, string, never, never>, updateMappedCashAccountFailure: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[error: ZeniAPIStatus<Record<string, unknown>>], ZeniAPIStatus<Record<string, unknown>>, string, never, never>, clearPlaidAccountView: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<string>;
+}, string, never, never>, updateMappedCashAccountSuccess: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[plaidAccountKeyType: PlaidAccountKeyType], {
+    plaidAccountKeyType: PlaidAccountKeyType;
+}, string, never, never>, updateMappedCashAccountFailure: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[plaidAccountKeyType: PlaidAccountKeyType, error: ZeniAPIStatus<Record<string, unknown>>], {
+    plaidAccountKeyType: PlaidAccountKeyType;
+    error: ZeniAPIStatus<Record<string, unknown>>;
+}, string, never, never>, clearPlaidAccountView: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<string>;
 declare const _default: import("@reduxjs/toolkit").Reducer<PlaidAccountViewState, import("@reduxjs/toolkit").AnyAction>;
 export default _default;

package/lib/view/spendManagement/plaidAccount/plaidAccountViewReducer.js

@@ -7,9 +7,12 @@ const zeniDayJS_1 = require("../../../zeniDayJS");
 const plaidAccountViewState_1 = require("./plaidAccountViewState");
 exports.initialState = {
     spend_management_setup: plaidAccountViewState_1.initialPlaidAccountState,
+    bill_pay_setup: plaidAccountViewState_1.initialPlaidAccountState,
+    reimbursement_setup: plaidAccountViewState_1.initialPlaidAccountState,
+    account_setup: plaidAccountViewState_1.initialPlaidAccountState,
+    charge_card_setup: plaidAccountViewState_1.initialPlaidAccountState,
     user_reimbursement_account: plaidAccountViewState_1.initialPlaidAccountState,
     external_account: plaidAccountViewState_1.initialPlaidAccountState,
-    reimbursement_setup: plaidAccountViewState_1.initialPlaidAccountState,
     billing_setup: plaidAccountViewState_1.initialPlaidAccountState,
 };
 const plaidAccountView = (0, toolkit_1.createSlice)({
@@ -36,7 +39,7 @@ const plaidAccountView = (0, toolkit_1.createSlice)({
         },
         getPaymentAccountsSuccess: {
             reducer(draft, action) {
-                const { paymentAccountIds, plaidAccountKeyType } = action.payload;
+                const { plaidAccountKeyType, paymentAccountIds } = action.payload;
                 draft[plaidAccountKeyType].accountDetails.fetchStatus = {
                     fetchState: 'Completed',
                     error: undefined,
@@ -67,7 +70,7 @@ const plaidAccountView = (0, toolkit_1.createSlice)({
         updatePaymentAccount: {
             reducer(draft, action) {
                 const { plaidAccountKeyType } = action.payload;
-                draft[plaidAccountKeyType].accountDetails.updateStatus = {
+                draft[plaidAccountKeyType].accountDetails.cashAccountUpdateStatus = {
                     fetchState: 'In-Progress',
                     error: undefined,
                 };
@@ -86,21 +89,21 @@ const plaidAccountView = (0, toolkit_1.createSlice)({
         updatePaymentAccountSuccess: {
             reducer(draft, action) {
                 const { plaidAccountKeyType } = action.payload;
-                draft[plaidAccountKeyType].accountDetails.updateStatus = {
+                draft[plaidAccountKeyType].accountDetails.cashAccountUpdateStatus = {
                     fetchState: 'Completed',
                     error: undefined,
                 };
             },
-            prepare(paymentAccountIds, plaidAccountKeyType) {
+            prepare(plaidAccountKeyType) {
                 return {
-                    payload: { paymentAccountIds, plaidAccountKeyType },
+                    payload: { plaidAccountKeyType },
                 };
             },
         },
         updatePaymentAccountFailure: {
             reducer(draft, action) {
                 const { error, plaidAccountKeyType } = action.payload;
-                draft[plaidAccountKeyType].accountDetails.updateStatus = {
+                draft[plaidAccountKeyType].accountDetails.cashAccountUpdateStatus = {
                     fetchState: 'Error',
                     error,
                 };
@@ -133,19 +136,15 @@ const plaidAccountView = (0, toolkit_1.createSlice)({
         },
         updatePaymentAccountStatusSuccess: {
             reducer(draft, action) {
-                const { paymentAccountIds, linkTokenType, plaidAccountKeyType } = action.payload;
+                const { linkTokenType, plaidAccountKeyType } = action.payload;
                 draft[plaidAccountKeyType].plaidConnectionDetails[linkTokenType] = Object.assign(Object.assign({}, draft[plaidAccountKeyType].plaidConnectionDetails[linkTokenType]), { updateStatus: {
                         fetchState: 'Completed',
                         error: undefined,
                     } });
-                if (plaidAccountKeyType !== 'reimbursement_setup') {
-                    draft[plaidAccountKeyType].accountDetails.paymentAccountIds =
-                        paymentAccountIds;
-                }
             },
-            prepare(paymentAccountIds, linkTokenType, plaidAccountKeyType) {
+            prepare(linkTokenType, plaidAccountKeyType) {
                 return {
-                    payload: { paymentAccountIds, linkTokenType, plaidAccountKeyType },
+                    payload: { linkTokenType, plaidAccountKeyType },
                 };
             },
         },
@@ -185,13 +184,11 @@ const plaidAccountView = (0, toolkit_1.createSlice)({
         },
         updatePaymentAccountLoginStatusSuccess: {
             reducer(draft, action) {
-                const { paymentAccountIds, linkTokenType, plaidAccountKeyType } = action.payload;
+                const { linkTokenType, plaidAccountKeyType } = action.payload;
                 draft[plaidAccountKeyType].plaidConnectionDetails[linkTokenType] = Object.assign(Object.assign({}, draft[plaidAccountKeyType].plaidConnectionDetails[linkTokenType]), { updateStatus: {
                         fetchState: 'Completed',
                         error: undefined,
                     } });
-                draft[plaidAccountKeyType].accountDetails.paymentAccountIds =
-                    paymentAccountIds;
             },
             prepare(paymentAccountIds, linkTokenType, plaidAccountKeyType) {
                 return {
@@ -215,17 +212,11 @@ const plaidAccountView = (0, toolkit_1.createSlice)({
         },
         getPlaidLinkToken: {
             reducer(draft, action) {
-                const { linkTokenType, paymentAccountId, plaidAccountKeyType } = action.payload;
+                const { linkTokenType, plaidAccountKeyType } = action.payload;
                 draft[plaidAccountKeyType].plaidConnectionDetails[linkTokenType] = Object.assign(Object.assign({}, draft[plaidAccountKeyType].plaidConnectionDetails[linkTokenType]), { fetchStatus: {
                         fetchState: 'In-Progress',
                         error: undefined,
                     } });
-                if (paymentAccountId != null &&
-                    plaidAccountKeyType !== 'reimbursement_setup') {
-                    draft[plaidAccountKeyType].accountDetails.paymentAccountIds = [
-                        paymentAccountId,
-                    ];
-                }
             },
             prepare(plaidAccountKeyType, linkTokenType, paymentAccountId) {
                 return {
@@ -273,10 +264,11 @@ const plaidAccountView = (0, toolkit_1.createSlice)({
                         error: undefined,
                     } });
             },
-            prepare(publicToken, plaidAccountKeyType, setupViewType, linkTokenType) {
+            prepare(publicToken, companyId, plaidAccountKeyType, setupViewType, linkTokenType) {
                 return {
                     payload: {
                         publicToken,
+                        companyId,
                         setupViewType,
                         linkTokenType: linkTokenType !== null && linkTokenType !== void 0 ? linkTokenType : 'link_account',
                         plaidAccountKeyType,
@@ -286,23 +278,15 @@ const plaidAccountView = (0, toolkit_1.createSlice)({
         },
         establishPlaidConnectionSuccess: {
             reducer(draft, action) {
-                const { primaryFundingAccountId, paymentAccountIds, linkTokenType, plaidAccountKeyType, } = action.payload;
+                const { linkTokenType, plaidAccountKeyType } = action.payload;
                 draft[plaidAccountKeyType].plaidConnectionDetails[linkTokenType] = Object.assign(Object.assign({}, draft[plaidAccountKeyType].plaidConnectionDetails[linkTokenType]), { updateStatus: {
                         fetchState: 'Completed',
                         error: undefined,
                     } });
-                draft[plaidAccountKeyType].accountDetails.primaryFundingAccount = {
-                    accountId: primaryFundingAccountId,
-                    accountType: 'paymentAccount',
-                };
-                draft[plaidAccountKeyType].accountDetails.paymentAccountIds =
-                    paymentAccountIds;
             },
-            prepare(primaryFundingAccountId, paymentAccountIds, linkTokenType, plaidAccountKeyType) {
+            prepare(linkTokenType, plaidAccountKeyType) {
                 return {
                     payload: {
-                        primaryFundingAccountId,
-                        paymentAccountIds,
                         linkTokenType,
                         plaidAccountKeyType,
                     },
@@ -324,27 +308,18 @@ const plaidAccountView = (0, toolkit_1.createSlice)({
             },
         },
         updatePlaidAccountViewAccountDetails: {
-            prepare(allBankAccountIds, paymentAccountIds, plaidAccountKeyType, depositAccountIds, primaryFundingAccount) {
+            prepare(allBankAccountIds, plaidAccountKeyType) {
                 return {
                     payload: {
                         allBankAccountIds,
-                        paymentAccountIds,
                         plaidAccountKeyType,
-                        depositAccountIds,
-                        primaryFundingAccount,
                     },
                 };
             },
             reducer(draft, action) {
-                const { allBankAccountIds, paymentAccountIds, depositAccountIds, primaryFundingAccount, plaidAccountKeyType, } = action.payload;
+                const { allBankAccountIds, plaidAccountKeyType } = action.payload;
                 draft[plaidAccountKeyType].accountDetails.allBankAccountIds =
                     allBankAccountIds;
-                draft[plaidAccountKeyType].accountDetails.paymentAccountIds =
-                    paymentAccountIds;
-                draft[plaidAccountKeyType].accountDetails.depositAccountIds =
-                    depositAccountIds !== null && depositAccountIds !== void 0 ? depositAccountIds : [];
-                draft[plaidAccountKeyType].accountDetails.primaryFundingAccount =
-                    primaryFundingAccount;
                 draft[plaidAccountKeyType].accountDetails.fetchStatus = {
                     fetchState: 'Completed',
                     error: undefined,
@@ -352,81 +327,79 @@ const plaidAccountView = (0, toolkit_1.createSlice)({
             },
         },
         updatePrimaryFundingAccount: {
-            reducer(draft) {
-                draft['reimbursement_setup'].accountDetails.primaryFundingAccountUpdateStatus = {
+            reducer(draft, action) {
+                draft[action.payload.plaidAccountKeyType].accountDetails.primaryFundingAccountUpdateStatus = {
                     fetchState: 'In-Progress',
                     error: undefined,
                 };
             },
-            prepare(companyId, accountId, accountType) {
-                return { payload: { companyId, accountId, accountType } };
+            prepare(companyId, plaidAccountKeyType, accountId, accountType) {
+                return {
+                    payload: { companyId, plaidAccountKeyType, accountId, accountType },
+                };
             },
         },
         updatePrimaryFundingAccountSuccess: {
             reducer(draft, action) {
-                const { accountId, accountType } = action.payload;
-                draft['reimbursement_setup'].accountDetails.primaryFundingAccountUpdateStatus = {
+                const { plaidAccountKeyType } = action.payload;
+                draft[plaidAccountKeyType].accountDetails.primaryFundingAccountUpdateStatus = {
                     fetchState: 'Completed',
                     error: undefined,
                 };
-                draft['reimbursement_setup'].accountDetails.primaryFundingAccount = {
-                    accountId: accountId,
-                    accountType: accountType,
-                };
             },
-            prepare(accountId, accountType) {
+            prepare(plaidAccountKeyType) {
                 return {
-                    payload: { accountId, accountType },
+                    payload: { plaidAccountKeyType },
                 };
             },
         },
         updatePrimaryFundingAccountFailure: {
             reducer(draft, action) {
-                draft['reimbursement_setup'].accountDetails.primaryFundingAccountUpdateStatus = {
+                draft[action.payload.plaidAccountKeyType].accountDetails.primaryFundingAccountUpdateStatus = {
                     fetchState: 'Error',
-                    error: action.payload,
+                    error: action.payload.error,
                 };
             },
-            prepare(error) {
+            prepare(plaidAccountKeyType, error) {
                 return {
-                    payload: error,
+                    payload: { error, plaidAccountKeyType },
                 };
             },
         },
         updateMappedCashAccount: {
-            reducer(draft) {
-                draft['reimbursement_setup'].accountDetails.updateStatus = {
+            reducer(draft, action) {
+                draft[action.payload.plaidAccountKeyType].accountDetails.cashAccountUpdateStatus = {
                     fetchState: 'In-Progress',
                     error: undefined,
                 };
             },
-            prepare(accountId, depositAccountId) {
-                return { payload: { accountId, depositAccountId } };
+            prepare(plaidAccountKeyType, accountId, depositAccountId) {
+                return { payload: { plaidAccountKeyType, accountId, depositAccountId } };
             },
         },
         updateMappedCashAccountSuccess: {
-            reducer(draft) {
-                draft['reimbursement_setup'].accountDetails.updateStatus = {
+            reducer(draft, action) {
+                draft[action.payload.plaidAccountKeyType].accountDetails.cashAccountUpdateStatus = {
                     fetchState: 'Completed',
                     error: undefined,
                 };
             },
-            prepare(depositAccountIds) {
+            prepare(plaidAccountKeyType) {
                 return {
-                    payload: { depositAccountIds },
+                    payload: { plaidAccountKeyType },
                 };
             },
         },
         updateMappedCashAccountFailure: {
             reducer(draft, action) {
-                draft['reimbursement_setup'].accountDetails.updateStatus = {
+                draft[action.payload.plaidAccountKeyType].accountDetails.cashAccountUpdateStatus = {
                     fetchState: 'Error',
-                    error: action.payload,
+                    error: action.payload.error,
                 };
             },
-            prepare(error) {
+            prepare(plaidAccountKeyType, error) {
                 return {
-                    payload: error,
+                    payload: { plaidAccountKeyType, error },
                 };
             },
         },

package/lib/view/spendManagement/plaidAccount/plaidAccountViewState.d.ts

@@ -1,7 +1,7 @@
 import { FetchStateAndError, ID } from '../../../commonStateTypes/common';
 import { ZeniDate } from '../../../zeniDayJS';
 export declare type PlaidLinkTokenType = 'link_account' | 'update_account' | 'link_account_no_microdeposit' | 'link_external_account';
-export declare type PlaidAccountKeyType = 'spend_management_setup' | 'reimbursement_setup' | 'user_reimbursement_account' | 'external_account' | 'billing_setup';
+export declare type PlaidAccountKeyType = 'spend_management_setup' | 'bill_pay_setup' | 'reimbursement_setup' | 'account_setup' | 'charge_card_setup' | 'user_reimbursement_account' | 'external_account' | 'billing_setup';
 export declare type PlaidConnectionDetails = Record<PlaidLinkTokenType, {
     linkToken?: string;
     expiration?: ZeniDate;
@@ -12,15 +12,10 @@ export declare const initialPlaidAccountState: PlaidAccountState;
 export interface PlaidAccountState {
     accountDetails: {
         fetchStatus: FetchStateAndError;
-        updateStatus: FetchStateAndError;
+        cashAccountUpdateStatus: FetchStateAndError;
         primaryFundingAccountUpdateStatus?: FetchStateAndError;
-        primaryFundingAccount?: {
-            accountId: ID;
-            accountType: string;
-        };
-        paymentAccountIds: ID[];
-        depositAccountIds: ID[];
         allBankAccountIds: ID[];
+        paymentAccountIds: ID[];
     };
     plaidConnectionDetails: PlaidConnectionDetails;
 }

package/lib/view/spendManagement/plaidAccount/plaidAccountViewState.js

@@ -4,10 +4,13 @@ exports.initialPlaidAccountState = void 0;
 exports.initialPlaidAccountState = {
     accountDetails: {
         fetchStatus: { fetchState: 'Not-Started', error: undefined },
-        updateStatus: { fetchState: 'Not-Started', error: undefined },
-        paymentAccountIds: [],
-        depositAccountIds: [],
+        cashAccountUpdateStatus: { fetchState: 'Not-Started', error: undefined },
+        primaryFundingAccountUpdateStatus: {
+            fetchState: 'Not-Started',
+            error: undefined,
+        },
         allBankAccountIds: [],
+        paymentAccountIds: [],
     },
     plaidConnectionDetails: {
         link_account: {

package/lib/view/spendManagement/reimbursement/remiSetupView/epic/remiSetup/fetchRemiSetupViewEpic.js

@@ -16,8 +16,6 @@ const snackbarReducer_1 = require("../../../../../../entity/snackbar/snackbarRed
 const setupViewReducer_1 = require("../../../../commonSetup/setupViewReducer");
 const remiSetupViewReducer_1 = require("../../remiSetupViewReducer");
 const plaidAccountViewReducer_1 = require("../../../../plaidAccount/plaidAccountViewReducer");
-const billPayConfigPayload_1 = require("../../../../billPay/billPayConfig/billPayConfigPayload");
-const billPayConfigState_1 = require("../../../../billPay/billPayConfig/billPayConfigState");
 const depositAccountReducer_1 = require("../../../../../../entity/depositAccount/depositAccountReducer");
 const paymentAccountListReducer_1 = require("../../../../zeniAccounts/paymentAccountList/paymentAccountListReducer");
 const depositAccountListReducer_1 = require("../../../../zeniAccounts/depositAccountList/depositAccountListReducer");
@@ -34,20 +32,9 @@ const fetchRemiSetupViewEpic = (actions$, state$, zeniAPI) => actions$.pipe((0,
         return zeniAPI
             .getJSON(`${zeniAPI.apiEndPoints.tenantMicroServiceBaseUrl}/1.0/companies/${companyId}?query={"view":"reimbursement_setup"}`)
             .pipe((0, operators_1.mergeMap)((response) => {
-            var _a, _b, _c, _d;
+            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 depositAccountIds = (_a = response.data.deposit_accounts) === null || _a === void 0 ? void 0 : _a.map((depositAccount) => depositAccount.deposit_account_id);
-                const primaryFundingAccountPayload = response.data.companies[0].reimbursement_info
-                    .primary_funding_account;
-                const primaryFundingAccount = primaryFundingAccountPayload.account_id != null &&
-                    primaryFundingAccountPayload.account_type != null
-                    ? {
-                        accountId: primaryFundingAccountPayload.account_id,
-                        accountType: (0, billPayConfigPayload_1.getAccountTypeSubConfigCodeKey)((0, billPayConfigState_1.toAccType)(primaryFundingAccountPayload.account_type)),
-                    }
-                    : undefined;
                 const actions = [
                     (0, userReducer_1.updateAllUsers)({ users: response.data.users }),
                     (0, userRoleReducer_1.updateUserRoles)(response.data.user_roles),
@@ -63,9 +50,9 @@ const fetchRemiSetupViewEpic = (actions$, state$, zeniAPI) => actions$.pipe((0,
                         data: response.data.payment_accounts,
                         updateType: 'replace',
                     }),
-                    (0, depositAccountReducer_1.updateDepositAccounts)((_b = response.data.deposit_accounts) !== null && _b !== void 0 ? _b : []),
+                    (0, depositAccountReducer_1.updateDepositAccounts)((_a = response.data.deposit_accounts) !== null && _a !== void 0 ? _a : []),
                     (0, depositAccountListReducer_1.updateDepositAccountList)({
-                        data: (_d = (_c = response.data) === null || _c === void 0 ? void 0 : _c.deposit_accounts) !== null && _d !== void 0 ? _d : [],
+                        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)({
@@ -74,7 +61,7 @@ const fetchRemiSetupViewEpic = (actions$, state$, zeniAPI) => actions$.pipe((0,
                     (0, remiSetupViewReducer_1.updateRemiSetupViewLocalStoreData)({
                         companyId: response.data.companies[0].company_id,
                     }),
-                    (0, plaidAccountViewReducer_1.updatePlaidAccountViewAccountDetails)(allBankAccountIds, paymentAccountIds, 'reimbursement_setup', depositAccountIds, primaryFundingAccount),
+                    (0, plaidAccountViewReducer_1.updatePlaidAccountViewAccountDetails)(allBankAccountIds, 'reimbursement_setup'),
                     (0, remiSetupViewReducer_1.fetchRemiSetupViewSuccess)(),
                 ];
                 return (0, rxjs_1.from)(actions);
@@ -89,10 +76,10 @@ const fetchRemiSetupViewEpic = (actions$, state$, zeniAPI) => actions$.pipe((0,
         }), (0, operators_1.catchError)((error) => (0, rxjs_1.of)((0, remiSetupViewReducer_1.fetchRemiSetupViewFailure)((0, responsePayload_1.createZeniAPIStatus)('Unexpected Error', 'Fetch Remi Setup view errored out' + JSON.stringify(error))))));
     }
     else {
-        const { allBankAccountIds, paymentAccountIds, depositAccountIds, primaryFundingAccount, } = plaidAccountViewState['reimbursement_setup'].accountDetails;
+        const { allBankAccountIds } = plaidAccountViewState['reimbursement_setup'].accountDetails;
         return (0, rxjs_1.of)((0, setupViewReducer_1.updateSetupViewLocalStoreData)({
             companyId,
-        }), (0, plaidAccountViewReducer_1.updatePlaidAccountViewAccountDetails)(allBankAccountIds, paymentAccountIds, 'reimbursement_setup', depositAccountIds, primaryFundingAccount), (0, remiSetupViewReducer_1.fetchRemiSetupViewSuccess)());
+        }), (0, plaidAccountViewReducer_1.updatePlaidAccountViewAccountDetails)(allBankAccountIds, 'reimbursement_setup'), (0, remiSetupViewReducer_1.fetchRemiSetupViewSuccess)());
     }
 }));
 exports.fetchRemiSetupViewEpic = fetchRemiSetupViewEpic;

package/lib/view/spendManagement/zeniAccounts/zeniAccountList/zeniAccountListSelector.js

@@ -9,12 +9,12 @@ const paymentAccountListSelector_1 = require("../paymentAccountList/paymentAccou
 const zeniAccountsConfigSelector_1 = require("../zeniAccountsConfig/zeniAccountsConfigSelector");
 const getZeniAccountList = (state, companyId) => {
     const { zeniAccountListState, depositAccountState, paymentAccountState, plaidAccountViewState, depositAccountListState, paymentAccountListState, } = state;
-    const { accountDetails, plaidConnectionDetails } = plaidAccountViewState['external_account'];
+    const { plaidConnectionDetails } = plaidAccountViewState['external_account'];
     const depositAccountsSelectorView = (0, depositAccountListSelector_1.getAllDepostAccounts)(depositAccountState, depositAccountListState);
     const zeniAccountsConfig = (0, zeniAccountsConfigSelector_1.getZeniAccountsConfigDetail)(state);
     const companyView = (0, getCompanyView_1.getCompanyView)(state, companyId, []);
     const companyBillPayInfo = companyView === null || companyView === void 0 ? void 0 : companyView.company.company.companyBillPayInfo;
-    const { paymentAccountIds } = accountDetails;
+    const { paymentAccountIds } = paymentAccountListState;
     const externalAccountsSelectorView = (0, paymentAccountListSelector_1.getAllPaymentAccounts)(paymentAccountState, paymentAccountListState);
     let summary = undefined;
     if (zeniAccountListState.currentTab.id === 'zeniAccounts') {