@zeniai/client-epic-state 4.19.18 → 4.19.19-beta0ND

package/lib/view/dashboard/dashboardSelector.js

@@ -184,6 +184,41 @@ exports.getDashboard = (0, toolkit_1.createSelector)(tenantSelector, cardBalance
     if (isTreasuryTOSAccepted === true || isTreasuryFeatureEnabled === false) {
         cardsToRemove.add('treasury_promo_card');
     }
+    // More than one promo card can't be shown in the dashboard(Priority: Treasury>Cards>Accounts>Bill> Remi)
+    // There is an exception when number of card accounts connected to QBO is zero, in that case we replace card_balance tile in 2nd position with zeni_promo_card,
+    // so 3rd position tile could be any other promo card based on priority order.
+    const PROMO_CARD_PRIORITY_ORDER = [
+        'treasury_promo_card',
+        'zeni_promo_card',
+        'zeni_accounts_promo_card',
+        'bill_pay_promo_card',
+        'reimbursement_promo_card',
+    ];
+    const promoCards = PROMO_CARD_PRIORITY_ORDER;
+    const promoCardsTobeRetained = promoCards.filter((c) => !cardsToRemove.has(c));
+    if (promoCardsTobeRetained.length > 1) {
+        const cardsToKeep = new Set();
+        if (cardsToRemove.has('card_balance') &&
+            promoCardsTobeRetained.includes('zeni_promo_card')) {
+            // zeni_promo_card is the primary promo card when card_balance is removed
+            cardsToKeep.add('zeni_promo_card');
+            // Also keep the highest priority non-zeni promo card as the 2nd
+            const secondCard = promoCardsTobeRetained.find((card) => card !== 'zeni_promo_card');
+            if (secondCard != null) {
+                cardsToKeep.add(secondCard);
+            }
+        }
+        else {
+            // Keep only the highest priority promo card
+            cardsToKeep.add(promoCardsTobeRetained[0]);
+        }
+        // Remove all other promo cards not in cardsToKeep
+        promoCardsTobeRetained.forEach((card) => {
+            if (!cardsToKeep.has(card)) {
+                cardsToRemove.add(card);
+            }
+        });
+    }
     cardsCopy = cardsCopy.filter((c) => !cardsToRemove.has(c));
     const reportsInOrder = [
         cashBalance,

package/lib/view/dashboardLayout/dashboardLayoutReducer.js

@@ -6,8 +6,8 @@ const toolkit_1 = require("@reduxjs/toolkit");
 exports.defaultCardsInOrder = [
     'cash_balance',
     'card_balance',
-    'treasury_promo_card',
     'zeni_promo_card',
+    'treasury_promo_card',
     'expense_automation_card',
     'zeni_accounts_promo_card',
     'task_card',

package/lib/view/dashboardLayout/fetchDashboardLayoutEpic.js

@@ -12,14 +12,24 @@ const fetchDashboardLayoutEpic = (actions$, _, zeniAPI) => actions$.pipe((0, ope
     if ((0, responsePayload_1.isSuccessResponse)(response) && response.data) {
         const cardOrder = response.data.preferences
             .card_order;
-        let updatedCardOrder = cardOrder;
-        // if treasury promo card is not in the response, add it at third position
-        // and update in the backend
-        if (cardOrder.includes('treasury_promo_card') === false) {
+        let updatedCardOrder = [...cardOrder];
+        const treasuryIdx = updatedCardOrder.indexOf('treasury_promo_card');
+        const zeniPromoIdx = updatedCardOrder.indexOf('zeni_promo_card');
+        // Swap zeni_promo_card before treasury_promo_card if needed
+        if (treasuryIdx !== -1 &&
+            zeniPromoIdx !== -1 &&
+            zeniPromoIdx > treasuryIdx) {
+            updatedCardOrder[treasuryIdx] = 'zeni_promo_card';
+            updatedCardOrder[zeniPromoIdx] =
+                'treasury_promo_card';
+            return (0, rxjs_1.of)((0, dashboardLayoutReducer_1.updateDashboardLayout)(updatedCardOrder));
+        }
+        // If treasury promo card is not in the response, add it at fourth position
+        if (treasuryIdx === -1) {
             updatedCardOrder = [
-                ...cardOrder.slice(0, 2),
+                ...cardOrder.slice(0, 3),
                 'treasury_promo_card',
-                ...cardOrder.slice(2),
+                ...cardOrder.slice(3),
             ];
             return (0, rxjs_1.of)((0, dashboardLayoutReducer_1.updateDashboardLayout)(updatedCardOrder));
         }

package/lib/view/spendManagement/billPay/billDetailView/billDetailViewSelector.js

@@ -110,7 +110,7 @@ const getBillDetailView = (state, billId) => {
         const previousBillsView = (0, previousBillsSelector_1.getPreviousBills)(state, (_e = (_d = transaction.vendor) === null || _d === void 0 ? void 0 : _d.id) !== null && _e !== void 0 ? _e : '');
         //don't include current bill
         previousBills = Object.assign(Object.assign({}, previousBillsView), { bills: previousBillsView.bills.filter((bill) => bill.id !== billId) });
-        fetchState = (0, reduceFetchState_1.reduceFetchState)([billTransactionDetails, previousBillsView]);
+        fetchState = (0, reduceFetchState_1.reduceFetchState)([billTransactionDetails]);
     }
     const realTimeApprovalkey = (0, realTimeApprovalState_1.getEntityRealTimeApprovalDetailKey)(billId, 'bill_pay');
     const { approverIds, attributes } = approverListState;

package/package.json

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