diff --git a/js/filters/decimalPlacesFormat.js b/js/filters/decimalPlacesFormat.js index beec48b021..de5c87cef9 100644 --- a/js/filters/decimalPlacesFormat.js +++ b/js/filters/decimalPlacesFormat.js @@ -2,7 +2,7 @@ angular.module('IguanaGUIApp') .filter('decimalPlacesFormat', function() { - return function(value, type) { + return function(value, type, limit) { if (value && type) { var valueComponents = value.toString().split('.'), decimalPlaces = { @@ -11,8 +11,10 @@ angular.module('IguanaGUIApp') }; if (value < 1 && value > 0) { - for (var i=valueComponents[1].length; i > -1; i--) { + for (var i=valueComponents[1].length ; i > -1; i--) { if (Number(valueComponents[1][i]) !== 0) { + if (i > settings.maxDecimalPlacesLimit && limit) i = settings.maxDecimalPlacesLimit; // max. decimal places limit + decimalPlaces.coin = i; decimalPlaces.currency = decimalPlaces.coin; break; @@ -26,7 +28,6 @@ angular.module('IguanaGUIApp') if (!valueComponents[1]) { // show only the whole number if right part eq zero decimalPlaces.coin = decimalPlaces.currency = 0; } - } return decimalPlaces ? Number(value).toFixed( diff --git a/js/lang/en.js b/js/lang/en.js index f1fa3a019d..8f2cfe4e0a 100644 --- a/js/lang/en.js +++ b/js/lang/en.js @@ -271,7 +271,7 @@ var lang = { 'DAY': 'day ago', 'DAYS': 'days ago' }, - 'EXPERIMENTAL':{ + 'EXPERIMENTAL': { 'ARE': 'are', 'IS': 'is', 'DASHBOARD_OUT_OF_SYNC_P3': 'out of sync. Information about balances, transactions and send/receive functions is limited.', diff --git a/js/settings.js b/js/settings.js index 4cbb55e6ff..301a246378 100644 --- a/js/settings.js +++ b/js/settings.js @@ -8,7 +8,8 @@ var _settings = { decimalPlacesCoin: 1, decimalPlacesCurrency: 2, decimalPlacesTxUnit: 5, - dashboardUpdateTimout: 15, // sec + maxDecimalPlacesLimit: 8, + dashboardUpdateTimeout: 15, // sec, deprecated defaultCurrency: 'USD', defaultLang: 'EN', portPollUpdateTimeout: 60, // sec diff --git a/partials/dashboard-main.html b/partials/dashboard-main.html index 8aa59a1a6d..4a5bfdf49f 100644 --- a/partials/dashboard-main.html +++ b/partials/dashboard-main.html @@ -5,7 +5,7 @@