From 17d8bd8082ed9b5e36b6b897740a75225ab9b449 Mon Sep 17 00:00:00 2001
From: Matias Alejo Garcia <ematiu@gmail.com>
Date: Wed, 15 Jul 2015 10:08:40 -0300
Subject: [PATCH] handles invalid txs in history

---
 public/views/modals/tx-details.html | 10 +++++++++-
 public/views/walletHome.html        |  6 ++++++
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/public/views/modals/tx-details.html b/public/views/modals/tx-details.html
index 84b397cfd..60e731c61 100644
--- a/public/views/modals/tx-details.html
+++ b/public/views/modals/tx-details.html
@@ -14,9 +14,13 @@
 
 <div class="modal-content fix-modals-touch">
   <div class="header-modal text-center">
-    <div class="size-42">
+    <div class="size-42" ng-show="btx.action != 'invalid'">
       <span ng-if="btx.action == 'received'">+</span><span ng-if="btx.action == 'sent'">-</span>{{btx.amountStr}} {{settings.unitName}}
     </div>
+    <div class="size-42" ng-show="btx.action == 'invalid'">
+      <span translate>- </span>
+    </div>
+ 
     <div class="size-18 m5t text-gray" ng-show="btx.alternativeAmount">
       {{btx.alternativeAmount}} {{settings.alternativeIsoCode}}
     </div>
@@ -36,6 +40,10 @@
       </span>
     </span>
     </li>
+    <li ng-if="btx.action == 'invalid'" class="line-b p10 oh">
+    <span class="right" translate>
+      This transaction becomed invalid. Possible due to a double spend attempt.
+    </span>
     <li ng-if="btx.time" class="line-b p10 oh">
     <span class="text-gray" translate>Date</span>:
     <span class="right">
diff --git a/public/views/walletHome.html b/public/views/walletHome.html
index 083703f50..f4231eeec 100644
--- a/public/views/walletHome.html
+++ b/public/views/walletHome.html
@@ -454,14 +454,20 @@
               ng-style="{'background-color':index.backgroundColor}" translate>Received</span>
             <span class="label tu gray radius" ng-show="btx.action == 'sent'" translate>Sent</span>
             <span class="label tu gray radius" ng-show="btx.action == 'moved'" translate>Moved</span>
+            <span class="label tu warning radius" ng-show="btx.action == 'invalid'" translate>Invalid</span>
           </div>
 
           <div class="large-4 medium-4 small-4 columns">
             <span class="size-16">
               <span ng-if="btx.action == 'received'">+</span>
               <span ng-if="btx.action == 'sent'">-</span>
+              <span  class="size-12" ng-if="btx.action == 'invalid'" translate>
+              (possible double spend)
+              </span>
+              <span  ng-if="btx.action != 'invalid'">
               {{btx.amountStr}}
               {{home.getUnitName()}}
+              </span>
             </span>
           </div>
           <div class="large-4 medium-4 small-4 columns text-right">