From 8aedffb61e82df6d9044493fc27902b24e1fb816 Mon Sep 17 00:00:00 2001 From: Sandeep Date: Thu, 2 Jun 2022 15:29:52 +0800 Subject: [PATCH 1/2] Fixed basket index should not show on binary bot --- src/botPage/view/blockly/blocks/shared.js | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/botPage/view/blockly/blocks/shared.js b/src/botPage/view/blockly/blocks/shared.js index c7f61cb17d..bf081c6269 100644 --- a/src/botPage/view/blockly/blocks/shared.js +++ b/src/botPage/view/blockly/blocks/shared.js @@ -112,7 +112,7 @@ fieldGeneratorMapping.SUBMARKET_LIST = block => () => { ...Object.keys(submarkets) .map(e => [submarkets[e].name, e]) // Filter out markets we don't have contracts for - .filter(submarket => !['energy'].includes(submarket[1])) + .filter(submarket => !['energy', 'smart_fx'].includes(submarket[1])) ); } } @@ -335,7 +335,10 @@ export const getContractsAvailableForSymbolFromApi = async underlyingSymbol => { contractsForStore .filter(c => c.symbol === underlyingSymbol) .forEach(() => - contractsForStore.splice(contractsForStore.findIndex(c => c.symbol === underlyingSymbol), 1) + contractsForStore.splice( + contractsForStore.findIndex(c => c.symbol === underlyingSymbol), + 1 + ) ); contractsForStore.push(contractsForSymbol); setStorage('contractsForStore', JSON.stringify(contractsForStore)); From 54784740f6b5dc84ef3e6915dfedb043e182eac1 Mon Sep 17 00:00:00 2001 From: Sandeep Date: Thu, 2 Jun 2022 18:27:01 +0800 Subject: [PATCH 2/2] added filter to filter out the basket index --- src/botPage/view/blockly/blocks/shared.js | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/src/botPage/view/blockly/blocks/shared.js b/src/botPage/view/blockly/blocks/shared.js index bf081c6269..b1d35ab015 100644 --- a/src/botPage/view/blockly/blocks/shared.js +++ b/src/botPage/view/blockly/blocks/shared.js @@ -80,13 +80,15 @@ const getActiveSubMarket = submarkets => ); const getActiveMarket = markets => - Object.keys(markets).reduce( - (acc, market) => - Object.keys(getActiveSubMarket(markets[market].submarkets)).length - ? { ...acc, [market]: markets[market] } - : { ...acc }, - {} - ); + Object.keys(markets) + .filter(m => m !== 'basket_index') + .reduce( + (acc, market) => + Object.keys(getActiveSubMarket(markets[market].submarkets)).length + ? { ...acc, [market]: markets[market] } + : { ...acc }, + {} + ); fieldGeneratorMapping.MARKET_LIST = () => { const markets = getActiveMarket(symbolApi.activeSymbols.getMarkets()); @@ -112,7 +114,7 @@ fieldGeneratorMapping.SUBMARKET_LIST = block => () => { ...Object.keys(submarkets) .map(e => [submarkets[e].name, e]) // Filter out markets we don't have contracts for - .filter(submarket => !['energy', 'smart_fx'].includes(submarket[1])) + .filter(submarket => !['energy'].includes(submarket[1])) ); } }