@zeniai/client-epic-state 4.18.96 → 4.18.97

package/lib/view/dashboard/dashboardEpic.js

@@ -37,7 +37,6 @@ const fetchDashboardEpic = (actions$, state$) => actions$.pipe((0, operators_1.f
     var _a, _b, _c, _d, _e, _f, _g, _h, _j;
     const { userId, companyId, fetchFullReport, cacheOverride, excludeResources, tenantId, } = action.payload;
     const currentTenant = (0, tenantSelector_1.getCurrentTenant)(state$.value);
-    const userRoleMap = (0, userRoleType_1.getUserRoleMap)(currentTenant.userRole);
     const isReimbursementFeatureEnabled = (_a = currentTenant.company) === null || _a === void 0 ? void 0 : _a.featuresActivationInfo.isReimbursementFeatureEnabled;
     const isAdmin = Boolean(currentTenant === null || currentTenant === void 0 ? void 0 : currentTenant.userRole) === true
         ? (0, userRoleType_1.hasAdminLevelAccess)(currentTenant.userRole)
@@ -89,7 +88,7 @@ const fetchDashboardEpic = (actions$, state$) => actions$.pipe((0, operators_1.f
                 refreshViewInBackground: false,
             }));
         }
-        if ((0, userRoleType_1.hasTreasuryAccess)(userRoleMap)) {
+        if (excludeResources.includes('treasury_promo_card') === false) {
             actions.push((0, treasurySetupViewReducer_1.fetchTreasuryFunds)());
         }
         return (0, rxjs_1.from)(actions);
@@ -205,7 +204,7 @@ const fetchDashboardEpic = (actions$, state$) => actions$.pipe((0, operators_1.f
             .fetchState !== 'In-Progress' &&
             state.treasurySetupViewState.treasuryFundsDetails.fetchStatus
                 .fetchState !== 'Completed' &&
-            (0, userRoleType_1.hasTreasuryAccess)(userRoleMap)) {
+            excludeResources.includes('treasury_promo_card') === false) {
             fetchActions.push((0, treasurySetupViewReducer_1.fetchTreasuryFunds)());
         }
         return (0, rxjs_1.from)(fetchActions);

package/lib/view/dashboard/dashboardSelector.d.ts

@@ -1,7 +1,6 @@
 import { ReportID, SelectorReport, SelectorView } from '../../commonStateTypes/viewAndReport/viewAndReport';
 import { TenantsOrdered } from '../../entity/tenant/tenantSelector';
 import { LoggedInUser, Tenant } from '../../entity/tenant/tenantState';
-import { RoleMap } from '../../entity/userRole/userRoleType';
 import { RootState } from '../../reducer';
 import { CardType } from './dashboardState';
 export interface DashboardReport extends SelectorReport {
@@ -12,4 +11,4 @@ export interface DashboardReport extends SelectorReport {
     currentTenant?: Tenant;
 }
 export declare const getDashboard: (state: RootState, additionalExcludedReports: ReportID[], // used when reports are excluded through statsig
-signedInUser: LoggedInUser | undefined, isExpenseAutomationFeatureEnabledV2: boolean, isExpenseAutomationFeatureEnabled: boolean, isDebitCardFeatureEnabled: boolean, isTreasuryFeatureEnabled: boolean, userRoleMap?: RoleMap) => DashboardReport;
+signedInUser: LoggedInUser | undefined, isExpenseAutomationFeatureEnabledV2: boolean, isExpenseAutomationFeatureEnabled: boolean, isDebitCardFeatureEnabled: boolean, isTreasuryFeatureEnabled: boolean) => DashboardReport;

package/lib/view/dashboard/dashboardSelector.js

@@ -45,7 +45,7 @@ const tenantSelector = (0, toolkit_1.createSelector)(tenantSelector_1.getTenants
 exports.getDashboard = (0, toolkit_1.createSelector)(tenantSelector, cardBalanceSelector_1.getCardBalance, cashBalanceSelector_1.getCashBalance, getOperatingExpensesForLast5Periods, getRevenueForLast4Periods, topExSelector_1.getTop6Expenses, getNetBurnOrIncomeForLast4Periods, getNetBurnOrIncomeStoryCard, getCashPositionLast5Periods, getCashInCashOutLast4Periods, insightsCardSelector_1.getInsights, companyPassportViewSelector_1.getCompanyPassportView, tasksCardSelector_1.getTasksCardReport, billPayCardSelector_1.getBillPayCardReport, reimbursementCardSelector_1.getReimbursementCardReport, apAgingSelector, arAgingSelector, zeniAccountsPromoCardSelector_1.getZeniAccountsPromoCard, referralSelector_1.getRewardsPlanCard, dashboardLayoutSelector_1.getDashboardCardsOrdered, (state) => {
     const currentTenant = (0, tenantSelector_1.getCurrentTenant)(state);
     return (0, monthEndCloseChecksViewSelector_1.getMonthEndCloseChecksViewByTenantId)(state, currentTenant.tenantId);
-}, (state) => state.tenantState, (_state, additionalExcludedReports) => additionalExcludedReports, (_state, _additionalExcludedReports, signedInUser) => signedInUser, (_state, _excluded, _signedInUser, isExpenseAutomationFeatureEnabledV2) => isExpenseAutomationFeatureEnabledV2, (_state, _excluded, _signedInUser, _enabledV2, isExpenseAutomationFeatureEnabled) => isExpenseAutomationFeatureEnabled, (_state, _excluded, _signedInUser, _enabledV2, _enabled, isDebitCardFeatureEnabled) => isDebitCardFeatureEnabled, (_state, _excluded, _signedInUser, _enabledV2, _enabled, _debitEnabled, isTreasuryFeatureEnabled) => isTreasuryFeatureEnabled, (_state, _excluded, _signedInUser, _enabledV2, _enabled, _debitEnabled, _treasuryEnabled, userRoleMap) => userRoleMap, (tenants, cardBalance, cashBalance, opEx, revenue, topEx, netBurnOrIncome, netBurnOrIncomeStoryCard, cashPosition, cashInCashOut, insightsView, companyPassportView, tasksCard, billPayCard, reimbursementCard, apAgingReport, arAgingReport, zeniAccountsPromoCard, rewardsPlanCard, cards, monthEndCloseChecksView, tenantState, additionalExcludedReports, signedInUser, isExpenseAutomationFeatureEnabledV2, isExpenseAutomationFeatureEnabled, isDebitCardFeatureEnabled, isTreasuryFeatureEnabled, userRoleMap) => {
+}, (state) => state.tenantState, (_state, additionalExcludedReports) => additionalExcludedReports, (_state, _additionalExcludedReports, signedInUser) => signedInUser, (_state, _excluded, _signedInUser, isExpenseAutomationFeatureEnabledV2) => isExpenseAutomationFeatureEnabledV2, (_state, _excluded, _signedInUser, _enabledV2, isExpenseAutomationFeatureEnabled) => isExpenseAutomationFeatureEnabled, (_state, _excluded, _signedInUser, _enabledV2, _enabled, isDebitCardFeatureEnabled) => isDebitCardFeatureEnabled, (_state, _excluded, _signedInUser, _enabledV2, _enabled, _debitEnabled, isTreasuryFeatureEnabled) => isTreasuryFeatureEnabled, (tenants, cardBalance, cashBalance, opEx, revenue, topEx, netBurnOrIncome, netBurnOrIncomeStoryCard, cashPosition, cashInCashOut, insightsView, companyPassportView, tasksCard, billPayCard, reimbursementCard, apAgingReport, arAgingReport, zeniAccountsPromoCard, rewardsPlanCard, cards, monthEndCloseChecksView, tenantState, additionalExcludedReports, signedInUser, isExpenseAutomationFeatureEnabledV2, isExpenseAutomationFeatureEnabled, isDebitCardFeatureEnabled, isTreasuryFeatureEnabled) => {
     var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0;
     const isReimbursementFeatureEnabled = (_a = tenants.currentTenant.company) === null || _a === void 0 ? void 0 : _a.featuresActivationInfo.isReimbursementFeatureEnabled;
     const isBillPayFeatureEnabled = (_b = tenants.currentTenant.company) === null || _b === void 0 ? void 0 : _b.featuresActivationInfo.isBillPayFeatureEnabled;
@@ -182,11 +182,8 @@ exports.getDashboard = (0, toolkit_1.createSelector)(tenantSelector, cardBalance
         }
     }
     // remove treasury promo card if its already enabled
-    const isUserHasTreasuryAccess = (0, userRoleType_1.hasTreasuryAccess)(userRoleMap);
     const isTreasuryTOSAccepted = (_0 = (_z = tenants.currentTenant.companyTreasuryInfo) === null || _z === void 0 ? void 0 : _z.info) === null || _0 === void 0 ? void 0 : _0.isTreasuryTOSAccepted;
-    if (isTreasuryTOSAccepted === true ||
-        isTreasuryFeatureEnabled === false ||
-        isUserHasTreasuryAccess === false) {
+    if (isTreasuryTOSAccepted === true || isTreasuryFeatureEnabled === false) {
         cardsToRemove.add('treasury_promo_card');
     }
     cardsCopy = cardsCopy.filter((c) => !cardsToRemove.has(c));

package/lib/view/spendManagement/treasury/treasuryTransferMoney/treasuryTransferMoneySelector.js

@@ -10,15 +10,10 @@ const getTreasuryTransferMoney = (state) => {
     const { treasuryTransferMoneyState, treasuryDetailState, treasurySetupViewState, depositAccountState, paymentAccountState, depositAccountListState, paymentAccountListState, } = state;
     const { localData, fetchState, error } = treasuryTransferMoneyState;
     const depositAccountsView = (0, depositAccountListSelector_1.getAllDepositAccounts)(depositAccountState, depositAccountListState);
-    const paymentAccountsView = (0, paymentAccountListSelector_1.getAllPaymentAccounts)(paymentAccountState, paymentAccountListState);
     let transferParties = [];
-    const transferMoneyPartiesFetchState = (0, reduceFetchState_1.reduceAllFetchState)([
-        depositAccountsView,
-        paymentAccountsView,
-    ]).fetchState;
-    if (depositAccountsView.fetchState === 'Completed' &&
-        paymentAccountsView.fetchState === 'Completed') {
-        transferParties = (0, setupViewSelector_1.getAllFundingAccounts)(depositAccountsView.depositAccounts, paymentAccountsView.paymentAccounts, paymentAccountListState.paymentAccountBalanceFetchStatus);
+    const transferMoneyPartiesFetchState = depositAccountsView.fetchState;
+    if (depositAccountsView.fetchState === 'Completed') {
+        transferParties = depositAccountsView.depositAccounts.map((depositAcc) => (0, setupViewSelector_1.mapDepositAccToFundingAccount)(depositAcc));
     }
     const primaryPaymentAccount = (0, paymentAccountListSelector_1.getPrimaryPaymentAccount)(paymentAccountState, paymentAccountListState);
     const treasuryAccount = {
@@ -30,7 +25,6 @@ const getTreasuryTransferMoney = (state) => {
     };
     const allRequiredDataFetchState = (0, reduceFetchState_1.reduceAllFetchState)([
         depositAccountsView,
-        paymentAccountsView,
         treasuryDetailState,
         treasurySetupViewState.currentAllocation.fetchStatus,
         treasurySetupViewState,

package/package.json

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