@zeniai/client-epic-state 4.14.0 → 4.14.2

package/lib/view/settingsView/settingsViewHelpers.js

@@ -46,12 +46,10 @@ const isBankConnectionsTabVisible = (currentTenant, userRoleMap) => {
         return false;
     }
     if ((0, exports.isSettingsVisible)(currentTenant)) {
-        return (((0, userRoleType_1.hasBillPayAccessible)(currentTenant, userRoleMap) ||
+        return ((0, userRoleType_1.hasBillPayAccessible)(currentTenant, userRoleMap) ||
             (0, userRoleType_1.hasReimbursementAccessible)(currentTenant, userRoleMap) ||
             (0, userRoleType_1.hasZeniAccountsAccessible)(currentTenant, userRoleMap) ||
-            (0, userRoleType_1.hasChargeCardAccessible)(currentTenant, userRoleMap)) &&
-            (0, tenantSelector_1.isTenantBankingOnly)(currentTenant) === false &&
-            (0, tenantSelector_1.isTenantCardsOnly)(currentTenant) === false);
+            (0, userRoleType_1.hasChargeCardAccessible)(currentTenant, userRoleMap));
     }
     else {
         return false;
@@ -63,12 +61,10 @@ const isBusinessVerificationTabVisible = (currentTenant, userRoleMap) => {
         return false;
     }
     if ((0, exports.isSettingsVisible)(currentTenant)) {
-        return (((0, userRoleType_1.hasBillPayAccessible)(currentTenant, userRoleMap) ||
+        return ((0, userRoleType_1.hasBillPayAccessible)(currentTenant, userRoleMap) ||
             (0, userRoleType_1.hasReimbursementAccessible)(currentTenant, userRoleMap) ||
             (0, userRoleType_1.hasZeniAccountsAccessible)(currentTenant, userRoleMap) ||
-            (0, userRoleType_1.hasChargeCardAccessible)(currentTenant, userRoleMap)) &&
-            (0, tenantSelector_1.isTenantBankingOnly)(currentTenant) === false &&
-            (0, tenantSelector_1.isTenantCardsOnly)(currentTenant) === false);
+            (0, userRoleType_1.hasChargeCardAccessible)(currentTenant, userRoleMap));
     }
     else {
         return false;

package/lib/view/transactionDetail/epics/saveTransactionDetailEpic.js

@@ -10,7 +10,6 @@ const operators_1 = require("rxjs/operators");
 const transactionDetailReducer_1 = require("../transactionDetailReducer");
 const transactionDetailState_1 = require("../transactionDetailState");
 const saveTransactionHelper_1 = require("./saveTransactionHelper");
-const accountListSelector_1 = require("../../accountList/accountListSelector");
 const transactionSelector_1 = require("../../../entity/transaction/transactionSelector");
 const saveTransactionDetailEpic = (actions$, state$) => actions$.pipe((0, operators_1.filter)(transactionDetailReducer_1.saveTransactionDetail.match), (0, operators_1.mergeMap)((action) => {
     const transactionId = action.payload.transactionId;
@@ -22,9 +21,8 @@ const saveTransactionDetailEpic = (actions$, state$) => actions$.pipe((0, operat
     const detail = (0, get_1.default)(transactionDetailState.transactionDetailById, key, undefined);
     const transaction = (0, transactionSelector_1.getSupportedTransactionById)(transactionState, key);
     if (detail != null && transaction != null) {
-        const uncategorizedIncomeExpense = (0, accountListSelector_1.getUncategorizedAccounts)(state$.value.accountState, state$.value.accountListState, 'accountList');
         const localData = detail.transactionDetailLocalData;
-        const transactionSaveUpdates = (0, saveTransactionHelper_1.toTransactionUpdatesFromTransactionDetailLocalData)(localData, transaction, uncategorizedIncomeExpense, isExpenseAutomationEnabled);
+        const transactionSaveUpdates = (0, saveTransactionHelper_1.toTransactionUpdatesFromTransactionDetailLocalData)(localData, transaction, isExpenseAutomationEnabled);
         fetchActions.push((0, transactionDetailReducer_1.updateTransactionDetail)(transactionId, transactionSaveUpdates));
         return (0, rxjs_1.from)(fetchActions);
     }

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

@@ -21,7 +21,7 @@ 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: UncategorizedAccounts, isExpenseAutomationEnabled: boolean) => TransactionSaveUpdates;
+export declare const toTransactionUpdatesFromTransactionDetailLocalData: (transactionDetailLocalData: TransactionDetailLocalData, transaction: SupportedTransaction, isExpenseAutomationEnabled: boolean) => TransactionSaveUpdates;
 export declare const toRecommendedAccountBase: (amountValue: number, accountBase?: AccountBase | undefined, recommendationBase?: RecommendationBase | undefined) => RecommendedAccountBase | undefined;
 export declare const toRecommendedClassBase: (amountValue: number, classBase?: ClassBase | undefined, recommendationBase?: RecommendationBase | undefined) => RecommendedClassBase | undefined;
 export declare const isTransactionMiscategorized: (transaction: SupportedTransaction, isExpenseAutomationEnabled: boolean) => boolean;

package/lib/view/transactionDetail/epics/saveTransactionHelper.js

@@ -24,7 +24,7 @@ const recommendationState_1 = require("../../recommendation/recommendationState"
  * 4. Only difference between this and Miscategorized will be that we will
  * additionally fire “Mark as not miscat” for every point above.
  */
-const toTransactionUpdatesFromTransactionDetailLocalData = (transactionDetailLocalData, transaction, uncategorizedIncomeExpense, isExpenseAutomationEnabled) => {
+const toTransactionUpdatesFromTransactionDetailLocalData = (transactionDetailLocalData, transaction, isExpenseAutomationEnabled) => {
     var _a, _b, _c;
     const updates = {
         updatesByLineId: {},
@@ -32,7 +32,6 @@ const toTransactionUpdatesFromTransactionDetailLocalData = (transactionDetailLoc
     const updatesByLineId = {};
     const entityUpdates = {};
     const isTransactionMisCategorized = (0, exports.isTransactionMiscategorized)(transaction, isExpenseAutomationEnabled);
-    const isTransactionUnCategorized = (0, exports.isTransactionUncategorized)(transaction, uncategorizedIncomeExpense);
     updates.memo = transactionDetailLocalData.memo;
     const updatedEntityId = transactionDetailLocalData.updatePreviousTransactionsWithUpdatedVendor ===
         true
@@ -138,7 +137,7 @@ const toTransactionUpdatesFromTransactionDetailLocalData = (transactionDetailLoc
         entityRelatedUpdates: entityUpdates,
         /*Note: We need to call `mark-miscategorized-as-correct` api only when any of the line item is miscategorized
         and all the line items are NOT uncategorized*/
-        markAsMiscatUpdates: isTransactionMisCategorized && !isTransactionUnCategorized,
+        markAsMiscatUpdates: isTransactionMisCategorized,
         anyBulkUpdates: isBulkUpdate,
     };
 };

package/lib/view/transactionDetail/epics/updateTransactionDetailEpic.js

@@ -25,6 +25,9 @@ const vendorSelector_1 = require("../../../entity/vendor/vendorSelector");
 const vendorReducer_1 = require("../../../entity/vendor/vendorReducer");
 const transactionSelector_1 = require("../../../entity/transaction/transactionSelector");
 const transactionType_1 = require("../../../entity/transaction/stateTypes/transactionType");
+const accountListSelector_1 = require("../../accountList/accountListSelector");
+const toSupportedTransaction_1 = __importDefault(require("../../../entity/transaction/toSupportedTransaction"));
+const saveTransactionHelper_1 = require("./saveTransactionHelper");
 const updateTransactionDetailEpic = (actions$, state$, zeniAPI) => actions$.pipe((0, operators_1.filter)(transactionDetailReducer_1.updateTransactionDetail.match), (0, operators_1.mergeMap)((action) => {
     const { transactionState, vendorState, transactionDetailState } = state$.value;
     return zeniAPI
@@ -76,9 +79,13 @@ const updateTransactionDetailEpic = (actions$, state$, zeniAPI) => actions$.pipe
                     callMarkTransactionAsNotMiscategorized = false;
                 }
             }
+            const uncategorizedIncomeExpense = (0, accountListSelector_1.getUncategorizedAccounts)(state$.value.accountState, state$.value.accountListState, 'accountList');
+            const transaction = (0, toSupportedTransaction_1.default)(response.data.transaction);
+            const isTransactionUnCategorized = (0, saveTransactionHelper_1.isTransactionUncategorized)(transaction, uncategorizedIncomeExpense);
             if (action.payload.transactionSaveUpdates.markAsMiscatUpdates ===
                 true &&
-                callMarkTransactionAsNotMiscategorized === true) {
+                callMarkTransactionAsNotMiscategorized === true &&
+                isTransactionUnCategorized === false) {
                 actions.push((0, transactionDetailReducer_1.markTransactionAsNotMiscategorized)(transactionIdResp, action.payload.transactionSaveUpdates));
             }
             else {

package/package.json

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