diff --git a/src/js/controllers/tab-scan.js b/src/js/controllers/tab-scan.js index 68e1e4dd0..e631e5b4f 100644 --- a/src/js/controllers/tab-scan.js +++ b/src/js/controllers/tab-scan.js @@ -113,7 +113,7 @@ angular.module('copayApp.controllers').controller('tabScanController', function( contents = contents.result || contents; var parsed = bitcoinUriService.parse(contents); - if (parsed.isValid) { + if (parsed.isValid && !parsed.testnet) { incomingData.redir(contents); } else { var title = gettextCatalog.getString('Scan Failed'); diff --git a/src/js/services/incomingData.js b/src/js/services/incomingData.js index 4c8142681..6802722ac 100644 --- a/src/js/services/incomingData.js +++ b/src/js/services/incomingData.js @@ -115,7 +115,7 @@ angular.module('copayApp.services').factory('incomingData', function(bitcoinUriS }, 100); } // data extensions for Payment Protocol with non-backwards-compatible request - if (allParsed.isValid && allParsed.coin && allParsed.url) { + if (allParsed.isValid && allParsed.coin && allParsed.url && !allParsed.testnet) { var coin = allParsed.coin; data = allParsed.url; if (allParsed.coin == 'bch') { @@ -168,12 +168,16 @@ angular.module('copayApp.services').factory('incomingData', function(bitcoinUriS } return true; // Cash URI - } else if (allParsed.isValid && allParsed.coin === 'bch' && allParsed.publicAddress) { + } else if (allParsed.isValid && allParsed.coin === 'bch' && allParsed.publicAddress && !allParsed.testnet) { var prefix = allParsed.testnet ? 'bchtest:' : 'bitcoincash:'; var addrIn = allParsed.publicAddress.legacy || allParsed.publicAddress.bitpay || prefix + allParsed.publicAddress.cashAddr; originalAddress = allParsed.publicAddress.cashAddr ? null : allParsed.publicAddress.legacy || allParsed.publicAddress.bitpay; - addr = bitcoinCashJsService.readAddress(addrIn).legacy; + var addresses = bitcoinCashJsService.readAddress(addrIn); + if (!addresses) { + return false; + } + addr = addresses.legacy; var message = allParsed.message; var amount = allParsed.amount ? allParsed.amount : '';