diff --git a/js/controllers/import.js b/js/controllers/import.js index c64bea1c6..82ee02fe9 100644 --- a/js/controllers/import.js +++ b/js/controllers/import.js @@ -7,10 +7,7 @@ angular.module('copayApp.controllers').controller('ImportController', $scope.title = 'Import a backup'; $scope.importStatus = 'Importing wallet - Reading backup...'; - var s = ($location.search()).skip; - if (s) { - $scope.skipFields = s.split(','); - } + $scope.hideAdv=true; var reader = new FileReader(); @@ -24,9 +21,20 @@ angular.module('copayApp.controllers').controller('ImportController', updateStatus('Importing wallet - Setting things up...'); var w, errMsg; + var skipFields = []; + if ($scope.skipPublicKeyRing) + skipFields.push('publicKeyRing'); + + if ($scope.skipTxProposals) + skipFields.push('txProposals'); + + if ($scope.skipPrivateKey) + skipFields.push('privateKey'); + +console.log('[import.js.36:skipFields:]',skipFields); //TODO // try to import encrypted wallet with passphrase try { - w = walletFactory.import(encryptedObj, passphrase, $scope.skipFields); + w = walletFactory.import(encryptedObj, passphrase, skipFields); } catch (e) { errMsg = e.message; } diff --git a/views/import.html b/views/import.html index da2dabc00..58984695e 100644 --- a/views/import.html +++ b/views/import.html @@ -17,11 +17,34 @@
Choose backup file from your computer + + + + + + + Show + Hide + advanced options + + + +
+ + + + + +
+ +
- - - -
Skipping fields: {{skipFields}} diff --git a/views/more.html b/views/more.html index 4b376c38c..930232624 100644 --- a/views/more.html +++ b/views/more.html @@ -18,7 +18,7 @@

- + Show Hide advanced options