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

fix conflicts

Browse source
This commit is contained in:
Matias Alejo Garcia 2014-05-01 11:04:21 -03:00
commit 84637bd12d
3 changed files with 8 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
js/controllers/transactions.js
View file

@ -22,7 +22,7 @@ angular.module('copay.transactions').controller('TransactionsController',
tx.outs.forEach(function(o) {
var addr = bitcore.Address.fromScriptPubKey(o.getScript(), config.networkName)[0].toString();
if (!w.addressIsOwn(addr, true)) {
if (!w.addressIsOwn(addr, {excludeMain:true})) {
outs.push({
address: addr,
value: bitcore.util.valueToBigInt(o.getValue())/bitcore.util.COIN,