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

better tx layout

Browse source
This commit is contained in:
Matias Alejo Garcia 2014-04-18 11:33:49 -03:00
commit fbede5a903
2 changed files with 17 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

26
index.html
View file

@ -236,20 +236,20 @@
<div class="large-12 columns"> <div class="large-12 columns">
<h3>Pending Transactions <small>({{txs.length}})</small></h3> <h3>Pending Transactions <small>({{txs.length}})</small></h3>
<div class="panel pending" ng-repeat="txp in txs"> <div class="panel pending" ng-repeat="txp in txs">
{{txp}} <div class="row" ng-repeat="o in txs.outs">
<div class="row"> <p class="large-5 columns"> {{o.address}}</p>
<p class="large-5 columns"> Address 1</p>
<i class="large-2 columns fi-arrow-right size-16 text-center"></i> <i class="large-2 columns fi-arrow-right size-16 text-center"></i>
<p class="large-5 columns"> Address 2</p> <p class="large-5 columns"> {{o.value}} BTC </p>
</div>
<div class="large-12 columns m0" ng-show="txp.signedByUs"> YOU SIGNED! </div> <div class="large-12 columns m0 panel panel-sign" ng-show="txp.signedByUs">
<i class="fi-check size-40"></i> YOU SIGNED!
<div class="large-12 columns m0" ng-show="!txp.signedByUs"> </div>
<div class="line"></div> <div class="large-12 columns m0" ng-show="!txp.signedByUs">
<button class="primary round large-4 columns"><i class="large-2 columns fi-x size-16 text-center"></i> Ignore</button> <div class="line"></div>
<small class="large-4 columns text-center">Faltan 3 cosigners</small> <button class="primary round large-4 columns"><i class="large-2 columns fi-x size-16 text-center"></i> Ignore</button>
<button class="secondary round large-4 columns" ng-click="sign(txp.ntxid)"><i class="large-2 columns fi-check size-16 text-center"></i> Sign</button> <small class="large-4 columns text-center">Faltan 3 cosigners</small>
</div> <button class="secondary round large-4 columns" ng-click="sign(txp.ntxid)"><i class="large-2 columns fi-check size-16 text-center"></i> Sign</button>
</div>
</div> <!-- end of row --> </div> <!-- end of row -->
</div> <!-- end of pending --> </div> <!-- end of pending -->
<div class="line-dashed-h"></div> <div class="line-dashed-h"></div>

6
js/controllers/transactions.js
View file

@ -15,7 +15,6 @@ angular.module('copay.transactions').controller('TransactionsController',
var b = i.txp.builder; var b = i.txp.builder;
var tx = b.build(); var tx = b.build();
var one = { var one = {
valueOutSat: b.valueOutSat,
feeSat: b.feeSat, feeSat: b.feeSat,
}; };
var outs = []; var outs = [];
@ -24,7 +23,10 @@ angular.module('copay.transactions').controller('TransactionsController',
var s = o.getScript(); var s = o.getScript();
var aStr = bitcore.Address.fromScript(s, config.networkName).toString(); var aStr = bitcore.Address.fromScript(s, config.networkName).toString();
if (!w.addressIsOwn(aStr)) if (!w.addressIsOwn(aStr))
outs.push({address: aStr, value: bitcore.util.valueToBigInt(o.getValue())}); outs.push({
address: aStr,
value: bitcore.util.valueToBigInt(o.getValue())/bitcore.util.COIN,
});
}); });
one.outs = outs; one.outs = outs;
ts.push(one); ts.push(one);