diff --git a/public/views/join.html b/public/views/join.html index 3ec49f38a..3a28c3488 100644 --- a/public/views/join.html +++ b/public/views/join.html @@ -141,6 +141,16 @@ + +
+ +
Multiple accounts can be derived from the same seed. Specify which account to use
+
+ + diff --git a/src/js/controllers/create.js b/src/js/controllers/create.js index 8949dcb77..4c9fd49ca 100644 --- a/src/js/controllers/create.js +++ b/src/js/controllers/create.js @@ -123,6 +123,7 @@ angular.module('copayApp.controllers').controller('createController', this.error = gettext('Please select account'); return; } + opts.account = account; self.hwWallet = self.seedSourceId == 'ledger' ? 'Ledger' : 'Trezor'; var src = self.seedSourceId == 'ledger' ? ledger : trezor; diff --git a/src/js/controllers/join.js b/src/js/controllers/join.js index 66c8cb331..8fa30f43a 100644 --- a/src/js/controllers/join.js +++ b/src/js/controllers/join.js @@ -6,6 +6,8 @@ angular.module('copayApp.controllers').controller('joinController', var self = this; var defaults = configService.getDefaults(); $scope.bwsurl = defaults.bws.url; + self.accountValuesForSeed = lodash.range(0, 100); + $scope.accountForSeed = 0; this.onQrCodeScanned = function(data) { $scope.secret = data; @@ -55,7 +57,8 @@ angular.module('copayApp.controllers').controller('joinController', var opts = { secret: form.secret.$modelValue, myName: form.myName.$modelValue, - bwsurl: $scope.bwsurl + bwsurl: $scope.bwsurl, + account: $scope.accountForSeed || 0, } var setSeed = self.seedSourceId =='set'; @@ -82,6 +85,7 @@ angular.module('copayApp.controllers').controller('joinController', this.error = gettext('Please select account'); return; } + opts.account = account; self.hwWallet = self.seedSourceId == 'ledger' ? 'Ledger' : 'Trezor'; var src = self.seedSourceId == 'ledger' ? ledger : trezor; diff --git a/src/js/services/profileService.js b/src/js/services/profileService.js index 7d5cfc2d9..8382316e6 100644 --- a/src/js/services/profileService.js +++ b/src/js/services/profileService.js @@ -186,11 +186,10 @@ angular.module('copayApp.services') // 1) { - walletClient.credentials.derivationStrategy == + //walletClient.credentials.derivationStrategy == } - // Nasty> - } + } catch (ex) { $log.info(ex); return cb(gettext('Could not create: Invalid wallet seed'));