@zeniai/client-epic-state 4.19.99-betaVR3 → 4.19.100

package/lib/view/spendManagement/billPay/billPayReview/billPayReviewSelector.js

@@ -8,7 +8,6 @@ const get_1 = __importDefault(require("lodash/get"));
 const reduceFetchState_1 = require("../../../../commonStateTypes/reduceFetchState");
 const contactSelector_1 = require("../../../../entity/billPay/contact/contactSelector");
 const paymentAccountSelector_1 = require("../../../../entity/paymentAccount/paymentAccountSelector");
-const tenantSelector_1 = require("../../../../entity/tenant/tenantSelector");
 const vendorSelector_1 = require("../../../../entity/vendor/vendorSelector");
 const accountListSelector_1 = require("../../../accountList/accountListSelector");
 const setupViewSelector_1 = require("../../commonSetup/setupViewSelector");
@@ -81,14 +80,11 @@ const getReviewPageBillDetail = (state, billId) => {
             }
         }
         if (sourceBillDetail != null) {
-            const fetchStateList = [
+            sourceBillDetailFetchState = (0, reduceFetchState_1.reduceFetchState)([
                 sourceBillDetail.fetchStatus,
                 accountListState.byReportId['billPayAccountList'],
-            ];
-            if ((0, tenantSelector_1.getIsAccountingClassesEnabled)(state)) {
-                fetchStateList.push(classListState);
-            }
-            sourceBillDetailFetchState = (0, reduceFetchState_1.reduceFetchState)(fetchStateList).fetchState;
+                classListState,
+            ]).fetchState;
         }
     }
     else {

package/lib/view/spendManagement/billPay/billPaySetupApproverView/billPaySetupApproverViewSelector.js

@@ -9,7 +9,6 @@ const cloneDeep_1 = __importDefault(require("lodash/cloneDeep"));
 const reduceFetchState_1 = require("../../../../commonStateTypes/reduceFetchState");
 const approvalRuleSelector_1 = require("../../../../entity/approvalRule/approvalRuleSelector");
 const classSelector_1 = require("../../../../entity/class/classSelector");
-const tenantSelector_1 = require("../../../../entity/tenant/tenantSelector");
 const userSelector_1 = require("../../../../entity/user/userSelector");
 const userRoleSelector_1 = require("../../../../entity/userRole/userRoleSelector");
 exports.getBillPaySetupApproverView = (0, toolkit_1.createSelector)((state) => state.billPaySetupApproverViewState, (state) => state.approvalRuleState, (state) => state.userState, (billPaySetupApproverViewState, approvalRuleState, userState) => {
@@ -51,7 +50,7 @@ exports.getBillPaySetupApproverView = (0, toolkit_1.createSelector)((state) => s
         newApprovalRuleId,
     };
 });
-exports.getBillPaySetupApproverUpdateDataView = (0, toolkit_1.createSelector)((state) => state.billPaySetupApproverViewState, (state) => state.approvalRuleState, (state) => state.userState, (state) => state.classState, (state) => state.classListState, (state) => state.userRoleState, (state) => (0, tenantSelector_1.getIsAccountingClassesEnabled)(state), (billPaySetupApproverViewState, approvalRuleState, userState, classState, classListState, userRoleState, isAccountingClassesEnabled) => {
+exports.getBillPaySetupApproverUpdateDataView = (0, toolkit_1.createSelector)((state) => state.billPaySetupApproverViewState, (state) => state.approvalRuleState, (state) => state.userState, (state) => state.classState, (state) => state.classListState, (state) => state.userRoleState, (billPaySetupApproverViewState, approvalRuleState, userState, classState, classListState, userRoleState) => {
     const { affectedEntityIds, approvalRuleIds, approverListState, billPaySetupApproverViewUpdateData, fetchState, error, listeningToPusherEvent, } = billPaySetupApproverViewState;
     const { approverIds, attributes } = approverListState;
     const allApprovalRules = (0, approvalRuleSelector_1.getApprovalRulesByIds)(approvalRuleState, approvalRuleIds);
@@ -99,9 +98,10 @@ exports.getBillPaySetupApproverUpdateDataView = (0, toolkit_1.createSelector)((s
         allAttributes,
         filteredAttributes,
         billPaySetupApproverViewUpdateData,
-        approverListFetchStatus: isAccountingClassesEnabled
-            ? (0, reduceFetchState_1.reduceAllFetchState)([approverListState.fetchStatus, classListState])
-            : approverListState.fetchStatus,
+        approverListFetchStatus: (0, reduceFetchState_1.reduceAllFetchState)([
+            approverListState.fetchStatus,
+            classListState,
+        ]),
         fetchState,
         allAccountingClasses,
         error,

package/lib/view/spendManagement/billPay/billPaySetupApproverView/epic/fetchBillPayApproversDetailsEpic.js

@@ -3,28 +3,23 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.fetchBillPayApproversDetailsEpic = void 0;
 const rxjs_1 = require("rxjs");
 const operators_1 = require("rxjs/operators");
-const tenantSelector_1 = require("../../../../../entity/tenant/tenantSelector");
 const classListReducer_1 = require("../../../../classList/classListReducer");
 const billPaySetupApproverViewReducer_1 = require("../billPaySetupApproverViewReducer");
 const fetchBillPayApproversDetailsEpic = (actions$, state$) => actions$.pipe((0, operators_1.filter)(billPaySetupApproverViewReducer_1.fetchBillPayApproversDetails.match), (0, operators_1.mergeMap)((action) => {
     const { cacheOverride, includeUserRoles } = action.payload;
     const { billPaySetupApproverViewState, classListState } = state$.value;
     const { approverListState } = billPaySetupApproverViewState;
-    const isAccountingClassesEnabled = (0, tenantSelector_1.getIsAccountingClassesEnabled)(state$.value);
     const actions = [];
     if (cacheOverride === true) {
         actions.push((0, billPaySetupApproverViewReducer_1.fetchBillPayApproversList)(cacheOverride, includeUserRoles));
-        if (isAccountingClassesEnabled) {
-            actions.push((0, classListReducer_1.fetchClassList)());
-        }
+        actions.push((0, classListReducer_1.fetchClassList)());
     }
     else {
         if (billPaySetupApproverViewState.hasValidState() === false &&
             approverListState.fetchStatus.fetchState !== 'In-Progress') {
             actions.push((0, billPaySetupApproverViewReducer_1.fetchBillPayApproversList)(true, includeUserRoles));
         }
-        if (isAccountingClassesEnabled &&
-            classListState.hasValidState() === false &&
+        if (classListState.hasValidState() === false &&
             classListState.fetchState !== 'In-Progress') {
             actions.push((0, classListReducer_1.fetchClassList)());
         }

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

@@ -16,7 +16,6 @@ const companySelector_1 = require("../../../../entity/company/companySelector");
 const depositAccountSelector_1 = require("../../../../entity/depositAccount/depositAccountSelector");
 const paymentAccountSelector_1 = require("../../../../entity/paymentAccount/paymentAccountSelector");
 const paymentInstrumentSelector_1 = require("../../../../entity/paymentInstrument/paymentInstrumentSelector");
-const tenantSelector_1 = require("../../../../entity/tenant/tenantSelector");
 const userSelector_1 = require("../../../../entity/user/userSelector");
 const vendorSelector_1 = require("../../../../entity/vendor/vendorSelector");
 const zeniDayJS_1 = require("../../../../zeniDayJS");
@@ -182,15 +181,12 @@ const getEditBillDetail = (state, isVendorRecommendationFeatureEnabled, isZeniAc
             isCancelled = sourceBillDetail.billDetailLocalData.isCancelled;
             billStage = billPayInfo?.stage.code ?? 'draft';
             if (billViewState != null) {
-                const fetchStateList = [
+                fetchState = (0, reduceFetchState_1.reduceFetchState)([
                     sourceBillDetail.fetchStatus,
                     accountListState.byReportId.billPayAccountList,
+                    classListState,
                     billPaySetupApproverViewState,
-                ];
-                if ((0, tenantSelector_1.getIsAccountingClassesEnabled)(state)) {
-                    fetchStateList.push(classListState);
-                }
-                fetchState = (0, reduceFetchState_1.reduceFetchState)(fetchStateList).fetchState;
+                ]).fetchState;
                 deleteStatus = billViewState.deleteStatus;
                 billActivities = (0, billDetailViewSelector_1.getBillActivities)(state, billId, billPayInfo?.stage.code);
             }
@@ -204,14 +200,11 @@ const getEditBillDetail = (state, isVendorRecommendationFeatureEnabled, isZeniAc
         }
     }
     else {
-        const newBillFetchStateList = [
+        fetchState = (0, reduceFetchState_1.reduceFetchState)([
             accountListState.byReportId.billPayAccountList,
+            classListState,
             billPaySetupApproverViewState,
-        ];
-        if ((0, tenantSelector_1.getIsAccountingClassesEnabled)(state)) {
-            newBillFetchStateList.push(classListState);
-        }
-        fetchState = (0, reduceFetchState_1.reduceFetchState)(newBillFetchStateList).fetchState;
+        ]).fetchState;
     }
     if (sourceBillDetail != null && fetchState == 'Completed') {
         const updatedRecord = sourceBillDetail.billDetailLocalData;

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

@@ -61,7 +61,7 @@ export declare const initialCreditAcc: CreditAccount;
 export declare const initialDebitCardSummaries: DebitCardSummaries;
 export declare const initialResendRevokeCardInvite: ResendRevokeCardInvite;
 export declare const initialCreditAccountRepayment: CreditAccountRepayment;
-export declare const toChargeCardSortKeyType: (v: string) => "status" | "accountType" | "owner" | "cardName" | "limit" | "department" | "cardType" | "utilisation";
+export declare const toChargeCardSortKeyType: (v: string) => "status" | "owner" | "cardName" | "limit" | "department" | "cardType" | "utilisation";
 export declare type ChargeCardViewSortKey = ReturnType<typeof toChargeCardSortKeyType>;
 export declare const ALL_CASHBACK_SORT_KEYS: readonly ["month", "cashback"];
 export declare const toCashbackSortKeyType: (v: string) => "month" | "cashback";

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

@@ -78,7 +78,6 @@ const ALL_CHARGE_CARD_SORT_KEYS = [
     'cardName',
     'department',
     'cardType',
-    'accountType',
     'status',
     'utilisation',
     'limit',

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

@@ -233,8 +233,6 @@ const getCardsBySortKey = (card, sortKey) => {
             return card.cardName.toLowerCase();
         case 'cardType':
             return card.type.code;
-        case 'accountType':
-            return card.type.code.includes('credit') ? 'credit' : 'debit';
         case 'status':
             return card.status.code;
         case 'utilisation':

package/lib/view/spendManagement/reimbursement/editRemiView/editRemiViewSelector.js

@@ -69,16 +69,13 @@ const getEditRemiDetail = (state, reimbursementId) => {
             paymentTo: reimbursementInfo?.toAccount.billAccountId,
         };
         if (sourceRemiDetail != null) {
-            const fetchStateList = [
+            fetchState = (0, reduceFetchState_1.reduceFetchState)([
                 sourceRemiDetail.fetchStatus,
                 accountListState.byReportId.reimbursementAccountList,
+                classListState,
                 merchantListState,
                 reimbursementConfigState,
-            ];
-            if ((0, tenantSelector_1.getIsAccountingClassesEnabled)(state)) {
-                fetchStateList.push(classListState);
-            }
-            fetchState = (0, reduceFetchState_1.reduceFetchState)(fetchStateList).fetchState;
+            ]).fetchState;
             remiStage = reimbursementInfo?.stage.code ?? 'draft';
             createdBy = (0, userSelector_1.getUserByUserId)(userState, reimbursement?.createdBy ?? '');
             createTime = reimbursement?.createTime;

package/lib/view/spendManagement/reimbursement/remiListView/remiListSelector.d.ts

@@ -42,7 +42,6 @@ export interface ReimbursementView extends Reimbursement {
     approvers: Approvers;
     submittedBy: User | undefined;
     bulkSelectInfo?: RemiBulkSelectInfo;
-    createdByUser?: User;
 }
 export declare const getRemiList: (state: RootState, currentTimePeriod: TimePeriod, isBulkActionFeatureEnabled: boolean) => RemiListReport;
 export declare const getApproversOrRejectors: (reimbursement: Reimbursement, entityApprovalStatusState: EntityApprovalStatusState, userState: UserState) => Approvers;

package/lib/view/spendManagement/reimbursement/remiListView/remiListSelector.js

@@ -51,7 +51,6 @@ const getRemiList = (state, currentTimePeriod, isBulkActionFeatureEnabled) => {
         return {
             ...reimbursement,
             submittedBy: (0, userSelector_1.getUserByUserId)(userState, reimbursement.reimburseeUserId),
-            createdByUser: (0, userSelector_1.getUserByUserId)(userState, reimbursement.createdBy),
             approvers: approvers,
         };
     });
@@ -424,14 +423,6 @@ const getRemiListOnSort = (sortKey, sortOrder, currentTab, reimbursements) => {
                     reimbursementsWithNoSortKeyValue.push(reimbursement);
                 }
                 break;
-            case 'createdBy':
-                if (reimbursement.createdByUser != null) {
-                    reimbursementsWithSortKeyValue.push(reimbursement);
-                }
-                else {
-                    reimbursementsWithNoSortKeyValue.push(reimbursement);
-                }
-                break;
         }
     });
     const getColumnWiseSortOrder = (sortOrder) => {
@@ -439,7 +430,6 @@ const getRemiListOnSort = (sortKey, sortOrder, currentTab, reimbursements) => {
             case 'reportName':
             case 'type':
             case 'status':
-            case 'createdBy':
                 return sortOrder === 'ascending' ? 'asc' : 'desc';
             default:
                 return sortOrder === 'ascending' ? 'desc' : 'asc';
@@ -459,8 +449,6 @@ const getRemiListOnSort = (sortKey, sortOrder, currentTab, reimbursements) => {
                 return getStatusPerTab(reimbursement);
             case 'amount':
                 return reimbursement.amount.amount ?? 0;
-            case 'createdBy':
-                return `${reimbursement.createdByUser?.firstName ?? ''} ${reimbursement.createdByUser?.lastName ?? ''}`.toLowerCase();
         }
     }, getColumnWiseSortOrder(sortOrder));
     return [

package/lib/view/spendManagement/reimbursement/remiListView/remiListState.d.ts

@@ -38,7 +38,7 @@ export declare const toRemiSubTabTypeStrict: (v: string) => "rejected" | "failed
 export type RemiSubTabType = ReturnType<typeof toRemiSubTabType>;
 export declare const toRemiSubTabUnderScoreType: (v: string) => "rejected" | "failed" | "ach" | "wire" | "cancelled" | "deleted" | "overdue" | "all" | "awaiting_approval" | "awaiting_my_approval" | "my_drafts" | "awaiting_all_approval";
 export type RemiSubTabUnderScoreType = ReturnType<typeof toRemiSubTabUnderScoreType>;
-declare const toReimbursementSortKeyType: (v: string) => "amount" | "status" | "type" | "createdBy" | "submittedOn" | "reportName";
+declare const toReimbursementSortKeyType: (v: string) => "amount" | "status" | "type" | "submittedOn" | "reportName";
 export type ReimbursementViewSortKey = ReturnType<typeof toReimbursementSortKeyType>;
 export interface ReimbursementFilters {
     categories: ReimbursementFilterCategory[];

package/lib/view/spendManagement/reimbursement/remiListView/remiListState.js

@@ -64,7 +64,6 @@ exports.toRemiSubTabUnderScoreType = toRemiSubTabUnderScoreType;
 const ALL_REIMBURSEMENT_SORT_KEYS = [
     'reportName',
     'submittedOn',
-    'createdBy',
     'type',
     'status',
     'amount',

package/lib/view/taskManager/taskDetailView/taskDetailSelector.js

@@ -98,11 +98,11 @@ exports.allTaskStatus = [
     },
     {
         code: 'done',
-        name: 'In Review',
+        name: 'Done',
     },
     {
         code: 'resolved',
-        name: 'Complete',
+        name: 'Resolved',
     },
 ];
 exports.allTaskPriority = [
@@ -116,7 +116,7 @@ exports.allTaskPriority = [
     },
     {
         code: 'medium',
-        name: 'Medium',
+        name: 'Normal',
     },
     {
         code: 'low',

package/lib/view/taskManager/taskListView/epics/bulkUpdateTaskListEpic.d.ts

@@ -16,7 +16,6 @@ interface UpdateTaskPayload {
     description: string;
     due_date: string | null;
     file_ids: ID[];
-    group_assignees: string[];
     name: string;
     priority: string;
     recurring_end_date: string | null;

package/lib/view/taskManager/taskListView/epics/bulkUpdateTaskListEpic.js

@@ -79,7 +79,6 @@ const toTaskPayload = (state, task) => {
         name: task.name,
         assignees: task.assignees,
         description: task.description,
-        group_assignees: task.groupAssignees,
         due_date: task.dueDate != null ? task.dueDate.format(formatZeniDateFY_1.DEFAULT_DATE_FORMAT) : null,
         priority: task.priority.code,
         status: task.status.code,

package/lib/view/taskManager/taskListView/taskListSelector.d.ts

@@ -8,7 +8,6 @@ import { UserState } from '../../../entity/user/userState';
 import { UserRoleState } from '../../../entity/userRole/userRoleState';
 import { RootState } from '../../../reducer';
 import { UserAndRole } from '../../companyView/types/userAndRole';
-import { UserGroupListSelectorView } from '../../userGroupListView/userGroupListViewSelector';
 import { UserListSelectorView } from '../../userListView/userListViewSelector';
 import { TaskListFilters, TaskListLocalData, TaskListState, TaskListUIState } from './taskList';
 export interface TaskWithUserDetails extends Task {
@@ -31,7 +30,6 @@ export interface TaskListSelectorView extends SelectorView {
     taskGroupUpdateStatus: FetchStateAndError;
     uiState: TaskListUIState;
     updateTasksFetchState: FetchStateAndError;
-    userGroupList: UserGroupListSelectorView;
     userList: UserListSelectorView;
 }
 export declare const getTaskListGroupedByAssignees: ({ taskListState, taskState, userState, userRoleState, addressState, tagState, }: {

package/lib/view/taskManager/taskListView/taskListSelector.js

@@ -17,7 +17,6 @@ const taskGroupTemplateSelector_1 = require("../../../entity/taskGroupTemplate/t
 const userSelector_1 = require("../../../entity/user/userSelector");
 const userAndRole_1 = require("../../companyView/types/userAndRole");
 const spendManagementFilterHelpers_1 = require("../../spendManagement/spendManagementFilterHelpers");
-const userGroupListViewSelector_1 = require("../../userGroupListView/userGroupListViewSelector");
 const userListViewSelector_1 = require("../../userListView/userListViewSelector");
 const taskDetailSelector_1 = require("../taskDetailView/taskDetailSelector");
 const taskList_1 = require("./taskList");
@@ -317,7 +316,7 @@ const getTaskGroupsWithTaskList = ({ taskListState, taskState, userState, userRo
         tagState,
     });
 };
-exports.getAllTasks = (0, toolkit_1.createSelector)((state) => state.taskListState, (state) => state.taskState, (state) => state.userState, (state) => state.userRoleState, (state) => state.userListViewState, (state) => state.addressState, (state) => state.taskGroupState, (state) => state.taskGroupViewState, (state) => state.tagViewState, (state) => state.tagState, (state) => state.taskGroupTemplateState, (state) => state.taskGroupTemplateViewState, (state) => state.userGroupsState, (state) => state.userGroupListViewState, (_state, isTaskTemplatesEnabled) => isTaskTemplatesEnabled, (taskListState, taskState, userState, userRoleState, userListViewState, addressState, taskGroupState, taskGroupViewState, tagViewState, tagState, taskGroupTemplateState, taskGroupTemplateViewState, userGroupsState, userGroupListViewState, isTaskTemplatesEnabled) => {
+exports.getAllTasks = (0, toolkit_1.createSelector)((state) => state.taskListState, (state) => state.taskState, (state) => state.userState, (state) => state.userRoleState, (state) => state.userListViewState, (state) => state.addressState, (state) => state.taskGroupState, (state) => state.taskGroupViewState, (state) => state.tagViewState, (state) => state.tagState, (state) => state.taskGroupTemplateState, (state) => state.taskGroupTemplateViewState, (_state, isTaskTemplatesEnabled) => isTaskTemplatesEnabled, (taskListState, taskState, userState, userRoleState, userListViewState, addressState, taskGroupState, taskGroupViewState, tagViewState, tagState, taskGroupTemplateState, taskGroupTemplateViewState, isTaskTemplatesEnabled) => {
     const { localData } = taskListState;
     const taskGroupsWithTasksList = getTaskGroupsWithTaskList({
         taskListState,
@@ -345,7 +344,6 @@ exports.getAllTasks = (0, toolkit_1.createSelector)((state) => state.taskListSta
         taskGroupTemplates,
         fetchState: fetchState,
         userList: (0, userListViewSelector_1.getUserList)(userState, userRoleState, userListViewState, 'taskManagerCandidate'),
-        userGroupList: (0, userGroupListViewSelector_1.getUserGroupList)(userGroupsState, userGroupListViewState, 'taskManagerCandidate'),
         error: error,
         version: 0,
         taskGroupsWithTasksList,

package/lib/view/transactionDetail/epics/saveTransactionHelper.js

@@ -78,8 +78,8 @@ const toTransactionUpdatesFromTransactionDetailLocalData = (transactionDetailLoc
                 lineItem.account?.qboId !== accountLine.account.qboId &&
                     Boolean(lineItem.account?.qboId);
             hasClassChanged =
-                (lineItem.class?.qboId != null || accountLine.class?.qboId != null) &&
-                    lineItem.class?.qboId !== accountLine.class?.qboId;
+                Boolean(lineItem.class?.qboId) &&
+                    lineItem.class?.qboId !== accountLine.class.qboId;
             const recommendedAccountBase = (0, exports.toRecommendedAccountBase)(lineItem.amount.amount, lineItem.account);
             const recommendedClassBase = (0, exports.toRecommendedClassBase)(lineItem.amount.amount, lineItem.class);
             const latestRecommendedCategory = lineItem.recommendedAccount;

package/lib/view/transactionDetail/transactionDetailLocalDataHelper.js

@@ -144,13 +144,13 @@ const buildLineItemById = (transaction, uncategorizedIncomeExpense, recommendati
                     record.isRetainedCategorySelected = false;
                 }
                 if (Boolean(recommendedClass?.qboId) &&
-                    recommendedClass?.qboId !== accountLine.class?.qboId) {
+                    recommendedClass?.qboId !== accountLine.class.qboId) {
                     record.isRecommendedClassSelected = false;
                     record.recommendedClass = recommendedClass;
                     record.isClassUpdateSelected = false;
                 }
                 if (accountLine.isClassMiscategorized &&
-                    Boolean(accountLine.class?.qboId) &&
+                    Boolean(accountLine.class.qboId) &&
                     Boolean(isVendorOrCustomerPresent)) {
                     record.retainedClass = accountLine.class;
                     record.isRetainedClassSelected = false;
@@ -342,14 +342,14 @@ const toUpdateLineItemsOriginalCategoryClass = (transaction, transactionDetailLo
                         }
                     };
                     const updateClass = () => {
-                        if (recommendedClass?.qboId !== accountLine.class?.qboId &&
+                        if (recommendedClass?.qboId !== accountLine.class.qboId &&
                             Boolean(recommendedClass?.qboId)) {
                             record.class = accountLine.class;
                             record.isRecommendedClassSelected = false;
                             record.recommendedClass = recommendedClass;
                             record.isClassUpdateSelected = false;
                             if (accountLine.isClassMiscategorized &&
-                                Boolean(accountLine.class?.qboId) &&
+                                Boolean(accountLine.class.qboId) &&
                                 Boolean(isVendorOrCustomerPresent)) {
                                 record.retainedClass = accountLine.class;
                                 record.isRetainedClassSelected = false;
@@ -362,7 +362,7 @@ const toUpdateLineItemsOriginalCategoryClass = (transaction, transactionDetailLo
                             record.recommendedClass = recommendedClass;
                             record.isClassUpdateSelected = false;
                             if (accountLine.isClassMiscategorized &&
-                                Boolean(accountLine.class?.qboId) &&
+                                Boolean(accountLine.class.qboId) &&
                                 Boolean(isVendorOrCustomerPresent)) {
                                 record.retainedClass = recommendedClass;
                                 record.isRetainedClassSelected = false;
@@ -659,13 +659,13 @@ const setEntityRecommendationForLineIdInLocalData = (transaction, transactionDet
                             record.isRetainedCategorySelected = false;
                         }
                     }
-                    if (recommendedClass?.qboId !== accountLine.class?.qboId &&
+                    if (recommendedClass?.qboId !== accountLine.class.qboId &&
                         Boolean(recommendedClass?.qboId)) {
                         record.isRecommendedClassSelected = false;
                         record.recommendedClass = recommendedClass;
                         record.isClassUpdateSelected = false;
                         if (accountLine.isClassMiscategorized &&
-                            Boolean(accountLine.class?.qboId)) {
+                            Boolean(accountLine.class.qboId)) {
                             record.retainedClass = accountLine.class;
                             record.isRetainedClassSelected = false;
                         }
@@ -673,12 +673,12 @@ const setEntityRecommendationForLineIdInLocalData = (transaction, transactionDet
                     else {
                         record.isRecommendedClassSelected = false;
                         record.recommendedClass = recommendedClass;
-                        if (recommendedClass?.qboId === accountLine.class?.qboId) {
+                        if (recommendedClass?.qboId === accountLine.class.qboId) {
                             record.recommendedClass = undefined;
                         }
                         record.isClassUpdateSelected = false;
                         if (accountLine.isClassMiscategorized &&
-                            Boolean(accountLine.class?.qboId)) {
+                            Boolean(accountLine.class.qboId)) {
                             record.retainedClass = recommendedClass;
                             record.isRetainedClassSelected = false;
                         }
@@ -694,7 +694,7 @@ const setEntityRecommendationForLineIdInLocalData = (transaction, transactionDet
                         Boolean(recommendedAccount?.qboId) !== false) {
                         record.account = recommendedAccount;
                     }
-                    if (Boolean(record.class?.qboId) === false &&
+                    if (Boolean(record.class.qboId) === false &&
                         Boolean(recommendedClass?.qboId) !== false) {
                         record.class = recommendedClass;
                     }
@@ -817,9 +817,7 @@ const getChangedLineItemCountFromLocalData = (transaction, transactionLocalData)
                     accountLineLocal.account?.qboId !== accountLine.account.qboId &&
                         accountLineLocal.account?.accountId !== accountLine.account.accountId;
                 hasClassChanged =
-                    (accountLineLocal.class?.qboId != null ||
-                        accountLine.class?.qboId != null) &&
-                        accountLineLocal.class?.qboId !== accountLine.class?.qboId;
+                    accountLineLocal.class?.qboId !== accountLine.class.qboId;
             }
             hasDescriptionChanged =
                 transactionLocalData.lineItemById[lineId] != null
@@ -959,10 +957,10 @@ const toUpdateLineItemsToOriginalVendor = (transaction, transactionDetailLocalDa
                     record.isRecommendedClassSelected = false;
                     record.recommendedClass = recommendedClass;
                     record.isClassUpdateSelected = false;
-                    if (recommendedClass?.qboId !== accountLine.class?.qboId &&
+                    if (recommendedClass?.qboId !== accountLine.class.qboId &&
                         Boolean(recommendedClass?.qboId)) {
                         if (accountLine.isClassMiscategorized &&
-                            Boolean(accountLine.class?.qboId) &&
+                            Boolean(accountLine.class.qboId) &&
                             Boolean(isVendorOrCustomerPresent)) {
                             record.retainedClass = accountLine.class;
                             record.isRetainedClassSelected = false;
@@ -975,7 +973,7 @@ const toUpdateLineItemsToOriginalVendor = (transaction, transactionDetailLocalDa
                         record.recommendedClass = recommendedClass;
                         record.isClassUpdateSelected = false;
                         if (accountLine.isClassMiscategorized &&
-                            Boolean(accountLine.class?.qboId) &&
+                            Boolean(accountLine.class.qboId) &&
                             Boolean(isVendorOrCustomerPresent)) {
                             record.retainedClass = recommendedClass;
                             record.isRetainedClassSelected = false;

package/lib/view/twoFactorAuthentication/resendOtpEpic.d.ts

@@ -10,4 +10,4 @@ import { resendOtpCardHolder, sendOtpCardHolderFailure, sendOtpCardHolderSuccess
 import { resendOtpSpendManagementSetUp, sendOtpFailureSpendManagementSetUp, sendOtpSuccessSpendManagementSetUp } from '../spendManagement/commonSetup/setupViewReducer';
 import { resendOtp, sendOtpFailure, sendOtpSuccess } from './twoFactorAuthenticationReducer';
 export type ActionType = ReturnType<typeof resendOtp> | ReturnType<typeof sendOtpSuccess> | ReturnType<typeof sendOtpFailure> | ReturnType<typeof resendOtpSpendManagementSetUp> | ReturnType<typeof sendOtpSuccessSpendManagementSetUp> | ReturnType<typeof sendOtpFailureSpendManagementSetUp> | ReturnType<typeof resendOtpVendorView> | ReturnType<typeof sendOtpVendorViewSuccess> | ReturnType<typeof sendOtpVendorViewFailure> | ReturnType<typeof resendOnboardingOfficerOtp> | ReturnType<typeof sendOnboardingOfficerOtpSuccess> | ReturnType<typeof sendOnboardingOfficerOtpFailure> | ReturnType<typeof resendOtpCardUserOnboarding> | ReturnType<typeof sendOtpCardUserOnboardingSuccess> | ReturnType<typeof sendOtpCardUserOnboardingFailure> | ReturnType<typeof resendOtpMyProfile> | ReturnType<typeof resendOtpCardHolder> | ReturnType<typeof sendOtpCardHolderSuccess> | ReturnType<typeof sendOtpCardHolderFailure> | ReturnType<typeof sendOtpMyProfileFailure> | ReturnType<typeof sendOtpMyProfileSuccess>;
-export declare const resendOtpEpic: (actions$: ActionsObservable<ActionType>, _state$: StateObservable<RootState>, zeniAPI: ZeniAPI) => Observable<ActionType>;
+export declare const resendOtpEpic: (actions$: ActionsObservable<ActionType>, state$: StateObservable<RootState>, zeniAPI: ZeniAPI) => Observable<ActionType>;

package/lib/view/twoFactorAuthentication/resendOtpEpic.js

@@ -11,11 +11,20 @@ const cardUserOnboardingReducer_1 = require("../spendManagement/chargeCards/card
 const chargeCardDetailReducer_1 = require("../spendManagement/chargeCards/chargeCardDetail/chargeCardDetailReducer");
 const setupViewReducer_1 = require("../spendManagement/commonSetup/setupViewReducer");
 const twoFactorAuthenticationReducer_1 = require("./twoFactorAuthenticationReducer");
-const resendOtpEpic = (actions$, _state$, zeniAPI) => actions$.pipe((0, operators_1.filter)(twoFactorAuthenticationReducer_1.resendOtp.match), (0, operators_1.mergeMap)((action) => {
+const resendOtpEpic = (actions$, state$, zeniAPI) => actions$.pipe((0, operators_1.filter)(twoFactorAuthenticationReducer_1.resendOtp.match), (0, operators_1.mergeMap)((action) => {
     const resendOtpActions = [];
     const { otpChallenge, twoFASource, entityId } = action.payload;
+    const chargeCard = twoFASource === 'ChargeCardHolder' && entityId != null
+        ? state$.value.chargeCardState.chargeCardByID[entityId]
+        : null;
     const payload = {
         otp_challenge: otpChallenge,
+        ...(chargeCard != null
+            ? {
+                provider_card_id: chargeCard.cardProviderID,
+                is_for_charge_cards: true,
+            }
+            : {}),
     };
     switch (twoFASource) {
         case 'SpendManagementSetup':
@@ -33,6 +42,11 @@ const resendOtpEpic = (actions$, _state$, zeniAPI) => actions$.pipe((0, operator
         case 'CardUserOnboarding':
             resendOtpActions.push((0, cardUserOnboardingReducer_1.resendOtpCardUserOnboarding)());
             break;
+        case 'ChargeCardHolder':
+            if (entityId != null) {
+                resendOtpActions.push((0, chargeCardDetailReducer_1.resendOtpCardHolder)({ chargeCardId: entityId }));
+            }
+            break;
     }
     const resendOtp$ = zeniAPI
         .putAndGetJSON(`${zeniAPI.apiEndPoints.authMicroServiceBaseUrl}/1.0/otp/resend`, payload)

package/lib/view/userListView/fetchUserListByTypeEpic.d.ts

@@ -1,12 +1,10 @@
 import { ActionsObservable, StateObservable } from 'redux-observable';
 import { updateAddresses } from '../../entity/address/addressReducer';
 import { updateAllUsers } from '../../entity/user/userReducer';
-import { updateAllUserGroups } from '../../entity/userGroups/userGroupsReducer';
 import { updateUserRoles } from '../../entity/userRole/userRoleReducer';
 import { RootState } from '../../reducer';
 import { ZeniAPI } from '../../zeniAPI';
 import { updateChargeCardCount, updateDebitCardCount } from '../spendManagement/chargeCards/issueChargeCard/issueChargeCardReducer';
-import { updateUserGroupIds } from '../userGroupListView/userGroupListViewReducer';
 import { fetchUserListByType, updateUserIds, updateUserListFetchFailure } from './userListViewReducer';
-export type ActionType = ReturnType<typeof fetchUserListByType> | ReturnType<typeof updateAllUsers> | ReturnType<typeof updateUserRoles> | ReturnType<typeof updateUserIds> | ReturnType<typeof updateChargeCardCount> | ReturnType<typeof updateDebitCardCount> | ReturnType<typeof updateAddresses> | ReturnType<typeof updateUserListFetchFailure> | ReturnType<typeof updateAllUserGroups> | ReturnType<typeof updateUserGroupIds>;
+export type ActionType = ReturnType<typeof fetchUserListByType> | ReturnType<typeof updateAllUsers> | ReturnType<typeof updateUserRoles> | ReturnType<typeof updateUserIds> | ReturnType<typeof updateChargeCardCount> | ReturnType<typeof updateDebitCardCount> | ReturnType<typeof updateAddresses> | ReturnType<typeof updateUserListFetchFailure>;
 export declare const fetchUserListByTypeEpic: (actions$: ActionsObservable<ActionType>, state$: StateObservable<RootState>, zeniAPI: ZeniAPI) => import("rxjs").Observable<ActionType>;

package/lib/view/userListView/fetchUserListByTypeEpic.js

@@ -6,11 +6,9 @@ const operators_1 = require("rxjs/operators");
 const addressReducer_1 = require("../../entity/address/addressReducer");
 const tenantSelector_1 = require("../../entity/tenant/tenantSelector");
 const userReducer_1 = require("../../entity/user/userReducer");
-const userGroupsReducer_1 = require("../../entity/userGroups/userGroupsReducer");
 const userRoleReducer_1 = require("../../entity/userRole/userRoleReducer");
 const responsePayload_1 = require("../../responsePayload");
 const issueChargeCardReducer_1 = require("../spendManagement/chargeCards/issueChargeCard/issueChargeCardReducer");
-const userGroupListViewReducer_1 = require("../userGroupListView/userGroupListViewReducer");
 const userListViewReducer_1 = require("./userListViewReducer");
 const fetchUserListByTypeEpic = (actions$, state$, zeniAPI) => actions$.pipe((0, operators_1.filter)(userListViewReducer_1.fetchUserListByType.match), (0, operators_1.mergeMap)((action) => {
     const { userType, cacheOverride } = action.payload;
@@ -34,15 +32,6 @@ const fetchUserListByTypeEpic = (actions$, state$, zeniAPI) => actions$.pipe((0,
                         usersPayload: response.data?.users ?? [],
                     }),
                 ];
-                if (response.data?.user_groups != null) {
-                    userListAction.push((0, userGroupsReducer_1.updateAllUserGroups)({ userGroups: response.data.user_groups }));
-                    if (userType === 'taskManagerCandidate') {
-                        userListAction.push((0, userGroupListViewReducer_1.updateUserGroupIds)({
-                            userGroupType: userType,
-                            userGroupsPayload: response.data.user_groups,
-                        }));
-                    }
-                }
                 if (userType === 'cardHolderCandidate') {
                     userListAction.push((0, issueChargeCardReducer_1.updateChargeCardCount)(response.data?.cards_count_by_user_id ?? []));
                     userListAction.push((0, issueChargeCardReducer_1.updateDebitCardCount)(response.data?.debit_cards_count_by_deposit_account_id ?? {}));

package/lib/view/userListView/userListViewPayload.d.ts

@@ -1,7 +1,6 @@
 import { ID } from '../../commonStateTypes/common';
 import { AddressPayload } from '../../entity/address/addressPayload';
 import { UserPayload } from '../../entity/user/userPayload';
-import { UserGroupPayload } from '../../entity/userGroups/userGroupsPayload';
 import { UserRolePayload } from '../../entity/userRole/userRolePayload';
 import { ZeniAPIResponse } from '../../responsePayload';
 interface UserListResponsePayload {
@@ -10,7 +9,6 @@ interface UserListResponsePayload {
     addresses?: AddressPayload[];
     cards_count_by_user_id?: ActiveChargeCardCountPayload[];
     debit_cards_count_by_deposit_account_id?: Record<ID, ActiveDebitCardCountByUserIdPayload>;
-    user_groups?: UserGroupPayload[];
 }
 export interface ActiveChargeCardCountPayload {
     business_physical_credit_card_count: number;

package/lib/zeniAPI.js

@@ -82,6 +82,8 @@ class ZeniAPIClient {
         return (0, rxjs_1.from)(promise);
     }
     postFormData(restEndPoint, formData, signal) {
+        // Use apiHeaders for auth headers, then remove Content-Type
+        // so the browser sets multipart/form-data with the correct boundary
         // eslint-disable-next-line @typescript-eslint/no-unused-vars
         const { 'Content-Type': _contentType, ...headers } = this.apiHeaders();
         const promise = (0, cross_fetch_1.fetch)(restEndPoint, {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zeniai/client-epic-state",
-  "version": "4.19.99-betaVR3",
+  "version": "4.19.100",
   "description": "Shared module between Web & Mobile containing required abstractions for state management, async network communication. ",
   "main": "lib/index.js",
   "module": "lib/esm/index.js",
@@ -105,7 +105,7 @@
   },
   "scripts": {
     "clean": "rimraf lib",
-    "test:typecheck": "echo 'Typechecking test files...' && NODE_OPTIONS=--max-old-space-size=4096 time tsc -p tsconfig.typecheck.json",
+    "test:typecheck": "echo 'Typechecking test files...' && time tsc -p tsconfig.typecheck.json",
     "test": "pnpm test:typecheck && vitest run --typecheck",
     "lint": "eslint . --ext .js,.jsx,.ts,.tsx --fix",
     "find-dead-code": "ts-prune | grep -v '(used in module)'",

package/lib/entity/userGroups/userGroupsPayload.d.ts

@@ -1,7 +0,0 @@
-import { UserGroup } from './userGroupsState';
-export interface UserGroupPayload {
-    id: string;
-    name: string;
-    user_ids?: string[] | null;
-}
-export declare function mapUserGroupPayloadToUserGroup(payload: UserGroupPayload): UserGroup;

package/lib/entity/userGroups/userGroupsPayload.js

@@ -1,10 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.mapUserGroupPayloadToUserGroup = mapUserGroupPayloadToUserGroup;
-function mapUserGroupPayloadToUserGroup(payload) {
-    return {
-        userGroupId: payload.id,
-        name: payload.name,
-        userIds: payload.user_ids ?? [],
-    };
-}