From 2fbd075206d4282019ceef99d5fe40a9f8b5fd56 Mon Sep 17 00:00:00 2001
From: Matias Alejo Garcia <ematiu@gmail.com>
Date: Mon, 21 Apr 2014 13:16:15 -0300
Subject: [PATCH] available address

---
 index.html                     |  4 ++--
 js/controllers/header.js       |  6 +-----
 js/controllers/transactions.js |  5 ++---
 js/services/controllerUtils.js | 38 ++++++++++++++--------------------
 4 files changed, 21 insertions(+), 32 deletions(-)

diff --git a/index.html b/index.html
index cb440eeab..f437762e3 100644
--- a/index.html
+++ b/index.html
@@ -214,13 +214,13 @@
     <script type="text/ng-template" id="addresses.html">
       <div class="addresses" data-ng-controller="AddressesController">
         <div ng-show='$root.wallet.publicKeyRing.isComplete()'>
-        <h3>Address</h3>
+        <h3>Addresses (available to spend)</h3>
         <div class="row">
           <div class="large-6 columns">
             <a class="panel db" ng-repeat="addr in addrs" ng-click="selectAddr(addr)">{{addr}}
 
  <span ng-if="!isMain[addr]">(change)</span>
- <span class="right">{{balanceByAddr[addr] || 0}} <i class="fi-bitcoin"></i></span></a>
+ <span class="right">({{balanceByAddr[addr] || 0}} <i class="fi-bitcoin"></i>)</span></a>
            
           </div>
           <div class="large-3 columns line-dashed-v text-center">
diff --git a/js/controllers/header.js b/js/controllers/header.js
index ac800178f..3334762c3 100644
--- a/js/controllers/header.js
+++ b/js/controllers/header.js
@@ -27,11 +27,7 @@ angular.module('copay.header').controller('HeaderController',
     $rootScope.$watch('wallet', function(wallet) {
       if (wallet) {
         controllerUtils.setSocketHandlers();
-        $rootScope.wallet.getBalance(function(balance) {
-          $rootScope.$apply(function() {
-            $rootScope.totalBalance = balance;
-          });
-        });
+        controllerUtils.updateBalance();
       }
     });
 
diff --git a/js/controllers/transactions.js b/js/controllers/transactions.js
index e849022f5..d4356a62a 100644
--- a/js/controllers/transactions.js
+++ b/js/controllers/transactions.js
@@ -4,9 +4,6 @@ var bitcore = require('bitcore');
 angular.module('copay.transactions').controller('TransactionsController',
   function($scope, $rootScope, $location) {
     $scope.title = 'Transactions';
-
-    $scope.oneAtATime = true;
-
     var _updateTxs = function() {
 console.log('[transactions.js.10:_updateTxs:]'); //TODO
       var w   =$rootScope.wallet;
@@ -32,6 +29,7 @@ console.log('[transactions.js.10:_updateTxs:]'); //TODO
         i.missingSignatures = tx.countInputMissingSignatures(0);
         txs.push(i);
       });
+console.log('[transactions.js.35:txs:]',txs); //TODO
       $scope.txs = txs;
       w.removeListener('txProposalsUpdated',_updateTxs)
       w.once('txProposalsUpdated',_updateTxs);
@@ -69,4 +67,5 @@ console.log('[transactions.js.68:txid:] SENTTX CALLBACK',txid); //TODO
       }
     };
 
+    _updateTxs();
   });
diff --git a/js/services/controllerUtils.js b/js/services/controllerUtils.js
index 13604c1ef..a803c7436 100644
--- a/js/services/controllerUtils.js
+++ b/js/services/controllerUtils.js
@@ -27,33 +27,34 @@ angular.module('copay.controllerUtils').factory('controllerUtils', function ($ro
     });
 
     w.on('created', function() {
-console.log('[controllerUtils.js.30:created:] RECV '); //TODO
       $location.path('peer');
       $rootScope.wallet = w;
-      
-      $rootScope.wallet.getBalance(false,function(balance) {
-        $rootScope.totalBalance = balance;
-      });
-      $rootScope.wallet.getBalance(true,function(balance) {
-        $rootScope.availableBalance = balance;
-      });
-
+      root.updateBalance();
     });
     w.on('refresh', function() {
       console.log('[controllerUtils.js] Refreshing'); //TODO
-      $rootScope.$digest();
+      root.updateBalance();
     });
     w.on('openError', root.onErrorDigest);
     w.on('close', root.onErrorDigest);
-
-console.log('[controllerUtils.js.45] CALLING NETSTART FROM setupUxHandlers'); //TODO
     w.netStart();
-console.log('[controllerUtils.js.45] setupUxHandlers END'); //TODO
+  };
+
+  root.updateBalance = function() {
+    var w = $rootScope.wallet;
+    w.getBalance(false,function(balance, balanceByAddr) {
+      $rootScope.totalBalance = balance;
+      $rootScope.balanceByAddr = balanceByAddr;
+      console.log('New balance:', balance);
+      w.getBalance(true,function(balance) {
+        $rootScope.availableBalance = balance;
+        $rootScope.$digest();
+      });
+    });
   };
 
   root.setSocketHandlers = function() {
     Socket.removeAllListeners();
-    var w = $rootScope.wallet;
 
     var addrs = $rootScope.wallet.getAddressesStr();
     for(var i = 0; i < addrs.length; i++) {
@@ -64,14 +65,7 @@ console.log('[controllerUtils.js.45] setupUxHandlers END'); //TODO
     addrs.forEach(function(addr) {
       Socket.on(addr, function(txid) {
         console.log('Received!', txid);
-        w.getBalance(false,function(balance, balanceByAddr) {
-            $rootScope.totalBalance = balance;
-            $rootScope.balanceByAddr = balanceByAddr;
-            console.log('New balance:', balance);
-            w.getBalance(true,function(balance) {
-              $rootScope.availableBalance = balance;
-          });
-        });
+        root.updateBalance();
       });
     });
   };