From 62d572b5a186b54651b05925f49c50a95b4e0bfd Mon Sep 17 00:00:00 2001
From: mahdiyeh-fs <mahdiyeh@firstsource.tech>
Date: Mon, 19 Jul 2021 10:18:40 +0430
Subject: [PATCH 1/3] remove symbol filtering in webtrader

---
 src/common/util.js      | 2 +-
 src/navigation/menu.es6 | 5 +----
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/common/util.js b/src/common/util.js
index f7a523f955..6c4339d0f6 100755
--- a/src/common/util.js
+++ b/src/common/util.js
@@ -1,5 +1,5 @@
 function filterRestrictedSymbols(active_symbols) {
-  return active_symbols.filter(function(item) { return !/^(BOOM|CRASH|STP).+/i.test(item.symbol)});
+  return active_symbols;
 }
 
 function isTick(ohlc) {
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 = `<ul>${
-      non_crypto_markets.map(m => `<li><div>${m.display_name}</div><ul>${
+      markets.map(m => `<li><div>${m.display_name}</div><ul>${
          m.submarkets.map(s => `<li><div>${s.display_name}</div><ul>${
             s.instruments.map(i => `<li symbol='${i.symbol}' pip='${i.pip}'><div>${i.display_name}</div></li>`).join('')
          }</ul></li>`).join('')

From 83917fe5ec55f7ce1d72514f620e64a0bb80291d Mon Sep 17 00:00:00 2001
From: mahdiyeh-fs <mahdiyeh@firstsource.tech>
Date: Mon, 19 Jul 2021 11:44:20 +0430
Subject: [PATCH 2/3] remove filterRestrictedSymbols method

---
 src/assetindex/assetIndex.es6     |  7 +++----
 src/common/util.js                |  4 ----
 src/instruments/instruments.es6   | 10 ++++------
 src/trade/tradeMenu.es6           |  7 +++----
 src/tradingtimes/tradingTimes.es6 |  8 +++-----
 5 files changed, 13 insertions(+), 23 deletions(-)

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 6c4339d0f6..b0f129389a 100755
--- a/src/common/util.js
+++ b/src/common/util.js
@@ -1,7 +1,3 @@
-function filterRestrictedSymbols(active_symbols) {
-  return active_symbols;
-}
-
 function isTick(ohlc) {
     return ohlc.indexOf("t") !== -1;
 }
diff --git a/src/instruments/instruments.es6 b/src/instruments/instruments.es6
index 90aab541cb..25490b4c69 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(activeSymbols) {
+               
+                const sym = _.head(activeSymbols);
      
                 const market = { name: sym.market, display_name: sym.market_display_name };
-                market.submarkets = _(filtered_symbols).groupBy('submarket').map(function(symbols) {
+                market.submarkets = _(activeSymbols).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/trade/tradeMenu.es6 b/src/trade/tradeMenu.es6
index ddc19fb614..3f30c174dd 100644
--- a/src/trade/tradeMenu.es6
+++ b/src/trade/tradeMenu.es6
@@ -14,11 +14,10 @@ const refresh_active_symbols = () => {
       .send({ active_symbols: 'brief' })
       .then((data) => {
          /* clean up the data! */
-         let markets = _(data.active_symbols).groupBy('market').map((symbols) => {
-            const filtered_symbols = filterRestrictedSymbols(symbols);
-            const sym = _.head(filtered_symbols);
+         let markets = _(data.active_symbols).groupBy('market').map((activSymbols) => {
+            const sym = _.head(activSymbols);
             const market = { name: sym.market, display_name: sym.market_display_name };
-            market.submarkets = _(filtered_symbols).groupBy('submarket').map((symbols) => {  
+            market.submarkets = _(activSymbols).groupBy('submarket').map((symbols) => {  
                const sym = _.head(symbols);
                const submarket = { name: sym.submarket, display_name: sym.submarket_display_name };
                submarket.instruments = _.map(symbols,(sym) => ({
diff --git a/src/tradingtimes/tradingTimes.es6 b/src/tradingtimes/tradingTimes.es6
index a87656194e..07d7819207 100644
--- a/src/tradingtimes/tradingTimes.es6
+++ b/src/tradingtimes/tradingTimes.es6
@@ -149,17 +149,15 @@ const initTradingWin = ($html) => {
       const refresh = (data) => {
         const result = processData(menu.extractFilteredMarkets(data[0]));
         const active_symbols = local_storage.get('active_symbols');
-        const filtered_symbols = filterRestrictedSymbols(active_symbols)
-        let header = getObjectMarketSubmarkets(filtered_symbols);
-        const markets_sorted_list = getSortedMarkets(filtered_symbols);
+        let header = getObjectMarketSubmarkets(active_symbols);
+        const markets_sorted_list = getSortedMarkets(active_symbols);
         
         if($.isEmptyObject(header)) return;
 
         function changed() {
           const val = $(this).val();
           const new_active_symbols = local_storage.get('active_symbols');
-          const new_filtered_symbols = filterRestrictedSymbols(new_active_symbols);
-          header = getObjectMarketSubmarkets(new_filtered_symbols);
+          header = getObjectMarketSubmarkets(new_active_symbols);
 
           if (header[val]) {
              const cumulative_submarkets = Object.keys(header[val]);

From 969c8a7409bfb6ef24b8f04bfeca57ef38959ed8 Mon Sep 17 00:00:00 2001
From: mahdiyeh-fs <mahdiyeh@firstsource.tech>
Date: Mon, 19 Jul 2021 15:17:14 +0430
Subject: [PATCH 3/3] change name

---
 src/instruments/instruments.es6 | 6 +++---
 src/trade/tradeMenu.es6         | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/instruments/instruments.es6 b/src/instruments/instruments.es6
index 25490b4c69..2c0699a175 100755
--- a/src/instruments/instruments.es6
+++ b/src/instruments/instruments.es6
@@ -13,12 +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(activeSymbols) {
+            const active_markets = _(data.active_symbols).groupBy('market').map(function(all_symbols) {
                
-                const sym = _.head(activeSymbols);
+                const sym = _.head(all_symbols);
      
                 const market = { name: sym.market, display_name: sym.market_display_name };
-                market.submarkets = _(activeSymbols).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/trade/tradeMenu.es6 b/src/trade/tradeMenu.es6
index 3f30c174dd..dbb15f4c31 100644
--- a/src/trade/tradeMenu.es6
+++ b/src/trade/tradeMenu.es6
@@ -14,10 +14,10 @@ const refresh_active_symbols = () => {
       .send({ active_symbols: 'brief' })
       .then((data) => {
          /* clean up the data! */
-         let markets = _(data.active_symbols).groupBy('market').map((activSymbols) => {
-            const sym = _.head(activSymbols);
+         let markets = _(data.active_symbols).groupBy('market').map((all_symbols) => {
+            const sym = _.head(all_symbols);
             const market = { name: sym.market, display_name: sym.market_display_name };
-            market.submarkets = _(activSymbols).groupBy('submarket').map((symbols) => {  
+            market.submarkets = _(all_symbols).groupBy('submarket').map((symbols) => {  
                const sym = _.head(symbols);
                const submarket = { name: sym.submarket, display_name: sym.submarket_display_name };
                submarket.instruments = _.map(symbols,(sym) => ({