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

Fix fee levels when there is no wallet and hide Glidera if wallet is not complete (#4068)

Browse source 
* fix cordova is not define

* Remove focused client from fee level service

* remove wallet should be complete in route.js for global preferences routes

* get network of the focused client in getCurrentFeeValue function

* refactor

* do not show testnet fee levels in preference global and refactors

* bump new version bwc v2.2.1
This commit is contained in:
Gabriel Edgardo Bazán 2016-04-13 17:46:25 +02:00 • committed by Gustavo Maximiliano Cortez
commit b720821d4e
8 changed files with 34 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

2
public/views/includes/sidebar.html
View file

@ -28,7 +28,7 @@
<div translate>Create, join or import</div>
</a>
</li>
<li ng-show="index.glideraEnabled">
<li ng-show="index.glideraEnabled && index.isComplete">
<a ng-click="sidebar.closeMenu(); $root.go('glidera')" class="oh">
<i class="icon-arrow-right3 size-18 right m10t vm"></i>
<i class="icon-bank size-24 icon vm"></i>

11
public/views/preferencesFee.html
View file

@ -1,5 +1,5 @@
<div
class="topbar-container"
<div
class="topbar-container"
ng-include="'views/includes/topbar.html'"
ng-init="titleSection='Bitcoin Network Fee Policy'; goBackToState = 'preferencesGlobal'; noColor = true">
</div>
@ -21,8 +21,8 @@
</div>
</div>
</div>
<ul class="no-bullet m0">
<li ng-repeat="fee in (index.network == 'livenet' ? prefFee.feeLevels.livenet : prefFee.feeLevels.testnet)"
<ul class="no-bullet m0">
<li ng-repeat="fee in prefFee.feeLevels.livenet"
ng-click="prefFee.save(fee.level)">
{{prefFee.feeOpts[fee.level]|translate}}
<i class="fi-check size-16 right" ng-show="prefFee.currentFeeLevel == fee.level"></i>
@ -30,8 +30,7 @@
</ul>
<div class="row m20t">
<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 class="text-gray size-12 text-center" ng-repeat="fee in prefFee.feeLevels.livenet" ng-if="fee.level == prefFee.currentFeeLevel">
<div ng-show="fee.nbBlocks">
<span translate>Average confirmation time: {{fee.nbBlocks * 10}} minutes</span>.
</div>

2
public/views/preferencesGlobal.html
View file

@ -78,7 +78,7 @@
<div translate>About Copay</div>
</li>
</ul>
<div ng-show="prefGlobal.usePushNotifications && !PNEnabledByUser && isIOS">
<div ng-show="prefGlobal.usePushNotifications && !PNEnabledByUser && isIOSApp">
<div class="text-centered text-gray size-12 m10" translate>Push notifications for Copay are currently disabled. Enable them in the Settings app.</div>
<ul class="no-bullet m0" ng-click="prefGlobal.openSettings()">
<li ng-style="{'color':index.backgroundColor}" translate>Open Settings app</li>