diff --git a/css/src/main.css b/css/src/main.css index bea1ac145..16d4d0d2a 100644 --- a/css/src/main.css +++ b/css/src/main.css @@ -1046,7 +1046,7 @@ a.text-warning:hover {color: #FD7262;} background: #2C3E50; -moz-box-shadow: 0px 0px 0px 0px rgba(255,255,255,0.09), inset 0px 0px 2px 0px rgba(0,0,0,0.20); box-shadow: 0px 0px 0px 0px rgba(255,255,255,0.09), inset 0px 0px 2px 0px rgba(0,0,0,0.20); - margin-bottom: 5px; + margin-bottom: 15px; } .box-setup-copay-required { diff --git a/js/controllers/copayers.js b/js/controllers/copayers.js index fc140593b..57573b4d0 100644 --- a/js/controllers/copayers.js +++ b/js/controllers/copayers.js @@ -5,6 +5,12 @@ angular.module('copayApp.controllers').controller('CopayersController', $scope.hideAdv = true; + + $scope.skipBackup = function() { + var w = $rootScope.wallet; + w.setBackupReady(true); + }; + $scope.backup = function() { var w = $rootScope.wallet; w.setBackupReady(); diff --git a/js/controllers/import.js b/js/controllers/import.js index e52f77e86..c186ad0da 100644 --- a/js/controllers/import.js +++ b/js/controllers/import.js @@ -2,12 +2,11 @@ angular.module('copayApp.controllers').controller('ImportController', function($scope, $rootScope, $location, walletFactory, controllerUtils, Passphrase, notification) { - controllerUtils.redirIfLogged(); $scope.title = 'Import a backup'; $scope.importStatus = 'Importing wallet - Reading backup...'; - $scope.hideAdv=true; + $scope.hideAdv = true; var reader = new FileReader(); @@ -59,7 +58,7 @@ angular.module('copayApp.controllers').controller('ImportController', $rootScope.wallet = w; controllerUtils.startNetwork($rootScope.wallet, $scope); }); - + }); }; @@ -105,6 +104,6 @@ angular.module('copayApp.controllers').controller('ImportController', if (backupFile) { reader.readAsBinaryString(backupFile); - } + } }; }); diff --git a/js/models/core/Wallet.js b/js/models/core/Wallet.js index 411c550d1..6b91a8b0d 100644 --- a/js/models/core/Wallet.js +++ b/js/models/core/Wallet.js @@ -86,6 +86,13 @@ function Wallet(opts) { this.lastTimestamp = opts.lastTimestamp || undefined; this.lastMessageFrom = {}; + //to avoid confirmation of copayer's backups if is imported from a file + this.isImported = opts.isImported || false; + + + //to avoid waiting others copayers to make a backup and login immediatly + this.forcedLogin = opts.forcedLogin || false; + this.paymentRequests = opts.paymentRequests || {}; //network nonces are 8 byte buffers, representing a big endian number @@ -910,6 +917,7 @@ Wallet.fromObj = function(o, storage, network, blockchain) { opts.storage = storage; opts.network = network; opts.blockchain = blockchain; + opts.isImported = true; return new Wallet(opts); }; @@ -2426,7 +2434,7 @@ Wallet.prototype.isShared = function() { * @return {boolean} */ Wallet.prototype.isReady = function() { - var ret = this.publicKeyRing.isComplete() && this.publicKeyRing.isFullyBackup(); + var ret = this.publicKeyRing.isComplete() && (this.publicKeyRing.isFullyBackup() || this.isImported || this.forcedLogin); return ret; }; @@ -2435,7 +2443,8 @@ Wallet.prototype.isReady = function() { * * Also backs up the wallet */ -Wallet.prototype.setBackupReady = function() { +Wallet.prototype.setBackupReady = function(forcedLogin) { + this.forcedLogin = forcedLogin; this.publicKeyRing.setBackupReady(); this.sendPublicKeyRing(); this.store(); diff --git a/views/copayers.html b/views/copayers.html index cbd00e805..090574f3e 100644 --- a/views/copayers.html +++ b/views/copayers.html @@ -51,6 +51,7 @@
+

Creating and storing a backup will allow to restore funds of the wallet

@@ -74,23 +75,7 @@
- -
-
- - Show - Hide - advanced options - -
- Delete wallet - | - Download seed backup -
-
- + + + Skip Backup + +