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

Fix wallet information. Fix Spending restriction options

Browse source
This commit is contained in:
Gustavo Maximiliano Cortez 2015-10-20 18:08:02 -03:00
commit 9bcf014694
No known key found for this signature in database
GPG key ID: 15EDAD8D9F2EB1AF
3 changed files with 13 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

22
public/views/preferences.html
View file

@ -62,19 +62,21 @@
<div translate>Advanced</div> <div translate>Advanced</div>
</li> </li>
</ul> </ul>
<div ng-show="!index.noFocusedWallet && (!index.isPrivKeyExternal || preferences.touchidAvailable)">
<h4 translate> <h4 translate>
Spending Restrictions Spending Restrictions
</h4> </h4>
<ul class="no-bullet m0 "> <ul class="no-bullet m0 ">
<li ng-hide="index.isPrivKeyExternal"> <li ng-show="!index.isPrivKeyExternal">
<switch id="network-name" name="encrypt" ng-model="encrypt" class="green right"></switch> <switch id="network-name" name="encrypt" ng-model="encrypt" class="green right"></switch>
<div translate>Request Password</div> <div translate>Request Password</div>
</li> </li>
<li ng-show="preferences.touchidAvailable"> <li ng-show="preferences.touchidAvailable">
<switch id="touchid" name="touchid" ng-model="touchid" class="green right"></switch> <switch id="touchid" name="touchid" ng-model="touchid" class="green right"></switch>
<div translate>Scan Fingerprint</div> <div translate>Scan Fingerprint</div>
</li> </li>
</ul> </ul>
</div>
<ul class="no-bullet m0 "> <ul class="no-bullet m0 ">
<h4 translate>Global settings</h4> <h4 translate>Global settings</h4>

1
public/views/preferencesAdvanced.html
View file

@ -9,7 +9,6 @@
<h4></h4> <h4></h4>
<ul class="no-bullet m0"> <ul class="no-bullet m0">
<li ng-click="$root.go('information')"> <li ng-click="$root.go('information')">
<i class="icon-arrow-right3 size-24 right text-gray"></i> <i class="icon-arrow-right3 size-24 right text-gray"></i>
<div translate>Wallet Information</div> <div translate>Wallet Information</div>

2
src/js/controllers/preferencesInformation.js
View file

@ -7,7 +7,7 @@ angular.module('copayApp.controllers').controller('preferencesInformation',
this.init = function() { this.init = function() {
var fc = profileService.focusedClient; var fc = profileService.focusedClient;
var c = fc.credentials; var c = fc.credentials;
var basePath = profileService.getUtils().PATHS.BASE_ADDRESS_DERIVATION[c.derivationStrategy][c.network]; var basePath = profileService.getUtils().getBaseAddressDerivationPath(c.derivationStrategy, c.network, 0);
$scope.walletName = c.walletName; $scope.walletName = c.walletName;
$scope.walletId = c.walletId; $scope.walletId = c.walletId;