BTCPrivate
/
copay
mirror of https://github.com/BTCPrivate/copay.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

added rates to tx history

This commit is contained in:
Ivan Socolsky 2014-11-28 11:23:08 -03:00
parent 3eb45e529f
commit bdec000af5
7 changed files with 24 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
config.js
View File

@ -46,9 +46,8 @@ var defaultConfig = {
storageSalt: 'mjuBtGybi/4=',
},
rate: {
url: 'https://bitpay.com/api/rates',
updateFrequencySeconds: 60 * 60
rates: {
url: 'https://insight.bitpay.com:443/api/rates',
},
verbose: 1,

9
js/controllers/history.js
View File

@ -140,19 +140,18 @@ angular.module('copayApp.controllers').controller('HistoryController',
}
var items = res.items;
var now = new Date();
_.each(items, function(tx) {
tx.ts = tx.minedTs || tx.sentTs;
tx.rateTs = Math.floor((tx.ts || now) / 1000);
});
var index = _.indexBy(res.items, function(tx) {
return Math.floor(tx.ts / 1000);
});
var index = _.indexBy(items, 'rateTs');
rateService.getHistoricRates(w.settings.alternativeIsoCode, _.keys(index), function(err, res) {
console.log(res);
if (!err && res) {
_.each(res, function(r) {
var tx = index[r.ts];
tx.alternativeAmount = tx.amountSat * rateService.SAT_TO_BTC * r.rate;
tx.alternativeAmount = r.rate != null ? tx.amountSat * rateService.SAT_TO_BTC * r.rate : null;
});
setTimeout(function() {
$scope.$digest();

5
js/controllers/settings.js
View File

@ -1,8 +1,6 @@
'use strict';
angular.module('copayApp.controllers').controller('SettingsController', function($scope, $rootScope, $window, $route, $location, $anchorScroll, controllerUtils, notification) {
controllerUtils.redirIfLogged();
$scope.title = 'Settings';
@ -93,6 +91,9 @@ angular.module('copayApp.controllers').controller('SettingsController', function
EncryptedInsightStorage: _.extend(config.EncryptedInsightStorage, {
url: insightSettings.livenet.url + '/api/email'
}),
rates: _.extend(config.rates, {
url: insightSettings.livenet.url + '/api/rates'
}),
}));
// Go home reloading the application

11
js/models/RateService.js
View File

@ -21,6 +21,8 @@ var RateService = function(opts) {
self.UNAVAILABLE_ERROR = 'Service is not available - check for service.isAvailable() or use service.whenAvailable()';
self.UNSUPPORTED_CURRENCY_ERROR = 'Currency not supported';
self._url = opts.url || 'https://insight.bitpay.com:443/api/rates';
self._isAvailable = false;
self._rates = {};
self._alternatives = [];
@ -86,7 +88,7 @@ RateService.prototype.getHistoricRate = function(code, date, cb) {
var self = this;
self.request.get({
url: 'http://localhost:3001/api/rates/' + code + '?ts=' + date,
url: self._url + '/' + code + '?ts=' + date,
json: true
}, function(err, res, body) {
if (err || res.statusCode != 200 || !body) return cb(err || res);
@ -97,12 +99,15 @@ RateService.prototype.getHistoricRate = function(code, date, cb) {
RateService.prototype.getHistoricRates = function(code, dates, cb) {
var self = this;
dates = [].concat(dates).join(',');
var tsList = dates.join(',');
self.request.get({
url: 'http://localhost:3001/api/rates/' + code + '?ts=' + dates,
url: self._url + '/' + code + '?ts=' + tsList,
json: true
}, function(err, res, body) {
if (err || res.statusCode != 200 || !body) return cb(err || res);
if (!_.isArray(body)) {
body = [{ ts: dates[0], rate: body.rate }];
}
return cb(null, body);
});
};

3
js/services/rate.js
View File

@ -1,7 +1,8 @@
'use strict';
angular.module('copayApp.services').factory('rateService', function(request) {
return copay.RateService.singleton({
var cfg = _.extend(config.rates, {
request: request
});
return copay.RateService.singleton(cfg);
});

8
test/RateService.js
View File

@ -86,7 +86,7 @@ describe('RateService model', function() {
it('should return current valuation', function() {
var rs = new RateService();
rs.isAvailable = sinon.stub().returns(true);
var getRateStub = sinon.stub(rs, '_getRate')
var getRateStub = sinon.stub(rs, 'getRate')
getRateStub.withArgs('USD').returns(300.00);
getRateStub.withArgs('EUR').returns(250.00);
var params = [{
@ -119,7 +119,7 @@ describe('RateService model', function() {
rs.isAvailable = sinon.stub().returns(true);
var today = Date.now();
var yesterday = today - 24 * 3600;
var getHistoricalRateStub = sinon.stub(rs, '_getHistoricRate');
var getHistoricalRateStub = sinon.stub(rs, 'getHistoricRate');
getHistoricalRateStub.withArgs('USD', today).yields(null, 300.00);
getHistoricalRateStub.withArgs('USD', yesterday).yields(null, 250.00);
getHistoricalRateStub.withArgs('EUR', today).yields(null, 250.00);
@ -185,7 +185,7 @@ describe('RateService model', function() {
it('should return current valuation', function() {
var rs = new RateService();
rs.isAvailable = sinon.stub().returns(true);
var getRateStub = sinon.stub(rs, '_getRate')
var getRateStub = sinon.stub(rs, 'getRate')
getRateStub.withArgs('USD').returns(300.00);
getRateStub.withArgs('EUR').returns(250.00);
var params = [{
@ -223,7 +223,7 @@ describe('RateService model', function() {
it('should return list of available currencies', function() {
var rs = new RateService();
rs.isAvailable = sinon.stub().returns(true);
sinon.stub(rs, '_getAlternatives').returns([{
sinon.stub(rs, 'getAlternatives').returns([{
name: 'United States Dollar',
isoCode: 'USD',
rate: 300.00,

2
views/history.html
View File

@ -47,7 +47,7 @@
'text-warning': btx.action == 'sent',
'text-gray': btx.action == 'moved'}">
<b>{{btx.amount| noFractionNumber}} {{$root.wallet.settings.unitName}}</b>
<b ng-show="btx.alternativeAmount >= 0">{{btx.alternativeAmount| noFractionNumber}} {{$root.wallet.settings.alternativeIsoCode}}</b>
<b ng-show="btx.alternativeAmount != null">{{btx.alternativeAmount| noFractionNumber}} {{$root.wallet.settings.alternativeIsoCode}}</b>
</div>
</div>