mirror of https://github.com/BTCPrivate/copay.git
Define rateService on history.js. Fix filter noFractionNumber if alternativeAmount is null.
This commit is contained in:
parent
f4fd6c24f7
commit
6d72d00b99
|
@ -2,7 +2,7 @@
|
||||||
var bitcore = require('bitcore');
|
var bitcore = require('bitcore');
|
||||||
|
|
||||||
angular.module('copayApp.controllers').controller('HistoryController',
|
angular.module('copayApp.controllers').controller('HistoryController',
|
||||||
function($scope, $rootScope, $filter) {
|
function($scope, $rootScope, $filter, rateService) {
|
||||||
var w = $rootScope.wallet;
|
var w = $rootScope.wallet;
|
||||||
|
|
||||||
$rootScope.title = 'History';
|
$rootScope.title = 'History';
|
||||||
|
@ -146,9 +146,8 @@ angular.module('copayApp.controllers').controller('HistoryController',
|
||||||
if (!err && res) {
|
if (!err && res) {
|
||||||
_.each(res, function(r) {
|
_.each(res, function(r) {
|
||||||
var tx = index[r.ts];
|
var tx = index[r.ts];
|
||||||
tx.alternativeAmount = $filter('noFractionNumber')(
|
var alternativeAmount = (r.rate != null ? tx.amountSat * rateService.SAT_TO_BTC * r.rate : null);
|
||||||
(r.rate != null ? tx.amountSat * rateService.SAT_TO_BTC * r.rate : null))
|
tx.alternativeAmount = alternativeAmount ? $filter('noFractionNumber')(alternativeAmount) : null;
|
||||||
;
|
|
||||||
});
|
});
|
||||||
setTimeout(function() {
|
setTimeout(function() {
|
||||||
$scope.$digest();
|
$scope.$digest();
|
||||||
|
|
Loading…
Reference in New Issue