From fb05586c32289ae95f707011d22c3c63b3cae433 Mon Sep 17 00:00:00 2001
From: Matias Alejo Garcia <ematiu@gmail.com>
Date: Tue, 9 Sep 2014 15:53:47 -0300
Subject: [PATCH] fix addr

---
 js/models/core/Wallet.js       |  1 -
 js/services/controllerUtils.js | 23 ++---------------------
 2 files changed, 2 insertions(+), 22 deletions(-)

diff --git a/js/models/core/Wallet.js b/js/models/core/Wallet.js
index 693eabe51..1b35a85ba 100644
--- a/js/models/core/Wallet.js
+++ b/js/models/core/Wallet.js
@@ -653,7 +653,6 @@ Wallet.prototype._setBlockchainListeners = function() {
   this.blockchain.on('disconnect', self.emit.bind(self,'networkError'));
 
   this.blockchain.on('tx', function(tx) {
-console.log('[Wallet.js.655:tx:]',tx); //TODO
     self.emit('tx', tx.address);
   });
 
diff --git a/js/services/controllerUtils.js b/js/services/controllerUtils.js
index 50f802b0f..5d21778b6 100644
--- a/js/services/controllerUtils.js
+++ b/js/services/controllerUtils.js
@@ -144,26 +144,6 @@ angular.module('copayApp.services')
           notification.info('New Transaction', ($rootScope.txAlertCount == 1) ? 'You have a pending transaction proposal' : 'You have ' + $rootScope.txAlertCount + ' pending transaction proposals', txAlertCount);
         }
       });
-
-
-      $rootScope.$watch('receivedFund', function(receivedFund) {
-        if (receivedFund) {
-          var currentAddr;
-          for (var i = 0; i < $rootScope.addrInfos.length; i++) {
-            var addrinfo = $rootScope.addrInfos[i];
-            if (addrinfo.address.toString() == receivedFund[1] && !addrinfo.isChange) {
-              currentAddr = addrinfo.address.toString();
-              break;
-            }
-          }
-          if (currentAddr) {
-            //var beep = new Audio('sound/transaction.mp3');
-            notification.funds('Received fund', currentAddr, receivedFund);
-            //beep.play();
-          }
-        }
-      });
-
     };
 
 
@@ -175,6 +155,7 @@ angular.module('copayApp.services')
       w.netStart();
     };
 
+    // TODO movie this to wallet
     root.updateAddressList = function() {
       var w = $rootScope.wallet;
       if (w && w.isReady())
@@ -293,9 +274,9 @@ angular.module('copayApp.services')
       });
     }
 
+    // TODO Move this to wallet model!
     root.updateGlobalAddresses = function() {
       if (!$rootScope.wallet) return;
-
       root.updateAddressList();
       var currentAddrs = $rootScope.wallet.blockchain.getSubscriptions();
       var allAddrs = $rootScope.addrInfos;