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

fixed bug which would stop bitcoincash bitpay urls working

Browse source
This commit is contained in:
Kadir Sekha 2018-03-01 16:17:08 +05:00
commit 775766f585
1 changed files with 3 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -16,7 +16,7 @@ angular.module('copayApp.services').factory('incomingData', function($log, $stat
noPrefixInAddress = 1; noPrefixInAddress = 1;
} }
if (typeof(data) == 'string' && (data.toLowerCase().indexOf('bitcoincash:') >= 0 || data[0] == 'q' || data[0] == 'p' || data[0] == 'C' || data[0] == 'H')) { if (typeof(data) == 'string' && !(/^bitcoin(cash)?:\?r=[\w+]/).exec(data) && (data.toLowerCase().indexOf('bitcoincash:') >= 0 || data[0] == 'q' || data[0] == 'p' || data[0] == 'C' || data[0] == 'H')) {
try { try {
noPrefixInAddress = 0; noPrefixInAddress = 0;
@ -109,7 +109,7 @@ angular.module('copayApp.services').factory('incomingData', function($log, $stat
} }
// data extensions for Payment Protocol with non-backwards-compatible request // data extensions for Payment Protocol with non-backwards-compatible request
if ((/^bitcoin(cash)?:\?r=[\w+]/).exec(data)) { if ((/^bitcoin(cash)?:\?r=[\w+]/).exec(data)) {
var c = data.indexOf('bitcoincash') >= 0 ? 'bch' : 'btc'; var coin = data.indexOf('bitcoincash') >= 0 ? 'bch' : 'btc';
data = decodeURIComponent(data.replace(/bitcoin(cash)?:\?r=/, '')); data = decodeURIComponent(data.replace(/bitcoin(cash)?:\?r=/, ''));
payproService.getPayProDetails(data, coin, function(err, details) { payproService.getPayProDetails(data, coin, function(err, details) {
if (err) { if (err) {
@ -136,7 +136,7 @@ angular.module('copayApp.services').factory('incomingData', function($log, $stat
if (err) { if (err) {
if (addr && amount) goSend(addr, amount, message, coin, shapeshiftData); if (addr && amount) goSend(addr, amount, message, coin, shapeshiftData);
else popupService.showAlert(gettextCatalog.getString('Error'), err); else popupService.showAlert(gettextCatalog.getString('Error'), err);
} else handlePayPro(details); } else handlePayPro(details, coin);
}); });
} else { } else {
goSend(addr, amount, message, coin, shapeshiftData); goSend(addr, amount, message, coin, shapeshiftData);
@ -214,7 +214,6 @@ angular.module('copayApp.services').factory('incomingData', function($log, $stat
return true; return true;
// Plain URL // Plain URL
} else if (/^https?:\/\//.test(data)) { } else if (/^https?:\/\//.test(data)) {
payproService.getPayProDetails(data, coin, function(err, details) { payproService.getPayProDetails(data, coin, function(err, details) {
if (err) { if (err) {
root.showMenu({ root.showMenu({