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

Merge pull request #357 from Bitcoin-com/wallet/task/546

Browse source 
546 - Bugfix for crashing when scanning BitPay invoice URL
This commit is contained in:
Jean-Baptiste Dominguez 2018-09-24 11:47:16 +02:00 • committed by GitHub
commit dbe920a67b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/js/services/send-flow.service.js
View file

@ -52,7 +52,7 @@ angular
// Detect some merchant that we know // Detect some merchant that we know
if (payProData.memo.indexOf('eGifter') > -1) { if (payProData.memo.indexOf('eGifter') > -1) {
name = 'eGifter' name = 'eGifter'
} else if (paymentUrl.indexOf('https://bitpay.com') > -1) { } else if (payProData.url.indexOf('https://bitpay.com') > -1) {
name = 'BitPay'; name = 'BitPay';
} }

2
src/js/services/shapeShiftApiService.js
View file

@ -24,7 +24,7 @@ var ShapeShift = (function() {
var parsedResponse = JP(xmlhttp.responseText); var parsedResponse = JP(xmlhttp.responseText);
cb.apply(null, [parsedResponse]); cb.apply(null, [parsedResponse]);
} else { } else {
cb.apply(null, [new Error('Request Failed')]) cb.apply(null, [new Error('Request Failed')]);
} }
} }
}; };