From d125a14483cb41337016674a5ffa9ea6c3a81ef8 Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Sun, 20 Dec 2015 19:02:38 -0300 Subject: [PATCH] Fix txp and tx with multiple and single outputs --- src/js/controllers/index.js | 1 + src/js/services/txFormatService.js | 9 ++++++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/js/controllers/index.js b/src/js/controllers/index.js index 575b29eae..51290d830 100644 --- a/src/js/controllers/index.js +++ b/src/js/controllers/index.js @@ -501,6 +501,7 @@ angular.module('copayApp.controllers').controller('indexController', function($r message: 'test multi-output', fee: 1000, createdOn: new Date() / 1000, + type: 'multiple_output', outputs: [] }; function addOutput(n) { diff --git a/src/js/services/txFormatService.js b/src/js/services/txFormatService.js index 1061ede76..71bd41825 100644 --- a/src/js/services/txFormatService.js +++ b/src/js/services/txFormatService.js @@ -24,9 +24,12 @@ angular.module('copayApp.services').factory('txFormatService', function(profileS root.processTx = function(tx) { if (!tx) return; - if (lodash.isArray(tx.outputs) && tx.outputs.length > 0 && tx.action != 'received') { - tx.hasMultiplesOutputs = true; - tx.recipientCount = tx.outputs.length; + var outputs = lodash.isArray(tx.outputs) ? tx.outputs.length : 0; + if (outputs && tx.action != 'received') { + if ((tx.type && tx.type == 'multiple_output') || (tx.proposalType && tx.proposalType == 'multiple_output')) { + tx.hasMultiplesOutputs = true; + tx.recipientCount = outputs; + } tx.amount = lodash.reduce(tx.outputs, function(total, o) { o.amountStr = formatAmountStr(o.amount); o.alternativeAmountStr = formatAlternativeStr(o.amount);