From 43d5b181618b10fcd2e839b07a1de1811d28c423 Mon Sep 17 00:00:00 2001
From: blavenie <benoit.lavenier@e-is.pro>
Date: Fri, 21 Dec 2018 15:23:24 +0100
Subject: [PATCH] [fix] TX in errors: display avatar, uid, name (as a validated
TX) [enh] TX in errors: add icons on dividers
---
www/js/services/tx-services.js | 3 ++-
www/templates/wallet/view_wallet_tx_error.html | 18 ++++++++++++------
2 files changed, 14 insertions(+), 7 deletions(-)
diff --git a/www/js/services/tx-services.js b/www/js/services/tx-services.js
index a5b7afe2..6f3306f9 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 5284be9b..588c7adf 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>
--
GitLab