@zeniai/client-epic-state 4.8.86 → 4.8.87

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

@@ -1,11 +1,16 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getAccountsTypesForScheduleEpics = exports.getAccountLabelForScheduleType = exports.getAccountsTypesForScheduleList = 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.getAccountsTypesForScheduleEpics = exports.getAccountLabelForScheduleType = exports.getAccountsTypesForScheduleList = exports.getDurationOfMonthOutTotalMonth = exports.calculateCOABalanceGroupedByPeriod = exports.mapScheduleJournalToCOABalance = exports.calculateTotalBalanceTimeframeTick = exports.setDefaultTotalBalanceTimeframeTicks = exports.mapTotalBalanceTimeframeTickToCOAGroupedBalance = exports.getAllTimeframeTicks = exports.getAllAccountNested = exports.getAllAccountBase = exports.getAccountLabelForSchedulesTab = exports.getAccountListKeyForSchedules = exports.getCalculatedScheduleTotals = exports.scheduleTypesAccountLabels = void 0;
 const amount_1 = require("../../../commonStateTypes/amount");
 const formatZeniDateFY_1 = require("../../../commonStateTypes/fiscalYearHelpers/formatZeniDateFY");
 const getFYMonths_1 = require("../../../commonStateTypes/fiscalYearHelpers/getFYMonths");
 const zeniDayJS_1 = require("../../../zeniDayJS");
-const scheduleDetailLocalDataHelper_1 = require("../scheduleDetailView/scheduleDetailLocalDataHelper");
+exports.scheduleTypesAccountLabels = {
+    prepaid_expenses: 'other_current_assets',
+    fixed_assets: 'fixed_assets',
+    accrued_expenses: 'other_expense',
+    deferred_revenue: 'other_income',
+};
 /**
  * This helper function calculates Total Amount and Total Running balances
  * for all the JE transactions which can be used to display the totals on the Schedule List page.
@@ -32,17 +37,21 @@ const getCalculatedScheduleTotals = (jeTransactions) => {
     };
 };
 exports.getCalculatedScheduleTotals = getCalculatedScheduleTotals;
-const getAccountListKeyForSchedulesTab = (scheduleTab) => {
-    switch (scheduleTab) {
+const getAccountListKeyForSchedules = () => {
+    return 'schedulesAccountList';
+};
+exports.getAccountListKeyForSchedules = getAccountListKeyForSchedules;
+const getAccountLabelForSchedulesTab = (tab) => {
+    switch (tab) {
         case 'prepaid_expenses':
-            return 'prepaidExpenseAccountList';
-        case 'accured_expenses':
-        case 'deferred_revenue':
         case 'fixed_assets':
-            return 'accountList';
+            return tab;
+        case 'accrued_expenses':
+        case 'deferred_revenue':
+            return 'uncategorized_expense';
     }
 };
-exports.getAccountListKeyForSchedulesTab = getAccountListKeyForSchedulesTab;
+exports.getAccountLabelForSchedulesTab = getAccountLabelForSchedulesTab;
 const getAllAccountBase = () => ({
     accountDescription: 'All',
     accountId: 'all',
@@ -214,9 +223,14 @@ const getAccountsTypesForScheduleList = (scheduleType) => {
     switch (scheduleType) {
         case 'prepaid_expenses':
             return {
-                accountListKey: 'prepaidExpenseAccountList',
+                accountListKey: 'schedulesAccountList',
                 allowedAccountList: ['other_current_assets'],
             };
+        case 'fixed_assets':
+            return {
+                accountListKey: 'schedulesAccountList',
+                allowedAccountList: ['fixed_assets'],
+            };
         default:
             return {
                 accountListKey: 'accountList',
@@ -228,7 +242,8 @@ exports.getAccountsTypesForScheduleList = getAccountsTypesForScheduleList;
 const getAccountLabelForScheduleType = (scheduleType) => {
     switch (scheduleType) {
         case 'prepaid_expenses':
-            return 'prepaid_expenses';
+        case 'fixed_assets':
+            return scheduleType;
         default:
             return undefined;
     }
@@ -239,22 +254,16 @@ exports.getAccountLabelForScheduleType = getAccountLabelForScheduleType;
  * @param scheduleType
  * @returns
  */
-const getAccountsTypesForScheduleEpics = (scheduleType) => {
-    const allowedAccountTypes = [
-        ...(0, exports.getAccountsTypesForScheduleList)(scheduleType).allowedAccountList,
-        ...(0, scheduleDetailLocalDataHelper_1.getAccountsTypesForScheduleDetails)(scheduleType),
-    ];
-    switch (scheduleType) {
-        case 'prepaid_expenses':
-            return {
-                accountListKey: 'prepaidExpenseAccountList',
-                allowedAccountList: [...new Set(allowedAccountTypes)],
-            };
-        default:
-            return {
-                accountListKey: 'accountList',
-                allowedAccountList: [],
-            };
-    }
+const getAccountsTypesForScheduleEpics = () => {
+    return {
+        accountListKey: 'schedulesAccountList',
+        allowedAccountList: [
+            'other_current_assets',
+            'fixed_assets',
+            'cogs',
+            'expenses',
+            'other_expense',
+        ],
+    };
 };
 exports.getAccountsTypesForScheduleEpics = getAccountsTypesForScheduleEpics;

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

@@ -1,11 +1,16 @@
-import { ScheduleListLocalData, ScheduleListViewState, ScheduleWithListStatus, ScheduleListUIState } from './scheduleListState';
+import { ScheduleListLocalData, ScheduleListViewState, ScheduleListForTypeState, JESchedulesForTypeState, ScheduleListUIState } from './scheduleListState';
+import { SortOrder } from '../../../commonStateTypes/selectorTypes/sortOrderTypes';
 import { FetchState, ID } from '../../../commonStateTypes/common';
 import { TimeframeTick } from '../../../commonStateTypes/timeframeTick';
 import { ZeniAPIStatus } from '../../../responsePayload';
+import { ScheduleListSortKey } from './scheduleListTypes';
 import { JEScheduledTransactionPayload } from '../../../entity/jeSchedules/jeSchedulesPayload';
+import { ScheduleTypes } from '../../../entity/jeSchedules/jeSchedulesTypes';
+export declare const initialUIState: ScheduleListUIState;
+export declare const initialJESchedulesForTypeState: JESchedulesForTypeState;
+export declare const initialScheduleListStateByType: ScheduleListForTypeState;
 export declare const initialState: ScheduleListViewState;
-export declare const scheduleListInitialState: ScheduleWithListStatus;
-export declare const fetchDownloadSchedules: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[tab: "prepaid_expenses" | "fixed_assets" | "accured_expenses" | "deferred_revenue", timeframeAndCategory: {
+export declare const fetchDownloadSchedules: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[tab: "prepaid_expenses" | "fixed_assets" | "accrued_expenses" | "deferred_revenue", timeframeAndCategory: {
     selectedTimeframe: TimeframeTick;
     selectedCategoryId: ID;
 }, downloadCategories: string[], cacheOverride?: any], {
@@ -13,10 +18,10 @@ export declare const fetchDownloadSchedules: import("@reduxjs/toolkit").ActionCr
         selectedTimeframe: TimeframeTick;
         selectedCategoryId: ID;
     };
-    tab: "prepaid_expenses" | "fixed_assets" | "accured_expenses" | "deferred_revenue";
+    tab: "prepaid_expenses" | "fixed_assets" | "accrued_expenses" | "deferred_revenue";
     cacheOverride: any;
     downloadCategories: string[];
-}, string, never, never>, fetchScheduleList: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[tab: "prepaid_expenses" | "fixed_assets" | "accured_expenses" | "deferred_revenue", timeframeAndCategory?: {
+}, string, never, never>, fetchScheduleList: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[tab: "prepaid_expenses" | "fixed_assets" | "accrued_expenses" | "deferred_revenue", timeframeAndCategory?: {
     selectedTimeframe: TimeframeTick;
     selectedCategoryId: ID;
 } | undefined, cacheOverride?: any], {
@@ -24,32 +29,36 @@ export declare const fetchDownloadSchedules: import("@reduxjs/toolkit").ActionCr
         selectedTimeframe: TimeframeTick;
         selectedCategoryId: ID;
     } | undefined;
-    tab: "prepaid_expenses" | "fixed_assets" | "accured_expenses" | "deferred_revenue";
+    tab: "prepaid_expenses" | "fixed_assets" | "accrued_expenses" | "deferred_revenue";
     cacheOverride: any;
-}, string, never, never>, fetchSchedulesAccount: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[tab: "prepaid_expenses" | "fixed_assets" | "accured_expenses" | "deferred_revenue"], {
-    tab: "prepaid_expenses" | "fixed_assets" | "accured_expenses" | "deferred_revenue";
-}, string, never, never>, updateScheduleListSuccess: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[tab: "prepaid_expenses" | "fixed_assets" | "accured_expenses" | "deferred_revenue", selectedTimeframe: TimeframeTick, selectedCategoryId: string, scheduleList: JEScheduledTransactionPayload[]], {
-    tab: "prepaid_expenses" | "fixed_assets" | "accured_expenses" | "deferred_revenue";
+}, string, never, never>, fetchSchedulesAccount: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[tab: "prepaid_expenses" | "fixed_assets" | "accrued_expenses" | "deferred_revenue"], {
+    tab: "prepaid_expenses" | "fixed_assets" | "accrued_expenses" | "deferred_revenue";
+}, string, never, never>, updateScheduleListSuccess: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[tab: "prepaid_expenses" | "fixed_assets" | "accrued_expenses" | "deferred_revenue", selectedTimeframe: TimeframeTick, selectedCategoryId: string, scheduleList: JEScheduledTransactionPayload[]], {
+    tab: "prepaid_expenses" | "fixed_assets" | "accrued_expenses" | "deferred_revenue";
     selectedTimeframe: TimeframeTick;
     selectedCategoryId: string;
     scheduleList: JEScheduledTransactionPayload[];
-}, string, never, never>, updateScheduleListFailure: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[tab: "prepaid_expenses" | "fixed_assets" | "accured_expenses" | "deferred_revenue", selectedTimeframe: TimeframeTick, selectedCategoryId: string, error: ZeniAPIStatus<Record<string, unknown>>], {
+}, string, never, never>, updateScheduleListFailure: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[tab: "prepaid_expenses" | "fixed_assets" | "accrued_expenses" | "deferred_revenue", selectedTimeframe: TimeframeTick, selectedCategoryId: string, error: ZeniAPIStatus<Record<string, unknown>>], {
     selectedCategoryId: string;
     selectedTimeframe: TimeframeTick;
-    tab: "prepaid_expenses" | "fixed_assets" | "accured_expenses" | "deferred_revenue";
+    tab: "prepaid_expenses" | "fixed_assets" | "accrued_expenses" | "deferred_revenue";
     error: ZeniAPIStatus<Record<string, unknown>>;
-}, string, never, never>, updateDownloadScheduleFailure: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[tab: "prepaid_expenses" | "fixed_assets" | "accured_expenses" | "deferred_revenue", selectedTimeframe: TimeframeTick, selectedCategoryId: string, error: ZeniAPIStatus<Record<string, unknown>>], {
+}, string, never, never>, updateDownloadScheduleFailure: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[tab: "prepaid_expenses" | "fixed_assets" | "accrued_expenses" | "deferred_revenue", selectedTimeframe: TimeframeTick, selectedCategoryId: string, error: ZeniAPIStatus<Record<string, unknown>>], {
     selectedCategoryId: string;
     selectedTimeframe: TimeframeTick;
-    tab: "prepaid_expenses" | "fixed_assets" | "accured_expenses" | "deferred_revenue";
+    tab: "prepaid_expenses" | "fixed_assets" | "accrued_expenses" | "deferred_revenue";
     error: ZeniAPIStatus<Record<string, unknown>>;
-}, string, never, never>, updateDownloadScheduleSuccess: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[tab: "prepaid_expenses" | "fixed_assets" | "accured_expenses" | "deferred_revenue", selectedTimeframe: TimeframeTick, selectedCategoryId: string, scheduleList: JEScheduledTransactionPayload[]], {
-    tab: "prepaid_expenses" | "fixed_assets" | "accured_expenses" | "deferred_revenue";
+}, string, never, never>, updateDownloadScheduleSuccess: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[tab: "prepaid_expenses" | "fixed_assets" | "accrued_expenses" | "deferred_revenue", selectedTimeframe: TimeframeTick, selectedCategoryId: string, scheduleList: JEScheduledTransactionPayload[]], {
+    tab: "prepaid_expenses" | "fixed_assets" | "accrued_expenses" | "deferred_revenue";
     selectedTimeframe: TimeframeTick;
     selectedCategoryId: string;
     scheduleList: JEScheduledTransactionPayload[];
-}, string, never, never>, updateScheduleListTab: import("@reduxjs/toolkit").ActionCreatorWithPayload<"prepaid_expenses" | "fixed_assets" | "accured_expenses" | "deferred_revenue", string>, updateScheduleListSubTab: import("@reduxjs/toolkit").ActionCreatorWithPayload<"all" | "new" | "completed" | "ongoing", string>, updateScheduleListUIState: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
-    uiState: Partial<ScheduleListUIState>;
+}, string, never, never>, updateScheduleListTab: import("@reduxjs/toolkit").ActionCreatorWithPayload<"prepaid_expenses" | "fixed_assets" | "accrued_expenses" | "deferred_revenue", string>, updateScheduleListSubTab: import("@reduxjs/toolkit").ActionCreatorWithPayload<"all" | "new" | "completed" | "ongoing", string>, updateScheduleListScrollState: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
+    scrollYOffset: number;
+}, string>, updateScheduleListSortState: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
+    sortKey: ScheduleListSortKey;
+    sortOrder: SortOrder;
 }, string>, updateScheduleListLocalData: import("@reduxjs/toolkit").ActionCreatorWithPayload<ScheduleListLocalData, string>, updateScheduleListSearchText: import("@reduxjs/toolkit").ActionCreatorWithPayload<string, string>, updateScheduleListDownloadState: import("@reduxjs/toolkit").ActionCreatorWithPayload<FetchState, string>, clearScheduleList: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<string>;
 declare const _default: import("@reduxjs/toolkit").Reducer<ScheduleListViewState, import("@reduxjs/toolkit").AnyAction>;
 export default _default;
+export declare function getState(state: ScheduleListViewState, tab: ScheduleTypes): ScheduleListForTypeState;

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

@@ -1,19 +1,36 @@
 "use strict";
 var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.clearScheduleList = exports.updateScheduleListDownloadState = exports.updateScheduleListSearchText = exports.updateScheduleListLocalData = exports.updateScheduleListUIState = exports.updateScheduleListSubTab = exports.updateScheduleListTab = exports.updateDownloadScheduleSuccess = exports.updateDownloadScheduleFailure = exports.updateScheduleListFailure = exports.updateScheduleListSuccess = exports.fetchSchedulesAccount = exports.fetchScheduleList = exports.fetchDownloadSchedules = exports.scheduleListInitialState = exports.initialState = void 0;
+exports.getState = exports.clearScheduleList = exports.updateScheduleListDownloadState = exports.updateScheduleListSearchText = exports.updateScheduleListLocalData = exports.updateScheduleListSortState = exports.updateScheduleListScrollState = exports.updateScheduleListSubTab = exports.updateScheduleListTab = exports.updateDownloadScheduleSuccess = exports.updateDownloadScheduleFailure = exports.updateScheduleListFailure = exports.updateScheduleListSuccess = exports.fetchSchedulesAccount = exports.fetchScheduleList = exports.fetchDownloadSchedules = exports.initialState = exports.initialScheduleListStateByType = exports.initialJESchedulesForTypeState = exports.initialUIState = void 0;
 const toolkit_1 = require("@reduxjs/toolkit");
 const zeniDayJS_1 = require("../../../zeniDayJS");
 const transactionIDPayload_1 = require("../../../entity/transaction/payloadTypes/transactionIDPayload");
 const scheduleListTypes_1 = require("./scheduleListTypes");
 const transactionDetailState_1 = require("../../transactionDetail/transactionDetailState");
-exports.initialState = {
-    byScheduleListKey: {},
-    currentTab: 'prepaid_expenses',
+exports.initialUIState = {
+    sortKey: 'transactionDate',
+    sortOrder: 'descending',
+    scrollYOffset: {
+        all: 0,
+        new: 0,
+        ongoing: 0,
+        completed: 0,
+    },
     currentSubTab: 'all',
     searchText: '',
+};
+exports.initialJESchedulesForTypeState = {
+    hasValidState() {
+        return this.fetchState === 'Completed';
+    },
+    fetchState: 'Not-Started',
+    error: undefined,
+    jeScheduleTransactionKeys: [],
+};
+exports.initialScheduleListStateByType = {
+    jeScheduleKeysByListKey: {},
     scheduleListLocalData: {
-        selectedCategoryID: 'all',
+        selectedCategoryId: 'all',
         selectedTimeframe: {
             startDate: (0, zeniDayJS_1.dateNow)().subtract(1, 'year'),
             endDate: (0, zeniDayJS_1.dateNow)(),
@@ -28,19 +45,16 @@ exports.initialState = {
         fetchState: 'Not-Started',
         error: undefined,
     },
+    uiState: exports.initialUIState,
 };
-exports.scheduleListInitialState = {
-    fetchState: 'Not-Started',
-    error: undefined,
-    jeScheduleTransactionKeys: [],
-    uiState: {
-        sortKey: 'transactionDate',
-        sortOrder: 'descending',
-        scrollYOffset: 0,
-    },
-    hasValidState() {
-        return this.fetchState === 'Completed';
+exports.initialState = {
+    listByScheduleType: {
+        prepaid_expenses: exports.initialScheduleListStateByType,
+        fixed_assets: exports.initialScheduleListStateByType,
+        deferred_revenue: exports.initialScheduleListStateByType,
+        accrued_expenses: exports.initialScheduleListStateByType,
     },
+    currentTab: 'prepaid_expenses',
 };
 const scheduleListView = (0, toolkit_1.createSlice)({
     name: 'scheduleListView',
@@ -48,25 +62,25 @@ const scheduleListView = (0, toolkit_1.createSlice)({
     reducers: {
         fetchDownloadSchedules: {
             reducer(draft, action) {
+                const state = getState(draft, action.payload.tab);
                 const selectedTimeframe = action.payload.timeframeAndCategory.selectedTimeframe;
-                const selectedCategoryID = action.payload.timeframeAndCategory.selectedCategoryId;
-                draft.scheduleListLocalData = {
+                const selectedCategoryId = action.payload.timeframeAndCategory.selectedCategoryId;
+                state.scheduleListLocalData = {
                     selectedTimeframe,
-                    selectedCategoryID: selectedCategoryID,
+                    selectedCategoryId: selectedCategoryId,
+                };
+                const key = (0, scheduleListTypes_1.getScheduleListKey)(selectedCategoryId, selectedTimeframe);
+                const record = state.jeScheduleKeysByListKey[key];
+                state.selectedCategoryId = selectedCategoryId;
+                state.selectedTimeframe = selectedTimeframe;
+                state.downloadState = {
+                    fetchState: 'In-Progress',
+                    error: undefined,
                 };
-                const key = (0, scheduleListTypes_1.getScheduleListKey)(action.payload.tab, selectedCategoryID, selectedTimeframe);
-                const record = draft.byScheduleListKey[key];
                 if (record == null) {
-                    draft.byScheduleListKey[key] = Object.assign({}, exports.scheduleListInitialState);
-                    draft.downloadState = {
-                        fetchState: 'In-Progress',
-                        error: undefined,
-                    };
-                }
-                else {
-                    draft.selectedCategoryId = selectedCategoryID;
-                    draft.selectedTimeframe = selectedTimeframe;
+                    state.jeScheduleKeysByListKey[key] = Object.assign({}, exports.initialJESchedulesForTypeState);
                 }
+                updateState(draft, action.payload.tab, state);
             },
             prepare(tab, timeframeAndCategory, downloadCategories, cacheOverride = false) {
                 return {
@@ -91,23 +105,25 @@ const scheduleListView = (0, toolkit_1.createSlice)({
         },
         fetchScheduleList: {
             reducer(draft, action) {
+                const state = getState(draft, action.payload.tab);
                 const selectedTimeframe = action.payload.timeframeAndCategory != null
                     ? action.payload.timeframeAndCategory.selectedTimeframe
-                    : draft.scheduleListLocalData.selectedTimeframe;
-                const selectedCategoryID = action.payload.timeframeAndCategory != null
+                    : state.selectedTimeframe;
+                const selectedCategoryId = action.payload.timeframeAndCategory != null
                     ? action.payload.timeframeAndCategory.selectedCategoryId
-                    : draft.scheduleListLocalData.selectedCategoryID;
-                const key = (0, scheduleListTypes_1.getScheduleListKey)(action.payload.tab, selectedCategoryID, selectedTimeframe);
-                const record = draft.byScheduleListKey[key];
-                draft.scheduleListLocalData = {
+                    : state.selectedCategoryId;
+                const key = (0, scheduleListTypes_1.getScheduleListKey)(selectedCategoryId, selectedTimeframe);
+                const record = state.jeScheduleKeysByListKey[key];
+                state.scheduleListLocalData = {
                     selectedTimeframe,
-                    selectedCategoryID,
+                    selectedCategoryId,
                 };
-                draft.selectedCategoryId = selectedCategoryID;
-                draft.selectedTimeframe = selectedTimeframe;
+                state.selectedCategoryId = selectedCategoryId;
+                state.selectedTimeframe = selectedTimeframe;
                 if (record == null) {
-                    draft.byScheduleListKey[key] = Object.assign(Object.assign({}, exports.scheduleListInitialState), { fetchState: 'In-Progress' });
+                    state.jeScheduleKeysByListKey[key] = Object.assign(Object.assign({}, exports.initialJESchedulesForTypeState), { fetchState: 'In-Progress' });
                 }
+                updateState(draft, action.payload.tab, state);
             },
             prepare(tab, timeframeAndCategory, cacheOverride = false) {
                 return {
@@ -131,10 +147,12 @@ const scheduleListView = (0, toolkit_1.createSlice)({
         },
         updateScheduleListFailure: {
             reducer(draft, action) {
-                const key = (0, scheduleListTypes_1.getScheduleListKey)(action.payload.tab, action.payload.selectedCategoryId, action.payload.selectedTimeframe);
-                draft.byScheduleListKey[key] = Object.assign(Object.assign({}, exports.scheduleListInitialState), { fetchState: 'Error', error: action.payload.error });
-                draft.selectedCategoryId = action.payload.selectedCategoryId;
-                draft.selectedTimeframe = action.payload.selectedTimeframe;
+                const state = getState(draft, action.payload.tab);
+                const key = (0, scheduleListTypes_1.getScheduleListKey)(action.payload.selectedCategoryId, action.payload.selectedTimeframe);
+                state.jeScheduleKeysByListKey[key] = Object.assign(Object.assign({}, exports.initialJESchedulesForTypeState), { fetchState: 'Error', error: action.payload.error });
+                state.selectedCategoryId = action.payload.selectedCategoryId;
+                state.selectedTimeframe = action.payload.selectedTimeframe;
+                updateState(draft, action.payload.tab, state);
             },
             prepare(tab, selectedTimeframe, selectedCategoryId, error) {
                 return { payload: { selectedCategoryId, selectedTimeframe, tab, error } };
@@ -152,14 +170,16 @@ const scheduleListView = (0, toolkit_1.createSlice)({
         },
         updateDownloadScheduleFailure: {
             reducer(draft, action) {
-                const key = (0, scheduleListTypes_1.getScheduleListKey)(action.payload.tab, action.payload.selectedCategoryId, action.payload.selectedTimeframe);
-                draft.byScheduleListKey[key] = Object.assign(Object.assign({}, exports.scheduleListInitialState), { error: action.payload.error });
-                draft.selectedCategoryId = action.payload.selectedCategoryId;
-                draft.selectedTimeframe = action.payload.selectedTimeframe;
-                draft.downloadState = {
+                const state = getState(draft, action.payload.tab);
+                const key = (0, scheduleListTypes_1.getScheduleListKey)(action.payload.selectedCategoryId, action.payload.selectedTimeframe);
+                state.jeScheduleKeysByListKey[key] = Object.assign(Object.assign({}, exports.initialJESchedulesForTypeState), { error: action.payload.error });
+                state.selectedCategoryId = action.payload.selectedCategoryId;
+                state.selectedTimeframe = action.payload.selectedTimeframe;
+                state.downloadState = {
                     fetchState: 'Error',
                     error: action.payload.error,
                 };
+                updateState(draft, action.payload.tab, state);
             },
             prepare(tab, selectedTimeframe, selectedCategoryId, error) {
                 return { payload: { selectedCategoryId, selectedTimeframe, tab, error } };
@@ -169,57 +189,70 @@ const scheduleListView = (0, toolkit_1.createSlice)({
             draft.currentTab = action.payload;
         },
         updateScheduleListSearchText(draft, action) {
-            draft.searchText = action.payload;
+            const state = getState(draft, draft.currentTab);
+            state.uiState.searchText = action.payload;
+            updateState(draft, draft.currentTab, state);
         },
         updateScheduleListSubTab(draft, action) {
-            draft.currentSubTab = action.payload;
+            const state = getState(draft, draft.currentTab);
+            state.uiState.currentSubTab = action.payload;
+            updateState(draft, draft.currentTab, state);
         },
-        updateScheduleListUIState(draft, action) {
+        updateScheduleListSortState(draft, action) {
             const tab = draft.currentTab;
-            const key = (0, scheduleListTypes_1.getScheduleListKey)(tab, draft.selectedCategoryId, draft.selectedTimeframe);
-            if (draft.byScheduleListKey[key] != null) {
-                if (action.payload.uiState.sortKey != null) {
-                    draft.byScheduleListKey[key].uiState.sortKey =
-                        action.payload.uiState.sortKey;
-                }
-                if (action.payload.uiState.sortOrder != null) {
-                    draft.byScheduleListKey[key].uiState.sortOrder =
-                        action.payload.uiState.sortOrder;
-                }
-                if (action.payload.uiState.scrollYOffset != null) {
-                    draft.byScheduleListKey[key].uiState.scrollYOffset =
-                        action.payload.uiState.scrollYOffset;
-                }
-            }
+            const state = getState(draft, tab);
+            state.uiState.sortKey = action.payload.sortKey;
+            state.uiState.sortOrder = action.payload.sortOrder;
+            updateState(draft, tab, state);
+        },
+        updateScheduleListScrollState(draft, action) {
+            const tab = draft.currentTab;
+            const state = getState(draft, tab);
+            state.uiState.scrollYOffset[state.uiState.currentSubTab] =
+                action.payload.scrollYOffset;
+            updateState(draft, tab, state);
         },
         updateScheduleListLocalData(draft, action) {
-            draft.scheduleListLocalData = action.payload;
+            const state = getState(draft, draft.currentTab);
+            state.scheduleListLocalData = action.payload;
+            updateState(draft, draft.currentTab, state);
         },
         updateScheduleListDownloadState(draft, action) {
-            draft.downloadState = { fetchState: action.payload, error: undefined };
+            const state = getState(draft, draft.currentTab);
+            state.downloadState = { fetchState: action.payload, error: undefined };
+            updateState(draft, draft.currentTab, state);
         },
         clearScheduleList(draft) {
             Object.assign(draft, exports.initialState);
         },
     },
 });
-_a = scheduleListView.actions, exports.fetchDownloadSchedules = _a.fetchDownloadSchedules, exports.fetchScheduleList = _a.fetchScheduleList, exports.fetchSchedulesAccount = _a.fetchSchedulesAccount, exports.updateScheduleListSuccess = _a.updateScheduleListSuccess, exports.updateScheduleListFailure = _a.updateScheduleListFailure, exports.updateDownloadScheduleFailure = _a.updateDownloadScheduleFailure, exports.updateDownloadScheduleSuccess = _a.updateDownloadScheduleSuccess, exports.updateScheduleListTab = _a.updateScheduleListTab, exports.updateScheduleListSubTab = _a.updateScheduleListSubTab, exports.updateScheduleListUIState = _a.updateScheduleListUIState, exports.updateScheduleListLocalData = _a.updateScheduleListLocalData, exports.updateScheduleListSearchText = _a.updateScheduleListSearchText, exports.updateScheduleListDownloadState = _a.updateScheduleListDownloadState, exports.clearScheduleList = _a.clearScheduleList;
+_a = scheduleListView.actions, exports.fetchDownloadSchedules = _a.fetchDownloadSchedules, exports.fetchScheduleList = _a.fetchScheduleList, exports.fetchSchedulesAccount = _a.fetchSchedulesAccount, exports.updateScheduleListSuccess = _a.updateScheduleListSuccess, exports.updateScheduleListFailure = _a.updateScheduleListFailure, exports.updateDownloadScheduleFailure = _a.updateDownloadScheduleFailure, exports.updateDownloadScheduleSuccess = _a.updateDownloadScheduleSuccess, exports.updateScheduleListTab = _a.updateScheduleListTab, exports.updateScheduleListSubTab = _a.updateScheduleListSubTab, exports.updateScheduleListScrollState = _a.updateScheduleListScrollState, exports.updateScheduleListSortState = _a.updateScheduleListSortState, exports.updateScheduleListLocalData = _a.updateScheduleListLocalData, exports.updateScheduleListSearchText = _a.updateScheduleListSearchText, exports.updateScheduleListDownloadState = _a.updateScheduleListDownloadState, exports.clearScheduleList = _a.clearScheduleList;
 exports.default = scheduleListView.reducer;
 /**
  * Helper functions
  */
 function doUpdateScheduleList(draft, payload, tab, selectedTimeframe, selectedCategoryId) {
+    const state = getState(draft, tab);
     const jeScheduleTransactionKeys = payload.map((schedules) => {
         const transactionID = (0, transactionIDPayload_1.toTransactionID)(schedules.base_transaction);
         return (0, transactionDetailState_1.getZeniTransactionDetailKey)(transactionID);
     });
-    draft.selectedCategoryId = selectedCategoryId;
-    draft.selectedTimeframe = selectedTimeframe;
-    const key = (0, scheduleListTypes_1.getScheduleListKey)(tab, selectedCategoryId, selectedTimeframe);
-    const record = draft.byScheduleListKey[key];
-    draft.byScheduleListKey[key] = Object.assign(Object.assign({}, record), { fetchState: 'Completed', error: undefined, jeScheduleTransactionKeys });
-    draft.downloadState = {
+    state.selectedCategoryId = selectedCategoryId;
+    state.selectedTimeframe = selectedTimeframe;
+    const key = (0, scheduleListTypes_1.getScheduleListKey)(selectedCategoryId, selectedTimeframe);
+    const record = state.jeScheduleKeysByListKey[key];
+    state.jeScheduleKeysByListKey[key] = Object.assign(Object.assign({}, record), { fetchState: 'Completed', error: undefined, jeScheduleTransactionKeys });
+    state.downloadState = {
         fetchState: 'Completed',
         error: undefined,
     };
 }
+function updateState(state, tab, updates) {
+    const listState = state.listByScheduleType[tab];
+    state.listByScheduleType[tab] = Object.assign(Object.assign({}, listState), updates);
+}
+function getState(state, tab) {
+    return state.listByScheduleType[tab];
+}
+exports.getState = getState;

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

@@ -7,8 +7,7 @@ import { NestedAccountHeirarchyForReport } from '../../../commonStateTypes/accou
 import { TimeframeTick, TimeframeTickWithMetaData } from '../../../commonStateTypes/timeframeTick';
 import { AccountBase } from '../../../entity/account/accountState';
 import { JEScheduledTransaction } from '../../../entity/jeSchedules/jeSchedulesSelector';
-import { SchedulesTypes } from '../../../entity/jeSchedules/jeSchedulesTypes';
-import { ScheduleSubTabType } from './scheduleListTypes';
+import { ScheduleTypes } from '../../../entity/jeSchedules/jeSchedulesTypes';
 import { Amount } from '../../../commonStateTypes/amount';
 import { COABalanceGroupedByPeriod } from '../../../commonStateTypes/coaBalance/coaBalance';
 export interface JEScheduledTransactionWithBalance extends JEScheduledTransaction {
@@ -16,17 +15,14 @@ export interface JEScheduledTransactionWithBalance extends JEScheduledTransactio
     durationOfMonths: number;
 }
 export interface ScheduleListReport extends SelectorView {
-    allSubTabs: ScheduleSubTabType[];
-    currentTab: SchedulesTypes;
-    currentSubTab: ScheduleSubTabType;
+    currentTab: ScheduleTypes;
     downloadUIState: FetchStateAndError;
     jeScheduleOrder: EntityOrder;
     jeScheduledTransactions: JEScheduledTransactionWithBalance[];
-    searchText: string;
     scheduleListAccounts: AccountBase[];
     scheduleListNestedAccountHierarchy: NestedAccountHeirarchyForReport[];
     uiState: ScheduleListUIState;
-    selectedCategoryID: ID;
+    selectedCategoryId: ID;
     selectedTimeframe: TimeframeTick;
     scheduleListLocalData: ScheduleListLocalData;
     allTimeframeTicks: TimeframeTickWithMetaData[];
@@ -36,4 +32,4 @@ export interface ScheduleListReport extends SelectorView {
     selectedScheduledId?: ID;
 }
 export declare const getScheduleListReport: (state: RootState) => ScheduleListReport;
-export declare const getFetchStateForScheduleAccountList: (state: RootState, scheduleTab: SchedulesTypes) => FetchState;
+export declare const getFetchStateForScheduleAccountList: (state: RootState) => FetchState;