From a393654cd59cbc5d839c60a3c3819abbb2328ab7 Mon Sep 17 00:00:00 2001
From: Yemel Jardi <angel.jardi@gmail.com>
Date: Thu, 5 Jun 2014 13:41:40 -0300
Subject: [PATCH 1/2] Add error message on wallet import while the wallet is
 already open

---
 js/controllers/import.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/js/controllers/import.js b/js/controllers/import.js
index 80292075a..13a891113 100644
--- a/js/controllers/import.js
+++ b/js/controllers/import.js
@@ -21,6 +21,10 @@ angular.module('copayApp.controllers').controller('ImportController',
         $rootScope.wallet = w;
 
         controllerUtils.startNetwork($rootScope.wallet);
+        $rootScope.wallet.on('connectionError', function() {
+          var message = "Looks like you are already connected to this wallet, please logout from it and try importing it again.";
+          $rootScope.$flashMessage = { message: message, type: 'error'};
+        });
       });
     };
 

From b83ac2be62d65096171ad0347f57734f892e8bc3 Mon Sep 17 00:00:00 2001
From: Yemel Jardi <angel.jardi@gmail.com>
Date: Thu, 5 Jun 2014 15:49:26 -0300
Subject: [PATCH 2/2] Formatting

---
 server.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server.js b/server.js
index 007162e39..f4fddb313 100644
--- a/server.js
+++ b/server.js
@@ -1,6 +1,6 @@
 var server = require('./app');
 var port   = process.env.PORT || 3000;
 
-server.start(port, function(loc){
+server.start(port, function(loc) {
   console.log('Listening at: ' + loc);
 });