diff --git a/index.html b/index.html
index e32a64b97..f08af7079 100644
--- a/index.html
+++ b/index.html
@@ -38,8 +38,6 @@
+
diff --git a/js/controllers/backup.js b/js/controllers/backup.js
index 6a986f21a..df14062c7 100644
--- a/js/controllers/backup.js
+++ b/js/controllers/backup.js
@@ -1,14 +1,8 @@
'use strict';
angular.module('copayApp.controllers').controller('BackupController',
- function($scope, $rootScope, $location, $window, $timeout, $modal, backupService, walletFactory, controllerUtils) {
+ function($scope, $rootScope, backupService, walletFactory, controllerUtils) {
- $scope.backup = function() {
- var w = $rootScope.wallet;
- w.setBackupReady();
- backupService.download(w);
- };
-
$scope.downloadBackup = function() {
var w = $rootScope.wallet;
backupService.download(w);
diff --git a/js/controllers/copayers.js b/js/controllers/copayers.js
new file mode 100644
index 000000000..c6a9c2c54
--- /dev/null
+++ b/js/controllers/copayers.js
@@ -0,0 +1,21 @@
+'use strict';
+
+angular.module('copayApp.controllers').controller('CopayersController',
+ function($scope, $rootScope, $location, backupService) {
+
+ $scope.backup = function() {
+ var w = $rootScope.wallet;
+ w.setBackupReady();
+ backupService.download(w);
+ };
+
+ $scope.downloadBackup = function() {
+ var w = $rootScope.wallet;
+ backupService.download(w);
+ }
+
+ $scope.goToWallet = function() {
+ $location.path('/addresses');
+ };
+
+ });
diff --git a/js/routes.js b/js/routes.js
index 96404b25c..3f7308341 100644
--- a/js/routes.js
+++ b/js/routes.js
@@ -26,6 +26,10 @@ angular
templateUrl: 'views/setup.html',
validate: false
})
+ .when('/copayers', {
+ templateUrl: 'views/copayers.html',
+ validate: true
+ })
.when('/addresses', {
templateUrl: 'views/addresses.html',
validate: true
@@ -74,6 +78,9 @@ angular
if ((!$rootScope.wallet || !$rootScope.wallet.id) && next.validate) {
$location.path('/');
}
+ if ($rootScope.wallet && !$rootScope.wallet.isReady()) {
+ $location.path('/copayers');
+ }
}
});
})
diff --git a/views/includes/copayers.html b/views/copayers.html
similarity index 90%
rename from views/includes/copayers.html
rename to views/copayers.html
index 77446a47d..c6d7c3434 100644
--- a/views/includes/copayers.html
+++ b/views/copayers.html
@@ -1,7 +1,8 @@
-
-
-
-

+
+
+
+
+
@@ -44,7 +45,7 @@
class="waiting br100 no-video"
ng-if="!hasVideo(copayer)"
src="./img/satoshi.gif"
- alt="{{copayer.nick}}"
+ alt="Waiting Copayer"
width="70">
@@ -60,7 +61,7 @@