@zeniai/client-epic-state 4.20.3-betaSS12 → 4.20.3-betaSS14

package/lib/esm/view/spendManagement/autotransferRules/autoTransferRulesSelector.js

@@ -0,0 +1,52 @@
+import recordGet from 'lodash/get';
+import { reduceAllFetchState } from '../../../commonStateTypes/reduceFetchState';
+import { getAllFundingAccounts, } from '../commonSetup/setupViewSelector';
+import { getAllDepositAccounts } from '../zeniAccounts/depositAccountList/depositAccountListSelector';
+import { getAllPaymentAccounts } from '../zeniAccounts/paymentAccountList/paymentAccountListSelector';
+export const getAutoTransferRules = (state) => {
+    const { autotransferRulesState, depositAccountState, paymentAccountState, depositAccountListState, paymentAccountListState, treasuryDetailState, } = state;
+    const { rules, error, historyByRuleId, ruleUpdateLocalData, ruleUpdateStatusById, ruleDeleteStatusById, createRuleFetchState, autoTransferReviewDetail, } = autotransferRulesState;
+    const depositAccountsView = getAllDepositAccounts(depositAccountState, depositAccountListState);
+    const paymentAccountsView = getAllPaymentAccounts(paymentAccountState, paymentAccountListState);
+    let transferMoneyParties = [];
+    const transferMoneyPartiesFetchState = reduceAllFetchState([
+        depositAccountsView,
+        paymentAccountsView,
+    ]).fetchState;
+    const fetchState = reduceAllFetchState([
+        autotransferRulesState,
+        depositAccountsView,
+        paymentAccountsView,
+    ]).fetchState;
+    if (depositAccountsView.fetchState === 'Completed' &&
+        paymentAccountsView.fetchState === 'Completed') {
+        transferMoneyParties = getAllFundingAccounts(depositAccountsView.depositAccounts, paymentAccountsView.paymentAccounts, paymentAccountListState.paymentAccountBalanceFetchStatus);
+    }
+    const treasuryAccount = {
+        accType: 'treasuryAccount',
+        label: 'Treasury',
+        id: 'treasury',
+        balance: treasuryDetailState.accountSummary?.availableBalance,
+    };
+    return {
+        autoTransferReviewDetail,
+        rules,
+        ruleUpdateLocalData,
+        ruleUpdateStatusById,
+        ruleDeleteStatusById,
+        ruleHistory: historyByRuleId,
+        treasuryAccount,
+        transferMoneyParties,
+        transferMoneyPartiesFetchState,
+        createRuleFetchState,
+        fetchState,
+        error,
+        version: 0,
+    };
+};
+export const getAutoTransferRuleById = (state, ruleId) => {
+    return state.autotransferRulesState.rules.find((rule) => rule.autoTransferRuleId === ruleId);
+};
+export const getAutoTransferRuleHistory = (state, ruleId) => {
+    return recordGet(state.autotransferRulesState.historyByRuleId, ruleId, undefined);
+};

package/lib/esm/view/spendManagement/autotransferRules/autoTransferRulesState.js

@@ -0,0 +1 @@
+export {};

package/lib/esm/view/spendManagement/autotransferRules/epics/createAutoTransferRuleEpic.js

@@ -0,0 +1,100 @@
+import { from, of } from 'rxjs';
+import { catchError, filter, mergeMap, switchMap } from 'rxjs/operators';
+import { openSnackbar } from '../../../../entity/snackbar/snackbarReducer';
+import { createZeniAPIStatus, isSuccessResponse, } from '../../../../responsePayload';
+import { mapPayloadToAutoTransferRule, } from '../autoTransferRulesPayload';
+import { createAutoTransferRule, createAutoTransferRuleFailure, createAutoTransferRuleSuccess, } from '../autoTransferRulesReducer';
+export const createAutoTransferRuleEpic = (actions$, state$, zeniAPI) => actions$.pipe(filter(createAutoTransferRule.match), switchMap(() => {
+    const requestBody = mapAutoTransferRuleLocalDataToPayload(state$.value.autotransferRulesState.ruleUpdateLocalData);
+    return zeniAPI
+        .postAndGetJSON(`${zeniAPI.apiEndPoints.bankingMicroServiceBaseUrl}/1.0/rules/transfer/auto`, requestBody)
+        .pipe(mergeMap((response) => {
+        if (isSuccessResponse(response) && response.data != null) {
+            const rule = mapPayloadToAutoTransferRule(response.data.auto_transfer_rule);
+            const actions = [
+                createAutoTransferRuleSuccess({ rule }),
+                openSnackbar({
+                    messageSection: 'auto_transfer_rule_create',
+                    messageText: 'success',
+                    type: 'success',
+                }),
+            ];
+            return from(actions);
+        }
+        else {
+            return from([
+                createAutoTransferRuleFailure({
+                    fetchState: 'Error',
+                    error: response.status,
+                }),
+                openSnackbar({
+                    messageSection: 'auto_transfer_rule_create',
+                    messageText: 'failed',
+                    type: 'error',
+                    variables: [
+                        {
+                            variableName: '_api-error_',
+                            variableValue: response.status.message,
+                        },
+                    ],
+                }),
+            ]);
+        }
+    }), catchError((error) => of(createAutoTransferRuleFailure({
+        fetchState: 'Error',
+        error: createZeniAPIStatus('Unexpected Error', 'Create auto transfer rule REST API call errored out ' +
+            JSON.stringify(error)),
+    }))));
+}));
+export function mapAutoTransferRuleLocalDataToPayload(localData, pauseRule, resumeRule) {
+    if (pauseRule === true) {
+        return {
+            is_active: false,
+        };
+    }
+    if (resumeRule === true) {
+        return {
+            is_active: true,
+        };
+    }
+    const payload = {
+        ...(localData.amount != null &&
+            localData.ruleType !== 'percentage_of_balance' && {
+            amount: localData.amount.amount,
+            currency_code: localData.amount.currencyCode,
+        }),
+        ...(localData.destinationAccount != null && {
+            destination_bank_account_id: localData.destinationAccount.id,
+            destination_bank_account_type: accountTypeSubConfigCodeToAccType(localData.destinationAccount.accType),
+        }),
+        ...(localData.destinationAccountWithPercentAllocation != null && {
+            destination_bank_account_metadata: localData.destinationAccountWithPercentAllocation.map((allocation) => ({
+                account_id: allocation.account.id,
+                account_type: accountTypeSubConfigCodeToAccType(allocation.account.accType),
+                percentage: allocation.percentage,
+            })),
+        }),
+        frequency: localData.frequency,
+        rule_type: localData.ruleType,
+        ...(localData.sourceAccount != null && {
+            source_bank_account_id: localData.sourceAccount.id,
+            source_bank_account_type: accountTypeSubConfigCodeToAccType(localData.sourceAccount.accType),
+        }),
+        ...(localData.firstTransferDate != null && {
+            first_transfer_date: localData.firstTransferDate.format('YYYY-MM-DD'),
+        }),
+    };
+    return payload;
+}
+export const accountTypeSubConfigCodeToAccType = (code) => {
+    switch (code) {
+        case 'depositAccount':
+            return 'deposit_account';
+        case 'paymentAccount':
+            return 'payment_account';
+        case 'treasuryAccount':
+            return 'treasury_account';
+        default:
+            return undefined;
+    }
+};

package/lib/esm/view/spendManagement/autotransferRules/epics/deleteAutoTransferRuleEpic.js

@@ -0,0 +1,48 @@
+import { from, of } from 'rxjs';
+import { catchError, filter, mergeMap, switchMap } from 'rxjs/operators';
+import { openSnackbar } from '../../../../entity/snackbar/snackbarReducer';
+import { createZeniAPIStatus, isSuccessResponse, } from '../../../../responsePayload';
+import { deleteAutoTransferRule, deleteAutoTransferRuleFailure, deleteAutoTransferRuleSuccess, } from '../autoTransferRulesReducer';
+export const deleteAutoTransferRuleEpic = (actions$, _state$, zeniAPI) => actions$.pipe(filter(deleteAutoTransferRule.match), switchMap((action) => {
+    const { ruleId } = action.payload;
+    return zeniAPI
+        .deleteAndGetJSON(`${zeniAPI.apiEndPoints.bankingMicroServiceBaseUrl}/1.0/rules/transfer/auto/${ruleId}`)
+        .pipe(mergeMap((response) => {
+        if (isSuccessResponse(response)) {
+            const actions = [
+                deleteAutoTransferRuleSuccess({ ruleId }),
+                openSnackbar({
+                    messageSection: 'auto_transfer_rule_delete',
+                    messageText: 'success',
+                    type: 'success',
+                }),
+            ];
+            return from(actions);
+        }
+        else {
+            return from([
+                deleteAutoTransferRuleFailure({
+                    ruleId,
+                    fetchState: 'Error',
+                    error: response.status,
+                }),
+                openSnackbar({
+                    messageSection: 'auto_transfer_rule_delete',
+                    messageText: 'failed',
+                    type: 'error',
+                    variables: [
+                        {
+                            variableName: '_api-error_',
+                            variableValue: response.status.message,
+                        },
+                    ],
+                }),
+            ]);
+        }
+    }), catchError((error) => of(deleteAutoTransferRuleFailure({
+        ruleId,
+        fetchState: 'Error',
+        error: createZeniAPIStatus('Unexpected Error', 'Delete auto transfer rule REST API call errored out ' +
+            JSON.stringify(error)),
+    }))));
+}));

package/lib/esm/view/spendManagement/autotransferRules/epics/fetchAutoTransferReviewDetailEpic.js

@@ -0,0 +1,36 @@
+import { of } from 'rxjs';
+import { catchError, filter, mergeMap, switchMap } from 'rxjs/operators';
+import { createZeniAPIStatus, isSuccessResponse, } from '../../../../responsePayload';
+import { fetchAutoTransferReviewDetail, updateAutoTransferReviewDetail, updateAutoTransferReviewDetailFailure, } from '../autoTransferRulesReducer';
+import { accountTypeSubConfigCodeToAccType } from './createAutoTransferRuleEpic';
+export const fetchAutoTransferReviewDetailEpic = (actions$, state$, zeniAPI) => actions$.pipe(filter(fetchAutoTransferReviewDetail.match), switchMap(() => {
+    const localData = state$.value.autotransferRulesState.ruleUpdateLocalData;
+    const payload = {
+        ...(localData.sourceAccount != null && {
+            from_account: {
+                account_id: localData.sourceAccount.id,
+                account_type: accountTypeSubConfigCodeToAccType(localData.sourceAccount.accType) ?? '',
+            },
+        }),
+        ...(localData.destinationAccount != null && {
+            to_account: {
+                account_id: localData.destinationAccount.id,
+                account_type: accountTypeSubConfigCodeToAccType(localData.destinationAccount.accType) ?? '',
+            },
+        }),
+        ...(localData.amount != null && {
+            amount: localData.amount.amount,
+            currency_code: localData.amount.currencyCode,
+            currency_symbol: localData.amount.currencySymbol,
+        }),
+    };
+    return zeniAPI
+        .postAndGetJSON(`${zeniAPI.apiEndPoints.bankingMicroServiceBaseUrl}/1.0/deposit-accounts/transfers/review`, payload)
+        .pipe(mergeMap((response) => {
+        if (isSuccessResponse(response) && response.data != null) {
+            return of(updateAutoTransferReviewDetail(response.data));
+        }
+        return of(updateAutoTransferReviewDetailFailure(response.status));
+    }), catchError((error) => of(updateAutoTransferReviewDetailFailure(createZeniAPIStatus('Unexpected Error', 'Fetch auto transfer review detail REST API call errored out ' +
+        JSON.stringify(error))))));
+}));

package/lib/esm/view/spendManagement/autotransferRules/epics/fetchAutoTransferRuleHistory.js

@@ -0,0 +1,45 @@
+import recordGet from 'lodash/get';
+import { concat, from, of } from 'rxjs';
+import { catchError, filter, mergeMap } from 'rxjs/operators';
+import { createZeniAPIStatus, isSuccessResponse, } from '../../../../responsePayload';
+import { fetchAutoTransferRuleHistory, updateAutoTransferRuleHistory, updateAutoTransferRuleHistoryFetchStatus, } from '../autoTransferRulesReducer';
+export const fetchAutoTransferRuleHistoryEpic = (actions$, state$, zeniAPI) => actions$.pipe(filter(fetchAutoTransferRuleHistory.match), mergeMap((action) => {
+    const { ruleId, cacheOverride } = action.payload;
+    const historyActions = [];
+    const state = state$.value;
+    const historyDetail = recordGet(state.autotransferRulesState.historyByRuleId, ruleId, undefined);
+    if (cacheOverride === true ||
+        historyDetail == null ||
+        historyDetail.fetchState !== 'In-Progress') {
+        historyActions.push(updateAutoTransferRuleHistoryFetchStatus({
+            ruleId,
+            fetchState: 'In-Progress',
+        }));
+        const getHistoryDetail$ = zeniAPI
+            .getJSON(`${zeniAPI.apiEndPoints.bankingMicroServiceBaseUrl}/1.0/rules/transfer/auto/${ruleId}/history`)
+            .pipe(mergeMap((response) => {
+            if (isSuccessResponse(response) && response.data != null) {
+                return of(updateAutoTransferRuleHistory({
+                    ruleId,
+                    historicEventsPayload: response.data.activities,
+                }));
+            }
+            else {
+                return of(updateAutoTransferRuleHistoryFetchStatus({
+                    ruleId,
+                    fetchState: 'Error',
+                    error: response.status,
+                }));
+            }
+        }), catchError((error) => of(updateAutoTransferRuleHistoryFetchStatus({
+            ruleId,
+            fetchState: 'Error',
+            error: createZeniAPIStatus('Unexpected Error', 'Fetch auto transfer rule history REST API call errored out ' +
+                JSON.stringify(error)),
+        }))));
+        return concat(from(historyActions), getHistoryDetail$);
+    }
+    else {
+        return from(historyActions);
+    }
+}));

package/lib/esm/view/spendManagement/autotransferRules/epics/fetchAutoTransferRulesEpic.js

@@ -0,0 +1,50 @@
+import { from, of } from 'rxjs';
+import { catchError, filter, mergeMap, switchMap } from 'rxjs/operators';
+import { createZeniAPIStatus, isSuccessResponse, } from '../../../../responsePayload';
+import { fetchTreasuryOverviewDetail } from '../../treasury/treasuryList/treasuryDetailReducer';
+import { fetchDepositAccountList } from '../../zeniAccounts/depositAccountList/depositAccountListReducer';
+import { fetchPaymentAccountList } from '../../zeniAccounts/paymentAccountList/paymentAccountListReducer';
+import { mapPayloadToAutoTransferRule, } from '../autoTransferRulesPayload';
+import { fetchAutoTransferRules, updateAutoTransferRules, updateAutoTransferRulesFailure, } from '../autoTransferRulesReducer';
+export const fetchAutoTransferRulesEpic = (actions$, state$, zeniAPI) => actions$.pipe(filter(fetchAutoTransferRules.match), switchMap((action) => {
+    const state = state$.value;
+    const { cacheOverride } = action.payload;
+    const { autotransferRulesState, depositAccountListState, paymentAccountListState, } = state;
+    if (cacheOverride === true ||
+        (autotransferRulesState.hasValidState() === false &&
+            autotransferRulesState.fetchState !== 'In-Progress')) {
+        return zeniAPI
+            .getJSON(`${zeniAPI.apiEndPoints.bankingMicroServiceBaseUrl}/1.0/rules/transfer/auto/list`)
+            .pipe(mergeMap((response) => {
+            if (isSuccessResponse(response) && response.data != null) {
+                const rules = response.data.auto_transfer_rules.map(mapPayloadToAutoTransferRule);
+                const actions = [
+                    updateAutoTransferRules({ rules }),
+                ];
+                if (depositAccountListState.fetchState !== 'In-Progress' &&
+                    depositAccountListState.fetchState !== 'Completed') {
+                    actions.push(fetchDepositAccountList());
+                }
+                if (paymentAccountListState.fetchState !== 'In-Progress' &&
+                    paymentAccountListState.fetchState !== 'Completed') {
+                    actions.push(fetchPaymentAccountList());
+                }
+                actions.push(fetchTreasuryOverviewDetail(false, true));
+                return from(actions);
+            }
+            else {
+                return of(updateAutoTransferRulesFailure({
+                    fetchState: 'Error',
+                    error: response.status,
+                }));
+            }
+        }), catchError((error) => of(updateAutoTransferRulesFailure({
+            fetchState: 'Error',
+            error: createZeniAPIStatus('Unexpected Error', 'Fetch auto transfer rules REST API call errored out ' +
+                JSON.stringify(error)),
+        }))));
+    }
+    else {
+        return from([]);
+    }
+}));

package/lib/esm/view/spendManagement/autotransferRules/epics/updateAutoTransferRuleEpic.js

@@ -0,0 +1,69 @@
+import { from, of } from 'rxjs';
+import { catchError, filter, mergeMap, switchMap } from 'rxjs/operators';
+import { openSnackbar } from '../../../../entity/snackbar/snackbarReducer';
+import { createZeniAPIStatus, isSuccessResponse, } from '../../../../responsePayload';
+import { mapPayloadToAutoTransferRule, } from '../autoTransferRulesPayload';
+import { updateAutoTransferRule, updateAutoTransferRuleFailure, updateAutoTransferRuleSuccess, } from '../autoTransferRulesReducer';
+import { mapAutoTransferRuleLocalDataToPayload } from './createAutoTransferRuleEpic';
+export const updateAutoTransferRuleEpic = (actions$, state$, zeniAPI) => actions$.pipe(filter(updateAutoTransferRule.match), switchMap((action) => {
+    const { ruleId, pauseRule, resumeRule } = action.payload;
+    const requestBody = mapAutoTransferRuleLocalDataToPayload(state$.value.autotransferRulesState.ruleUpdateLocalData, pauseRule, resumeRule);
+    return zeniAPI
+        .putAndGetJSON(`${zeniAPI.apiEndPoints.bankingMicroServiceBaseUrl}/1.0/rules/transfer/auto/${ruleId}`, requestBody)
+        .pipe(mergeMap((response) => {
+        if (isSuccessResponse(response) && response.data != null) {
+            const rule = mapPayloadToAutoTransferRule(response.data.auto_transfer_rule);
+            const isPauseOrResumeOnly = Object.keys(requestBody).length === 1 &&
+                'is_active' in requestBody;
+            const messageSection = isPauseOrResumeOnly
+                ? requestBody.is_active === false
+                    ? 'auto_transfer_rule_pause'
+                    : 'auto_transfer_rule_resume'
+                : 'auto_transfer_rule_update';
+            const actions = [
+                updateAutoTransferRuleSuccess({ rule }),
+                openSnackbar({
+                    messageSection,
+                    messageText: 'success',
+                    type: 'success',
+                    variables: [
+                        {
+                            variableName: '__ruleName__',
+                            variableValue: rule.ruleType === 'minimum_balance'
+                                ? 'Maintain a Minimum Balance'
+                                : rule.ruleType === 'recurring'
+                                    ? 'Make a Recurring Transfer'
+                                    : 'Distribute Balance by Percentage',
+                        },
+                    ],
+                }),
+            ];
+            return from(actions);
+        }
+        else {
+            return from([
+                updateAutoTransferRuleFailure({
+                    ruleId,
+                    fetchState: 'Error',
+                    error: response.status,
+                }),
+                openSnackbar({
+                    messageSection: 'auto_transfer_rule_update',
+                    messageText: 'failed',
+                    type: 'error',
+                    variables: [
+                        {
+                            variableName: '_api-error_',
+                            variableValue: response.status.message,
+                        },
+                    ],
+                }),
+            ]);
+        }
+    }), catchError((error) => of(updateAutoTransferRuleFailure({
+        ruleId,
+        fetchState: 'Error',
+        error: createZeniAPIStatus('Unexpected Error', 'Update auto transfer rule REST API call errored out ' +
+            JSON.stringify(error)),
+    }))));
+}));

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

@@ -53,7 +53,7 @@ export const fetchBillDetailEpic = (actions$, state$, zeniAPI) => actions$.pipe(
                 response.data?.transaction?.transaction_id != null) {
                 // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
                 const transcationId = response.data.transaction.transaction_id;
-                const vendorInResponse = response.data?.vendors[0];
+                const vendorInResponse = response.data?.vendors?.[0];
                 const flattenedContacts = vendorInResponse?.contacts ?? [];
                 const flattenedAddresses = getFlattenedAddress(response.data?.vendors ?? []);
                 const flattenedBankAccounts = vendorInResponse?.bank_accounts ?? [];
@@ -85,7 +85,7 @@ export const fetchBillDetailEpic = (actions$, state$, zeniAPI) => actions$.pipe(
                         ...response.data.bank_accounts,
                     ]),
                     updatePaymentInstruments(flattenedPaymentInstruments),
-                    updateVendors(response.data.vendors),
+                    updateVendors(response.data.vendors ?? []),
                     // end: save all vendor related entities
                 ];
                 if (vendorInResponse == null &&
@@ -94,15 +94,15 @@ export const fetchBillDetailEpic = (actions$, state$, zeniAPI) => actions$.pipe(
                     fetchActions.push(fetchVendorsList({
                         searchString: response.data?.transaction.candidate_vendor_name,
                     }));
-                    fetchActions.push(waitForVendorByNameThenUpdateBillDetail(billId, response.data, response.data.vendors[0]?.vendor_id));
+                    fetchActions.push(waitForVendorByNameThenUpdateBillDetail(billId, response.data, undefined));
                 }
                 else {
                     fetchActions.push(updateBillDetail({ billId, billDetail: response.data }));
-                    fetchActions.push(updateBillDetailFetchState(transcationId, 'Completed', undefined, response.data.vendors[0]?.vendor_id));
+                    fetchActions.push(updateBillDetailFetchState(transcationId, 'Completed', undefined, vendorInResponse?.vendor_id));
                     const transactionInResponse = response.data?.transaction;
                     if (transactionInResponse != null &&
                         transactionInResponse.total_amount != null &&
-                        Boolean(vendorInResponse) === true) {
+                        vendorInResponse != null) {
                         fetchActions.push(fetchDuplicateBill(vendorInResponse.vendor_name, vendorInResponse.vendor_id, transactionInResponse.total_amount, transactionInResponse.recipient_total_amount, transactionInResponse.document_id, billId));
                     }
                     const billHasPaymentError = [

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

@@ -416,6 +416,14 @@ export const getBillListOnSort = (sortKey, sortOrder, currentTab, transactions)
                     transactionsWithNoSortKeyValue.push(transaction);
                 }
                 break;
+            case 'invoiceNumber':
+                if (transaction.documentId != null) {
+                    transactionsWithSortKeyValue.push(transaction);
+                }
+                else {
+                    transactionsWithNoSortKeyValue.push(transaction);
+                }
+                break;
             case 'dueDate':
                 if (currentTab === 'draft') {
                     if (Boolean(transaction.dueDate) === true) {
@@ -518,6 +526,8 @@ export const getBillListOnSort = (sortKey, sortOrder, currentTab, transactions)
                 return transaction.totalAmountInUSD?.amount ?? 0;
             case 'paymentMethod':
                 return transaction.billPayInfo.billPaymentMethodType.name;
+            case 'invoiceNumber':
+                return transaction.documentId;
         }
     }, getColumnWiseSortOrder(sortOrder));
     return [

package/lib/esm/view/spendManagement/billPay/billList/billListState.js

@@ -43,6 +43,7 @@ const ALL_BILL_PAY_SORT_KEYS = [
     'invoiceDate',
     'name',
     'paymentMethod',
+    'invoiceNumber',
 ];
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
 const toBillPaySortKeyType = (v) => stringToUnion(v, ALL_BILL_PAY_SORT_KEYS);

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

@@ -2,6 +2,7 @@ import recordGet from 'lodash/get';
 import { reduceFetchState } from '../../../../commonStateTypes/reduceFetchState';
 import { getContactsByIds } from '../../../../entity/billPay/contact/contactSelector';
 import { getPaymentAccountsByPaymentAccountIds } from '../../../../entity/paymentAccount/paymentAccountSelector';
+import { getIsAccountingClassesEnabled } from '../../../../entity/tenant/tenantSelector';
 import { getVendorByVendorId } from '../../../../entity/vendor/vendorSelector';
 import { getAccountList } from '../../../accountList/accountListSelector';
 import { getAllFundingAccounts, } from '../../commonSetup/setupViewSelector';
@@ -73,11 +74,14 @@ export const getReviewPageBillDetail = (state, billId) => {
             }
         }
         if (sourceBillDetail != null) {
-            sourceBillDetailFetchState = reduceFetchState([
+            const fetchStateList = [
                 sourceBillDetail.fetchStatus,
                 accountListState.byReportId['billPayAccountList'],
-                classListState,
-            ]).fetchState;
+            ];
+            if (getIsAccountingClassesEnabled(state)) {
+                fetchStateList.push(classListState);
+            }
+            sourceBillDetailFetchState = reduceFetchState(fetchStateList).fetchState;
         }
     }
     else {

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

@@ -3,6 +3,7 @@ import cloneDeep from 'lodash/cloneDeep';
 import { reduceAllFetchState, reduceAnyFetchState, } from '../../../../commonStateTypes/reduceFetchState';
 import { getApprovalRulesByIds } from '../../../../entity/approvalRule/approvalRuleSelector';
 import { getClassesByIds } from '../../../../entity/class/classSelector';
+import { getIsAccountingClassesEnabled } from '../../../../entity/tenant/tenantSelector';
 import { getUserByUserId } from '../../../../entity/user/userSelector';
 import { getUserRoleByUserId } from '../../../../entity/userRole/userRoleSelector';
 export const getBillPaySetupApproverView = createSelector((state) => state.billPaySetupApproverViewState, (state) => state.approvalRuleState, (state) => state.userState, (billPaySetupApproverViewState, approvalRuleState, userState) => {
@@ -44,7 +45,7 @@ export const getBillPaySetupApproverView = createSelector((state) => state.billP
         newApprovalRuleId,
     };
 });
-export const getBillPaySetupApproverUpdateDataView = 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) => {
+export const getBillPaySetupApproverUpdateDataView = createSelector((state) => state.billPaySetupApproverViewState, (state) => state.approvalRuleState, (state) => state.userState, (state) => state.classState, (state) => state.classListState, (state) => state.userRoleState, (state) => getIsAccountingClassesEnabled(state), (billPaySetupApproverViewState, approvalRuleState, userState, classState, classListState, userRoleState, isAccountingClassesEnabled) => {
     const { affectedEntityIds, approvalRuleIds, approverListState, billPaySetupApproverViewUpdateData, fetchState, error, listeningToPusherEvent, } = billPaySetupApproverViewState;
     const { approverIds, attributes } = approverListState;
     const allApprovalRules = getApprovalRulesByIds(approvalRuleState, approvalRuleIds);
@@ -92,10 +93,9 @@ export const getBillPaySetupApproverUpdateDataView = createSelector((state) => s
         allAttributes,
         filteredAttributes,
         billPaySetupApproverViewUpdateData,
-        approverListFetchStatus: reduceAllFetchState([
-            approverListState.fetchStatus,
-            classListState,
-        ]),
+        approverListFetchStatus: isAccountingClassesEnabled
+            ? reduceAllFetchState([approverListState.fetchStatus, classListState])
+            : approverListState.fetchStatus,
         fetchState,
         allAccountingClasses,
         error,

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

@@ -1,22 +1,27 @@
 import { concat, from } from 'rxjs';
 import { filter, mergeMap } from 'rxjs/operators';
+import { getIsAccountingClassesEnabled } from '../../../../../entity/tenant/tenantSelector';
 import { fetchClassList } from '../../../../classList/classListReducer';
 import { fetchBillPayApproversDetails, fetchBillPayApproversList, } from '../billPaySetupApproverViewReducer';
 export const fetchBillPayApproversDetailsEpic = (actions$, state$) => actions$.pipe(filter(fetchBillPayApproversDetails.match), mergeMap((action) => {
     const { cacheOverride, includeUserRoles } = action.payload;
     const { billPaySetupApproverViewState, classListState } = state$.value;
     const { approverListState } = billPaySetupApproverViewState;
+    const isAccountingClassesEnabled = getIsAccountingClassesEnabled(state$.value);
     const actions = [];
     if (cacheOverride === true) {
         actions.push(fetchBillPayApproversList(cacheOverride, includeUserRoles));
-        actions.push(fetchClassList());
+        if (isAccountingClassesEnabled) {
+            actions.push(fetchClassList());
+        }
     }
     else {
         if (billPaySetupApproverViewState.hasValidState() === false &&
             approverListState.fetchStatus.fetchState !== 'In-Progress') {
             actions.push(fetchBillPayApproversList(true, includeUserRoles));
         }
-        if (classListState.hasValidState() === false &&
+        if (isAccountingClassesEnabled &&
+            classListState.hasValidState() === false &&
             classListState.fetchState !== 'In-Progress') {
             actions.push(fetchClassList());
         }

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

@@ -7,6 +7,7 @@ import { getCompanyByCompanyId } from '../../../../entity/company/companySelecto
 import { getDepositAccountByDepositAccountId } from '../../../../entity/depositAccount/depositAccountSelector';
 import { getPaymentAccountByPaymentAccountId, getPaymentAccountsByPaymentAccountIds, } from '../../../../entity/paymentAccount/paymentAccountSelector';
 import { getPaymentInstrumentById, getPaymentInstrumentsByIds, } from '../../../../entity/paymentInstrument/paymentInstrumentSelector';
+import { getIsAccountingClassesEnabled } from '../../../../entity/tenant/tenantSelector';
 import { getUserByUserId } from '../../../../entity/user/userSelector';
 import { getVendorByQboId, getVendorByVendorId, } from '../../../../entity/vendor/vendorSelector';
 import { dateNow } from '../../../../zeniDayJS';
@@ -172,12 +173,15 @@ export const getEditBillDetail = (state, isVendorRecommendationFeatureEnabled, i
             isCancelled = sourceBillDetail.billDetailLocalData.isCancelled;
             billStage = billPayInfo?.stage.code ?? 'draft';
             if (billViewState != null) {
-                fetchState = reduceFetchState([
+                const fetchStateList = [
                     sourceBillDetail.fetchStatus,
                     accountListState.byReportId.billPayAccountList,
-                    classListState,
                     billPaySetupApproverViewState,
-                ]).fetchState;
+                ];
+                if (getIsAccountingClassesEnabled(state)) {
+                    fetchStateList.push(classListState);
+                }
+                fetchState = reduceFetchState(fetchStateList).fetchState;
                 deleteStatus = billViewState.deleteStatus;
                 billActivities = getBillActivities(state, billId, billPayInfo?.stage.code);
             }
@@ -191,11 +195,14 @@ export const getEditBillDetail = (state, isVendorRecommendationFeatureEnabled, i
         }
     }
     else {
-        fetchState = reduceFetchState([
+        const newBillFetchStateList = [
             accountListState.byReportId.billPayAccountList,
-            classListState,
             billPaySetupApproverViewState,
-        ]).fetchState;
+        ];
+        if (getIsAccountingClassesEnabled(state)) {
+            newBillFetchStateList.push(classListState);
+        }
+        fetchState = reduceFetchState(newBillFetchStateList).fetchState;
     }
     if (sourceBillDetail != null && fetchState == 'Completed') {
         const updatedRecord = sourceBillDetail.billDetailLocalData;

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

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

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

@@ -219,6 +219,8 @@ 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':