From cd33523b3fafec55fb6e6705de9dfbbfb3b3fdb7 Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Sun, 30 Nov 2014 17:34:14 -0300 Subject: [PATCH] Show balance of addresses. Remove filter noFractionNumber. --- js/controllers/receive.js | 4 ++-- js/services/pendingTxsService.js | 2 +- views/receive.html | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/js/controllers/receive.js b/js/controllers/receive.js index 39cfac733..6481d09b3 100644 --- a/js/controllers/receive.js +++ b/js/controllers/receive.js @@ -44,7 +44,7 @@ angular.module('copayApp.controllers').controller('ReceiveController', $scope.setAddressList = function() { var w = $rootScope.wallet; - var balance = $rootScope.balanceByAddr; + var balance = w.balanceInfo.balanceByAddr; var addresses = w.getAddressesOrderer(); if (addresses) { @@ -58,7 +58,7 @@ angular.module('copayApp.controllers').controller('ReceiveController', list.push({ 'index': index, 'address': address, - 'balance': balance ? balance[address] : 0, + 'balance': balance ? balance[address] : null, 'isChange': w.addressIsChange(address), }); }); diff --git a/js/services/pendingTxsService.js b/js/services/pendingTxsService.js index 0b8d5812d..ed0cb10bf 100644 --- a/js/services/pendingTxsService.js +++ b/js/services/pendingTxsService.js @@ -2,7 +2,7 @@ 'use strict'; angular.module('copayApp.services') - .factory('pendingTxsService', function($rootScope, $sce, $location, $filter, notification, $timeout, rateService) { + .factory('pendingTxsService', function($rootScope) { var root = {}; root.update = function(w) { var w = $rootScope.wallet; diff --git a/views/receive.html b/views/receive.html index 709218c26..a07a964c7 100644 --- a/views/receive.html +++ b/views/receive.html @@ -23,7 +23,7 @@ - {{addr.balance || 0|noFractionNumber}} {{$root.wallet.settings.unitName}} + {{addr.balance || '0'}} {{$root.wallet.settings.unitName}}
@@ -42,7 +42,7 @@ - {{addr.balance || 0|noFractionNumber}} {{$root.wallet.settings.unitName}} + {{addr.balance || '0'}} {{$root.wallet.settings.unitName}}