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

Merge pull request #316 from Bitcoin-com/wallet/task/500

Browse source 
Changed testnet to isTestnet.
This commit is contained in:
Jean-Baptiste Dominguez 2018-08-31 16:45:40 +09:00 • committed by GitHub
commit 2b8c2d1c61
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 40 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -13,7 +13,7 @@ angular.module('copayApp.services').factory('incomingData', function(externalLin
var noPrefixInAddress = 0;
var allParsed = bitcoinUriService.parse(data);
if (allParsed.isValid && allParsed.testnet) {
if (allParsed.isValid && allParsed.isTestnet) {
popupService.showAlert(
gettextCatalog.getString('Unsupported'),
gettextCatalog.getString('Testnet is not supported.')
@ -114,7 +114,7 @@ angular.module('copayApp.services').factory('incomingData', function(externalLin
}
// data extensions for Payment Protocol with non-backwards-compatible request
if (allParsed.isValid && allParsed.coin && allParsed.url && !allParsed.testnet) {
if (allParsed.isValid && allParsed.coin && allParsed.url && !allParsed.isTestnet) {
var coin = allParsed.coin;
data = allParsed.url;
payproService.getPayProDetails(data, allParsed.coin, function onGetPayProDetails(err, details) {
@ -152,8 +152,8 @@ angular.module('copayApp.services').factory('incomingData', function(externalLin
}
return true;
// Cash URI
} else if (allParsed.isValid && allParsed.coin === 'bch' && allParsed.publicAddress && !allParsed.testnet) {
var prefix = allParsed.testnet ? 'bchtest:' : 'bitcoincash:';
} else if (allParsed.isValid && allParsed.coin === 'bch' && allParsed.publicAddress && !allParsed.isTestnet) {
var prefix = allParsed.isTestnet ? 'bchtest:' : 'bitcoincash:';
var addrIn = allParsed.publicAddress.legacy || allParsed.publicAddress.bitpay || prefix + allParsed.publicAddress.cashAddr;
originalAddress = allParsed.publicAddress.cashAddr || allParsed.publicAddress.legacy || allParsed.publicAddress.bitpay;