BTCPrivate
/
copay
mirror of https://github.com/BTCPrivate/copay.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix flashing get started message

This commit is contained in:
Gustavo Maximiliano Cortez 2016-10-16 20:00:38 -03:00
parent 65dc3d24c0
commit 13d85c193d
No known key found for this signature in database
GPG Key ID: 15EDAD8D9F2EB1AF
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/js/controllers/bitpayCard.js
View File

@ -7,7 +7,9 @@ angular.module('copayApp.controllers').controller('bitpayCardController', functi
$scope.network = bitpayCardService.getEnvironment();
var getFromCache = function(cb) {
$scope.loadingCache = true;
bitpayCardService.getBitpayDebitCardsHistory($scope.cardId, function(err, data) {
$scope.loadingCache = false;
if (err || lodash.isEmpty(data)) return cb();
$scope.historyCached = true;
self.bitpayCardTransactionHistory = data.transactions;

6
www/views/bitpayCard.html
View File

@ -40,7 +40,7 @@
<div
class="m10t text-center padding"
ng-if="!loadingHistory && !bitpayCard.bitpayCardTransactionHistory[0] && !error">
ng-if="!loadingCache && !loadingHistory && !bitpayCard.bitpayCardTransactionHistory[0] && !error">
<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>
@ -74,11 +74,11 @@
{{tx.desc}}
</div>
-->
<div class="col col-20 text-center p10t">
<div class="col col-10 text-center p10t">
<img ng-show="!tx.pending" ng-src="img/check.svg" width="14">
<img ng-show="tx.pending" ng-src="img/sync.svg" width="14">
</div>
<div class="col col-20 text-right size-12 text-gray">
<div class="col col-25 text-right size-12 text-gray">
<div class="size-14"
ng-class="{
'text-success': tx.amount.indexOf('-') == -1 && !tx.pending,