mirror of https://github.com/BTCPrivate/copay.git
Show balance of addresses. Remove filter noFractionNumber.
This commit is contained in:
parent
01b678457d
commit
cd33523b3f
|
@ -44,7 +44,7 @@ angular.module('copayApp.controllers').controller('ReceiveController',
|
||||||
|
|
||||||
$scope.setAddressList = function() {
|
$scope.setAddressList = function() {
|
||||||
var w = $rootScope.wallet;
|
var w = $rootScope.wallet;
|
||||||
var balance = $rootScope.balanceByAddr;
|
var balance = w.balanceInfo.balanceByAddr;
|
||||||
|
|
||||||
var addresses = w.getAddressesOrderer();
|
var addresses = w.getAddressesOrderer();
|
||||||
if (addresses) {
|
if (addresses) {
|
||||||
|
@ -58,7 +58,7 @@ angular.module('copayApp.controllers').controller('ReceiveController',
|
||||||
list.push({
|
list.push({
|
||||||
'index': index,
|
'index': index,
|
||||||
'address': address,
|
'address': address,
|
||||||
'balance': balance ? balance[address] : 0,
|
'balance': balance ? balance[address] : null,
|
||||||
'isChange': w.addressIsChange(address),
|
'isChange': w.addressIsChange(address),
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
'use strict';
|
'use strict';
|
||||||
|
|
||||||
angular.module('copayApp.services')
|
angular.module('copayApp.services')
|
||||||
.factory('pendingTxsService', function($rootScope, $sce, $location, $filter, notification, $timeout, rateService) {
|
.factory('pendingTxsService', function($rootScope) {
|
||||||
var root = {};
|
var root = {};
|
||||||
root.update = function(w) {
|
root.update = function(w) {
|
||||||
var w = $rootScope.wallet;
|
var w = $rootScope.wallet;
|
||||||
|
|
|
@ -23,7 +23,7 @@
|
||||||
<i class="fi-bitcoin-circle icon-rotate spinner"></i>
|
<i class="fi-bitcoin-circle icon-rotate spinner"></i>
|
||||||
</span>
|
</span>
|
||||||
<span class="size-14" ng-show="!$root.updatingBalance">
|
<span class="size-14" ng-show="!$root.updatingBalance">
|
||||||
<b>{{addr.balance || 0|noFractionNumber}} {{$root.wallet.settings.unitName}}</b>
|
<b>{{addr.balance || '0'}} {{$root.wallet.settings.unitName}}</b>
|
||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
<div class="large-2 columns show-for-large-up text-right">
|
<div class="large-2 columns show-for-large-up text-right">
|
||||||
|
@ -42,7 +42,7 @@
|
||||||
<i class="fi-bitcoin-circle icon-rotate spinner"></i>
|
<i class="fi-bitcoin-circle icon-rotate spinner"></i>
|
||||||
</span>
|
</span>
|
||||||
<span class="size-14" ng-show="!$root.updatingBalance">
|
<span class="size-14" ng-show="!$root.updatingBalance">
|
||||||
<b>{{addr.balance || 0|noFractionNumber}} {{$root.wallet.settings.unitName}}</b>
|
<b>{{addr.balance || '0'}} {{$root.wallet.settings.unitName}}</b>
|
||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
Loading…
Reference in New Issue