diff --git a/www/templates/wallet/item_tx.html b/www/templates/wallet/item_tx.html index 5a4db8b847f22c626999cb05649245caef4b6576..7bd47d84376819a5eb8c1b27bc2154ae5c9eb796 100644 --- a/www/templates/wallet/item_tx.html +++ b/www/templates/wallet/item_tx.html @@ -5,7 +5,7 @@ <div class="row no-padding"> <div class="col no-padding"> - <b class="ion-clock" ng-if="pending"> </b> + <b class="ion-clock" ng-if="::pending"> </b> <a class="" ui-sref="app.wot_identity({pubkey:tx.pubkey, uid:tx.uid})" ng-if="tx.uid"> {{::tx.name||tx.uid}} </a> @@ -21,9 +21,12 @@ {{::tx.comment}}<br/> </p> <h4> - <a class="gray underline" ui-sref="app.view_block({number: tx.block_number})"> + <a ng-if="::!pending" class="gray underline" ui-sref="app.view_block({number: tx.block_number})"> {{::tx.time | formatFromNow}} | {{::tx.time | formatDate}} </a> + <span ng-if="::pending" class="gray"> + {{::tx.time | formatFromNow}} | {{::tx.time | formatDate}} + </span> </h4> </div> <div class="col col-50 no-padding" ng-if="::tx.comment"> diff --git a/www/templates/wallet/view_wallet_tx.html b/www/templates/wallet/view_wallet_tx.html index d309822a422d9b011e38d2c7f6f41ad103784daa..eb3c9a8f90efb2fcda32ad5a7e5cf0b4f026eedb 100644 --- a/www/templates/wallet/view_wallet_tx.html +++ b/www/templates/wallet/view_wallet_tx.html @@ -97,7 +97,7 @@ <div ng-repeat="tx in formData.tx.history" class="item item-tx item-icon-left" - ng-include="!tx.isUD ? 'templates/wallet/item_tx.html' : 'templates/wallet/item_ud.html'"> + ng-include="::!tx.isUD ? 'templates/wallet/item_tx.html' : 'templates/wallet/item_ud.html'"> </div> <div class="item item-text-wrap text-center" ng-if="formData.tx.fromTime > 0"> <p> diff --git a/www/templates/wot/view_identity_tx.html b/www/templates/wot/view_identity_tx.html index 16499945901dc431bf23c02c4397a6937d0e7389..7fc1a6aebac262f9941cf4c92a7a351f137e8c20 100644 --- a/www/templates/wot/view_identity_tx.html +++ b/www/templates/wot/view_identity_tx.html @@ -52,9 +52,9 @@ </span> <!-- iterate on each TX --> - <div class="item item-tx item-icon-left" - ng-repeat="tx in formData.tx.history" - ng-include="'templates/wallet/item_tx.html'"> + <div ng-repeat="tx in formData.tx.history" + class="item item-tx item-icon-left" + ng-include="::!tx.isUD ? 'templates/wallet/item_tx.html' : 'templates/wallet/item_ud.html'"> </div> <div class="item item-text-wrap text-center" ng-if="formData.tx.fromTime > 0">