@zeniai/client-epic-state 4.8.3 → 4.8.4

package/lib/entity/account/accountSelector.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="url-parse" />
-import { AccountBase, AccountState } from './accountState';
+import { Account, AccountBase, AccountState, AccountType } from './accountState';
 import { ID } from '../../commonStateTypes/common';
 import { EntityOrder } from '../../commonStateTypes/selectorTypes/selectorTypes';
 import { ReportIDPlusForecastID } from '../../commonStateTypes/viewAndReport/viewAndReport';
@@ -108,3 +108,5 @@ export declare const getAccountsOrdered: (filter: COABalancesFilter, accountStat
     accountsViewParentId: AccountsViewParentID | undefined;
     labels: ("prepaid_expenses" | "uncategorized_income" | "uncategorized_expense")[];
 }[];
+export declare const getAccountsByType: (accountState: AccountState, accountTypes: AccountType[]) => Partial<Record<AccountType, Account[]>>;
+export declare const getAccountIdsForTypes: (accountState: AccountState, accountTypes: AccountType[]) => ID[];

package/lib/entity/account/accountSelector.js

@@ -1,6 +1,10 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getAccountsOrdered = exports.getAccountWithBalance = exports.getAccount = exports.getAccountBase = void 0;
+exports.getAccountIdsForTypes = exports.getAccountsByType = exports.getAccountsOrdered = exports.getAccountWithBalance = exports.getAccount = exports.getAccountBase = void 0;
+const flatMap_1 = __importDefault(require("lodash/flatMap"));
 const accountState_1 = require("./accountState");
 const coaBalance_1 = require("../../commonStateTypes/coaBalance/coaBalance");
 const sortBalancesByFreeRangeTotal_1 = require("../../commonStateTypes/coaBalance/sortBalancesByFreeRangeTotal");
@@ -142,3 +146,25 @@ const getAccountsOrdered = (filter, accountState, id, orderBy, order = 'last_bal
     }
 });
 exports.getAccountsOrdered = getAccountsOrdered;
+const getAccountsByType = (accountState, accountTypes) => {
+    const accountsByType = {};
+    accountTypes.forEach((accountType) => {
+        accountsByType[accountType] = Object.values(accountState.accountsByKey).filter((account) => account.accountType === accountType);
+    });
+    return accountsByType;
+};
+exports.getAccountsByType = getAccountsByType;
+const getAccountIdsForTypes = (accountState, accountTypes) => {
+    const allAccountsByType = (0, exports.getAccountsByType)(accountState, accountTypes);
+    let allAccountIdsForTypes = [];
+    accountTypes.forEach((accountType) => {
+        if (allAccountsByType[accountType] != null) {
+            allAccountIdsForTypes = [
+                ...allAccountIdsForTypes,
+                ...(0, flatMap_1.default)(allAccountsByType[accountType], (value) => value.accountId),
+            ];
+        }
+    });
+    return allAccountIdsForTypes;
+};
+exports.getAccountIdsForTypes = getAccountIdsForTypes;

package/lib/view/scheduleView/scheduleDetailView/epics/fetchScheduleDetailsEpic.js

@@ -9,11 +9,12 @@ const scheduleDetailReducer_1 = require("../scheduleDetailReducer");
 const transactionType_1 = require("../../../../entity/transaction/stateTypes/transactionType");
 const transactionDetailState_1 = require("../../../transactionDetail/transactionDetailState");
 const fetchScheduleDetailsEpic = (actions$, state$, zeniAPI) => actions$.pipe((0, operators_1.filter)(scheduleDetailReducer_1.fetchScheduleDetails.match), (0, operators_1.mergeMap)((action) => {
+    var _a;
     const updateActions = [];
     const { tab, selectedJeScheduleDetailId } = action.payload;
     const { scheduleDetailState } = state$.value;
     if (selectedJeScheduleDetailId != null) {
-        if (scheduleDetailState.editScheduleStateById[selectedJeScheduleDetailId] != null &&
+        if (((_a = scheduleDetailState.editScheduleStateById[selectedJeScheduleDetailId]) === null || _a === void 0 ? void 0 : _a.jeScheduleDetails.length) > 0 &&
             scheduleDetailState.selectedJEScheduleKey != null) {
             updateActions.push((0, scheduleDetailReducer_1.initializeScheduleDetailLocalData)(scheduleDetailState.selectedJEScheduleKey, selectedJeScheduleDetailId));
             updateActions.push((0, scheduleDetailReducer_1.updateScheduleDetailsSuccess)());

package/lib/view/scheduleView/scheduleDetailView/epics/fetchScheduleDetailsPageEpic.js

@@ -6,9 +6,10 @@ const operators_1 = require("rxjs/operators");
 const accountListReducer_1 = require("../../../accountList/accountListReducer");
 const classListReducer_1 = require("../../../classList/classListReducer");
 const scheduleDetailReducer_1 = require("../scheduleDetailReducer");
+const scheduleDetailLocalDataHelper_1 = require("../scheduleDetailLocalDataHelper");
 const fetchScheduleDetailsPageEpic = (actions$) => actions$.pipe((0, operators_1.filter)(scheduleDetailReducer_1.fetchScheduleDetailsPage.match), (0, operators_1.mergeMap)((action) => {
     const scheduleDetailsActions = [];
-    scheduleDetailsActions.push((0, accountListReducer_1.fetchAccountList)('accountList', true));
+    scheduleDetailsActions.push((0, accountListReducer_1.fetchAccountList)('prepaidExpenseAccountList', true, false, false, false, (0, scheduleDetailLocalDataHelper_1.getAccountsTypesForScheduleDetails)('prepaid_expenses')));
     scheduleDetailsActions.push((0, classListReducer_1.fetchClassList)());
     scheduleDetailsActions.push((0, scheduleDetailReducer_1.fetchScheduleDetails)(action.payload.tab, action.payload.selectedJeScheduleDetailId));
     return (0, rxjs_1.concat)((0, rxjs_1.from)(scheduleDetailsActions));

package/lib/view/scheduleView/scheduleDetailView/scheduleDetailLocalDataHelper.d.ts

@@ -3,8 +3,9 @@ import { JEScheduledTransaction, ScheduledJournalEntry } from '../../../entity/j
 import { JEScheduleDetailsLocalData, JETransactionLink, ScheduleDetailsLocalData } from './scheduleDetailState';
 import ZeniUrl from '../../../zeniUrl';
 import { ZeniDate } from '../../../zeniDayJS';
-import { ScheduleJournalEntryStatusCodeType } from '../../../entity/jeSchedules/jeSchedulesTypes';
+import { ScheduleJournalEntryStatusCodeType, SchedulesTypes } from '../../../entity/jeSchedules/jeSchedulesTypes';
 import { TransactionID } from '../../../entity/transaction/stateTypes/transaction';
+import { AccountType } from '../../../entity/account/accountState';
 export declare const DUMMY_TRANSACTION_ID = "dummyid";
 export declare const getPostingDateAndStatusForIndex: (schedulePostingMonth: number, schedulePostingYear: number, postingDay?: 2 | 1 | 22 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 10 | 11 | 12 | 13 | 14 | 15 | 16 | 17 | 18 | 19 | 20 | 21 | 23 | 24 | 25 | 26 | 27 | 28 | undefined) => {
     postingDate: ZeniDate;
@@ -16,3 +17,9 @@ export declare const updateAmountsInScheduleDetails: (jeSchedulesLocalData: JESc
 export declare const getQBOUrlForLink: (qboAppUrl: string, jeLink?: JETransactionLink | undefined) => ZeniUrl | undefined;
 export declare const getThirdPartyIDFromQBOURL: (jeLinkURL: ZeniUrl) => JETransactionLink;
 export declare const getJETransactionLinkFromThirdPartyId: (thirdPartyID?: string | undefined, transactionId?: string | undefined, recommendedTransactionID?: TransactionID | undefined) => JETransactionLink;
+/**
+ * Function to get type of accounts to fetch for a given tab
+ * @param scheduleType
+ * @returns
+ */
+export declare const getAccountsTypesForScheduleDetails: (scheduleType: SchedulesTypes) => AccountType[];

package/lib/view/scheduleView/scheduleDetailView/scheduleDetailLocalDataHelper.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getJETransactionLinkFromThirdPartyId = exports.getThirdPartyIDFromQBOURL = exports.getQBOUrlForLink = exports.updateAmountsInScheduleDetails = exports.getInitializedJEScheduleDetailsLocalData = exports.createNewSchedulesHelper = exports.getPostingDateAndStatusForIndex = exports.DUMMY_TRANSACTION_ID = void 0;
+exports.getAccountsTypesForScheduleDetails = exports.getJETransactionLinkFromThirdPartyId = exports.getThirdPartyIDFromQBOURL = exports.getQBOUrlForLink = exports.updateAmountsInScheduleDetails = exports.getInitializedJEScheduleDetailsLocalData = exports.createNewSchedulesHelper = exports.getPostingDateAndStatusForIndex = exports.DUMMY_TRANSACTION_ID = void 0;
 const amount_1 = require("../../../commonStateTypes/amount");
 const zeniUrl_1 = require("../../../zeniUrl");
 const zeniDayJS_1 = require("../../../zeniDayJS");
@@ -183,3 +183,17 @@ const getJETransactionLinkFromThirdPartyId = (thirdPartyID, transactionId, recom
     };
 };
 exports.getJETransactionLinkFromThirdPartyId = getJETransactionLinkFromThirdPartyId;
+/**
+ * Function to get type of accounts to fetch for a given tab
+ * @param scheduleType
+ * @returns
+ */
+const getAccountsTypesForScheduleDetails = (scheduleType) => {
+    switch (scheduleType) {
+        case 'prepaid_expenses':
+            return ['cogs', 'expenses', 'other_expense'];
+        default:
+            return [];
+    }
+};
+exports.getAccountsTypesForScheduleDetails = getAccountsTypesForScheduleDetails;

package/lib/view/scheduleView/scheduleDetailView/scheduleDetailSelector.js

@@ -6,6 +6,8 @@ const accountListSelector_1 = require("../../accountList/accountListSelector");
 const classListSelector_1 = require("../../classList/classListSelector");
 const reduceFetchState_1 = require("../../../commonStateTypes/reduceFetchState");
 const scheduleDetailReducer_1 = require("./scheduleDetailReducer");
+const accountSelector_1 = require("../../../entity/account/accountSelector");
+const scheduleDetailLocalDataHelper_1 = require("./scheduleDetailLocalDataHelper");
 const getScheduleDetailsView = (state) => {
     const { accountState, accountListState, classState, classListState, scheduleDetailState, } = state;
     const jeScheduleKey = scheduleDetailState.selectedJEScheduleKey;
@@ -29,9 +31,13 @@ const getScheduleDetailsView = (state) => {
         };
     }
     const jeScheduleTransactionState = (0, jeSchedulesSelector_1.getJEScheduledTransactionByJEScheduleKey)(jeScheduleKey, state);
-    const allAccountList = (0, accountListSelector_1.getAccountList)(accountState, accountListState, 'accountList');
+    const scheduleDetailAccountTypes = (0, scheduleDetailLocalDataHelper_1.getAccountsTypesForScheduleDetails)('prepaid_expenses');
+    const scheduleDetailAccountIds = (0, accountSelector_1.getAccountIdsForTypes)(accountState, scheduleDetailAccountTypes);
+    const allAccountList = (0, accountListSelector_1.getAccountList)(accountState, accountListState, 'prepaidExpenseAccountList');
+    const filteredAccounts = allAccountList.accounts.filter((account) => scheduleDetailAccountIds.includes(account.accountId));
     const allClassList = (0, classListSelector_1.getClassList)(classState, classListState);
-    const accountListNestedAccountHierarchy = (0, accountListSelector_1.getNestedAccountListHeirarchy)(accountListState, 'accountList');
+    const accountListNestedAccountHierarchy = (0, accountListSelector_1.getNestedAccountListHeirarchy)(accountListState, 'prepaidExpenseAccountList').filter((account) => account.accountId[0] != null &&
+        scheduleDetailAccountIds.includes(account.accountId[0]));
     const classListNestedAccountHierarchy = (0, classListSelector_1.getNestedClassListHeirarchy)(classListState);
     const selectedJeScheduleDetailId = jeScheduleTransactionState.jeScheduleId;
     let scheduleDetailsLocalData = Object.assign({}, scheduleDetailReducer_1.initialScheduleDetailsLocalData);
@@ -53,7 +59,7 @@ const getScheduleDetailsView = (state) => {
     return {
         uiState: scheduleDetailState.uiState,
         selectedJEScheduleTransaction: jeScheduleTransactionState,
-        allAccountList: allAccountList.accounts,
+        allAccountList: filteredAccounts,
         allClassList: allClassList.classes,
         accountListNestedAccountHierarchy,
         classListNestedAccountHierarchy,

package/lib/view/scheduleView/scheduleListView/epics/fetchScheduleListEpic.d.ts

@@ -24,4 +24,4 @@ export interface ScheduleListQueryParam {
  * @param accountListState
  * @returns
  */
-export declare const getAllAccountIdsForTab: (tab: SchedulesTypes, accountListState: AccountListState) => ID[];
+export declare const getAllAccountIdsForTab: (tab: SchedulesTypes, accountListState: AccountListState, filterAccountIds: ID[]) => ID[];

package/lib/view/scheduleView/scheduleListView/epics/fetchScheduleListEpic.js

@@ -8,11 +8,12 @@ const responsePayload_1 = require("../../../../responsePayload");
 const jeSchedulesReducer_1 = require("../../../../entity/jeSchedules/jeSchedulesReducer");
 const timePeriod_1 = require("../../../../commonStateTypes/timePeriod");
 const timeframeTick_1 = require("../../../../commonStateTypes/timeframeTick");
-const fetchSchedulesAccountEpic_1 = require("./fetchSchedulesAccountEpic");
+const scheduleListHelper_1 = require("../scheduleListHelper");
 const scheduleListTypes_1 = require("../scheduleListTypes");
+const accountSelector_1 = require("../../../../entity/account/accountSelector");
 const fetchScheduleListEpic = (actions$, state$, zeniAPI) => actions$.pipe((0, operators_1.filter)(scheduleListReducer_1.fetchScheduleList.match), (0, operators_1.mergeMap)((action) => {
     const { tab } = action.payload;
-    const { scheduleListState, accountListState } = state$.value;
+    const { scheduleListState, accountState, accountListState } = state$.value;
     // if parameters are provided, use those. else go to localdata
     const timeframe = action.payload.timeframeAndCategory != null
         ? action.payload.timeframeAndCategory.selectedTimeframe
@@ -26,9 +27,11 @@ const fetchScheduleListEpic = (actions$, state$, zeniAPI) => actions$.pipe((0, o
     if (draft != null && draft.fetchState === 'Completed') {
         return (0, rxjs_1.from)([]);
     }
+    const scheduleListCurrentTabAccountTypes = (0, scheduleListHelper_1.getAccountsTypesForSchedulePayload)(scheduleListState.currentTab).allowedAccountList;
+    const scheduleListCurrentTabAccountIds = (0, accountSelector_1.getAccountIdsForTypes)(accountState, scheduleListCurrentTabAccountTypes);
     let categoryIds = [categoryId];
     if (categoryId === 'all') {
-        categoryIds = (0, exports.getAllAccountIdsForTab)(scheduleListState.currentTab, accountListState);
+        categoryIds = (0, exports.getAllAccountIdsForTab)(scheduleListState.currentTab, accountListState, scheduleListCurrentTabAccountIds);
     }
     const queryParam = {
         start_date: (0, timePeriod_1.toString)(timePeriod.start),
@@ -61,9 +64,9 @@ exports.fetchScheduleListEpic = fetchScheduleListEpic;
  * @param accountListState
  * @returns
  */
-const getAllAccountIdsForTab = (tab, accountListState) => {
-    const accountStateForReport = accountListState.byReportId[(0, fetchSchedulesAccountEpic_1.getAccountsTypesForSchedulePayload)(tab).accountListKey];
-    let accountIds = accountStateForReport.accountIds;
+const getAllAccountIdsForTab = (tab, accountListState, filterAccountIds) => {
+    const accountStateForReport = accountListState.byReportId[(0, scheduleListHelper_1.getAccountsTypesForSchedulePayload)(tab).accountListKey];
+    let accountIds = accountStateForReport.accountIds.filter((accountId) => filterAccountIds.includes(accountId));
     if (tab === 'prepaid_expenses') {
         const filteredList = accountStateForReport.accountIdsByLabel['prepaid_expenses'];
         if (filteredList.length > 0) {

package/lib/view/scheduleView/scheduleListView/epics/fetchSchedulesAccountEpic.d.ts

@@ -3,17 +3,5 @@ import { Observable } from 'rxjs';
 import { RootState } from '../../../../reducer';
 import { fetchSchedulesAccount } from '../scheduleListReducer';
 import { fetchAccountList } from '../../../accountList/accountListReducer';
-import { AccountListKeyType } from '../../../accountList/accountListState';
-import { AccountType } from '../../../../entity/account/accountState';
-import { SchedulesTypes } from '../../../../entity/jeSchedules/jeSchedulesTypes';
 export declare type ActionType = ReturnType<typeof fetchSchedulesAccount> | ReturnType<typeof fetchAccountList>;
 export declare const fetchSchedulesAccountEpic: (actions$: ActionsObservable<ActionType>, _state$: StateObservable<RootState>) => Observable<ActionType>;
-declare type AccountListTypesPayload = {
-    accountListKey: AccountListKeyType;
-    allowedAccountList: AccountType[];
-};
-/**
- * Helper functions
- */
-export declare const getAccountsTypesForSchedulePayload: (scheduleType: SchedulesTypes) => AccountListTypesPayload;
-export {};

package/lib/view/scheduleView/scheduleListView/epics/fetchSchedulesAccountEpic.js

@@ -1,37 +1,20 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getAccountsTypesForSchedulePayload = exports.fetchSchedulesAccountEpic = void 0;
+exports.fetchSchedulesAccountEpic = void 0;
 const rxjs_1 = require("rxjs");
 const operators_1 = require("rxjs/operators");
 const scheduleListReducer_1 = require("../scheduleListReducer");
 const accountListReducer_1 = require("../../../accountList/accountListReducer");
+const scheduleListHelper_1 = require("../scheduleListHelper");
 const fetchSchedulesAccountEpic = (actions$, 
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
 _state$) => actions$.pipe((0, operators_1.filter)(scheduleListReducer_1.fetchSchedulesAccount.match), (0, operators_1.mergeMap)(() => {
     const fetchScheduleListActions = [];
     const scheduleTabIds = ['prepaid_expenses'];
     scheduleTabIds.forEach((scheduleTab) => {
-        const accountType = (0, exports.getAccountsTypesForSchedulePayload)(scheduleTab);
+        const accountType = (0, scheduleListHelper_1.getAccountsTypesForSchedulePayload)(scheduleTab);
         fetchScheduleListActions.push((0, accountListReducer_1.fetchAccountList)(accountType.accountListKey, false, false, false, false, accountType.allowedAccountList));
     });
     return (0, rxjs_1.from)(fetchScheduleListActions);
 }));
 exports.fetchSchedulesAccountEpic = fetchSchedulesAccountEpic;
-/**
- * Helper functions
- */
-const getAccountsTypesForSchedulePayload = (scheduleType) => {
-    switch (scheduleType) {
-        case 'prepaid_expenses':
-            return {
-                accountListKey: 'prepaidExpenseAccountList',
-                allowedAccountList: ['other_current_assets'],
-            };
-        default:
-            return {
-                accountListKey: 'accountList',
-                allowedAccountList: [],
-            };
-    }
-};
-exports.getAccountsTypesForSchedulePayload = getAccountsTypesForSchedulePayload;

package/lib/view/scheduleView/scheduleListView/scheduleListHelper.d.ts

@@ -2,9 +2,10 @@ import { NestedAccountHeirarchyForReport } from '../../../commonStateTypes/accou
 import { Amount } from '../../../commonStateTypes/amount';
 import { COABalance, COABalanceGroupedByPeriod } from '../../../commonStateTypes/coaBalance/coaBalance';
 import { TimeframeTickWithMetaData } from '../../../commonStateTypes/timeframeTick';
-import { AccountBase } from '../../../entity/account/accountState';
+import { AccountBase, AccountType } from '../../../entity/account/accountState';
 import { JEScheduledTransaction, ScheduledJournalEntry } from '../../../entity/jeSchedules/jeSchedulesSelector';
 import { SchedulesTypes } from '../../../entity/jeSchedules/jeSchedulesTypes';
+import { AccountListKeyType } from '../../accountList/accountListState';
 import { JEScheduledTransactionWithBalance } from './scheduleListSelector';
 export declare type TimeframeTickBalances = Record<string, COABalance[]>;
 export interface ScheduleTotalType {
@@ -74,3 +75,14 @@ export declare const calculateCOABalanceGroupedByPeriod: (jeSchedule: JESchedule
  * @returns
  */
 export declare const getDurationOfMonthOutTotalMonth: (jeSchedule: JEScheduledTransaction) => number;
+declare type AccountListTypesPayload = {
+    accountListKey: AccountListKeyType;
+    allowedAccountList: AccountType[];
+};
+/**
+ * Function to get accountListKey and allowedAccountList for a given tab
+ * @param scheduleType
+ * @returns
+ */
+export declare const getAccountsTypesForSchedulePayload: (scheduleType: SchedulesTypes) => AccountListTypesPayload;
+export {};

package/lib/view/scheduleView/scheduleListView/scheduleListHelper.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getDurationOfMonthOutTotalMonth = exports.calculateCOABalanceGroupedByPeriod = exports.mapScheduleJournalToCOABalance = exports.calculateTotalBalanceTimeframeTick = exports.setDefaultTotalBalanceTimeframeTicks = exports.mapTotalBalanceTimeframeTickToCOAGroupedBalance = exports.getAllTimeframeTicks = exports.getAllAccountNested = exports.getAllAccountBase = exports.getAccountListKeyForSchedulesTab = exports.getCalculatedScheduleTotals = void 0;
+exports.getAccountsTypesForSchedulePayload = exports.getDurationOfMonthOutTotalMonth = exports.calculateCOABalanceGroupedByPeriod = exports.mapScheduleJournalToCOABalance = exports.calculateTotalBalanceTimeframeTick = exports.setDefaultTotalBalanceTimeframeTicks = exports.mapTotalBalanceTimeframeTickToCOAGroupedBalance = exports.getAllTimeframeTicks = exports.getAllAccountNested = exports.getAllAccountBase = exports.getAccountListKeyForSchedulesTab = exports.getCalculatedScheduleTotals = void 0;
 const amount_1 = require("../../../commonStateTypes/amount");
 const formatZeniDateFY_1 = require("../../../commonStateTypes/fiscalYearHelpers/formatZeniDateFY");
 const getFYMonths_1 = require("../../../commonStateTypes/fiscalYearHelpers/getFYMonths");
@@ -202,3 +202,23 @@ const getDurationOfMonthOutTotalMonth = (jeSchedule) => {
     return totalDurationCompleted;
 };
 exports.getDurationOfMonthOutTotalMonth = getDurationOfMonthOutTotalMonth;
+/**
+ * Function to get accountListKey and allowedAccountList for a given tab
+ * @param scheduleType
+ * @returns
+ */
+const getAccountsTypesForSchedulePayload = (scheduleType) => {
+    switch (scheduleType) {
+        case 'prepaid_expenses':
+            return {
+                accountListKey: 'prepaidExpenseAccountList',
+                allowedAccountList: ['other_current_assets'],
+            };
+        default:
+            return {
+                accountListKey: 'accountList',
+                allowedAccountList: [],
+            };
+    }
+};
+exports.getAccountsTypesForSchedulePayload = getAccountsTypesForSchedulePayload;

package/lib/view/scheduleView/scheduleListView/scheduleListSelector.js

@@ -12,6 +12,8 @@ const scheduleListReducer_1 = require("./scheduleListReducer");
 const scheduleListTypes_1 = require("./scheduleListTypes");
 const amount_1 = require("../../../commonStateTypes/amount");
 const scheduleListHelper_1 = require("./scheduleListHelper");
+const scheduleListHelper_2 = require("./scheduleListHelper");
+const accountSelector_1 = require("../../../entity/account/accountSelector");
 const sortedJETransactionsView = (jeTransactions, sortKey, sortOrder) => {
     return (0, orderBy_1.default)(jeTransactions, (jeTransaction) => {
         var _a;
@@ -69,12 +71,15 @@ const getScheduleListReport = (state) => {
     const allScheduleAccounts = (0, accountListSelector_1.getAccountList)(accountState, accountListState, (0, scheduleListHelper_1.getAccountListKeyForSchedulesTab)(scheduleListState.currentTab));
     let allNestedAccounts = (0, accountListSelector_1.getNestedAccountListHeirarchy)(accountListState, (0, scheduleListHelper_1.getAccountListKeyForSchedulesTab)(scheduleListState.currentTab));
     let allAccounts = allScheduleAccounts.accounts;
+    const scheduleListCurrentTabAccountTypes = (0, scheduleListHelper_2.getAccountsTypesForSchedulePayload)(scheduleListState.currentTab).allowedAccountList;
+    const scheduleListCurrentTabAccountIds = (0, accountSelector_1.getAccountIdsForTypes)(accountState, scheduleListCurrentTabAccountTypes);
     if (scheduleListState.currentTab === 'prepaid_expenses') {
         const filteredList = (0, accountListSelector_1.getFilteredNestedAndAccountListsForLabel)(accountState, accountListState, (0, scheduleListHelper_1.getAccountListKeyForSchedulesTab)(scheduleListState.currentTab), 'prepaid_expenses');
         // Use this list only if there is some account in it.
         if (filteredList.accountList.length > 0) {
-            allAccounts = filteredList.accountList;
-            allNestedAccounts = filteredList.nestedAccountList;
+            allAccounts = filteredList.accountList.filter((account) => scheduleListCurrentTabAccountIds.includes(account.accountId));
+            allNestedAccounts = filteredList.nestedAccountList.filter((account) => account.accountId[0] != null &&
+                scheduleListCurrentTabAccountIds.includes(account.accountId[0]));
         }
     }
     if (scheduleListRecord == null) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zeniai/client-epic-state",
-  "version": "4.8.3",
+  "version": "4.8.4",
   "description": "Shared module between Web & Mobile containing required abstractions for state management, async network communication. ",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",