feat(interest): add pax, usdt deposit form init support

blockchain · Jul 13, 2020 · e727e8f · e727e8f
1 parent 4f39fde
commit e727e8f
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 20 deletions.
diff --git a/packages/blockchain-wallet-v4-frontend/src/data/components/interest/reducers.ts b/packages/blockchain-wallet-v4-frontend/src/data/components/interest/reducers.ts
@@ -1,4 +1,4 @@
-import { append, assoc, compose, concat, dropLast, lensProp, over } from 'ramda'
+import { append, assoc, compose, dropLast, lensProp, over } from 'ramda'
 
 import Remote from 'blockchain-wallet-v4/src/remote/remote'
 
@@ -80,10 +80,7 @@ export function interestReducer (
     case AT.FETCH_INTEREST_INSTRUMENTS_SUCCESS:
       return {
         ...state,
-        // @ts-ignore
-        instruments: Remote.Success(
-          concat(['USDT', 'PAX'], payload.interestInstruments.instruments)
-        )
+        instruments: Remote.Success(payload.interestInstruments.instruments)
       }
     case AT.FETCH_INTEREST_LIMITS_FAILURE:
       return {
@@ -128,13 +125,7 @@ export function interestReducer (
     case AT.FETCH_INTEREST_RATE_SUCCESS:
       return {
         ...state,
-        // @ts-ignore
-        interestRate: Remote.Success({
-          BTC: 4.7,
-          ETH: 4.9,
-          PAX: 4.2,
-          USDT: 4.1
-        })
+        interestRate: Remote.Success(payload.interestRate.rates)
       }
     case AT.FETCH_INTEREST_TRANSACTIONS_LOADING: {
       const { reset } = payload

diff --git a/packages/blockchain-wallet-v4-frontend/src/data/components/interest/sagas.ts b/packages/blockchain-wallet-v4-frontend/src/data/components/interest/sagas.ts
@@ -207,7 +207,6 @@ export default ({
       AT.FETCH_INTEREST_LIMITS_FAILURE
     ])
 
-    // TODO: add USD-T & PAX
     switch (coin) {
       case 'BTC':
         const btcAccountsR = yield select(
@@ -219,14 +218,22 @@ export default ({
         defaultAccountR = btcAccountsR.map(nth(defaultIndex))
         payment = yield call(createPayment, defaultIndex)
         break
-
       case 'ETH':
         const ethAccountR = yield select(
           selectors.core.common.eth.getAccountBalances
         )
         defaultAccountR = ethAccountR.map(head)
         payment = yield call(createPayment, defaultAccountR)
         break
+      case 'PAX':
+      case 'USDT':
+        const erc20AccountR = yield select(
+          selectors.core.common.eth.getErc20AccountBalances,
+          coin
+        )
+        defaultAccountR = erc20AccountR.map(head)
+        payment = yield call(createPayment)
+        break
       default:
         throw new Error('Invalid Coin Type')
     }
@@ -312,13 +319,7 @@ export default ({
       yield put(actions.form.startSubmit(FORM))
       const withdrawalAmountBase = convertStandardToBase(coin, withdrawalAmount)
       let receiveAddress
-      // TODO: USD-T & PAX
       switch (coin) {
-        case 'ETH':
-          receiveAddress = selectors.core.data.eth
-            .getDefaultAddress(yield select())
-            .getOrFail('Failed to get ETH receive address')
-          break
         case 'BTC':
           receiveAddress = selectors.core.common.btc
             .getNextAvailableReceiveAddress(
@@ -328,6 +329,13 @@ export default ({
             )
             .getOrFail('Failed to get BTC receive address')
           break
+        case 'ETH':
+        case 'PAX':
+        case 'USDT':
+          receiveAddress = selectors.core.data.eth
+            .getDefaultAddress(yield select())
+            .getOrFail('Failed to get ETH receive address')
+          break
         default:
           throw new Error('Invalid Coin Type')
       }