fix(BSV): add bsv to selectReceiveAddress for refund address generation

blockchain · Jan 3, 2019 · b847e17 · b847e17
1 parent 76d89f4
commit b847e17
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/packages/blockchain-wallet-v4-frontend/src/data/components/exchange/exchange.sagas.js b/packages/blockchain-wallet-v4-frontend/src/data/components/exchange/exchange.sagas.js
@@ -113,7 +113,6 @@ export default ({ api, coreSagas, networks }) => {
         ['payload', 'limits', currency],
         yield take(AT.FETCH_LIMITS_SUCCESS)
       )
-
     return limitsR.map(prop(currency)).getOrFail(NO_LIMITS_ERROR)
   }
 

diff --git a/packages/blockchain-wallet-v4-frontend/src/data/components/exchange/services.js b/packages/blockchain-wallet-v4-frontend/src/data/components/exchange/services.js
@@ -23,7 +23,7 @@ export const convertBaseToStandard = (coin, value) => {
       return Exchange.convertBchToBch({ value, fromUnit: 'SAT', toUnit: 'BCH' })
         .value
     case 'BSV':
-      return Exchange.convertBsvToBsv({ value, fromUnit: 'SAT', toUnit: 'BCH' })
+      return Exchange.convertBsvToBsv({ value, fromUnit: 'SAT', toUnit: 'BSV' })
         .value
     case 'BTC':
       return Exchange.convertBitcoinToBitcoin({
@@ -54,7 +54,7 @@ export const convertStandardToBase = (coin, value) => {
       return Exchange.convertBchToBch({ value, fromUnit: 'BCH', toUnit: 'SAT' })
         .value
     case 'BSV':
-      return Exchange.convertBsvToBsv({ value, fromUnit: 'BCH', toUnit: 'SAT' })
+      return Exchange.convertBsvToBsv({ value, fromUnit: 'BSV', toUnit: 'SAT' })
         .value
     case 'BTC':
       return Exchange.convertBitcoinToBitcoin({

diff --git a/packages/blockchain-wallet-v4-frontend/src/data/components/utils/sagas.js b/packages/blockchain-wallet-v4-frontend/src/data/components/utils/sagas.js
@@ -26,6 +26,14 @@ export const selectReceiveAddress = function*(source, networks) {
     }
     return utils.bch.toCashAddr(bchReceiveAddress.getOrElse(''))
   }
+  if (equals('BSV', coin)) {
+    const selector = selectors.core.common.bsv.getNextAvailableReceiveAddress
+    const bsvReceiveAddress = selector(settings.NETWORK_BCH, address, appState)
+    if (isEmpty(bsvReceiveAddress.getOrElse(''))) {
+      throw new Error('Could not generate bitcoin sv receive address')
+    }
+    return utils.bch.toCashAddr(bsvReceiveAddress.getOrElse(''))
+  }
   if (equals('BTC', coin)) {
     const selector =
       type !== ADDRESS_TYPES.LOCKBOX