From 3080cf05dde9f998926ff86f5c1f79f074eea394 Mon Sep 17 00:00:00 2001
From: Matias Alejo Garcia <ematiu@gmail.com>
Date: Wed, 31 Aug 2016 15:26:46 -0300
Subject: [PATCH] better activity

---
 public/views/includes/walletActivity.html | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/public/views/includes/walletActivity.html b/public/views/includes/walletActivity.html
index bdd5d7d9b..c6ed33ba9 100644
--- a/public/views/includes/walletActivity.html
+++ b/public/views/includes/walletActivity.html
@@ -17,7 +17,6 @@
       </div>
   </div>
 
-
   <div ng-if="x.types.indexOf('TxProposalRemoved')>=0">
     <i class="icon ion-ios-close-empty size-21" ng-style="{'color':x.wallet.color}"></i>
     Proposal Deleted
@@ -29,13 +28,13 @@
   </div>
 
   <div ng-if="x.types.indexOf('TxProposalRemoved') == -1 && x.types.indexOf('TxProposalRejected') == -1">
-    <span ng-if="x.types.indexOf('NewTxProposal')>=0 ">
+    <span ng-if="x.types.indexOf('NewTxProposal')>=0  && x.types.indexOf('NewOutgoingTx')==-1 ">
       <i class="icon ion-arrow-up-c size-21" ng-style="{'color':x.wallet.color}"></i>
 
       {{x.amountStr}}
       <i>{{x.message}}</i>
     </span>
-    <span ng-if="x.types.indexOf('TxProposalAcceptedBy')>=0 && x.types.indexOf('NewTxProposal') == -1 ">
+    <span ng-if="x.types.indexOf('TxProposalAcceptedBy')>=0 && x.types.indexOf('NewTxProposal') == -1  && x.types.indexOf('NewOutgoingTx')==-1">
       <i class="icon ion-checkmark-round size-21" ng-style="{'color':x.wallet.color}"></i>
       Proposal Accepted
     </span>