From 4f5c814c508db93da407f53bf55ab40c69c219fb Mon Sep 17 00:00:00 2001
From: Gustavo Maximiliano Cortez <cmgustavo83@gmail.com>
Date: Wed, 5 Oct 2016 11:42:40 -0300
Subject: [PATCH] Fix first view

---
 src/js/controllers/bitpayCard.js            |  1 +
 src/js/controllers/preferencesBitpayCard.js |  4 ++--
 src/sass/views/bitpayCard.scss              |  5 ++++-
 www/views/bitpayCard.html                   | 12 +++++++-----
 4 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/src/js/controllers/bitpayCard.js b/src/js/controllers/bitpayCard.js
index 54a9c09a5..03d1d123f 100644
--- a/src/js/controllers/bitpayCard.js
+++ b/src/js/controllers/bitpayCard.js
@@ -94,6 +94,7 @@ angular.module('copayApp.controllers').controller('bitpayCardController', functi
               transactions: self.bitpayCardTransactionHistory
             };
             bitpayCardService.setCacheData(cacheData, function(err) {
+              $scope.bitpayCardCached = true;
               if (err) $log.error(err);
             });
           });
diff --git a/src/js/controllers/preferencesBitpayCard.js b/src/js/controllers/preferencesBitpayCard.js
index 2abf6a8c4..536d4cde6 100644
--- a/src/js/controllers/preferencesBitpayCard.js
+++ b/src/js/controllers/preferencesBitpayCard.js
@@ -4,8 +4,8 @@ angular.module('copayApp.controllers').controller('preferencesBitpayCardControll
   function($scope, $state, $timeout, $ionicHistory, bitpayCardService, popupService) {
 
     $scope.logout = function() {
-      var title = 'Are you sure you would like to log out of your Bitpay Card account?';
-      popupService.showConfirm(title, null, null, null, function(res) {
+      var msg = 'Are you sure you would like to log out of your BitPay Card account?';
+      popupService.showConfirm(null, msg, null, null, function(res) {
         if (res) logout();
       });
     };
diff --git a/src/sass/views/bitpayCard.scss b/src/sass/views/bitpayCard.scss
index 5d7b045b6..563554f15 100644
--- a/src/sass/views/bitpayCard.scss
+++ b/src/sass/views/bitpayCard.scss
@@ -3,12 +3,15 @@
     width: 100%;
     text-align: center;
     padding: 2rem 1rem 1.5rem 1rem;
-    min-height: 140px;
+    height: 140px;
     border-color: #172565;
     background-color: #1e3186;
     background-image: linear-gradient(0deg, #172565, #172565 0%, transparent 0%);
     color: #fff;
   }
+  .wallet-details-wallet-info {
+    bottom: 5px;
+  }
   strong {
     line-height: 100%;
   }
diff --git a/www/views/bitpayCard.html b/www/views/bitpayCard.html
index ab8457b30..b5d3cd836 100644
--- a/www/views/bitpayCard.html
+++ b/www/views/bitpayCard.html
@@ -92,28 +92,30 @@
     <div ng-show="bitpayCard.bitpayCardAuthenticated">
       <div class="oh pr">
         <div class="amount">
-          <div ng-if="!loadingHistory && bitpayCard.bitpayCardCurrentBalance" ng-click="bitpayCard.update()">
+          <div ng-if="bitpayCard.bitpayCardCurrentBalance" ng-click="bitpayCard.update()">
             <div class="size-36 m20b">${{bitpayCard.bitpayCardCurrentBalance}}</div>
             <a class="button button-positive button-small" ui-sref="tabs.bitpayCard.amount({'isCard': true, 'toName': 'BitPay Card'})">
               <i class="icon ion-ios-plus-empty"></i> {{'Add Funds'|translate}}
             </a>
           </div>
-          <div ng-if="loadingHistory" class="m10t">
+          <div ng-if="!bitpayCard.bitpayCardCurrentBalance" class="m10t">
             <strong class="size-36">...</strong>
           </div>
         </div>
+        <div class="wallet-details-wallet-info">
+          <img style="height:0.6em"  ng-show="loadingHistory" src="img/icon-sync-white.svg">
+        </div>
       </div>
 
       <div
         class="m10t text-center padding"
-        ng-show="!bitpayCard.bitpayCardTransactionHistory[0] &&
-        !bitpayCard.bitpayCardInvoiceHistory[0] && (!loadingHistory || !bitpayCardCached)">
+        ng-if="!bitpayCardCached && !loadingHistory && !bitpayCard.bitpayCardTransactionHistory[0]">
         <i class="icon ion-ios-arrow-thin-up size-24"></i>
         <h1>Get started</h1>
         <h4>Your BitPay Card is ready. Add funds to your card to start using your card at stores and ATMs worldwide.</h4>
       </div>
 
-      <div class="list" ng-if="bitpayCardCached">
+      <div class="list" ng-show="bitpayCardCached">
         <div class="item item-divider">
         <select class="select-style" ng-model="dateRange" ng-change="bitpayCard.update(dateRange)">
           <option value="last30Days">Recent Activity</option>