@zeniai/client-epic-state 4.8.12 → 4.8.14

package/lib/view/spendManagement/zeniAccounts/transferDetail/transferDetailSelector.d.ts

@@ -1,5 +1,7 @@
 import { FetchState } from '../../../../commonStateTypes/common';
 import { SelectorView } from '../../../../commonStateTypes/viewAndReport/viewAndReport';
+import { DepositAccount } from '../../../../entity/depositAccount/depositAccount';
+import { PaymentAccount } from '../../../../entity/paymentAccount/paymentAccountState';
 import { RootState } from '../../../../reducer';
 import { TransferDetailLocalData, TransferMoneyParty } from './transferDetailState';
 export interface TransferDetailSelectorView extends SelectorView {
@@ -8,3 +10,6 @@ export interface TransferDetailSelectorView extends SelectorView {
     transferMoneyPartiesFetchState: FetchState;
 }
 export declare const getTransferDetail: (state: RootState) => TransferDetailSelectorView;
+export declare const getTransferMoneyParties: (depositAccounts: DepositAccount[], paymentAccounts: PaymentAccount[]) => TransferMoneyParty[];
+export declare const mapDepositAccToTransferMoneyParty: (depositAcc: DepositAccount) => TransferMoneyParty;
+export declare const mapPaymentAccToTransferMoneyParty: (paymentAcc: PaymentAccount) => TransferMoneyParty;

package/lib/view/spendManagement/zeniAccounts/transferDetail/transferDetailSelector.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getTransferDetail = void 0;
+exports.mapPaymentAccToTransferMoneyParty = exports.mapDepositAccToTransferMoneyParty = exports.getTransferMoneyParties = exports.getTransferDetail = void 0;
 const reduceFetchState_1 = require("../../../../commonStateTypes/reduceFetchState");
 const depositAccountPayload_1 = require("../../../../entity/depositAccount/depositAccountPayload");
 const depositAccountListSelector_1 = require("../depositAccountList/depositAccountListSelector");
@@ -17,35 +17,7 @@ const getTransferDetail = (state) => {
     ]).fetchState;
     if (depositAccountsView.fetchState === 'Completed' &&
         paymentAccountsView.fetchState === 'Completed') {
-        transferParties = [
-            ...depositAccountsView.depositAccounts.map((depositAcc) => ({
-                id: depositAcc.id,
-                accType: 'depositAccount',
-                label: depositAcc.accountName,
-                maskedAccountNumber: depositAcc.maskedAccountNumber,
-                accountBalance: depositAcc.accountBalance,
-                logo: undefined,
-            })),
-            ...paymentAccountsView.paymentAccounts
-                .filter((paymentAccount) => {
-                var _a, _b;
-                return ((_a = paymentAccount.providerVerificationStatus) === null || _a === void 0 ? void 0 : _a.code) === 'verified' ||
-                    ((_b = paymentAccount.providerVerificationStatus) === null || _b === void 0 ? void 0 : _b.code) ===
-                        'manually_verified';
-            })
-                .map((paymentAcc) => {
-                var _a;
-                return ({
-                    id: paymentAcc.paymentAccountId,
-                    accType: 'paymentAccount',
-                    maskedAccountNumber: paymentAcc.maskedAccountNumber,
-                    label: Boolean(paymentAcc.institutionDetails.institutionName) === true
-                        ? paymentAcc.institutionDetails.institutionName
-                        : (0, depositAccountPayload_1.getZeniAccountFallbackName)(paymentAcc.maskedAccountNumber, (_a = paymentAcc.accountSubType) === null || _a === void 0 ? void 0 : _a.name),
-                    logo: paymentAcc.institutionDetails.logo,
-                });
-            }),
-        ];
+        transferParties = (0, exports.getTransferMoneyParties)(depositAccountsView.depositAccounts, paymentAccountsView.paymentAccounts);
     }
     return {
         transferDetailLocalData: localData,
@@ -57,3 +29,42 @@ const getTransferDetail = (state) => {
     };
 };
 exports.getTransferDetail = getTransferDetail;
+/* This helper function takes deposit accounts and payment accounts
+   and give back TrasferMoneyParty type array
+   to support single dropdown with both lists */
+const getTransferMoneyParties = (depositAccounts, paymentAccounts) => {
+    return [
+        ...depositAccounts.map((depositAcc) => (0, exports.mapDepositAccToTransferMoneyParty)(depositAcc)),
+        ...paymentAccounts
+            .filter((paymentAccount) => {
+            var _a, _b;
+            return ((_a = paymentAccount.providerVerificationStatus) === null || _a === void 0 ? void 0 : _a.code) === 'verified' ||
+                ((_b = paymentAccount.providerVerificationStatus) === null || _b === void 0 ? void 0 : _b.code) ===
+                    'manually_verified';
+        })
+            .map((paymentAcc) => (0, exports.mapPaymentAccToTransferMoneyParty)(paymentAcc)),
+    ];
+};
+exports.getTransferMoneyParties = getTransferMoneyParties;
+const mapDepositAccToTransferMoneyParty = (depositAcc) => ({
+    id: depositAcc.id,
+    accType: 'depositAccount',
+    label: depositAcc.accountName,
+    maskedAccountNumber: depositAcc.maskedAccountNumber,
+    accountBalance: depositAcc.accountBalance,
+    logo: undefined,
+});
+exports.mapDepositAccToTransferMoneyParty = mapDepositAccToTransferMoneyParty;
+const mapPaymentAccToTransferMoneyParty = (paymentAcc) => {
+    var _a;
+    return ({
+        id: paymentAcc.paymentAccountId,
+        accType: 'paymentAccount',
+        maskedAccountNumber: paymentAcc.maskedAccountNumber,
+        label: Boolean(paymentAcc.institutionDetails.institutionName) === true
+            ? paymentAcc.institutionDetails.institutionName
+            : (0, depositAccountPayload_1.getZeniAccountFallbackName)(paymentAcc.maskedAccountNumber, (_a = paymentAcc.accountSubType) === null || _a === void 0 ? void 0 : _a.name),
+        logo: paymentAcc.institutionDetails.logo,
+    });
+};
+exports.mapPaymentAccToTransferMoneyParty = mapPaymentAccToTransferMoneyParty;

package/lib/view/spendManagement/zeniAccounts/transferDetail/transferMoneyEpic.js

@@ -9,18 +9,18 @@ const depositAccountListReducer_1 = require("../depositAccountList/depositAccoun
 const depositAccountTransactionListReducer_1 = require("../depositAccountTransactionList/depositAccountTransactionListReducer");
 const helpers_1 = require("../../helpers");
 const transferMoneyEpic = (actions$, state$, zeniAPI) => actions$.pipe((0, operators_1.filter)(transferDetailReducer_1.transferMoney.match), (0, operators_1.switchMap)((action) => {
-    var _a, _b, _c, _d;
+    var _a, _b, _c, _d, _e, _f;
     const state = state$.value;
     const { depositAccountId } = action.payload;
     const localData = state.transferDetailState.localData;
     const payload = {
         from_account: {
             account_id: (_a = localData.transferFrom) === null || _a === void 0 ? void 0 : _a.id,
-            account_type: (0, helpers_1.accountTypeSubConfigCodeToAccType)((_b = localData.transferFrom) === null || _b === void 0 ? void 0 : _b.accType),
+            account_type: (_c = (0, helpers_1.accountTypeSubConfigCodeToAccType)((_b = localData.transferFrom) === null || _b === void 0 ? void 0 : _b.accType)) !== null && _c !== void 0 ? _c : '',
         },
         to_account: {
-            account_id: (_c = localData.transferTo) === null || _c === void 0 ? void 0 : _c.id,
-            account_type: (0, helpers_1.accountTypeSubConfigCodeToAccType)((_d = localData.transferTo) === null || _d === void 0 ? void 0 : _d.accType),
+            account_id: (_d = localData.transferTo) === null || _d === void 0 ? void 0 : _d.id,
+            account_type: (_f = (0, helpers_1.accountTypeSubConfigCodeToAccType)((_e = localData.transferTo) === null || _e === void 0 ? void 0 : _e.accType)) !== null && _f !== void 0 ? _f : '',
         },
         amount: localData.amount.amount,
         currency_code: localData.amount.currencyCode,

package/lib/view/vendorReviewView/common/payload/commonTypes.js

@@ -4,7 +4,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.toGlobalMerchantsBasePayload = exports.toVendorReviewViewRecommendationPayload = exports.toNonExistingRecommendationGlobalMerchantBasePayload = exports.toUserPayload = void 0;
-const flatMap_1 = __importDefault(require("lodash/flatMap"));
 const omit_1 = __importDefault(require("lodash/omit"));
 const globalMerchantPayload_1 = require("../../../../entity/globalMerchant/globalMerchantPayload");
 /**
@@ -69,19 +68,25 @@ const toVendorReviewViewRecommendationPayload = (recommendations, nonExistingRec
             global_merchants: recommendationEntities,
         };
     });
-    const allRecommendations = recommendationsPayload.length > 0
-        ? recommendationsPayload
-        : nonExistingRecommendationsPayload;
+    const allRecommendations = [
+        {
+            global_merchants: [
+                ...recommendationsPayload[0].global_merchants,
+                ...nonExistingRecommendationsPayload[0].global_merchants,
+            ],
+        },
+    ];
     return allRecommendations;
 };
 exports.toVendorReviewViewRecommendationPayload = toVendorReviewViewRecommendationPayload;
 const toGlobalMerchantsBasePayload = (vendorsRecommendationsPayload) => {
-    var _a, _b;
-    let globalMerchantBasePayload = [];
-    if (((_b = (_a = vendorsRecommendationsPayload[0]) === null || _a === void 0 ? void 0 : _a.global_merchants[0]) === null || _b === void 0 ? void 0 : _b.global_merchant_id) != null) {
-        globalMerchantBasePayload = (0, flatMap_1.default)(vendorsRecommendationsPayload.map((vendorsRecoomendation) => vendorsRecoomendation
-            .global_merchants));
-    }
+    var _a;
+    const globalMerchantBasePayload = [];
+    (_a = vendorsRecommendationsPayload[0]) === null || _a === void 0 ? void 0 : _a.global_merchants.forEach((globalMerchantPayload) => {
+        if (globalMerchantPayload.global_merchant_id != null) {
+            globalMerchantBasePayload.push(globalMerchantPayload);
+        }
+    });
     return globalMerchantBasePayload;
 };
 exports.toGlobalMerchantsBasePayload = toGlobalMerchantsBasePayload;

package/lib/view/vendorReviewView/common/state/commonTypes.js

@@ -67,15 +67,17 @@ const toNonExistingGlobalMerchantBase = (globalMerchantPayload) => {
 };
 exports.toNonExistingGlobalMerchantBase = toNonExistingGlobalMerchantBase;
 const toAllRecommendationsFromPayload = (recommendationsPayload) => {
-    var _a, _b;
-    let recommendations = [];
-    let nonExistingRecommendations = [];
-    if (((_b = (_a = recommendationsPayload[0]) === null || _a === void 0 ? void 0 : _a.global_merchants[0]) === null || _b === void 0 ? void 0 : _b.global_merchant_id) != null) {
-        recommendations = (0, exports.toRecommendationsFromPayload)(recommendationsPayload);
-    }
-    else {
-        nonExistingRecommendations = (0, exports.toNonExistingRecommendationsFromPayload)(recommendationsPayload);
-    }
+    var _a;
+    const recommendations = [];
+    const nonExistingRecommendations = [];
+    (_a = recommendationsPayload[0]) === null || _a === void 0 ? void 0 : _a.global_merchants.forEach((globalmerchant) => {
+        if (globalmerchant.global_merchant_id != null) {
+            recommendations.push((0, globalMerchantPayload_1.toGlobalMerchantBase)(globalmerchant));
+        }
+        else {
+            nonExistingRecommendations.push((0, exports.toNonExistingGlobalMerchantBase)(globalmerchant));
+        }
+    });
     const recommendationIds = recommendations.map((recommendation) => recommendation.globalMerchantId);
     return {
         recommendationIds,

package/lib/view/vendorReviewView/vendorFirstReviewView/epics/fetchVendorFirstReviewViewEpic.js

@@ -82,17 +82,13 @@ exports.mapUsersPayloadFromVendorFirstReviewViewResponse = mapUsersPayloadFromVe
 const mapGlobalMerchantsBasePayloadFromVendorFirstReviewViewResponse = (vendorsResponse) => {
     const globalMerchantBasePayload = [];
     vendorsResponse.forEach((vendor) => {
-        var _a, _b;
-        if (((_b = (_a = vendor.recommendations[0]) === null || _a === void 0 ? void 0 : _a.global_merchants[0]) === null || _b === void 0 ? void 0 : _b.global_merchant_id) != null) {
-            mapVendorRecommendationsToGlobalMerchantBasePayload(vendor.recommendations, globalMerchantBasePayload);
-        }
+        var _a;
+        const existingMerchants = (_a = vendor.recommendations[0]) === null || _a === void 0 ? void 0 : _a.global_merchants.filter((merchant) => merchant.global_merchant_id != null);
+        mapEntitiesRecommendationsPayloadToGlobalMerchantsBasePayload(existingMerchants, globalMerchantBasePayload);
     });
     return globalMerchantBasePayload;
 };
 exports.mapGlobalMerchantsBasePayloadFromVendorFirstReviewViewResponse = mapGlobalMerchantsBasePayloadFromVendorFirstReviewViewResponse;
-const mapVendorRecommendationsToGlobalMerchantBasePayload = (recommendations, globalMerchantBasePayload) => {
-    recommendations.forEach((recommendation) => mapEntitiesRecommendationsPayloadToGlobalMerchantsBasePayload(recommendation.global_merchants, globalMerchantBasePayload));
-};
 const mapEntitiesRecommendationsPayloadToGlobalMerchantsBasePayload = (entities, globalMerchantBasePayload) => {
     entities.forEach((entity) => globalMerchantBasePayload.push(entity));
 };

package/lib/view/vendorReviewView/vendorFirstReviewView/vendorFirstReviewViewReducer.js

@@ -83,8 +83,9 @@ const vendorFirstReviewView = (0, toolkit_1.createSlice)({
                         const isRecommendationSelected = selectedGlobalMerchantId != null &&
                             (selectedGlobalMerchantId ===
                                 vendorLocalData.recommendationIds[0] ||
-                                selectedGlobalMerchantId ===
-                                    ((_a = vendorLocalData.recommendedNonExistingGlobalMerchants[0]) === null || _a === void 0 ? void 0 : _a.globalMerchantName));
+                                (vendorLocalData.recommendationIds.length === 0 &&
+                                    selectedGlobalMerchantId ===
+                                        ((_a = vendorLocalData.recommendedNonExistingGlobalMerchants[0]) === null || _a === void 0 ? void 0 : _a.globalMerchantName)));
                         const isRetainSelected = selectedGlobalMerchantId != null &&
                             selectedGlobalMerchantId === vendorLocalData.vendorId;
                         currentSelection =
@@ -244,7 +245,7 @@ const mapPayloadToVendorFirstReviewView = (payload) => {
         },
         currentSelection: null,
         recommendationIds,
-        recommendedNonExistingGlobalMerchants: recommendationIds.length === 0 ? nonExistingRecommendations : [],
+        recommendedNonExistingGlobalMerchants: nonExistingRecommendations,
         lastUpdatedVendorNameByUserId: (_a = payload.last_updated_vendor_name_by_user) === null || _a === void 0 ? void 0 : _a.user_id,
     };
 };

package/lib/view/vendorReviewView/vendorFirstReviewView/vendorFirstReviewViewSelector.js

@@ -19,10 +19,10 @@ const getVendorFirstReviewView = (state) => {
         const currentVendor = (0, vendorSelector_1.getVendorByVendorId)(vendorState, vendorLocalData.vendorId);
         const users = (0, userSelector_1.getUsersByUserIds)(userState, userIds);
         let recommendations = (0, globalMerchantSelector_1.getGlobalMerchantsByMerchantIds)(globalMerchantState, vendorLocalData.recommendationIds);
-        recommendations =
-            recommendations.length > 0
-                ? recommendations
-                : vendorLocalData.recommendedNonExistingGlobalMerchants;
+        recommendations = [
+            ...recommendations,
+            ...vendorLocalData.recommendedNonExistingGlobalMerchants,
+        ];
         let selectedVendor;
         const vendor = (0, vendorSelector_1.getVendorByVendorId)(vendorState, vendorLocalData.selectedVendorId);
         if (vendor != null) {

package/lib/view/vendorReviewView/vendorGlobalReviewView/epics/fetchVendorGlobalReviewViewEpic.js

@@ -71,15 +71,12 @@ exports.toUsersPayload = toUsersPayload;
 const mapGlobalReviewPayloadToGlobalMerchantsBasePayload = (vendorsResponse) => {
     let globalMerchantBasePayload = [];
     vendorsResponse.forEach((vendor) => {
-        var _a, _b;
-        if (((_b = (_a = vendor.recommendations[0]) === null || _a === void 0 ? void 0 : _a.global_merchants[0]) === null || _b === void 0 ? void 0 : _b.global_merchant_id) != null) {
-            globalMerchantBasePayload = [
-                ...new Set([
-                    ...globalMerchantBasePayload,
-                    ...(0, commonTypes_1.toGlobalMerchantsBasePayload)(vendor.recommendations),
-                ]),
-            ];
-        }
+        globalMerchantBasePayload = [
+            ...new Set([
+                ...globalMerchantBasePayload,
+                ...(0, commonTypes_1.toGlobalMerchantsBasePayload)(vendor.recommendations),
+            ]),
+        ];
     });
     return globalMerchantBasePayload;
 };

package/package.json

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