diff --git a/src/js/controllers/buyAmazon.js b/src/js/controllers/buyAmazon.js index 856888e68..fa68f3c60 100644 --- a/src/js/controllers/buyAmazon.js +++ b/src/js/controllers/buyAmazon.js @@ -223,7 +223,8 @@ angular.module('copayApp.controllers').controller('buyAmazonController', functio var dataSrc = { amount: parsedAmount.amount, currency: parsedAmount.currency, - uuid: wallet.id + uuid: wallet.id, + buyerSelectedTransactionCurrency: coin.toUpperCase() }; ongoingProcess.set('loadingTxInfo', true); createInvoice(dataSrc, function(err, invoice, accessKey) { diff --git a/src/js/controllers/buyMercadoLibre.js b/src/js/controllers/buyMercadoLibre.js index 5ac73ac00..cba6d7bac 100644 --- a/src/js/controllers/buyMercadoLibre.js +++ b/src/js/controllers/buyMercadoLibre.js @@ -221,7 +221,8 @@ angular.module('copayApp.controllers').controller('buyMercadoLibreController', f var dataSrc = { amount: parsedAmount.amount, currency: parsedAmount.currency, - uuid: wallet.id + uuid: wallet.id, + buyerSelectedTransactionCurrency: coin.toUpperCase() }; ongoingProcess.set('loadingTxInfo', true); createInvoice(dataSrc, function(err, invoice, accessKey) { diff --git a/src/js/controllers/topup.js b/src/js/controllers/topup.js index ee47872cc..35902ac65 100644 --- a/src/js/controllers/topup.js +++ b/src/js/controllers/topup.js @@ -189,7 +189,8 @@ angular.module('copayApp.controllers').controller('topUpController', function($s $scope.amountUnitStr = parsedAmount.amountUnitStr; var dataSrc = { amount: parsedAmount.amount, - currency: parsedAmount.currency + currency: parsedAmount.currency, + buyerSelectedTransactionCurrency: coin.toUpperCase() }; ongoingProcess.set('loadingTxInfo', true); createInvoice(dataSrc, function(err, invoice) { diff --git a/src/js/services/incomingData.js b/src/js/services/incomingData.js index 6c9d93c33..845c4fe0b 100644 --- a/src/js/services/incomingData.js +++ b/src/js/services/incomingData.js @@ -111,7 +111,7 @@ angular.module('copayApp.services').factory('incomingData', function($log, $stat if ((/^bitcoin(cash)?:\?r=[\w+]/).exec(data)) { var c = data.indexOf('bitcoincash') >= 0 ? 'bch' : 'btc'; data = decodeURIComponent(data.replace(/bitcoin(cash)?:\?r=/, '')); - payproService.getPayProDetails(data, function(err, details) { + payproService.getPayProDetails(data, coin, function(err, details) { if (err) { popupService.showAlert(gettextCatalog.getString('Error'), err); } else handlePayPro(details, coin); @@ -132,7 +132,7 @@ angular.module('copayApp.services').factory('incomingData', function($log, $stat var amount = parsed.amount ? parsed.amount : ''; if (parsed.r) { - payproService.getPayProDetails(parsed.r, function(err, details) { + payproService.getPayProDetails(parsed.r, coin, function(err, details) { if (err) { if (addr && amount) goSend(addr, amount, message, coin, shapeshiftData); else popupService.showAlert(gettextCatalog.getString('Error'), err); @@ -154,7 +154,7 @@ angular.module('copayApp.services').factory('incomingData', function($log, $stat // paypro not yet supported on cash if (parsed.r) { - payproService.getPayProDetails(parsed.r, function(err, details) { + payproService.getPayProDetails(parsed.r, coin, function(err, details) { if (err) { if (addr && amount) goSend(addr, amount, message, coin, shapeshiftData); @@ -197,7 +197,7 @@ angular.module('copayApp.services').factory('incomingData', function($log, $stat // paypro not yet supported on cash if (parsed.r) { - payproService.getPayProDetails(parsed.r, function(err, details) { + payproService.getPayProDetails(parsed.r, coin, function(err, details) { if (err) { if (addr && amount) goSend(addr, amount, message, coin, shapeshiftData); @@ -215,7 +215,7 @@ angular.module('copayApp.services').factory('incomingData', function($log, $stat // Plain URL } else if (/^https?:\/\//.test(data)) { - payproService.getPayProDetails(data, function(err, details) { + payproService.getPayProDetails(data, coin, function(err, details) { if (err) { root.showMenu({ data: data, diff --git a/src/js/services/payproService.js b/src/js/services/payproService.js index 96ed90441..6cd83ef9a 100644 --- a/src/js/services/payproService.js +++ b/src/js/services/payproService.js @@ -5,11 +5,12 @@ angular.module('copayApp.services').factory('payproService', var ret = {}; - ret.getPayProDetails = function(uri, cb, disableLoader) { + ret.getPayProDetails = function(uri, coin, cb, disableLoader) { if (!cb) cb = function() {}; var wallet = profileService.getWallets({ - onlyComplete: true + onlyComplete: true, + coin: coin })[0]; if (!wallet) return cb();