@zeniai/client-epic-state 4.8.26 → 4.8.27

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

@@ -11,8 +11,8 @@ const initializeScheduleDetailLocalDataEpic = (actions$, state$) => actions$.pip
     const { scheduleDetailState } = state;
     const actions = [];
     const { selectedJeScheduleDetailId, selectedJEScheduleKey } = action.payload;
-    const jeScheduleTransactionState = (0, jeSchedulesSelector_1.getJEScheduledTransactionByJEScheduleKey)(selectedJEScheduleKey, state);
     if (selectedJeScheduleDetailId != null) {
+        const jeScheduleTransactionState = (0, jeSchedulesSelector_1.getJEScheduledTransactionByJEScheduleKey)(selectedJEScheduleKey, state);
         const scheduledJournalEntry = jeScheduleTransactionState.scheduledJournalEntry;
         if (selectedJEScheduleKey != null) {
             actions.push((0, scheduleDetailReducer_1.updateScheduleDetailsLocalData)({
@@ -22,10 +22,8 @@ const initializeScheduleDetailLocalDataEpic = (actions$, state$) => actions$.pip
         }
     }
     else {
-        // Initialize the start posting date with the start month of transaction
-        const transactionStartMonth = jeScheduleTransactionState.baseTransaction.date.endOf('month');
         actions.push((0, scheduleDetailReducer_1.updateScheduleDetailsLocalData)({
-            localData: Object.assign(Object.assign({}, scheduleDetailState.newScheduleState), { selectedDate: transactionStartMonth }),
+            localData: scheduleDetailState.newScheduleState,
             selectedJeScheduleDetailId: undefined,
         }));
     }

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

@@ -12,6 +12,7 @@ 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) => {
@@ -70,7 +71,7 @@ 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_1.getAccountsTypesForScheduleList)(scheduleListState.currentTab).allowedAccountList;
+    const scheduleListCurrentTabAccountTypes = (0, scheduleListHelper_2.getAccountsTypesForScheduleList)(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');

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

@@ -53,7 +53,8 @@ const getEditBillDetail = (state, isVendorRecommendationFeatureEnabled, billId)
     let contactDetails = [];
     const primaryPaymentAccount = (0, paymentAccountSelector_1.getPaymentAccountsByPaymentAccountIds)(paymentAccountState, (transaction === null || transaction === void 0 ? void 0 : transaction.billPayInfo.fromAccount.billAccountType) ===
         'paymentAccount' &&
-        (transaction === null || transaction === void 0 ? void 0 : transaction.billPayInfo.fromAccount.billAccountId) != null
+        (transaction === null || transaction === void 0 ? void 0 : transaction.billPayInfo.fromAccount.billAccountId) != null &&
+        (transaction === null || transaction === void 0 ? void 0 : transaction.billPayInfo.fromAccount.billAccountId.length) > 0
         ? /*
           for extsing transaction since we are not calling payment accounts
           we need to pick payment ids from billPayInfo object

package/lib/view/spendManagement/helpers.js

@@ -125,18 +125,8 @@ const getTotalPayments = (startDate, endDate, frequency, currentInstance) => {
         pastPayments = currentInstance.instance - 1;
     }
     let totalPayments = 0;
-    switch (frequency) {
-        case 'weekly':
-        case 'biweekly':
-            totalPayments = endDate.diff(currentStartDate, 'day') / getRecurringFrequencyInDays(frequency);
-            break;
-        case 'monthly':
-            totalPayments = endDate.diff(currentStartDate, 'month');
-            break;
-        case 'quarterly':
-            totalPayments = endDate.diff(currentStartDate, 'quarter');
-            break;
-    }
+    const offSetValue = getRecurringFrequencyInDays(frequency);
+    totalPayments = endDate.diff(currentStartDate, 'day') / offSetValue;
     return Math.floor(totalPayments + pastPayments) + 1; //+1 to include startDate
 };
 exports.getTotalPayments = getTotalPayments;
@@ -148,40 +138,17 @@ const getEndDate = (startDate, frequency, totalPayments, currentInstance) => {
         currentStartDate = currentInstance.vendorReceiveDate;
         currentTotalPayments = totalPayments - currentInstance.instance + 1;
     }
-    switch (frequency) {
-        case 'weekly':
-        case 'biweekly':
-            endDate = currentStartDate.add(getRecurringFrequencyInDays(frequency) * (currentTotalPayments - 1), 'day');
-            break;
-        case 'monthly':
-            endDate = currentStartDate.add(currentTotalPayments - 1, 'month');
-            break;
-        case 'quarterly':
-            endDate = currentStartDate.add(currentTotalPayments - 1, 'quarter');
-            break;
-    }
+    const offSetValue = getRecurringFrequencyInDays(frequency);
+    endDate = currentStartDate.add(offSetValue * (currentTotalPayments - 1), 'day');
     return endDate;
 };
 exports.getEndDate = getEndDate;
 function getRecurringBillInstances(startDate, frequency, totalPayments, currentInstance, billAmount) {
     const updatedInstances = [];
-    const getRecurringFrequencyWithOffset = (frequency) => {
-        switch (frequency) {
-            case 'weekly':
-                return { offSetValue: getRecurringFrequencyInDays(frequency), offSetUnit: 'day' };
-            case 'biweekly':
-                return { offSetValue: getRecurringFrequencyInDays(frequency), offSetUnit: 'day' };
-            case 'monthly':
-                return { offSetValue: 1, offSetUnit: 'month' };
-            case 'quarterly':
-                return { offSetValue: 1, offSetUnit: 'quarter' };
-        }
-    };
-    const { offSetValue, offSetUnit } = getRecurringFrequencyWithOffset(frequency);
+    const offSetValue = getRecurringFrequencyInDays(frequency);
     for (let i = 0; i < totalPayments; i++) {
-        updatedInstances.push(Object.assign({ instance: currentInstance + i, isDeleted: false, amount: billAmount }, checkIfHolidayAndGetNextDate(startDate.add(i * offSetValue, offSetUnit))));
+        updatedInstances.push(Object.assign({ instance: currentInstance + i, isDeleted: false, amount: billAmount }, checkIfHolidayAndGetNextDate(startDate.add(i * offSetValue, 'day'))));
     }
-    ;
     return updatedInstances;
 }
 function getRecurringFrequencyInDays(frequency) {

package/package.json

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