diff --git a/public/views/export.html b/public/views/export.html index 170e1b95e..db852af1d 100644 --- a/public/views/export.html +++ b/public/views/export.html @@ -35,7 +35,7 @@ -
+
+ +
+ + + + WARNING: The private key of this wallet is not available. The export allows to check the wallet balance, transaction history, and create spend proposals from the export. However, does not allow to approve (sign) proposals, so funds will not be accessible from the export. + + +
+ +
- WARNING: Not including the private key allows to check the wallet balance, transaction history, and create spend proposals from the export. However, does not allow to approve (sign) proposals, so funds will not be accessable from the export. + WARNING: Not including the private key allows to check the wallet balance, transaction history, and create spend proposals from the export. However, does not allow to approve (sign) proposals, so funds will not be accessible from the export.
diff --git a/src/js/controllers/join.js b/src/js/controllers/join.js index 9a66b61e2..6561f4af2 100644 --- a/src/js/controllers/join.js +++ b/src/js/controllers/join.js @@ -153,10 +153,9 @@ angular.module('copayApp.controllers').controller('joinController', var opts = { secret: form.secret.$modelValue, - myName: form.myName.$modelValue - extendedPrivateKey: form.privateKey.$modelValue, - myName: form.myName.$modelValue + myName: form.myName.$modelValue, } + var setSeed = form.setSeed.$modelValue; if (setSeed) { opts.mnemonic = form.privateKey.$modelValue; @@ -170,23 +169,17 @@ angular.module('copayApp.controllers').controller('joinController', return; } - if (form.hwLedger.$modelValue) { self.ledger = true; - ledger.getXPubKey($scope.externalIndex, function(data) { + ledger.getInfoForNewWallet($scope.externalIndex, function(err, lopts) { self.ledger = false; - $scope.$apply(); - if (data.success) { - opts.extendedPublicKey = data.xpubkey; - opts.externalSource = 'ledger'; - opts.externalIndex = $scope.externalIndex; - self._join(opts); - } else { - self.loading = false; - $log.debug(data.message); - self.error = data.message; + if (err) { + self.error = err; $scope.$apply(); + return; } + opts = lodash.assign(lopts, opts); + self._join(opts); }); } else { self._join(opts);