@zeniai/client-epic-state 4.11.96 → 4.11.97

package/lib/view/financeStatement/financeStatementEpic.d.ts

@@ -8,24 +8,18 @@ import { fetchCashFlow } from '../cashFlow/cashFlowReducer';
 export declare type ActionType = ReturnType<typeof fetchFinanceStatement> | ReturnType<typeof fetchAllTenants> | ReturnType<typeof fetchProfitAndLoss> | ReturnType<typeof fetchBalanceSheet> | ReturnType<typeof fetchCashFlow>;
 export declare const fetchFinanceStatementEpic: (actions$: ActionsObservable<ActionType>, state$: StateObservable<RootState>) => import("rxjs").Observable<{
     payload: {
-        userId: string;
-        zeniSessionId: string | undefined;
-    };
-    type: string;
-} | {
-    payload: {
-        forecastId: string | undefined;
-        cacheOverride: boolean;
+        timeframe: "month" | "year" | "quarter";
+        fetchFullReport: boolean;
     };
     type: string;
 } | {
     payload: {
-        cacheOverride: boolean;
+        userId: string;
+        zeniSessionId: string | undefined;
     };
     type: string;
 } | {
     payload: {
-        fetchFullReport: boolean;
         cacheOverride: boolean;
     };
     type: string;

package/lib/view/financeStatement/financeStatementEpic.js

@@ -12,31 +12,62 @@ const cashFlowSelector_1 = require("../cashFlow/cashFlowSelector");
 const cashFlowReducer_1 = require("../cashFlow/cashFlowReducer");
 const balanceSheetSelector_1 = require("../balanceSheet/balanceSheetSelector");
 const fetchFinanceStatementEpic = (actions$, state$) => actions$.pipe((0, operators_1.filter)(financeStatementReducer_1.fetchFinanceStatement.match), (0, operators_1.switchMap)((action) => {
-    const { userId, fetchFullReport, cacheOverride } = action.payload;
+    const { userId, fetchSelectedTab, fetchFullReport, cacheOverride } = action.payload;
+    const state = state$.value;
     if (cacheOverride === true) {
         return (0, rxjs_1.of)((0, tenantReducer_1.fetchAllTenants)(userId), (0, profitAndLossReducer_1.fetchProfitAndLoss)(), (0, balanceSheetReducer_1.fetchBalanceSheet)(), (0, cashFlowReducer_1.fetchCashFlow)());
     }
     else {
-        const state = state$.value;
+        const { tenantState, financeStatementState } = state;
         const fetchActions = [];
-        if (state.tenantState.fetchState !== 'In-Progress' &&
-            !state.tenantState.hasValidState()) {
+        if (tenantState.fetchState !== 'In-Progress' &&
+            !tenantState.hasValidState()) {
             fetchActions.push((0, tenantReducer_1.fetchAllTenants)(userId));
         }
-        const pandLFetchState = (0, profitAndLossSelector_1.getPandLReportFetchState)(undefined, state.profitAndLossState).fetchState;
-        if (pandLFetchState !== 'In-Progress' &&
-            pandLFetchState !== 'Completed') {
-            fetchActions.push((0, profitAndLossReducer_1.fetchProfitAndLoss)());
+        const pandLFetchState = (0, profitAndLossSelector_1.getPandLReportFetchState)(undefined, state.profitAndLossState);
+        const balanceSheetFetchState = (0, balanceSheetSelector_1.getBalanceSheetFetchState)(state.balanceSheetState);
+        const cashFlowFetchState = (0, cashFlowSelector_1.getCashFlowReportFetchState)(state.cashFlowState);
+        if (fetchSelectedTab) {
+            switch (financeStatementState.selectedReportId) {
+                case 'profit_and_loss':
+                case 'profit_and_loss_by_classes':
+                    if (pandLFetchState.fetchStateByTimeframe[financeStatementState.timeframe].fetchState !== 'In-Progress' &&
+                        pandLFetchState.fetchStateByTimeframe[financeStatementState.timeframe].fetchState !== 'Completed') {
+                        fetchActions.push((0, profitAndLossReducer_1.fetchProfitAndLossForTimeframe)(financeStatementState.timeframe));
+                    }
+                    break;
+                case 'balance_sheet':
+                    if (balanceSheetFetchState.fetchStateByTimeframe[financeStatementState.timeframe].fetchState !== 'In-Progress' &&
+                        balanceSheetFetchState.fetchStateByTimeframe[financeStatementState.timeframe].fetchState !== 'Completed') {
+                        fetchActions.push((0, balanceSheetReducer_1.fetchBalanceSheetForTimeframe)(financeStatementState.timeframe));
+                    }
+                    break;
+                case 'cash_flow':
+                    if (cashFlowFetchState.fetchStateByTimeframe[financeStatementState.timeframe].fetchState !== 'In-Progress' &&
+                        cashFlowFetchState.fetchStateByTimeframe[financeStatementState.timeframe].fetchState !== 'Completed') {
+                        fetchActions.push((0, cashFlowReducer_1.fetchCashFlowForTimeframe)(financeStatementState.timeframe, fetchFullReport));
+                    }
+                    break;
+                default:
+                    break;
+            }
         }
-        const balanceSheetFetchState = (0, balanceSheetSelector_1.getBalanceSheetFetchState)(state.balanceSheetState).fetchState;
-        if (balanceSheetFetchState !== 'In-Progress' &&
-            balanceSheetFetchState !== 'Completed') {
-            fetchActions.push((0, balanceSheetReducer_1.fetchBalanceSheet)(fetchFullReport));
-        }
-        const cashFlowFetchState = (0, cashFlowSelector_1.getCashFlowReportFetchState)(state.cashFlowState).fetchState;
-        if (cashFlowFetchState !== 'In-Progress' &&
-            cashFlowFetchState !== 'Completed') {
-            fetchActions.push((0, cashFlowReducer_1.fetchCashFlow)(fetchFullReport));
+        else {
+            if (pandLFetchState.reducedAllFetchState.fetchState !== 'In-Progress' &&
+                pandLFetchState.reducedAllFetchState.fetchState !== 'Completed') {
+                fetchActions.push((0, profitAndLossReducer_1.fetchProfitAndLoss)());
+            }
+            if (balanceSheetFetchState.reducedAllFetchState.fetchState !==
+                'In-Progress' &&
+                balanceSheetFetchState.reducedAllFetchState.fetchState !==
+                    'Completed') {
+                fetchActions.push((0, balanceSheetReducer_1.fetchBalanceSheet)(fetchFullReport));
+            }
+            if (cashFlowFetchState.reducedAllFetchState.fetchState !==
+                'In-Progress' &&
+                cashFlowFetchState.reducedAllFetchState.fetchState !== 'Completed') {
+                fetchActions.push((0, cashFlowReducer_1.fetchCashFlow)(fetchFullReport));
+            }
         }
         return (0, rxjs_1.from)(fetchActions);
     }

package/lib/view/financeStatement/financeStatementReducer.d.ts

@@ -7,8 +7,9 @@ import { COABalanceType } from '../../commonStateTypes/coaBalance/coaBalanceType
 import { FinanceStatementState } from './financeStatementState';
 import { Month } from '../../commonStateTypes/timePeriod';
 export declare const initialFinanceStatementState: FinanceStatementState;
-export declare const fetchFinanceStatement: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[userId: string, fetchFullReport?: boolean | undefined, cacheOverride?: boolean | undefined], {
+export declare const fetchFinanceStatement: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[userId: string, fetchSelectedTab?: boolean | undefined, fetchFullReport?: boolean | undefined, cacheOverride?: boolean | undefined], {
     userId: string;
+    fetchSelectedTab: boolean;
     fetchFullReport: boolean;
     cacheOverride: boolean;
 }, string, never, never>, updateFinanceStatementTimeframe: import("@reduxjs/toolkit").ActionCreatorWithPayload<"month" | "year" | "quarter", string>, updateFinanceStatementThisPeriod: import("@reduxjs/toolkit").ActionCreatorWithPayload<{

package/lib/view/financeStatement/financeStatementReducer.js

@@ -29,10 +29,13 @@ const financeStatement = (0, toolkit_1.createSlice)({
             reducer(draft) {
                 draft.lastFetchRequestTime = (0, zeniDayJS_1.dateNow)();
             },
-            prepare(userId, fetchFullReport = false, // eslint-disable-line @typescript-eslint/no-inferrable-types,
+            prepare(userId, fetchSelectedTab = true, // eslint-disable-line @typescript-eslint/no-inferrable-types,
+            fetchFullReport = false, // eslint-disable-line @typescript-eslint/no-inferrable-types,
             cacheOverride = false // eslint-disable-line @typescript-eslint/no-inferrable-types
             ) {
-                return { payload: { userId, fetchFullReport, cacheOverride } };
+                return {
+                    payload: { userId, fetchSelectedTab, fetchFullReport, cacheOverride },
+                };
             },
         },
         updateFinanceStatementTimeframe(draft, action) {

package/lib/view/financeStatement/financeStatementSelector.d.ts

@@ -1,5 +1,5 @@
 import { RootState } from '../../reducer';
-import { FetchState } from '../../commonStateTypes/common';
+import { FetchState, FetchStateAndError } from '../../commonStateTypes/common';
 import { SelectorReport, ReportID, ReportFormat } from '../../commonStateTypes/viewAndReport/viewAndReport';
 import { TimeframeTickWithMetaData } from '../../commonStateTypes/timeframeTick';
 import { COABalancesFilter, COABalancesOrder } from '../../commonStateTypes/coaBalance/coaBalancesFilter';
@@ -13,6 +13,7 @@ export interface FinanceStatementReport extends SelectorReport {
     allTimeframeTicks: TimeframeTickWithMetaData[];
     balancesInTimeframe: COABalance[];
     dataAvailable?: DataAvailable;
+    selectedReportAndTimeframeFetchState: FetchStateAndError;
     profitAndLossReport: ProfitAndLossReport;
     profitAndLossByClassReport: ProfitAndLossClassesViewReport;
     balanceSheetReport: BalanceSheetReport;

package/lib/view/financeStatement/financeStatementSelector.js

@@ -66,11 +66,35 @@ exports.getFinanceStatement = (0, toolkit_1.createSelector)((state) => state.acc
     const balanceSheetReport = (0, balanceSheetSelector_1.getBalanceSheet)(filter, accountState, accountGroupState, sectionAccountsViewState, balanceSheetState);
     const cashFlowReport = (0, cashFlowSelector_1.getCashFlow)(filter, accountState, accountGroupState, sectionAccountsViewState, cashFlowState);
     const allReports = [
-        profitAndLossReport,
-        balanceSheetReport,
-        cashFlowReport,
+        profitAndLossReport.reducedAnyFetchState,
+        balanceSheetReport.reducedAnyFetchState,
+        cashFlowReport.reducedAnyFetchState,
     ];
-    const fetchState = (0, reduceFetchState_1.reduceFetchState)(allReports);
+    const fetchState = (0, reduceFetchState_1.reduceAnyCompletedFetchState)(allReports);
+    let selectedReportAndTimeframeFetchState = fetchState;
+    switch (financeStatementState.selectedReportId) {
+        case 'profit_and_loss':
+        case 'profit_and_loss_by_classes':
+            selectedReportAndTimeframeFetchState = {
+                fetchState: profitAndLossReport.fetchState,
+                error: profitAndLossReport.error,
+            };
+            break;
+        case 'balance_sheet':
+            selectedReportAndTimeframeFetchState = {
+                fetchState: balanceSheetReport.fetchState,
+                error: balanceSheetReport.error,
+            };
+            break;
+        case 'cash_flow':
+            selectedReportAndTimeframeFetchState = {
+                fetchState: cashFlowReport.fetchState,
+                error: cashFlowReport.error,
+            };
+            break;
+        default:
+            break;
+    }
     return {
         reportId: 'finance_statement',
         reportTitle: '',
@@ -79,6 +103,7 @@ exports.getFinanceStatement = (0, toolkit_1.createSelector)((state) => state.acc
         error: fetchState.error,
         allTimeframeTicks,
         balancesInTimeframe,
+        selectedReportAndTimeframeFetchState,
         displayOrder: financeStatementState.displayOrder,
         reportFormat: financeStatementState.reportFormat,
         firstMonthOfFY,

package/lib/view/profitAndLoss/profitAndLossSelector.d.ts

@@ -7,8 +7,12 @@ import { ForecastState } from '../../entity/forecast/forecastState';
 import { SectionAccountsViewState } from '../../entity/sectionAccountsView/sectionAccountsViewState';
 import { PandLReportViewCalculatedSectionID, PandLReportViewSectionID } from '../profitAndLossClassesView/profitAndLossClassesViewSelectorTypes';
 import { ProfitAndLossUIState, ProfitAndLossWithForecastState } from './profitAndLossState';
+import { FetchStateByTimeframe } from '../../commonStateTypes/coaBalance/coaBalance';
 export interface ProfitAndLossReport extends AccountsViewSelectorReport<PandLReportViewSectionID, PandLReportViewCalculatedSectionID> {
     uiState: ProfitAndLossUIState;
+    fetchStateByTimeframe: FetchStateByTimeframe;
+    reducedAnyFetchState: FetchStateAndError;
+    reducedAllFetchState: FetchStateAndError;
 }
 /**
  * Get P&L with forecast data overlaid on actuals.
@@ -37,4 +41,8 @@ export declare const getProfitAndLossReport: (filter: COABalancesFilter, forecas
  * @param state
  */
 export declare function getProfitAndLossForFullDataAvailableRange(timeframe: 'month' | 'quarter' | 'year', forecastId: ID | undefined, accountState: AccountState, accountGroupState: AccountGroupState, sectionsState: SectionAccountsViewState, forecastState: ForecastState, state: ProfitAndLossWithForecastState): ProfitAndLossReport;
-export declare const getPandLReportFetchState: (forecastId: ID | undefined, profitAndLossState: ProfitAndLossWithForecastState) => FetchStateAndError;
+export declare const getPandLReportFetchState: (forecastId: ID | undefined, profitAndLossState: ProfitAndLossWithForecastState) => {
+    reducedAnyFetchState: FetchStateAndError;
+    reducedAllFetchState: FetchStateAndError;
+    fetchStateByTimeframe: FetchStateByTimeframe;
+};

package/lib/view/profitAndLoss/profitAndLossSelector.js

@@ -30,16 +30,16 @@ function getProfitAndLossWithForecastOnDataAvailableDateRange(filter, forecastId
 }
 exports.getProfitAndLossWithForecastOnDataAvailableDateRange = getProfitAndLossWithForecastOnDataAvailableDateRange;
 const getProfitAndLossReport = (filter, forecastId, accountState, accountGroupState, sectionsState, profitAndLossState, forecastState) => {
+    if (filter.timeframe === 'week' || filter.timeframe === 'free_range') {
+        throw Error('free_range or week period is invalid');
+    }
     const pandLState = (0, profitAndLossReducer_1.getState)(profitAndLossState, forecastId);
-    const fetchState = (0, reduceFetchState_1.reduceAnyFetchState)([
-        pandLState.fetchState.month,
-        pandLState.fetchState.quarter,
-        pandLState.fetchState.year,
-    ]);
+    const { reducedAllFetchState, reducedAnyFetchState, fetchStateByTimeframe } = (0, exports.getPandLReportFetchState)(forecastId, profitAndLossState);
     const reportId = (0, profitAndLossForTimeframeEpic_1.reportIdUniqueKey)(forecastId);
     const sections = {};
     const calculatedSections = {};
-    if (fetchState.fetchState === 'Completed') {
+    const selectedTimeframeFetchState = fetchStateByTimeframe[filter.timeframe];
+    if (selectedTimeframeFetchState.fetchState === 'Completed') {
         profitAndLossClassesViewSelectorTypes_1.ALL_PANDL_REPORT_VIEW_SECTION_IDS.forEach((sectionId) => {
             sections[`${sectionId}`] = (0, sectionAccountsViewSelector_1.getSectionAccountsViewReport)(accountState, accountGroupState, sectionsState, {
                 reportId,
@@ -67,8 +67,11 @@ const getProfitAndLossReport = (filter, forecastId, accountState, accountGroupSt
         bookCloseDate: pandLState.bookCloseDate,
         version: pandLState.version,
         status: pandLState.status,
-        fetchState: fetchState.fetchState,
-        error: fetchState.error,
+        reducedAllFetchState,
+        reducedAnyFetchState,
+        fetchStateByTimeframe,
+        fetchState: selectedTimeframeFetchState.fetchState,
+        error: selectedTimeframeFetchState.error,
         filter: filter,
         uiState: pandLState.uiState,
         idsInOrder: profitAndLossClassesViewSelector_1.profitAndLossIdsInOrder,
@@ -95,10 +98,22 @@ function getProfitAndLossForFullDataAvailableRange(timeframe, forecastId, accoun
 exports.getProfitAndLossForFullDataAvailableRange = getProfitAndLossForFullDataAvailableRange;
 const getPandLReportFetchState = (forecastId, profitAndLossState) => {
     const pandLState = (0, profitAndLossReducer_1.getState)(profitAndLossState, forecastId);
-    return (0, reduceFetchState_1.reduceAnyFetchState)([
-        pandLState.fetchState.month,
-        pandLState.fetchState.quarter,
-        pandLState.fetchState.year,
-    ]);
+    return {
+        reducedAnyFetchState: (0, reduceFetchState_1.reduceAnyCompletedFetchState)([
+            pandLState.fetchState.month,
+            pandLState.fetchState.quarter,
+            pandLState.fetchState.year,
+        ]),
+        reducedAllFetchState: (0, reduceFetchState_1.reduceAllFetchState)([
+            pandLState.fetchState.month,
+            pandLState.fetchState.quarter,
+            pandLState.fetchState.year,
+        ]),
+        fetchStateByTimeframe: {
+            month: pandLState.fetchState.month,
+            quarter: pandLState.fetchState.quarter,
+            year: pandLState.fetchState.year,
+        },
+    };
 };
 exports.getPandLReportFetchState = getPandLReportFetchState;

package/lib/view/profitAndLoss/profitAndLossState.d.ts

@@ -1,4 +1,5 @@
-import { FetchStateAndError, ID } from '../../commonStateTypes/common';
+import { FetchStateByTimeframe } from '../../commonStateTypes/coaBalance/coaBalance';
+import { ID } from '../../commonStateTypes/common';
 import { Report } from '../../commonStateTypes/viewAndReport/viewAndReport';
 export interface ProfitAndLossUIState {
     nodeCollapseState: Record<ID, boolean>;
@@ -10,11 +11,7 @@ export interface ProfitAndLossUIState {
 export interface ProfitAndLossState extends Report {
     uiState: ProfitAndLossUIState;
     forecastId?: ID;
-    fetchState: {
-        month: FetchStateAndError;
-        quarter: FetchStateAndError;
-        year: FetchStateAndError;
-    };
+    fetchState: FetchStateByTimeframe;
 }
 export interface ProfitAndLossWithForecastState {
     pandL: ProfitAndLossState;

package/lib/view/reimbursementCard/fetchReimbursementCardEpic.js

@@ -28,7 +28,7 @@ const fetchReimbursementCardEpic = (actions$, _state$, zeniAPI) => actions$.pipe
         get_count_only: true,
     };
     return zeniAPI
-        .getJSON(`${zeniAPI.apiEndPoints.accountMicroServiceBaseUrl}/1.0/reimbursement-card?query=${encodeURIComponent(JSON.stringify(queryParam))}`)
+        .getJSON(`${zeniAPI.apiEndPoints.spendManagementMicroServiceBaseUrl}/1.0/reimbursement-card?query=${encodeURIComponent(JSON.stringify(queryParam))}`)
         .pipe((0, operators_1.mergeMap)((response) => {
         if ((0, responsePayload_1.isSuccessResponse)(response) && response.data != null) {
             return (0, rxjs_1.of)((0, reimbursementCardReducer_1.updateReimbursementCard)({

package/lib/view/spendManagement/billPay/billDetailView/epics/approveOrRejectBillEpic.js

@@ -16,7 +16,7 @@ const approveOrRejectBillEpic = (actions$, _state$, zeniAPI) => actions$.pipe((0
         description,
     };
     return zeniAPI
-        .putAndGetJSON(`${zeniAPI.apiEndPoints.accountMicroServiceBaseUrl}/1.0/bills/transactions/${billId}/approval-status`, payload)
+        .putAndGetJSON(`${zeniAPI.apiEndPoints.spendManagementMicroServiceBaseUrl}/1.0/bills/transactions/${billId}/approval-status`, payload)
         .pipe((0, operators_1.mergeMap)((response) => {
         var _a, _b;
         if ((0, responsePayload_1.isSuccessResponse)(response) && response.data != null) {

package/lib/view/spendManagement/billPay/billDetailView/epics/cancelAndDeleteBillEpic.js

@@ -20,7 +20,7 @@ const cancelAndDeleteBillEpic = (actions$, state$, zeniAPI) => actions$.pipe((0,
     const transaction = billTransactionState.transactionById[action.payload.billId];
     const isRecurring = (_a = transaction === null || transaction === void 0 ? void 0 : transaction.isRecurring) !== null && _a !== void 0 ? _a : false;
     const recurringConfigId = transaction === null || transaction === void 0 ? void 0 : transaction.recurringBillConfigId;
-    let cancelApiUrl = `${zeniAPI.apiEndPoints.accountMicroServiceBaseUrl}/1.0/bills/transactions/${action.payload.billId}`;
+    let cancelApiUrl = `${zeniAPI.apiEndPoints.spendManagementMicroServiceBaseUrl}/1.0/bills/transactions/${action.payload.billId}`;
     if (isRecurring === true) {
         cancelApiUrl = `${cancelApiUrl}/recurring/cancel-payment`;
     }

package/lib/view/spendManagement/billPay/billDetailView/epics/deleteBillEpic.js

@@ -20,7 +20,7 @@ const deleteBillEpic = (actions$, state$, zeniAPI) => actions$.pipe((0, operator
     const transaction = billTransactionState.transactionById[action.payload.billId];
     const isRecurring = (_a = transaction === null || transaction === void 0 ? void 0 : transaction.isRecurring) !== null && _a !== void 0 ? _a : false;
     const recurringConfigId = transaction === null || transaction === void 0 ? void 0 : transaction.recurringBillConfigId;
-    let deleteApiUrl = `${zeniAPI.apiEndPoints.accountMicroServiceBaseUrl}/1.0/bills/transactions/${action.payload.billId}`;
+    let deleteApiUrl = `${zeniAPI.apiEndPoints.spendManagementMicroServiceBaseUrl}/1.0/bills/transactions/${action.payload.billId}`;
     if (isRecurring === true) {
         deleteApiUrl = `${deleteApiUrl}/recurring`;
     }

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

@@ -53,7 +53,7 @@ const fetchBillDetailEpic = (actions$, state$, zeniAPI) => actions$.pipe((0, ope
             is_include_deleted: isShowDeletedBillsEnabled,
         };
         const getTransactionDetail$ = zeniAPI
-            .getJSON(`${zeniAPI.apiEndPoints.accountMicroServiceBaseUrl}/1.0/bills/transactions/${billId}?query=${encodeURIComponent(JSON.stringify(query))}`)
+            .getJSON(`${zeniAPI.apiEndPoints.spendManagementMicroServiceBaseUrl}/1.0/bills/transactions/${billId}?query=${encodeURIComponent(JSON.stringify(query))}`)
             .pipe((0, operators_1.mergeMap)((response) => {
             var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p;
             if ((0, responsePayload_1.isSuccessResponse)(response) &&

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

@@ -25,7 +25,7 @@ const fetchBillListPerTabEpic = (actions$, _state$, zeniAPI) => actions$.pipe((0
         is_include_deleted: isShowDeletedBillsEnabled ? tab !== 'draft' : false,
     };
     return zeniAPI
-        .getJSON(`${zeniAPI.apiEndPoints.accountMicroServiceBaseUrl}/1.0/bills/transactions?query=${encodeURIComponent(JSON.stringify(queryParam))}`)
+        .getJSON(`${zeniAPI.apiEndPoints.spendManagementMicroServiceBaseUrl}/1.0/bills/transactions?query=${encodeURIComponent(JSON.stringify(queryParam))}`)
         .pipe((0, operators_1.mergeMap)((response) => {
         var _a, _b;
         if ((0, responsePayload_1.isSuccessResponse)(response) && response.data != null) {

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

@@ -13,7 +13,7 @@ const fetchBillPayConfigEpic = (actions$, _state$, zeniAPI) => actions$.pipe((0,
         is_include_payment_accounts_info: true,
     };
     return zeniAPI
-        .getJSON(`${zeniAPI.apiEndPoints.accountMicroServiceBaseUrl}/1.0/bill-pay/config?query=${encodeURIComponent(JSON.stringify(queryParam))}`)
+        .getJSON(`${zeniAPI.apiEndPoints.spendManagementMicroServiceBaseUrl}/1.0/bill-pay/config?query=${encodeURIComponent(JSON.stringify(queryParam))}`)
         .pipe((0, operators_1.mergeMap)((response) => {
         if ((0, responsePayload_1.isSuccessResponse)(response) && response.data != null) {
             const updateActions = [];

package/lib/view/spendManagement/billPay/billsBulkActionView/epics/approveOrRejectBillsBulkActionEpic.js

@@ -13,7 +13,7 @@ const approveOrRejectBillsBulkActionEpic = (actions$, state$, zeniAPI) => action
     const transactionIds = billsBulkActionViewState.billsSelectedForBulkAction;
     const payload = prepareBulkApproveOrRejectPayload(transactionIds, approvalType, description);
     return zeniAPI
-        .putAndGetJSON(`${zeniAPI.apiEndPoints.accountMicroServiceBaseUrl}/1.0/bulk/bills/transactions`, payload)
+        .putAndGetJSON(`${zeniAPI.apiEndPoints.spendManagementMicroServiceBaseUrl}/1.0/bulk/bills/transactions`, payload)
         .pipe((0, operators_1.mergeMap)((response) => {
         var _a, _b, _c, _d, _e, _f;
         if ((0, responsePayload_1.isSuccessStatus)(response)) {

package/lib/view/spendManagement/billPay/billsBulkActionView/epics/cancelOrDeleteBillsBulkActionEpic.js

@@ -12,7 +12,7 @@ const cancelOrDeleteBillsBulkActionEpic = (actions$, state$, zeniAPI) => actions
     const { billsBulkActionViewState } = state$.value;
     const transactionIds = billsBulkActionViewState.billsSelectedForBulkAction;
     const payload = prepareBulkCancelOrDeletePayload(transactionIds, operationType, description);
-    const bulkApiUrl = `${zeniAPI.apiEndPoints.accountMicroServiceBaseUrl}/1.0/bulk/bills/transactions`;
+    const bulkApiUrl = `${zeniAPI.apiEndPoints.spendManagementMicroServiceBaseUrl}/1.0/bulk/bills/transactions`;
     const api = operationType === 'cancel'
         ? zeniAPI.putAndGetJSON(bulkApiUrl, payload)
         : zeniAPI.deleteAndGetJSON(bulkApiUrl, payload);

package/lib/view/spendManagement/billPay/billsBulkActionView/epics/reviewDraftBillsBulkActionEpic.ts.js

@@ -12,7 +12,7 @@ const reviewDraftBillsBulkActionEpic = (actions$, state$, zeniAPI) => actions$.p
         entity_ids: transactionIds,
     };
     return zeniAPI
-        .getJSON(`${zeniAPI.apiEndPoints.accountMicroServiceBaseUrl}/1.0/bulk/bills//transactions/validate?query=${encodeURIComponent(JSON.stringify(queryParam))}`)
+        .getJSON(`${zeniAPI.apiEndPoints.spendManagementMicroServiceBaseUrl}/1.0/bulk/bills/transactions/validate?query=${encodeURIComponent(JSON.stringify(queryParam))}`)
         .pipe((0, operators_1.mergeMap)((response) => {
         var _a, _b;
         if ((0, responsePayload_1.isSuccessStatus)(response)) {

package/lib/view/spendManagement/billPay/billsBulkActionView/epics/submitDraftBillsBulkActionEpic.js

@@ -11,7 +11,7 @@ const editBillViewSelector_1 = require("../../editBillView/editBillViewSelector"
 const submitDraftBillsBulkActionEpic = (actions$, state$, zeniAPI) => actions$.pipe((0, operators_1.filter)(billsBulkActionViewReducer_1.submitDraftBillsBulkAction.match), (0, operators_1.mergeMap)(() => {
     const { billsBulkActionViewState, billTransactionState } = state$.value;
     const payload = prepareBulkSubmitPayload(billsBulkActionViewState, billTransactionState);
-    const bulkApiUrl = `${zeniAPI.apiEndPoints.accountMicroServiceBaseUrl}/1.0/bulk/bills/transactions`;
+    const bulkApiUrl = `${zeniAPI.apiEndPoints.spendManagementMicroServiceBaseUrl}/1.0/bulk/bills/transactions`;
     return zeniAPI
         .putAndGetJSON(bulkApiUrl, payload)
         .pipe((0, operators_1.mergeMap)((response) => {

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

@@ -27,7 +27,7 @@ const convertAmountToHomeCurrencyEpic = (actions$, state$, zeniAPI) => actions$.
             home_currency_code: conversionCurrencyCode,
         };
         return zeniAPI
-            .postAndGetJSON(`${zeniAPI.apiEndPoints.accountMicroServiceBaseUrl}/1.0/bills/currencies/conversion`, payload)
+            .postAndGetJSON(`${zeniAPI.apiEndPoints.spendManagementMicroServiceBaseUrl}/1.0/bills/currencies/conversion`, payload)
             .pipe((0, operators_1.mergeMap)((response) => {
             if ((0, responsePayload_1.isSuccessResponse)(response) && response.data != null) {
                 const updateActions = [];

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

@@ -32,7 +32,7 @@ const saveBillDetailEpic = (actions$, state$, zeniAPI) => actions$.pipe((0, oper
         : state.editBillDetailViewState.newBillState;
     const payload = prepareSaveBillPayload(state.accountState, state.billTransactionState, state.paymentAccountState, state.recurringBillState, billDetail, billStageCode);
     const isRecurringBill = billDetail.billDetailLocalData.isRecurring;
-    const saveBillBaseURL = `${zeniAPI.apiEndPoints.accountMicroServiceBaseUrl}/1.0/bills/transactions`;
+    const saveBillBaseURL = `${zeniAPI.apiEndPoints.spendManagementMicroServiceBaseUrl}/1.0/bills/transactions`;
     const saveBillApi = billId != null
         ? zeniAPI.putAndGetJSON(getSaveBillApiURL(saveBillBaseURL, isRecurringBill, billId, state.billTransactionState), payload)
         : zeniAPI.postAndGetJSON(getSaveBillApiURL(saveBillBaseURL, isRecurringBill), payload);

package/lib/view/spendManagement/billPay/magicLinkView/epics/fetchMagicLinkBillEpic.js

@@ -8,7 +8,7 @@ const responsePayload_1 = require("../../../../../responsePayload");
 const attachmentPayload_1 = require("../../../../../entity/transaction/payloadTypes/attachmentPayload");
 const fetchMagicLinkBillEpic = (actions$, _, zeniAPI) => actions$.pipe((0, operators_1.filter)(magicLinkViewReducer_1.fetchBillAttachment.match), (0, operators_1.mergeMap)((action) => {
     const { billId } = action.payload;
-    let apiUrl = `${zeniAPI.apiEndPoints.accountMicroServiceBaseUrl}/1.0/bills/transactions/${billId}`;
+    let apiUrl = `${zeniAPI.apiEndPoints.spendManagementMicroServiceBaseUrl}/1.0/bills/transactions/${billId}`;
     const queryParam = {
         transaction_type: 'bill',
         bill_pay_provider: 'zeni',

package/lib/view/spendManagement/billPay/previousBills/fetchPreviousBillsEpic.js

@@ -34,7 +34,7 @@ const fetchPreviousBillsEpic = (actions$, state$, zeniAPI) => actions$.pipe((0,
             limit: 3,
         };
         return zeniAPI
-            .getJSON(`${zeniAPI.apiEndPoints.accountMicroServiceBaseUrl}/1.0/bills/transactions?query=${encodeURIComponent(JSON.stringify(queryParam))}`)
+            .getJSON(`${zeniAPI.apiEndPoints.spendManagementMicroServiceBaseUrl}/1.0/bills/transactions?query=${encodeURIComponent(JSON.stringify(queryParam))}`)
             .pipe((0, operators_1.mergeMap)((response) => {
             if ((0, responsePayload_1.isSuccessResponse)(response) && response.data != null) {
                 const updateActions = [];

package/lib/view/spendManagement/commonHistoryView/fetchEntityHistoryEpic.js

@@ -26,7 +26,7 @@ const fetchEntityHistoryEpic = (actions$, state$, zeniAPI) => actions$.pipe((0,
         }));
         const entityTypeInUrl = entityType === 'bill_pay' ? 'bill' : entityType;
         const getHistoryDetail$ = zeniAPI
-            .getJSON(`${zeniAPI.apiEndPoints.accountMicroServiceBaseUrl}/1.0/${entityTypeInUrl}s/transactions/${entityId}/history`)
+            .getJSON(`${zeniAPI.apiEndPoints.spendManagementMicroServiceBaseUrl}/1.0/${entityTypeInUrl}s/transactions/${entityId}/history`)
             .pipe((0, operators_1.mergeMap)((response) => {
             if ((0, responsePayload_1.isSuccessResponse)(response) && response.data != null) {
                 return (0, rxjs_1.of)((0, commonHistoryReducer_1.updateCommonHistory)({

package/lib/view/spendManagement/plaidAccount/epic/paymentAccounts/updateMappedCashAccountEpic.js

@@ -9,7 +9,7 @@ const depositAccountReducer_1 = require("../../../../../entity/depositAccount/de
 const updateMappedCashAccountEpic = (actions$, _state$, zeniAPI) => actions$.pipe((0, operators_1.filter)(plaidAccountViewReducer_1.updateMappedCashAccount.match), (0, operators_1.mergeMap)((action) => {
     const { plaidAccountKeyType, accountId, depositAccountId } = action.payload;
     return zeniAPI
-        .putAndGetJSON(`${zeniAPI.apiEndPoints.payMicroServiceBaseUrl}/1.0/deposit-accounts/${depositAccountId}`, {
+        .putAndGetJSON(`${zeniAPI.apiEndPoints.bankingMicroServiceBaseUrl}/1.0/deposit-accounts/${depositAccountId}`, {
         zeni_mapped_account_id: accountId,
     })
         .pipe((0, operators_1.mergeMap)((response) => {

package/lib/view/spendManagement/reimbursement/editRemiView/epics/fetchCurrencyConversionValueEpic.js

@@ -25,7 +25,7 @@ const fetchCurrencyConversionValueEpic = (actions$, state$, zeniAPI) => actions$
         home_currency_code: conversionCurrencyCode,
     };
     return zeniAPI
-        .postAndGetJSON(`${zeniAPI.apiEndPoints.accountMicroServiceBaseUrl}/1.0/reimbursements/currencies/conversion`, payload)
+        .postAndGetJSON(`${zeniAPI.apiEndPoints.spendManagementMicroServiceBaseUrl}/1.0/reimbursements/currencies/conversion`, payload)
         .pipe((0, operators_1.mergeMap)((response) => {
         if ((0, responsePayload_1.isSuccessResponse)(response) && response.data != null) {
             const updateActions = [];

package/lib/view/spendManagement/reimbursement/editRemiView/epics/saveRemiDetailEpic.js

@@ -29,8 +29,8 @@ const saveRemiDetailEpic = (actions$, state$, zeniAPI) => actions$.pipe((0, oper
         : state.editRemiDetailViewState.newRemiState;
     const payload = prepareSaveRemiPayload(state.reimbursementState, state.tenantState, remiDetail, remiStageCode, isSubmitted);
     const saveVendorApi = reimbursementId != null
-        ? zeniAPI.putAndGetJSON(`${zeniAPI.apiEndPoints.accountMicroServiceBaseUrl}/1.0/reimbursements/transactions/${action.payload.reimbursementId}`, payload)
-        : zeniAPI.postAndGetJSON(`${zeniAPI.apiEndPoints.accountMicroServiceBaseUrl}/1.0/reimbursements/transactions`, payload);
+        ? zeniAPI.putAndGetJSON(`${zeniAPI.apiEndPoints.spendManagementMicroServiceBaseUrl}/1.0/reimbursements/transactions/${action.payload.reimbursementId}`, payload)
+        : zeniAPI.postAndGetJSON(`${zeniAPI.apiEndPoints.spendManagementMicroServiceBaseUrl}/1.0/reimbursements/transactions`, payload);
     return saveVendorApi.pipe((0, operators_1.mergeMap)((response) => {
         var _a, _b, _c;
         if ((0, responsePayload_1.isSuccessResponse)(response) &&

package/lib/view/spendManagement/reimbursement/reimbursementConfig/fetchReimbursementConfigEpic.js

@@ -8,7 +8,7 @@ const responsePayload_1 = require("../../../../responsePayload");
 const currencyReducer_1 = require("../../../../entity/currency/currencyReducer");
 const fetchReimbursementConfigEpic = (actions$, _state$, zeniAPI) => actions$.pipe((0, operators_1.filter)(reimbursementConfigReducer_1.fetchReimbursementConfig.match), (0, operators_1.mergeMap)(() => {
     return zeniAPI
-        .getJSON(`${zeniAPI.apiEndPoints.accountMicroServiceBaseUrl}/1.0/reimbursements/config`)
+        .getJSON(`${zeniAPI.apiEndPoints.spendManagementMicroServiceBaseUrl}/1.0/reimbursements/config`)
         .pipe((0, operators_1.mergeMap)((response) => {
         if ((0, responsePayload_1.isSuccessResponse)(response) && response.data != null) {
             const updateActions = [];

package/lib/view/spendManagement/reimbursement/remiDetailView/epics/approveOrRejectRemiEpic.js

@@ -16,7 +16,7 @@ const approveOrRejectRemiEpic = (actions$, _state$, zeniAPI) => actions$.pipe((0
         description,
     };
     return zeniAPI
-        .putAndGetJSON(`${zeniAPI.apiEndPoints.accountMicroServiceBaseUrl}/1.0/reimbursements/transactions/${reimbursementId}/approval-status`, payload)
+        .putAndGetJSON(`${zeniAPI.apiEndPoints.spendManagementMicroServiceBaseUrl}/1.0/reimbursements/transactions/${reimbursementId}/approval-status`, payload)
         .pipe((0, operators_1.mergeMap)((response) => {
         var _a, _b;
         if ((0, responsePayload_1.isSuccessResponse)(response) && response.data != null) {

package/lib/view/spendManagement/reimbursement/remiDetailView/epics/cancelAndDeleteRemiEpic.js

@@ -16,7 +16,7 @@ const cancelAndDeleteRemiEpic = (actions$, state$, zeniAPI) => actions$.pipe((0,
     const { reimbursementState } = state$.value;
     const transaction = reimbursementState.reimbursementById[action.payload.reimbursementId];
     return zeniAPI
-        .putAndGetJSON(`${zeniAPI.apiEndPoints.accountMicroServiceBaseUrl}/1.0/reimbursements/transactions/${action.payload.reimbursementId}/cancel-payment`, query)
+        .putAndGetJSON(`${zeniAPI.apiEndPoints.spendManagementMicroServiceBaseUrl}/1.0/reimbursements/transactions/${action.payload.reimbursementId}/cancel-payment`, query)
         .pipe((0, operators_1.mergeMap)((response) => {
         var _a, _b;
         if (action.payload.isDeleteRemi === true &&

package/lib/view/spendManagement/reimbursement/remiDetailView/epics/deleteRemiEpic.js

@@ -16,7 +16,7 @@ const deleteRemiEpic = (actions$, state$, zeniAPI) => actions$.pipe((0, operator
     const { reimbursementState } = state$.value;
     const transaction = reimbursementState.reimbursementById[action.payload.reimbursementId];
     return zeniAPI
-        .deleteAndGetJSON(`${zeniAPI.apiEndPoints.accountMicroServiceBaseUrl}/1.0/reimbursements/transactions/${action.payload.reimbursementId}?query=${encodeURIComponent(JSON.stringify(query))}`)
+        .deleteAndGetJSON(`${zeniAPI.apiEndPoints.spendManagementMicroServiceBaseUrl}/1.0/reimbursements/transactions/${action.payload.reimbursementId}?query=${encodeURIComponent(JSON.stringify(query))}`)
         .pipe((0, operators_1.mergeMap)((response) => {
         if ((0, responsePayload_1.isSuccessStatus)(response)) {
             const actions = [

package/lib/view/spendManagement/reimbursement/remiDetailView/epics/fetchDuplicateReimbursementEpic.js

@@ -49,7 +49,7 @@ const fetchDuplicateReimbursementEpic = (actions$, state$, zeniAPI) => actions$.
         lines: lines.map(reimbursementPayload_1.toReimbursementLinePayload),
     };
     return zeniAPI
-        .postAndGetJSON(`${zeniAPI.apiEndPoints.accountMicroServiceBaseUrl}/1.0/reimbursements/transactions/duplicates`, payload)
+        .postAndGetJSON(`${zeniAPI.apiEndPoints.spendManagementMicroServiceBaseUrl}/1.0/reimbursements/transactions/duplicates`, payload)
         .pipe((0, operators_1.mergeMap)((response) => {
         if ((0, responsePayload_1.isSuccessResponse)(response) && response.data != null) {
             const updateActions = [];

package/lib/view/spendManagement/reimbursement/remiDetailView/epics/fetchRemiDetailEpic.js

@@ -44,7 +44,7 @@ const fetchRemiDetailEpic = (actions$, state$, zeniAPI) => actions$.pipe((0, ope
             is_include_deleted: isShowDeletedReimbursementEnabled,
         };
         const getTransactionDetail$ = zeniAPI
-            .getJSON(`${zeniAPI.apiEndPoints.accountMicroServiceBaseUrl}/1.0/reimbursements/transactions/${reimbursementId}?query=${encodeURIComponent(JSON.stringify(query))}`)
+            .getJSON(`${zeniAPI.apiEndPoints.spendManagementMicroServiceBaseUrl}/1.0/reimbursements/transactions/${reimbursementId}?query=${encodeURIComponent(JSON.stringify(query))}`)
             .pipe((0, operators_1.mergeMap)((response) => {
             var _a, _b, _c, _d;
             if ((0, responsePayload_1.isSuccessResponse)(response) &&

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

@@ -28,7 +28,7 @@ const fetchRemiListPerTabEpic = (actions$, _state$, zeniAPI) => actions$.pipe((0
         is_include_line_items: isIncludeLineItems ? tab !== 'draft' : false,
     };
     return zeniAPI
-        .getJSON(`${zeniAPI.apiEndPoints.accountMicroServiceBaseUrl}/1.0/reimbursements/transactions?query=${encodeURIComponent(JSON.stringify(queryParam))}`)
+        .getJSON(`${zeniAPI.apiEndPoints.spendManagementMicroServiceBaseUrl}/1.0/reimbursements/transactions?query=${encodeURIComponent(JSON.stringify(queryParam))}`)
         .pipe((0, operators_1.mergeMap)((response) => {
         var _a;
         if ((0, responsePayload_1.isSuccessResponse)(response) && response.data != null) {

package/lib/view/spendManagement/zeniAccounts/checkDeposit/checkDepositEpic.js

@@ -23,7 +23,7 @@ const checkDepositEpic = (actions$, state$, zeniAPI) => actions$.pipe((0, operat
         check_back_file_id: checkBack === null || checkBack === void 0 ? void 0 : checkBack.fileId,
     };
     return zeniAPI
-        .postAndGetJSON(`${zeniAPI.apiEndPoints.payMicroServiceBaseUrl}/1.0/deposit-accounts/${(_a = localData.depositTo) === null || _a === void 0 ? void 0 : _a.id}/check-deposits`, payload)
+        .postAndGetJSON(`${zeniAPI.apiEndPoints.bankingMicroServiceBaseUrl}/1.0/deposit-accounts/${(_a = localData.depositTo) === null || _a === void 0 ? void 0 : _a.id}/check-deposits`, payload)
         .pipe((0, operators_1.mergeMap)((response) => {
         if ((0, responsePayload_1.isSuccessResponse)(response)) {
             return (0, rxjs_1.of)((0, snackbarReducer_1.openSnackbar)({