@zeniai/client-epic-state 4.9.71 → 4.9.73

package/lib/entity/billPay/billTransaction/billTransactionPayload.d.ts

@@ -85,7 +85,7 @@ export declare const toBillTransaction: (payload: BillTransactionPayload) => Bil
 export declare const toBillPayInfo: (payload: BillPayInfoPayload) => BillPayInfo;
 export declare const toBillStage: (payload: BillStagePayload) => BillStage;
 export declare const toBillPaymentMethod: (payload: BillPaymentMethodPayload) => BillPaymentMethod;
-export declare const toBillAccount: (payload: BillAccountPayload) => BillAccount;
+export declare const toBillAccount: (payload: BillAccountPayload, billPaymentMethod: BillPaymentMethod) => BillAccount;
 export declare const toFromBillAccount: (payload: BillAccountPayload) => FromBillAccount;
 export declare const toBillPaymentStatus: (payload: BillPaymentStatusPayload) => BillPaymentStatus;
 export declare const toBillStatus: (payload: BillStatusPayload) => BillStatus;

package/lib/entity/billPay/billTransaction/billTransactionPayload.js

@@ -29,7 +29,7 @@ const toBillPayInfo = (payload) => {
             : undefined,
         billPaymentMethodType: (0, exports.toBillPaymentMethod)(payload.bill_payment_method_type),
         fromAccount: (0, exports.toFromBillAccount)(payload.from_account),
-        toAccount: (0, exports.toBillAccount)(payload.to_account),
+        toAccount: (0, exports.toBillAccount)(payload.to_account, (0, exports.toBillPaymentMethod)(payload.bill_payment_method_type)),
         isCancelled: payload.is_cancelled,
         billStatus: (0, exports.toBillStatus)(payload.bill_status),
         actualDepositDate: payload.actual_deposit_date != null
@@ -63,11 +63,14 @@ const toBillPaymentMethod = (payload) => {
     });
 };
 exports.toBillPaymentMethod = toBillPaymentMethod;
-const toBillAccount = (payload) => ({
-    billAccountId: payload.account_id != null
-        ? payload.account_id
-        : payload.payment_instrument_id != null
+const toBillAccount = (payload, billPaymentMethod) => ({
+    billAccountId: billPaymentMethod.code === 'wire' &&
+        billPaymentMethod.subCode === 'international'
+        ? payload.payment_instrument_id != null
             ? payload.payment_instrument_id
+            : undefined
+        : payload.account_id != null
+            ? payload.account_id
             : undefined,
     billAccountType: payload.account_type != null
         ? (0, billTransactionState_1.toBillAccountType)(payload.account_type)

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

@@ -76,15 +76,8 @@ const saveVendorEpic = (actions$, state$, zeniAPI) => actions$.pipe((0, operator
                 const vendorCurrencyCode = updatedVendor.vendorCurrencyCode;
                 const vendorCurrencySymbol = updatedVendor.vendorCurrencySymbol;
                 Object.keys(updatedLines).forEach((lineId) => {
-                    var _a, _b;
                     const line = lines[lineId];
-                    updatedLines[lineId] = Object.assign(Object.assign({}, line), { account: Boolean((_a = line.account) === null || _a === void 0 ? void 0 : _a.accountId) === false &&
-                            vendorCategory != null
-                            ? vendorCategory
-                            : line.account, class: Boolean((_b = line.class) === null || _b === void 0 ? void 0 : _b.classId) === false &&
-                            vendorClass != null
-                            ? vendorClass
-                            : line.class });
+                    updatedLines[lineId] = Object.assign(Object.assign({}, line), { account: vendorCategory, class: vendorClass });
                 });
                 //when it's a new bill and it doesn't have any line item, we want to default the account and class to vendor's account and class
                 if (Object.keys(updatedLines).length === 0) {

package/lib/view/spendManagement/billPay/editBillView/epics/fetchVendorAndUpdateBillLocalDataEpic.d.ts

@@ -1,10 +1,10 @@
 import { ActionsObservable, StateObservable } from 'redux-observable';
 import { updateBankAccounts } from '../../../../../entity/bankAccount/bankAccountReducer';
 import { RootState } from '../../../../../reducer';
-import { fetchVendorAndUpdateBillLocalData, saveBillUpdatesToLocalStore, waitForVendorByIdThenSaveBillUpdatetoLocalStore } from '../editBillViewReducer';
+import { convertAmountToHomeCurrency, fetchVendorAndUpdateBillLocalData, saveBillUpdatesToLocalStore, waitForVendorByIdThenSaveBillUpdatetoLocalStore } from '../editBillViewReducer';
 import { updateVendorsList, updateVendorListFailure } from '../../../../vendorList/vendorListReducer';
 import { fetchVendor, indicateReadyToInitializeBillLocalStore } from '../../../../commonVendorView/vendorView/vendorViewReducer';
 import { fetchPreviousBills } from '../../previousBills/previousBillsReducer';
-export declare type ActionType = ReturnType<typeof waitForVendorByIdThenSaveBillUpdatetoLocalStore> | ReturnType<typeof fetchVendor> | ReturnType<typeof updateVendorListFailure> | ReturnType<typeof saveBillUpdatesToLocalStore> | ReturnType<typeof fetchVendorAndUpdateBillLocalData> | ReturnType<typeof updateBankAccounts> | ReturnType<typeof updateVendorsList> | ReturnType<typeof indicateReadyToInitializeBillLocalStore> | ReturnType<typeof fetchPreviousBills>;
+export declare type ActionType = ReturnType<typeof waitForVendorByIdThenSaveBillUpdatetoLocalStore> | ReturnType<typeof fetchVendor> | ReturnType<typeof updateVendorListFailure> | ReturnType<typeof saveBillUpdatesToLocalStore> | ReturnType<typeof fetchVendorAndUpdateBillLocalData> | ReturnType<typeof updateBankAccounts> | ReturnType<typeof updateVendorsList> | ReturnType<typeof indicateReadyToInitializeBillLocalStore> | ReturnType<typeof fetchPreviousBills> | ReturnType<typeof convertAmountToHomeCurrency>;
 export declare const fetchVendorAndUpdateBillLocalDataEpic: (actions$: ActionsObservable<ActionType>, state$: StateObservable<RootState>) => import("rxjs").Observable<ActionType>;
 export declare const waitForVendorByIdThenSaveBillUpdatetoLocalStoreEpic: (actions$: ActionsObservable<ActionType>, state$: StateObservable<RootState>) => import("rxjs").Observable<ActionType>;

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

@@ -14,7 +14,9 @@ const classSelector_1 = require("../../../../../entity/class/classSelector");
 const editBillViewState_1 = require("../../../../spendManagement/billPay/editBillView/editBillViewState");
 const vendorViewReducer_1 = require("../../../../commonVendorView/vendorView/vendorViewReducer");
 const previousBillsReducer_1 = require("../../previousBills/previousBillsReducer");
+const currencyHelper_1 = require("../../../../../commonStateTypes/currencyHelper");
 const fetchVendorAndUpdateBillLocalDataEpic = (actions$, state$) => actions$.pipe((0, operators_1.filter)(editBillViewReducer_1.fetchVendorAndUpdateBillLocalData.match), (0, operators_1.mergeMap)((action) => {
+    var _a, _b, _c, _d;
     const fetchActions = [];
     const { vendorId } = action.payload;
     const state = state$.value;
@@ -27,6 +29,14 @@ const fetchVendorAndUpdateBillLocalDataEpic = (actions$, state$) => actions$.pip
     if (vendorId != null) {
         const vendor = (0, vendorSelector_1.getVendorByVendorId)(state.vendorState, vendorId);
         if (vendor != null) {
+            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,
@@ -51,6 +61,7 @@ const waitForVendorByIdThenSaveBillUpdatetoLocalStoreEpic = (actions$, state$) =
     const { vendorId } = action.payload;
     return actions$.pipe((0, operators_1.filter)((value) => vendorViewReducer_1.indicateReadyToInitializeBillLocalStore.match(value)), (0, operators_1.take)(1), // don't listen forever! IMPORTANT!
     (0, operators_1.mergeMap)(() => {
+        var _a, _b, _c, _d;
         const state = state$.value;
         const fetchActions = [];
         const vendor = (0, vendorSelector_1.getVendorByVendorId)(state.vendorState, vendorId);
@@ -61,6 +72,11 @@ 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);
             fetchActions.push((0, editBillViewReducer_1.saveBillUpdatesToLocalStore)({
                 billDetailLocalData: prepareBillLocalData(state, billInLocalStore, vendor),
                 billId: action.payload.billId,
@@ -98,13 +114,8 @@ function prepareBillLocalData(state, billInLocalStore, vendor) {
         ? (0, zeniDayJS_1.dateNow)().isSameOrBefore(payNowCutOffTime)
         : false;
     Object.keys(updatedLines).forEach((lineId) => {
-        var _a, _b;
         const line = lines[lineId];
-        updatedLines[lineId] = Object.assign(Object.assign({}, line), { account: Boolean((_a = line.account) === null || _a === void 0 ? void 0 : _a.accountId) === false && vendorCategory != null
-                ? vendorCategory
-                : line.account, class: Boolean((_b = line.class) === null || _b === void 0 ? void 0 : _b.classId) === false && vendorClass != null
-                ? vendorClass
-                : line.class });
+        updatedLines[lineId] = Object.assign(Object.assign(Object.assign({}, line), { account: vendorCategory, class: vendorClass }), editBillViewState_1.defaultRecommendationStateObj);
     });
     //when it's a new bill and it doesn't have any line item, we want to default the account and class to vendor's account and class
     if (Object.keys(updatedLines).length === 0) {

package/package.json

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