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

Support new proposals with array of outputs

Browse source
This commit is contained in:
Gustavo Maximiliano Cortez 2016-01-29 17:00:57 -03:00
commit 9cc275af5f
No known key found for this signature in database
GPG key ID: 15EDAD8D9F2EB1AF
2 changed files with 2 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/js/controllers/index.js
View file

@ -517,7 +517,6 @@ angular.module('copayApp.controllers').controller('indexController', function($r
message: 'test multi-output', message: 'test multi-output',
fee: 1000, fee: 1000,
createdOn: new Date() / 1000, createdOn: new Date() / 1000,
type: 'multiple_output',
outputs: [] outputs: []
}; };
function addOutput(n) { function addOutput(n) {

4
src/js/services/txFormatService.js
View file

@ -26,11 +26,10 @@ angular.module('copayApp.services').factory('txFormatService', function(profileS
var outputs = lodash.isArray(tx.outputs) ? tx.outputs.length : 0; var outputs = lodash.isArray(tx.outputs) ? tx.outputs.length : 0;
if (outputs && tx.action != 'received') { if (outputs && tx.action != 'received') {
if ((tx.type && tx.type == 'multiple_output') || (tx.proposalType && tx.proposalType == 'multiple_output')) { if (outputs > 1) {
tx.hasMultiplesOutputs = true; tx.hasMultiplesOutputs = true;
tx.recipientCount = outputs; tx.recipientCount = outputs;
} }
tx.toAddress = tx.outputs[0].toAddress;
tx.amount = lodash.reduce(tx.outputs, function(total, o) { tx.amount = lodash.reduce(tx.outputs, function(total, o) {
o.amountStr = formatAmountStr(o.amount); o.amountStr = formatAmountStr(o.amount);
o.alternativeAmountStr = formatAlternativeStr(o.amount); o.alternativeAmountStr = formatAlternativeStr(o.amount);
@ -38,6 +37,7 @@ angular.module('copayApp.services').factory('txFormatService', function(profileS
}, 0); }, 0);
} }
tx.toAddress = tx.outputs[0].toAddress; // Get first address for single transactions
tx.amountStr = formatAmountStr(tx.amount); tx.amountStr = formatAmountStr(tx.amount);
tx.alternativeAmountStr = formatAlternativeStr(tx.amount); tx.alternativeAmountStr = formatAlternativeStr(tx.amount);
tx.feeStr = formatFeeStr(tx.fee || tx.fees); tx.feeStr = formatFeeStr(tx.fee || tx.fees);