Skip to content
Snippets Groups Projects
Commit 43d5b181 authored by Benoit Lavenier's avatar Benoit Lavenier
Browse files

[fix] TX in errors: display avatar, uid, name (as a validated TX)

[enh] TX in errors: add icons on dividers
parent e3755c67
No related branches found
No related tags found
No related merge requests found
......@@ -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;
......
......@@ -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>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment