feat(sb): only show fiat in side naav if user is eligible

blockchain · Jul 16, 2020 · bcaaf4f · bcaaf4f
1 parent 08f55b4
commit bcaaf4f
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 4 deletions.
diff --git a/packages/blockchain-wallet-v4-frontend/src/data/auth/sagas.js b/packages/blockchain-wallet-v4-frontend/src/data/auth/sagas.js
@@ -143,6 +143,7 @@ export default ({ api, coreSagas }) => {
       const language = yield select(selectors.preferences.getLanguage)
       yield put(actions.modules.settings.updateLanguage(language))
       yield put(actions.analytics.initUserSession())
+      yield put(actions.components.simpleBuy.fetchSBPaymentMethods())
       yield fork(checkDataErrors)
       yield fork(logoutRoutine, yield call(setLogoutEventListener))
     } catch (e) {

diff --git a/packages/blockchain-wallet-v4-frontend/src/data/components/simpleBuy/sagas.ts b/packages/blockchain-wallet-v4-frontend/src/data/components/simpleBuy/sagas.ts
@@ -451,9 +451,14 @@ export default ({
     currency
   }: ReturnType<typeof A.fetchSBPaymentMethods>) {
     try {
-      yield call(createUser)
       yield call(waitForUserData)
       const isUserTier2: boolean = yield call(isTier2)
+      if (!isUserTier2) {
+        return yield put(
+          A.fetchSBPaymentMethodsSuccess({ currency: 'USD', methods: [] })
+        )
+      }
+      yield call(createUser)
       yield put(A.fetchSBPaymentMethodsLoading())
       const methods = yield call(
         api.getSBPaymentMethods,

diff --git a/packages/blockchain-wallet-v4-frontend/src/layouts/Wallet/MenuLeft/Navigation/template.tsx b/packages/blockchain-wallet-v4-frontend/src/layouts/Wallet/MenuLeft/Navigation/template.tsx
@@ -98,6 +98,7 @@ const Navigation = (props: OwnProps & Props) => {
         mapObjIndexed(
           (coin: SupportedCoinType, i) =>
             coin &&
+            coin.method &&
             coin.invited &&
             coin.txListAppRoute && (
               <LinkContainer

diff --git a/packages/blockchain-wallet-v4/src/network/api/simpleBuy/types.ts b/packages/blockchain-wallet-v4/src/network/api/simpleBuy/types.ts
@@ -101,6 +101,7 @@ export type SBPairType = {
 }
 
 export type SBPaymentMethodType = {
+  currency: FiatType
   limits: {
     max: string
     min: string

diff --git a/packages/blockchain-wallet-v4/src/redux/walletOptions/selectors.ts b/packages/blockchain-wallet-v4/src/redux/walletOptions/selectors.ts
@@ -11,7 +11,9 @@ import {
   set,
   toUpper
 } from 'ramda'
+import { FiatTypeEnum } from 'blockchain-wallet-v4/src/types'
 import { getInvitations } from '../settings/selectors'
+import { getSBPaymentMethods } from 'data/components/simpleBuy/selectors'
 import { RootState } from 'data/rootReducer'
 import { SupportedCoinType } from './types'
 
@@ -34,15 +36,29 @@ export const getAdsUrl = state => getWebOptions(state).map(path(['ads', 'url']))
 
 // coins
 export const getSupportedCoins = createDeepEqualSelector(
-  [getInvitations, getWebOptions],
-  (invitationsR, webOptionsR) => {
+  [getInvitations, getWebOptions, getSBPaymentMethods],
+  (invitationsR, webOptionsR, sbPaymentMethods) => {
     const addInvited = (obj, coin) => {
       // @ts-ignore
       const invited = invitationsR.map(propOr(true, coin)).getOrElse(false)
       return set(lensProp('invited'), invited, obj)
     }
+    const addMethod = (obj, coin) => {
+      const methods = sbPaymentMethods.getOrElse({
+        currency: 'USD',
+        methods: []
+      })
+      const method =
+        coin in FiatTypeEnum
+          ? methods.methods.find(method => method.currency === coin)
+          : true
+      return set(lensProp('method'), method, obj)
+    }
 
-    return webOptionsR.map(prop('coins')).map(mapObjIndexed(addInvited))
+    return webOptionsR
+      .map(prop('coins'))
+      .map(mapObjIndexed(addInvited))
+      .map(mapObjIndexed(addMethod))
   }
 )
 export const getSyncToExchangeList = state =>

diff --git a/packages/blockchain-wallet-v4/src/redux/walletOptions/types.ts b/packages/blockchain-wallet-v4/src/redux/walletOptions/types.ts
@@ -29,6 +29,7 @@ export type SupportedCoinType = {
   }
   invited?: boolean
   learnMoreLink: string
+  method?: boolean
   minConfirmations: number
   showNewTagSidenav: boolean
   txExplorerBaseUrl: string
@@ -48,6 +49,7 @@ export type SupportedFiatType = {
   }
   invited?: boolean
   learnMoreLink: ''
+  method?: boolean
   minConfirmations: 0
   txExplorerBaseUrl: ''
   txListAppRoute: string