Merge branch 'dev' of github.com:binary-com/binary-bot into data-coercion

Aaron Imming · Aaron Imming · commit 65717ffe0619 · 2019-06-11T09:53:09.000+08:00
diff --git a/src/botPage/view/View.js b/src/botPage/view/View.js
@@ -18,8 +18,8 @@ import Tour from './tour';
 import TradeInfoPanel from './TradeInfoPanel';
 import { showDialog } from '../bot/tools';
 import Elevio from '../../common/elevio';
-import { updateConfigCurrencies } from '../common/const';
-import { roundBalance, isVirtual } from '../common/tools';
+import config, { updateConfigCurrencies } from '../common/const';
+import { isVirtual } from '../common/tools';
 import {
     logoutAllTokens,
     getOAuthURL,
@@ -66,8 +66,16 @@ api.events.on('balance', response => {
         balance: { balance: b, currency },
     } = response;
 
-    const balance = (+roundBalance({ currency, balance: b })).toLocaleString(getLanguage().replace('_', '-'));
-    $('.topMenuBalance').text(`${balance} ${currency}`);
+    const elTopMenuBalances = document.querySelectorAll('.topMenuBalance');
+    const localString = getLanguage().replace('_', '-');
+    const balance = (+b).toLocaleString(localString, {
+        minimumFractionDigits: config.lists.CRYPTO_CURRENCIES.includes(currency) ? 8 : 2,
+    });
+
+    elTopMenuBalances.forEach(elTopMenuBalance => {
+        const element = elTopMenuBalance;
+        element.textContent = `${balance} ${currency}`;
+    });
 });
 
 const addBalanceForToken = token => {
diff --git a/static/xml/toolbox.xml b/static/xml/toolbox.xml
@@ -241,7 +241,6 @@
             <block type="controls_whileUntil"></block>
             <block type="controls_for"></block>
             <block type="controls_forEach"></block>
-            <block type="controls_for"></block>
             <block type="controls_flow_statements"></block>
         </category>
     </category>
