@zeniai/client-epic-state 4.8.12 → 4.8.14

package/lib/entity/billPay/billTransaction/billTransactionPayload.d.ts

@@ -1,6 +1,6 @@
 import { ID } from '../../../commonStateTypes/common';
 import { VendorTransactionPayload } from '../../transaction/payloadTypes/vendorTransactionPayload';
-import { BillPayInfo, BillStage, BillTransaction, BillAccount, BillPaymentMethod, BillPaymentStatus, BillStatus } from './billTransactionState';
+import { BillPayInfo, BillStage, BillTransaction, BillAccount, BillPaymentMethod, BillPaymentStatus, BillStatus, FromBillAccount } from './billTransactionState';
 export interface BillTransactionPayload extends VendorTransactionPayload {
     bill_pay_info: BillPayInfoPayload;
     entity_approval_id: ID;
@@ -66,14 +66,16 @@ export interface BillPaymentMethodPayload {
     name: string | null;
 }
 export interface BillAccountPayload {
-    account_id: string | null;
+    account_id?: string | null;
     payment_instrument_id?: string | null;
     account_type: string | null;
+    account_holder_type?: string | null;
 }
 export declare const toBillTransaction: (payload: BillTransactionPayload) => BillTransaction;
 export declare const toBillPayInfo: (payload: BillPayInfoPayload) => BillPayInfo;
 export declare const toBillStage: (payload: BillStagePayload) => BillStage;
 export declare const toBillPaymentMethod: (payload: BillPaymentMethodPayload) => BillPaymentMethod;
 export declare const toBillAccount: (payload: BillAccountPayload) => BillAccount;
+export declare const toFromBillAccount: (payload: BillAccountPayload) => FromBillAccount;
 export declare const toBillPaymentStatus: (payload: BillPaymentStatusPayload) => BillPaymentStatus;
 export declare const toBillStatus: (payload: BillStatusPayload) => BillStatus;

package/lib/entity/billPay/billTransaction/billTransactionPayload.js

@@ -1,10 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.toBillStatus = exports.toBillPaymentStatus = exports.toBillAccount = exports.toBillPaymentMethod = exports.toBillStage = exports.toBillPayInfo = exports.toBillTransaction = void 0;
+exports.toBillStatus = exports.toBillPaymentStatus = exports.toFromBillAccount = exports.toBillAccount = exports.toBillPaymentMethod = exports.toBillStage = exports.toBillPayInfo = exports.toBillTransaction = void 0;
 const amount_1 = require("../../../commonStateTypes/amount");
 const zeniDayJS_1 = require("../../../zeniDayJS");
 const vendorTransactionPayload_1 = require("../../transaction/payloadTypes/vendorTransactionPayload");
+const billPayConfigState_1 = require("../../../view/spendManagement/billPay/billPayConfig/billPayConfigState");
 const billTransactionState_1 = require("./billTransactionState");
+const billPayConfigPayload_1 = require("../../../view/spendManagement/billPay/billPayConfig/billPayConfigPayload");
 const toBillTransaction = (payload) => {
     var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
     return (Object.assign(Object.assign({}, (0, vendorTransactionPayload_1.toVendorTransaction)(payload)), { billPayInfo: (0, exports.toBillPayInfo)(payload.bill_pay_info), classId: (_a = payload.class_id) !== null && _a !== void 0 ? _a : '', className: (_b = payload.class_name) !== null && _b !== void 0 ? _b : '', qboClassId: (_c = payload.qbo_class_id) !== null && _c !== void 0 ? _c : '', transactionReferenceId: (_d = payload.transaction_reference_id) !== null && _d !== void 0 ? _d : '', entityApprovalId: payload.entity_approval_id, updateTime: (0, zeniDayJS_1.date)(payload.update_time), createdBy: (_e = payload.created_by_user_id) !== null && _e !== void 0 ? _e : '', candidateVendorName: (_f = payload.candidate_vendor_name) !== null && _f !== void 0 ? _f : '', bookCloseDate: payload.book_close_date != null ? (0, zeniDayJS_1.date)(payload.book_close_date) : undefined, lastUpdatedByUserId: (_g = payload.last_updated_by_user_id) !== null && _g !== void 0 ? _g : '', paymentProcessingTotalFee: (0, amount_1.toAmount)((_h = payload.total_fee) !== null && _h !== void 0 ? _h : 0, payload.currency_code, payload.currency_symbol), isDeleted: payload.is_deleted, isRecurring: payload.is_recurring, recurringBillConfigId: (_j = payload.recurring_bill_config_id) !== null && _j !== void 0 ? _j : undefined, recurringBillInstance: (_k = payload.recurring_bill_instance) !== null && _k !== void 0 ? _k : undefined }));
@@ -25,7 +27,7 @@ const toBillPayInfo = (payload) => {
             ? (0, zeniDayJS_1.date)(payload.bill_payment_status_update_time)
             : undefined,
         billPaymentMethodType: (0, exports.toBillPaymentMethod)(payload.bill_payment_method_type),
-        fromAccount: (0, exports.toBillAccount)(payload.from_account),
+        fromAccount: (0, exports.toFromBillAccount)(payload.from_account),
         toAccount: (0, exports.toBillAccount)(payload.to_account),
         isCancelled: payload.is_cancelled,
         billStatus: (0, exports.toBillStatus)(payload.bill_status),
@@ -66,9 +68,28 @@ const toBillAccount = (payload) => ({
         : payload.payment_instrument_id != null
             ? payload.payment_instrument_id
             : undefined,
-    billAccountType: payload.account_type != null ? payload.account_type : '',
+    billAccountType: payload.account_type != null
+        ? (0, billTransactionState_1.toBillAccountType)(payload.account_type)
+        : undefined,
+    billAccountHolderType: payload.account_holder_type != null
+        ? (0, billTransactionState_1.toBillAccountHolderType)(payload.account_holder_type)
+        : undefined,
 });
 exports.toBillAccount = toBillAccount;
+const toFromBillAccount = (payload) => ({
+    billAccountId: payload.account_id != null
+        ? payload.account_id
+        : payload.payment_instrument_id != null
+            ? payload.payment_instrument_id
+            : undefined,
+    billAccountType: payload.account_type != null
+        ? (0, billPayConfigPayload_1.getAccountTypeSubConfigCodeKey)((0, billPayConfigState_1.toAccType)(payload.account_type))
+        : undefined,
+    billAccountHolderType: payload.account_holder_type != null
+        ? (0, billTransactionState_1.toBillAccountHolderType)(payload.account_holder_type)
+        : undefined,
+});
+exports.toFromBillAccount = toFromBillAccount;
 const toBillPaymentStatus = (payload) => {
     var _a;
     return ({

package/lib/entity/billPay/billTransaction/billTransactionState.d.ts

@@ -3,7 +3,7 @@ import { ID } from '../../../commonStateTypes/common';
 import { BillTransactionDetailKey } from '../../../view/spendManagement/billPay/billDetailView/billDetailViewState';
 import { ZeniDate } from '../../../zeniDayJS';
 import { VendorTransaction } from '../../transaction/stateTypes/vendorTransaction';
-import { BillPaymentConfigCodeType, BillPaymentSubConfigCodeType } from '../../../view/spendManagement/billPay/billPayConfig/billPayConfigState';
+import { AccountTypeSubConfigCodeKeyType, BillPaymentConfigCodeType, BillPaymentSubConfigCodeType } from '../../../view/spendManagement/billPay/billPayConfig/billPayConfigState';
 export interface BillTransaction extends VendorTransaction {
     billPayInfo: BillPayInfo;
     classId: ID;
@@ -33,7 +33,7 @@ export interface BillPayInfo {
     billPaymentStatusMessage: string;
     billPaymentStatusUpdateTime?: ZeniDate;
     billPaymentMethodType: BillPaymentMethod;
-    fromAccount: BillAccount;
+    fromAccount: FromBillAccount;
     toAccount: BillAccount;
     isCancelled: boolean;
     billStatus: BillStatus;
@@ -70,7 +70,11 @@ export interface BillPaymentMethod {
 }
 export interface BillAccount {
     billAccountId?: ID;
-    billAccountType: string;
+    billAccountType?: BillAccountType;
+    billAccountHolderType?: BillAccountHolderType;
+}
+export interface FromBillAccount extends Omit<BillAccount, 'billAccountType'> {
+    billAccountType?: AccountTypeSubConfigCodeKeyType;
 }
 export interface BillTransactionState {
     transactionById: Record<ID | BillTransactionDetailKey, BillTransaction | undefined>;
@@ -87,3 +91,7 @@ export declare const toBillPaymentStatusSummaryCodeType: (v: string) => "pending
 export declare type BillPaymentStatusSummaryCodeType = ReturnType<typeof toBillPaymentStatusSummaryCodeType>;
 export declare const toBillPaymentStatusDescriptionCodeType: (v: string) => "pending_vendor_action" | "preparing_for_payment" | "error_processing" | "bill_cancelled" | "preparing_for_payment_without_expected_deposit_date" | "destination_bank_account_closed" | "destination_bank_declined_payment" | "invalid_bank_account" | "funds_arrived";
 export declare type BillPaymentStatusDescriptionCodeType = ReturnType<typeof toBillPaymentStatusDescriptionCodeType>;
+export declare const toBillAccountType: (v: string) => "deposit_account" | "payment_account" | "bank_account" | "payment_instrument";
+export declare type BillAccountType = ReturnType<typeof toBillAccountType>;
+export declare const toBillAccountHolderType: (v: string) => "vendor" | "customer";
+export declare type BillAccountHolderType = ReturnType<typeof toBillAccountHolderType>;

package/lib/entity/billPay/billTransaction/billTransactionState.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.toBillPaymentStatusDescriptionCodeType = exports.toBillPaymentStatusSummaryCodeType = exports.toBillStatusSummaryCodeType = exports.toBillStatusCodeType = exports.toBillPaymentStatusCodeType = exports.toBillStageCodeType = exports.toInternationalTransferFeeBearerPaymentMethod = void 0;
+exports.toBillAccountHolderType = exports.toBillAccountType = exports.toBillPaymentStatusDescriptionCodeType = exports.toBillPaymentStatusSummaryCodeType = exports.toBillStatusSummaryCodeType = exports.toBillStatusCodeType = exports.toBillPaymentStatusCodeType = exports.toBillStageCodeType = exports.toInternationalTransferFeeBearerPaymentMethod = void 0;
 const stringToUnion_1 = require("../../../commonStateTypes/stringToUnion");
 const ALL_INTERNATIONAL_TRANSFER_FEE_BEARER_PAYMENT_METHOD = [
     'swift_our',
@@ -61,3 +61,14 @@ const BILL_PAYMENT_STATUS_DESCRIPTION_CODE = [
 ];
 const toBillPaymentStatusDescriptionCodeType = (v) => (0, stringToUnion_1.stringToUnion)(v, BILL_PAYMENT_STATUS_DESCRIPTION_CODE);
 exports.toBillPaymentStatusDescriptionCodeType = toBillPaymentStatusDescriptionCodeType;
+const BILL_ACCOUNT_CODE = [
+    'deposit_account',
+    'payment_account',
+    'bank_account',
+    'payment_instrument',
+];
+const toBillAccountType = (v) => (0, stringToUnion_1.stringToUnion)(v, BILL_ACCOUNT_CODE);
+exports.toBillAccountType = toBillAccountType;
+const BILL_ACCOUNT_HOLDER_CODE = ['customer', 'vendor'];
+const toBillAccountHolderType = (v) => (0, stringToUnion_1.stringToUnion)(v, BILL_ACCOUNT_HOLDER_CODE);
+exports.toBillAccountHolderType = toBillAccountHolderType;

package/lib/entity/reimbursement/reimbursementPayload.d.ts

@@ -4,7 +4,7 @@ import { BillAccountPayload, BillPaymentMethodPayload, BillPaymentStatusPayload,
 import { ClassBasePayload } from '../class/classPayload';
 import { MerchantBasePayload } from '../merchant/merchantPayload';
 import { AttachmentPayload } from '../transaction/payloadTypes/attachmentPayload';
-import { DistanceMilage, LineDetail, MilageReimbursementLine, OutofPocketReimbursementLine, Reimbursement, ReimbursementInfo, ReimbursementLine, ReimbursementLineBase, ReimbursementTypeCode } from './reimbursementState';
+import { DistanceMilage, LineDetail, MilageReimbursementLine, OutofPocketReimbursementLine, Reimbursement, ReimbursementInfo, ReimbursementLine, ReimbursementLineBase, ReimbursementTypeCode, RemiBillAccount } from './reimbursementState';
 export interface ReimbursementPayload {
     reimbursement_provider: string;
     transaction_type: string;
@@ -99,3 +99,4 @@ export declare const toLineDetailPayload: (lineDetail: LineDetail) => LineDetail
 export declare const toLineDetail: (payload: LineDetailPayload) => LineDetail;
 export declare const toDistanceMilage: (payload: DistanceMilagePayload) => DistanceMilage;
 export declare const toDistanceMilagePayload: (distanceMilage: DistanceMilage) => DistanceMilagePayload;
+export declare const toRemiBillAccount: (payload: BillAccountPayload) => RemiBillAccount;

package/lib/entity/reimbursement/reimbursementPayload.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.toDistanceMilagePayload = exports.toDistanceMilage = exports.toLineDetail = exports.toLineDetailPayload = exports.toReimbursementTypePayloadPayload = exports.toReimbursementLineBasePayload = exports.toReimbursementLineBase = exports.toOutofPocketReimbursementLine = exports.toMilageReimbursementLine = exports.toReimbursementLine = exports.toOutofPocketReimbursementLinePayload = exports.toMilageReimbursementLinePayload = exports.toReimbursementLinePayload = exports.toReimbursementInfo = exports.toReimbursement = exports.toReimbursementTransactionTypeStrict = exports.toReimbursementTransactionType = void 0;
+exports.toRemiBillAccount = exports.toDistanceMilagePayload = exports.toDistanceMilage = exports.toLineDetail = exports.toLineDetailPayload = exports.toReimbursementTypePayloadPayload = exports.toReimbursementLineBasePayload = exports.toReimbursementLineBase = exports.toOutofPocketReimbursementLine = exports.toMilageReimbursementLine = exports.toReimbursementLine = exports.toOutofPocketReimbursementLinePayload = exports.toMilageReimbursementLinePayload = exports.toReimbursementLinePayload = exports.toReimbursementInfo = exports.toReimbursement = exports.toReimbursementTransactionTypeStrict = exports.toReimbursementTransactionType = void 0;
 const urlPayload_1 = require("../../commonPayloadTypes/urlPayload");
 const amount_1 = require("../../commonStateTypes/amount");
 const stringToUnion_1 = require("../../commonStateTypes/stringToUnion");
@@ -56,8 +56,8 @@ const toReimbursementInfo = (payload) => {
             ? (0, zeniDayJS_1.date)(payload.reimbursement_payment_status_update_time)
             : undefined,
         billPaymentMethodType: (0, billTransactionPayload_1.toBillPaymentMethod)(payload.reimbursement_payment_method_type),
-        fromAccount: (0, billTransactionPayload_1.toBillAccount)(payload.from_account),
-        toAccount: (0, billTransactionPayload_1.toBillAccount)(payload.to_account),
+        fromAccount: (0, exports.toRemiBillAccount)(payload.from_account),
+        toAccount: (0, exports.toRemiBillAccount)(payload.to_account),
         billStatus: (0, billTransactionPayload_1.toBillStatus)(payload.reimbursement_status),
         expectedDepositDate: payload.expected_deposit_date != null
             ? (0, zeniDayJS_1.date)(payload.expected_deposit_date)
@@ -162,3 +162,12 @@ const toDistanceMilagePayload = (distanceMilage) => ({
     value: distanceMilage.value,
 });
 exports.toDistanceMilagePayload = toDistanceMilagePayload;
+const toRemiBillAccount = (payload) => ({
+    billAccountId: payload.account_id != null
+        ? payload.account_id
+        : payload.payment_instrument_id != null
+            ? payload.payment_instrument_id
+            : undefined,
+    billAccountType: payload.account_type != null ? payload.account_type : '',
+});
+exports.toRemiBillAccount = toRemiBillAccount;

package/lib/entity/reimbursement/reimbursementState.d.ts

@@ -5,7 +5,7 @@ import { Attachment } from '../transaction/stateTypes/attachment';
 import { ZeniUrl as Url } from '../../zeniUrl';
 import { AccountBase } from '../account/accountState';
 import { ClassBase } from '../class/classState';
-import { BillAccount, BillPaymentStatus, BillStage, BillStatus } from '../billPay/billTransaction/billTransactionState';
+import { BillPaymentStatus, BillStage, BillStatus } from '../billPay/billTransaction/billTransactionState';
 import { BillPaymentConfigCodeType, BillPaymentSubConfigCodeType } from '../../view/spendManagement/billPay/billPayConfig/billPayConfigState';
 import { ReimbursementTransactionType } from './reimbursementPayload';
 import { MerchantBase } from '../merchant/merchant';
@@ -64,14 +64,18 @@ export interface ReimbursementInfo {
     billPaymentStatus: BillPaymentStatus;
     billPaymentStatusUpdateTime?: ZeniDate;
     billPaymentMethodType: RemiPaymentMethod;
-    fromAccount: BillAccount;
-    toAccount: BillAccount;
+    fromAccount: RemiBillAccount;
+    toAccount: RemiBillAccount;
     billStatus: BillStatus;
     expectedDepositDate?: ZeniDate;
     stripeInboundTransferId: string;
     stripeOutboundPaymentId: string;
     actualDepositDate?: ZeniDate;
 }
+export interface RemiBillAccount {
+    billAccountId?: ID;
+    billAccountType: string;
+}
 export interface ReimbursementState {
     reimbursementById: Record<ID, Reimbursement | undefined>;
 }

package/lib/view/commonVendorView/vendorView/epics/saveVendorEpic.js

@@ -21,8 +21,11 @@ const paymentInstrumentReducer_1 = require("../../../../entity/paymentInstrument
 const classSelectorV2_1 = require("../../../../entity/class/classSelectorV2");
 const editBillViewState_1 = require("../../../spendManagement/billPay/editBillView/editBillViewState");
 const currencyHelper_1 = require("../../../../commonStateTypes/currencyHelper");
+const zeniDayJS_1 = require("../../../../zeniDayJS");
+const workingDayHelper_1 = require("../../../../commonStateTypes/workingDayHelper");
+const companySelector_1 = require("../../../../entity/company/companySelector");
 const saveVendorEpic = (actions$, state$, zeniAPI) => actions$.pipe((0, operators_1.filter)(vendorViewReducer_1.saveVendor.match), (0, operators_1.mergeMap)((action) => {
-    var _a, _b, _c, _d, _e;
+    var _a, _b, _c, _d, _e, _f, _g;
     const state = state$.value;
     const newlySelectedVendor = (_b = (_a = state.vendorViewState.newVendorState) === null || _a === void 0 ? void 0 : _a.vendorDetailLocalData) === null || _b === void 0 ? void 0 : _b.vendorId;
     const vendorDetailsUpdated = action.payload.vendorId != null
@@ -32,6 +35,16 @@ const saveVendorEpic = (actions$, state$, zeniAPI) => actions$.pipe((0, operator
     const effectiveVendorId = (_c = action.payload.vendorId) !== null && _c !== void 0 ? _c : newlySelectedVendor;
     const payload = (0, vendorViewPayload_1.prepareEditVendorPayload)(state, vendorDetailsUpdated !== null && vendorDetailsUpdated !== void 0 ? vendorDetailsUpdated : vendorViewReducer_1.initialVendorDetailLocalData, effectiveVendorId);
     let billInLocalStore = state.editBillDetailViewState.newBillState;
+    const { tenantState, companyState } = state;
+    const { currentTenantId } = tenantState;
+    const companyId = currentTenantId != null
+        ? (_e = (_d = tenantState.tenantsById) === null || _d === void 0 ? void 0 : _d[currentTenantId]) === null || _e === void 0 ? void 0 : _e.companyId
+        : undefined;
+    const currentCompany = (0, companySelector_1.getCompanyByCompanyId)(companyState, companyId !== null && companyId !== void 0 ? companyId : '');
+    const payNowCutOffTime = currentCompany === null || currentCompany === void 0 ? void 0 : currentCompany.company.companyBillPayInfo.payNowCutOffTimeByMethod.ach;
+    const isPayNowEnabled = payNowCutOffTime != null
+        ? (0, zeniDayJS_1.dateNow)().isSameOrBefore(payNowCutOffTime)
+        : false;
     if (action.payload.billId != null) {
         const billDetailKey = (0, billDetailViewState_1.getBillTransactionDetailKey)(action.payload.billId);
         billInLocalStore =
@@ -42,9 +55,9 @@ const saveVendorEpic = (actions$, state$, zeniAPI) => actions$.pipe((0, operator
     const saveVendorApi = effectiveVendorId != null
         ? zeniAPI.putAndGetJSON(`${zeniAPI.apiEndPoints.accountMicroServiceBaseUrl}/1.0/vendors/${effectiveVendorId}`, payload)
         : zeniAPI.postAndGetJSON(`${zeniAPI.apiEndPoints.accountMicroServiceBaseUrl}/1.0/vendors`, payload);
-    const userId = (_e = (_d = state.tenantState.loggedInUser) === null || _d === void 0 ? void 0 : _d.userId) !== null && _e !== void 0 ? _e : '';
+    const userId = (_g = (_f = state.tenantState.loggedInUser) === null || _f === void 0 ? void 0 : _f.userId) !== null && _g !== void 0 ? _g : '';
     return saveVendorApi.pipe((0, operators_1.mergeMap)((response) => {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u;
         if ((0, responsePayload_1.isSuccessResponse)(response)) {
             const updatedVendor = ((_a = response.data) === null || _a === void 0 ? void 0 : _a.vendors[0]) != null
                 ? (0, vendorPayload_1.mapVendorPayloadToVendor)((_b = response.data) === null || _b === void 0 ? void 0 : _b.vendors[0])
@@ -106,7 +119,11 @@ const saveVendorEpic = (actions$, state$, zeniAPI) => actions$.pipe((0, operator
                         updatesByLineId: updatedLines,
                         whatForSection: Object.assign(Object.assign({}, billInLocalStore.billDetailLocalData.whatForSection), { currencyCode: updatedVendor === null || updatedVendor === void 0 ? void 0 : updatedVendor.vendorCurrencyCode }),
                         paymentDetailsSection: Object.assign(Object.assign({}, billInLocalStore.billDetailLocalData
-                            .paymentDetailsSection), { paymentTo: undefined, internationalTransferFeeBearerPaymentMethod: updatedVendor === null || updatedVendor === void 0 ? void 0 : updatedVendor.preferredInternationalTransferFeeBearerPaymentMethod }),
+                            .paymentDetailsSection), { paymentTo: undefined, internationalTransferFeeBearerPaymentMethod: updatedVendor === null || updatedVendor === void 0 ? void 0 : updatedVendor.preferredInternationalTransferFeeBearerPaymentMethod, paymentDate: (_t = (_s = billInLocalStore.billDetailLocalData
+                                .paymentDetailsSection) === null || _s === void 0 ? void 0 : _s.paymentDate) !== null && _t !== void 0 ? _t : 
+                            //in case paymentDate is not present in the billDetailLocalData, then today/next working date will be considered.
+                            //this is done beacuse we are doing similar calcualtion in getDefaultValues of editBillDetailPage.
+                            (0, zeniDayJS_1.date)((0, workingDayHelper_1.getNextNthWorkingDay)((0, zeniDayJS_1.dateNow)().toDate(), [0, 6], isPayNowEnabled ? 0 : 1).toISOString()) }),
                         isCollectToAccountInfoFromVendorContact: false,
                         isRecurring: false,
                     },
@@ -128,7 +145,7 @@ const saveVendorEpic = (actions$, state$, zeniAPI) => actions$.pipe((0, operator
             return (0, rxjs_1.from)(actions);
         }
         else {
-            if (((_s = response.data) === null || _s === void 0 ? void 0 : _s.error_code) === 1001) {
+            if (((_u = response.data) === null || _u === void 0 ? void 0 : _u.error_code) === 1001) {
                 return (0, rxjs_1.of)((0, vendorViewReducer_1.saveVendorSuccessOrFailure)('Error', action.payload.vendorId, response.status, true), (0, vendorViewReducer_1.fetchUserDetails)({ userId: userId }));
             }
             return (0, rxjs_1.of)((0, vendorViewReducer_1.saveVendorSuccessOrFailure)('Error', action.payload.vendorId, response.status), (0, snackbarReducer_1.openSnackbar)({

package/lib/view/spendManagement/billPay/billDetailView/billDetailViewPayload.d.ts

@@ -9,6 +9,7 @@ import { ZeniAPIResponse } from '../../../../responsePayload';
 import { VendorPayload } from '../../../../entity/vendor/vendorPayload';
 import { PaymentInstrumentPayload } from '../../../../entity/paymentInstrument/paymentInstrumentPayload';
 import { RecurringBillConfigResponsePayload, RecurringBillDataPayload } from '../../../../entity/billPay/recurringBills/recurringBillsPayload';
+import { DepositAccountPayload } from '../../../../entity/depositAccount/depositAccountPayload';
 export interface ApproveOrRejectBillPayload {
     approval_rules: ApprovalRulePayload[];
     users: UserPayload[];
@@ -19,6 +20,7 @@ export interface BillDetailViewPayload extends ApproveOrRejectBillPayload {
     bank_accounts: BankAccountPayload[];
     payment_instruments: PaymentInstrumentPayload[];
     payment_accounts: PaymentAccountPayload[];
+    deposit_accounts: DepositAccountPayload[];
     accounts: AccountPayload[];
     vendors: VendorPayload[];
     recurring_bill_configs: RecurringBillConfigResponsePayload[];

package/lib/view/spendManagement/billPay/billDetailView/billDetailViewReducer.d.ts

@@ -5,8 +5,8 @@ import { BillDetailViewPayload } from './billDetailViewPayload';
 export declare const initialState: BillDetailViewState;
 export declare const fetchBillDetail: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[billId: string, isShowDeletedBillsEnabled: boolean, cacheOverride?: any], {
     billId: string;
-    cacheOverride: any;
     isShowDeletedBillsEnabled: boolean;
+    cacheOverride: any;
 }, string, never, never>, updateBillDetail: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
     billId: ID;
     billDetail: BillDetailViewPayload;

package/lib/view/spendManagement/billPay/billDetailView/billDetailViewReducer.js

@@ -29,8 +29,8 @@ const billDetailView = (0, toolkit_1.createSlice)({
                 return {
                     payload: {
                         billId,
-                        cacheOverride,
                         isShowDeletedBillsEnabled,
+                        cacheOverride,
                     },
                 };
             },
@@ -40,10 +40,9 @@ const billDetailView = (0, toolkit_1.createSlice)({
             delete draft.billDetailById[key];
         },
         updateBillDetail(draft, action) {
-            var _a, _b, _c, _d;
             const { billId, billDetail } = action.payload;
             const key = (0, billDetailViewState_1.getBillTransactionDetailKey)(billId);
-            draft.billDetailById[key] = Object.assign(Object.assign({}, draft.billDetailById[key]), { bankAccountId: (_a = billDetail.bank_accounts[0]) === null || _a === void 0 ? void 0 : _a.bank_account_id, paymentInstrumentId: (_b = billDetail.payment_instruments[0]) === null || _b === void 0 ? void 0 : _b.zeni_payment_instrument_id, paymentAccountId: (_c = billDetail.payment_accounts[0]) === null || _c === void 0 ? void 0 : _c.payment_account_id, zeniAccountId: (_d = billDetail.accounts[0]) === null || _d === void 0 ? void 0 : _d.account_id, billId: billId, approvalRuleIds: billDetail.approval_rules.map((approvalRule) => approvalRule.approval_rule_id), entityApprovalIds: billDetail.entity_approvals.map((entityApproval) => entityApproval.entity_approval_id) });
+            draft.billDetailById[key] = Object.assign(Object.assign({}, draft.billDetailById[key]), { billId: billId, approvalRuleIds: billDetail.approval_rules.map((approvalRule) => approvalRule.approval_rule_id), entityApprovalIds: billDetail.entity_approvals.map((entityApproval) => entityApproval.entity_approval_id) });
         },
         updateBillDetailFetchState: {
             reducer: (draft, action) => {

package/lib/view/spendManagement/billPay/billDetailView/billDetailViewSelector.d.ts

@@ -5,7 +5,6 @@ import { BankAccount } from '../../../../entity/bankAccount/bankAccount';
 import { BillPayConfig } from '../billPayConfig/billPayConfigState';
 import { BillTransaction } from '../../../../entity/billPay/billTransaction/billTransactionState';
 import { ActivityStatus, EntityType } from '../../../../entity/entityApprovalStatus/entityApprovalStatusState';
-import { PaymentAccount } from '../../../../entity/paymentAccount/paymentAccountState';
 import { User } from '../../../../entity/user/userState';
 import { RootState } from '../../../../reducer';
 import { ZeniDate } from '../../../../zeniDayJS';
@@ -19,13 +18,13 @@ import { UserAndRole } from '../../../companyView/types/userAndRole';
 import { Class } from '../../../../entity/class/classState';
 import { PaymentInstrument } from '../../../../entity/paymentInstrument/paymentInstrument';
 import { RecurringBillConfig, RecurringBillData } from '../../../../entity/billPay/recurringBills/recurringBillsState';
+import { TransferMoneyParty } from '../../zeniAccounts/transferDetail/transferDetailState';
 export interface BillDetailViewSelector extends SelectorView {
-    transactionDetails: BillTransaction | undefined;
-    createdBy: User | undefined;
-    bankAccount: BankAccount | undefined;
-    paymentInstrument: PaymentInstrument | undefined;
-    paymentAccount: PaymentAccount | undefined;
-    zeniAccountName: string;
+    transactionDetails?: BillTransaction;
+    createdBy?: User;
+    bankAccount?: BankAccount;
+    paymentInstrument?: PaymentInstrument;
+    withdrawFrom?: TransferMoneyParty;
     previousBills: PreviousBillsSelectorView;
     deleteStatus: FetchStateAndError;
     cancelAndDeleteStatus: FetchStateAndError;

package/lib/view/spendManagement/billPay/billDetailView/billDetailViewSelector.js

@@ -7,7 +7,6 @@ exports.checkApproveRejectBtnShow = exports.getBillDetailView = exports.getBillA
 const get_1 = __importDefault(require("lodash/get"));
 const cloneDeep_1 = __importDefault(require("lodash/cloneDeep"));
 const reduceFetchState_1 = require("../../../../commonStateTypes/reduceFetchState");
-const accountSelector_1 = require("../../../../entity/account/accountSelector");
 const approvalRuleSelector_1 = require("../../../../entity/approvalRule/approvalRuleSelector");
 const bankAccountSelector_1 = require("../../../../entity/bankAccount/bankAccountSelector");
 const billPayConfigSelector_1 = require("../billPayConfig/billPayConfigSelector");
@@ -25,6 +24,8 @@ const realTimeApprovalState_1 = require("../../realTimeApprovalView/realTimeAppr
 const helpers_1 = require("../../helpers");
 const paymentInstrumentSelector_1 = require("../../../../entity/paymentInstrument/paymentInstrumentSelector");
 const billPayConfigPayload_1 = require("../billPayConfig/billPayConfigPayload");
+const depositAccountSelector_1 = require("../../../../entity/depositAccount/depositAccountSelector");
+const transferDetailSelector_1 = require("../../zeniAccounts/transferDetail/transferDetailSelector");
 const getBillActivities = (state, billId, billStageCode) => {
     const { billDetailViewState, approvalRuleState, entityApprovalStatusState, userState, } = state;
     const key = (0, billDetailViewState_1.getBillTransactionDetailKey)(billId);
@@ -83,8 +84,8 @@ const getBillActivities = (state, billId, billStageCode) => {
 };
 exports.getBillActivities = getBillActivities;
 const getBillDetailView = (state, billId) => {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p;
-    const { accountState, bankAccountState, paymentInstrumentState, billDetailViewState, billTransactionState, paymentAccountState, userState, billPayConfigState, userRoleState, classListState, classState, commonHistoryState, realTimeApprovalState, entityApprovalStatusState, billPaySetupApproverViewState, vendorState, recurringBillState, } = state;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t;
+    const { bankAccountState, paymentInstrumentState, billDetailViewState, billTransactionState, paymentAccountState, userState, billPayConfigState, userRoleState, classListState, classState, commonHistoryState, realTimeApprovalState, entityApprovalStatusState, billPaySetupApproverViewState, vendorState, recurringBillState, depositAccountState, } = state;
     const { approverListState } = billPaySetupApproverViewState;
     const detailKey = (0, billDetailViewState_1.getBillTransactionDetailKey)(billId !== null && billId !== void 0 ? billId : '');
     const billTransactionDetails = (0, get_1.default)(billDetailViewState.billDetailById, detailKey, undefined);
@@ -93,14 +94,11 @@ const getBillDetailView = (state, billId) => {
         fetchState: (_a = billTransactionDetails === null || billTransactionDetails === void 0 ? void 0 : billTransactionDetails.fetchState) !== null && _a !== void 0 ? _a : 'Not-Started',
         error: billTransactionDetails === null || billTransactionDetails === void 0 ? void 0 : billTransactionDetails.error,
     };
-    const bankAccount = (0, bankAccountSelector_1.getBankAccountByBankAccountId)(bankAccountState, (_b = billTransactionDetails === null || billTransactionDetails === void 0 ? void 0 : billTransactionDetails.bankAccountId) !== null && _b !== void 0 ? _b : '');
-    const paymentInstrument = (billTransactionDetails === null || billTransactionDetails === void 0 ? void 0 : billTransactionDetails.paymentInstrumentId) != null
-        ? (0, paymentInstrumentSelector_1.getPaymentInstrumentById)(paymentInstrumentState, billTransactionDetails.paymentInstrumentId)
-        : undefined;
-    const paymentAccount = (billTransactionDetails === null || billTransactionDetails === void 0 ? void 0 : billTransactionDetails.paymentAccountId) != null
-        ? (0, paymentAccountSelector_1.getPaymentAccountByPaymentAccountId)(paymentAccountState, billTransactionDetails.paymentAccountId)
-        : undefined;
-    let zeniAccountName = '';
+    const bankAccount = (0, bankAccountSelector_1.getBankAccountByBankAccountId)(bankAccountState, (_b = transaction === null || transaction === void 0 ? void 0 : transaction.billPayInfo.toAccount.billAccountId) !== null && _b !== void 0 ? _b : '');
+    const paymentInstrument = (0, paymentInstrumentSelector_1.getPaymentInstrumentById)(paymentInstrumentState, (_c = transaction === null || transaction === void 0 ? void 0 : transaction.billPayInfo.toAccount.billAccountId) !== null && _c !== void 0 ? _c : '');
+    const paymentAccount = (0, paymentAccountSelector_1.getPaymentAccountByPaymentAccountId)(paymentAccountState, (_d = transaction === null || transaction === void 0 ? void 0 : transaction.billPayInfo.fromAccount.billAccountId) !== null && _d !== void 0 ? _d : '');
+    const depositAccount = (0, depositAccountSelector_1.getDepositAccountByDepositAccountId)(depositAccountState, (_e = transaction === null || transaction === void 0 ? void 0 : transaction.billPayInfo.fromAccount.billAccountId) !== null && _e !== void 0 ? _e : '');
+    const withdrawFrom = (0, transferDetailSelector_1.getTransferMoneyParties)((_f = (depositAccount && [depositAccount])) !== null && _f !== void 0 ? _f : [], (_g = (paymentAccount && [paymentAccount])) !== null && _g !== void 0 ? _g : [])[0];
     let previousBills = {
         bills: [],
         fetchState: 'Not-Started',
@@ -109,9 +107,7 @@ const getBillDetailView = (state, billId) => {
     };
     if ((billTransactionDetails === null || billTransactionDetails === void 0 ? void 0 : billTransactionDetails.fetchState) === 'Completed' &&
         transaction != null) {
-        const zeniAccount = (0, accountSelector_1.getAccountBase)(accountState, (_c = billTransactionDetails.zeniAccountId) !== null && _c !== void 0 ? _c : '', 'bill_pay');
-        zeniAccountName = zeniAccount != null ? zeniAccount.accountName : '';
-        const previousBillsView = (0, previousBillsSelector_1.getPreviousBills)(state, (_e = (_d = transaction.vendor) === null || _d === void 0 ? void 0 : _d.id) !== null && _e !== void 0 ? _e : '');
+        const previousBillsView = (0, previousBillsSelector_1.getPreviousBills)(state, (_j = (_h = transaction.vendor) === null || _h === void 0 ? void 0 : _h.id) !== null && _j !== void 0 ? _j : '');
         //don't include current bill
         previousBills = Object.assign(Object.assign({}, previousBillsView), { bills: previousBillsView.bills.filter((bill) => bill.id !== billId) });
         fetchState = (0, reduceFetchState_1.reduceFetchState)([billTransactionDetails, previousBillsView]);
@@ -123,7 +119,7 @@ const getBillDetailView = (state, billId) => {
     const allApproverIds = [
         ...new Set([
             ...approverIds,
-            ...((_f = realTimeApprovalData === null || realTimeApprovalData === void 0 ? void 0 : realTimeApprovalData.realTimeApproverIds) !== null && _f !== void 0 ? _f : []),
+            ...((_k = realTimeApprovalData === null || realTimeApprovalData === void 0 ? void 0 : realTimeApprovalData.realTimeApproverIds) !== null && _k !== void 0 ? _k : []),
         ]),
     ];
     const allApprovers = allApproverIds
@@ -136,7 +132,7 @@ const getBillDetailView = (state, billId) => {
         .filter((approver) => approver.user != null);
     const filteredAttributes = (0, cloneDeep_1.default)(attributes);
     const filteredApprovers = (0, cloneDeep_1.default)(allApprovers);
-    const entityApprovalStatusByIds = (0, entityApprovalStatusSelector_1.getEntityApprovalStatusByIds)(entityApprovalStatusState, (_g = billTransactionDetails === null || billTransactionDetails === void 0 ? void 0 : billTransactionDetails.entityApprovalIds) !== null && _g !== void 0 ? _g : []);
+    const entityApprovalStatusByIds = (0, entityApprovalStatusSelector_1.getEntityApprovalStatusByIds)(entityApprovalStatusState, (_l = billTransactionDetails === null || billTransactionDetails === void 0 ? void 0 : billTransactionDetails.entityApprovalIds) !== null && _l !== void 0 ? _l : []);
     if (billActivities != null &&
         (transaction === null || transaction === void 0 ? void 0 : transaction.billPayInfo.stage.code) !== 'draft') {
         entityApprovalStatusByIds.forEach((approval) => {
@@ -156,18 +152,18 @@ const getBillDetailView = (state, billId) => {
             }
         });
     }
-    const deleteStatus = (_h = billTransactionDetails === null || billTransactionDetails === void 0 ? void 0 : billTransactionDetails.deleteStatus) !== null && _h !== void 0 ? _h : billDetailViewState_1.initialBillDetailView.deleteStatus;
-    const cancelStatus = (_j = billTransactionDetails === null || billTransactionDetails === void 0 ? void 0 : billTransactionDetails.cancelStatus) !== null && _j !== void 0 ? _j : billDetailViewState_1.initialBillDetailView.cancelStatus;
-    const cancelAndDeleteStatus = (_k = billTransactionDetails === null || billTransactionDetails === void 0 ? void 0 : billTransactionDetails.cancelAndDeleteStatus) !== null && _k !== void 0 ? _k : billDetailViewState_1.initialBillDetailView.cancelAndDeleteStatus;
-    const approvalUpdateStatus = (_l = billTransactionDetails === null || billTransactionDetails === void 0 ? void 0 : billTransactionDetails.approvalUpdateStatus) !== null && _l !== void 0 ? _l : billDetailViewState_1.initialBillDetailView.approvalUpdateStatus;
+    const deleteStatus = (_m = billTransactionDetails === null || billTransactionDetails === void 0 ? void 0 : billTransactionDetails.deleteStatus) !== null && _m !== void 0 ? _m : billDetailViewState_1.initialBillDetailView.deleteStatus;
+    const cancelStatus = (_o = billTransactionDetails === null || billTransactionDetails === void 0 ? void 0 : billTransactionDetails.cancelStatus) !== null && _o !== void 0 ? _o : billDetailViewState_1.initialBillDetailView.cancelStatus;
+    const cancelAndDeleteStatus = (_p = billTransactionDetails === null || billTransactionDetails === void 0 ? void 0 : billTransactionDetails.cancelAndDeleteStatus) !== null && _p !== void 0 ? _p : billDetailViewState_1.initialBillDetailView.cancelAndDeleteStatus;
+    const approvalUpdateStatus = (_q = billTransactionDetails === null || billTransactionDetails === void 0 ? void 0 : billTransactionDetails.approvalUpdateStatus) !== null && _q !== void 0 ? _q : billDetailViewState_1.initialBillDetailView.approvalUpdateStatus;
     const approvalType = billDetailViewState.approvalType;
-    const createdBy = (0, userSelector_1.getUserByUserId)(userState, (_m = transaction === null || transaction === void 0 ? void 0 : transaction.createdBy) !== null && _m !== void 0 ? _m : '');
+    const createdBy = (0, userSelector_1.getUserByUserId)(userState, (_r = transaction === null || transaction === void 0 ? void 0 : transaction.createdBy) !== null && _r !== void 0 ? _r : '');
     const paymentMethodCode = transaction === null || transaction === void 0 ? void 0 : transaction.billPayInfo.billPaymentMethodType.code;
     const paymentMethodSubCode = transaction === null || transaction === void 0 ? void 0 : transaction.billPayInfo.billPaymentMethodType.subCode;
     const internationalTransferFeeBearerPaymentMethod = transaction === null || transaction === void 0 ? void 0 : transaction.billPayInfo.internationalTransferFeeBearerPaymentMethod;
     const { internationalCode, internationalSubCode } = (0, billPayConfigSelector_1.getInternationalMethodCode)(paymentMethodSubCode, internationalTransferFeeBearerPaymentMethod);
     const paymentMethodType = paymentMethodCode != null && paymentMethodSubCode != null
-        ? (0, billPayConfigSelector_1.getBillPayConfigByKey)(billPayConfigState, (0, billPayConfigState_1.getBillPayConfigMethodKey)(paymentMethodCode, (0, billPayConfigState_1.toBillPaymentSubConfigCodeKeyType)((0, billPayConfigPayload_1.getBillPaymentSubConfigCodeKey)(paymentMethodSubCode)), internationalCode != null
+        ? (0, billPayConfigSelector_1.getBillPayConfigByKey)(billPayConfigState, (0, billPayConfigState_1.getBillPayConfigMethodKey)(paymentMethodCode, (0, billPayConfigState_1.toBillPaymentSubConfigCodeKeyType)((0, billPayConfigPayload_1.getBillPaymentSubConfigCodeKey)(paymentMethodSubCode)), withdrawFrom === null || withdrawFrom === void 0 ? void 0 : withdrawFrom.accType, internationalCode != null
             ? (0, billPayConfigPayload_1.getInternationalWireMethodCodeKey)(internationalCode)
             : undefined, internationalSubCode != null
             ? (0, billPayConfigPayload_1.getInternationalSubConfigCodeKey)(internationalSubCode)
@@ -183,8 +179,8 @@ const getBillDetailView = (state, billId) => {
         classIds: classIds,
         reportId: 'class_list',
     });
-    const currentVendorDetails = (0, get_1.default)(vendorState.vendorByID, (_o = billTransactionDetails === null || billTransactionDetails === void 0 ? void 0 : billTransactionDetails.vendorId) !== null && _o !== void 0 ? _o : '', undefined);
-    const isRecurring = (_p = transaction === null || transaction === void 0 ? void 0 : transaction.isRecurring) !== null && _p !== void 0 ? _p : false;
+    const currentVendorDetails = (0, get_1.default)(vendorState.vendorByID, (_s = billTransactionDetails === null || billTransactionDetails === void 0 ? void 0 : billTransactionDetails.vendorId) !== null && _s !== void 0 ? _s : '', undefined);
+    const isRecurring = (_t = transaction === null || transaction === void 0 ? void 0 : transaction.isRecurring) !== null && _t !== void 0 ? _t : false;
     let recurringBillConfigDetail = undefined;
     let recurringBillInstances = undefined;
     if (isRecurring && (transaction === null || transaction === void 0 ? void 0 : transaction.recurringBillConfigId) != null) {
@@ -200,8 +196,7 @@ const getBillDetailView = (state, billId) => {
         createdBy,
         bankAccount,
         paymentInstrument,
-        paymentAccount,
-        zeniAccountName,
+        withdrawFrom,
         previousBills,
         deleteStatus,
         cancelStatus,

package/lib/view/spendManagement/billPay/billDetailView/billDetailViewState.d.ts

@@ -8,10 +8,6 @@ export interface BillDetailView extends FetchedState {
     cancelStatus: FetchStateAndError;
     approvalUpdateStatus: FetchStateAndError;
     billId?: ID;
-    bankAccountId?: ID;
-    paymentInstrumentId?: ID;
-    paymentAccountId?: ID;
-    zeniAccountId?: ID;
     entityApprovalIds: ID[];
     approvalRuleIds: ID[];
     eventIds: ID[];

package/lib/view/spendManagement/billPay/billDetailView/epics/fetchBillDetailEpic.d.ts

@@ -21,7 +21,8 @@ import { fetchDuplicateBill } from '../../billPayReview/billPayReviewReducer';
 import { updatePaymentInstruments } from '../../../../../entity/paymentInstrument/paymentInstrumentReducer';
 import { convertAmountToHomeCurrency } from '../../editBillView/editBillViewReducer';
 import { updateRecurringBillConfigs, updateRecurringBills } from '../../../../../entity/billPay/recurringBills/recurringBillsReducer';
-export declare type ActionType = ReturnType<typeof fetchBillDetail> | ReturnType<typeof updateBillTransaction> | ReturnType<typeof updateBankAccounts> | ReturnType<typeof updatePaymentInstruments> | ReturnType<typeof updateBillDetailFetchState> | ReturnType<typeof removeBillTransaction> | ReturnType<typeof removeBillDetail> | ReturnType<typeof updatePaymentAccounts> | ReturnType<typeof updateAccounts> | ReturnType<typeof updateAllUsers> | ReturnType<typeof updateApprovalRules> | ReturnType<typeof updateEntityApprovalStatus> | ReturnType<typeof fetchPreviousBills> | ReturnType<typeof updateBillDetail> | ReturnType<typeof updateClasses> | ReturnType<typeof updateVendors> | ReturnType<typeof updateContacts> | ReturnType<typeof updateAddresses> | ReturnType<typeof fetchEntityHistory> | ReturnType<typeof fetchVendorsList> | ReturnType<typeof fetchDuplicateBill> | ReturnType<typeof convertAmountToHomeCurrency> | ReturnType<typeof waitForVendorByNameThenUpdateBillDetail> | ReturnType<typeof updateRecurringBillConfigs> | ReturnType<typeof updateRecurringBills>;
+import { updateDepositAccounts } from '../../../../../entity/depositAccount/depositAccountReducer';
+export declare type ActionType = ReturnType<typeof fetchBillDetail> | ReturnType<typeof updateBillTransaction> | ReturnType<typeof updateBankAccounts> | ReturnType<typeof updatePaymentInstruments> | ReturnType<typeof updateBillDetailFetchState> | ReturnType<typeof removeBillTransaction> | ReturnType<typeof removeBillDetail> | ReturnType<typeof updatePaymentAccounts> | ReturnType<typeof updateAccounts> | ReturnType<typeof updateAllUsers> | ReturnType<typeof updateApprovalRules> | ReturnType<typeof updateEntityApprovalStatus> | ReturnType<typeof fetchPreviousBills> | ReturnType<typeof updateBillDetail> | ReturnType<typeof updateClasses> | ReturnType<typeof updateVendors> | ReturnType<typeof updateContacts> | ReturnType<typeof updateAddresses> | ReturnType<typeof fetchEntityHistory> | ReturnType<typeof fetchVendorsList> | ReturnType<typeof fetchDuplicateBill> | ReturnType<typeof convertAmountToHomeCurrency> | ReturnType<typeof waitForVendorByNameThenUpdateBillDetail> | ReturnType<typeof updateRecurringBillConfigs> | ReturnType<typeof updateRecurringBills> | ReturnType<typeof updateDepositAccounts>;
 export declare const fetchBillDetailEpic: (actions$: ActionsObservable<ActionType>, state$: StateObservable<RootState>, zeniAPI: ZeniAPI) => Observable<ActionType>;
 export declare const waitForVendorByNameThenUpdateBillDetailEpic: (actions$: ActionsObservable<ActionType>, _: StateObservable<RootState>) => Observable<{
     payload: {

package/lib/view/spendManagement/billPay/billDetailView/epics/fetchBillDetailEpic.js

@@ -28,8 +28,9 @@ const vendorListReducer_1 = require("../../../../vendorList/vendorListReducer");
 const billPayReviewReducer_1 = require("../../billPayReview/billPayReviewReducer");
 const paymentInstrumentReducer_1 = require("../../../../../entity/paymentInstrument/paymentInstrumentReducer");
 const recurringBillsReducer_1 = require("../../../../../entity/billPay/recurringBills/recurringBillsReducer");
+const depositAccountReducer_1 = require("../../../../../entity/depositAccount/depositAccountReducer");
 const fetchBillDetailEpic = (actions$, state$, zeniAPI) => actions$.pipe((0, operators_1.filter)(billDetailViewReducer_1.fetchBillDetail.match), (0, operators_1.mergeMap)((action) => {
-    const { billId, cacheOverride, isShowDeletedBillsEnabled } = action.payload;
+    const { billId, isShowDeletedBillsEnabled, cacheOverride } = action.payload;
     const detailKey = (0, billDetailViewState_1.getBillTransactionDetailKey)(billId);
     const billActions = [];
     const state = state$.value;
@@ -76,6 +77,7 @@ const fetchBillDetailEpic = (actions$, state$, zeniAPI) => actions$.pipe((0, ope
                     (0, recurringBillsReducer_1.updateRecurringBills)(response.data.recurring_bills),
                     (0, billTransactionReducer_1.updateBillTransaction)(response.data.transaction),
                     (0, paymentAccountReducer_1.updatePaymentAccounts)(response.data.payment_accounts),
+                    (0, depositAccountReducer_1.updateDepositAccounts)(response.data.deposit_accounts),
                     (0, accountReducer_1.updateAccounts)((_j = response.data.accounts) !== null && _j !== void 0 ? _j : [], 'bill_pay'),
                     (0, userReducer_1.updateAllUsers)({ users: (_k = response.data.users) !== null && _k !== void 0 ? _k : [] }),
                     (0, approvalRuleReducer_1.updateApprovalRules)(response.data.approval_rules),

package/lib/view/spendManagement/billPay/billList/billListSelector.js

@@ -125,9 +125,10 @@ const getBillList = (state, currentTimePeriod) => {
         sortKey: 'name',
         sortOrder: 'ascending',
     };
-    const isWireActiveForCurrentTenant = (_m = (_l = (0, billPayConfigSelector_1.getBillPayConfigByKey)(billPayConfigState, (0, billPayConfigState_1.getBillPayConfigMethodKey)('wire', 'usDomestic'))) === null || _l === void 0 ? void 0 : _l.isEnabled) !== null && _m !== void 0 ? _m : false;
-    const isAchActiveForCurrentTenant = ((_p = (_o = (0, billPayConfigSelector_1.getBillPayConfigByKey)(billPayConfigState, (0, billPayConfigState_1.getBillPayConfigMethodKey)('ach', 'standard'))) === null || _o === void 0 ? void 0 : _o.isEnabled) !== null && _p !== void 0 ? _p : false) ||
-        ((_r = (_q = (0, billPayConfigSelector_1.getBillPayConfigByKey)(billPayConfigState, (0, billPayConfigState_1.getBillPayConfigMethodKey)('ach', 'sameDay'))) === null || _q === void 0 ? void 0 : _q.isEnabled) !== null && _r !== void 0 ? _r : false);
+    const isWireActiveForCurrentTenant = (_m = (_l = (0, billPayConfigSelector_1.getBillPayConfigByKey)(billPayConfigState, (0, billPayConfigState_1.getBillPayConfigMethodKey)('wire', 'usDomestic', 'paymentAccount') //TBR
+    )) === null || _l === void 0 ? void 0 : _l.isEnabled) !== null && _m !== void 0 ? _m : false;
+    const isAchActiveForCurrentTenant = ((_p = (_o = (0, billPayConfigSelector_1.getBillPayConfigByKey)(billPayConfigState, (0, billPayConfigState_1.getBillPayConfigMethodKey)('ach', 'standard', 'paymentAccount'))) === null || _o === void 0 ? void 0 : _o.isEnabled) !== null && _p !== void 0 ? _p : false) ||
+        ((_r = (_q = (0, billPayConfigSelector_1.getBillPayConfigByKey)(billPayConfigState, (0, billPayConfigState_1.getBillPayConfigMethodKey)('ach', 'sameDay', 'paymentAccount'))) === null || _q === void 0 ? void 0 : _q.isEnabled) !== null && _r !== void 0 ? _r : false);
     const allSubTabs = getAllSubTabs(billListState.currentTab, isWireActiveForCurrentTenant, isAchActiveForCurrentTenant);
     const loweredSearchText = billListState.searchText.trim().toLowerCase();
     transactionsView = (0, exports.getBillListOnSort)(sortKey, sortOrder, billListState.currentTab, transactionsView.filter((transaction) => {