@zeniai/client-epic-state 4.11.47 → 4.11.49

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/settingsView/settingsViewSelector.js

@@ -74,16 +74,16 @@ function getBankConnectionsSetupViewDetails(state, companyId, isAccountEnabled,
     const accountsPrimaryAccount = (_e = companyView === null || companyView === void 0 ? void 0 : companyView.company.company.companyZeniAccountInfo.primaryFundingAccount) === null || _e === void 0 ? void 0 : _e.accountId; //companyZeniAccountInfo
     const chargeCardsPrimaryAccount = (_f = companyView === null || companyView === void 0 ? void 0 : companyView.company.company.companyChargeCardInfo.primaryFundingAccount) === null || _f === void 0 ? void 0 : _f.accountId; //companyChargeCardInfo
     const primaryAccounts = [];
-    if (billPayPrimaryAccount) {
+    if (billPayPrimaryAccount != null) {
         primaryAccounts.push(billPayPrimaryAccount);
     }
-    if (remiPrimaryAccount) {
+    if (remiPrimaryAccount != null) {
         primaryAccounts.push(remiPrimaryAccount);
     }
-    if (accountsPrimaryAccount) {
+    if (accountsPrimaryAccount != null) {
         primaryAccounts.push(accountsPrimaryAccount);
     }
-    if (chargeCardsPrimaryAccount) {
+    if (chargeCardsPrimaryAccount != null) {
         primaryAccounts.push(chargeCardsPrimaryAccount);
     }
     const nonPrimaryPaymentAccounts = paymentAccounts.filter((paymentAcc) => !primaryAccounts.includes(paymentAcc.paymentAccountId));

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

@@ -61,16 +61,20 @@ const getEditBillDetail = (state, isVendorRecommendationFeatureEnabled, isZeniAc
         ? (_f = (_e = tenantState.tenantsById) === null || _e === void 0 ? void 0 : _e[currentTenantId]) === null || _f === void 0 ? void 0 : _f.companyId
         : undefined;
     const currentCompany = (0, companySelector_1.getCompanyByCompanyId)(companyState, companyId !== null && companyId !== void 0 ? companyId : '');
-    const primaryPaymentAccount = (0, paymentAccountSelector_1.getPaymentAccountsByPaymentAccountIds)(paymentAccountState, (transaction === null || transaction === void 0 ? void 0 : transaction.billPayInfo.fromAccount.billAccountType) ===
-        'paymentAccount' &&
-        (transaction === null || transaction === void 0 ? void 0 : transaction.billPayInfo.fromAccount.billAccountId) != null &&
-        (transaction === null || transaction === void 0 ? void 0 : transaction.billPayInfo.fromAccount.billAccountId.length) > 0
-        ? /*
-          for extsing transaction since we are not calling payment accounts
-          we need to pick payment ids from billPayInfo object
-      */
-            [transaction.billPayInfo.fromAccount.billAccountId]
-        : paymentAccountListState.paymentAccountIds);
+    const primaryPaymentAccount = (0, paymentAccountSelector_1.getPaymentAccountsByPaymentAccountIds)(paymentAccountState, paymentAccountListState.paymentAccountIds);
+    const fromPaymentAccount = (transaction === null || transaction === void 0 ? void 0 : transaction.billPayInfo.fromAccount.billAccountType) === 'paymentAccount' &&
+        (transaction === null || transaction === void 0 ? void 0 : transaction.billPayInfo.fromAccount.billAccountId) != null
+        ? (0, paymentAccountSelector_1.getPaymentAccountsByPaymentAccountIds)(paymentAccountState, [
+            transaction.billPayInfo.fromAccount.billAccountId,
+        ])
+        : undefined;
+    // add the account received in the transaction fromAccount
+    // if its not already present in the payment account list
+    if (fromPaymentAccount != null &&
+        fromPaymentAccount.length > 0 &&
+        primaryPaymentAccount.some((account) => account.paymentAccountId === fromPaymentAccount[0].paymentAccountId) === false) {
+        primaryPaymentAccount.push(fromPaymentAccount[0]);
+    }
     const fromDepositAccount = (transaction === null || transaction === void 0 ? void 0 : transaction.billPayInfo.fromAccount.billAccountType) === 'depositAccount' &&
         (transaction === null || transaction === void 0 ? void 0 : transaction.billPayInfo.fromAccount.billAccountId) != null
         ? (0, depositAccountSelector_1.getDepositAccountByDepositAccountId)(depositAccountState, transaction === null || transaction === void 0 ? void 0 : transaction.billPayInfo.fromAccount.billAccountId)

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

@@ -4,11 +4,11 @@ import { fetchEditBillDetailPage, updateShowAutofill } from '../editBillViewRedu
 import { RootState } from '../../../../../reducer';
 import { fetchClassList } from '../../../../classList/classListReducer';
 import { fetchAccountList } from '../../../../accountList/accountListReducer';
-import { getPaymentAccounts } from '../../../plaidAccount/plaidAccountViewReducer';
 import { fetchBillPaySetupApproverView } from '../../billPaySetupApproverView/billPaySetupApproverViewReducer';
 import { fetchOwnerList } from '../../../../ownerList/ownerListReducer';
 import { fetchVendorTypeList } from '../../../../vendorTypeList/vendorTypeListReducer';
 import { fetchBillPayConfig } from '../../billPayConfig/billPayConfigReducer';
 import { fetchDepositAccountList } from '../../../zeniAccounts/depositAccountList/depositAccountListReducer';
-export declare type ActionType = ReturnType<typeof fetchEditBillDetailPage> | ReturnType<typeof fetchClassList> | ReturnType<typeof fetchVendorTypeList> | ReturnType<typeof fetchAccountList> | ReturnType<typeof getPaymentAccounts> | ReturnType<typeof fetchDepositAccountList> | ReturnType<typeof fetchBillPayConfig> | ReturnType<typeof updateShowAutofill> | ReturnType<typeof fetchBillPaySetupApproverView> | ReturnType<typeof fetchOwnerList>;
+import { fetchPaymentAccountList } from '../../../zeniAccounts/paymentAccountList/paymentAccountListReducer';
+export declare type ActionType = ReturnType<typeof fetchEditBillDetailPage> | ReturnType<typeof fetchClassList> | ReturnType<typeof fetchVendorTypeList> | ReturnType<typeof fetchAccountList> | ReturnType<typeof fetchPaymentAccountList> | ReturnType<typeof fetchDepositAccountList> | ReturnType<typeof fetchBillPayConfig> | ReturnType<typeof updateShowAutofill> | ReturnType<typeof fetchBillPaySetupApproverView> | ReturnType<typeof fetchOwnerList>;
 export declare const fetchEditBillDetailPageEpic: (actions$: ActionsObservable<ActionType>, state$: StateObservable<RootState>) => Observable<ActionType>;

package/lib/view/spendManagement/billPay/editBillView/epics/fetchEditBillDetailPageEpic.js

@@ -6,13 +6,13 @@ const operators_1 = require("rxjs/operators");
 const editBillViewReducer_1 = require("../editBillViewReducer");
 const classListReducer_1 = require("../../../../classList/classListReducer");
 const accountListReducer_1 = require("../../../../accountList/accountListReducer");
-const plaidAccountViewReducer_1 = require("../../../plaidAccount/plaidAccountViewReducer");
 const billPaySetupApproverViewReducer_1 = require("../../billPaySetupApproverView/billPaySetupApproverViewReducer");
 const ownerListReducer_1 = require("../../../../ownerList/ownerListReducer");
 const vendorTypeListReducer_1 = require("../../../../vendorTypeList/vendorTypeListReducer");
 const billPayConfigReducer_1 = require("../../billPayConfig/billPayConfigReducer");
 const depositAccountListReducer_1 = require("../../../zeniAccounts/depositAccountList/depositAccountListReducer");
 const companySelector_1 = require("../../../../../entity/company/companySelector");
+const paymentAccountListReducer_1 = require("../../../zeniAccounts/paymentAccountList/paymentAccountListReducer");
 const fetchEditBillDetailPageEpic = (actions$, state$) => actions$.pipe((0, operators_1.filter)(editBillViewReducer_1.fetchEditBillDetailPage.match), (0, operators_1.mergeMap)((action) => {
     var _a, _b, _c;
     const { cacheOverride, billId, isShowDeletedBillsEnabled } = action.payload;
@@ -34,7 +34,7 @@ const fetchEditBillDetailPageEpic = (actions$, state$) => actions$.pipe((0, oper
         if (isCompanyZeniAccountsSetUpDone) {
             billDetailActions.push((0, depositAccountListReducer_1.fetchDepositAccountList)());
         }
-        billDetailActions.push((0, plaidAccountViewReducer_1.getPaymentAccounts)('bill_pay', 'spend_management_setup'));
+        billDetailActions.push((0, paymentAccountListReducer_1.fetchPaymentAccountList)());
         if (billId != null) {
             billDetailActions.push((0, editBillViewReducer_1.fetchBillAndInitializeLocalStore)(billId, true, isShowDeletedBillsEnabled));
         }
@@ -73,10 +73,10 @@ const fetchEditBillDetailPageEpic = (actions$, state$) => actions$.pipe((0, oper
             depositAccounts.fetchState !== 'Completed') {
             billDetailActions.push((0, depositAccountListReducer_1.fetchDepositAccountList)());
         }
-        const paymentAccount = state.plaidAccountViewState['spend_management_setup'].accountDetails;
-        if (paymentAccount.fetchStatus.fetchState !== 'In-Progress' &&
-            paymentAccount.fetchStatus.fetchState !== 'Completed') {
-            billDetailActions.push((0, plaidAccountViewReducer_1.getPaymentAccounts)('bill_pay', 'spend_management_setup'));
+        const paymentAccounts = state.paymentAccountListState;
+        if (paymentAccounts.fetchState !== 'In-Progress' &&
+            paymentAccounts.fetchState !== 'Completed') {
+            billDetailActions.push((0, paymentAccountListReducer_1.fetchPaymentAccountList)());
         }
         if (billId != null) {
             billDetailActions.push((0, editBillViewReducer_1.fetchBillAndInitializeLocalStore)(billId, false, isShowDeletedBillsEnabled));

package/lib/view/spendManagement/commonSetup/setupViewSelector.js

@@ -10,7 +10,7 @@ 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);
@@ -38,9 +38,15 @@ function getCommonSetupViewDetails(state, companyId, setupViewType, plaidAccount
             primaryFundingAccount = (0, exports.mapPaymentAccToFundingAccount)(paymentAccount);
         }
     }
+    let paymentAccountForBilling;
+    if (((_d = accountDetails.paymentAccountIds) === null || _d === void 0 ? void 0 : _d.length) > 0) {
+        const paymentAccountId = accountDetails.paymentAccountIds[0];
+        paymentAccountForBilling = (0, paymentAccountSelector_1.getPaymentAccountByPaymentAccountId)(paymentAccountState, paymentAccountId);
+    }
     return {
         companyBillPayInfo,
         primaryFundingAccount,
+        paymentAccount: paymentAccountForBilling,
         allFundingAccounts,
         allBankAccounts,
         plaidConnectionDetails,

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/plaidAccountViewReducer.d.ts

@@ -5,7 +5,8 @@ export declare const getPaymentAccounts: import("@reduxjs/toolkit").ActionCreato
     setupViewType: "bill_pay" | "reimbursement" | "zeni_accounts" | "charge_cards" | "billing";
     includeBalances: boolean;
     plaidAccountKeyType: PlaidAccountKeyType;
-}, string, never, never>, getPaymentAccountsSuccess: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[plaidAccountKeyType: PlaidAccountKeyType], {
+}, string, never, never>, getPaymentAccountsSuccess: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[paymentAccountIds: string[], plaidAccountKeyType: PlaidAccountKeyType], {
+    paymentAccountIds: string[];
     plaidAccountKeyType: PlaidAccountKeyType;
 }, string, never, never>, getPaymentAccountsFailure: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[error: ZeniAPIStatus<Record<string, unknown>>, plaidAccountKeyType: PlaidAccountKeyType], {
     error: ZeniAPIStatus<Record<string, unknown>>;

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

@@ -39,15 +39,17 @@ const plaidAccountView = (0, toolkit_1.createSlice)({
         },
         getPaymentAccountsSuccess: {
             reducer(draft, action) {
-                const { plaidAccountKeyType } = action.payload;
+                const { plaidAccountKeyType, paymentAccountIds } = action.payload;
                 draft[plaidAccountKeyType].accountDetails.fetchStatus = {
                     fetchState: 'Completed',
                     error: undefined,
                 };
+                draft[plaidAccountKeyType].accountDetails.paymentAccountIds =
+                    paymentAccountIds;
             },
-            prepare(plaidAccountKeyType) {
+            prepare(paymentAccountIds, plaidAccountKeyType) {
                 return {
-                    payload: { plaidAccountKeyType },
+                    payload: { paymentAccountIds, plaidAccountKeyType },
                 };
             },
         },

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

@@ -15,6 +15,7 @@ export interface PlaidAccountState {
         cashAccountUpdateStatus: FetchStateAndError;
         primaryFundingAccountUpdateStatus?: FetchStateAndError;
         allBankAccountIds: ID[];
+        paymentAccountIds: ID[];
     };
     plaidConnectionDetails: PlaidConnectionDetails;
 }

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

@@ -10,6 +10,7 @@ exports.initialPlaidAccountState = {
             error: undefined,
         },
         allBankAccountIds: [],
+        paymentAccountIds: [],
     },
     plaidConnectionDetails: {
         link_account: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zeniai/client-epic-state",
-  "version": "4.11.47",
+  "version": "4.11.49",
   "description": "Shared module between Web & Mobile containing required abstractions for state management, async network communication. ",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",