Skip to content
This repository was archived by the owner on Feb 22, 2024. It is now read-only.

amam/missing zero #1474

Merged
merged 2 commits into from
Jun 17, 2019
Merged

amam/missing zero #1474

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ddaa0f1
fix missing exit spot and quote
cakasuma Jun 14, 2019
b5fc3e3
add handler
cakasuma Jun 17, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions src/common/util.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,21 @@ function addComma(num, decimal_points, is_crypto) {
});
};

function getSymbolPipValue(symbol) {
var active_symbols = local_storage.get('active_symbols');
var pip_value = 4;
var selected_symbol = active_symbols.find(function(item) {
return item.symbol === symbol;
});

if (selected_symbol) {
var symbol_pip = selected_symbol.pip.toString();
pip_value = symbol_pip.substring(symbol_pip.indexOf(".") + 1).length;
}

return pip_value;
};

function sortAlphaNum(property) {
"use strict";
var reA = /[^a-zA-Z]/g;
Expand Down
2 changes: 1 addition & 1 deletion src/trade/tradeDialog.es6
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -399,7 +399,7 @@ function init_state(available,root, dialog, symbol, contracts_for_spot) {
multiplier: "0",
error: '',
loading: true, /* the proposal request state */

pip: getSymbolPipValue(symbol.symbol),
/* computed properties */
netprofit_: function () {
const {contract_type} = state.category_displays.selected;
Expand Down
2 changes: 1 addition & 1 deletion src/trade/tradeDialog.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
rv-show='template.visible'><!-- tradeTemplateManger will render here --></div>
<li>
<li class="tick-quote">
<span rv-text="tick.quote | add-comma"
<span rv-text="tick.quote | add-comma proposal.pip"
rv-class-down="tick.down < quote"></span>
</li>
<li class='sparkline-chart'>
Expand Down
13 changes: 5 additions & 8 deletions src/viewtransaction/viewTransaction.es6
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 = '';
Expand Down Expand Up @@ -233,17 +227,19 @@ const updateIndicative = (data, state) => {

function updateState(contract, state) {
const sell_time = contract.is_path_dependent && contract.status !== 'sold' ? contract.exit_tick_time : parseInt(contract.sell_time);
const pip_value = getSymbolPipValue(contract.underlying);

// note: cannot use spread operator - rivets.js 2-way data-binding breaks if new object
state.proposal_open_contract.pip = pip_value;
state.proposal_open_contract.is_sold_before_expiry = sell_time < contract.date_expiry;
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 = contract.entry_tick;
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 = contract.exit_tick;
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;
Expand Down Expand Up @@ -499,6 +495,7 @@ const initState = (proposal, root) => {
is_sold_before_expiry: sell_time < proposal.date_expiry,
isLookback: Lookback.isLookback(proposal.contract_type),
lb_formula: Lookback.formula(proposal.contract_type, proposal.multiplier && formatPrice(proposal.multiplier, proposal.currency || 'USD')),
pip: 0,
},
sell: {
bid_prices: [],
Expand Down
14 changes: 7 additions & 7 deletions src/viewtransaction/viewTransaction.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,18 +51,18 @@ <h3>Exit spot</h3>
<p>Entry Spot</p>
<span rv-data-balloon="proposal_open_contract.entry_tick_time | moment | or '-'"
rv-if="proposal_open_contract.entry_tick_time"
rv-text="proposal_open_contract.entry_tick | add-comma | or '-'"
rv-text="proposal_open_contract.entry_tick | add-comma proposal_open_contract.pip | or '-'"
class="dotted-underline entry-spot"></span>
</div>
<div rv-if="proposal_open_contract.user_sold | not-eq true | and proposal_open_contract.exit_tick | eq undefined"> <p>Current Spot</p>
<span rv-text="proposal_open_contract.current_spot | or '-'" rv-indicative-color="proposal_open_contract.current_spot"></span>
<span rv-text="proposal_open_contract.current_spot | add-comma proposal_open_contract.pip | or '-'" rv-indicative-color="proposal_open_contract.current_spot"></span>
</div>
<div rv-if="proposal_open_contract.user_sold | not-eq true | and proposal_open_contract.exit_tick | and proposal_open_contract.isLookback | eq false"> <p>Exit Spot</p>
<span rv-text="proposal_open_contract.exit_tick | add-comma | or '-'"></span>
<span rv-text="proposal_open_contract.exit_tick | add-comma proposal_open_contract.pip | or '-'"></span>
</div>
<div rv-if="proposal_open_contract.isLookback">
<p>Close</p>
<span rv-text="proposal_open_contract.exit_tick | add-comma | or '-'"></span>
<span rv-text="proposal_open_contract.exit_tick | add-comma proposal_open_contract.pip | or '-'"></span>
</div>
<div rv-if="proposal_open_contract.multiplier">
<p>Multiplier</p>
Expand Down Expand Up @@ -113,7 +113,7 @@ <h3>Exit spot</h3>
<div> <p>Entry Spot</p>
<span rv-data-balloon="proposal_open_contract.entry_tick_time | moment | or '-'"
rv-if="proposal_open_contract.entry_tick_time"
rv-text="proposal_open_contract.entry_tick | add-comma | or '-'"
rv-text="proposal_open_contract.entry_tick | add-comma proposal_open_contract.pip | or '-'"
class="dotted-underline">
</span>
<span rv-data-balloon="proposal_open_contract.purchase_time | moment | or '-'"
Expand All @@ -124,8 +124,8 @@ <h3>Exit spot</h3>
</div>
<div rv-if="proposal_open_contract.is_sold | eq 1"> <p>Exit Spot</p>
<span rv-data-balloon="proposal_open_contract.exit_tick_time | moment | or '-'"
rv-text="proposal_open_contract.exit_tick | add-comma | or '-'"
rv-class-dotted-underline="proposal_open_contract.exit_tick | add-comma"></span>
rv-text="proposal_open_contract.exit_tick | add-comma proposal_open_contract.pip | or '-'"
rv-class-dotted-underline="proposal_open_contract.exit_tick | add-comma proposal_open_contract.pip"></span>
</div>
<div rv-if="proposal_open_contract.is_sold | eq 0"> <p>Current Level</p>
<span rv-data-balloon="proposal_open_contract.current_spot_time | moment | or '-'"
Expand Down