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..358037fb7 100644 --- a/js/models/core/Wallet.js +++ b/js/models/core/Wallet.js @@ -86,6 +86,9 @@ 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; + this.paymentRequests = opts.paymentRequests || {}; //network nonces are 8 byte buffers, representing a big endian number @@ -910,6 +913,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 +2430,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); return ret; }; diff --git a/views/copayers.html b/views/copayers.html index ddd2a02a5..a9c7427f9 100644 --- a/views/copayers.html +++ b/views/copayers.html @@ -75,17 +75,6 @@ - - -