From 8d826c9f5d0496f445caf7f8467810277c235234 Mon Sep 17 00:00:00 2001
From: Matias Alejo Garcia <ematiu@gmail.com>
Date: Fri, 24 Apr 2015 10:10:01 -0300
Subject: [PATCH 1/3] fix error message

---
 src/js/controllers/index.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/js/controllers/index.js b/src/js/controllers/index.js
index dd6c4b50d..23cb3ff97 100644
--- a/src/js/controllers/index.js
+++ b/src/js/controllers/index.js
@@ -573,7 +573,11 @@ angular.module('copayApp.controllers').controller('indexController', function($r
     } else if (err.code === 'ETIMEDOUT') {
       $log.debug('Time out:', err);
     } else {
-      self.clientError(err && err.message ? 'Error at Wallet Service:' + err.message : err);
+      var msg = 'Error at Wallet Service: ';
+      if (err.message) msg = msg + err.message;
+      else (err.error) msg = msg + err.error;
+      else msg = msg +  err;
+      self.clientError(msg);
     }
     $rootScope.$apply();
   });

From 968c7cc369fb885f4dd74285777f2df9234ca72e Mon Sep 17 00:00:00 2001
From: Matias Alejo Garcia <ematiu@gmail.com>
Date: Fri, 24 Apr 2015 11:02:43 -0300
Subject: [PATCH 2/3] rm unused functions

---
 src/js/services/legacyImportService.js | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/js/services/legacyImportService.js b/src/js/services/legacyImportService.js
index 1f04e7d69..de03c808e 100644
--- a/src/js/services/legacyImportService.js
+++ b/src/js/services/legacyImportService.js
@@ -1,6 +1,6 @@
 'use strict';
 angular.module('copayApp.services')
-  .factory('legacyImportService', function($rootScope, $log, $timeout, $http, lodash, bitcore, bwcService, sjcl, profileService) {
+  .factory('legacyImportService', function($rootScope, $log, $timeout, $http, lodash, bitcore, bwcService, sjcl, profileService, isChromeApp) {
 
     var root = {};
     var wc = bwcService.getClient();
@@ -126,8 +126,15 @@ angular.module('copayApp.services')
       };
 
       var localStorageGet = function(key, cb) {
-        var v = localStorage.getItem(key);
-        return cb(null, v);
+        if (isChromeApp) {
+          chrome.storage.local.get(key,
+            function(data) {
+              return cb(null, data[key]);
+            });
+        } else {
+          var v = localStorage.getItem(key);
+          return cb(null, v);
+        }
       };
 
       var get = fromCloud ? insightGet : localStorageGet;

From e2f0515c9ecae418898300b9192a3232fcf1bfe4 Mon Sep 17 00:00:00 2001
From: Matias Alejo Garcia <ematiu@gmail.com>
Date: Fri, 24 Apr 2015 14:46:09 -0300
Subject: [PATCH 3/3] fix err

---
 src/js/controllers/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/js/controllers/index.js b/src/js/controllers/index.js
index 23cb3ff97..5e9492787 100644
--- a/src/js/controllers/index.js
+++ b/src/js/controllers/index.js
@@ -575,7 +575,7 @@ angular.module('copayApp.controllers').controller('indexController', function($r
     } else {
       var msg = 'Error at Wallet Service: ';
       if (err.message) msg = msg + err.message;
-      else (err.error) msg = msg + err.error;
+      else if (err.error) msg = msg + err.error;
       else msg = msg +  err;
       self.clientError(msg);
     }