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

Hide options if it is the old bws

Browse source
This commit is contained in:
Gustavo Maximiliano Cortez 2015-08-05 16:34:05 -03:00
commit d8a155a0e8
4 changed files with 18 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

5
public/views/preferences.html
View file

@ -77,11 +77,12 @@
{{preferences.selectedAlternative.name}} {{preferences.selectedAlternative.name}}
</span> </span>
</li> </li>
<li class="line-b p20" ng-click="$root.go('preferencesFee')"> <li class="line-b p20" ng-click="$root.go('preferencesFee')"
ng-show="(index.network == 'livenet' ? index.feeLevels.livenet : index.feeLevels.testnet)">
<span translate>Bitcoin Network Fee Policy</span> <span translate>Bitcoin Network Fee Policy</span>
<span class="right text-gray"> <span class="right text-gray">
<i class="icon-arrow-right3 size-24 right"></i> <i class="icon-arrow-right3 size-24 right"></i>
<span class="text-capitalize">{{index.feeOpts[index.currentFeeLevel]|translate}}</span> {{index.feeOpts[index.currentFeeLevel]|translate}}
</span> </span>
</li> </li>
<li class="line-b p20"> <li class="line-b p20">

2
public/views/preferencesFee.html
View file

@ -7,7 +7,7 @@
<ul class="no-bullet m0 size-14"> <ul class="no-bullet m0 size-14">
<li ng-repeat="fee in (index.network == 'livenet' ? index.feeLevels.livenet : index.feeLevels.testnet)" <li ng-repeat="fee in (index.network == 'livenet' ? index.feeLevels.livenet : index.feeLevels.testnet)"
ng-click="prefFee.save(fee.level)" class="line-b p20"> ng-click="prefFee.save(fee.level)" class="line-b p20">
<span class="text-capitalize">{{index.feeOpts[fee.level]|translate}}</span> {{index.feeOpts[fee.level]|translate}}
<i class="fi-check size-16 right" ng-show="index.currentFeeLevel == fee.level"></i> <i class="fi-check size-16 right" ng-show="index.currentFeeLevel == fee.level"></i>
</li> </li>
</ul> </ul>

22
public/views/walletHome.html
View file

@ -427,16 +427,18 @@
<i ng-if="!home.hideAdvSend" class="icon-arrow-up4"></i> <i ng-if="!home.hideAdvSend" class="icon-arrow-up4"></i>
</a> </a>
<div class="m10t" ng-hide="home.hideAdvSend"> <div class="m10t" ng-hide="home.hideAdvSend">
<h4 class="title m0" translate>Fee policy for this transaction</h4> <div ng-show="(index.network == 'livenet' ? index.feeLevels.livenet : index.feeLevels.testnet)">
<ul class="no-bullet m0 size-14"> <h4 class="title m0" translate>Fee policy for this transaction</h4>
<li ng-repeat="fee in (index.network == 'livenet' ? index.feeLevels.livenet : index.feeLevels.testnet)" <ul class="no-bullet m0 size-14">
ng-click="home.currentSendFeeLevel = fee.level" class="line-b p20"> <li ng-repeat="fee in (index.network == 'livenet' ? index.feeLevels.livenet : index.feeLevels.testnet)"
{{index.feeOpts[fee.level]|translate}} ng-click="home.currentSendFeeLevel = fee.level" class="line-b p20">
<i class="fi-check size-16 right" {{index.feeOpts[fee.level]|translate}}
ng-show="(home.currentSendFeeLevel || index.currentFeeLevel) == fee.level"></i> <i class="fi-check size-16 right"
</li> ng-show="(home.currentSendFeeLevel || index.currentFeeLevel) == fee.level"></i>
</ul> </li>
<h4 class="title m0" translate>Use unconfirmed funds for this transaction</h4> </ul>
</div>
<h4 class="title m0">&nbsp;</h4>
<div class="p20 line-b"> <div class="p20 line-b">
<span class="size-14" translate>Use Unconfirmed Funds</span> <span class="size-14" translate>Use Unconfirmed Funds</span>
<switch id="spend-unconfirmed" name="currentSpendUnconfirmed" ng-model="currentSpendUnconfirmed" class="green right"></switch> <switch id="spend-unconfirmed" name="currentSpendUnconfirmed" ng-model="currentSpendUnconfirmed" class="green right"></switch>

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

@ -1,6 +1,6 @@
'use strict'; 'use strict';
angular.module('copayApp.services').factory('feeService', function($log, profileService, configService, gettextCatalog) { angular.module('copayApp.services').factory('feeService', function($log, profileService, configService, gettextCatalog, lodash) {
var root = {}; var root = {};
// Constant fee options to translate // Constant fee options to translate
@ -21,11 +21,7 @@ angular.module('copayApp.services').factory('feeService', function($log, profile
return cb({message: 'Could not get dynamic fee. Using static 10000sat'}, fee); return cb({message: 'Could not get dynamic fee. Using static 10000sat'}, fee);
} }
else { else {
for (var i = 0; i < 3; i++) { fee = lodash.find(levels, { level: feeLevel }).feePerKB;
if (levels[i].level == feeLevel) {
fee = levels[i].feePerKB;
}
}
$log.debug('Dynamic fee for ' + feeLevel + ': ' + fee); $log.debug('Dynamic fee for ' + feeLevel + ': ' + fee);
return cb(null, fee); return cb(null, fee);
} }