diff --git a/src/assetindex/assetIndex.es6 b/src/assetindex/assetIndex.es6 index b3cd24efdc..0830f96f18 100644 --- a/src/assetindex/assetIndex.es6 +++ b/src/assetindex/assetIndex.es6 @@ -82,13 +82,12 @@ const initTable = () => { function populateTable(result) { const active_symbols_data = local_storage.get('active_symbols'); - const filtered_active_symbols = filterRestrictedSymbols(active_symbols_data); const asset_index_data = [...result[0].asset_index]; - if($.isEmptyObject(filtered_active_symbols) && $.isEmptyObject(asset_index_data)) return; + if($.isEmptyObject(active_symbols_data) && $.isEmptyObject(asset_index_data)) return; - state.dropdown.market_submarkets = getObjectMarketSubmarkets(filtered_active_symbols); - state.dropdown.sorted_markets = getSortedMarkets(filtered_active_symbols); + state.dropdown.market_submarkets = getObjectMarketSubmarkets(active_symbols_data); + state.dropdown.sorted_markets = getSortedMarkets(active_symbols_data); state.table.asset_data = asset_index_data; header_el = asset_win_el.parent().find('.ui-dialog-title').addClass('with-content'); diff --git a/src/common/util.js b/src/common/util.js index f7a523f955..b0f129389a 100755 --- a/src/common/util.js +++ b/src/common/util.js @@ -1,7 +1,3 @@ -function filterRestrictedSymbols(active_symbols) { - return active_symbols.filter(function(item) { return !/^(BOOM|CRASH|STP).+/i.test(item.symbol)}); -} - function isTick(ohlc) { return ohlc.indexOf("t") !== -1; } diff --git a/src/instruments/instruments.es6 b/src/instruments/instruments.es6 index 90aab541cb..2c0699a175 100755 --- a/src/instruments/instruments.es6 +++ b/src/instruments/instruments.es6 @@ -13,14 +13,12 @@ function refresh_active_symbols() { .then(function(data) { local_storage.set('active_symbols', data.active_symbols); const active_symbols = []; - const active_markets = _(data.active_symbols).groupBy('market').map(function(symbols) { - - const filtered_symbols = filterRestrictedSymbols(symbols) - - const sym = _.head(filtered_symbols); + const active_markets = _(data.active_symbols).groupBy('market').map(function(all_symbols) { + + const sym = _.head(all_symbols); const market = { name: sym.market, display_name: sym.market_display_name }; - market.submarkets = _(filtered_symbols).groupBy('submarket').map(function(symbols) { + market.submarkets = _(all_symbols).groupBy('submarket').map(function(symbols) { const sym = _.head(symbols); const submarket = { name: sym.submarket, display_name: sym.submarket_display_name }; submarket.instruments = _.map(symbols, function(sym) { diff --git a/src/navigation/menu.es6 b/src/navigation/menu.es6 index f456ce3df6..35e3e72794 100644 --- a/src/navigation/menu.es6 +++ b/src/navigation/menu.es6 @@ -50,11 +50,8 @@ export const extractChartableMarkets = (trading_times_data) => { }; export const refreshMenu = (root, markets, callback) => { - const is_not_crypto = symbol => !/^(cry|JD)/i.test(symbol); - const non_crypto_markets = markets.filter( m => is_not_crypto(m.name)) - const menu = `