From e69131b172dfcf27a5f355bf9f9e9924a7b191cc Mon Sep 17 00:00:00 2001 From: Khalid Ibrahim Date: Fri, 14 Jun 2019 19:28:04 +0800 Subject: [PATCH 1/4] fixed missing decimal places issue --- src/common/util.js | 8 ++++++++ src/viewtransaction/viewTransaction.es6 | 10 ++-------- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/src/common/util.js b/src/common/util.js index 6490976733..04e4516025 100755 --- a/src/common/util.js +++ b/src/common/util.js @@ -131,6 +131,14 @@ function addComma(num, decimal_points, is_crypto) { }); }; +function setSymbolDecimalPlace(current_value, symbol) { + const active_symbol = local_storage.get('active_symbols').find((item) => item.symbol === symbol); + const pip = active_symbol.pip.toString(); + const decimals = pip.substring(pip.indexOf(".") + 1).length || 4; + + return addComma(current_value, decimals); +}; + function sortAlphaNum(property) { "use strict"; var reA = /[^a-zA-Z]/g; diff --git a/src/viewtransaction/viewTransaction.es6 b/src/viewtransaction/viewTransaction.es6 index b3c1ec54fa..164dde3394 100644 --- a/src/viewtransaction/viewTransaction.es6 +++ b/src/viewtransaction/viewTransaction.es6 @@ -45,12 +45,6 @@ const showMarketDataDisruptionWindow = () => { window.dd = market_data_disruption_win; }; -const countDecimals = (value) => { - if ((value % 1) !== 0) - return value.toString().split(".")[1].length; - return 0; -}; - const initChart = (root, state, options) => { let data = []; let type = ''; @@ -239,11 +233,11 @@ const updateIndicative = (data, state) => { state.proposal_open_contract.current_spot = contract.current_spot; state.proposal_open_contract.current_spot_time = contract.current_spot_time; state.proposal_open_contract.bid_price = contract.bid_price; - state.proposal_open_contract.entry_tick = countDecimals(contract.entry_tick) < 3 ? contract.entry_tick.toFixed(3) : contract.entry_tick; + state.proposal_open_contract.entry_tick = setSymbolDecimalPlace(contract.entry_tick, contract.underlying); state.proposal_open_contract.entry_tick_time = contract.entry_tick_time; state.proposal_open_contract.status = contract.status; state.proposal_open_contract.is_sold = contract.is_sold; - state.proposal_open_contract.exit_tick = countDecimals(contract.exit_tick) < 3 ? contract.exit_tick.toFixed(3) : contract.exit_tick; + state.proposal_open_contract.exit_tick = setSymbolDecimalPlace(contract.exit_tick, contract.underlying); state.proposal_open_contract.exit_tick_time = contract.exit_tick_time; state.proposal_open_contract.date_expiry = contract.date_expiry; state.proposal_open_contract.sell_price = contract.sell_price; From a27c8a2e6969c05ff9c3eef966a83c1d3b84bfe7 Mon Sep 17 00:00:00 2001 From: Khalid Ibrahim Date: Fri, 14 Jun 2019 19:34:02 +0800 Subject: [PATCH 2/4] es5 only --- src/common/util.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/common/util.js b/src/common/util.js index 04e4516025..e8841dd833 100755 --- a/src/common/util.js +++ b/src/common/util.js @@ -132,9 +132,9 @@ function addComma(num, decimal_points, is_crypto) { }; function setSymbolDecimalPlace(current_value, symbol) { - const active_symbol = local_storage.get('active_symbols').find((item) => item.symbol === symbol); - const pip = active_symbol.pip.toString(); - const decimals = pip.substring(pip.indexOf(".") + 1).length || 4; + var active_symbol = local_storage.get('active_symbols').find((item) => item.symbol === symbol); + var pip = active_symbol.pip.toString(); + var decimals = pip.substring(pip.indexOf(".") + 1).length || 4; return addComma(current_value, decimals); }; From f2f6922ab34779a46a199d09b3ed2b4f5dea0dac Mon Sep 17 00:00:00 2001 From: Khalid Ibrahim Date: Fri, 14 Jun 2019 19:37:56 +0800 Subject: [PATCH 3/4] more es5 --- src/common/util.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/common/util.js b/src/common/util.js index e8841dd833..8e76239029 100755 --- a/src/common/util.js +++ b/src/common/util.js @@ -132,7 +132,7 @@ function addComma(num, decimal_points, is_crypto) { }; function setSymbolDecimalPlace(current_value, symbol) { - var active_symbol = local_storage.get('active_symbols').find((item) => item.symbol === symbol); + var active_symbol = local_storage.get('active_symbols').find(function(item) {item.symbol === symbol}); var pip = active_symbol.pip.toString(); var decimals = pip.substring(pip.indexOf(".") + 1).length || 4; From 4af8de106fa0e6bab3b770e8175d9be9f208150a Mon Sep 17 00:00:00 2001 From: Khalid Ibrahim Date: Fri, 14 Jun 2019 19:40:13 +0800 Subject: [PATCH 4/4] nicer looking functions --- src/common/util.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/common/util.js b/src/common/util.js index 8e76239029..43efeefc66 100755 --- a/src/common/util.js +++ b/src/common/util.js @@ -132,7 +132,9 @@ function addComma(num, decimal_points, is_crypto) { }; function setSymbolDecimalPlace(current_value, symbol) { - var active_symbol = local_storage.get('active_symbols').find(function(item) {item.symbol === symbol}); + var active_symbol = local_storage.get('active_symbols').find(function(item) { + item.symbol === symbol + }); var pip = active_symbol.pip.toString(); var decimals = pip.substring(pip.indexOf(".") + 1).length || 4;