fix(send receive): bch address

blockchain · Jun 3, 2021 · ab7b8f3 · ab7b8f3
1 parent 9e0f75c
commit ab7b8f3
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 23 deletions.
diff --git a/packages/blockchain-wallet-v4-frontend/src/data/components/sendBch/sagas.ts b/packages/blockchain-wallet-v4-frontend/src/data/components/sendBch/sagas.ts
@@ -326,11 +326,15 @@ export default ({ api, coreSagas, networks }: { api: APIType; coreSagas: any; ne
         const value = payment.value()
         if (!value.to) throw new Error('missing_to_from_custodial')
         if (!value.amount) throw new Error('missing_amount_from_custodial')
+        if (!value.selection) throw new Error('missing_selection_from_custodial')
         yield call(
           api.withdrawSBFunds,
-          utils.bch.toCashAddr(value.to[0].address),
+          utils.bch.isCashAddr(value.to[0].address)
+            ? value.to[0].address
+            : utils.bch.toCashAddr(value.to[0].address),
           'BCH',
-          new BigNumber(value.amount[0]).toString()
+          new BigNumber(value.amount[0]).toString(),
+          value.selection.fee
         )
       } else {
         payment = yield payment.publish()

diff --git a/packages/blockchain-wallet-v4/src/network/api/simpleBuy/index.ts b/packages/blockchain-wallet-v4/src/network/api/simpleBuy/index.ts
@@ -404,7 +404,8 @@ export default ({
         address,
         amount,
         currency,
-        fee: fee?.toString()
+        fee: fee?.toString(),
+        product: 'SIMPLEBUY'
       },
       endPoint: '/payments/withdrawals',
       headers: {

diff --git a/packages/blockchain-wallet-v4/src/utils/bch.js b/packages/blockchain-wallet-v4/src/utils/bch.js
@@ -8,7 +8,7 @@ const formatAddr = (address, displayOnly) => {
   return displayOnly ? address.split('bitcoincash:')[1] : address
 }
 
-const hasPrefix = address => address.substring(0, 12) === 'bitcoincash:'
+const hasPrefix = (address) => address.substring(0, 12) === 'bitcoincash:'
 
 export const toCashAddr = (address, displayOnly) => {
   const pubKeyHash = 0
@@ -20,15 +20,9 @@ export const toCashAddr = (address, displayOnly) => {
 
     switch (version) {
       case pubKeyHash:
-        return formatAddr(
-          cashaddress.encode(cashAddrPrefix, 'pubkeyhash', hash),
-          displayOnly
-        )
+        return formatAddr(cashaddress.encode(cashAddrPrefix, 'pubkeyhash', hash), displayOnly)
       case scriptHash:
-        return formatAddr(
-          cashaddress.encode(cashAddrPrefix, 'scripthash', hash),
-          displayOnly
-        )
+        return formatAddr(cashaddress.encode(cashAddrPrefix, 'scripthash', hash), displayOnly)
       default:
         throw new Error('toBitcoinCash: Address type not supported')
     }
@@ -37,33 +31,27 @@ export const toCashAddr = (address, displayOnly) => {
   }
 }
 
-export const fromCashAddr = address => {
+export const fromCashAddr = (address) => {
   const { hash, version } = hasPrefix(address)
     ? cashaddress.decode(address)
     : cashaddress.decode(`bitcoincash:${address}`)
   switch (version) {
     case 'pubkeyhash':
-      return Bitcoin.address.toBase58Check(
-        hash,
-        Bitcoin.networks.bitcoin.pubKeyHash
-      )
+      return Bitcoin.address.toBase58Check(hash, Bitcoin.networks.bitcoin.pubKeyHash)
     case 'scripthash':
-      return Bitcoin.address.toBase58Check(
-        hash,
-        Bitcoin.networks.bitcoin.scriptHash
-      )
+      return Bitcoin.address.toBase58Check(hash, Bitcoin.networks.bitcoin.scriptHash)
     default:
       throw new Error('fromBitcoinCash: Address type not supported')
   }
 }
 
-export const isCashAddr = address => {
+export const isCashAddr = (address) => {
   try {
     return fromCashAddr(address)
   } catch (e) {
     return false
   }
 }
 
-export const convertFromCashAddrIfCashAddr = addr =>
+export const convertFromCashAddrIfCashAddr = (addr) =>
   isCashAddr(addr) ? fromCashAddr(addr) : addr