anders/Wallet
1
0
Fork 0
Code Issues Projects Releases Packages Wiki Activity

cleanup unused method for alt currency conversion

Browse source
This commit is contained in:
Ivan Socolsky 2014-11-04 16:01:45 -03:00
commit 8517dcd2d6
2 changed files with 7 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

10
js/controllers/history.js
View file

@ -59,7 +59,7 @@ angular.module('copayApp.controllers').controller('HistoryController',
return; return;
} }
_.each(res, function (r) { _.each(res, function(r) {
r.ts = r.minedTs || r.sentTs; r.ts = r.minedTs || r.sentTs;
if (r.action === 'sent' && r.peerActions) { if (r.action === 'sent' && r.peerActions) {
r.actionList = controllerUtils.getActionList(r.peerActions); r.actionList = controllerUtils.getActionList(r.peerActions);
@ -82,14 +82,6 @@ angular.module('copayApp.controllers').controller('HistoryController',
var w = $rootScope.wallet; var w = $rootScope.wallet;
return w.getNetworkName().substring(0, 4); return w.getNetworkName().substring(0, 4);
}; };
$scope.amountAlternative = function(amount, txIndex, cb) {
var w = $rootScope.wallet;
rateService.whenAvailable(function() {
var valueSat = amount * w.settings.unitToSatoshi;
$scope.alternativeCurrency[txIndex] = rateService.toFiat(valueSat, w.settings.alternativeIsoCode);
return cb ? cb() : null;
});
};
// Autoload transactions // Autoload transactions
$scope.getTransactions(); $scope.getTransactions();

23
test/unit/controllers/controllersSpec.js
View file

@ -26,11 +26,11 @@ describe("Unit: Controllers", function() {
var server; var server;
beforeEach(module('copayApp')); beforeEach(module('copayApp'));
beforeEach(module('copayApp.controllers')); beforeEach(module('copayApp.controllers'));
beforeEach(module(function($provide) { beforeEach(module(function($provide) {
$provide.value('request', { $provide.value('request', {
'get': function(_, cb) { 'get': function(_, cb) {
cb(null, null, [{ cb(null, null, [{
name: 'USD Dollars', name: 'USD Dollars',
code: 'USD', code: 'USD',
rate: 2 rate: 2
@ -71,7 +71,7 @@ describe("Unit: Controllers", function() {
w.createTx = sinon.stub().yields(null); w.createTx = sinon.stub().yields(null);
w.sendTx = sinon.stub().yields(null); w.sendTx = sinon.stub().yields(null);
w.requiresMultipleSignatures = sinon.stub().returns(true); w.requiresMultipleSignatures = sinon.stub().returns(true);
w.getTxProposals = sinon.stub().returns([1,2,3]); w.getTxProposals = sinon.stub().returns([1, 2, 3]);
$rootScope.wallet = w; $rootScope.wallet = w;
@ -172,17 +172,6 @@ describe("Unit: Controllers", function() {
scope.getTransactions(); scope.getTransactions();
expect(scope.blockchain_txs).to.be.empty; expect(scope.blockchain_txs).to.be.empty;
}); });
it('should call amountAlternative and return a value', function() {
var cb = sinon.spy();
var s1 = sinon.stub(scope, 'amountAlternative');
s1.onCall(0).returns(1000);
s1.onCall(1).returns(2000);
expect(s1(100, 0, cb)).equal(1000);
expect(s1(200, 1, cb)).equal(2000);
sinon.assert.callCount(scope.amountAlternative, 2);
s1.restore();
});
}); });
describe('Send Controller', function() { describe('Send Controller', function() {