@zeniai/client-epic-state 4.9.63 → 4.9.65

package/lib/view/scheduleView/scheduleDetailView/scheduleDetailSelector.js

@@ -42,7 +42,7 @@ const getScheduleDetailsView = (state, scheduleType) => {
     const scheduleDetailAccountIds = (0, accountSelector_1.getAccountIdsForTypes)(accountState, scheduleDetailAccountTypes);
     const allAccountList = (0, accountListSelector_1.getAccountList)(accountState, accountListState, accountTypes.accountListKey);
     const filteredAccounts = allAccountList.accounts.filter((account) => scheduleDetailAccountIds.includes(account.accountId));
-    const depreciationCategoryIds = (0, accountSelector_1.getAccountIdsForTypes)(accountState, ['fixed_assets'] // This will always be for fixed assets list
+    const depreciationCategoryIds = (0, accountSelector_1.getAccountIdsForTypes)(accountState, ['fixed_assets', 'other_assets'] // This will always be for fixed assets list
     );
     const accountLabel = (0, scheduleListHelper_1.getAccountLabelForScheduleType)('fixed_assets');
     const fixedAssetLabelAccountIds = accountLabel != null

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

@@ -229,7 +229,7 @@ const getAccountsTypesForScheduleList = (scheduleType) => {
         case 'fixed_assets':
             return {
                 accountListKey: 'schedulesAccountList',
-                allowedAccountList: ['fixed_assets'],
+                allowedAccountList: ['fixed_assets', 'other_assets'],
             };
         default:
             return {
@@ -263,6 +263,7 @@ const getAccountsTypesForScheduleEpics = () => {
             'cogs',
             'expenses',
             'other_expense',
+            'other_assets',
         ],
     };
 };

package/lib/view/spendManagement/billPay/editBillView/editBillViewReducer.d.ts

@@ -65,8 +65,8 @@ export declare const fetchEditBillDetailPage: import("@reduxjs/toolkit").ActionC
     amountPayload: AmountPayload;
     conversionRate: number;
     billId?: string | undefined;
-}, string>, fetchVendorAndUpdateBillLocalData: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[vendorId: string, billId?: string | undefined], {
-    vendorId: string;
+}, string>, fetchVendorAndUpdateBillLocalData: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[vendorId?: string | undefined, billId?: string | undefined], {
+    vendorId: string | undefined;
     billId: string | undefined;
 }, string, never, never>, waitForVendorByIdThenSaveBillUpdatetoLocalStore: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[vendorId: string, billId?: string | undefined], {
     vendorId: string;

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

@@ -18,22 +18,31 @@ const fetchVendorAndUpdateBillLocalDataEpic = (actions$, state$) => actions$.pip
     const fetchActions = [];
     const { vendorId } = action.payload;
     const state = state$.value;
-    const vendor = (0, vendorSelector_1.getVendorByVendorId)(state.vendorState, vendorId);
     let billInLocalStore = state.editBillDetailViewState.newBillState;
     if (action.payload.billId != null) {
         const billDetailKey = (0, billDetailViewState_1.getBillTransactionDetailKey)(action.payload.billId);
         billInLocalStore =
             state.editBillDetailViewState.editBillStateById[billDetailKey];
     }
-    if (vendor != null) {
+    if (vendorId != null) {
+        const vendor = (0, vendorSelector_1.getVendorByVendorId)(state.vendorState, vendorId);
+        if (vendor != null) {
+            fetchActions.push((0, editBillViewReducer_1.saveBillUpdatesToLocalStore)({
+                billDetailLocalData: prepareBillLocalData(state, billInLocalStore, vendor),
+                billId: action.payload.billId,
+            }));
+            fetchActions.push((0, previousBillsReducer_1.fetchPreviousBills)(vendor.qboId, false));
+        }
+        else {
+            fetchActions.push((0, vendorViewReducer_1.fetchVendor)(vendorId), (0, editBillViewReducer_1.waitForVendorByIdThenSaveBillUpdatetoLocalStore)(vendorId, action.payload.billId));
+        }
+    }
+    else {
+        // when tentative vendor is selected from the vendor dropdown, then vendor_id is undefined
         fetchActions.push((0, editBillViewReducer_1.saveBillUpdatesToLocalStore)({
-            billDetailLocalData: prepareBillLocalData(state, billInLocalStore, vendor),
+            billDetailLocalData: prepareBillLocalData(state, billInLocalStore),
             billId: action.payload.billId,
         }));
-        fetchActions.push((0, previousBillsReducer_1.fetchPreviousBills)(vendor.qboId, false));
-    }
-    else {
-        fetchActions.push((0, vendorViewReducer_1.fetchVendor)(vendorId), (0, editBillViewReducer_1.waitForVendorByIdThenSaveBillUpdatetoLocalStore)(vendorId, action.payload.billId));
     }
     return (0, rxjs_1.from)(fetchActions);
 }));
@@ -67,17 +76,17 @@ function prepareBillLocalData(state, billInLocalStore, vendor) {
     const isCancelled = billInLocalStore.billDetailLocalData.isCancelled;
     const lines = billInLocalStore.billDetailLocalData.updatesByLineId;
     const updatedLines = Object.assign({}, lines);
-    const vendorCategory = vendor.accountId != null
+    const vendorCategory = (vendor === null || vendor === void 0 ? void 0 : vendor.accountId) != null
         ? (0, accountSelector_1.getAccountBase)(state.accountState, vendor.accountId, 'account_list')
         : undefined;
-    const vendorClass = vendor.classId != null
+    const vendorClass = (vendor === null || vendor === void 0 ? void 0 : vendor.classId) != null
         ? (0, classSelector_1.getClassById)(state.classState, {
             classId: vendor.classId,
             reportId: 'class_list',
         })
         : undefined;
-    const vendorCurrencyCode = vendor.vendorCurrencyCode;
-    const vendorCurrencySymbol = vendor.vendorCurrencySymbol;
+    const vendorCurrencyCode = vendor === null || vendor === void 0 ? void 0 : vendor.vendorCurrencyCode;
+    const vendorCurrencySymbol = vendor === null || vendor === void 0 ? void 0 : vendor.vendorCurrencySymbol;
     const { tenantState, companyState } = state;
     const { currentTenantId } = tenantState;
     const companyId = currentTenantId != null
@@ -101,8 +110,8 @@ function prepareBillLocalData(state, billInLocalStore, vendor) {
     if (Object.keys(updatedLines).length === 0) {
         updatedLines['1'] = Object.assign({ account: vendorCategory, class: vendorClass, amount: {
                 amount: 0,
-                currencyCode: vendorCurrencyCode,
-                currencySymbol: vendorCurrencySymbol,
+                currencyCode: vendorCurrencyCode !== null && vendorCurrencyCode !== void 0 ? vendorCurrencyCode : 'USD',
+                currencySymbol: vendorCurrencySymbol !== null && vendorCurrencySymbol !== void 0 ? vendorCurrencySymbol : '$',
             }, id: '1', lineDescription: '', platformLineDetailType: 'account_based_expense_line_detail', type: 'transaction_with_account_and_class_line', billable: 'not_billable', isCategoryMiscategorized: false, isClassMiscategorized: false }, editBillViewState_1.defaultRecommendationStateObj);
     }
     return {

package/package.json

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