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

Merge pull request #3900 from cmgustavo/ref/set-fee-level

Browse source 
Decrease in call to feelevels
This commit is contained in:
Matias Alejo Garcia 2016-02-23 09:44:35 -03:00
commit 1c8049c956
12 changed files with 87 additions and 98 deletions
Download patch file Download diff file Expand all files Collapse all files

28
public/views/preferencesFee.html
View file

@ -3,19 +3,35 @@
ng-include="'views/includes/topbar.html'"
ng-init="titleSection='Bitcoin Network Fee Policy'; goBackToState = 'preferencesGlobal'; noColor = true">
</div>
<div class="content preferences" ng-controller="preferencesFeeController as prefFee">
<div class="content preferences" ng-controller="preferencesFeeController as prefFee" ng-init="prefFee.init()">
<h4></h4>
<div class="preferences-fee" ng-show="prefFee.loading">
<div class="row p20 text-center">
<div class="columns large-12 medium-12 small-12 m10b">
<div class="spinner">
<div class="rect1"></div>
<div class="rect2"></div>
<div class="rect3"></div>
<div class="rect4"></div>
<div class="rect5"></div>
</div>
</div>
<div class="size-12 text-gray m20t" translate>
Loading...
</div>
</div>
</div>
<ul class="no-bullet m0">
<li ng-repeat="fee in (index.network == 'livenet' ? index.feeLevels.livenet : index.feeLevels.testnet)"
<li ng-repeat="fee in (index.network == 'livenet' ? prefFee.feeLevels.livenet : prefFee.feeLevels.testnet)"
ng-click="prefFee.save(fee.level)">
{{index.feeOpts[fee.level]|translate}}
<i class="fi-check size-16 right" ng-show="index.currentFeeLevel == fee.level"></i>
{{prefFee.feeOpts[fee.level]|translate}}
<i class="fi-check size-16 right" ng-show="prefFee.currentFeeLevel == fee.level"></i>
</li>
</ul>
<div class="row m20t">
<div class="text-gray size-12 text-center" ng-repeat="fee in (index.network == 'livenet' ? index.feeLevels.livenet :
index.feeLevels.testnet)" ng-if="fee.level == index.currentFeeLevel">
<div class="text-gray size-12 text-center" ng-repeat="fee in (index.network == 'livenet' ? prefFee.feeLevels.livenet :
prefFee.feeLevels.testnet)" ng-if="fee.level == prefFee.currentFeeLevel">
<div ng-show="fee.nbBlocks">
<span translate>Average confirmation time: {{fee.nbBlocks * 10}} minutes</span>.
</div>

5
public/views/preferencesGlobal.html
View file

@ -36,10 +36,9 @@
</ul>
<h4></h4>
<ul class="no-bullet m0 ">
<li ng-click="$root.go('preferencesFee')"
ng-show="(index.network == 'livenet' ? index.feeLevels.livenet : index.feeLevels.testnet)">
<li ng-click="$root.go('preferencesFee')">
<div class="right text-gray">
{{index.feeOpts[index.currentFeeLevel]|translate}}
{{prefGlobal.feeOpts[prefGlobal.currentFeeLevel]|translate}}
<i class="icon-arrow-right3 size-24"></i>
</div>
<div translate>Bitcoin Network Fee Policy</div>

10
public/views/preferencesHistory.html
View file

@ -5,13 +5,15 @@
</div>
<div class="content preferences" ng-controller="preferencesHistory as history">
<h4></h4>
<ul class="no-bullet m0" ng-style="{'color':index.backgroundColor}">
<ul class="no-bullet m0">
<li ng-if="!index.isCordova" ng-init="index.csvHistory()">
<a ng-style="{'color':index.backgroundColor}" ng-csv="index.csvContent" csv-header="index.csvHeader" filename="{{ index.csvFilename }}">
<span translate>Export to file</span>
<a ng-style="{'color':index.backgroundColor}" ng-csv="index.csvContent"
csv-header="index.csvHeader"
filename="{{index.csvFilename }}" translate>
Export to file
</a>
</li>
<li ng-click="history.clearTransactionHistory();" translate>
<li ng-style="{'color':index.backgroundColor}" ng-click="history.clearTransactionHistory();" translate>
Clear cache
</li>
</ul>

7
public/views/walletHome.html
View file

@ -358,9 +358,12 @@
<div class="pr p25b">
<h4 class="title m0">
<available-balance></available-balance>
<span
ng-show="home.lockedCurrentFeePerKb || home.blockUx || home.lockAmount"
class="text-gray" translate>Send All</span>
<a
ng-show="!home.lockedCurrentFeePerKb && index.feeToSendMaxStr && index.availableBalanceSat > 0 && !home.blockUx && !home.lockAmount"
ng-click="home.sendAll()"
ng-show="index.availableBalanceSat > 0 && !home.lockedCurrentFeePerKb && !home.blockUx && !home.lockAmount"
ng-click="home.sendAll(index.totalBytesToSendMax, index.availableBalanceSat)"
translate> Send All
</a>
<div ng-show="!home.paymentExpired && home._paypro">