From ab9696fdd759c92d04c854828eae2b05fcb9b2b2 Mon Sep 17 00:00:00 2001
From: Matias Alejo Garcia <ematiu@gmail.com>
Date: Tue, 2 Dec 2014 17:38:31 -0300
Subject: [PATCH] fix import

---
 js/controllers/import.js       | 2 ++
 js/services/identityService.js | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/js/controllers/import.js b/js/controllers/import.js
index 6ee3bf798..c8481f078 100644
--- a/js/controllers/import.js
+++ b/js/controllers/import.js
@@ -81,6 +81,8 @@ angular.module('copayApp.controllers').controller('ImportController',
           if (err) {
             $scope.loading = false;
             $scope.error = 'Could not read wallet. Please check your password';
+            $rootScope.$digest();
+            return;
           }
           copay.Compatibility.deleteOldWallet(backupOldWallet);
         });
diff --git a/js/services/identityService.js b/js/services/identityService.js
index 49d77a26b..182e7162e 100644
--- a/js/services/identityService.js
+++ b/js/services/identityService.js
@@ -314,7 +314,7 @@ angular.module('copayApp.services')
     };
 
     root.importWallet = function(encryptedObj, pass, opts, cb) {
-      copay.Compatibility.importEncryptedWallet($rootScope.iden, encryptedObj, pass, opts);
+      copay.Compatibility.importEncryptedWallet($rootScope.iden, encryptedObj, pass, opts, cb);
     };
 
     root.joinWallet = function(opts, cb) {