@zeniai/client-epic-state 4.8.22 → 4.8.24

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

@@ -51,14 +51,23 @@ const getEditBillDetail = (state, isVendorRecommendationFeatureEnabled, billId)
     let bankAccountList = [];
     let paymentInstrumentList = [];
     let contactDetails = [];
-    const primaryPaymentAccount = (0, paymentAccountSelector_1.getPaymentAccountsByPaymentAccountIds)(paymentAccountState, (transaction === null || transaction === void 0 ? void 0 : transaction.billPayInfo.fromAccount.billAccountId) != null
+    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
         ? /*
           for extsing transaction since we are not calling payment accounts
           we need to pick payment ids from billPayInfo object
       */
             [transaction.billPayInfo.fromAccount.billAccountId]
         : setupViewState.accountDetails.paymentAccountIds);
+    const fromDepositAccount = (transaction === null || transaction === void 0 ? void 0 : transaction.billPayInfo.fromAccount.billAccountType) === 'depositAccount' &&
+        (transaction === null || transaction === void 0 ? void 0 : transaction.billPayInfo.fromAccount.billAccountId) != null
+        ? (0, depositAccountSelector_1.getDepositAccountByDepositAccountId)(depositAccountState, transaction === null || transaction === void 0 ? void 0 : transaction.billPayInfo.fromAccount.billAccountId)
+        : undefined;
     const allDepositAccounts = (0, depositAccountListSelector_1.getAllDepostAccounts)(depositAccountState, depositAccountListState).depositAccounts;
+    if (allDepositAccounts.length === 0 && fromDepositAccount != null) {
+        allDepositAccounts.push(fromDepositAccount);
+    }
     const withdrawFromList = (0, transferDetailSelector_1.getTransferMoneyParties)(allDepositAccounts, primaryPaymentAccount);
     let previousBills = {
         bills: [],

package/lib/view/spendManagement/helpers.js

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

package/package.json

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