feat(PIT): check if user is connected to sidenav

blockchain · Oct 22, 2019 · 931a0d9 · 931a0d9
1 parent dcbe167
commit 931a0d9
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 13 deletions.
diff --git a/config/mocks/wallet-options-v4.json b/config/mocks/wallet-options-v4.json
@@ -266,7 +266,7 @@
         }
       },
       "thePit": {
-        "countries": ["UK"]
+        "countries": ["US"]
       },
       "sfox": {
         "countries": ["US"],

diff --git a/packages/blockchain-wallet-v4-frontend/src/data/modules/profile/selectors.js b/packages/blockchain-wallet-v4-frontend/src/data/modules/profile/selectors.js
@@ -97,6 +97,21 @@ export const isInvitedToKyc = state =>
 
 export const userFlowSupported = isInvitedToKyc
 
+export const isInvitedToPitSidenav = state => {
+  const pitCountries = selectors.core.walletOptions.getPitCountryList(state)
+  const userCountry = selectors.core.settings.getCountryCode(state)
+
+  const transform = (pitCountries, userCountry) => {
+    const isCountryWhitelisted =
+      pitCountries &&
+      (pitCountries === '*' || includes(userCountry, pitCountries))
+
+    return isCountryWhitelisted
+  }
+
+  return lift(transform)(pitCountries, userCountry)
+}
+
 export const isInvitedToPitHomeBanner = state => {
   const pitCountries = selectors.core.walletOptions.getPitCountryList(state)
   const userCountry = selectors.core.settings.getCountryCode(state)

diff --git a/packages/blockchain-wallet-v4-frontend/src/layouts/Wallet/MenuLeft/Navigation/index.js b/packages/blockchain-wallet-v4-frontend/src/layouts/Wallet/MenuLeft/Navigation/index.js
@@ -1,14 +1,12 @@
 import React from 'react'
 import { connect } from 'react-redux'
 import { compose, bindActionCreators } from 'redux'
-import { concat, equals, not, prop } from 'ramda'
+import { concat, prop } from 'ramda'
 import { STATUS } from 'react-joyride/lib'
 
-import { actions, model, selectors } from 'data'
+import { actions, selectors } from 'data'
 import Navigation from './template'
 
-const { NONE, REJECTED } = model.profile.KYC_STATES
-
 class NavigationContainer extends React.PureComponent {
   handlePitTourCallbacks = (data, e) => {
     if ([STATUS.FINISHED, STATUS.SKIPPED].includes(data.status)) {
@@ -31,9 +29,6 @@ class NavigationContainer extends React.PureComponent {
         handleCloseMenu={actions.layoutWalletMenuCloseClicked}
         pitUrl={concat(prop('thePit', domains), '/trade')}
         handlePitTourCallbacks={this.handlePitTourCallbacks}
-        userEligibleForPIT={
-          (equals(NONE, userKYCState), not(equals(REJECTED, userKYCState)))
-        }
       />
     )
   }

diff --git a/packages/blockchain-wallet-v4-frontend/src/layouts/Wallet/MenuLeft/ThePitLink/index.js b/packages/blockchain-wallet-v4-frontend/src/layouts/Wallet/MenuLeft/ThePitLink/index.js
@@ -134,7 +134,7 @@ const PitLinkContent = props => {
 }
 
 const ThePitLink = props => {
-  return props.userEligibleForPIT ? (
+  return props.isInvitedToPitSidenav ? (
     props.isPitAccountLinked ? (
       <Link
         href={props.pitUrl}

diff --git a/packages/blockchain-wallet-v4-frontend/src/layouts/Wallet/MenuLeft/selectors.js b/packages/blockchain-wallet-v4-frontend/src/layouts/Wallet/MenuLeft/selectors.js
@@ -19,7 +19,8 @@ export const getData = createDeepEqualSelector(
     selectors.core.settings.getCountryCode,
     selectors.core.walletOptions.getAdsBlacklist,
     selectors.core.walletOptions.getAdsUrl,
-    selectors.modules.profile.getUserKYCState
+    selectors.modules.profile.getUserKYCState,
+    selectors.modules.profile.isInvitedToPitSidenav
   ],
   (
     pitConnectTest,
@@ -35,14 +36,16 @@ export const getData = createDeepEqualSelector(
     countryCodeR,
     adsBlacklistR,
     adsUrlR,
-    userKYCState
+    userKYCState,
+    isInvitedToPitSidenavR
   ) => {
     const transform = (
       pitConnectTest,
       canTrade,
       lockboxDevices,
       countryCode,
-      userKYCState
+      userKYCState,
+      isInvitedToPitSidenav
     ) => {
       return {
         adsBlacklist: adsBlacklistR.getOrElse([]),
@@ -51,6 +54,7 @@ export const getData = createDeepEqualSelector(
         countryCode,
         hasRunWalletTour: walletTourVisibility,
         hasSkippedTour: hasSkippedTourR.getOrElse(false),
+        isInvitedToPitSidenav,
         firstLogin,
         lockboxDevices,
         lockboxOpened,
@@ -67,7 +71,8 @@ export const getData = createDeepEqualSelector(
       canTradeR,
       lockboxDevicesR,
       countryCodeR,
-      userKYCState
+      userKYCState,
+      isInvitedToPitSidenavR
     )
   }
 )