mirror of https://github.com/BTCPrivate/copay.git
Hide options if it is the old bws
This commit is contained in:
parent
a034c832be
commit
d8a155a0e8
|
@ -77,11 +77,12 @@
|
|||
{{preferences.selectedAlternative.name}}
|
||||
</span>
|
||||
</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 class="right text-gray">
|
||||
<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>
|
||||
</li>
|
||||
<li class="line-b p20">
|
||||
|
|
|
@ -7,7 +7,7 @@
|
|||
<ul class="no-bullet m0 size-14">
|
||||
<li ng-repeat="fee in (index.network == 'livenet' ? index.feeLevels.livenet : index.feeLevels.testnet)"
|
||||
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>
|
||||
</li>
|
||||
</ul>
|
||||
|
|
|
@ -427,16 +427,18 @@
|
|||
<i ng-if="!home.hideAdvSend" class="icon-arrow-up4"></i>
|
||||
</a>
|
||||
<div class="m10t" ng-hide="home.hideAdvSend">
|
||||
<h4 class="title m0" translate>Fee policy for this transaction</h4>
|
||||
<ul class="no-bullet m0 size-14">
|
||||
<li ng-repeat="fee in (index.network == 'livenet' ? index.feeLevels.livenet : index.feeLevels.testnet)"
|
||||
ng-click="home.currentSendFeeLevel = fee.level" class="line-b p20">
|
||||
{{index.feeOpts[fee.level]|translate}}
|
||||
<i class="fi-check size-16 right"
|
||||
ng-show="(home.currentSendFeeLevel || index.currentFeeLevel) == fee.level"></i>
|
||||
</li>
|
||||
</ul>
|
||||
<h4 class="title m0" translate>Use unconfirmed funds for this transaction</h4>
|
||||
<div ng-show="(index.network == 'livenet' ? index.feeLevels.livenet : index.feeLevels.testnet)">
|
||||
<h4 class="title m0" translate>Fee policy for this transaction</h4>
|
||||
<ul class="no-bullet m0 size-14">
|
||||
<li ng-repeat="fee in (index.network == 'livenet' ? index.feeLevels.livenet : index.feeLevels.testnet)"
|
||||
ng-click="home.currentSendFeeLevel = fee.level" class="line-b p20">
|
||||
{{index.feeOpts[fee.level]|translate}}
|
||||
<i class="fi-check size-16 right"
|
||||
ng-show="(home.currentSendFeeLevel || index.currentFeeLevel) == fee.level"></i>
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
<h4 class="title m0"> </h4>
|
||||
<div class="p20 line-b">
|
||||
<span class="size-14" translate>Use Unconfirmed Funds</span>
|
||||
<switch id="spend-unconfirmed" name="currentSpendUnconfirmed" ng-model="currentSpendUnconfirmed" class="green right"></switch>
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
'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 = {};
|
||||
|
||||
// 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);
|
||||
}
|
||||
else {
|
||||
for (var i = 0; i < 3; i++) {
|
||||
if (levels[i].level == feeLevel) {
|
||||
fee = levels[i].feePerKB;
|
||||
}
|
||||
}
|
||||
fee = lodash.find(levels, { level: feeLevel }).feePerKB;
|
||||
$log.debug('Dynamic fee for ' + feeLevel + ': ' + fee);
|
||||
return cb(null, fee);
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue