@zeniai/client-epic-state 4.11.37 → 4.11.38

package/lib/entity/company/companyPayload.js

@@ -17,7 +17,7 @@ const toCompanyInfo = (payload, companyIdTenantIdMapping, companyInStore) => {
             ? (0, zeniDayJS_1.date)(payload.book_close_date)
             : undefined,
         companyId: payload.company_id,
-        tenantId: companyIdTenantIdMapping != null
+        tenantId: (companyIdTenantIdMapping === null || companyIdTenantIdMapping === void 0 ? void 0 : companyIdTenantIdMapping[payload.company_id]) != null
             ? companyIdTenantIdMapping[payload.company_id]
             : companyInStore === null || companyInStore === void 0 ? void 0 : companyInStore.companyInfo.tenantId,
         createTime: (0, zeniDayJS_1.date)(payload.create_time),

package/lib/entity/company/companyReducer.js

@@ -36,8 +36,12 @@ const company = (0, toolkit_1.createSlice)({
                     }
                     else if (companyInStore != null &&
                         (newCompany.companyInfo.updateTime.isAfter(companyInStore.companyInfo.updateTime) ||
-                            !(0, isEqual_1.default)(newCompany.parentSubsidiaryInfo, companyInStore.parentSubsidiaryInfo))) {
-                        // Note: If company data already exists, save it iff the new data is the latest one or parent subsidiary relationship has changed
+                            !(0, isEqual_1.default)(newCompany.parentSubsidiaryInfo, companyInStore.parentSubsidiaryInfo) ||
+                            newCompany.companyInfo.tenantId !==
+                                companyInStore.companyInfo.tenantId)) {
+                        // Note: If company data already exists, save it if the new data is the latest one
+                        // or parent subsidiary relationship has changed
+                        // or tenant id has changed
                         draft.companiesById[companyPayload.company_id] = newCompany;
                     }
                 });

package/lib/entity/user/userSelector.js

@@ -31,8 +31,13 @@ const getAllZeniUsersFromState = (state) => {
 exports.getAllZeniUsersFromState = getAllZeniUsersFromState;
 const getUserName = (user) => {
     if (user != null) {
-        if (user.firstName || user.lastName) {
-            return `${user.firstName} ${user.lastName}`;
+        const firstName = user.firstName;
+        const lastName = user.lastName;
+        if (Boolean(firstName) && Boolean(lastName)) {
+            return `${firstName} ${lastName}`;
+        }
+        else if (Boolean(firstName) || Boolean(lastName)) {
+            return firstName || lastName;
         }
         else {
             return user.email;

package/lib/view/companyView/selector/companyManagementViewSelector.js

@@ -14,6 +14,7 @@ const orderBy_1 = __importDefault(require("lodash/orderBy"));
 const zeniDayJS_1 = require("../../../zeniDayJS");
 const customerSatisfactionState_1 = require("../../../entity/customerSatisfaction/customerSatisfactionState");
 const cockpitHelpers_1 = require("../helpers/cockpitHelpers");
+const sortOrderPayload_1 = require("../../../commonPayloadTypes/sortOrderPayload");
 const getManagementViewFromCompanyIds = (rootState, companyIds, fetchState) => {
     const uiState = rootState.companyViewState.managementView.uiState;
     const { sortKey, sortOrder, filterText, filters } = uiState;
@@ -334,12 +335,27 @@ const sortAndFilterCompanies = (sortKey, sortOrder, filterText, companies, userS
                 break;
         }
     });
+    const sortOrderKey = (0, sortOrderPayload_1.getSortOrder)(sortOrder);
+    const sortOrderKeys = [];
+    if (sortKey === 'plans') {
+        let maxPlansCount = 0;
+        companiesWithSortKeyValue.forEach((company) => {
+            var _a;
+            maxPlansCount = Math.max(maxPlansCount, (_a = (0, exports.getPlanList)(company)) === null || _a === void 0 ? void 0 : _a.length);
+        });
+        for (let i = 0; i < maxPlansCount; i++) {
+            sortOrderKeys.push(sortOrderKey);
+        }
+    }
+    if (sortOrderKeys.length === 0) {
+        sortOrderKeys.push(sortOrderKey, sortOrderKey);
+    }
     const sortedCompaniesWithSortKeyValue = (0, orderBy_1.default)(companiesWithSortKeyValue, [
         (company) => {
-            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;
             let primarySortValue;
-            let secondarySortValue;
-            let isSecondarySortApplicable;
+            let multiSortValues = [];
+            let isMultiSortApplicable = false;
             const managegmentInfo = company.company.company.managegmentInfo;
             switch (sortKey) {
                 case 'companyName':
@@ -350,10 +366,11 @@ const sortAndFilterCompanies = (sortKey, sortOrder, filterText, companies, userS
                     primarySortValue = (_a = managegmentInfo.companyGroupId) === null || _a === void 0 ? void 0 : _a.toLowerCase();
                     break;
                 case 'plans':
-                    primarySortValue = (_b = (0, exports.getPlanList)(company)[0]) === null || _b === void 0 ? void 0 : _b.label;
+                    isMultiSortApplicable = true;
+                    multiSortValues = (0, exports.getPlanList)(company).map((plan) => plan === null || plan === void 0 ? void 0 : plan.zeniSku);
                     break;
                 case 'task':
-                    primarySortValue = (_c = company.taskSummary) === null || _c === void 0 ? void 0 : _c.count;
+                    primarySortValue = (_b = company.taskSummary) === null || _b === void 0 ? void 0 : _b.count;
                     break;
                 case 'controller':
                     primarySortValue = (0, userSelector_1.getUserNameById)(userState, managegmentInfo.controllerUserIds[0]).toLowerCase();
@@ -371,50 +388,53 @@ const sortAndFilterCompanies = (sortKey, sortOrder, filterText, companies, userS
                     primarySortValue = (0, userSelector_1.getUserNameById)(userState, managegmentInfo.apAnalystUserIds[0]).toLowerCase();
                     break;
                 case 'reportSent':
-                    primarySortValue = ((_d = managegmentInfo.lastReportSentDate) !== null && _d !== void 0 ? _d : (0, zeniDayJS_1.date)('1970-01-01T00:00:00.000Z')).valueOf();
+                    primarySortValue = ((_c = managegmentInfo.lastReportSentDate) !== null && _c !== void 0 ? _c : (0, zeniDayJS_1.date)('1970-01-01T00:00:00.000Z')).valueOf();
                     break;
                 case 'taxStatus':
-                    primarySortValue = (_e = managegmentInfo.taxStatusCode) === null || _e === void 0 ? void 0 : _e.toLowerCase();
+                    primarySortValue = (_d = managegmentInfo.taxStatusCode) === null || _d === void 0 ? void 0 : _d.toLowerCase();
                     break;
                 case 'taxLead':
                     primarySortValue = (0, userSelector_1.getUserNameById)(userState, managegmentInfo.taxLeadUserIds[0]).toLowerCase();
                     break;
                 case 'monthlyRecurringRevenue':
                     primarySortValue =
-                        (_h = (_g = (_f = company.primarySubscription) === null || _f === void 0 ? void 0 : _f.summary) === null || _g === void 0 ? void 0 : _g.summary.monthlyRecurringRevenue.amount) !== null && _h !== void 0 ? _h : 0;
+                        (_g = (_f = (_e = company.primarySubscription) === null || _e === void 0 ? void 0 : _e.summary) === null || _f === void 0 ? void 0 : _f.summary.monthlyRecurringRevenue.amount) !== null && _g !== void 0 ? _g : 0;
                     break;
                 case 'annualRecurringRevenue':
                     primarySortValue =
-                        (_l = (_k = (_j = company.primarySubscription) === null || _j === void 0 ? void 0 : _j.summary) === null || _k === void 0 ? void 0 : _k.summary.annualRecurringRevenue.amount) !== null && _l !== void 0 ? _l : 0;
+                        (_k = (_j = (_h = company.primarySubscription) === null || _h === void 0 ? void 0 : _h.summary) === null || _j === void 0 ? void 0 : _j.summary.annualRecurringRevenue.amount) !== null && _k !== void 0 ? _k : 0;
                     break;
                 case 'notes':
-                    primarySortValue = (_m = managegmentInfo.note) === null || _m === void 0 ? void 0 : _m.length;
+                    primarySortValue = (_l = managegmentInfo.note) === null || _l === void 0 ? void 0 : _l.length;
                     break;
                 case 'satisfaction':
-                    isSecondarySortApplicable = true;
-                    primarySortValue =
-                        ((_o = managegmentInfo.customerSatisfaction) === null || _o === void 0 ? void 0 : _o.customerRating) != null
-                            ? customerSatisfactionState_1.customerRatingValues[managegmentInfo.customerSatisfaction.customerRating]
-                            : 0;
-                    secondarySortValue =
-                        ((_p = managegmentInfo.customerSatisfaction) === null || _p === void 0 ? void 0 : _p.teamRating) != null
-                            ? customerSatisfactionState_1.teamRatingValues[managegmentInfo.customerSatisfaction.teamRating]
-                            : 0;
+                    isMultiSortApplicable = true;
+                    multiSortValues.push(((_m = managegmentInfo.customerSatisfaction) === null || _m === void 0 ? void 0 : _m.customerRating) != null
+                        ? customerSatisfactionState_1.customerRatingValues[managegmentInfo.customerSatisfaction.customerRating]
+                        : 0);
+                    multiSortValues.push(((_o = managegmentInfo.customerSatisfaction) === null || _o === void 0 ? void 0 : _o.teamRating) != null
+                        ? customerSatisfactionState_1.teamRatingValues[managegmentInfo.customerSatisfaction.teamRating]
+                        : 0);
                     break;
                 case 'bookCloseDate':
-                    primarySortValue = ((_q = company.company.company.companyInfo.bookCloseDate) !== null && _q !== void 0 ? _q : (0, zeniDayJS_1.date)('1970-01-01T00:00:00.000Z')).valueOf();
+                    primarySortValue = ((_p = company.company.company.companyInfo.bookCloseDate) !== null && _p !== void 0 ? _p : (0, zeniDayJS_1.date)('1970-01-01T00:00:00.000Z')).valueOf();
                     break;
                 case 'status':
-                default:
-                    isSecondarySortApplicable = true;
-                    primarySortValue = cockpitTypes_1.MANAGEMENT_STATUS_CODES.indexOf((_r = managegmentInfo.statusCode) === null || _r === void 0 ? void 0 : _r.toLowerCase());
-                    secondarySortValue = (_s = managegmentInfo.companyGroupId) === null || _s === void 0 ? void 0 : _s.toLowerCase();
+                default: {
+                    isMultiSortApplicable = true;
+                    let statusCode = '';
+                    if (managegmentInfo.statusCode) {
+                        statusCode = (0, cockpitTypes_1.toManagementStatusCodeType)(managegmentInfo.statusCode.toLowerCase());
+                    }
+                    multiSortValues.push(cockpitTypes_1.MANAGEMENT_STATUS_CODES.indexOf(statusCode));
+                    multiSortValues.push((_q = managegmentInfo.companyGroupId) === null || _q === void 0 ? void 0 : _q.toLowerCase());
+                }
             }
-            return isSecondarySortApplicable === true
-                ? [primarySortValue, secondarySortValue]
+            return isMultiSortApplicable === true
+                ? multiSortValues
                 : primarySortValue;
         },
-    ], sortOrder === 'ascending' ? ['asc', 'asc'] : ['desc', 'desc']);
+    ], sortOrderKeys);
     return [...sortedCompaniesWithSortKeyValue, ...companiesWithNoSortKeyValue];
 };
 const getTotalRecurringRevenue = (companies) => companies.reduce((prev, curr) => {

package/lib/view/people/peopleSelector.js

@@ -142,8 +142,8 @@ const sortPeopleBySortKey = (person, sortKey, userState, classState) => {
         default:
             return person.user != null
                 ? person.user.firstName
-                    ? (_b = person.user) === null || _b === void 0 ? void 0 : _b.firstName.toLowerCase()
-                    : (_c = person.user) === null || _c === void 0 ? void 0 : _c.email.toLowerCase()
+                    ? (_b = person.user) === null || _b === void 0 ? void 0 : _b.firstName.toLowerCase().trim()
+                    : (_c = person.user) === null || _c === void 0 ? void 0 : _c.email.toLowerCase().trim()
                 : undefined;
     }
 };

package/lib/view/spendManagement/billPay/billList/billListSelector.d.ts

@@ -13,6 +13,7 @@ import { RecurringBillConfig } from '../../../../entity/billPay/recurringBills/r
 import { BulkOperationType, BulkSelectExceptionInfoType } from '../billsBulkActionView/billsBulkActionViewState';
 export interface BillBulkSelectInfo {
     isSelectableForBulkAction: boolean;
+    isSelectableForBulkActionSelectAll: boolean;
     bulkSelectExceptionInfo?: BulkSelectExceptionInfoType;
 }
 export interface BillListBulkActionInfo {
@@ -49,4 +50,4 @@ export declare const getBillList: (state: RootState, currentTimePeriod: TimePeri
 export declare const getApproversOrRejectors: (billTransaction: BillTransaction, entityApprovalStatusState: EntityApprovalStatusState, userState: UserState) => Approvers;
 export declare const getBillListOnSort: (sortKey: BillPayViewSortKey, sortOrder: SortOrder, currentTab: BillTab, transactions: BillTransactionView[]) => BillTransactionView[];
 export declare const checkIfBulkActionAllowed: (selectedTab: BillTab, selectedSubTab: BillsSubTabType) => boolean;
-export declare const getAllowedBulkActions: (selectedTab: BillTab, selectedSubTab: BillsSubTabType, isAllAwaitingMyApproval: boolean, isFirstBillProcessing: boolean) => BulkOperationType[];
+export declare const getAllowedBulkActions: (selectedTab: BillTab, selectedSubTab: BillsSubTabType, isAllAwaitingMyApproval: boolean, isFirstBillProcessing: boolean, isBookClosedForAnySelectedBill: boolean, isRecurringBillInBulkActionList: boolean) => BulkOperationType[];

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

@@ -100,21 +100,7 @@ const getBillList = (state, currentTimePeriod, isBulkActionFeatureEnabled) => {
             }
             break;
     }
-    const bulkSubmissionFetchState = billsBulkActionViewState.bulkSubmissionFetchState.fetchState;
-    let isRecurringBillInBulkActionList = false;
-    let billListBulkActionInfo = {
-        isBulkActionAllowed: false,
-        billsSelectedForBulkAction: [],
-        allowedBulkActions: [],
-        bulkSubmissionFetchState,
-        isRecurringBillInBulkActionList,
-    };
-    let firstBillInBulkList = undefined;
-    const isBulkActionAllowed = isBulkActionFeatureEnabled
-        ? (0, exports.checkIfBulkActionAllowed)(billListState.currentTab, billListState.currentSubTab)
-        : false;
     let transactionsView = transactions.map((transaction) => {
-        var _a, _b;
         let approvers = {
             users: [],
             attributes: [],
@@ -128,51 +114,10 @@ const getBillList = (state, currentTimePeriod, isBulkActionFeatureEnabled) => {
             recurringBillDetail = (0, get_1.default)(recurringBillState.recurringBillDetailByConfigId, transaction.recurringBillConfigId, undefined);
         }
         const recurringBillConfig = recurringBillDetail === null || recurringBillDetail === void 0 ? void 0 : recurringBillDetail.recurringBillConfig;
-        let billBulkSelectInfo;
-        if (isBulkActionAllowed) {
-            const isProcessing = (0, helpers_1.isBillProcessing)((_a = transaction.bulkProcessingDetail) === null || _a === void 0 ? void 0 : _a.type);
-            const isError = ((_b = transaction.bulkProcessingDetail) === null || _b === void 0 ? void 0 : _b.type) === 'error';
-            const isBookClosedForBill = transaction.bookCloseDate != null &&
-                transaction.date.isBefore(transaction.bookCloseDate);
-            const { isSelectableForBulkAction, bulkSelectExceptionInfo } = isProcessing || isError
-                ? {
-                    isSelectableForBulkAction: false,
-                    bulkSelectExceptionInfo: undefined,
-                }
-                : isBillSelectableForBulkAction(transaction, billListState.currentTab, isBookClosedForBill, firstBillInBulkList);
-            if (isBulkActionAllowed &&
-                billsBulkActionViewState.billsSelectedForBulkAction.includes(transaction.id)) {
-                if (isRecurring) {
-                    isRecurringBillInBulkActionList = true;
-                }
-            }
-            billBulkSelectInfo = {
-                isSelectableForBulkAction,
-                bulkSelectExceptionInfo,
-            };
-        }
         return Object.assign(Object.assign({}, transaction), { approvers,
             isRecurring,
-            billBulkSelectInfo,
             recurringBillConfig });
     });
-    if (isBulkActionAllowed) {
-        const billsSelectedForBulkAction = billsBulkActionViewState.billsSelectedForBulkAction;
-        firstBillInBulkList = (0, get_1.default)(billTransactionState.transactionById, billsSelectedForBulkAction[0], undefined);
-        const allBulkBillsAwaitingMyApproval = (0, difference_1.default)(billsSelectedForBulkAction, pendingApprovalTransactionIDs)
-            .length === 0;
-        const allowedBulkActions = isBulkActionAllowed
-            ? (0, exports.getAllowedBulkActions)(billListState.currentTab, billListState.currentSubTab, allBulkBillsAwaitingMyApproval, (firstBillInBulkList === null || firstBillInBulkList === void 0 ? void 0 : firstBillInBulkList.billPayInfo.billPaymentStatus.code) ===
-                'processing')
-            : [];
-        billListBulkActionInfo = {
-            isBulkActionAllowed,
-            billsSelectedForBulkAction,
-            allowedBulkActions,
-            bulkSubmissionFetchState,
-            isRecurringBillInBulkActionList,
-        };
-    }
     transactionsView = (0, spendManagementFilterHelpers_1.applyAdvancedFiltersOnList)('bill_pay', transactionsView, billListState.filters);
     const TransactionsPendingForMyApprovalLength = pendingApprovalTransactionIDs.length;
     const fetchState = (_f = (_e = billListState.byBillListKey[key]) === null || _e === void 0 ? void 0 : _e.fetchState) !== null && _f !== void 0 ? _f : 'Not-Started';
@@ -195,6 +140,73 @@ const getBillList = (state, currentTimePeriod, isBulkActionFeatureEnabled) => {
             ((_c = transaction.documentId) === null || _c === void 0 ? void 0 : _c.toLowerCase().includes(loweredSearchText)) ===
                 true);
     }));
+    //BulkActions
+    const bulkSubmissionFetchState = billsBulkActionViewState.bulkSubmissionFetchState.fetchState;
+    let isRecurringBillInBulkActionList = false;
+    let isBookClosedForAnySelectedBill = false;
+    let billListBulkActionInfo = {
+        isBulkActionAllowed: false,
+        billsSelectedForBulkAction: [],
+        allowedBulkActions: [],
+        bulkSubmissionFetchState,
+        isRecurringBillInBulkActionList,
+    };
+    const billsSelectedForBulkAction = billsBulkActionViewState.billsSelectedForBulkAction;
+    const firstBillInBulkList = (0, get_1.default)(billTransactionState.transactionById, billsSelectedForBulkAction[0], undefined);
+    const isBulkActionAllowed = isBulkActionFeatureEnabled
+        ? (0, exports.checkIfBulkActionAllowed)(billListState.currentTab, billListState.currentSubTab)
+        : false;
+    let firstSelectableBill = undefined;
+    if (isBulkActionAllowed) {
+        transactionsView = transactionsView.map((transaction) => {
+            var _a, _b;
+            let billBulkSelectInfo;
+            if (isBulkActionAllowed) {
+                const isProcessing = (0, helpers_1.isBillProcessing)((_a = transaction.bulkProcessingDetail) === null || _a === void 0 ? void 0 : _a.type);
+                const isError = ((_b = transaction.bulkProcessingDetail) === null || _b === void 0 ? void 0 : _b.type) === 'error';
+                const isBookClosedForBill = transaction.bookCloseDate != null &&
+                    transaction.date.isBefore(transaction.bookCloseDate);
+                const { isSelectableForBulkAction, isSelectableForBulkActionSelectAll, bulkSelectExceptionInfo, } = isProcessing || isError
+                    ? {
+                        isSelectableForBulkAction: false,
+                        isSelectableForBulkActionSelectAll: false,
+                        bulkSelectExceptionInfo: undefined,
+                    }
+                    : isBillSelectableForBulkAction(transaction, billListState.currentTab, isBookClosedForBill, pendingApprovalTransactionIDs.includes(transaction.id), firstSelectableBill, firstBillInBulkList);
+                if (isBulkActionAllowed &&
+                    billsBulkActionViewState.billsSelectedForBulkAction.includes(transaction.id)) {
+                    if (transaction.isRecurring) {
+                        isRecurringBillInBulkActionList = true;
+                    }
+                    if (isBookClosedForBill) {
+                        isBookClosedForAnySelectedBill = true;
+                    }
+                }
+                if (firstSelectableBill == null && isSelectableForBulkAction) {
+                    firstSelectableBill = transaction;
+                }
+                billBulkSelectInfo = {
+                    isSelectableForBulkAction,
+                    isSelectableForBulkActionSelectAll,
+                    bulkSelectExceptionInfo,
+                };
+            }
+            return Object.assign(Object.assign({}, transaction), { billBulkSelectInfo });
+        });
+        const allBulkBillsAwaitingMyApproval = (0, difference_1.default)(billsSelectedForBulkAction, pendingApprovalTransactionIDs)
+            .length === 0;
+        const allowedBulkActions = isBulkActionAllowed
+            ? (0, exports.getAllowedBulkActions)(billListState.currentTab, billListState.currentSubTab, allBulkBillsAwaitingMyApproval, (firstBillInBulkList === null || firstBillInBulkList === void 0 ? void 0 : firstBillInBulkList.billPayInfo.billPaymentStatus.code) ===
+                'processing', isBookClosedForAnySelectedBill, isRecurringBillInBulkActionList)
+            : [];
+        billListBulkActionInfo = {
+            isBulkActionAllowed,
+            billsSelectedForBulkAction,
+            allowedBulkActions,
+            bulkSubmissionFetchState,
+            isRecurringBillInBulkActionList,
+        };
+    }
     const isDownloadEnabled = (0, spendManagementFilterHelpers_1.isBillListDownloadable)(state, currentTimePeriod);
     const billBulkSubmissionLimit = billPayConfigState.billBulkSubmissionLimit;
     return {
@@ -506,28 +518,66 @@ const checkIfBulkActionAllowed = (selectedTab, selectedSubTab) => {
     return true;
 };
 exports.checkIfBulkActionAllowed = checkIfBulkActionAllowed;
-const isBillSelectableForBulkAction = (bill, selectedTab, isBookClosedForBill, firstBillSelected) => {
+const isBillSelectableForBulkAction = (bill, selectedTab, isBookClosedForBill, isAwaitingMyApproval, firstSelectableBill, firstBillSelected) => {
     const result = {
         isSelectableForBulkAction: true,
+        isSelectableForBulkActionSelectAll: true,
         bulkSelectExceptionInfo: undefined,
     };
-    if (isBookClosedForBill && selectedTab !== 'draft') {
-        return {
-            isSelectableForBulkAction: false,
-            bulkSelectExceptionInfo: 'bookCloseDateProcessing',
-        };
+    if (isBookClosedForBill) {
+        if (selectedTab === 'scheduled' ||
+            (selectedTab === 'pending_approval' && !isAwaitingMyApproval)) {
+            return {
+                isSelectableForBulkAction: false,
+                isSelectableForBulkActionSelectAll: false,
+                bulkSelectExceptionInfo: 'bookCloseDateProcessing',
+            };
+        }
     }
     if (selectedTab === 'scheduled') {
+        //for cases where user attempts select all on scheduled tab
+        if (firstBillSelected == null && firstSelectableBill != null) {
+            if (firstSelectableBill.billPayInfo.billPaymentStatus.code === 'processing') {
+                if (bill.isRecurring &&
+                    Boolean(firstSelectableBill.isRecurring) === false) {
+                    return {
+                        isSelectableForBulkAction: true,
+                        isSelectableForBulkActionSelectAll: false,
+                        bulkSelectExceptionInfo: undefined,
+                    };
+                }
+                if (bill.billPayInfo.billPaymentStatus.code !== 'processing') {
+                    return {
+                        isSelectableForBulkAction: true,
+                        isSelectableForBulkActionSelectAll: false,
+                        bulkSelectExceptionInfo: undefined,
+                    };
+                }
+            }
+            if (bill.billPayInfo.billPaymentStatus.code === 'processing') {
+                if (firstSelectableBill.billPayInfo.billPaymentStatus.code !==
+                    'processing') {
+                    return {
+                        isSelectableForBulkAction: true,
+                        isSelectableForBulkActionSelectAll: false,
+                        bulkSelectExceptionInfo: undefined,
+                    };
+                }
+            }
+        }
         if ((firstBillSelected === null || firstBillSelected === void 0 ? void 0 : firstBillSelected.billPayInfo.billPaymentStatus.code) === 'processing') {
-            if (bill.isRecurring) {
+            if (bill.isRecurring &&
+                Boolean(firstBillSelected === null || firstBillSelected === void 0 ? void 0 : firstBillSelected.isRecurring) === false) {
                 return {
                     isSelectableForBulkAction: false,
+                    isSelectableForBulkActionSelectAll: true,
                     bulkSelectExceptionInfo: 'cancelRecurring',
                 };
             }
             if (bill.billPayInfo.billPaymentStatus.code !== 'processing') {
                 return {
                     isSelectableForBulkAction: false,
+                    isSelectableForBulkActionSelectAll: true,
                     bulkSelectExceptionInfo: 'processingSelectTogether',
                 };
             }
@@ -537,6 +587,7 @@ const isBillSelectableForBulkAction = (bill, selectedTab, isBookClosedForBill, f
             if (firstBillSelected.billPayInfo.billPaymentStatus.code !== 'processing') {
                 return {
                     isSelectableForBulkAction: false,
+                    isSelectableForBulkActionSelectAll: true,
                     bulkSelectExceptionInfo: 'processingWithOthers',
                 };
             }
@@ -544,7 +595,7 @@ const isBillSelectableForBulkAction = (bill, selectedTab, isBookClosedForBill, f
     }
     return result;
 };
-const getAllowedBulkActions = (selectedTab, selectedSubTab, isAllAwaitingMyApproval, isFirstBillProcessing) => {
+const getAllowedBulkActions = (selectedTab, selectedSubTab, isAllAwaitingMyApproval, isFirstBillProcessing, isBookClosedForAnySelectedBill, isRecurringBillInBulkActionList) => {
     switch (selectedTab) {
         case 'draft':
             return ['send_for_approval', 'delete'];
@@ -553,11 +604,16 @@ const getAllowedBulkActions = (selectedTab, selectedSubTab, isAllAwaitingMyAppro
                 case 'all':
                 case 'awaiting_approval':
                 case 'overdue':
-                    return isAllAwaitingMyApproval
-                        ? ['approve', 'reject', 'delete']
-                        : ['delete'];
+                    if (isAllAwaitingMyApproval) {
+                        return isBookClosedForAnySelectedBill
+                            ? ['approve', 'reject']
+                            : ['approve', 'reject', 'delete'];
+                    }
+                    return isBookClosedForAnySelectedBill ? [] : ['delete'];
                 case 'awaiting_my_approval':
-                    return ['approve', 'reject', 'delete'];
+                    return isBookClosedForAnySelectedBill
+                        ? ['approve', 'reject']
+                        : ['approve', 'reject', 'delete'];
                 case 'rejected':
                     return ['delete'];
                 default:
@@ -567,6 +623,9 @@ const getAllowedBulkActions = (selectedTab, selectedSubTab, isAllAwaitingMyAppro
         case 'scheduled': {
             switch (selectedSubTab) {
                 case 'all':
+                    if (isRecurringBillInBulkActionList) {
+                        return ['delete'];
+                    }
                     return isFirstBillProcessing ? ['cancel'] : ['delete'];
                 case 'failed':
                 case 'cancelled':

package/lib/view/spendManagement/chargeCards/chargeCardList/chargeCardListSelector.js

@@ -43,7 +43,7 @@ const getChargeCardListView = (state, includeCreditAccountAndCashbackInfo) => {
         var _a, _b, _c, _d, _e;
         switch (sortKey) {
             case 'owner':
-                return ((_c = `${(_a = card.cardHolderUser) === null || _a === void 0 ? void 0 : _a.firstName.toLowerCase()} ${(_b = card.cardHolderUser) === null || _b === void 0 ? void 0 : _b.lastName.toLowerCase()}`) !== null && _c !== void 0 ? _c : '');
+                return ((_c = `${(_a = card.cardHolderUser) === null || _a === void 0 ? void 0 : _a.firstName.toLowerCase().trim()} ${(_b = card.cardHolderUser) === null || _b === void 0 ? void 0 : _b.lastName.toLowerCase().trim()}`) !== null && _c !== void 0 ? _c : '');
             case 'cardName':
                 return card.cardName.toLowerCase();
             case 'department':

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

@@ -18,8 +18,10 @@ const fetchZeniAccountListEpic = (actions$, state$) => actions$.pipe((0, operato
     }
     else {
         const depositAccountList = state.depositAccountListState;
-        if (depositAccountList.hasValidState() === false &&
-            depositAccountList.fetchState !== 'In-Progress') {
+        const zeniAccountList = state.zeniAccountListState;
+        if ((depositAccountList.hasValidState() === false &&
+            depositAccountList.fetchState !== 'In-Progress') ||
+            zeniAccountList.summary.zeniAccounts == null) {
             zeniAccountActions.push((0, depositAccountListReducer_1.fetchDepositAccountList)());
         }
         const paymentAccountList = state.paymentAccountListState;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zeniai/client-epic-state",
-  "version": "4.11.37",
+  "version": "4.11.38",
   "description": "Shared module between Web & Mobile containing required abstractions for state management, async network communication. ",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -48,7 +48,7 @@
   },
   "dependencies": {
     "@reduxjs/toolkit": "^1.6.2",
-    "@stripe/stripe-js": "4.2.0",
+    "@stripe/stripe-js": "^4.1.0",
     "cross-fetch": "^3.1.2",
     "date-holidays": "^3.23.8",
     "dayjs": "^1.10.7",