From 076d4c20cf607bb95957c56d2d256b09c959b660 Mon Sep 17 00:00:00 2001
From: Ivan Socolsky <jungans@gmail.com>
Date: Fri, 31 Oct 2014 12:03:37 -0300
Subject: [PATCH 1/3] fixed bug in controllerUtils#isFocusedWallet

---
 js/services/controllerUtils.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/js/services/controllerUtils.js b/js/services/controllerUtils.js
index c04481eea..b371bd332 100644
--- a/js/services/controllerUtils.js
+++ b/js/services/controllerUtils.js
@@ -64,7 +64,7 @@ angular.module('copayApp.services')
 
 
     root.isFocusedWallet = function(wid) {
-      return wid === $rootScope.wallet.getId();
+      return $rootScope.wallet && wid === $rootScope.wallet.getId();
     };
 
 

From 69153757fb1e96e18cd6179e101afc8e8777b85f Mon Sep 17 00:00:00 2001
From: Ivan Socolsky <jungans@gmail.com>
Date: Fri, 31 Oct 2014 12:17:28 -0300
Subject: [PATCH 2/3] refreshing txs when switching wallets

---
 js/controllers/sidebar.js | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/js/controllers/sidebar.js b/js/controllers/sidebar.js
index 66e2034d0..8b659f3bb 100644
--- a/js/controllers/sidebar.js
+++ b/js/controllers/sidebar.js
@@ -67,12 +67,13 @@ angular.module('copayApp.controllers').controller('SidebarController', function(
       if (controllerUtils.isFocusedWallet(wid)) return;
       var w = $rootScope.iden.getWalletById(wid);
       $scope.wallets.push(w);
-      controllerUtils.updateBalance(w, function(err, res) {
-        if (err) return;
-        setTimeout(function() {
-          $scope.$digest();
-        }, 1);
-      });
+      controllerUtils.updateTxsAndBalance(w);
+      // controllerUtils.updateBalance(w, function(err, res) {
+      //   if (err) return;
+      //   setTimeout(function() {
+      //     $scope.$digest();
+      //   }, 1);
+      // });
     });
   };
 });

From acb6592dc454ec4979365a2ba407ca9428cab63f Mon Sep 17 00:00:00 2001
From: Ivan Socolsky <jungans@gmail.com>
Date: Fri, 31 Oct 2014 12:20:46 -0300
Subject: [PATCH 3/3] removed unused code

---
 js/controllers/sidebar.js | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/js/controllers/sidebar.js b/js/controllers/sidebar.js
index 8b659f3bb..576618b8f 100644
--- a/js/controllers/sidebar.js
+++ b/js/controllers/sidebar.js
@@ -68,12 +68,6 @@ angular.module('copayApp.controllers').controller('SidebarController', function(
       var w = $rootScope.iden.getWalletById(wid);
       $scope.wallets.push(w);
       controllerUtils.updateTxsAndBalance(w);
-      // controllerUtils.updateBalance(w, function(err, res) {
-      //   if (err) return;
-      //   setTimeout(function() {
-      //     $scope.$digest();
-      //   }, 1);
-      // });
     });
   };
 });