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

Mahdiyeh/fix: mlt_and_uk_market #6600

Merged
merged 5 commits into from
Jun 30, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
26 changes: 21 additions & 5 deletions src/javascript/app/pages/trade/markets.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ import Defaults from './defaults';
import { sortSubmarket, getAvailableUnderlyings } from '../../common/active_symbols';
import { getElementById } from '../../../_common/common_functions';
import { localize } from '../../../_common/localize';
import Client from '../../base/client';
import { State } from '../../../_common/storage';

function scrollToPosition (element, to, duration) {
const requestAnimationFrame = window.requestAnimationFrame ||
Expand Down Expand Up @@ -69,7 +71,9 @@ class Markets extends React.Component {
constructor (props) {
super(props);
let market_symbol = Defaults.get('market');

let final_markets_arr,
final_market_obj;

const market_list = Symbols.markets();
this.markets = getAvailableUnderlyings(market_list);

Expand All @@ -80,9 +84,21 @@ class Markets extends React.Component {
underlying_symbol = Object.keys(this.markets[market_symbol].submarkets[submarket].symbols).sort()[0];
}
const is_not_crypto = symbol => !/^(cry|JD)/i.test(symbol);
const is_synthetic = symbol => /^(synthetic)/i.test(symbol);
const is_uk = State.getResponse('authorize.country') === 'gb';
const is_malta = State.getResponse('landing_company.gaming_company.shortcode') === 'malta';
const market_arr = Object.entries(this.markets).sort((a, b) => sortSubmarket(a[0], b[0]));
const non_crypto_markets_arr = market_arr.filter(market => is_not_crypto(market));
this.markets_all = non_crypto_markets_arr.slice();
if ((is_malta || is_uk) && Client.getAccountOfType('virtual')) {
final_markets_arr = market_arr.filter(market => is_synthetic(market));
final_market_obj = Object.fromEntries(final_markets_arr);
market_symbol = Object.keys(final_market_obj)[0];
const submarket = Object.keys(final_market_obj[market_symbol].submarkets).sort(sortSubmarket)[0];
underlying_symbol = Object.keys(final_market_obj[market_symbol].submarkets[submarket].symbols).sort()[0];
} else {
final_markets_arr = market_arr.filter(market => is_not_crypto(market));
final_market_obj = Object.fromEntries(final_markets_arr);
}
this.markets_all = final_markets_arr.slice();
if (!(market_symbol in this.markets)) {
market_symbol = Object.keys(this.markets).find(m => this.markets[m].submarkets[market_symbol]);
Defaults.set('market', market_symbol);
Expand All @@ -93,13 +109,13 @@ class Markets extends React.Component {
open : false,
market: {
symbol: market_symbol,
name : this.markets[market_symbol].name,
name : final_market_obj[market_symbol].name,
},
underlying: {
symbol: underlying_symbol,
name : this.underlyings[underlying_symbol],
},
markets : non_crypto_markets_arr,
markets : final_markets_arr,
active_market : market_symbol,
query : '',
open_dropdown_scroll_id: 0,
Expand Down
2 changes: 1 addition & 1 deletion src/javascript/app/pages/trade/tradepage.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ const TradePage = (() => {
const onLoad = () => {
DerivBanner.onLoad();

BinarySocket.wait('authorize').then(() => {
BinarySocket.wait('authorize' , 'landing_company').then(() => {
init();
});
};
Expand Down