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

Merge pull request #6293 from matiu/bug/low

Browse source 
handle err
This commit is contained in:
Javier Donadío 2017-06-23 12:34:59 -03:00 • committed by GitHub
commit 54338c3859
3 changed files with 13 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/js/controllers/tx-details.js
View file

@ -118,12 +118,17 @@ angular.module('copayApp.controllers').controller('txDetailsController', functio
initActionList();
getFiatRate();
feeService.getLowAmount($scope.wallet, function(err, amount) {
$scope.btx.lowAmount = tx.amount< amount;
});
feeService.getFeeLevels(function(err, levels) {
if (err) return;
walletService.getLowAmount($scope.wallet, levels, function(err, amount) {
if (err) return;
$scope.btx.lowAmount = tx.amount < amount;
$timeout(function() {
$scope.$apply();
$timeout(function() {
$scope.$apply();
});
});
});
});
};

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

@ -53,7 +53,9 @@ angular.module('copayApp.controllers').controller('walletDetailsController', fun
if (analyzeUtxosDone) return;
feeService.getFeeLevels(function(err, levels){
if (err) return;
walletService.getLowUtxos($scope.wallet, levels, function(err, resp){
if (err || !resp) return;
analyzeUtxosDone = true;
$scope.lowUtxosWarning = resp.warning;
});

2
www/views/addresses.html
View file

@ -91,7 +91,7 @@
</div>
<div class="item" >
<span translate> Approximate fee to move all wallet's balance (with normal priority) </span>
<span translate> Approximate Bitcoin network fee to transfer wallet's balance (with normal priority) </span>
<div class="addr-path">
{{minFeePer}} [{{minFee}}]
</div>