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

Starting to integrate BIP70 payment protocol into new send flow.

Browse source
This commit is contained in:
Brendon Duncan 2018-08-06 12:04:14 +12:00
commit fb4bc1563c
5 changed files with 120 additions and 88 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -121,9 +121,14 @@ angular.module('copayApp.services').factory('incomingData', function($log, $stat
var coin = data.indexOf('bitcoincash') >= 0 ? 'bch' : 'btc';
data = decodeURIComponent(data.replace(/bitcoin(cash)?:\?r=/, ''));
if (coin == 'bch') {
payproService.getPayProDetailsViaHttp(data, function(err, details) {
payproService.getPayProDetailsViaHttp(data, function onGetPayProDetailsViaHttp(err, details) {
if (err) {
popupService.showAlert(gettextCatalog.getString('Error'), err)
var message = err.toString();
if (typeof err.data === 'string') {
// i.e. 'This invoice is no longer accepting payments'
message = gettextCatalog.getString(err.data);
}
popupService.showAlert(gettextCatalog.getString('Error'), message)
} else {
handlePayPro(createBchPayProObject(details), coin);
}
@ -415,12 +420,15 @@ angular.module('copayApp.services').factory('incomingData', function($log, $stat
}
function handlePayPro(payProDetails, coin) {
var thirdPartyData = {
id: 'bip70PaymentProtocol',
coin: coin,
details: payProDetails
};
var stateParams = {
amount: payProDetails.amount,
toAddress: payProDetails.toAddress,
description: payProDetails.memo,
paypro: payProDetails,
coin: coin,
toAddr: payProDetails.toAddress,
thirdParty: JSON.stringify(thirdPartyData)
};
// fee
@ -434,7 +442,7 @@ angular.module('copayApp.services').factory('incomingData', function($log, $stat
'notify': $state.current.name == 'tabs.send' ? false : true
}).then(function() {
$timeout(function() {
$state.transitionTo('tabs.send.confirm', stateParams);
$state.transitionTo('tabs.send.origin', stateParams);
});
});
}