@zeniai/client-epic-state 4.12.21 → 4.12.23

package/lib/view/spendManagement/billPay/billPayConfig/billPayConfigReducer.js

@@ -20,6 +20,7 @@ exports.initialState = {
         return this.fetchState == 'Completed';
     },
     billBulkSubmissionLimit: 10,
+    lastSelectedFromAccount: undefined,
 };
 const billPayConfig = (0, toolkit_1.createSlice)({
     name: 'billPayConfig',
@@ -98,6 +99,14 @@ const billPayConfig = (0, toolkit_1.createSlice)({
                 draft.vendor.currencyListByCountryId[countryCode] =
                     currencyPayload.currencies.map((currency) => (0, billPayConfigPayload_1.toVendorCurrency)(currency));
             });
+            draft.lastSelectedFromAccount =
+                payload.last_selected_from_account.account_id != null &&
+                    payload.last_selected_from_account.account_type != null
+                    ? {
+                        accountId: payload.last_selected_from_account.account_id,
+                        accountType: (0, billPayConfigPayload_1.getAccountTypeSubConfigCodeKey)((0, billPayConfigState_1.toAccType)(payload.last_selected_from_account.account_type)),
+                    }
+                    : undefined;
         },
         updateBillPayConfigFailure(draft, action) {
             draft.fetchState = 'Error';

package/lib/view/spendManagement/billPay/billPayConfig/billPayConfigState.d.ts

@@ -18,6 +18,10 @@ export interface BillPayConfigState extends FetchedState {
     };
     billPayBotEmail: string;
     billBulkSubmissionLimit: number;
+    lastSelectedFromAccount?: {
+        accountId: ID;
+        accountType: AccountTypeSubConfigCodeKeyType;
+    };
 }
 export interface VendorCurrency extends Currency {
     currencyName: string;

package/lib/view/spendManagement/billPay/editBillView/editBillViewSelector.d.ts

@@ -3,7 +3,6 @@ import { RootState } from '../../../../reducer';
 import { SelectorView } from '../../../../commonStateTypes/viewAndReport/viewAndReport';
 import { Amount } from '../../../../commonStateTypes/amount';
 import { BillPayInfo, BillPaymentMethod, BillStageCodeType, BillTransaction, InternationalTransferFeeBearerPaymentMethod } from '../../../../entity/billPay/billTransaction/billTransactionState';
-import { PaymentAccountState } from '../../../../entity/paymentAccount/paymentAccountState';
 import { Attachment } from '../../../../entity/transaction/stateTypes/attachment';
 import { TransactionWithAccountAndClassLine } from '../../../../entity/transaction/stateTypes/transactionLine';
 import { Vendor } from '../../../../entity/vendor/vendorState';
@@ -26,7 +25,6 @@ import { VendorDetailLocalData } from '../../../commonVendorView/vendorView/vend
 import { AccountBase, RecommendedAccountBase } from '../../../../entity/account/accountState';
 import { ClassBase, RecommendedClassBase } from '../../../../entity/class/classState';
 import { RecurringBillState } from '../../../../entity/billPay/recurringBills/recurringBillsState';
-import { DepositAccountState } from '../../../../entity/depositAccount/depositAccount';
 import { FundingAccount } from '../../commonSetup/setupViewSelector';
 export declare type PaymentToOption = {
     id: ID;
@@ -121,7 +119,7 @@ export declare const getEditBillDetail: (state: RootState, isVendorRecommendatio
 export declare const getBillPayConfigList: (billPayConfigState: BillPayConfigState) => BillPayConfig[];
 export declare const getPaymentMethodType: (billPayConfigState: BillPayConfigState, accType: AccountTypeSubConfigCodeKeyType, paymentMethod?: BillPaymentMethod | undefined, internationalTransferFeeBearerPaymentMethod?: "swift_our" | "swift_sha" | undefined) => BillPayConfig | undefined;
 export declare function getWhatForSection(updatedWhatForSection: WhatForSection | undefined): WhatForSection;
-export declare function getPaymentSection(state: RootState, withdrawFromList: FundingAccount[], updatedPaymentSection: PaymentDetailsSection): PaymentDetailsSectionView;
+export declare function getPaymentSection(state: RootState, withdrawFromList: FundingAccount[], updatedPaymentSection: PaymentDetailsSection, companyId?: string, billPayInfo?: BillPayInfo): PaymentDetailsSectionView;
 export declare function toPaymentToOption(paymentMode: PaymentMode): PaymentToOption;
 export interface PaymentDetailsSectionView {
     paymentType?: BillPayConfig;
@@ -131,6 +129,7 @@ export interface PaymentDetailsSectionView {
     paymentTo?: PaymentToOption;
     internationalTransferFeeBearerPaymentMethod?: InternationalTransferFeeBearerPaymentMethod;
     conversionRate?: number;
+    defaultSelectedAccount?: FundingAccount;
 }
 export declare const getRecurringBillLocalData: (recurringBillState: RecurringBillState, transaction: BillTransaction) => {
     recurringBillInstancesLocalData: RecurringBillInstance[];
@@ -138,4 +137,11 @@ export declare const getRecurringBillLocalData: (recurringBillState: RecurringBi
 };
 export declare const getInvoiceDate: (billStageCode: BillStageCodeType, invoiceDate: ZeniDate, bookCloseDate?: import("dayjs").Dayjs | undefined) => import("dayjs").Dayjs;
 export declare const getDueDate: (billStageCode: BillStageCodeType, dueDate: ZeniDate, invoiceDate?: import("dayjs").Dayjs | undefined, bookCloseDate?: import("dayjs").Dayjs | undefined) => import("dayjs").Dayjs;
-export declare const getWithdrawFrom: (paymentAccountState: PaymentAccountState, depositAccountState: DepositAccountState, fromAccountId: ID, fromAccountType: string) => FundingAccount | undefined;
+export declare const getWithdrawFrom: (state: RootState, fromAccountId?: string | undefined, fromAccountType?: string | undefined, companyId?: string | undefined, lastSelectedFromAccount?: {
+    accountId: ID;
+    accountType: AccountTypeSubConfigCodeKeyType;
+} | undefined) => FundingAccount | undefined;
+export declare const getDefaultWithdrawFromAccount: (state: RootState, depositAccounts: ID[], companyId: ID, lastSelectedFromAccount?: {
+    accountId: ID;
+    accountType: AccountTypeSubConfigCodeKeyType;
+} | undefined) => FundingAccount | undefined;

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

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getWithdrawFrom = exports.getDueDate = exports.getInvoiceDate = exports.getRecurringBillLocalData = exports.toPaymentToOption = exports.getPaymentSection = exports.getWhatForSection = exports.getPaymentMethodType = exports.getBillPayConfigList = exports.getEditBillDetail = void 0;
+exports.getDefaultWithdrawFromAccount = exports.getWithdrawFrom = exports.getDueDate = exports.getInvoiceDate = exports.getRecurringBillLocalData = exports.toPaymentToOption = exports.getPaymentSection = exports.getWhatForSection = exports.getPaymentMethodType = exports.getBillPayConfigList = exports.getEditBillDetail = void 0;
 const get_1 = __importDefault(require("lodash/get"));
 const has_1 = __importDefault(require("lodash/has"));
 const reduceFetchState_1 = require("../../../../commonStateTypes/reduceFetchState");
@@ -30,8 +30,9 @@ const billPayConfigPayload_1 = require("../billPayConfig/billPayConfigPayload");
 const depositAccountListSelector_1 = require("../../zeniAccounts/depositAccountList/depositAccountListSelector");
 const depositAccountSelector_1 = require("../../../../entity/depositAccount/depositAccountSelector");
 const setupViewSelector_1 = require("../../commonSetup/setupViewSelector");
+const getCompanyView_1 = require("../../../companyView/selectorHelpers/getCompanyView");
 const getEditBillDetail = (state, isVendorRecommendationFeatureEnabled, isZeniAccountsEnabled, billId) => {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2, _3, _4, _5, _6, _7;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2, _3, _4, _5;
     const { accountListState, accountState, bankAccountState, billDetailViewState, paymentAccountListState, billTransactionState, billPayConfigState, classListState, classState, editBillDetailViewState, paymentAccountState, vendorState, tenantState, companyState, userState, commonHistoryState, contactState, paymentInstrumentState, recurringBillState, depositAccountListState, depositAccountState, } = state;
     const transaction = (0, get_1.default)(billTransactionState.transactionById, billId !== null && billId !== void 0 ? billId : '', undefined);
     let recommendations = {};
@@ -112,7 +113,7 @@ const getEditBillDetail = (state, isVendorRecommendationFeatureEnabled, isZeniAc
     let editBillInitialDetails = {
         lineDetailSection: {},
         whatForSection: getWhatForSection(undefined),
-        paymentDetailsSection: getPaymentSection(state, withdrawFromList, {}),
+        paymentDetailsSection: getPaymentSection(state, withdrawFromList, {}, companyId, transaction === null || transaction === void 0 ? void 0 : transaction.billPayInfo),
         totalAmount: sourceBillDetail === null || sourceBillDetail === void 0 ? void 0 : sourceBillDetail.billDetailLocalData.totalAmount,
         recipientTotalAmount: sourceBillDetail === null || sourceBillDetail === void 0 ? void 0 : sourceBillDetail.billDetailLocalData.recipientTotalAmount,
     };
@@ -154,14 +155,14 @@ const getEditBillDetail = (state, isVendorRecommendationFeatureEnabled, isZeniAc
         const initialPaymentDetailsSection = {
             paymentType: (0, exports.getPaymentMethodType)(billPayConfigState, (_q = billPayInfo === null || billPayInfo === void 0 ? void 0 : billPayInfo.fromAccount.billAccountType) !== null && _q !== void 0 ? _q : 'depositAccount', billPayInfo === null || billPayInfo === void 0 ? void 0 : billPayInfo.billPaymentMethodType, billPayInfo === null || billPayInfo === void 0 ? void 0 : billPayInfo.internationalTransferFeeBearerPaymentMethod),
             paymentDate: billPayInfo === null || billPayInfo === void 0 ? void 0 : billPayInfo.paymentDate,
-            withdrawFrom: (0, exports.getWithdrawFrom)(paymentAccountState, depositAccountState, (_r = billPayInfo === null || billPayInfo === void 0 ? void 0 : billPayInfo.fromAccount.billAccountId) !== null && _r !== void 0 ? _r : '', (_s = billPayInfo === null || billPayInfo === void 0 ? void 0 : billPayInfo.fromAccount.billAccountType) !== null && _s !== void 0 ? _s : ''),
-            paymentTo: ((_t = billPayInfo === null || billPayInfo === void 0 ? void 0 : billPayInfo.toAccount.billAccountId) === null || _t === void 0 ? void 0 : _t.length) != null &&
+            withdrawFrom: (0, exports.getWithdrawFrom)(state, billPayInfo === null || billPayInfo === void 0 ? void 0 : billPayInfo.fromAccount.billAccountId, billPayInfo === null || billPayInfo === void 0 ? void 0 : billPayInfo.fromAccount.billAccountType, companyId !== null && companyId !== void 0 ? companyId : '', billPayConfigState.lastSelectedFromAccount),
+            paymentTo: ((_r = billPayInfo === null || billPayInfo === void 0 ? void 0 : billPayInfo.toAccount.billAccountId) === null || _r === void 0 ? void 0 : _r.length) != null &&
                 (billPayInfo === null || billPayInfo === void 0 ? void 0 : billPayInfo.toAccount.billAccountId.length) > 0
                 ? billPayInfo.toAccount.billAccountId
                 : undefined,
             internationalTransferFeeBearerPaymentMethod: billPayInfo === null || billPayInfo === void 0 ? void 0 : billPayInfo.internationalTransferFeeBearerPaymentMethod,
         };
-        const initialPaymentDetailsSectionView = getPaymentSection(state, withdrawFromList, initialPaymentDetailsSection);
+        const initialPaymentDetailsSectionView = getPaymentSection(state, withdrawFromList, initialPaymentDetailsSection, companyId, billPayInfo);
         editBillInitialDetails = {
             vendor: initialVendor,
             whatForSection: initialWhatForSection,
@@ -173,7 +174,7 @@ const getEditBillDetail = (state, isVendorRecommendationFeatureEnabled, isZeniAc
         if (sourceBillDetail != null) {
             const billViewState = billDetailViewState.billDetailById[key];
             isCancelled = sourceBillDetail.billDetailLocalData.isCancelled;
-            billStage = (_u = billPayInfo === null || billPayInfo === void 0 ? void 0 : billPayInfo.stage.code) !== null && _u !== void 0 ? _u : 'draft';
+            billStage = (_s = billPayInfo === null || billPayInfo === void 0 ? void 0 : billPayInfo.stage.code) !== null && _s !== void 0 ? _s : 'draft';
             if (billViewState != null) {
                 fetchState = (0, reduceFetchState_1.reduceFetchState)([
                     sourceBillDetail.fetchStatus,
@@ -185,7 +186,7 @@ const getEditBillDetail = (state, isVendorRecommendationFeatureEnabled, isZeniAc
             }
         }
         //recurringBill Details
-        isRecurring = (_v = transaction === null || transaction === void 0 ? void 0 : transaction.isRecurring) !== null && _v !== void 0 ? _v : false;
+        isRecurring = (_t = transaction === null || transaction === void 0 ? void 0 : transaction.isRecurring) !== null && _t !== void 0 ? _t : false;
         if (isRecurring && transaction != null) {
             const { recurringConfigLocalData, recurringBillInstancesLocalData } = (0, exports.getRecurringBillLocalData)(recurringBillState, transaction);
             recurringConfig = recurringConfigLocalData;
@@ -208,16 +209,16 @@ const getEditBillDetail = (state, isVendorRecommendationFeatureEnabled, isZeniAc
         lastRecommendedVendorName = updatedRecord.lastRecommendedVendorName;
         paymentDetailsSection =
             updatedRecord.paymentDetailsSection != null
-                ? getPaymentSection(state, withdrawFromList, updatedRecord.paymentDetailsSection)
+                ? getPaymentSection(state, withdrawFromList, updatedRecord.paymentDetailsSection, companyId, billPayInfo)
                 : undefined;
         vendorDetails =
             updatedRecord.vendor != null
                 ? (0, vendorSelector_1.getVendorByVendorId)(vendorState, updatedRecord.vendor.id)
                 : undefined;
         file = updatedRecord.file;
-        const bankAccInBill = (0, bankAccountSelector_1.getBankAccountByBankAccountId)(bankAccountState, (_x = (_w = updatedRecord.paymentDetailsSection) === null || _w === void 0 ? void 0 : _w.paymentTo) !== null && _x !== void 0 ? _x : '');
-        const vendorBankAccounts = (0, bankAccountSelector_1.getBankAccountsByBankAccountIds)(bankAccountState, (_y = vendorDetails === null || vendorDetails === void 0 ? void 0 : vendorDetails.bankAccountIds) !== null && _y !== void 0 ? _y : []);
-        const vendorPaymentInstruments = (0, paymentInstrumentSelector_1.getPaymentInstrumentsByIds)(paymentInstrumentState, (_z = vendorDetails === null || vendorDetails === void 0 ? void 0 : vendorDetails.paymentInstrumentIds) !== null && _z !== void 0 ? _z : []);
+        const bankAccInBill = (0, bankAccountSelector_1.getBankAccountByBankAccountId)(bankAccountState, (_v = (_u = updatedRecord.paymentDetailsSection) === null || _u === void 0 ? void 0 : _u.paymentTo) !== null && _v !== void 0 ? _v : '');
+        const vendorBankAccounts = (0, bankAccountSelector_1.getBankAccountsByBankAccountIds)(bankAccountState, (_w = vendorDetails === null || vendorDetails === void 0 ? void 0 : vendorDetails.bankAccountIds) !== null && _w !== void 0 ? _w : []);
+        const vendorPaymentInstruments = (0, paymentInstrumentSelector_1.getPaymentInstrumentsByIds)(paymentInstrumentState, (_x = vendorDetails === null || vendorDetails === void 0 ? void 0 : vendorDetails.paymentInstrumentIds) !== null && _x !== void 0 ? _x : []);
         const isBankAccInBillExistInVendor = bankAccInBill != null
             ? vendorBankAccounts
                 .map((bankAc) => bankAc.bankAccountId)
@@ -270,7 +271,7 @@ const getEditBillDetail = (state, isVendorRecommendationFeatureEnabled, isZeniAc
             whatForSection.recipientCurrencyCode =
                 recommendedVendor.vendorCurrencyCode;
         }
-        isRecurring = (_0 = sourceBillDetail.billDetailLocalData.isRecurring) !== null && _0 !== void 0 ? _0 : false;
+        isRecurring = (_y = sourceBillDetail.billDetailLocalData.isRecurring) !== null && _y !== void 0 ? _y : false;
         recurringConfig = sourceBillDetail.billDetailLocalData.recurringConfig;
         recurringBillInstances =
             sourceBillDetail.billDetailLocalData.recurringBillInstances;
@@ -290,7 +291,7 @@ const getEditBillDetail = (state, isVendorRecommendationFeatureEnabled, isZeniAc
     }
     const vendorContactSaveStatus = editBillDetailViewState.updateVendorContactState;
     const lineDetailSection = {};
-    const lineDetailSectionUpdatesByLineId = (_2 = (_1 = sourceBillDetail === null || sourceBillDetail === void 0 ? void 0 : sourceBillDetail.billDetailLocalData) === null || _1 === void 0 ? void 0 : _1.updatesByLineId) !== null && _2 !== void 0 ? _2 : {};
+    const lineDetailSectionUpdatesByLineId = (_0 = (_z = sourceBillDetail === null || sourceBillDetail === void 0 ? void 0 : sourceBillDetail.billDetailLocalData) === null || _z === void 0 ? void 0 : _z.updatesByLineId) !== null && _0 !== void 0 ? _0 : {};
     const classList = (0, classListSelector_1.getClassList)(classState, classListState);
     if (accountList.fetchState === 'Completed') {
         Object.keys(lineDetailSectionUpdatesByLineId).forEach((lineId) => {
@@ -311,16 +312,16 @@ const getEditBillDetail = (state, isVendorRecommendationFeatureEnabled, isZeniAc
     const accountsHierarchyList = (0, accountListSelector_1.getNestedAccountListHierarchy)(accountListState, 'billPayAccountList');
     const classHierarchyList = (0, classListSelector_1.getNestedClassListHierarchy)(classListState);
     const duplicateBills = (0, billPayReviewSelector_1.getDuplicateBills)(state, billId);
-    const isProcessing = (0, helpers_1.isBillProcessing)((_3 = transaction === null || transaction === void 0 ? void 0 : transaction.bulkProcessingDetail) === null || _3 === void 0 ? void 0 : _3.type);
+    const isProcessing = (0, helpers_1.isBillProcessing)((_1 = transaction === null || transaction === void 0 ? void 0 : transaction.bulkProcessingDetail) === null || _1 === void 0 ? void 0 : _1.type);
     return {
         showVendorGptRecommendationText,
         recommendedVendor,
         lastRecommendedVendorName,
         duplicateBills,
         fetchState: fetchState,
-        saveStatus: (_4 = sourceBillDetail === null || sourceBillDetail === void 0 ? void 0 : sourceBillDetail.saveStatus) !== null && _4 !== void 0 ? _4 : undefined,
-        error: (_6 = (_5 = sourceBillDetail === null || sourceBillDetail === void 0 ? void 0 : sourceBillDetail.fetchStatus) === null || _5 === void 0 ? void 0 : _5.error) !== null && _6 !== void 0 ? _6 : undefined,
-        uploadStatus: (_7 = sourceBillDetail === null || sourceBillDetail === void 0 ? void 0 : sourceBillDetail.uploadFetchState) !== null && _7 !== void 0 ? _7 : undefined,
+        saveStatus: (_2 = sourceBillDetail === null || sourceBillDetail === void 0 ? void 0 : sourceBillDetail.saveStatus) !== null && _2 !== void 0 ? _2 : undefined,
+        error: (_4 = (_3 = sourceBillDetail === null || sourceBillDetail === void 0 ? void 0 : sourceBillDetail.fetchStatus) === null || _3 === void 0 ? void 0 : _3.error) !== null && _4 !== void 0 ? _4 : undefined,
+        uploadStatus: (_5 = sourceBillDetail === null || sourceBillDetail === void 0 ? void 0 : sourceBillDetail.uploadFetchState) !== null && _5 !== void 0 ? _5 : undefined,
         version: 0,
         createdBy,
         createTime,
@@ -439,13 +440,13 @@ function getWhatForSection(updatedWhatForSection) {
     };
 }
 exports.getWhatForSection = getWhatForSection;
-function getPaymentSection(state, withdrawFromList, updatedPaymentSection) {
+function getPaymentSection(state, withdrawFromList, updatedPaymentSection, companyId, billPayInfo) {
     var _a, _b;
     const withdrawFrom = (updatedPaymentSection === null || updatedPaymentSection === void 0 ? void 0 : updatedPaymentSection.withdrawFrom) != null
         ? updatedPaymentSection === null || updatedPaymentSection === void 0 ? void 0 : updatedPaymentSection.withdrawFrom
         : withdrawFromList.length === 1
             ? withdrawFromList[0]
-            : undefined;
+            : (0, exports.getWithdrawFrom)(state, billPayInfo === null || billPayInfo === void 0 ? void 0 : billPayInfo.fromAccount.billAccountId, billPayInfo === null || billPayInfo === void 0 ? void 0 : billPayInfo.fromAccount.billAccountType, companyId !== null && companyId !== void 0 ? companyId : '', state.billPayConfigState.lastSelectedFromAccount);
     const withdrawFromAccountingName = undefined;
     const availablePaymentOptions = state.billPayConfigState.fetchState === 'Completed'
         ? (0, exports.getBillPayConfigList)(state.billPayConfigState).filter((option) => { var _a; return option.method.includes((_a = withdrawFrom === null || withdrawFrom === void 0 ? void 0 : withdrawFrom.accType) !== null && _a !== void 0 ? _a : ''); })
@@ -591,17 +592,69 @@ const getDueDate = (billStageCode, dueDate, invoiceDate, bookCloseDate) => {
     }
 };
 exports.getDueDate = getDueDate;
-const getWithdrawFrom = (paymentAccountState, depositAccountState, fromAccountId, fromAccountType) => {
-    const withdrawFromAsDepositAcc = (0, depositAccountSelector_1.getDepositAccountByDepositAccountId)(depositAccountState, fromAccountId);
-    const withdrawFromAsPaymentAcc = (0, paymentAccountSelector_1.getPaymentAccountByPaymentAccountId)(paymentAccountState, fromAccountId);
-    if (fromAccountType === 'depositAccount' &&
-        withdrawFromAsDepositAcc != null) {
-        return (0, setupViewSelector_1.mapDepositAccToFundingAccount)(withdrawFromAsDepositAcc);
+const getWithdrawFrom = (state, fromAccountId, fromAccountType, companyId, lastSelectedFromAccount) => {
+    const { paymentAccountState, depositAccountState, depositAccountListState } = state;
+    if (fromAccountId != null) {
+        const withdrawFromAsDepositAcc = (0, depositAccountSelector_1.getDepositAccountByDepositAccountId)(depositAccountState, fromAccountId);
+        const withdrawFromAsPaymentAcc = (0, paymentAccountSelector_1.getPaymentAccountByPaymentAccountId)(paymentAccountState, fromAccountId);
+        if (fromAccountType === 'depositAccount' &&
+            withdrawFromAsDepositAcc != null) {
+            return (0, setupViewSelector_1.mapDepositAccToFundingAccount)(withdrawFromAsDepositAcc);
+        }
+        if (fromAccountType === 'paymentAccount' &&
+            withdrawFromAsPaymentAcc != null) {
+            return (0, setupViewSelector_1.mapPaymentAccToFundingAccount)(withdrawFromAsPaymentAcc);
+        }
     }
-    if (fromAccountType === 'paymentAccount' &&
-        withdrawFromAsPaymentAcc != null) {
-        return (0, setupViewSelector_1.mapPaymentAccToFundingAccount)(withdrawFromAsPaymentAcc);
+    else {
+        return (0, exports.getDefaultWithdrawFromAccount)(state, depositAccountListState.accountIds, companyId !== null && companyId !== void 0 ? companyId : '', lastSelectedFromAccount);
     }
     return undefined;
 };
 exports.getWithdrawFrom = getWithdrawFrom;
+const getDefaultWithdrawFromAccount = (state, depositAccounts, companyId, lastSelectedFromAccount) => {
+    const { depositAccountState, paymentAccountState } = state;
+    const companyView = (0, getCompanyView_1.getCompanyView)(state, companyId, []);
+    const primaryAccount = companyView === null || companyView === void 0 ? void 0 : companyView.company.company.companyBillPayInfo.primaryFundingAccount;
+    let defaultAccount = undefined;
+    // User paying bill for first time or previously paid with external account
+    if (lastSelectedFromAccount == null ||
+        (lastSelectedFromAccount === null || lastSelectedFromAccount === void 0 ? void 0 : lastSelectedFromAccount.accountType) === 'paymentAccount') {
+        if (depositAccounts.length === 0) {
+            defaultAccount = primaryAccount;
+        }
+        else {
+            if ((primaryAccount === null || primaryAccount === void 0 ? void 0 : primaryAccount.accountType) === 'depositAccount') {
+                defaultAccount = primaryAccount;
+            }
+        }
+    }
+    else {
+        // User paid with Zeni account previously
+        if (depositAccounts.length === 1) {
+            defaultAccount = primaryAccount;
+        }
+        else {
+            if ((primaryAccount === null || primaryAccount === void 0 ? void 0 : primaryAccount.accountType) === 'depositAccount') {
+                defaultAccount = primaryAccount;
+            }
+            else {
+                defaultAccount = lastSelectedFromAccount;
+            }
+        }
+    }
+    if (defaultAccount != null) {
+        const defaultAccAsDepositAcc = (0, depositAccountSelector_1.getDepositAccountByDepositAccountId)(depositAccountState, defaultAccount === null || defaultAccount === void 0 ? void 0 : defaultAccount.accountId);
+        const defaultAccAsPaymentAcc = (0, paymentAccountSelector_1.getPaymentAccountByPaymentAccountId)(paymentAccountState, defaultAccount === null || defaultAccount === void 0 ? void 0 : defaultAccount.accountId);
+        if (defaultAccount.accountType === 'depositAccount' &&
+            defaultAccAsDepositAcc != null) {
+            return (0, setupViewSelector_1.mapDepositAccToFundingAccount)(defaultAccAsDepositAcc);
+        }
+        if (defaultAccount.accountType === 'paymentAccount' &&
+            defaultAccAsPaymentAcc != null) {
+            return (0, setupViewSelector_1.mapPaymentAccToFundingAccount)(defaultAccAsPaymentAcc);
+        }
+    }
+    return undefined;
+};
+exports.getDefaultWithdrawFromAccount = getDefaultWithdrawFromAccount;

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

@@ -97,7 +97,7 @@ const initializeBillToLocalStoreEpic = (actions$, state$) => actions$.pipe((0, o
     const editBillState = (0, get_1.default)(state.editBillDetailViewState.editBillStateById, detailKey, undefined);
     const billDetail = (0, get_1.default)(state.billDetailViewState.billDetailById, detailKey, undefined);
     const transaction = (0, get_1.default)(state.billTransactionState.transactionById, billId, undefined);
-    const { accountListState, accountState, classListState, classState, recurringBillState, depositAccountState, paymentAccountState, } = state;
+    const { accountListState, accountState, classListState, classState, recurringBillState, } = state;
     const accountList = (0, accountListSelector_1.getAccountList)(accountState, accountListState, 'billPayAccountList');
     const classList = (0, classListSelector_1.getClassList)(classState, classListState);
     const recommendations = transaction === null || transaction === void 0 ? void 0 : transaction.recommendations;
@@ -161,7 +161,7 @@ const initializeBillToLocalStoreEpic = (actions$, state$) => actions$.pipe((0, o
         const paymentDetailsSection = {
             paymentType: (0, editBillViewSelector_1.getPaymentMethodType)(state.billPayConfigState, (_h = transaction.billPayInfo.fromAccount.billAccountType) !== null && _h !== void 0 ? _h : 'depositAccount', transaction.billPayInfo.billPaymentMethodType, transaction.billPayInfo.internationalTransferFeeBearerPaymentMethod),
             paymentDate: (_j = transaction.billPayInfo.paymentDate) !== null && _j !== void 0 ? _j : (0, zeniDayJS_1.date)((0, workingDayHelper_1.getNextNthWorkingDay)((0, zeniDayJS_1.dateNow)().toDate(), [0, 6], isPayNowEnabled ? 0 : 1).toISOString()),
-            withdrawFrom: (0, editBillViewSelector_1.getWithdrawFrom)(paymentAccountState, depositAccountState, (_k = transaction.billPayInfo.fromAccount.billAccountId) !== null && _k !== void 0 ? _k : '', (_l = transaction.billPayInfo.fromAccount.billAccountType) !== null && _l !== void 0 ? _l : ''),
+            withdrawFrom: (0, editBillViewSelector_1.getWithdrawFrom)(state, (_k = transaction.billPayInfo.fromAccount.billAccountId) !== null && _k !== void 0 ? _k : '', (_l = transaction.billPayInfo.fromAccount.billAccountType) !== null && _l !== void 0 ? _l : '', companyId),
             paymentTo: transaction.billPayInfo.toAccount.billAccountId != null &&
                 transaction.billPayInfo.toAccount.billAccountId.length > 0
                 ? transaction.billPayInfo.toAccount.billAccountId

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

@@ -248,7 +248,7 @@ const toBillDetailLocalData = (state, showVendorGptRecommendationText, billPaylo
             paymentDate: ((_o = billPayload.bill_pay_info) === null || _o === void 0 ? void 0 : _o.payment_date) != null
                 ? (0, zeniDayJS_1.date)((_p = billPayload.bill_pay_info) === null || _p === void 0 ? void 0 : _p.payment_date)
                 : (0, zeniDayJS_1.date)((0, workingDayHelper_1.getNextNthWorkingDay)((0, zeniDayJS_1.dateNow)().toDate(), [0, 6], isPayNowEnabled ? 0 : 1).toISOString()),
-            withdrawFrom: (0, editBillViewSelector_1.getWithdrawFrom)(state.paymentAccountState, state.depositAccountState, (_r = (_q = billPayload.bill_pay_info) === null || _q === void 0 ? void 0 : _q.from_account.account_id) !== null && _r !== void 0 ? _r : '', (_t = (_s = billPayload.bill_pay_info) === null || _s === void 0 ? void 0 : _s.from_account.account_type) !== null && _t !== void 0 ? _t : ''),
+            withdrawFrom: (0, editBillViewSelector_1.getWithdrawFrom)(state, (_r = (_q = billPayload.bill_pay_info) === null || _q === void 0 ? void 0 : _q.from_account.account_id) !== null && _r !== void 0 ? _r : '', (_t = (_s = billPayload.bill_pay_info) === null || _s === void 0 ? void 0 : _s.from_account.account_type) !== null && _t !== void 0 ? _t : ''),
             internationalTransferFeeBearerPaymentMethod: ((_u = billPayload.bill_pay_info) === null || _u === void 0 ? void 0 : _u.international_transfer_fee_bearer_payment_method) != null
                 ? (0, billTransactionState_1.toInternationalTransferFeeBearerPaymentMethod)((_v = billPayload.bill_pay_info) === null || _v === void 0 ? void 0 : _v.international_transfer_fee_bearer_payment_method)
                 : undefined,

package/lib/view/spendManagement/chargeCards/chargeCardConfig/chargeCardConfigPayload.d.ts

@@ -5,6 +5,12 @@ export interface ChargeCardConfigPayload {
     allowed_credit_limit_span_options: AllowedValueWithCode[];
     credit_terms: CreditTermsPayload;
     repayment_info: RePaymentInfoPayload;
+    receipt_required_above_amount: {
+        amount: number;
+        currency_code: string;
+        currency_symbol: string;
+    };
+    receipt_bot_email: string;
     is_ai_categorization_enabled_for_cards_transactions: boolean;
 }
 interface CreditTermsPayload {

package/lib/view/spendManagement/chargeCards/chargeCardConfig/chargeCardConfigReducer.js

@@ -4,6 +4,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.clearChargeCardConfig = exports.updateChargeCardConfigFailure = exports.updateChargeCardConfig = exports.fetchChargeCardConfig = exports.initialState = void 0;
 const toolkit_1 = require("@reduxjs/toolkit");
 const chargeCard_1 = require("../../../../entity/chargeCard/chargeCard");
+const amount_1 = require("../../../../commonStateTypes/amount");
 const chargeCardConfigPayload_1 = require("./chargeCardConfigPayload");
 exports.initialState = {
     creditLimitFrequency: [],
@@ -12,6 +13,12 @@ exports.initialState = {
         name: '',
         maxVirtualCard: 0,
     },
+    receiptRequiredAboveAmount: {
+        amount: 0,
+        currencyCode: 'USD',
+        currencySymbol: '$',
+    },
+    receiptBotEmail: '',
     isAiCategorizationEnabledForCardsTransactions: false,
     rePaymentInfo: undefined,
     fetchState: 'Not-Started',
@@ -37,6 +44,8 @@ const chargeCardConfig = (0, toolkit_1.createSlice)({
                 }));
             draft.creditTerm = (0, chargeCardConfigPayload_1.toCreditTerm)(payload.credit_terms);
             draft.rePaymentInfo = (0, chargeCardConfigPayload_1.toRePaymentInfo)(payload.repayment_info);
+            draft.receiptRequiredAboveAmount = (0, amount_1.toAmount)(payload.receipt_required_above_amount.amount, payload.receipt_required_above_amount.currency_code, payload.receipt_required_above_amount.currency_symbol);
+            draft.receiptBotEmail = payload.receipt_bot_email;
             draft.isAiCategorizationEnabledForCardsTransactions =
                 payload.is_ai_categorization_enabled_for_cards_transactions;
             draft.fetchState = 'Completed';

package/lib/view/spendManagement/chargeCards/chargeCardConfig/chargeCardConfigState.d.ts

@@ -1,3 +1,4 @@
+import { Amount } from '../../../../commonStateTypes/amount';
 import { FetchedState, ID } from '../../../../commonStateTypes/common';
 import { TimeframeTick } from '../../../../commonStateTypes/timeframeTick';
 import { CreditLimitFrequency } from '../../../../entity/chargeCard/chargeCard';
@@ -5,6 +6,8 @@ import { ZeniDate } from '../../../../zeniDayJS';
 export interface ChargeCardConfigState extends FetchedState {
     creditLimitFrequency: CreditLimitFrequency[];
     creditTerm: CreditTerm;
+    receiptRequiredAboveAmount: Amount;
+    receiptBotEmail: string;
     isAiCategorizationEnabledForCardsTransactions: boolean;
     rePaymentInfo?: RePaymentInfo;
 }

package/lib/view/spendManagement/chargeCards/chargeCardDetail/chargeCardDetail.d.ts

@@ -1,6 +1,7 @@
 import { FetchedState, FetchStateAndError, ID } from '../../../../commonStateTypes/common';
 import { SortOrder } from '../../../../commonStateTypes/selectorTypes/sortOrderTypes';
 import { PageToken } from '../../../../commonStateTypes/viewAndReport/viewAndReport';
+import { Attachment } from '../../../../entity/transaction/stateTypes/attachment';
 export interface ChargeCardDetailState {
     detailById: Record<ID, ChargeCardDetail>;
 }
@@ -9,16 +10,25 @@ interface ChargeCardDetail extends FetchedState {
     transactionList: ChargeCardDetailTransactionList;
     updateStatus: FetchStateAndError;
 }
+export declare const toChargeCardTransactionSortKeyType: (v: string) => "type" | "amount" | "merchant" | "paymentDate" | "receipts";
+export declare type ChargeCardTransactionSortKey = ReturnType<typeof toChargeCardTransactionSortKeyType>;
 interface ChargeCardDetailTransactionList extends FetchStateAndError {
     transactionIds: ID[];
+    uploadReceiptsFetchStateByTransactionId: Record<ID, FetchStateAndError>;
+    uploadReceiptsShowTickByTransactionId: Record<ID, boolean>;
+    transactionAttachmentsByTransactionId: Record<ID, TransactionAttachments>;
     uiState: ChargeCardDetailUiState;
 }
+export interface TransactionAttachments extends FetchStateAndError {
+    attachments: Attachment[];
+}
+export declare const initialTransactionAttachments: TransactionAttachments;
 export interface ChargeCardDetailUiState {
     sortOrder: SortOrder;
     pageToken: PageToken;
     pageTokenType: PageToken;
     scrollYOffset: number;
-    sortBy: string;
+    sortKey: ChargeCardTransactionSortKey;
     limit: number;
 }
 export declare const emptyChargeCardDetail: ChargeCardDetail;

package/lib/view/spendManagement/chargeCards/chargeCardDetail/chargeCardDetail.js

@@ -1,16 +1,34 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.emptyChargeCardDetail = void 0;
+exports.emptyChargeCardDetail = exports.initialTransactionAttachments = exports.toChargeCardTransactionSortKeyType = void 0;
+const stringToUnion_1 = require("../../../../commonStateTypes/stringToUnion");
+const ALL_CHARGE_CARD_TRANSACTION_SORT_KEYS = [
+    'merchant',
+    'paymentDate',
+    'receipts',
+    'type',
+    'amount',
+];
+const toChargeCardTransactionSortKeyType = (v) => (0, stringToUnion_1.stringToUnion)(v, ALL_CHARGE_CARD_TRANSACTION_SORT_KEYS);
+exports.toChargeCardTransactionSortKeyType = toChargeCardTransactionSortKeyType;
+exports.initialTransactionAttachments = {
+    attachments: [],
+    fetchState: 'Not-Started',
+    error: undefined,
+};
 exports.emptyChargeCardDetail = {
     id: '',
     fetchState: 'Not-Started',
     transactionList: {
+        transactionAttachmentsByTransactionId: {},
+        uploadReceiptsFetchStateByTransactionId: {},
+        uploadReceiptsShowTickByTransactionId: {},
         transactionIds: [],
         fetchState: 'Not-Started',
         error: undefined,
         uiState: {
             sortOrder: 'descending',
-            sortBy: 'transaction_date',
+            sortKey: 'paymentDate',
             limit: 0,
             pageToken: null,
             scrollYOffset: 0,

package/lib/view/spendManagement/chargeCards/chargeCardDetail/chargeCardDetailPayload.d.ts

@@ -1,8 +1,13 @@
 import { ChargeCardPayload } from '../../../../entity/chargeCard/chargeCardPayload';
 import { ChargeCardTransactionPayload } from '../../../../entity/chargeCardTransaction/chargeCardTransactionPayload';
+import { AttachmentPayload } from '../../../../entity/transaction/payloadTypes/attachmentPayload';
 import { UserPayload } from '../../../../entity/user/userPayload';
 import { UserRolePayload } from '../../../../entity/userRole/userRolePayload';
 import { ZeniAPIResponse } from '../../../../responsePayload';
+interface ChargeCardTransactionAttachmentPayload {
+    attachments: AttachmentPayload[];
+}
+export declare type UpdateChargeCardTransactionAttachmentResponse = ZeniAPIResponse<ChargeCardTransactionAttachmentPayload>;
 interface ChargeCardDetailPayload {
     card: ChargeCardPayload;
     users: UserPayload[];

package/lib/view/spendManagement/chargeCards/chargeCardDetail/chargeCardDetailReducer.d.ts

@@ -1,7 +1,8 @@
 import { ZeniAPIStatus } from '../../../../responsePayload';
 import { FetchState, ID } from '../../../../commonStateTypes/common';
-import { ChargeCardDetailState } from './chargeCardDetail';
 import { PageToken } from '../../../../commonStateTypes/viewAndReport/viewAndReport';
+import { AttachmentPayload } from '../../../../entity/transaction/payloadTypes/attachmentPayload';
+import { ChargeCardDetailState, ChargeCardDetailUiState } from './chargeCardDetail';
 import { ChargeCardTransactionListPayload } from './chargeCardDetailPayload';
 export declare const initialState: ChargeCardDetailState;
 export declare const fetchChargeCardDetailPage: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[chargeCardId: string, cacheOverride?: any], {
@@ -18,9 +19,33 @@ export declare const fetchChargeCardDetailPage: import("@reduxjs/toolkit").Actio
     chargeCardId: string;
     pageToken: PageToken;
     pageTokenType: PageToken;
-}, string, never, never>, updateChargeCardTransactionList: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
+}, string, never, never>, updateChargeCardDetailUIState: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
+    chargeCardId: ID;
+    uiState: Partial<ChargeCardDetailUiState>;
+}, string>, updateChargeCardTransactionList: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
     chargeCardId: ID;
     data: ChargeCardTransactionListPayload;
+}, string>, updateChargeCardTransactionUploadReceiptsFetchStatus: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
+    transactionId: ID;
+    chargeCardId: ID;
+    fetchState: FetchState;
+    error?: ZeniAPIStatus<Record<string, unknown>> | undefined;
+}, string>, fetchChargeCardTransactionAttachments: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[cardId: string, transactionId: string, attachmentIds: string[]], {
+    cardId: string;
+    transactionId: string;
+    attachmentIds: string[];
+}, string, never, never>, updateChargeCardTransactionAttachmentsFailure: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
+    cardId: ID;
+    transactionId: ID;
+    status: ZeniAPIStatus;
+}, string>, updateChargeCardTransactionReceiptsShowTickFetchStatus: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
+    transactionId: ID;
+    chargeCardId: ID;
+    shouldShowTick: boolean;
+}, string>, updateChargeCardTransactionAttachmentsInCardDetail: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
+    cardId: ID;
+    transactionId: ID;
+    transactionAttachments: AttachmentPayload[];
 }, string>, updateChargeCardTransactionListFailure: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
     chargeCardId: ID;
     error: ZeniAPIStatus;