Merge pull request #6679 from JDonadio/ref/wiki-spending-password

fix method name - add spending password external link
This commit is contained in:
Gustavo Maximiliano Cortez 2017-08-31 18:25:09 -03:00 committed by GitHub
commit 9602fb9bb6
5 changed files with 19 additions and 5 deletions

View file

@ -66,7 +66,7 @@ angular.module('copayApp.controllers').controller('advancedSettingsController',
}); });
}; };
$scope.learnMore = function() { $scope.openBitcoinCashWeb = function() {
var url = 'https://www.bitcoincash.org/'; var url = 'https://www.bitcoincash.org/';
var optIn = true; var optIn = true;
var title = null; var title = null;

View file

@ -1,7 +1,7 @@
'use strict'; 'use strict';
angular.module('copayApp.controllers').controller('preferencesController', angular.module('copayApp.controllers').controller('preferencesController',
function($scope, $rootScope, $timeout, $log, $ionicHistory, configService, profileService, fingerprintService, walletService, platformInfo) { function($scope, $rootScope, $timeout, $log, $ionicHistory, configService, profileService, fingerprintService, walletService, platformInfo, externalLinkService, gettextCatalog) {
var wallet; var wallet;
var walletId; var walletId;
@ -58,6 +58,16 @@ angular.module('copayApp.controllers').controller('preferencesController',
} }
}; };
$scope.openWikiSpendingPassword = function() {
var url = 'https://github.com/bitpay/copay/wiki/COPAY---FAQ#what-the-spending-password-does';
var optIn = true;
var title = null;
var message = gettextCatalog.getString('Read more in our Wiki');
var okText = gettextCatalog.getString('Open');
var cancelText = gettextCatalog.getString('Go Back');
externalLinkService.open(url, optIn, title, message, okText, cancelText);
};
$scope.touchIdChange = function() { $scope.touchIdChange = function() {
var newStatus = $scope.touchIdEnabled.value; var newStatus = $scope.touchIdEnabled.value;
walletService.setTouchId(wallet, !!newStatus, function(err) { walletService.setTouchId(wallet, !!newStatus, function(err) {

View file

@ -34,6 +34,9 @@
width: 20px; width: 20px;
} }
} }
a {
cursor: pointer;
}
} }
&-explanation, &-button-group { &-explanation, &-button-group {
padding: 0 1rem; padding: 0 1rem;

View file

@ -13,7 +13,7 @@
</ion-toggle> </ion-toggle>
<div class="comment" translate> <div class="comment" translate>
Enable Bitcoin Cash wallet creation and operation within the App. Enable Bitcoin Cash wallet creation and operation within the App.
<a ng-click="learnMore()">Learn more</a> <a ng-click="openBitcoinCashWeb()">Learn more</a>
</div> </div>

View file

@ -44,10 +44,11 @@
<div class="comment"> <div class="comment">
<span translate> <span translate>
If enabled, all sensitive information (private key and recovery phrase) and actions (spending and exporting) associated with this wallet will be protected. If enabled, all sensitive information (private key and recovery phrase) and actions (spending and exporting) associated with this wallet will be protected.
<a ng-click="openWikiSpendingPassword()">Learn more</a>
</span> </span>
<span class="text-light assertive" ng-show="wallet.needsBackup" translate> <div class="text-light assertive" ng-show="wallet.needsBackup" translate>
Complete the backup process to use this option Complete the backup process to use this option
</span> </div>
</div> </div>
</div> </div>
<div ng-show="wallet.canSign() && touchIdAvailable"> <div ng-show="wallet.canSign() && touchIdAvailable">