mirror of https://github.com/BTCPrivate/copay.git
better tx layout
This commit is contained in:
parent
5cff5f6b47
commit
fbede5a903
26
index.html
26
index.html
|
@ -236,20 +236,20 @@
|
|||
<div class="large-12 columns">
|
||||
<h3>Pending Transactions <small>({{txs.length}})</small></h3>
|
||||
<div class="panel pending" ng-repeat="txp in txs">
|
||||
{{txp}}
|
||||
<div class="row">
|
||||
<p class="large-5 columns"> Address 1</p>
|
||||
<div class="row" ng-repeat="o in txs.outs">
|
||||
<p class="large-5 columns"> {{o.address}}</p>
|
||||
<i class="large-2 columns fi-arrow-right size-16 text-center"></i>
|
||||
<p class="large-5 columns"> Address 2</p>
|
||||
|
||||
<div class="large-12 columns m0" ng-show="txp.signedByUs"> YOU SIGNED! </div>
|
||||
|
||||
<div class="large-12 columns m0" ng-show="!txp.signedByUs">
|
||||
<div class="line"></div>
|
||||
<button class="primary round large-4 columns"><i class="large-2 columns fi-x size-16 text-center"></i> Ignore</button>
|
||||
<small class="large-4 columns text-center">Faltan 3 cosigners</small>
|
||||
<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>
|
||||
<p class="large-5 columns"> {{o.value}} BTC </p>
|
||||
</div>
|
||||
<div class="large-12 columns m0 panel panel-sign" ng-show="txp.signedByUs">
|
||||
<i class="fi-check size-40"></i> YOU SIGNED!
|
||||
</div>
|
||||
<div class="large-12 columns m0" ng-show="!txp.signedByUs">
|
||||
<div class="line"></div>
|
||||
<button class="primary round large-4 columns"><i class="large-2 columns fi-x size-16 text-center"></i> Ignore</button>
|
||||
<small class="large-4 columns text-center">Faltan 3 cosigners</small>
|
||||
<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 pending -->
|
||||
<div class="line-dashed-h"></div>
|
||||
|
|
|
@ -15,7 +15,6 @@ angular.module('copay.transactions').controller('TransactionsController',
|
|||
var b = i.txp.builder;
|
||||
var tx = b.build();
|
||||
var one = {
|
||||
valueOutSat: b.valueOutSat,
|
||||
feeSat: b.feeSat,
|
||||
};
|
||||
var outs = [];
|
||||
|
@ -24,7 +23,10 @@ angular.module('copay.transactions').controller('TransactionsController',
|
|||
var s = o.getScript();
|
||||
var aStr = bitcore.Address.fromScript(s, config.networkName).toString();
|
||||
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;
|
||||
ts.push(one);
|
||||
|
|
Loading…
Reference in New Issue