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

Default static fee if using old bws

Browse source
This commit is contained in:
Gustavo Maximiliano Cortez 2015-07-24 15:09:19 -03:00
commit 0b34e1d1b5
3 changed files with 8 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

11
public/views/walletHome.html
View file

@ -399,14 +399,13 @@
</div> </div>
</div> </div>
<div class="text-right size-12 m10b" ng-if="index.feeLevels.livenet && index.feeLevels.testnet"> <div class="text-right size-12 m20b" ng-if="index.feeLevels.livenet && index.feeLevels.testnet">
<span ng-repeat="fee in (index.network == 'livenet' ? index.feeLevels.livenet : index.feeLevels.testnet)" <span ng-repeat="fee in (index.network == 'livenet' ? index.feeLevels.livenet : index.feeLevels.testnet)"
ng-show="index.currentFeeLevel == fee.level"> ng-show="index.currentFeeLevel == fee.level" class="pointer" ng-click="home.openFeeLevelsModal(index.feeLevels, index.currentFeeLevel)">
<span translate>Fee</span>: <span translate>Fee level: {{fee.level}}</span>
<span class="text-light" translate>{{fee.feePerKBUnit}} per kB</span> <span class="text-gray">({{fee.feePerKBUnit}}/KB)</span>
(<span translate>Average confirmation time: {{fee.nbBlocks * 10}} minutes</span>) <i class="fi-pencil"></i>
</span> </span>
<a href ng-click="home.openFeeLevelsModal(index.feeLevels, index.currentFeeLevel)" translate>Change</a>
</div> </div>
<div class="row"> <div class="row">

6
src/js/controllers/walletHome.js
View file

@ -725,11 +725,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
amount = parseInt((form.amount.$modelValue * unitToSat).toFixed(0)); amount = parseInt((form.amount.$modelValue * unitToSat).toFixed(0));
feeService.getCurrentFeeValue(function(err, feePerKb) { feeService.getCurrentFeeValue(function(err, feePerKb) {
if (err) { if (err) $log.debug(err);
self.setOngoingProcess();
profileService.lockFC();
return self.setSendError(err);
}
fc.sendTxProposal({ fc.sendTxProposal({
toAddress: address, toAddress: address,
amount: amount, amount: amount,

4
src/js/services/feeService.js
View file

@ -11,7 +11,7 @@ angular.module('copayApp.services').factory('feeService', function($log, lodash,
var fee = 10000; var fee = 10000;
fc.getFeeLevels(fc.credentials.network, function(err, levels) { fc.getFeeLevels(fc.credentials.network, function(err, levels) {
if (err) { if (err) {
return cb({message: 'Error getting dynamic fee'}) return cb({message: 'Error getting dynamic fee'}, fee);
} }
else { else {
for (var i = 0; i < 3; i++) { for (var i = 0; i < 3; i++) {
@ -52,7 +52,7 @@ angular.module('copayApp.services').factory('feeService', function($log, lodash,
fc.getFeeLevels('livenet', function(errLivenet, levelsLivenet) { fc.getFeeLevels('livenet', function(errLivenet, levelsLivenet) {
fc.getFeeLevels('testnet', function(errTestnet, levelsTestnet) { fc.getFeeLevels('testnet', function(errTestnet, levelsTestnet) {
if (errLivenet || errTestnet) $log.error('Error getting dynamic fee'); if (errLivenet || errTestnet) $log.debug('Error getting dynamic fee');
for (var i = 0; i < 3; i++) { for (var i = 0; i < 3; i++) {
levelsLivenet[i]['feePerKBUnit'] = profileService.formatAmount(levelsLivenet[i].feePerKB) + ' ' + unitName; levelsLivenet[i]['feePerKBUnit'] = profileService.formatAmount(levelsLivenet[i].feePerKB) + ' ' + unitName;