From 04d6eb7aa438ac1895bad3442d1ce435fa58df7d Mon Sep 17 00:00:00 2001
From: Gustavo Maximiliano Cortez <cmgustavo83@gmail.com>
Date: Tue, 9 Dec 2014 22:01:52 -0300
Subject: [PATCH] remove loading message from History. change Send title

---
 js/controllers/send.js | 2 +-
 views/history.html     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/js/controllers/send.js b/js/controllers/send.js
index 7bfd9bfae..2ef07160a 100644
--- a/js/controllers/send.js
+++ b/js/controllers/send.js
@@ -12,7 +12,7 @@ angular.module('copayApp.controllers').controller('SendController',
       preconditions.checkState(w);
       preconditions.checkState(w.settings.unitToSatoshi);
 
-      $rootScope.title = w.isShared() ? 'Create Transaction Proposal' : 'Send';
+      $rootScope.title = w.isShared() ? 'Send Proposal' : 'Send';
       $scope.loading = false;
       $scope.error = $scope.success = null;
 
diff --git a/views/history.html b/views/history.html
index 8ad75677f..16e63cb49 100644
--- a/views/history.html
+++ b/views/history.html
@@ -2,7 +2,7 @@
   <div class="row">
     <div class="large-12 medium-12 small-12 columns">
       <h1 class="hide-for-large-up">{{$root.title}}</h1> 
-      <div ng-if="loading" class="m20b">
+      <div ng-if="loading && !blockchain_txs[0].txid" class="m20b">
         <i class="fi-bitcoin-circle icon-rotate spinner"></i> 
         <span translate>Loading...</span>
       </div>