diff --git a/js/controllers/join.js b/js/controllers/join.js index bfc09fb8a..41ee28f36 100644 --- a/js/controllers/join.js +++ b/js/controllers/join.js @@ -1,9 +1,9 @@ 'use strict'; angular.module('copayApp.controllers').controller('JoinController', - function($scope, $rootScope, $timeout, $location, walletFactory, controllerUtils, Passphrase, notification) { - + function($scope, $rootScope, $timeout, walletFactory, controllerUtils, Passphrase, notification) { controllerUtils.redirIfLogged(); + $rootScope.fromSetup = false; $scope.loading = false; // QR code Scanner diff --git a/js/controllers/open.js b/js/controllers/open.js index 5efd96e16..28464262d 100644 --- a/js/controllers/open.js +++ b/js/controllers/open.js @@ -9,6 +9,7 @@ angular.module('copayApp.controllers').controller('OpenController', v2 = o2.show.toLowerCase(); return v1 > v2 ? 1 : (v1 < v2) ? -1 : 0; }; + $rootScope.fromSetup = false; $scope.loading = false; $scope.wallets = walletFactory.getWallets().sort(cmp); $scope.selectedWalletId = walletFactory.storage.getLastOpened() || ($scope.wallets[0] && $scope.wallets[0].id); diff --git a/js/controllers/setup.js b/js/controllers/setup.js index f14dafdb7..ee9d48d33 100644 --- a/js/controllers/setup.js +++ b/js/controllers/setup.js @@ -36,6 +36,7 @@ angular.module('copayApp.controllers').controller('SetupController', function($scope, $rootScope, $location, $timeout, walletFactory, controllerUtils, Passphrase, backupService, notification) { controllerUtils.redirIfLogged(); + $rootScope.fromSetup = true; $rootScope.videoInfo = {}; $scope.loading = false; $scope.walletPassword = $rootScope.walletPassword; diff --git a/views/copayers.html b/views/copayers.html index a20294192..06e185395 100644 --- a/views/copayers.html +++ b/views/copayers.html @@ -8,6 +8,7 @@
+ Step 3

Waiting copayers

Share this secret with your other copayers

diff --git a/views/setup.html b/views/setup.html index 99ee4c25c..0428a4944 100644 --- a/views/setup.html +++ b/views/setup.html @@ -12,6 +12,8 @@
+ Step 1 + Step 2

Create new wallet