anders/Wallet
1
0
Fork 0
Code Issues Projects Releases Packages Wiki Activity

fix refreshs

Browse source
This commit is contained in:
Matias Alejo Garcia 2016-08-23 17:45:23 -03:00
commit d7080bb2c9
No known key found for this signature in database
GPG key ID: 02470DB551277AB3
3 changed files with 16 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

20
public/views/walletDetails.html
View file

@ -103,26 +103,10 @@
<span>{{newRelease}}</span><i class="icon-arrow-right3 right size-18"></i> <span>{{newRelease}}</span><i class="icon-arrow-right3 right size-18"></i>
</div> </div>
<div ng-if="wallet.txps[0]">
<h4 ng-show="requiresMultipleSignatures" class="title m0" translate>Payment Proposals</h4>
<h4 ng-show="!requiresMultipleSignatures" class="title m0" translate>Unsent transactions</h4>
<div ng-repeat="tx in wallet.txps">
<div ng-include="wallet.txTemplateUrl"></div>
</div>
<div class="text-gray text-center size-12 p10t"
ng-show="status.lockedBalanceSat">
<span translate>Total Locked Balance</span>:
<b>{{status.lockedBalanceStr}} </b>
<span> {{status.lockedBalanceAlternative}}
{{status.alternativeIsoCode}} </span>
</div>
</div>
<div ng-if="txps[0]"> <div ng-if="txps[0]">
<h3 class="title m0" translate>Payment Proposals</h3> <h4 ng-show="requiresMultipleSignatures" class="title m0" translate>Payment Proposals</h4>
<h4 ng-show="!requiresMultipleSignatures" class="title m0" translate>Unsent transactions</h4>
<div class="list card"> <div class="list card">
<ul> <ul>
<li ng-repeat="tx in txps" class="item item-icon-left" <li ng-repeat="tx in txps" class="item item-icon-left"

4
src/js/controllers/tab-home.js
View file

@ -32,7 +32,9 @@ angular.module('copayApp.controllers').controller('tabHomeController',
return; return;
} }
wallet.status = status; wallet.status = status;
$scope.$apply(); $timeout(function(){
$scope.$apply();
}, 1);
}); });
}; };

14
src/js/controllers/walletDetails.js
View file

@ -39,7 +39,10 @@ angular.module('copayApp.controllers').controller('walletDetailsController', fun
setPendingTxps(status.pendingTxps); setPendingTxps(status.pendingTxps);
$scope.status = status; $scope.status = status;
$scope.$apply(); $timeout(function(){
$scope.$apply();
}, 1);
}); });
}; };
@ -126,7 +129,10 @@ angular.module('copayApp.controllers').controller('walletDetailsController', fun
$scope.updatingTxHistoryProgress = txs ? txs.length : 0; $scope.updatingTxHistoryProgress = txs ? txs.length : 0;
$scope.completeTxHistory = txs; $scope.completeTxHistory = txs;
$scope.showHistory(); $scope.showHistory();
$scope.$digest(); $timeout(function(){
$scope.$apply();
}, 1);
}; };
$timeout(function() { $timeout(function() {
@ -142,7 +148,9 @@ angular.module('copayApp.controllers').controller('walletDetailsController', fun
$scope.completeTxHistory = txHistory; $scope.completeTxHistory = txHistory;
$scope.showHistory(); $scope.showHistory();
$scope.$apply(); $timeout(function(){
$scope.$apply();
}, 1);
}); });
}); });
}; };