@zeniai/client-epic-state 4.9.81 → 4.9.83

package/lib/commonStateTypes/workingDayHelper.d.ts

@@ -1,4 +1,5 @@
 import { ZeniDate } from '../zeniDayJS';
+export declare const standardFormat = "MM/DD/YYYY";
 export declare const startDate = "2000-01-01";
 export declare const endDate = "2070-12-31";
 export declare const PAYMENT_BUSINESS_DAYS = 4;

package/lib/commonStateTypes/workingDayHelper.js

@@ -3,10 +3,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isHoliday = exports.getYearsList = exports.filterDays = exports.isHolidayToday = exports.getPreviousNthWorkingDay = exports.getNextNthWorkingDay = exports.holidaysFormatted = exports.holidays = exports.PAYMENT_BUSINESS_DAYS = exports.endDate = exports.startDate = void 0;
+exports.isHoliday = exports.getYearsList = exports.filterDays = exports.isHolidayToday = exports.getPreviousNthWorkingDay = exports.getNextNthWorkingDay = exports.holidaysFormatted = exports.holidays = exports.PAYMENT_BUSINESS_DAYS = exports.endDate = exports.startDate = exports.standardFormat = void 0;
 const date_holidays_1 = __importDefault(require("date-holidays"));
 const zeniDayJS_1 = require("../zeniDayJS");
-const standardFormat = 'MM/DD/YYYY';
+exports.standardFormat = 'MM/DD/YYYY';
 exports.startDate = '2000-01-01';
 exports.endDate = '2070-12-31';
 exports.PAYMENT_BUSINESS_DAYS = 4;
@@ -15,16 +15,16 @@ exports.holidays = dateHolidays
     .getHolidays(new Date().getFullYear())
     .filter((holiday) => holiday.type === 'public' || holiday.type === 'bank')
     .map((holiday) => (0, zeniDayJS_1.date)(holiday.date).toDate()); // https://www.linkedin.com/pulse/fix-invalid-date-safari-ie-hatem-ahmad/
-exports.holidaysFormatted = exports.holidays.map((holiday) => (0, zeniDayJS_1.date)(holiday.toDateString()).format(standardFormat));
+exports.holidaysFormatted = exports.holidays.map((holiday) => (0, zeniDayJS_1.date)(holiday.toDateString()).format(exports.standardFormat));
 const getNextNthWorkingDay = (date, filterDaysIndex, numberOfWorkingDays) => {
     const currentDate = new Date(date.toDateString());
-    const holidaysFormatted = exports.holidays.map((holiday) => (0, zeniDayJS_1.date)(holiday.toDateString()).format(standardFormat));
+    const holidaysFormatted = exports.holidays.map((holiday) => (0, zeniDayJS_1.date)(holiday.toDateString()).format(exports.standardFormat));
     Array(numberOfWorkingDays)
         .fill(0)
         .forEach(() => {
         currentDate.setDate(currentDate.getDate() + 1);
         while (filterDaysIndex.includes(currentDate.getDay()) ||
-            holidaysFormatted.indexOf((0, zeniDayJS_1.date)(currentDate.toDateString()).format(standardFormat)) != -1) {
+            holidaysFormatted.indexOf((0, zeniDayJS_1.date)(currentDate.toDateString()).format(exports.standardFormat)) != -1) {
             currentDate.setDate(currentDate.getDate() + 1);
         }
     });
@@ -33,32 +33,32 @@ const getNextNthWorkingDay = (date, filterDaysIndex, numberOfWorkingDays) => {
 exports.getNextNthWorkingDay = getNextNthWorkingDay;
 const getPreviousNthWorkingDay = (date, filterDaysIndex, numberOfWorkingDays) => {
     const currentDate = new Date(date.toDateString());
-    const holidaysFormatted = exports.holidays.map((holiday) => (0, zeniDayJS_1.date)(holiday.toDateString()).format(standardFormat));
+    const holidaysFormatted = exports.holidays.map((holiday) => (0, zeniDayJS_1.date)(holiday.toDateString()).format(exports.standardFormat));
     Array(numberOfWorkingDays)
         .fill(0)
         .forEach(() => {
         while (filterDaysIndex.includes(currentDate.getDay()) ||
-            holidaysFormatted.indexOf((0, zeniDayJS_1.date)(currentDate.toDateString()).format(standardFormat)) != -1) {
+            holidaysFormatted.indexOf((0, zeniDayJS_1.date)(currentDate.toDateString()).format(exports.standardFormat)) != -1) {
             currentDate.setDate(currentDate.getDate() - 1);
         }
         currentDate.setDate(currentDate.getDate() - 1);
     });
     while (filterDaysIndex.includes(currentDate.getDay()) ||
-        holidaysFormatted.indexOf((0, zeniDayJS_1.date)(currentDate.toDateString()).format(standardFormat)) != -1) {
+        holidaysFormatted.indexOf((0, zeniDayJS_1.date)(currentDate.toDateString()).format(exports.standardFormat)) != -1) {
         currentDate.setDate(currentDate.getDate() - 1);
     }
     return currentDate;
 };
 exports.getPreviousNthWorkingDay = getPreviousNthWorkingDay;
 const isHolidayToday = (filterDaysIndex) => {
-    const holidaysFormatted = exports.holidays.map((holiday) => (0, zeniDayJS_1.date)(holiday.toDateString()).format(standardFormat));
+    const holidaysFormatted = exports.holidays.map((holiday) => (0, zeniDayJS_1.date)(holiday.toDateString()).format(exports.standardFormat));
     const currentDate = new Date();
     return (filterDaysIndex.includes(currentDate.getDay()) ||
-        holidaysFormatted.indexOf((0, zeniDayJS_1.date)(currentDate.toDateString()).format(standardFormat)) != -1);
+        holidaysFormatted.indexOf((0, zeniDayJS_1.date)(currentDate.toDateString()).format(exports.standardFormat)) != -1);
 };
 exports.isHolidayToday = isHolidayToday;
 const filterDays = (date, filterDaysIndex) => {
-    const formattedDate = (0, zeniDayJS_1.date)(date.toDateString()).format(standardFormat);
+    const formattedDate = (0, zeniDayJS_1.date)(date.toDateString()).format(exports.standardFormat);
     return (filterDaysIndex.includes(date.getDay()) === false &&
         exports.holidaysFormatted.includes(formattedDate) === false);
 };
@@ -81,6 +81,7 @@ const getHolidaysListPerYear = (year) => {
 const holidaysPerYear = {
     [(0, zeniDayJS_1.dateNow)().year()]: getHolidaysListPerYear((0, zeniDayJS_1.dateNow)().year()),
 };
+//isHoliday requires date parameter to be simple date Dayjs format, not datetime Dayjs
 const isHoliday = (date) => {
     const currentYear = date.year();
     let holidays = [];

package/lib/view/commonVendorView/vendorView/epics/saveVendorEpic.d.ts

@@ -4,11 +4,11 @@ import { RootState } from '../../../../reducer';
 import { fetchUserDetails, resetVendorDetailLocalData, saveVendor, saveVendorSuccessOrFailure, updateVendorDetailLocalData } from '../vendorViewReducer';
 import { updateVendors } from '../../../../entity/vendor/vendorReducer';
 import { updateAddresses } from '../../../../entity/address/addressReducer';
-import { convertAmountToHomeCurrency, saveBillUpdatesToLocalStore, updateRecommendedVendorId } from '../../../spendManagement/billPay/editBillView/editBillViewReducer';
+import { convertAmountToHomeCurrency, saveBillUpdatesToLocalStore } from '../../../spendManagement/billPay/editBillView/editBillViewReducer';
 import { fetchPreviousBills } from '../../../spendManagement/billPay/previousBills/previousBillsReducer';
 import { updateContacts } from '../../../../entity/billPay/contact/contactReducer';
 import { updateBankAccounts } from '../../../../entity/bankAccount/bankAccountReducer';
 import { openSnackbar } from '../../../../entity/snackbar/snackbarReducer';
 import { updatePaymentInstruments } from '../../../../entity/paymentInstrument/paymentInstrumentReducer';
-export declare type ActionType = ReturnType<typeof saveVendor> | ReturnType<typeof updateVendors> | ReturnType<typeof updateContacts> | ReturnType<typeof updateBankAccounts> | ReturnType<typeof updateRecommendedVendorId> | ReturnType<typeof saveBillUpdatesToLocalStore> | ReturnType<typeof fetchPreviousBills> | ReturnType<typeof openSnackbar> | ReturnType<typeof saveVendorSuccessOrFailure> | ReturnType<typeof resetVendorDetailLocalData> | ReturnType<typeof updateAddresses> | ReturnType<typeof updateVendorDetailLocalData> | ReturnType<typeof fetchUserDetails> | ReturnType<typeof updatePaymentInstruments> | ReturnType<typeof convertAmountToHomeCurrency>;
+export declare type ActionType = ReturnType<typeof saveVendor> | ReturnType<typeof updateVendors> | ReturnType<typeof updateContacts> | ReturnType<typeof updateBankAccounts> | ReturnType<typeof saveBillUpdatesToLocalStore> | ReturnType<typeof fetchPreviousBills> | ReturnType<typeof openSnackbar> | ReturnType<typeof saveVendorSuccessOrFailure> | ReturnType<typeof resetVendorDetailLocalData> | ReturnType<typeof updateAddresses> | ReturnType<typeof updateVendorDetailLocalData> | ReturnType<typeof fetchUserDetails> | ReturnType<typeof updatePaymentInstruments> | ReturnType<typeof convertAmountToHomeCurrency>;
 export declare const saveVendorEpic: (actions$: ActionsObservable<ActionType>, state$: StateObservable<RootState>, zeniAPI: ZeniAPI) => import("rxjs").Observable<ActionType>;

package/lib/view/commonVendorView/vendorView/epics/saveVendorEpic.js

@@ -148,7 +148,7 @@ const saveVendorEpic = (actions$, state$, zeniAPI) => actions$.pipe((0, operator
                         isRecurring: false,
                     },
                     billId: action.payload.billId,
-                }), (0, editBillViewReducer_1.updateRecommendedVendorId)());
+                }));
                 if ((updatedVendor === null || updatedVendor === void 0 ? void 0 : updatedVendor.qboId) != null) {
                     actions.push((0, previousBillsReducer_1.fetchPreviousBills)(updatedVendor.qboId, false));
                 }

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

@@ -72,11 +72,14 @@ const waitForVendorByIdThenSaveBillUpdatetoLocalStoreEpic = (actions$, state$) =
                 state.editBillDetailViewState.editBillStateById[billDetailKey];
         }
         if (vendor != null) {
-            (0, editBillViewReducer_1.convertAmountToHomeCurrency)(true, {
-                amount: (_b = (_a = billInLocalStore.billDetailLocalData.totalAmount) === null || _a === void 0 ? void 0 : _a.amount) !== null && _b !== void 0 ? _b : 0,
-                currencyCode: (_c = vendor.vendorCurrencyCode) !== null && _c !== void 0 ? _c : 'USD',
-                currencySymbol: (_d = vendor.vendorCurrencySymbol) !== null && _d !== void 0 ? _d : '$',
-            }, 'USD', action.payload.billId);
+            if (vendor.vendorCurrencyCode != null &&
+                !(0, currencyHelper_1.isUsdCurrency)(vendor.vendorCurrencyCode)) {
+                fetchActions.push((0, editBillViewReducer_1.convertAmountToHomeCurrency)(true, {
+                    amount: (_b = (_a = billInLocalStore.billDetailLocalData.totalAmount) === null || _a === void 0 ? void 0 : _a.amount) !== null && _b !== void 0 ? _b : 0,
+                    currencyCode: (_c = vendor.vendorCurrencyCode) !== null && _c !== void 0 ? _c : 'USD',
+                    currencySymbol: (_d = vendor.vendorCurrencySymbol) !== null && _d !== void 0 ? _d : '$',
+                }, 'USD', action.payload.billId));
+            }
             fetchActions.push((0, editBillViewReducer_1.saveBillUpdatesToLocalStore)({
                 billDetailLocalData: prepareBillLocalData(state, billInLocalStore, vendor),
                 billId: action.payload.billId,

package/lib/view/spendManagement/zeniAccounts/transferDetail/transferDetailPayload.js

@@ -2,12 +2,15 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.mapReviewTransferMoneyPayloadToReviewTransferMoney = void 0;
 const amount_1 = require("../../../../commonStateTypes/amount");
+const workingDayHelper_1 = require("../../../../commonStateTypes/workingDayHelper");
 const zeniDayJS_1 = require("../../../../zeniDayJS");
 const mapReviewTransferMoneyPayloadToReviewTransferMoney = (payload) => ({
     isShowDailyAchLimitWarning: payload.is_show_daily_ach_limit_warning,
     dailyAchDebitLimit: payload.daily_ach_debit_limit != null
         ? (0, amount_1.toAmount)(payload.daily_ach_debit_limit.amount, payload.daily_ach_debit_limit.currency_code, payload.daily_ach_debit_limit.currency_symbol)
         : (0, amount_1.toAmount)(0, 'USD', '$'),
-    transferSchedules: payload.transfer_schedules.map((transfer_schedule) => (Object.assign(Object.assign({}, (0, amount_1.toAmount)(transfer_schedule.amount, transfer_schedule.currency_code, transfer_schedule.currency_symbol)), { scheduleTime: (0, zeniDayJS_1.dateInLocal)(transfer_schedule.schedule_time) }))),
+    transferSchedules: payload.transfer_schedules.map((transfer_schedule) => (Object.assign(Object.assign({}, (0, amount_1.toAmount)(transfer_schedule.amount, transfer_schedule.currency_code, transfer_schedule.currency_symbol)), { scheduleTime: (0, zeniDayJS_1.date)(
+        //this is required as isHoliday function in src/commonStateTypes/workingDayHelper.ts require date to be simple date Dayjs format, not datetime Dayjs
+        (0, zeniDayJS_1.date)(transfer_schedule.schedule_time).format(workingDayHelper_1.standardFormat)) }))),
 });
 exports.mapReviewTransferMoneyPayloadToReviewTransferMoney = mapReviewTransferMoneyPayloadToReviewTransferMoney;

package/package.json

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