@zeniai/client-epic-state 4.8.7 → 4.8.8

package/lib/view/accountList/accountListSelector.d.ts

@@ -6,12 +6,13 @@ import { AccountListState, AccountListKeyType } from './accountListState';
 export interface AccountListSelectorView extends SelectorView {
     accounts: AccountBase[];
 }
-export declare const getAccountList: (accountState: AccountState, accountListState: AccountListState, accountListKey: AccountListKeyType) => AccountListSelectorView;
-export declare const getAccountListFetchState: (accountListState: AccountListState, accountListKey: AccountListKeyType) => FetchState;
-export declare const getUncategorizedAccounts: (accountState: AccountState, accountListState: AccountListState, accountListKey: AccountListKeyType) => {
+export interface UncategorizedAccounts {
     income: AccountBase | undefined;
     expense: AccountBase | undefined;
-};
+}
+export declare const getAccountList: (accountState: AccountState, accountListState: AccountListState, accountListKey: AccountListKeyType) => AccountListSelectorView;
+export declare const getAccountListFetchState: (accountListState: AccountListState, accountListKey: AccountListKeyType) => FetchState;
+export declare const getUncategorizedAccounts: (accountState: AccountState, accountListState: AccountListState, accountListKey: AccountListKeyType) => UncategorizedAccounts;
 export declare const getNestedAccountListHeirarchy: (accountListState: AccountListState, accountListKey: AccountListKeyType) => NestedAccountHeirarchyForReport[];
 /**
  * This function gets the list for given label and will filter out the accounts and

package/lib/view/classList/classListSelector.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getNestedClassListHeirarchy = exports.getClassList = void 0;
 const classSelector_1 = require("../../entity/class/classSelector");
+// TODO - Fix return type, currently it's returning Class[] but ClassListSelectorView --> classes is ClassBase[]
 const getClassList = (classState, classListState) => {
     return {
         classes: (0, classSelector_1.getClassesByIds)(classState, {

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

@@ -6,10 +6,11 @@ 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 scheduleListHelper_1 = require("../../scheduleListView/scheduleListHelper");
 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)('prepaidExpenseAccountList', true, false, false, false, (0, scheduleDetailLocalDataHelper_1.getAccountsTypesForScheduleDetails)('prepaid_expenses')));
+    const accountType = (0, scheduleListHelper_1.getAccountsTypesForScheduleEpics)('prepaid_expenses');
+    scheduleDetailsActions.push((0, accountListReducer_1.fetchAccountList)(accountType.accountListKey, true, false, false, false, accountType.allowedAccountList));
     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/scheduleDetailSelector.d.ts

@@ -4,11 +4,13 @@ import { NestedClassHeirarchyForReport } from '../../../commonStateTypes/classes
 import { AccountBase } from '../../../entity/account/accountState';
 import { ClassBase } from '../../../entity/class/classState';
 import { JEScheduledTransaction } from '../../../entity/jeSchedules/jeSchedulesSelector';
+import { UncategorizedAccounts } from '../../accountList/accountListSelector';
 import { ScheduleDetailUIState, ScheduleDetailsLocalData } from './scheduleDetailState';
 import { SelectorView } from '../../../commonStateTypes/viewAndReport/viewAndReport';
 import { FetchStateAndError } from '../../../commonStateTypes/common';
 export interface ScheduleDetailsView extends SelectorView {
     allAccountList: AccountBase[];
+    uncategorizedAccounts: UncategorizedAccounts;
     accountListNestedAccountHierarchy: NestedAccountHeirarchyForReport[];
     allClassList: ClassBase[];
     classListNestedAccountHierarchy: NestedClassHeirarchyForReport[];

package/lib/view/scheduleView/scheduleDetailView/scheduleDetailSelector.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.getScheduleDetailsView = void 0;
+const omit_1 = __importDefault(require("lodash/omit"));
 const jeSchedulesSelector_1 = require("../../../entity/jeSchedules/jeSchedulesSelector");
 const accountListSelector_1 = require("../../accountList/accountListSelector");
 const classListSelector_1 = require("../../classList/classListSelector");
@@ -11,12 +15,14 @@ const scheduleDetailLocalDataHelper_1 = require("./scheduleDetailLocalDataHelper
 const getScheduleDetailsView = (state) => {
     const { accountState, accountListState, classState, classListState, scheduleDetailState, } = state;
     const jeScheduleKey = scheduleDetailState.selectedJEScheduleKey;
+    const uncategorizedAccounts = (0, accountListSelector_1.getUncategorizedAccounts)(accountState, accountListState, 'prepaidExpenseAccountList');
     if (jeScheduleKey == null) {
         return {
             uiState: scheduleDetailState.uiState,
             selectedJEScheduleTransaction: undefined,
             allAccountList: [],
             allClassList: [],
+            uncategorizedAccounts,
             accountListNestedAccountHierarchy: [],
             classListNestedAccountHierarchy: [],
             scheduleDetailsLocalData: {
@@ -36,6 +42,9 @@ const getScheduleDetailsView = (state) => {
     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 allClasses = allClassList.classes.map((classData) => {
+        return (0, omit_1.default)(classData, ['accountIds', 'key']);
+    });
     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);
@@ -60,7 +69,8 @@ const getScheduleDetailsView = (state) => {
         uiState: scheduleDetailState.uiState,
         selectedJEScheduleTransaction: jeScheduleTransactionState,
         allAccountList: filteredAccounts,
-        allClassList: allClassList.classes,
+        allClassList: allClasses,
+        uncategorizedAccounts,
         accountListNestedAccountHierarchy,
         classListNestedAccountHierarchy,
         scheduleDetailsLocalData,

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

@@ -29,7 +29,7 @@ const fetchScheduleListEpic = (actions$, state$, zeniAPI) => actions$.pipe((0, o
         action.payload.cacheOverride === false) {
         return (0, rxjs_1.from)([]);
     }
-    const scheduleListCurrentTabAccountTypes = (0, scheduleListHelper_1.getAccountsTypesForSchedulePayload)(scheduleListState.currentTab).allowedAccountList;
+    const scheduleListCurrentTabAccountTypes = (0, scheduleListHelper_1.getAccountsTypesForScheduleList)(scheduleListState.currentTab).allowedAccountList;
     const scheduleListCurrentTabAccountIds = (0, accountSelector_1.getAccountIdsForTypes)(accountState, scheduleListCurrentTabAccountTypes);
     let categoryIds = [categoryId];
     if (categoryId === 'all') {
@@ -67,7 +67,7 @@ exports.fetchScheduleListEpic = fetchScheduleListEpic;
  * @returns
  */
 const getAllAccountIdsForTab = (tab, accountListState, filterAccountIds) => {
-    const accountStateForReport = accountListState.byReportId[(0, scheduleListHelper_1.getAccountsTypesForSchedulePayload)(tab).accountListKey];
+    const accountStateForReport = accountListState.byReportId[(0, scheduleListHelper_1.getAccountsTypesForScheduleList)(tab).accountListKey];
     let accountIds = accountStateForReport.accountIds.filter((accountId) => filterAccountIds.includes(accountId));
     if (tab === 'prepaid_expenses') {
         const filteredList = accountStateForReport.accountIdsByLabel['prepaid_expenses'];

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

@@ -12,7 +12,7 @@ _state$) => actions$.pipe((0, operators_1.filter)(scheduleListReducer_1.fetchSch
     const fetchScheduleListActions = [];
     const scheduleTabIds = ['prepaid_expenses'];
     scheduleTabIds.forEach((scheduleTab) => {
-        const accountType = (0, scheduleListHelper_1.getAccountsTypesForSchedulePayload)(scheduleTab);
+        const accountType = (0, scheduleListHelper_1.getAccountsTypesForScheduleEpics)(scheduleTab);
         fetchScheduleListActions.push((0, accountListReducer_1.fetchAccountList)(accountType.accountListKey, false, false, false, false, accountType.allowedAccountList));
     });
     return (0, rxjs_1.from)(fetchScheduleListActions);

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

@@ -84,5 +84,11 @@ declare type AccountListTypesPayload = {
  * @param scheduleType
  * @returns
  */
-export declare const getAccountsTypesForSchedulePayload: (scheduleType: SchedulesTypes) => AccountListTypesPayload;
+export declare const getAccountsTypesForScheduleList: (scheduleType: SchedulesTypes) => AccountListTypesPayload;
+/**
+ * Function to get accountListKey and allowedAccountList for a given tab
+ * @param scheduleType
+ * @returns
+ */
+export declare const getAccountsTypesForScheduleEpics: (scheduleType: SchedulesTypes) => AccountListTypesPayload;
 export {};

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

@@ -1,10 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-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;
+exports.getAccountsTypesForScheduleEpics = 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;
 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");
 /**
  * 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.
@@ -207,7 +208,7 @@ exports.getDurationOfMonthOutTotalMonth = getDurationOfMonthOutTotalMonth;
  * @param scheduleType
  * @returns
  */
-const getAccountsTypesForSchedulePayload = (scheduleType) => {
+const getAccountsTypesForScheduleList = (scheduleType) => {
     switch (scheduleType) {
         case 'prepaid_expenses':
             return {
@@ -221,4 +222,28 @@ const getAccountsTypesForSchedulePayload = (scheduleType) => {
             };
     }
 };
-exports.getAccountsTypesForSchedulePayload = getAccountsTypesForSchedulePayload;
+exports.getAccountsTypesForScheduleList = getAccountsTypesForScheduleList;
+/**
+ * Function to get accountListKey and allowedAccountList for a given tab
+ * @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: [],
+            };
+    }
+};
+exports.getAccountsTypesForScheduleEpics = getAccountsTypesForScheduleEpics;

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

@@ -71,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_2.getAccountsTypesForSchedulePayload)(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/epics/initializeBillToLocalStoreEpic.js

@@ -14,6 +14,9 @@ const editBillViewState_1 = require("../editBillViewState");
 const editBillViewSelector_1 = require("../editBillViewSelector");
 const accountListSelector_1 = require("../../../../accountList/accountListSelector");
 const classListSelector_1 = require("../../../../classList/classListSelector");
+const workingDayHelper_1 = require("../../../../../commonStateTypes/workingDayHelper");
+const zeniDayJS_1 = require("../../../../../zeniDayJS");
+const companySelector_1 = require("../../../../../entity/company/companySelector");
 const isClassRecommendation = (recommendations, classObj) => {
     if (classObj == null) {
         return false;
@@ -87,7 +90,7 @@ const getLineRecommendationsLocalData = (lineId, line, recommendations, accountL
 };
 exports.getLineRecommendationsLocalData = getLineRecommendationsLocalData;
 const initializeBillToLocalStoreEpic = (actions$, state$) => actions$.pipe((0, operators_1.filter)(editBillViewReducer_1.initializeBillToLocalStore.match), (0, operators_1.mergeMap)((action) => {
-    var _a, _b, _c, _d, _e, _f;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j;
     const { billId } = action.payload;
     const state = state$.value;
     const detailKey = (0, billDetailViewState_1.getBillTransactionDetailKey)(billId);
@@ -136,9 +139,19 @@ const initializeBillToLocalStoreEpic = (actions$, state$) => actions$.pipe((0, o
         (_e = transaction.lines) === null || _e === void 0 ? void 0 : _e.forEach((line) => {
             updatesByLineId[line.id] = Object.assign(Object.assign({}, line), (0, exports.getLineRecommendationsLocalData)(line.id, line, recommendations, accountList, classList, vendor));
         });
+        const { tenantState, companyState } = state;
+        const { currentTenantId } = tenantState;
+        const companyId = currentTenantId != null
+            ? (_g = (_f = tenantState.tenantsById) === null || _f === void 0 ? void 0 : _f[currentTenantId]) === null || _g === void 0 ? void 0 : _g.companyId
+            : undefined;
+        const currentCompany = (0, companySelector_1.getCompanyByCompanyId)(companyState, companyId !== null && companyId !== void 0 ? companyId : '');
+        const payNowCutOffTime = currentCompany === null || currentCompany === void 0 ? void 0 : currentCompany.company.companyBillPayInfo.payNowCutOffTimeByMethod.ach;
+        const isPayNowEnabled = payNowCutOffTime != null
+            ? (0, zeniDayJS_1.dateNow)().isSameOrBefore(payNowCutOffTime)
+            : false;
         const paymentDetailsSection = {
             paymentType: (0, editBillViewSelector_1.getPaymentMethodType)(state.billPayConfigState, transaction.billPayInfo.billPaymentMethodType, transaction.billPayInfo.internationalTransferFeeBearerPaymentMethod),
-            paymentDate: transaction.billPayInfo.paymentDate,
+            paymentDate: (_h = transaction.billPayInfo.paymentDate) !== null && _h !== void 0 ? _h : (0, zeniDayJS_1.date)((0, workingDayHelper_1.getNextNthWorkingDay)((0, zeniDayJS_1.dateNow)().toDate(), [0, 6], isPayNowEnabled ? 0 : 1).toISOString()),
             withdrawFrom: transaction.billPayInfo.fromAccount.billAccountId != null &&
                 transaction.billPayInfo.fromAccount.billAccountId.length > 0
                 ? transaction.billPayInfo.fromAccount.billAccountId
@@ -151,7 +164,7 @@ const initializeBillToLocalStoreEpic = (actions$, state$) => actions$.pipe((0, o
         };
         const totalAmount = transaction.amount;
         const isCancelled = transaction.billPayInfo.isCancelled;
-        const file = (_f = transaction.attachments) === null || _f === void 0 ? void 0 : _f[0];
+        const file = (_j = transaction.attachments) === null || _j === void 0 ? void 0 : _j[0];
         const candidateVendorname = transaction.candidateVendorName;
         const toAccountVendorEmail = transaction.billPayInfo.toAccountVendorEmail;
         const isCollectToAccountInfoFromVendorContact = transaction.billPayInfo.isCollectToAccountInfoFromVendorContact;

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

@@ -25,6 +25,8 @@ const initializeBillToLocalStoreEpic_1 = require("./initializeBillToLocalStoreEp
 const transactionPayload_1 = require("../../../../../entity/transaction/payloadTypes/transactionPayload");
 const billPayConfigPayload_1 = require("../../billPayConfig/billPayConfigPayload");
 const billTransactionState_1 = require("../../../../../entity/billPay/billTransaction/billTransactionState");
+const workingDayHelper_1 = require("../../../../../commonStateTypes/workingDayHelper");
+const companySelector_1 = require("../../../../../entity/company/companySelector");
 const parseInvoiceToBillEpic = (actions$, state$) => actions$.pipe((0, operators_1.filter)(editBillViewReducer_1.parseInvoiceToBill.match), (0, operators_1.mergeMap)((action) => {
     var _a, _b, _c, _d, _e, _f;
     const { invoiceProcessingPayload, isVendorRecommendationFeatureEnabled } = action.payload;
@@ -118,7 +120,7 @@ const parseInvoiceToBillEpic = (actions$, state$) => actions$.pipe((0, operators
 }));
 exports.parseInvoiceToBillEpic = parseInvoiceToBillEpic;
 const toBillDetailLocalData = (state, billPayload, vendor, recommendedVendorId) => {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y;
     const currency = {
         currencyCode: (_a = billPayload.currency_code) !== null && _a !== void 0 ? _a : '',
         currencySymbol: (_b = billPayload.currency_symbol) !== null && _b !== void 0 ? _b : '', //api not returning symbol
@@ -170,6 +172,16 @@ const toBillDetailLocalData = (state, billPayload, vendor, recommendedVendorId)
         : undefined, internationalTransferFeeBearerPaymentMethod != null
         ? (0, billTransactionState_1.toInternationalTransferFeeBearerPaymentMethod)(internationalTransferFeeBearerPaymentMethod)
         : undefined);
+    const { tenantState, companyState } = state;
+    const { currentTenantId } = tenantState;
+    const companyId = currentTenantId != null
+        ? (_k = (_j = tenantState.tenantsById) === null || _j === void 0 ? void 0 : _j[currentTenantId]) === null || _k === void 0 ? void 0 : _k.companyId
+        : undefined;
+    const currentCompany = (0, companySelector_1.getCompanyByCompanyId)(companyState, companyId !== null && companyId !== void 0 ? companyId : '');
+    const payNowCutOffTime = currentCompany === null || currentCompany === void 0 ? void 0 : currentCompany.company.companyBillPayInfo.payNowCutOffTimeByMethod.ach;
+    const isPayNowEnabled = payNowCutOffTime != null
+        ? (0, zeniDayJS_1.dateNow)().isSameOrBefore(payNowCutOffTime)
+        : false;
     return {
         recommendedVendorId,
         lastRecommendedVendorName: recommendedVendorId != null ? vendor === null || vendor === void 0 ? void 0 : vendor.name : undefined,
@@ -196,24 +208,24 @@ const toBillDetailLocalData = (state, billPayload, vendor, recommendedVendorId)
                     ? (0, billPayConfigPayload_1.getInternationalSubConfigCodeKey)(internationalSubCode)
                     : undefined))
                 : undefined,
-            paymentDate: ((_j = billPayload.bill_pay_info) === null || _j === void 0 ? void 0 : _j.payment_date) != null
-                ? (0, zeniDayJS_1.date)((_k = billPayload.bill_pay_info) === null || _k === void 0 ? void 0 : _k.payment_date)
-                : undefined,
-            withdrawFrom: (_m = (_l = billPayload.bill_pay_info) === null || _l === void 0 ? void 0 : _l.from_account.account_id) !== null && _m !== void 0 ? _m : undefined,
-            internationalTransferFeeBearerPaymentMethod: ((_o = billPayload.bill_pay_info) === null || _o === void 0 ? void 0 : _o.international_transfer_fee_bearer_payment_method) != null
-                ? (0, billTransactionState_1.toInternationalTransferFeeBearerPaymentMethod)((_p = billPayload.bill_pay_info) === null || _p === void 0 ? void 0 : _p.international_transfer_fee_bearer_payment_method)
+            paymentDate: ((_l = billPayload.bill_pay_info) === null || _l === void 0 ? void 0 : _l.payment_date) != null
+                ? (0, zeniDayJS_1.date)((_m = billPayload.bill_pay_info) === null || _m === void 0 ? void 0 : _m.payment_date)
+                : (0, zeniDayJS_1.date)((0, workingDayHelper_1.getNextNthWorkingDay)((0, zeniDayJS_1.dateNow)().toDate(), [0, 6], isPayNowEnabled ? 0 : 1).toISOString()),
+            withdrawFrom: (_p = (_o = billPayload.bill_pay_info) === null || _o === void 0 ? void 0 : _o.from_account.account_id) !== null && _p !== void 0 ? _p : undefined,
+            internationalTransferFeeBearerPaymentMethod: ((_q = billPayload.bill_pay_info) === null || _q === void 0 ? void 0 : _q.international_transfer_fee_bearer_payment_method) != null
+                ? (0, billTransactionState_1.toInternationalTransferFeeBearerPaymentMethod)((_r = billPayload.bill_pay_info) === null || _r === void 0 ? void 0 : _r.international_transfer_fee_bearer_payment_method)
                 : undefined,
         },
         totalAmount: billPayload.amount != null
             ? (0, amount_1.toAmountWC)(billPayload.amount, {
-                currencyCode: (_q = billPayload.currency_code) !== null && _q !== void 0 ? _q : 'USD',
-                currencySymbol: (_r = billPayload.currency_symbol) !== null && _r !== void 0 ? _r : '$',
+                currencyCode: (_s = billPayload.currency_code) !== null && _s !== void 0 ? _s : 'USD',
+                currencySymbol: (_t = billPayload.currency_symbol) !== null && _t !== void 0 ? _t : '$',
             })
             : undefined,
         isCancelled: false,
-        toAccountVendorEmail: (_t = (_s = billPayload.bill_pay_info) === null || _s === void 0 ? void 0 : _s.to_account_vendor_email) !== null && _t !== void 0 ? _t : undefined,
-        isCollectToAccountInfoFromVendorContact: (_v = (_u = billPayload.bill_pay_info) === null || _u === void 0 ? void 0 : _u.is_collect_to_account_info_from_vendor_contact) !== null && _v !== void 0 ? _v : false,
-        isRecurring: (_w = billPayload.is_recurring) !== null && _w !== void 0 ? _w : false,
+        toAccountVendorEmail: (_v = (_u = billPayload.bill_pay_info) === null || _u === void 0 ? void 0 : _u.to_account_vendor_email) !== null && _v !== void 0 ? _v : undefined,
+        isCollectToAccountInfoFromVendorContact: (_x = (_w = billPayload.bill_pay_info) === null || _w === void 0 ? void 0 : _w.is_collect_to_account_info_from_vendor_contact) !== null && _x !== void 0 ? _x : false,
+        isRecurring: (_y = billPayload.is_recurring) !== null && _y !== void 0 ? _y : false,
     };
 };
 exports.toBillDetailLocalData = toBillDetailLocalData;

package/lib/view/transactionDetail/epics/saveTransactionHelper.d.ts

@@ -1,5 +1,5 @@
-import { AccountBase } from '../../../entity/account/accountState';
 import { SupportedTransaction } from '../../../entity/transaction/transactionState';
+import { UncategorizedAccounts } from '../../accountList/accountListSelector';
 import { TransactionSaveUpdates } from '../transactionDetailState';
 import { TransactionDetailLocalData } from '../transactionDetailTypes';
 /**
@@ -18,7 +18,4 @@ import { TransactionDetailLocalData } from '../transactionDetailTypes';
  * 4. Only difference between this and Miscategorized will be that we will
  * additionally fire “Mark as not miscat” for every point above.
  */
-export declare const toTransactionUpdatesFromTransactionDetailLocalData: (transactionDetailLocalData: TransactionDetailLocalData, transaction: SupportedTransaction, uncategorizedIncomeExpense: {
-    income: AccountBase | undefined;
-    expense: AccountBase | undefined;
-}) => TransactionSaveUpdates;
+export declare const toTransactionUpdatesFromTransactionDetailLocalData: (transactionDetailLocalData: TransactionDetailLocalData, transaction: SupportedTransaction, uncategorizedIncomeExpense: UncategorizedAccounts) => TransactionSaveUpdates;

package/lib/view/transactionDetail/transactionDetailLocalDataHelper.d.ts

@@ -4,11 +4,9 @@ import { AccountBase } from '../../entity/account/accountState';
 import { ClassBase } from '../../entity/class/classState';
 import { Entity } from '../../entity/genericEntity/entity';
 import { SupportedTransaction } from '../../entity/transaction/transactionState';
+import { UncategorizedAccounts } from '../accountList/accountListSelector';
 import { TransactionDetailLocalData } from './transactionDetailTypes';
-export declare const toTransactionDetailLocalData: (transaction: SupportedTransaction, vendorId: ID | undefined, uncategorizedIncomeExpense?: {
-    income: AccountBase | undefined;
-    expense: AccountBase | undefined;
-} | undefined) => TransactionDetailLocalData;
+export declare const toTransactionDetailLocalData: (transaction: SupportedTransaction, vendorId: ID | undefined, uncategorizedIncomeExpense?: UncategorizedAccounts | undefined) => TransactionDetailLocalData;
 export declare const toUpdateLineItemsOriginalCategoryClass: (transaction: SupportedTransaction, transactionDetailLocalData: TransactionDetailLocalData, lineIdsForReplace: ID[], lineIdsForUpdateAll: ID[], replace: 'account' | 'class' | 'both', updateAll?: boolean | undefined) => TransactionDetailLocalData;
 export declare const toSetAllLineItemsToCategoryClass: (transaction: SupportedTransaction, transactionDetailLocalData: TransactionDetailLocalData, isUpdateAll: boolean, lineEntity?: Entity | undefined, chosenAccount?: {
     account: AccountBase;
@@ -18,9 +16,6 @@ export declare const toSetAllLineItemsToCategoryClass: (transaction: SupportedTr
     updateOrRetain: 'update' | 'retain';
 } | undefined, recommendations?: Recommendation[] | undefined) => TransactionDetailLocalData;
 export declare const toSetAllLineItemsLocalDataIsUpdateAllChecked: (transaction: SupportedTransaction, transactionDetailLocalData: TransactionDetailLocalData, isUpdateAll: boolean, entity?: Entity | undefined) => TransactionDetailLocalData;
-export declare const setEntityRecommendationForLineIdInLocalData: (transaction: SupportedTransaction, transactionDetailLocalData: TransactionDetailLocalData, entity: Entity, recommendationLineIds: ID[], recommendations?: Recommendation[] | undefined, uncategorizedIncomeExpense?: {
-    income: AccountBase | undefined;
-    expense: AccountBase | undefined;
-} | undefined) => TransactionDetailLocalData;
+export declare const setEntityRecommendationForLineIdInLocalData: (transaction: SupportedTransaction, transactionDetailLocalData: TransactionDetailLocalData, entity: Entity, recommendationLineIds: ID[], recommendations?: Recommendation[] | undefined, uncategorizedIncomeExpense?: UncategorizedAccounts | undefined) => TransactionDetailLocalData;
 export declare const removeEntityRecommendationForLineIdInLocalData: (transaction: SupportedTransaction, transactionDetailLocalData: TransactionDetailLocalData, recommendationLineIds: ID[]) => TransactionDetailLocalData;
 export declare const getChangedLineItemCountFromLocalData: (transaction: SupportedTransaction, transactionLocalData: TransactionDetailLocalData) => number;

package/lib/view/transactionDetail/transactionDetailReducer.d.ts

@@ -8,6 +8,7 @@ import { AccountBase } from '../../entity/account/accountState';
 import { ClassBase } from '../../entity/class/classState';
 import { Entity } from '../../entity/genericEntity/entity';
 import { Recommendation } from '../../commonStateTypes/recommendationBase';
+import { UncategorizedAccounts } from '../accountList/accountListSelector';
 export declare const initialState: TransactionDetailState;
 export declare const fetchTransactionDetail: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[transactionId: TransactionID, cacheOverride?: any], {
     transactionId: TransactionID;
@@ -83,20 +84,14 @@ export declare const fetchTransactionDetail: import("@reduxjs/toolkit").ActionCr
     transaction: SupportedTransaction;
     isUpdateAll: boolean;
     entity: Entity | undefined;
-}, string, never, never>, setEntityRecommendationForLineIdsForTransactionDetail: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[transactionId: TransactionID, transaction: SupportedTransaction, lineIds: string[], entity: Entity, amount: number, recommendations?: Recommendation[] | undefined, uncategorizedIncomeExpense?: {
-    income: AccountBase | undefined;
-    expense: AccountBase | undefined;
-} | undefined], {
+}, string, never, never>, setEntityRecommendationForLineIdsForTransactionDetail: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[transactionId: TransactionID, transaction: SupportedTransaction, lineIds: string[], entity: Entity, amount: number, recommendations?: Recommendation[] | undefined, uncategorizedIncomeExpense?: UncategorizedAccounts | undefined], {
     transactionId: TransactionID;
     transaction: SupportedTransaction;
     lineIds: string[];
     entity: Entity;
     amount: number;
     recommendations: Recommendation[] | undefined;
-    uncategorizedIncomeExpense: {
-        income: AccountBase | undefined;
-        expense: AccountBase | undefined;
-    } | undefined;
+    uncategorizedIncomeExpense: UncategorizedAccounts | undefined;
 }, string, never, never>, removeEntityRecommendationForLineIdForTransactionDetail: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[transactionId: TransactionID, transaction: SupportedTransaction, lineId: string], {
     transactionId: TransactionID;
     transaction: SupportedTransaction;

package/lib/view/vendorReviewView/common/payload/commonTypes.js

@@ -4,7 +4,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.toGlobalMerchantsBasePayload = exports.toVendorReviewViewRecommendationPayload = exports.toNonExistingRecommendationGlobalMerchantBasePayload = exports.toUserPayload = void 0;
-const flatMap_1 = __importDefault(require("lodash/flatMap"));
 const omit_1 = __importDefault(require("lodash/omit"));
 const globalMerchantPayload_1 = require("../../../../entity/globalMerchant/globalMerchantPayload");
 /**
@@ -69,19 +68,25 @@ const toVendorReviewViewRecommendationPayload = (recommendations, nonExistingRec
             global_merchants: recommendationEntities,
         };
     });
-    const allRecommendations = recommendationsPayload.length > 0
-        ? recommendationsPayload
-        : nonExistingRecommendationsPayload;
+    const allRecommendations = [
+        {
+            global_merchants: [
+                ...recommendationsPayload[0].global_merchants,
+                ...nonExistingRecommendationsPayload[0].global_merchants,
+            ],
+        },
+    ];
     return allRecommendations;
 };
 exports.toVendorReviewViewRecommendationPayload = toVendorReviewViewRecommendationPayload;
 const toGlobalMerchantsBasePayload = (vendorsRecommendationsPayload) => {
-    var _a, _b;
-    let globalMerchantBasePayload = [];
-    if (((_b = (_a = vendorsRecommendationsPayload[0]) === null || _a === void 0 ? void 0 : _a.global_merchants[0]) === null || _b === void 0 ? void 0 : _b.global_merchant_id) != null) {
-        globalMerchantBasePayload = (0, flatMap_1.default)(vendorsRecommendationsPayload.map((vendorsRecoomendation) => vendorsRecoomendation
-            .global_merchants));
-    }
+    var _a;
+    const globalMerchantBasePayload = [];
+    (_a = vendorsRecommendationsPayload[0]) === null || _a === void 0 ? void 0 : _a.global_merchants.forEach((globalMerchantPayload) => {
+        if (globalMerchantPayload.global_merchant_id != null) {
+            globalMerchantBasePayload.push(globalMerchantPayload);
+        }
+    });
     return globalMerchantBasePayload;
 };
 exports.toGlobalMerchantsBasePayload = toGlobalMerchantsBasePayload;

package/lib/view/vendorReviewView/common/state/commonTypes.js

@@ -67,15 +67,17 @@ const toNonExistingGlobalMerchantBase = (globalMerchantPayload) => {
 };
 exports.toNonExistingGlobalMerchantBase = toNonExistingGlobalMerchantBase;
 const toAllRecommendationsFromPayload = (recommendationsPayload) => {
-    var _a, _b;
-    let recommendations = [];
-    let nonExistingRecommendations = [];
-    if (((_b = (_a = recommendationsPayload[0]) === null || _a === void 0 ? void 0 : _a.global_merchants[0]) === null || _b === void 0 ? void 0 : _b.global_merchant_id) != null) {
-        recommendations = (0, exports.toRecommendationsFromPayload)(recommendationsPayload);
-    }
-    else {
-        nonExistingRecommendations = (0, exports.toNonExistingRecommendationsFromPayload)(recommendationsPayload);
-    }
+    var _a;
+    const recommendations = [];
+    const nonExistingRecommendations = [];
+    (_a = recommendationsPayload[0]) === null || _a === void 0 ? void 0 : _a.global_merchants.forEach((globalmerchant) => {
+        if (globalmerchant.global_merchant_id != null) {
+            recommendations.push((0, globalMerchantPayload_1.toGlobalMerchantBase)(globalmerchant));
+        }
+        else {
+            nonExistingRecommendations.push((0, exports.toNonExistingGlobalMerchantBase)(globalmerchant));
+        }
+    });
     const recommendationIds = recommendations.map((recommendation) => recommendation.globalMerchantId);
     return {
         recommendationIds,

package/lib/view/vendorReviewView/vendorFirstReviewView/epics/fetchVendorFirstReviewViewEpic.js

@@ -82,17 +82,13 @@ exports.mapUsersPayloadFromVendorFirstReviewViewResponse = mapUsersPayloadFromVe
 const mapGlobalMerchantsBasePayloadFromVendorFirstReviewViewResponse = (vendorsResponse) => {
     const globalMerchantBasePayload = [];
     vendorsResponse.forEach((vendor) => {
-        var _a, _b;
-        if (((_b = (_a = vendor.recommendations[0]) === null || _a === void 0 ? void 0 : _a.global_merchants[0]) === null || _b === void 0 ? void 0 : _b.global_merchant_id) != null) {
-            mapVendorRecommendationsToGlobalMerchantBasePayload(vendor.recommendations, globalMerchantBasePayload);
-        }
+        var _a;
+        const existingMerchants = (_a = vendor.recommendations[0]) === null || _a === void 0 ? void 0 : _a.global_merchants.filter((merchant) => merchant.global_merchant_id != null);
+        mapEntitiesRecommendationsPayloadToGlobalMerchantsBasePayload(existingMerchants, globalMerchantBasePayload);
     });
     return globalMerchantBasePayload;
 };
 exports.mapGlobalMerchantsBasePayloadFromVendorFirstReviewViewResponse = mapGlobalMerchantsBasePayloadFromVendorFirstReviewViewResponse;
-const mapVendorRecommendationsToGlobalMerchantBasePayload = (recommendations, globalMerchantBasePayload) => {
-    recommendations.forEach((recommendation) => mapEntitiesRecommendationsPayloadToGlobalMerchantsBasePayload(recommendation.global_merchants, globalMerchantBasePayload));
-};
 const mapEntitiesRecommendationsPayloadToGlobalMerchantsBasePayload = (entities, globalMerchantBasePayload) => {
     entities.forEach((entity) => globalMerchantBasePayload.push(entity));
 };

package/lib/view/vendorReviewView/vendorFirstReviewView/vendorFirstReviewViewReducer.js

@@ -83,8 +83,9 @@ const vendorFirstReviewView = (0, toolkit_1.createSlice)({
                         const isRecommendationSelected = selectedGlobalMerchantId != null &&
                             (selectedGlobalMerchantId ===
                                 vendorLocalData.recommendationIds[0] ||
-                                selectedGlobalMerchantId ===
-                                    ((_a = vendorLocalData.recommendedNonExistingGlobalMerchants[0]) === null || _a === void 0 ? void 0 : _a.globalMerchantName));
+                                (vendorLocalData.recommendationIds.length === 0 &&
+                                    selectedGlobalMerchantId ===
+                                        ((_a = vendorLocalData.recommendedNonExistingGlobalMerchants[0]) === null || _a === void 0 ? void 0 : _a.globalMerchantName)));
                         const isRetainSelected = selectedGlobalMerchantId != null &&
                             selectedGlobalMerchantId === vendorLocalData.vendorId;
                         currentSelection =
@@ -244,7 +245,7 @@ const mapPayloadToVendorFirstReviewView = (payload) => {
         },
         currentSelection: null,
         recommendationIds,
-        recommendedNonExistingGlobalMerchants: recommendationIds.length === 0 ? nonExistingRecommendations : [],
+        recommendedNonExistingGlobalMerchants: nonExistingRecommendations,
         lastUpdatedVendorNameByUserId: (_a = payload.last_updated_vendor_name_by_user) === null || _a === void 0 ? void 0 : _a.user_id,
     };
 };

package/lib/view/vendorReviewView/vendorFirstReviewView/vendorFirstReviewViewSelector.js

@@ -19,10 +19,10 @@ const getVendorFirstReviewView = (state) => {
         const currentVendor = (0, vendorSelector_1.getVendorByVendorId)(vendorState, vendorLocalData.vendorId);
         const users = (0, userSelector_1.getUsersByUserIds)(userState, userIds);
         let recommendations = (0, globalMerchantSelector_1.getGlobalMerchantsByMerchantIds)(globalMerchantState, vendorLocalData.recommendationIds);
-        recommendations =
-            recommendations.length > 0
-                ? recommendations
-                : vendorLocalData.recommendedNonExistingGlobalMerchants;
+        recommendations = [
+            ...recommendations,
+            ...vendorLocalData.recommendedNonExistingGlobalMerchants,
+        ];
         let selectedVendor;
         const vendor = (0, vendorSelector_1.getVendorByVendorId)(vendorState, vendorLocalData.selectedVendorId);
         if (vendor != null) {

package/lib/view/vendorReviewView/vendorGlobalReviewView/epics/fetchVendorGlobalReviewViewEpic.js

@@ -71,15 +71,12 @@ exports.toUsersPayload = toUsersPayload;
 const mapGlobalReviewPayloadToGlobalMerchantsBasePayload = (vendorsResponse) => {
     let globalMerchantBasePayload = [];
     vendorsResponse.forEach((vendor) => {
-        var _a, _b;
-        if (((_b = (_a = vendor.recommendations[0]) === null || _a === void 0 ? void 0 : _a.global_merchants[0]) === null || _b === void 0 ? void 0 : _b.global_merchant_id) != null) {
-            globalMerchantBasePayload = [
-                ...new Set([
-                    ...globalMerchantBasePayload,
-                    ...(0, commonTypes_1.toGlobalMerchantsBasePayload)(vendor.recommendations),
-                ]),
-            ];
-        }
+        globalMerchantBasePayload = [
+            ...new Set([
+                ...globalMerchantBasePayload,
+                ...(0, commonTypes_1.toGlobalMerchantsBasePayload)(vendor.recommendations),
+            ]),
+        ];
     });
     return globalMerchantBasePayload;
 };

package/package.json

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