mirror of https://github.com/BTCPrivate/copay.git
fix toggle switch on export wallet
This commit is contained in:
parent
453b129892
commit
839344a0b5
|
@ -4,8 +4,6 @@
|
|||
ng-init="titleSection='Export'; goBackToState = 'preferencesAdvanced'">
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
<div class="content preferences" ng-controller="exportController as exportC">
|
||||
<h4></h4>
|
||||
<div ng-show="!exportC.backupWalletPlainText">
|
||||
|
@ -19,7 +17,6 @@
|
|||
<div class="text-warning size-14 m20b" ng-show="exportC.isEncrypted">
|
||||
<i class="fi-alert size-12"></i>
|
||||
<span translate> A spending password is set for this wallet. Exporting keeps the spending password in the export archive.</span>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
@ -29,16 +26,12 @@
|
|||
<div class="columns">
|
||||
<label for="password" translate>Set up a password </label>
|
||||
<div class="input">
|
||||
<input type="password" class="form-control"
|
||||
placeholder="{{'Your password'|translate}}"
|
||||
name="password" ng-model="exportC.password">
|
||||
<input type="password" class="form-control" placeholder="{{'Your password'|translate}}" name="password" ng-model="exportC.password">
|
||||
</div>
|
||||
|
||||
<label for="password" translate>Repeat the password</label>
|
||||
<div class="input">
|
||||
<input type="password" class="form-control"
|
||||
placeholder="{{'Repeat password'|translate}}"
|
||||
name="password" ng-model="exportC.repeatpassword">
|
||||
<input type="password" class="form-control" placeholder="{{'Repeat password'|translate}}" name="password" ng-model="exportC.repeatpassword">
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
@ -46,20 +39,13 @@
|
|||
|
||||
<h4></h4>
|
||||
|
||||
<ul class="no-bullet m0">
|
||||
<li>
|
||||
<switch id="no-metaData" name="metaData" ng-model="metaData" class="green right"></switch>
|
||||
<span translate>Include address book and history cache</span>
|
||||
</li>
|
||||
</ul>
|
||||
|
||||
<ul class="no-bullet m0" ng-show="index.canSign">
|
||||
<li>
|
||||
<switch id="no-sign" name="noSign" ng-model="noSign" class="green right"></switch>
|
||||
<span translate>Do not include private key</span>
|
||||
</li>
|
||||
</ul>
|
||||
<ion-toggle ng-model="metaDataEnabled" toggle-class="toggle-balanced" class="r0" ng-change="metaDataChange()">
|
||||
<span class="toggle-label" translate>Include address book and history cache</span>
|
||||
</ion-toggle>
|
||||
|
||||
<ion-toggle ng-model="noSignEnabled" toggle-class="toggle-balanced" class="r0" ng-change="noSignChange()">
|
||||
<span class="toggle-label" translate>Do not include private key</span>
|
||||
</ion-toggle>
|
||||
|
||||
<div class="box-notification" ng-show="!index.canSign">
|
||||
<span class="text-warning size-14">
|
||||
|
@ -80,7 +66,6 @@
|
|||
</span>
|
||||
</div>
|
||||
|
||||
|
||||
<div class="row">
|
||||
<div class="columns">
|
||||
<button class="black round expand m20t" ng-click="exportC.downloadWalletBackup()"
|
||||
|
@ -106,7 +91,7 @@
|
|||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
</div>
|
||||
|
||||
<div class="row" ng-show="exportC.backupWalletPlainText">
|
||||
|
|
|
@ -20,10 +20,14 @@
|
|||
background-color: transparent !important;
|
||||
margin-top: -25px;
|
||||
padding-bottom: 30px;
|
||||
right: -27px !important;
|
||||
right: -25px !important;
|
||||
border-width: 0px;
|
||||
}
|
||||
|
||||
.r0 {
|
||||
right: 0px !important;
|
||||
}
|
||||
|
||||
.item-toggle .toggle {
|
||||
right: 28px;
|
||||
}
|
||||
|
|
|
@ -8,18 +8,25 @@ angular.module('copayApp.controllers').controller('exportController',
|
|||
|
||||
self.error = null;
|
||||
self.success = null;
|
||||
$scope.metaData = true;
|
||||
$scope.metaDataEnabled = true;
|
||||
var fc = profileService.focusedClient;
|
||||
self.isEncrypted = fc.isPrivKeyEncrypted();
|
||||
|
||||
$scope.metaDataChange = function() {
|
||||
console.log($scope.metaDataEnabled);
|
||||
};
|
||||
$scope.noSignChange = function() {
|
||||
console.log($scope.noSignEnabled);
|
||||
};
|
||||
|
||||
self.downloadWalletBackup = function() {
|
||||
self.getMetaData($scope.metaData, function(err, txsFromLocal, localAddressBook) {
|
||||
self.getMetaData($scope.metaDataEnabled, function(err, txsFromLocal, localAddressBook) {
|
||||
if (err) {
|
||||
self.error = true;
|
||||
return;
|
||||
}
|
||||
var opts = {
|
||||
noSign: $scope.noSign,
|
||||
noSign: $scope.noSignEnabled,
|
||||
historyCache: txsFromLocal,
|
||||
addressBook: localAddressBook
|
||||
};
|
||||
|
@ -29,7 +36,6 @@ angular.module('copayApp.controllers').controller('exportController',
|
|||
self.error = true;
|
||||
return;
|
||||
}
|
||||
|
||||
$rootScope.$emit('Local/BackupDone');
|
||||
notification.success(gettext('Success'), gettext('Encrypted export file saved'));
|
||||
go.walletHome();
|
||||
|
@ -83,13 +89,13 @@ angular.module('copayApp.controllers').controller('exportController',
|
|||
}
|
||||
|
||||
self.getBackup = function(cb) {
|
||||
self.getMetaData($scope.metaData, function(err, txsFromLocal, localAddressBook) {
|
||||
self.getMetaData($scope.metaDataEnabled, function(err, txsFromLocal, localAddressBook) {
|
||||
if (err) {
|
||||
self.error = true;
|
||||
return cb(null);
|
||||
}
|
||||
var opts = {
|
||||
noSign: $scope.noSign,
|
||||
noSign: $scope.noSignEnabled,
|
||||
historyCache: txsFromLocal,
|
||||
addressBook: localAddressBook
|
||||
};
|
||||
|
@ -139,7 +145,7 @@ angular.module('copayApp.controllers').controller('exportController',
|
|||
var ew = backup;
|
||||
if (!ew) return;
|
||||
|
||||
if ($scope.noSign)
|
||||
if ($scope.noSignEnabled)
|
||||
name = name + '(No Private Key)';
|
||||
|
||||
var subject = 'Copay Wallet Backup: ' + name;
|
||||
|
|
Loading…
Reference in New Issue