From c258c26925df8d32deb50995ea4182b31376572c Mon Sep 17 00:00:00 2001
From: pbca26 <pbca26@gmail.com>
Date: Sun, 5 Feb 2017 19:50:45 +0300
Subject: [PATCH] #70 added decimal places fix

---
 js/filters/decimalPlacesFormat.js |  7 ++++---
 js/lang/en.js                     |  2 +-
 js/settings.js                    |  3 ++-
 partials/dashboard-main.html      | 28 +++++++---------------------
 4 files changed, 14 insertions(+), 26 deletions(-)

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 @@
     <div class="balance-block unselectable" ng-hide="$state.current.name === 'dashboard.mobileTransactions'">
       <div class="label">{{ 'DASHBOARD.TOTAL_BALANCE' | lang }}</div>
       <div class="balance">
-        <span class="value">{{ totalBalance > 0 ? (totalBalance | decimalPlacesFormat: 'currency') : 0 }}</span>
+        <span class="value">{{ totalBalance > 0 ? (totalBalance | decimalPlacesFormat: 'currency' : true) : 0 }}</span>
         <span class="currency">{{ currency }}</span>
       </div>
     </div>
@@ -18,7 +18,8 @@
                data-coin-balance-value="{{ item.coinBalanceUnformatted }}"
                ng-class="{ 'active': ( activeCoin === item.id || activeCoin === $index ) && !util.isMobile(), 'syncing': coinSyncInfo[item.id].loaderBar }"
                ng-repeat="item in sideBarCoins | orderBy: 'id'"
-               ng-click="util.isMobile() ? setActiveCoin(item) : ( activeCoin !== item.id ? setActiveCoin(item) : null )">
+               ng-click="util.isMobile() ? setActiveCoin(item) : ( activeCoin !== item.id ? setActiveCoin(item) : null )"
+               title="isIguana ? Blocks: {{ coinSyncInfo[item.id].localBlocks }} / {{ coinSyncInfo[item.id].totalBlocks }} Bundles: {{ coinSyncInfo[item.id].localBundles }} / {{ coinSyncInfo[item.id].totalBundles }}">
             <spinner visibility="item.loading"></spinner>
             <div class="remove-coin cursor-pointer" ng-click="removeCoin(item.id)"
                  ng-class="{ 'hidden': sideBarCoins.length === 1 }"></div>
@@ -35,26 +36,11 @@
                 </div>
               </div>
               <div class="balance" ng-class="{ 'invisible': item.loading }" ng-if="activeSyncInfo !== item.id">
-                <div class="coin-value"><span class="val">{{ item.coinValue > 0 ? (item.coinValue | decimalPlacesFormat: 'coin') : 0 }}</span> {{ item.coinIdUc }}</div>
-                <div class="currency-value"><span class="val">{{ item.currencyValue > 0 ? (item.currencyValue | decimalPlacesFormat: 'currency') : 0 }}</span> {{ item.currencyName }}</div>
+                <div class="coin-value"><span class="val">{{ item.coinValue > 0 ? (item.coinValue | decimalPlacesFormat: 'coin' : true) : 0 }}</span> {{ item.coinIdUc }}</div>
+                <div class="currency-value"><span class="val">{{ item.currencyValue > 0 ? (item.currencyValue | decimalPlacesFormat: 'currency' : true) : 0 }}</span> {{ item.currencyName }}</div>
               </div>
             </div>
             <div class="bi_interface-right active-arrow"></div>
-            <!--span class="sync-info-block" ng-if="coinSyncInfo[item.id] && coinSyncInfo[item.id].loaderBar">
-              <div class="info-icon" ng-click="showSyncInfo(item.id)">i</div>
-              <div class="sync-info" ng-if="activeSyncInfo === item.id">
-                Peers: {{ coinSyncInfo[item.id].peers }}<br/>
-                <span ng-if="isIguana">
-                  Sync: {{ coinSyncInfo[item.id].bundlesPercentage }}%<br/>
-                  Blocks: {{ coinSyncInfo[item.id].blocks }}<br/>
-                  Bundles: {{ coinSyncInfo[item.id].localBundles }} / {{ coinSyncInfo[item.id].totalBundles }}
-                </span>
-                <span ng-if="!isIguana">
-                  Sync: {{ coinSyncInfo[item.id].blocksPercentage }}%<br/>
-                  Blocks: {{ coinSyncInfo[item.id].localBlocks }} / {{ coinSyncInfo[item.id].totalBlocks }}<br/>
-                </span>
-              </div>
-            </span-->
           </div>
         </div>
         <button class="btn btn-add-coin" ng-click="openAddCoinModal()" ng-class="{ 'disabled': !addCoinButtonState }">{{ ( isIguana ? 'DASHBOARD.ADD_COIN' : 'LOGIN.ADD_WALLET' ) | lang }}</button>
@@ -71,11 +57,11 @@
             <span>{{ 'DASHBOARD.INFORMATION' | lang }}</span>
           </div>
           <div class="active-coin-balance" ng-class="{ 'invisible': txUnit.loading }">
-            <span class="value">{{ txUnit.activeCoinBalance > 0 ? (txUnit.activeCoinBalance | decimalPlacesFormat: 'coin') : 0 }}</span>
+            <span class="value">{{ txUnit.activeCoinBalance > 0 ? (txUnit.activeCoinBalance | decimalPlacesFormat: 'coin' : true) : 0 }}</span>
             <span class="coin-name">{{ activeCoin.toUpperCase() }}</span>
           </div>
           <div class="active-coin-balance-currency" ng-class="{ 'invisible': txUnit.loading }">
-            <span class="value">{{ txUnit.activeCoinBalanceCurrency > 0 ? (txUnit.activeCoinBalanceCurrency | decimalPlacesFormat: 'currency') : 0 }}</span>
+            <span class="value">{{ txUnit.activeCoinBalanceCurrency > 0 ? (txUnit.activeCoinBalanceCurrency | decimalPlacesFormat: 'currency' : true) : 0 }}</span>
             <span class="currency">{{ currency }}</span>
           </div>
           <div class="action-buttons unselectable">