diff --git a/src/common/util.js b/src/common/util.js index 6490976733..43efeefc66 100755 --- a/src/common/util.js +++ b/src/common/util.js @@ -131,6 +131,16 @@ 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 pip = active_symbol.pip.toString(); + var 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;