diff --git a/www/js/services/tx-services.js b/www/js/services/tx-services.js index a5b7afe2e60115708a18bcd4d0fdf2b2e0950bd1..6f3306f900cf971d865b5e1861d3af95e47d142f 100644 --- a/www/js/services/tx-services.js +++ b/www/js/services/tx-services.js @@ -367,7 +367,8 @@ angular.module('cesium.tx.services', ['ngApi', 'cesium.bma.services', data.balance = (balanceWithPending < 0) ? balanceFromSource : balanceWithPending; // Will add uid (+ plugin will add name, avatar, etc. if enable) - return csWot.extendAll((data.tx.history || []).concat(data.tx.validating||[]).concat(data.tx.pendings||[]), 'pubkey') + var allTx = (data.tx.history || []).concat(data.tx.validating||[], data.tx.pendings||[], data.tx.errors||[]); + return csWot.extendAll(allTx, 'pubkey') .then(function() { console.debug('[tx] TX and sources loaded in '+ (Date.now()-now) +'ms'); return data; diff --git a/www/templates/wallet/view_wallet_tx_error.html b/www/templates/wallet/view_wallet_tx_error.html index 5284be9b21aa208e4a60b931c5c3f9c1662a0ed2..588c7adf20377edb5b40c4284fd8f18a33dea883 100644 --- a/www/templates/wallet/view_wallet_tx_error.html +++ b/www/templates/wallet/view_wallet_tx_error.html @@ -32,13 +32,16 @@ <div class="col list" ng-class="::motion.ionListClass"> <!-- Pending received TX --> - <span class="item item-divider"> - <span translate>ACCOUNT.PENDING_TX_RECEIVED</span> + <div class="item item-divider" > + <span> + <b class="ion-clock"> </b> + {{:locale:'ACCOUNT.PENDING_TX_RECEIVED'|translate}} + </span> <div class="badge item-note"> <span ng-if="!$root.settings.useRelative">({{$root.currency.name | abbreviate}})</span> <span ng-if="$root.settings.useRelative">({{'COMMON.UD' | translate}}<sub>{{$root.currency.name | abbreviate}}</sub>)</span> </div> - </span> + </div> <span class="item padding" ng-if="!loading && !hasReceivedTx()"> <span class="gray">{{:locale:'ACCOUNT.NO_TX'|translate}}</span> @@ -52,13 +55,16 @@ </div> <!-- Error sent TX --> - <span class="item item-divider"> - <span translate>ACCOUNT.ERROR_TX_SENT</span> + <div class="item item-divider"> + <span> + <b class="ion-close-circled"> </b> + {{:locale:'ACCOUNT.ERROR_TX_SENT'|translate}} + </span> <div class="badge item-note"> <span ng-if="!$root.settings.useRelative">({{$root.currency.name | abbreviate}})</span> <span ng-if="$root.settings.useRelative">({{'COMMON.UD' | translate}}<sub>{{$root.currency.name | abbreviate}}</sub>)</span> </div> - </span> + </div> <span class="item padding" ng-if="!loading && !hasSentTx()"> <span class="gray">{{:locale:'ACCOUNT.NO_TX'|translate}}</span>