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

settings: fix balance bug 2

Browse source
This commit is contained in:
Manuel Araoz 2014-09-03 16:03:31 -03:00
commit 53869531c2
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
js/filters.js
View file

@ -45,12 +45,12 @@ angular.module('copayApp.filters', [])
}; };
}) })
.filter('noFractionNumber', .filter('noFractionNumber',
[ '$filter', '$locale', [ '$filter', '$locale', '$rootScope',
function(filter, locale) { function(filter, locale, $rootScope) {
var numberFilter = filter('number'); var numberFilter = filter('number');
var formats = locale.NUMBER_FORMATS; var formats = locale.NUMBER_FORMATS;
return function(amount, n) { return function(amount, n) {
var fractionSize = (typeof(n) != 'undefined') ? n : config.unitToSatoshi.toString().length - 1; var fractionSize = (typeof(n) != 'undefined') ? n : $rootScope.wallet.settings.unitToSatoshi.toString().length - 1;
var value = numberFilter(amount, fractionSize); var value = numberFilter(amount, fractionSize);
var sep = value.indexOf(formats.DECIMAL_SEP); var sep = value.indexOf(formats.DECIMAL_SEP);
var group = value.indexOf(formats.GROUP_SEP); var group = value.indexOf(formats.GROUP_SEP);

2
js/models/core/Wallet.js
View file

@ -73,7 +73,7 @@ function Wallet(opts) {
this.id = opts.id || Wallet.getRandomId(); this.id = opts.id || Wallet.getRandomId();
this.secretNumber = opts.secretNumber || Wallet.getRandomNumber(); this.secretNumber = opts.secretNumber || Wallet.getRandomNumber();
this.lock = new WalletLock(this.storage, this.id, opts.lockTimeOutMin); this.lock = new WalletLock(this.storage, this.id, opts.lockTimeOutMin);
this.settings = opts.settings || copayConfig.settings; this.settings = opts.settings || copayConfig.wallet.settings;
this.name = opts.name; this.name = opts.name;
this.publicKeyRing.walletId = this.id; this.publicKeyRing.walletId = this.id;