chore(api): consolidate files and remove redundant types file

blockchain · Apr 16, 2021 · 6e70095 · 6e70095
1 parent ffd7af4
commit 6e70095
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 356 deletions.
diff --git a/packages/blockchain-wallet-v4-frontend/src/data/components/settings/sagas.ts b/packages/blockchain-wallet-v4-frontend/src/data/components/settings/sagas.ts
@@ -55,7 +55,7 @@ export default ({ api, coreSagas }) => {
       )
       const userId = userIdR.getOrElse(null)
       if (userId) {
-        const data = yield call(api.getProductsEligiblity)
+        const data = yield call(api.getProductsEligibility)
         yield put(A.fetchProductsEligibilitySuccess(data))
       } else {
         yield put(A.fetchProductsEligibilitySuccess(Remote.Success([])))

diff --git a/...es/blockchain-wallet-v4-frontend/src/modals/Brokerage/Banks/Deposit/EnterAmount/index.tsx b/...es/blockchain-wallet-v4-frontend/src/modals/Brokerage/Banks/Deposit/EnterAmount/index.tsx
@@ -4,7 +4,7 @@ import { prop } from 'ramda'
 import { bindActionCreators, Dispatch } from 'redux'
 
 import { Remote } from 'blockchain-wallet-v4/src'
-import { SBPaymentMethodType } from 'blockchain-wallet-v4/src/network/api/settingsComponent/types'
+import { SBPaymentMethodType } from 'blockchain-wallet-v4/src/network/api/simpleBuy/types'
 import {
   ExtractSuccess,
   FiatType,

diff --git a/...s/blockchain-wallet-v4-frontend/src/modals/Brokerage/Banks/Withdraw/EnterAmount/index.tsx b/...s/blockchain-wallet-v4-frontend/src/modals/Brokerage/Banks/Withdraw/EnterAmount/index.tsx
@@ -3,7 +3,7 @@ import { connect, ConnectedProps } from 'react-redux'
 import { bindActionCreators, Dispatch } from 'redux'
 
 import { Remote } from 'blockchain-wallet-v4/src'
-import { SBPaymentTypes } from 'blockchain-wallet-v4/src/network/api/settingsComponent/types'
+import { SBPaymentTypes } from 'blockchain-wallet-v4/src/network/api/simpleBuy/types'
 import {
   BeneficiaryType,
   ExtractSuccess,

diff --git a/packages/blockchain-wallet-v4/src/network/api/custodial/index.ts b/packages/blockchain-wallet-v4/src/network/api/custodial/index.ts
@@ -1,5 +1,5 @@
 import { CoinType, SBPaymentTypes, WalletFiatType } from 'core/types'
-import { BankTransferAccountType } from 'data/types'
+import { BankTransferAccountType, ProductEligibility } from 'data/types'
 
 import {
   BeneficiariesType,
@@ -101,9 +101,16 @@ export default ({ authorizedGet, authorizedPost, nabuUrl }) => {
       data: request
     })
 
+  const getProductsEligibility = (): ProductEligibility[] =>
+    authorizedGet({
+      url: nabuUrl,
+      endPoint: '/eligible/products'
+    })
+
   return {
     checkWithdrawalLocks,
     getBeneficiaries,
+    getProductsEligibility,
     getWithdrawalLocks,
     getWithdrawalFees,
     initiateCustodialTransfer,

diff --git a/packages/blockchain-wallet-v4/src/network/api/index.ts b/packages/blockchain-wallet-v4/src/network/api/index.ts
@@ -16,7 +16,6 @@ import misc from './misc'
 import profile from './profile'
 import rates from './rates'
 import settings from './settings'
-import settingsComponent from './settingsComponent'
 import simpleBuy from './simpleBuy'
 import swap from './swap'
 import wallet from './wallet'
@@ -81,11 +80,6 @@ const api = ({
       ...http
     }),
     ...settings({ rootUrl, ...http }),
-    ...settingsComponent({
-      nabuUrl,
-      authorizedGet: authorizedHttp.get,
-      ...http
-    }),
     ...simpleBuy({
       everypayUrl,
       nabuUrl,

diff --git a/packages/blockchain-wallet-v4/src/network/api/settingsComponent/index.ts b/packages/blockchain-wallet-v4/src/network/api/settingsComponent/index.ts