diff --git a/public/views/create.html b/public/views/create.html
index 79f17bf97..45acdd3c6 100644
--- a/public/views/create.html
+++ b/public/views/create.html
@@ -22,7 +22,7 @@
-
+
Connecting to {{create.hwWallet}} Wallet...
+
Please accept to export two public keys from the Trezor app
diff --git a/public/views/join.html b/public/views/join.html
index 30f8e9891..3b3d97398 100644
--- a/public/views/join.html
+++ b/public/views/join.html
@@ -20,7 +20,7 @@
-
+
Connecting to {{join.hwWallet}} Wallet...
+
Please accept to export two public keys from the Trezor app
@@ -98,12 +99,9 @@
diff --git a/src/js/controllers/index.js b/src/js/controllers/index.js
index 26154dd1b..a4bc2e2a2 100644
--- a/src/js/controllers/index.js
+++ b/src/js/controllers/index.js
@@ -92,6 +92,7 @@ angular.module('copayApp.controllers').controller('indexController', function($r
self.setSpendUnconfirmed();
$timeout(function() {
+ $rootScope.$apply();
self.hasProfile = true;
self.noFocusedWallet = false;
self.onGoingProcess = {};
@@ -141,7 +142,7 @@ angular.module('copayApp.controllers').controller('indexController', function($r
var defaults = configService.getDefaults();
var config = configService.getSync();
- self.usingCustomBWS = config.bwsFor && (config.bwsFor[self.walletId] != defaults.bws.url);
+ self.usingCustomBWS = config.bwsFor && config.bwsFor[self.walletId] && (config.bwsFor[self.walletId] != defaults.bws.url);
};
self.setTab = function(tab, reset, tries, switchState) {
diff --git a/src/js/controllers/join.js b/src/js/controllers/join.js
index 8ab7386f2..2c5227ecf 100644
--- a/src/js/controllers/join.js
+++ b/src/js/controllers/join.js
@@ -7,6 +7,7 @@ angular.module('copayApp.controllers').controller('joinController',
var defaults = configService.getDefaults();
$scope.bwsurl = defaults.bws.url;
$scope.derivationPath = derivationPathHelper.default;
+ $scope.account = 1;
this.onQrCodeScanned = function(data) {
$scope.secret = data;
@@ -43,7 +44,6 @@ angular.module('copayApp.controllers').controller('joinController',
this.setSeedSource = function(src) {
self.seedSourceId = $scope.seedSource.id;
- self.accountValues = lodash.range(1, 100);
$timeout(function() {
$rootScope.$apply();
@@ -55,7 +55,6 @@ angular.module('copayApp.controllers').controller('joinController',
self.error = gettext('Please enter the required fields');
return;
}
- self.loading = true;
var opts = {
secret: form.secret.$modelValue,
@@ -120,6 +119,7 @@ angular.module('copayApp.controllers').controller('joinController',
};
this._join = function(opts) {
+ self.loading = true;
$timeout(function() {
profileService.joinWallet(opts, function(err) {
if (err) {