BTCPrivate
/
copay
mirror of https://github.com/BTCPrivate/copay.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #330 from maraoz/UI/transaction-links 

show transaction id, and link to insight
This commit is contained in:
Gustavo Maximiliano Cortez 2014-05-09 09:37:10 -03:00
parent fe4716ccc0 a6bab6da4c
commit 4f8cca9cd6
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
index.html
View File

@ -399,9 +399,11 @@
Transaction finally rejected
</span>
<p class="small" ng-show="!tx.missingSignatures && tx.sentTs">
<a href="http://{{$root.wallet.networkName === 'testnet' ? 'test':'live' }}.insight.is/tx/{{tx.sentTxid}}" target="blank">
<i class="fi-arrow-right size-40"></i>
Sent at {{tx.sentTs | date:'medium'}}
<i class="fi-arrow-right size-40"></i>
Sent at {{tx.sentTs | date:'medium'}} |
Transaction ID:
<a href="http://{{getShortNetworkName()}}.insight.is/tx/{{tx.sentTxid}}" target="blank">
{{tx.sentTxid}}
</a>
</p>
<p class="text-gray" ng-show="!tx.finallyRejected && tx.missingSignatures==1">
@ -424,7 +426,9 @@
<div class="m15">
<div class="row">
<div class="large-8 columns">
ID: {{btx.txid}}
<a href="http://{{getShortNetworkName()}}.insight.is/tx/{{btx.txid}}" target="blank">
{{btx.txid}}
</a>
</div>
<div class="large-4 columns text-right">
{{btx.firstSeenTs * 1000 | date:'medium'}} </h6>

5
js/controllers/transactions.js
View File

@ -70,7 +70,6 @@ angular.module('copay.transactions').controller('TransactionsController',
if (p.builder.isFullySigned()) {
$scope.send(ntxid);
_updateTxs();
// $rootScope.$digest();
}
else {
_updateTxs();
@ -92,6 +91,10 @@ angular.module('copay.transactions').controller('TransactionsController',
}
};
$scope.getShortNetworkName = function() {
return config.networkName.substring(0,4);
};
$scope.reject = function (ntxid) {
$scope.loading = true;
var w = $rootScope.wallet;