mirrors/BlueWallet
1
0
Fork 0
mirror of https://github.com/BlueWallet/BlueWallet.git synced 2025-03-26 08:55:56 +01:00
Code Issues Projects Releases Packages Wiki Activity

FIX: Handle BitPay BIP70 scenarios where schema isnt present.

Browse source
This commit is contained in:
Marcos Rodriguez Vélez 2019-02-25 15:11:32 -05:00 • committed by Igor Korsakov
parent 89a1188659
commit 68854034d2
1 changed files with 8 additions and 3 deletions

11
bip70/bip70.js
View file

@ -20,9 +20,14 @@ export default class BitcoinBIP70TransactionDecode {
static decode(data) {
return new Promise(async (resolve, reject) => {
try {
const url = data.match(/bitcoin:\?r=https?:\/\/\S+/gi);
let url;
if (data.match(/bitcoin:\?r=https?:\/\/\S+/gi)) {
url = data.toString().split('bitcoin:?r=')[1];
} else if (data.startsWith('https://bitpay.com/i/') || data.startsWith('https://www.bitpay.com/i/')) {
url = data.toString();
}
const api = new Frisbee({
baseURI: url.toString().split('bitcoin:?r=')[1],
baseURI: url,
headers: {
Accept: 'application/payment-request',
},
@ -69,6 +74,6 @@ export default class BitcoinBIP70TransactionDecode {
}
static matchesPaymentURL(data) {
return data !== null && data.match(/bitcoin:\?r=https?:\/\/\S+/gi) !== null;
return data !== null && (data.match(/bitcoin:\?r=https?:\/\/\S+/gi) !== null || data.startsWith('https://bitpay.com/i/') || data.startsWith('https://www.bitpay.com/i/'));
}
}