Merge branch 'master' of https://github.com/bitpay/copay

src/js/controllers/bitpayCard.js

@@ -80,6 +80,8 @@ angular.module('copayApp.controllers').controller('bitpayCardController', functi
           txs[i].desc = _processDescription(txs[i]);
           txs[i].price = _price(txs[i]);
           txs[i].runningBalance = runningBalance;
+          txs[i].pending = txs[i].status.toLowerCase() == 'pending';
+
           _runningBalance(txs[i]);
 
           if (txs[i].merchant.city && txs[i].merchant.state) {
@@ -92,10 +94,10 @@ angular.module('copayApp.controllers').controller('bitpayCardController', functi
           return !tx.pending && tx.type.indexOf('93') == -1;
         });
         self.bitpayCardTransactionHistoryConfirming = lodash.filter(txs, function(tx) {
-          return tx.pending;
+          return tx.pending && tx.type.indexOf('93') == -1;
         });
-        self.bitpayCardTransactionHistoryPreAuth = lodash.includes(txs, function(tx) {
-          return tx.type.indexOf('93') > -1;
+        self.bitpayCardTransactionHistoryPreAuth = lodash.filter(txs, function(tx) {
+          return tx.pending && tx.type.indexOf('93') > -1;
         });
 
         lodash.forEach(self.bitpayCardTransactionHistoryConfirming, function(tx) {

src/js/controllers/tab-send.js

@@ -133,7 +133,7 @@ angular.module('copayApp.controllers').controller('tabSendController', function(
   };
 
   $scope.searchBlurred = function() {
-    if ($scope.formData.search == null) {
+    if ($scope.formData.search == null || $scope.formData.search.length == 0) {
       $scope.searchFocus = false;
     }
   };

src/sass/views/bitpayCard.scss

@@ -13,6 +13,10 @@
     color: #727272;
     padding: 2px 1rem;
     background: #f8f8f9;
+    i {
+      position: absolute;
+      padding-left: 5px;
+    }
   }
 
   .comment {
@@ -86,11 +90,15 @@
 
       &.send .svg #-Transaction-icons {
       }
-      &.receive .svg #-Transaction-icons {
+      &.receive .svg #-Transaction-icons,
+      &.receive .tx-icon .houston {
         stroke: #09C286;
+        color: #09C286;
       }
-      &.pending .svg #-Transaction-icons {
+      &.pending .svg #-Transaction-icons,
+      &.pending .tx-icon .houston {
         stroke: $v-bitcoin-orange;
+        color: $v-bitcoin-orange;
       }
     }
   }

src/sass/views/walletDetails.scss

@@ -176,9 +176,6 @@
     display: block;
     align-items: center;
     justify-content: center;
-    @media(max-width: 320px) {
-      padding-top: 60px;
-    }
 
     &.collapsible {
       margin-bottom: 10px;