anders/Wallet
1
0
Fork 0
Code Issues Projects Releases Packages Wiki Activity

Not using data if it is for the testnet.

Browse source
This commit is contained in:
Brendon Duncan 2018-08-30 09:04:01 +12:00
commit e6fba98af9
2 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/js/controllers/tab-scan.js
View file

@ -113,7 +113,7 @@ angular.module('copayApp.controllers').controller('tabScanController', function(
contents = contents.result || contents; contents = contents.result || contents;
var parsed = bitcoinUriService.parse(contents); var parsed = bitcoinUriService.parse(contents);
if (parsed.isValid) { if (parsed.isValid && !parsed.testnet) {
incomingData.redir(contents); incomingData.redir(contents);
} else { } else {
var title = gettextCatalog.getString('Scan Failed'); var title = gettextCatalog.getString('Scan Failed');

10
src/js/services/incomingData.js
View file

@ -115,7 +115,7 @@ angular.module('copayApp.services').factory('incomingData', function(bitcoinUriS
}, 100); }, 100);
} }
// data extensions for Payment Protocol with non-backwards-compatible request // 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; var coin = allParsed.coin;
data = allParsed.url; data = allParsed.url;
if (allParsed.coin == 'bch') { if (allParsed.coin == 'bch') {
@ -168,12 +168,16 @@ angular.module('copayApp.services').factory('incomingData', function(bitcoinUriS
} }
return true; return true;
// Cash URI // 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 prefix = allParsed.testnet ? 'bchtest:' : 'bitcoincash:';
var addrIn = allParsed.publicAddress.legacy || allParsed.publicAddress.bitpay || prefix + allParsed.publicAddress.cashAddr; var addrIn = allParsed.publicAddress.legacy || allParsed.publicAddress.bitpay || prefix + allParsed.publicAddress.cashAddr;
originalAddress = allParsed.publicAddress.cashAddr ? null : allParsed.publicAddress.legacy || allParsed.publicAddress.bitpay; 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 message = allParsed.message;
var amount = allParsed.amount ? allParsed.amount : ''; var amount = allParsed.amount ? allParsed.amount : '';