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

Treating BitPay address like cashAddr.

Browse source
This commit is contained in:
Brendon Duncan 2018-08-29 17:39:04 +12:00
commit 471a9ba4ae
1 changed files with 12 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -168,14 +168,21 @@ angular.module('copayApp.services').factory('incomingData', function(bitcoinUriS
}
return true;
// Cash URI
} else if (allParsed.isValid && allParsed.publicAddress && allParsed.publicAddress.cashAddr) {
} else if (allParsed.isValid && allParsed.publicAddress && (allParsed.publicAddress.cashAddr || allParsed.publicAddress.bitpay)) {
var coin = 'bch';
var prefix = allParsed.testnet ? 'bchtest:' : 'bitcoincash:';
addr = bitcoinCashJsService.readAddress(prefix + allParsed.publicAddress.cashAddr).legacy;
var message = parsed.message;
var amount = parsed.amount ? parsed.amount : '';
var prefix = allParsed.testnet ? 'bchtest:' : 'bitcoincash:';
var addrIn = prefix + allParsed.publicAddress.cashAddr;
if (allParsed.publicAddress.bitpay) {
addrIn = allParsed.publicAddress.bitpay;
originalAddress = allParsed.publicAddress.bitpay;
}
addr = bitcoinCashJsService.readAddress(addrIn).legacy;
var message = allParsed.message;
var amount = allParsed.amount ? allParsed.amount : '';
// paypro not yet supported on cash
if (allParsed.url) {