From 82f6ca7575df13e7f3b841871eb1509bddfabeab Mon Sep 17 00:00:00 2001
From: Matias Alejo Garcia <ematiu@gmail.com>
Date: Thu, 10 Dec 2015 12:44:40 -0300
Subject: [PATCH] feat/animation-when-new-tx

---
 public/views/includes/walletInfo.html |  2 +-
 public/views/walletHome.html          | 22 ++++++++++++++++++----
 src/js/controllers/index.js           |  2 +-
 3 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/public/views/includes/walletInfo.html b/public/views/includes/walletInfo.html
index 0d42eb65a..6ff654914 100644
--- a/public/views/includes/walletInfo.html
+++ b/public/views/includes/walletInfo.html
@@ -12,5 +12,5 @@
 <!-- <img style="height:1em"  ng&#45;show="index.preferences.email" src="img/icon&#45;email.svg"> -->
 <img style="height:1em"  ng-show="index.usingCustomBWS" src="img/icon-bws.svg">
 
-<img style="height:1em"  class="animated flash infinite" ng-show="index.loadingWallet" src="img/icon-sync.svg">
+<img style="height:1em"  class="animated flash infinite" ng-show="index.loadingWallet || index.updatingTxHistory[index.walletId]" src="img/icon-sync.svg">
 
diff --git a/public/views/walletHome.html b/public/views/walletHome.html
index 0bf7f9c24..d74e5cf8f 100644
--- a/public/views/walletHome.html
+++ b/public/views/walletHome.html
@@ -187,7 +187,8 @@
           </div>
         </div>
       </div>
-      <div ng-show="index.updatingTxHistory[index.walletId] && index.txProgress > 6">
+      <div ng-show="index.updatingTxHistory[index.walletId] 
+                && ( (index.txProgress > 6 && !index.txHistory[0]) || (index.txProgress > 50 ) )">
         <div  class="row p20 text-center">
           <div class="columns large-12 medium-12 small-12 m10b">
             <div class="spinner">
@@ -208,10 +209,23 @@
       <div ng-show="index.txHistory[0]">
         <h4 class="title m0">
           <span translate>Activity</span>
-          <small ng-show="index.updatingTxHistory[index.walletId] && !index.loadingWallet" translate>
-            Updating...
-          </small>
         </h4>
+
+ 
+        <div ng-if="index.txHistory[0] &&  index.updatingTxHistory[index.walletId]" class="row collapse last-transactions-content animated fadeInDown">
+          <div class="large-6 medium-6 small-6 columns size-14">
+            <div class="m10r left">
+              <img src="img/icon-new.svg" width="40">
+            </div>
+            <div class="m10t" style="background:#eee; width: 8em; margin-left: 52px; line-height:0.6em">
+              <span>&nbsp;</span>
+            </div>
+            <div style="margin-top:5px; background:#eee; width: 6em; margin-left: 52px; line-height:0.6em">
+              <span>&nbsp;</span>
+            </div>
+ 
+         </div>
+        </div>
         
         <div ng-repeat="btx in index.txHistory"
           ng-click="home.openTxModal(btx)"
diff --git a/src/js/controllers/index.js b/src/js/controllers/index.js
index 06c71803d..326b4e97a 100644
--- a/src/js/controllers/index.js
+++ b/src/js/controllers/index.js
@@ -855,7 +855,6 @@ angular.module('copayApp.controllers').controller('indexController', function($r
       fixTxsUnit(txsFromLocal);
 
       function getNewTxs(newTxs, skip, i_cb) {
-
         self.getTxsFromServer(client, skip, endingTxid, requestLimit, function(err, res, shouldContinue) {
           if (err) return i_cb(err);
 
@@ -882,6 +881,7 @@ angular.module('copayApp.controllers').controller('indexController', function($r
 
       getNewTxs([], 0, function(err, txs) {
         if (err) return cb(err);
+
         var newHistory = lodash.compact(txs.concat(txsFromLocal));
         $log.debug('Tx History synced. Total Txs: ' + newHistory.length);