@zeniai/client-epic-state 4.11.37 → 4.11.39

package/lib/entity/cardPayment/cardPaymentPayload.js

@@ -7,9 +7,9 @@ const mapCardPaymentPayloadToCardPayment = (payload) => ({
     brand: payload.brand,
     expiryMonth: payload.expiry_month,
     expiryYear: payload.expiry_year,
-    firstName: payload.first_name,
+    firstName: payload.first_name.trim(),
     last4: payload.last4,
-    lastName: payload.last_name,
+    lastName: payload.last_name.trim(),
     maskedNumber: payload.masked_number,
 });
 exports.mapCardPaymentPayloadToCardPayment = mapCardPaymentPayloadToCardPayment;

package/lib/entity/chargeCard/chargeCardPayload.js

@@ -8,7 +8,7 @@ const chargeCard_1 = require("./chargeCard");
 const mapChargeCardPayloadToChargeCard = (payload) => ({
     id: payload.card_id,
     type: (0, chargeCard_1.toCardType)(payload.card_type),
-    cardName: payload.card_name,
+    cardName: payload.card_name.trim(),
     limit: (0, amount_1.toAmount)(payload.credit_limit, payload.currency_code, payload.currency_symbol),
     balance: (0, amount_1.toAmount)(payload.balance_amount, payload.currency_code, payload.currency_symbol),
     hold: (0, amount_1.toAmount)(payload.hold_amount, payload.currency_code, payload.currency_symbol),

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/customer/customerPayload.js

@@ -22,8 +22,8 @@ const toCustomerBasePayload = (customer) => {
 };
 exports.toCustomerBasePayload = toCustomerBasePayload;
 const toCustomer = (payload, parseOutParentName = false) => {
-    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;
-    return (Object.assign(Object.assign({}, (0, exports.toCustomerBase)(payload, parseOutParentName)), { addressId: (_a = payload.address_id) !== null && _a !== void 0 ? _a : undefined, lastName: (_b = payload.last_name) !== null && _b !== void 0 ? _b : undefined, paymentMethodId: (_c = payload.payment_method_id) !== null && _c !== void 0 ? _c : undefined, suffix: (_d = payload.suffix) !== null && _d !== void 0 ? _d : undefined, createTime: payload.create_time != null ? (0, zeniDayJS_1.date)(payload.create_time) : undefined, qboCreateTime: payload.qbo_create_time != null ? (0, zeniDayJS_1.date)(payload.qbo_create_time) : undefined, nameOnCheck: (_e = payload.name_on_check) !== null && _e !== void 0 ? _e : undefined, firstName: (_f = payload.first_name) !== null && _f !== void 0 ? _f : undefined, middleName: (_g = payload.middle_name) !== null && _g !== void 0 ? _g : undefined, contacts: (_h = payload.contacts) !== null && _h !== void 0 ? _h : undefined, termId: (_j = payload.term_id) !== null && _j !== void 0 ? _j : undefined, note: (_k = payload.note) !== null && _k !== void 0 ? _k : undefined, syncToken: payload.sync_token, email: (_l = payload.email) !== null && _l !== void 0 ? _l : undefined, websiteUrl: (_m = payload.website_url) !== null && _m !== void 0 ? _m : undefined, parentCustomerId: (_o = payload.parent_customer_id) !== null && _o !== void 0 ? _o : undefined, qboParentCustomerId: (_p = payload.qbo_parent_customer_id) !== null && _p !== void 0 ? _p : undefined, isBillWithParent: Boolean(payload.is_bill_with_parent), updateTime: payload.update_time != null ? (0, zeniDayJS_1.date)(payload.update_time) : undefined, accountId: (_q = payload.account_id) !== null && _q !== void 0 ? _q : undefined, phone: (_r = payload.phone) !== null && _r !== void 0 ? _r : undefined, bankAccountIds: (_s = payload.bank_account_ids) !== null && _s !== void 0 ? _s : undefined, balance: (_t = payload.balance) !== null && _t !== void 0 ? _t : undefined, isDeleted: Boolean(payload.is_deleted), tenantId: payload.tenant_id, title: (_u = payload.title) !== null && _u !== void 0 ? _u : undefined, isSubCustomer: Boolean(payload.is_sub_customer), isTaxable: Boolean(payload.is_taxable), shippingAddressId: (_v = payload.shipping_address_id) !== null && _v !== void 0 ? _v : undefined, billingAddressId: (_w = payload.billing_address_id) !== null && _w !== void 0 ? _w : undefined, currencySymbol: (_x = payload.currency_symbol) !== null && _x !== void 0 ? _x : undefined, qboUpdateTime: payload.qbo_update_time != null ? (0, zeniDayJS_1.date)(payload.qbo_update_time) : undefined, accountingClassId: (_y = payload.accounting_class_id) !== null && _y !== void 0 ? _y : undefined, currencyCode: (_z = payload.currency_code) !== null && _z !== void 0 ? _z : undefined }));
+    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;
+    return (Object.assign(Object.assign({}, (0, exports.toCustomerBase)(payload, parseOutParentName)), { addressId: (_a = payload.address_id) !== null && _a !== void 0 ? _a : undefined, lastName: (_c = (_b = payload.last_name) === null || _b === void 0 ? void 0 : _b.trim()) !== null && _c !== void 0 ? _c : undefined, paymentMethodId: (_d = payload.payment_method_id) !== null && _d !== void 0 ? _d : undefined, suffix: (_e = payload.suffix) !== null && _e !== void 0 ? _e : undefined, createTime: payload.create_time != null ? (0, zeniDayJS_1.date)(payload.create_time) : undefined, qboCreateTime: payload.qbo_create_time != null ? (0, zeniDayJS_1.date)(payload.qbo_create_time) : undefined, nameOnCheck: (_f = payload.name_on_check) !== null && _f !== void 0 ? _f : undefined, firstName: (_h = (_g = payload.first_name) === null || _g === void 0 ? void 0 : _g.trim()) !== null && _h !== void 0 ? _h : undefined, middleName: (_k = (_j = payload.middle_name) === null || _j === void 0 ? void 0 : _j.trim()) !== null && _k !== void 0 ? _k : undefined, contacts: (_l = payload.contacts) !== null && _l !== void 0 ? _l : undefined, termId: (_m = payload.term_id) !== null && _m !== void 0 ? _m : undefined, note: (_o = payload.note) !== null && _o !== void 0 ? _o : undefined, syncToken: payload.sync_token, email: (_q = (_p = payload.email) === null || _p === void 0 ? void 0 : _p.trim()) !== null && _q !== void 0 ? _q : undefined, websiteUrl: (_r = payload.website_url) !== null && _r !== void 0 ? _r : undefined, parentCustomerId: (_s = payload.parent_customer_id) !== null && _s !== void 0 ? _s : undefined, qboParentCustomerId: (_t = payload.qbo_parent_customer_id) !== null && _t !== void 0 ? _t : undefined, isBillWithParent: Boolean(payload.is_bill_with_parent), updateTime: payload.update_time != null ? (0, zeniDayJS_1.date)(payload.update_time) : undefined, accountId: (_u = payload.account_id) !== null && _u !== void 0 ? _u : undefined, phone: (_v = payload.phone) !== null && _v !== void 0 ? _v : undefined, bankAccountIds: (_w = payload.bank_account_ids) !== null && _w !== void 0 ? _w : undefined, balance: (_x = payload.balance) !== null && _x !== void 0 ? _x : undefined, isDeleted: Boolean(payload.is_deleted), tenantId: payload.tenant_id, title: (_y = payload.title) !== null && _y !== void 0 ? _y : undefined, isSubCustomer: Boolean(payload.is_sub_customer), isTaxable: Boolean(payload.is_taxable), shippingAddressId: (_z = payload.shipping_address_id) !== null && _z !== void 0 ? _z : undefined, billingAddressId: (_0 = payload.billing_address_id) !== null && _0 !== void 0 ? _0 : undefined, currencySymbol: (_1 = payload.currency_symbol) !== null && _1 !== void 0 ? _1 : undefined, qboUpdateTime: payload.qbo_update_time != null ? (0, zeniDayJS_1.date)(payload.qbo_update_time) : undefined, accountingClassId: (_2 = payload.accounting_class_id) !== null && _2 !== void 0 ? _2 : undefined, currencyCode: (_3 = payload.currency_code) !== null && _3 !== void 0 ? _3 : undefined }));
 };
 exports.toCustomer = toCustomer;
 /**

package/lib/entity/tenant/tenantReducer.js

@@ -404,8 +404,8 @@ function mapLoggedInUserPayloadToLoggedInUser(payload, zeniSessionId) {
     return {
         userId: payload.user_id,
         zeniSessionId: zeniSessionId,
-        firstName: payload.first_name,
-        lastName: payload.last_name,
+        firstName: payload.first_name.trim(),
+        lastName: payload.last_name.trim(),
         photo: (0, urlPayload_1.toURL)(payload.photo),
     };
 }

package/lib/entity/user/userReducer.js

@@ -50,17 +50,17 @@ exports.default = user.reducer;
  * Helper functions.
  */
 function mapUserPayloadToUser(payload) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p;
     return {
         userId: payload.user_id,
         email: payload.email,
-        firstName: (_a = payload.first_name) !== null && _a !== void 0 ? _a : '',
-        lastName: (_b = payload.last_name) !== null && _b !== void 0 ? _b : '',
-        middleName: (_c = payload.middle_name) !== null && _c !== void 0 ? _c : '',
+        firstName: (_b = (_a = payload.first_name) === null || _a === void 0 ? void 0 : _a.trim()) !== null && _b !== void 0 ? _b : '',
+        lastName: (_d = (_c = payload.last_name) === null || _c === void 0 ? void 0 : _c.trim()) !== null && _d !== void 0 ? _d : '',
+        middleName: (_f = (_e = payload.middle_name) === null || _e === void 0 ? void 0 : _e.trim()) !== null && _f !== void 0 ? _f : '',
         birthday: payload.birthday != null ? (0, zeniDayJS_1.date)(payload.birthday) : undefined,
-        countryCode: (_d = payload.country_code) !== null && _d !== void 0 ? _d : undefined,
-        phone: (_e = payload.phone) !== null && _e !== void 0 ? _e : undefined,
-        ssn: (_f = payload.ssn) !== null && _f !== void 0 ? _f : undefined,
+        countryCode: (_g = payload.country_code) !== null && _g !== void 0 ? _g : undefined,
+        phone: (_h = payload.phone) !== null && _h !== void 0 ? _h : undefined,
+        ssn: (_j = payload.ssn) !== null && _j !== void 0 ? _j : undefined,
         photo: payload.photo != null ? (0, exports.toPhotoURL)(payload.photo) : undefined,
         lastSeenTime: payload.last_seen_time != null ? (0, zeniDayJS_1.date)(payload.last_seen_time) : undefined,
         createTime: payload.create_time != null ? (0, zeniDayJS_1.date)(payload.create_time) : undefined,
@@ -70,13 +70,13 @@ function mapUserPayloadToUser(payload) {
          * it should be a calculated from createTime or updateTime.
          * Lets do it when we enable support in platform.
          */
-        syncToken: (_g = payload.sync_token) !== null && _g !== void 0 ? _g : undefined,
-        roleAtCompany: (_h = payload.role_at_company) !== null && _h !== void 0 ? _h : undefined,
-        gender: (_j = payload.gender) !== null && _j !== void 0 ? _j : undefined,
+        syncToken: (_k = payload.sync_token) !== null && _k !== void 0 ? _k : undefined,
+        roleAtCompany: (_l = payload.role_at_company) !== null && _l !== void 0 ? _l : undefined,
+        gender: (_m = payload.gender) !== null && _m !== void 0 ? _m : undefined,
         isPotentialFraud: payload.is_potential_fraud,
         isDeleted: payload.is_deleted,
-        addressId: (_k = payload.address_id) !== null && _k !== void 0 ? _k : undefined,
-        companyId: (_l = payload.company_id) !== null && _l !== void 0 ? _l : undefined,
+        addressId: (_o = payload.address_id) !== null && _o !== void 0 ? _o : undefined,
+        companyId: (_p = payload.company_id) !== null && _p !== void 0 ? _p : undefined,
         isPhoneVerified: payload.is_phone_verified,
     };
 }

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/entity/vendor/vendorPayload.js

@@ -28,12 +28,12 @@ const toVendorBasePayload = (tranVendor, vendorUpdates) => {
 };
 exports.toVendorBasePayload = toVendorBasePayload;
 const mapVendorPayloadToVendor = (payload) => {
-    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;
-    return Object.assign(Object.assign({}, (0, exports.mapVendorBasePayloadToVendorBase)(payload)), { qboId: payload.qbo_id, title: (_a = payload.title) !== null && _a !== void 0 ? _a : '', suffix: (_b = payload.suffix) !== null && _b !== void 0 ? _b : '', firstName: (_c = payload.first_name) !== null && _c !== void 0 ? _c : '', middleName: (_d = payload.middle_name) !== null && _d !== void 0 ? _d : '', lastName: (_e = payload.last_name) !== null && _e !== void 0 ? _e : '', vendorType: (_f = payload.vendor_type) !== null && _f !== void 0 ? _f : '', isDeleted: (_g = payload.is_deleted) !== null && _g !== void 0 ? _g : false, createTime: payload.create_time != null ? (0, zeniDayJS_1.date)(payload.create_time) : (0, zeniDayJS_1.dateNow)(), updateTime: payload.update_time != null ? (0, zeniDayJS_1.date)(payload.update_time) : (0, zeniDayJS_1.dateNow)(), syncToken: (_h = payload.sync_token) !== null && _h !== void 0 ? _h : '', email: (_j = payload.email) !== null && _j !== void 0 ? _j : '', phone: (_k = payload.phone) !== null && _k !== void 0 ? _k : '', websiteUrl: (_l = payload.website_url) !== null && _l !== void 0 ? _l : '', currencyCode: payload.currency_code, currencySymbol: payload.currency_symbol, vendorCurrencyCode: (_m = payload.vendor_currency_code) !== null && _m !== void 0 ? _m : payload.currency_code, vendorCurrencySymbol: (_o = payload.vendor_currency_symbol) !== null && _o !== void 0 ? _o : payload.currency_symbol, countryCode: (_p = payload.country_code) !== null && _p !== void 0 ? _p : undefined, accountId: (_r = (_q = payload.account) === null || _q === void 0 ? void 0 : _q.account_id) !== null && _r !== void 0 ? _r : undefined, classId: (_t = (_s = payload.accounting_class) === null || _s === void 0 ? void 0 : _s.accounting_class_id) !== null && _t !== void 0 ? _t : undefined, contactIds: (_v = (_u = payload.contacts) === null || _u === void 0 ? void 0 : _u.map((contact) => contact.contact_id)) !== null && _v !== void 0 ? _v : [], billingAddressId: payload.billing_address != null
+    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, _8, _9;
+    return Object.assign(Object.assign({}, (0, exports.mapVendorBasePayloadToVendorBase)(payload)), { qboId: payload.qbo_id, title: (_a = payload.title) !== null && _a !== void 0 ? _a : '', suffix: (_b = payload.suffix) !== null && _b !== void 0 ? _b : '', firstName: (_d = (_c = payload.first_name) === null || _c === void 0 ? void 0 : _c.trim()) !== null && _d !== void 0 ? _d : '', middleName: (_f = (_e = payload.middle_name) === null || _e === void 0 ? void 0 : _e.trim()) !== null && _f !== void 0 ? _f : '', lastName: (_h = (_g = payload.last_name) === null || _g === void 0 ? void 0 : _g.trim()) !== null && _h !== void 0 ? _h : '', vendorType: (_j = payload.vendor_type) !== null && _j !== void 0 ? _j : '', isDeleted: (_k = payload.is_deleted) !== null && _k !== void 0 ? _k : false, createTime: payload.create_time != null ? (0, zeniDayJS_1.date)(payload.create_time) : (0, zeniDayJS_1.dateNow)(), updateTime: payload.update_time != null ? (0, zeniDayJS_1.date)(payload.update_time) : (0, zeniDayJS_1.dateNow)(), syncToken: (_l = payload.sync_token) !== null && _l !== void 0 ? _l : '', email: (_o = (_m = payload.email) === null || _m === void 0 ? void 0 : _m.trim()) !== null && _o !== void 0 ? _o : '', phone: (_p = payload.phone) !== null && _p !== void 0 ? _p : '', websiteUrl: (_q = payload.website_url) !== null && _q !== void 0 ? _q : '', currencyCode: payload.currency_code, currencySymbol: payload.currency_symbol, vendorCurrencyCode: (_r = payload.vendor_currency_code) !== null && _r !== void 0 ? _r : payload.currency_code, vendorCurrencySymbol: (_s = payload.vendor_currency_symbol) !== null && _s !== void 0 ? _s : payload.currency_symbol, countryCode: (_t = payload.country_code) !== null && _t !== void 0 ? _t : undefined, accountId: (_v = (_u = payload.account) === null || _u === void 0 ? void 0 : _u.account_id) !== null && _v !== void 0 ? _v : undefined, classId: (_x = (_w = payload.accounting_class) === null || _w === void 0 ? void 0 : _w.accounting_class_id) !== null && _x !== void 0 ? _x : undefined, contactIds: (_z = (_y = payload.contacts) === null || _y === void 0 ? void 0 : _y.map((contact) => contact.contact_id)) !== null && _z !== void 0 ? _z : [], billingAddressId: payload.billing_address != null
             ? payload.billing_address.address_id
             : undefined, addressId: payload.address != null ? payload.address.address_id : undefined, shippingAddressId: payload.shipping_address != null
             ? payload.shipping_address.address_id
-            : undefined, bankAccountIds: (_x = (_w = payload.bank_accounts) === null || _w === void 0 ? void 0 : _w.map((bankAcc) => bankAcc.bank_account_id)) !== null && _x !== void 0 ? _x : [], paymentInstrumentIds: (_z = (_y = payload.payment_instruments) === null || _y === void 0 ? void 0 : _y.map((piAcc) => piAcc.zeni_payment_instrument_id)) !== null && _z !== void 0 ? _z : [], ownerId: (_1 = (_0 = payload.owner) === null || _0 === void 0 ? void 0 : _0.user_id) !== null && _1 !== void 0 ? _1 : undefined, balance: (_2 = payload.balance) !== null && _2 !== void 0 ? _2 : 0, matchScore: ((_3 = payload.match_score) === null || _3 === void 0 ? void 0 : _3.value) != null ? payload.match_score.value : 0, isVendor1099: (_4 = payload.is_vendor_1099) !== null && _4 !== void 0 ? _4 : false, documentIds: (_5 = payload.document_ids) !== null && _5 !== void 0 ? _5 : [], last30DaysSpend: payload.last_30_days_spend, last90DaysSpend: payload.last_90_days_spend, yearToDateSpend: payload.year_to_date_spend, lastMonthSpend: payload.last_month_spend, last3MonthsSpend: payload.last_3_months_spend, last6MonthsSpend: payload.last_6_months_spend, last12MonthsSpend: payload.last_12_months_spend, previousYearSpend: payload.previous_year_spend, recommendations: payload.recommendation != null && payload.recommendation.length > 0
+            : undefined, bankAccountIds: (_1 = (_0 = payload.bank_accounts) === null || _0 === void 0 ? void 0 : _0.map((bankAcc) => bankAcc.bank_account_id)) !== null && _1 !== void 0 ? _1 : [], paymentInstrumentIds: (_3 = (_2 = payload.payment_instruments) === null || _2 === void 0 ? void 0 : _2.map((piAcc) => piAcc.zeni_payment_instrument_id)) !== null && _3 !== void 0 ? _3 : [], ownerId: (_5 = (_4 = payload.owner) === null || _4 === void 0 ? void 0 : _4.user_id) !== null && _5 !== void 0 ? _5 : undefined, balance: (_6 = payload.balance) !== null && _6 !== void 0 ? _6 : 0, matchScore: ((_7 = payload.match_score) === null || _7 === void 0 ? void 0 : _7.value) != null ? payload.match_score.value : 0, isVendor1099: (_8 = payload.is_vendor_1099) !== null && _8 !== void 0 ? _8 : false, documentIds: (_9 = payload.document_ids) !== null && _9 !== void 0 ? _9 : [], last30DaysSpend: payload.last_30_days_spend, last90DaysSpend: payload.last_90_days_spend, yearToDateSpend: payload.year_to_date_spend, lastMonthSpend: payload.last_month_spend, last3MonthsSpend: payload.last_3_months_spend, last6MonthsSpend: payload.last_6_months_spend, last12MonthsSpend: payload.last_12_months_spend, previousYearSpend: payload.previous_year_spend, recommendations: payload.recommendation != null && payload.recommendation.length > 0
             ? (0, transactionPayload_1.transformRecommendation)(payload.recommendation[0]) // In this case, there will be only one recommendation item since this is entity recommendation payload.
             : [], preferredInternationalTransferFeeBearerPaymentMethod: payload.preferred_international_transfer_fee_bearer_payment_method != null
             ? (0, billTransactionState_1.toInternationalTransferFeeBearerPaymentMethod)(payload.preferred_international_transfer_fee_bearer_payment_method)

package/lib/view/companyView/epic/companyPassport/createCompanyOfficersEpic.js

@@ -42,9 +42,9 @@ const createCompanyOfficersEpic = (actions$, state$, zeniAPI) => actions$.pipe((
                 (0, userRoleReducer_1.updateUserRoles)((_f = (_e = response.data) === null || _e === void 0 ? void 0 : _e.user_roles) !== null && _f !== void 0 ? _f : []),
             ];
             const officersData = officers.map((officer) => {
-                var _a, _b, _c;
+                var _a, _b, _c, _d, _e;
                 const user = users.find((user) => user.email === officer.email);
-                return Object.assign(Object.assign({}, officer), { firstName: (_a = user === null || user === void 0 ? void 0 : user.first_name) !== null && _a !== void 0 ? _a : officer.firstName, lastName: (_b = user === null || user === void 0 ? void 0 : user.last_name) !== null && _b !== void 0 ? _b : officer.lastName, phone: (_c = user === null || user === void 0 ? void 0 : user.phone) !== null && _c !== void 0 ? _c : '', userId: user === null || user === void 0 ? void 0 : user.user_id });
+                return Object.assign(Object.assign({}, officer), { firstName: (_b = (_a = user === null || user === void 0 ? void 0 : user.first_name) === null || _a === void 0 ? void 0 : _a.trim()) !== null && _b !== void 0 ? _b : officer.firstName, lastName: (_d = (_c = user === null || user === void 0 ? void 0 : user.last_name) === null || _c === void 0 ? void 0 : _c.trim()) !== null && _d !== void 0 ? _d : officer.lastName, phone: (_e = user === null || user === void 0 ? void 0 : user.phone) !== null && _e !== void 0 ? _e : '', userId: user === null || user === void 0 ? void 0 : user.user_id });
             });
             actions.push((0, companyViewReducer_1.companyPassportSaveDataInLocalStore)({
                 officers: officersData,

package/lib/view/companyView/epic/companyPassport/updatePrimaryContactEpic.js

@@ -39,7 +39,7 @@ const updatePrimaryContactEpic = (actions$, state$, zeniAPI) => actions$.pipe((0
         : // User PUT call is on individual user so User will be updated across tenants wherever its present
             zeniAPI.putAndGetJSON(`${zeniAPI.apiEndPoints.tenantMicroServiceBaseUrl}/1.0/users/${userId}`, payload);
     return userAPI.pipe((0, operators_1.mergeMap)((response) => {
-        var _a, _b, _c, _d, _e, _f, _g, _h;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
         const users = (_b = (_a = response.data) === null || _a === void 0 ? void 0 : _a.users) !== null && _b !== void 0 ? _b : [];
         if ((0, responsePayload_1.isSuccessResponse)(response) && users.length > 0) {
             const actions = [(0, userReducer_1.updateAllUsers)({ users })];
@@ -48,7 +48,7 @@ const updatePrimaryContactEpic = (actions$, state$, zeniAPI) => actions$.pipe((0
                     payload: (_d = (_c = response.data) === null || _c === void 0 ? void 0 : _c.companies) !== null && _d !== void 0 ? _d : [],
                     schema: {},
                 }), (0, userRoleReducer_1.updateUserRoles)((_f = (_e = response.data) === null || _e === void 0 ? void 0 : _e.user_roles) !== null && _f !== void 0 ? _f : []), (0, companyViewReducer_1.companyPassportSaveDataInLocalStore)({
-                    primaryContact: Object.assign(Object.assign({}, action.payload.primaryContact), { firstName: (_g = users[0].first_name) !== null && _g !== void 0 ? _g : action.payload.primaryContact.firstName, lastName: (_h = users[0].last_name) !== null && _h !== void 0 ? _h : action.payload.primaryContact.lastName, userId: users[0].user_id }),
+                    primaryContact: Object.assign(Object.assign({}, action.payload.primaryContact), { firstName: (_h = (_g = users[0].first_name) === null || _g === void 0 ? void 0 : _g.trim()) !== null && _h !== void 0 ? _h : action.payload.primaryContact.firstName, lastName: (_k = (_j = users[0].last_name) === null || _j === void 0 ? void 0 : _j.trim()) !== null && _k !== void 0 ? _k : action.payload.primaryContact.lastName, userId: users[0].user_id }),
                 }));
             }
             actions.push((0, companyViewReducer_1.companyPassportUpdatePrimaryContactSuccess)(companyId));

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/onboardingView/cockpitView/epic/sendOnboardingCustomerViewInviteEpic.js

@@ -98,6 +98,7 @@ const sendOnboardingCustomerViewInviteEpic = (actions$, _state$, zeniAPI) => act
 }));
 exports.sendOnboardingCustomerViewInviteEpic = sendOnboardingCustomerViewInviteEpic;
 const getUserNameForEmailSent = (onboardingInfo, users) => {
+    var _a, _b, _c, _d;
     const customerUserId = (onboardingInfo === null || onboardingInfo === void 0 ? void 0 : onboardingInfo.onboarding_customer_user_ids) != null &&
         onboardingInfo.onboarding_customer_user_ids.length > 0
         ? onboardingInfo.onboarding_customer_user_ids[0]
@@ -106,7 +107,14 @@ const getUserNameForEmailSent = (onboardingInfo, users) => {
     if (customerUserId != null) {
         const user = users.find((user) => user.user_id === customerUserId);
         if (user != null) {
-            userName = `${user.first_name} ${user.last_name}`;
+            const firstName = (_b = (_a = user.first_name) === null || _a === void 0 ? void 0 : _a.trim()) !== null && _b !== void 0 ? _b : '';
+            const lastName = (_d = (_c = user.last_name) === null || _c === void 0 ? void 0 : _c.trim()) !== null && _d !== void 0 ? _d : '';
+            if (Boolean(firstName) && Boolean(lastName)) {
+                userName = `${firstName} ${lastName}`;
+            }
+            else {
+                userName = firstName || lastName || '';
+            }
         }
     }
     return userName;

package/lib/view/reviewCompanyView/reviewCompanyViewSelector.js

@@ -68,6 +68,7 @@ exports.getReviewCompanySelectorView = (0, toolkit_1.createSelector)((state) =>
                 break;
         }
     });
+    const sortOrderValue = (0, sortOrderPayload_1.getSortOrder)(sortOrder);
     const sortedCompaniesWithSortKeyValue = (0, orderBy_1.default)(companiesWithSortKeyValues, (company) => {
         var _a;
         const warningCount = (0, exports.getAuditWarningsCount)(company);
@@ -113,7 +114,7 @@ exports.getReviewCompanySelectorView = (0, toolkit_1.createSelector)((state) =>
         return isSecondarySortApplicable === true
             ? [primarySortValue, secondarySortValue]
             : primarySortValue;
-    }, (0, sortOrderPayload_1.getSortOrder)(sortOrder));
+    }, [sortOrderValue, sortOrderValue]);
     return {
         companies: [
             ...sortedCompaniesWithSortKeyValue,

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

@@ -40,14 +40,23 @@ const getChargeCardListView = (state, includeCreditAccountAndCashbackInfo) => {
     const sortKey = chargeCardListState.uiState.sortKey;
     const sortOrder = (0, sortOrderPayload_1.getSortOrder)(chargeCardListState.uiState.sortOrder);
     const cardsInOrder = (0, orderBy_1.default)(cards, (card) => {
-        var _a, _b, _c, _d, _e;
+        var _a, _b, _c, _d;
         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 : '');
+            case 'owner': {
+                const firstName = (_a = card.cardHolderUser) === null || _a === void 0 ? void 0 : _a.firstName.toLowerCase();
+                const lastName = (_b = card.cardHolderUser) === null || _b === void 0 ? void 0 : _b.lastName.toLowerCase();
+                if (Boolean(firstName) && Boolean(lastName)) {
+                    return `${firstName} ${lastName}`;
+                }
+                else if (Boolean(firstName) || Boolean(lastName)) {
+                    return firstName !== null && firstName !== void 0 ? firstName : lastName;
+                }
+                return '';
+            }
             case 'cardName':
                 return card.cardName.toLowerCase();
             case 'department':
-                return (_e = (_d = card.department) === null || _d === void 0 ? void 0 : _d.className.toLowerCase()) !== null && _e !== void 0 ? _e : '';
+                return (_d = (_c = card.department) === null || _c === void 0 ? void 0 : _c.className.toLowerCase()) !== null && _d !== void 0 ? _d : '';
             case 'utilisation':
                 return card.limit.amount - card.available.amount;
             case 'limit':

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

@@ -33,7 +33,7 @@ const issueChargeCardEpic = (actions$, state$, zeniAPI) => actions$.pipe((0, ope
                 keepExistingListItems: true,
             }), (0, chargeCardListReducer_1.issueChargeCardSuccessOrFailure)({ fetchState: 'Completed' }));
             const names = response.data.users
-                .map((user) => { var _a; return (_a = user.first_name) !== null && _a !== void 0 ? _a : user.last_name; })
+                .map((user) => { var _a, _b, _c; return (_b = (_a = user.first_name) === null || _a === void 0 ? void 0 : _a.trim()) !== null && _b !== void 0 ? _b : (_c = user.last_name) === null || _c === void 0 ? void 0 : _c.trim(); })
                 .join(', ');
             actions.push((0, snackbarReducer_1.openSnackbar)({
                 messageSection: 'issue_charge_card',

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/lib/view/vendorReviewView/common/payload/commonTypes.js

@@ -10,10 +10,11 @@ const globalMerchantPayload_1 = require("../../../../entity/globalMerchant/globa
  * Helpers
  */
 const toUserPayload = (user) => {
+    var _a, _b;
     return {
         user_id: user.user_id,
-        first_name: user.first_name,
-        last_name: user.last_name,
+        first_name: (_a = user.first_name) === null || _a === void 0 ? void 0 : _a.trim(),
+        last_name: (_b = user.last_name) === null || _b === void 0 ? void 0 : _b.trim(),
         email: '',
     };
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zeniai/client-epic-state",
-  "version": "4.11.37",
+  "version": "4.11.39",
   "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",