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

Review screen, cleaning in the same time

Browse source
This commit is contained in:
Jean-Baptiste Dominguez 2018-08-06 23:19:46 +09:00
commit 470868ade9
5 changed files with 25 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/js/controllers/review.controller.js
View file

@ -43,6 +43,7 @@ function reviewController(addressbookService, bitcoinCashJsService, bitcore, bit
vm.sendStatus = '';
vm.thirdParty = false;
vm.wallet = null;
vm.memoExpanded = false;
var config = null;
var defaults = {};
@ -83,6 +84,12 @@ function reviewController(addressbookService, bitcoinCashJsService, bitcore, bit
}
vm.thirdParty.data['fromWalletId'] = vm.fromWalletId;
}
if (vm.thirdParty.id === 'bip70') {
if (vm.thirdParty.memo) {
vm.memo = 'Payment request for BitPay invoice.\n' + toAddress + ' for merchant';
vm.memoExpanded = true;
}
}
}
}
@ -321,7 +328,7 @@ function reviewController(addressbookService, bitcoinCashJsService, bitcore, bit
txp.outputs = [{
'toAddress': tx.toAddress,
'amount': tx.amount,
'message': tx.description
'message': vm.memo
}];
if (tx.sendMaxInfo) {
@ -333,7 +340,7 @@ function reviewController(addressbookService, bitcoinCashJsService, bitcore, bit
} else txp.feeLevel = tx.feeLevel;
}
txp.message = tx.description;
txp.message = vm.memo;
if (tx.paypro) {
txp.payProUrl = tx.paypro.url;

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

@ -422,7 +422,8 @@ angular.module('copayApp.services').factory('incomingData', function($log, $stat
function handlePayPro(payProDetails, coin) {
var thirdPartyData = {
id: payProDetails.name,
id: 'bip70',
name: payProDetails.name,
caName: payProDetails.caName,
caTrusted: payProDetails.caTrusted,
coin: coin,