From 3bbd74e977575500bea0f7437e874fe39029fc78 Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Mon, 12 Jun 2017 12:28:24 -0300 Subject: [PATCH 1/5] WalletDetails: fix padding on Android --- www/views/walletDetails.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/www/views/walletDetails.html b/www/views/walletDetails.html index 3bbc0478a..93fe90f68 100644 --- a/www/views/walletDetails.html +++ b/www/views/walletDetails.html @@ -11,7 +11,7 @@ -
+
Date: Mon, 12 Jun 2017 12:29:47 -0300 Subject: [PATCH 2/5] Fix padding for small devices --- src/sass/views/walletDetails.scss | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/sass/views/walletDetails.scss b/src/sass/views/walletDetails.scss index 18baa3324..3ee4846f4 100644 --- a/src/sass/views/walletDetails.scss +++ b/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; From 64016ebdf8d3f837316e77fe773c7b0e01a6703d Mon Sep 17 00:00:00 2001 From: Andy Phillipson Date: Thu, 15 Jun 2017 19:51:02 -0400 Subject: [PATCH 3/5] Detect a pending transaction. --- src/js/controllers/bitpayCard.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/js/controllers/bitpayCard.js b/src/js/controllers/bitpayCard.js index 2a1a3c55a..a12f01698 100644 --- a/src/js/controllers/bitpayCard.js +++ b/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) { From 0d4fd06bcca6af114afc614af1841567ec6e0437 Mon Sep 17 00:00:00 2001 From: Andy Phillipson Date: Fri, 16 Jun 2017 12:45:11 -0400 Subject: [PATCH 4/5] Fix the send search bg, mcc icon coloring, pre-auth header. --- src/js/controllers/bitpayCard.js | 6 +-- src/js/controllers/tab-send.js | 2 +- src/sass/views/bitpayCard.scss | 12 +++++- www/views/bitpayCard.html | 24 ++++------- www/views/includes/cardActivity.html | 63 ++++++++++++++++++++++++++++ 5 files changed, 86 insertions(+), 21 deletions(-) diff --git a/src/js/controllers/bitpayCard.js b/src/js/controllers/bitpayCard.js index 2a1a3c55a..1bb639029 100644 --- a/src/js/controllers/bitpayCard.js +++ b/src/js/controllers/bitpayCard.js @@ -92,10 +92,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) { diff --git a/src/js/controllers/tab-send.js b/src/js/controllers/tab-send.js index 5c2f576ec..ba6577938 100644 --- a/src/js/controllers/tab-send.js +++ b/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; } }; diff --git a/src/sass/views/bitpayCard.scss b/src/sass/views/bitpayCard.scss index a1ae39918..d49fc3821 100644 --- a/src/sass/views/bitpayCard.scss +++ b/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; } } } diff --git a/www/views/bitpayCard.html b/www/views/bitpayCard.html index 25256c3c7..91c85b482 100644 --- a/www/views/bitpayCard.html +++ b/www/views/bitpayCard.html @@ -51,18 +51,6 @@ Your BitPay Card is ready. Add funds to your card to start using your card at stores and ATMs worldwide.
-
- Confirming transactions take up to 1 block confirmation to proccess. - Learn More -
-
- Confirming load transactions that are underpaid may require at least six blockchain confirmations to process. - Learn More -
-
- (Pre-Auth Holds transactions) The merchant has initiated a hold to make those funds unavailable until your transaction to them has fully settled. Funds are released within 30 days at the latest in the event the merchant decides not to complete the transaction. - Learn More -