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

amam/barrier_message #1449

Merged
merged 1 commit into from
May 15, 2019
Merged

amam/barrier_message #1449

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 6 additions & 5 deletions src/trade/tradeDialog.es6
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -829,15 +829,16 @@ function init_state(available,root, dialog, symbol, contracts_for_spot) {
};

state.proposal.onchange = function () {
var unit = state.duration_unit.value;
var expiry_type = _(['seconds', 'minutes', 'hours']).includes(unit) ? 'intraday' : unit === 'days' ? 'daily' : 'tick';
const unit = state.duration_unit.value;
let expiry_type = _(['seconds', 'minutes', 'hours']).includes(unit) ? 'intraday' : unit === 'days' ? 'daily' : 'tick';
const subcat = state.category_displays.selected.sentiment;
if(state.categories.value.contract_category === 'spreads') expiry_type = 'intraday';
var row = _(available).filter({
const row = _(available).filter({
'contract_category_display': state.categories.value.contract_category_display,
'contract_display': state.category_displays.selected.name,
'expiry_type': expiry_type
}).head();
var request = {
const request = {
proposal: 1,
subscribe: 1,
contract_type: row.contract_type,
Expand All @@ -862,7 +863,7 @@ function init_state(available,root, dialog, symbol, contracts_for_spot) {
add_barriers_to_request(state, request);
set_is_barrier_offset(state);

if (state.categories.value.contract_category === 'digits') {
if (state.categories.value.contract_category === 'digits' && !(subcat === 'odd' || subcat === 'even')) {
request.barrier = state.digits.value + '';
}
if (state.date_start.value !== 'now') {
Expand Down