From 4e19fce252c23fea2968ffb79f9d4697440d1f2b Mon Sep 17 00:00:00 2001
From: Sandeep <sandeep@regentmarkets.com>
Date: Tue, 6 Feb 2024 11:31:04 +0800
Subject: [PATCH 1/4] refactor: removed unwanted console statements and added
 some checks for consoles

---
 package-lock.json                     | 9 +++++----
 package.json                          | 2 +-
 plugins/fetch-blockly-translations.js | 6 ++++--
 src/api-base.js                       | 4 ++--
 4 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 3ec4ed420..ec2c3d6df 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -98,7 +98,7 @@
                 "sass-loader": "^13.3.2",
                 "sha1": "^1.1.1",
                 "style-loader": "^3.3.3",
-                "trackjs": "^3.10.1",
+                "trackjs": "^3.10.4",
                 "webpack": "^5.88.0",
                 "webpack-cli": "^5.1.4",
                 "webpack-dev-server": "^4.15.1"
@@ -18007,9 +18007,10 @@
             }
         },
         "node_modules/trackjs": {
-            "version": "3.10.1",
-            "dev": true,
-            "license": "SEE LICENSE IN LICENSE.md"
+            "version": "3.10.4",
+            "resolved": "https://registry.npmjs.org/trackjs/-/trackjs-3.10.4.tgz",
+            "integrity": "sha512-coQkj9d7OjPmrLKj4MeLvf1U5vPD9QfXMpqVghhKnF++BlFOkA9t64ry0Usqt+8dk1tunZ9DQ5IVKLYi+3H8+w==",
+            "dev": true
         },
         "node_modules/tree-changes": {
             "version": "0.9.3",
diff --git a/package.json b/package.json
index 0cebe57d2..8eae2779c 100644
--- a/package.json
+++ b/package.json
@@ -101,7 +101,7 @@
         "sass-loader": "^13.3.2",
         "sha1": "^1.1.1",
         "style-loader": "^3.3.3",
-        "trackjs": "^3.10.1",
+        "trackjs": "^3.10.4",
         "webpack": "^5.88.0",
         "webpack-cli": "^5.1.4",
         "webpack-dev-server": "^4.15.1"
diff --git a/plugins/fetch-blockly-translations.js b/plugins/fetch-blockly-translations.js
index 4bee759e7..2abc143cf 100644
--- a/plugins/fetch-blockly-translations.js
+++ b/plugins/fetch-blockly-translations.js
@@ -62,8 +62,10 @@ const axios = require('axios');
     // eslint-disable-next-line no-console
     console.log(outputFile, 'output file');
     await fs.writeFile(outputFile, mergedContent, 'utf8', err => {
-        // eslint-disable-next-line no-console
-        console.log(err, 'Error fetching blockly');
+        if (err) {
+            // eslint-disable-next-line no-console
+            console.log(err, 'Error fetching blockly');
+        }
     });
 })()
     .then(() => {
diff --git a/src/api-base.js b/src/api-base.js
index cb1864ecc..0dc6b3103 100644
--- a/src/api-base.js
+++ b/src/api-base.js
@@ -38,7 +38,7 @@ class APIBase {
 
             this.api.onOpen().subscribe(() => {
                 // eslint-disable-next-line no-console
-                console.log('Connection has been established!', this.api);
+                console.log('Connection has been established!');
             });
         } catch (error) {
             globalObserver.emit('Error', error);
@@ -155,7 +155,7 @@ class APIBase {
 
             this.api_chart.onOpen().subscribe(() => {
                 // eslint-disable-next-line no-console
-                console.log('Connection has been established for chart ws!', this.api_chart);
+                console.log('Connection has been established for chart ws!');
             });
         } catch (error) {
             globalObserver.emit('Error', error);

From 727261022d552c3202bdc8a0bbb525eea0139678 Mon Sep 17 00:00:00 2001
From: Sandeep <sandeep@regentmarkets.com>
Date: Tue, 6 Feb 2024 12:18:57 +0800
Subject: [PATCH 2/4] refactor: :recycle: Refactoring and removing unnecessary
 comments

---
 src/blockly/blocks/after_purchase/index.js             | 1 -
 src/blockly/blocks/after_purchase/read_details.js      | 1 -
 src/blockly/blocks/after_purchase/trade_again.js       | 1 -
 src/blockly/blocks/before_purchase/ask_price.js        | 1 -
 src/blockly/blocks/before_purchase/index.js            | 1 -
 src/blockly/blocks/before_purchase/payout.js           | 1 -
 src/blockly/blocks/before_purchase/purchase.js         | 1 -
 src/blockly/blocks/during_purchase/check_sell.js       | 1 -
 src/blockly/blocks/during_purchase/index.js            | 1 -
 src/blockly/blocks/during_purchase/sell_at_market.js   | 1 -
 src/blockly/blocks/indicators/bb.js                    | 1 -
 src/blockly/blocks/indicators/bba.js                   | 1 -
 src/blockly/blocks/indicators/ema.js                   | 1 -
 src/blockly/blocks/indicators/emaa.js                  | 1 -
 src/blockly/blocks/indicators/macda.js                 | 1 -
 src/blockly/blocks/indicators/rsi.js                   | 1 -
 src/blockly/blocks/indicators/rsia.js                  | 1 -
 src/blockly/blocks/indicators/sma.js                   | 1 -
 src/blockly/blocks/indicators/smaa.js                  | 1 -
 src/blockly/blocks/ticks/direction.js                  | 1 -
 src/blockly/blocks/ticks/get_ohlc.js                   | 1 -
 src/blockly/blocks/ticks/lastDigitList.js              | 1 -
 src/blockly/blocks/ticks/last_digit.js                 | 1 -
 src/blockly/blocks/ticks/ohlc.js                       | 1 -
 src/blockly/blocks/ticks/ohlc_values.js                | 1 -
 src/blockly/blocks/ticks/readOhlc.js                   | 1 -
 src/blockly/blocks/ticks/tick.js                       | 1 -
 src/blockly/blocks/ticks/tick_analysis.js              | 1 -
 src/blockly/blocks/ticks/ticks.js                      | 1 -
 src/blockly/blocks/tools/balance.js                    | 1 -
 src/blockly/blocks/tools/block_holder.js               | 1 -
 src/blockly/blocks/tools/candle/is_candle_black.js     | 1 -
 src/blockly/blocks/tools/candle/ohlc_values_in_list.js | 1 -
 src/blockly/blocks/tools/candle/read_ohlc_obj.js       | 1 -
 src/blockly/blocks/tools/loader.js                     | 1 -
 src/blockly/blocks/tools/notify.js                     | 1 -
 src/blockly/blocks/tools/time/epoch.js                 | 1 -
 src/blockly/blocks/tools/time/interval.js              | 1 -
 src/blockly/blocks/tools/time/timeout.js               | 1 -
 src/blockly/blocks/tools/total_profit.js               | 1 -
 src/blockly/blocks/tools/total_runs.js                 | 1 -
 41 files changed, 41 deletions(-)

diff --git a/src/blockly/blocks/after_purchase/index.js b/src/blockly/blocks/after_purchase/index.js
index f2aae9872..c6a156110 100644
--- a/src/blockly/blocks/after_purchase/index.js
+++ b/src/blockly/blocks/after_purchase/index.js
@@ -1,4 +1,3 @@
-// https://blockly-demo.appspot.com/static/demos/blockfactory/index.html#i7qkfj
 import { translate } from '@i18n';
 import './check_result';
 import './read_details';
diff --git a/src/blockly/blocks/after_purchase/read_details.js b/src/blockly/blocks/after_purchase/read_details.js
index d8fdc4576..a403a099f 100644
--- a/src/blockly/blocks/after_purchase/read_details.js
+++ b/src/blockly/blocks/after_purchase/read_details.js
@@ -1,4 +1,3 @@
-// https://blockly-demo.appspot.com/static/demos/blockfactory/index.html#u8i287
 import { translate } from '@i18n';
 import config from '@currency-config';
 import { insideAfterPurchase } from '../../relationChecker';
diff --git a/src/blockly/blocks/after_purchase/trade_again.js b/src/blockly/blocks/after_purchase/trade_again.js
index 4a7e6071c..52a523d9b 100644
--- a/src/blockly/blocks/after_purchase/trade_again.js
+++ b/src/blockly/blocks/after_purchase/trade_again.js
@@ -1,4 +1,3 @@
-// https://blockly-demo.appspot.com/static/demos/blockfactory/index.html#xkasg4
 import { translate } from '@i18n';
 import { insideAfterPurchase } from '../../relationChecker';
 
diff --git a/src/blockly/blocks/before_purchase/ask_price.js b/src/blockly/blocks/before_purchase/ask_price.js
index f27cf7eb4..4c34e2ec0 100644
--- a/src/blockly/blocks/before_purchase/ask_price.js
+++ b/src/blockly/blocks/before_purchase/ask_price.js
@@ -1,4 +1,3 @@
-// https://blockly-demo.appspot.com/static/demos/blockfactory/index.html#pbvgpo
 import { translate } from '@i18n';
 import { insideBeforePurchase } from '../../relationChecker';
 import { getPurchaseChoices } from '../shared';
diff --git a/src/blockly/blocks/before_purchase/index.js b/src/blockly/blocks/before_purchase/index.js
index 405a484a9..9cd9ba0ad 100644
--- a/src/blockly/blocks/before_purchase/index.js
+++ b/src/blockly/blocks/before_purchase/index.js
@@ -1,4 +1,3 @@
-// https://blockly-demo.appspot.com/static/demos/blockfactory/index.html#u7tjez
 import { translate } from '@i18n';
 import './purchase';
 import './ask_price';
diff --git a/src/blockly/blocks/before_purchase/payout.js b/src/blockly/blocks/before_purchase/payout.js
index ac295b058..bf32cfef9 100644
--- a/src/blockly/blocks/before_purchase/payout.js
+++ b/src/blockly/blocks/before_purchase/payout.js
@@ -1,4 +1,3 @@
-// https://blockly-demo.appspot.com/static/demos/blockfactory/index.html#pbvgpo
 import { translate } from '@i18n';
 import { insideBeforePurchase } from '../../relationChecker';
 import { getPurchaseChoices } from '../shared';
diff --git a/src/blockly/blocks/before_purchase/purchase.js b/src/blockly/blocks/before_purchase/purchase.js
index ce472bd20..0ddcf99d1 100644
--- a/src/blockly/blocks/before_purchase/purchase.js
+++ b/src/blockly/blocks/before_purchase/purchase.js
@@ -1,4 +1,3 @@
-// https://blockly-demo.appspot.com/static/demos/blockfactory/index.html#pbvgpo
 import { translate } from '@i18n';
 import { insideBeforePurchase } from '../../relationChecker';
 import { getPurchaseChoices } from '../shared';
diff --git a/src/blockly/blocks/during_purchase/check_sell.js b/src/blockly/blocks/during_purchase/check_sell.js
index c95aa26fc..bfb1f192f 100644
--- a/src/blockly/blocks/during_purchase/check_sell.js
+++ b/src/blockly/blocks/during_purchase/check_sell.js
@@ -1,4 +1,3 @@
-// https://blockly-demo.appspot.com/static/demos/blockfactory/index.html#2jo335
 import { translate } from '@i18n';
 import { insideDuringPurchase } from '../../relationChecker';
 
diff --git a/src/blockly/blocks/during_purchase/index.js b/src/blockly/blocks/during_purchase/index.js
index c9b21a1a3..723715455 100644
--- a/src/blockly/blocks/during_purchase/index.js
+++ b/src/blockly/blocks/during_purchase/index.js
@@ -1,4 +1,3 @@
-// https://blockly-demo.appspot.com/static/demos/blockfactory/index.html#qx2zox
 import { translate } from '@i18n';
 import './sell_at_market';
 import './check_sell';
diff --git a/src/blockly/blocks/during_purchase/sell_at_market.js b/src/blockly/blocks/during_purchase/sell_at_market.js
index f9fd9d1fc..a53010d91 100644
--- a/src/blockly/blocks/during_purchase/sell_at_market.js
+++ b/src/blockly/blocks/during_purchase/sell_at_market.js
@@ -1,4 +1,3 @@
-// https://blockly-demo.appspot.com/static/demos/blockfactory/index.html#pbvgpo
 import { translate } from '@i18n';
 import { insideDuringPurchase } from '../../relationChecker';
 
diff --git a/src/blockly/blocks/indicators/bb.js b/src/blockly/blocks/indicators/bb.js
index 0c02a32ee..a1097fb95 100644
--- a/src/blockly/blocks/indicators/bb.js
+++ b/src/blockly/blocks/indicators/bb.js
@@ -1,4 +1,3 @@
-// https://blockly-demo.appspot.com/static/demos/blockfactory/index.html#3qghes
 import { translate } from '@i18n';
 import config from '@currency-config';
 import { expectValue } from '../shared';
diff --git a/src/blockly/blocks/indicators/bba.js b/src/blockly/blocks/indicators/bba.js
index 25540e338..df244d3db 100644
--- a/src/blockly/blocks/indicators/bba.js
+++ b/src/blockly/blocks/indicators/bba.js
@@ -1,4 +1,3 @@
-// https://blockly-demo.appspot.com/static/demos/blockfactory/index.html#3qghes
 import { translate } from '@i18n';
 import config from '@currency-config';
 import { expectValue } from '../shared';
diff --git a/src/blockly/blocks/indicators/ema.js b/src/blockly/blocks/indicators/ema.js
index 4a3cc4e15..ae004b23e 100644
--- a/src/blockly/blocks/indicators/ema.js
+++ b/src/blockly/blocks/indicators/ema.js
@@ -1,4 +1,3 @@
-// https://blockly-demo.appspot.com/static/demos/blockfactory/index.html#3qghes
 import { translate } from '@i18n';
 import { expectValue } from '../shared';
 
diff --git a/src/blockly/blocks/indicators/emaa.js b/src/blockly/blocks/indicators/emaa.js
index 4c08cd772..70b3b3f67 100644
--- a/src/blockly/blocks/indicators/emaa.js
+++ b/src/blockly/blocks/indicators/emaa.js
@@ -1,4 +1,3 @@
-// https://blockly-demo.appspot.com/static/demos/blockfactory/index.html#3qghes
 import { translate } from '@i18n';
 import { expectValue } from '../shared';
 
diff --git a/src/blockly/blocks/indicators/macda.js b/src/blockly/blocks/indicators/macda.js
index c4105b1a2..471a7605b 100644
--- a/src/blockly/blocks/indicators/macda.js
+++ b/src/blockly/blocks/indicators/macda.js
@@ -1,4 +1,3 @@
-// https://blockly-demo.appspot.com/static/demos/blockfactory/index.html#3qghes
 import { translate } from '@i18n';
 import config from '@currency-config';
 import { expectValue } from '../shared';
diff --git a/src/blockly/blocks/indicators/rsi.js b/src/blockly/blocks/indicators/rsi.js
index abd5caa8e..85bb9b06f 100644
--- a/src/blockly/blocks/indicators/rsi.js
+++ b/src/blockly/blocks/indicators/rsi.js
@@ -1,4 +1,3 @@
-// https://blockly-demo.appspot.com/static/demos/blockfactory/index.html#3qghes
 import { translate } from '@i18n';
 import { expectValue } from '../shared';
 
diff --git a/src/blockly/blocks/indicators/rsia.js b/src/blockly/blocks/indicators/rsia.js
index 41b1e6ffd..da84e5795 100644
--- a/src/blockly/blocks/indicators/rsia.js
+++ b/src/blockly/blocks/indicators/rsia.js
@@ -1,4 +1,3 @@
-// https://blockly-demo.appspot.com/static/demos/blockfactory/index.html#3qghes
 import { translate } from '@i18n';
 import { expectValue } from '../shared';
 
diff --git a/src/blockly/blocks/indicators/sma.js b/src/blockly/blocks/indicators/sma.js
index 8c8cbd7f7..307e246bf 100644
--- a/src/blockly/blocks/indicators/sma.js
+++ b/src/blockly/blocks/indicators/sma.js
@@ -1,4 +1,3 @@
-// https://blockly-demo.appspot.com/static/demos/blockfactory/index.html#3qghes
 import { translate } from '@i18n';
 import { expectValue } from '../shared';
 
diff --git a/src/blockly/blocks/indicators/smaa.js b/src/blockly/blocks/indicators/smaa.js
index 5f88e013f..e15f411a3 100644
--- a/src/blockly/blocks/indicators/smaa.js
+++ b/src/blockly/blocks/indicators/smaa.js
@@ -1,4 +1,3 @@
-// https://blockly-demo.appspot.com/static/demos/blockfactory/index.html#3qghes
 import { translate } from '@i18n';
 import { expectValue } from '../shared';
 
diff --git a/src/blockly/blocks/ticks/direction.js b/src/blockly/blocks/ticks/direction.js
index a9fb58d83..64d4ca813 100644
--- a/src/blockly/blocks/ticks/direction.js
+++ b/src/blockly/blocks/ticks/direction.js
@@ -1,4 +1,3 @@
-// https://blockly-demo.appspot.com/static/demos/blockfactory/index.html#n3drko
 import { translate } from '@i18n';
 import { disable } from '../../utils';
 
diff --git a/src/blockly/blocks/ticks/get_ohlc.js b/src/blockly/blocks/ticks/get_ohlc.js
index 582365710..5e91ca692 100644
--- a/src/blockly/blocks/ticks/get_ohlc.js
+++ b/src/blockly/blocks/ticks/get_ohlc.js
@@ -1,4 +1,3 @@
-// https://blockly-demo.appspot.com/static/demos/blockfactory/index.html#szwuog
 import { translate } from '@i18n';
 import { mainScope } from '../../relationChecker';
 import candleInterval, { getGranularity } from './candleInterval';
diff --git a/src/blockly/blocks/ticks/lastDigitList.js b/src/blockly/blocks/ticks/lastDigitList.js
index 770419bbf..da13d177d 100644
--- a/src/blockly/blocks/ticks/lastDigitList.js
+++ b/src/blockly/blocks/ticks/lastDigitList.js
@@ -1,4 +1,3 @@
-// https://blockly-demo.appspot.com/static/demos/blockfactory/index.html#2jo335
 import { translate } from '@i18n';
 import { mainScope } from '../../relationChecker';
 
diff --git a/src/blockly/blocks/ticks/last_digit.js b/src/blockly/blocks/ticks/last_digit.js
index 66a7cd3e3..dc81fc647 100644
--- a/src/blockly/blocks/ticks/last_digit.js
+++ b/src/blockly/blocks/ticks/last_digit.js
@@ -1,4 +1,3 @@
-// https://blockly-demo.appspot.com/static/demos/blockfactory/index.html#2jo335
 import { translate } from '@i18n';
 import { mainScope } from '../../relationChecker';
 
diff --git a/src/blockly/blocks/ticks/ohlc.js b/src/blockly/blocks/ticks/ohlc.js
index 72f01f1ae..611d9a675 100644
--- a/src/blockly/blocks/ticks/ohlc.js
+++ b/src/blockly/blocks/ticks/ohlc.js
@@ -1,4 +1,3 @@
-// https://blockly-demo.appspot.com/static/demos/blockfactory/index.html#2jo335
 import { translate } from '@i18n';
 import { mainScope } from '../../relationChecker';
 import candleInterval, { getGranularity } from './candleInterval';
diff --git a/src/blockly/blocks/ticks/ohlc_values.js b/src/blockly/blocks/ticks/ohlc_values.js
index 0cfaae876..7583bfe50 100644
--- a/src/blockly/blocks/ticks/ohlc_values.js
+++ b/src/blockly/blocks/ticks/ohlc_values.js
@@ -1,4 +1,3 @@
-// https://blockly-demo.appspot.com/static/demos/blockfactory/index.html#2jo335
 import { translate } from '@i18n';
 import config from '@currency-config';
 import { mainScope } from '../../relationChecker';
diff --git a/src/blockly/blocks/ticks/readOhlc.js b/src/blockly/blocks/ticks/readOhlc.js
index d22e87f87..285b47d33 100644
--- a/src/blockly/blocks/ticks/readOhlc.js
+++ b/src/blockly/blocks/ticks/readOhlc.js
@@ -1,4 +1,3 @@
-// https://blockly-demo.appspot.com/static/demos/blockfactory/index.html#szwuog
 import { translate } from '@i18n';
 import config from '@currency-config';
 import { mainScope } from '../../relationChecker';
diff --git a/src/blockly/blocks/ticks/tick.js b/src/blockly/blocks/ticks/tick.js
index e35a115de..04046ab59 100644
--- a/src/blockly/blocks/ticks/tick.js
+++ b/src/blockly/blocks/ticks/tick.js
@@ -1,4 +1,3 @@
-// https://blockly-demo.appspot.com/static/demos/blockfactory/index.html#2jo335
 import { translate } from '@i18n';
 import { mainScope } from '../../relationChecker';
 
diff --git a/src/blockly/blocks/ticks/tick_analysis.js b/src/blockly/blocks/ticks/tick_analysis.js
index e9b63ee3a..1e686a865 100644
--- a/src/blockly/blocks/ticks/tick_analysis.js
+++ b/src/blockly/blocks/ticks/tick_analysis.js
@@ -1,4 +1,3 @@
-// https://blockly-demo.appspot.com/static/demos/blockfactory/index.html#i7qkfj
 import { translate } from '@i18n';
 
 Blockly.Blocks.tick_analysis = {
diff --git a/src/blockly/blocks/ticks/ticks.js b/src/blockly/blocks/ticks/ticks.js
index e1f28ec86..877f9a71e 100644
--- a/src/blockly/blocks/ticks/ticks.js
+++ b/src/blockly/blocks/ticks/ticks.js
@@ -1,4 +1,3 @@
-// https://blockly-demo.appspot.com/static/demos/blockfactory/index.html#2jo335
 import { translate } from '@i18n';
 import { mainScope } from '../../relationChecker';
 
diff --git a/src/blockly/blocks/tools/balance.js b/src/blockly/blocks/tools/balance.js
index 39c09b2ff..80fd0e50f 100644
--- a/src/blockly/blocks/tools/balance.js
+++ b/src/blockly/blocks/tools/balance.js
@@ -1,4 +1,3 @@
-// https://blockly-demo.appspot.com/static/demos/blockfactory/index.html#kqvz7z
 import { translate } from '@i18n';
 import config from '@currency-config';
 
diff --git a/src/blockly/blocks/tools/block_holder.js b/src/blockly/blocks/tools/block_holder.js
index 6ea87048e..080adcd61 100644
--- a/src/blockly/blocks/tools/block_holder.js
+++ b/src/blockly/blocks/tools/block_holder.js
@@ -1,4 +1,3 @@
-// https://blockly-demo.appspot.com/static/demos/blockfactory/index.html#i7qkfj
 import { translate } from '@i18n';
 
 Blockly.Blocks.block_holder = {
diff --git a/src/blockly/blocks/tools/candle/is_candle_black.js b/src/blockly/blocks/tools/candle/is_candle_black.js
index 2793b7149..c52da420c 100644
--- a/src/blockly/blocks/tools/candle/is_candle_black.js
+++ b/src/blockly/blocks/tools/candle/is_candle_black.js
@@ -1,4 +1,3 @@
-// https://blockly-demo.appspot.com/static/demos/blockfactory/index.html#szwuog
 import { translate } from '@i18n';
 import { expectValue } from '../../shared';
 
diff --git a/src/blockly/blocks/tools/candle/ohlc_values_in_list.js b/src/blockly/blocks/tools/candle/ohlc_values_in_list.js
index 6dbdfa2b6..e0cd55034 100644
--- a/src/blockly/blocks/tools/candle/ohlc_values_in_list.js
+++ b/src/blockly/blocks/tools/candle/ohlc_values_in_list.js
@@ -1,4 +1,3 @@
-// https://blockly-demo.appspot.com/static/demos/blockfactory/index.html#2jo335
 import { translate } from '@i18n';
 import config from '@currency-config';
 import { expectValue } from '../../shared';
diff --git a/src/blockly/blocks/tools/candle/read_ohlc_obj.js b/src/blockly/blocks/tools/candle/read_ohlc_obj.js
index 80e0d8c4c..1c6d79fc7 100644
--- a/src/blockly/blocks/tools/candle/read_ohlc_obj.js
+++ b/src/blockly/blocks/tools/candle/read_ohlc_obj.js
@@ -1,4 +1,3 @@
-// https://blockly-demo.appspot.com/static/demos/blockfactory/index.html#szwuog
 import { translate } from '@i18n';
 import config from '@currency-config';
 import { expectValue } from '../../shared';
diff --git a/src/blockly/blocks/tools/loader.js b/src/blockly/blocks/tools/loader.js
index 697c284e6..2d08ba893 100644
--- a/src/blockly/blocks/tools/loader.js
+++ b/src/blockly/blocks/tools/loader.js
@@ -1,4 +1,3 @@
-// https://blockly-demo.appspot.com/static/demos/blockfactory/index.html#tkcvmb
 import { translate } from '@i18n';
 import { observer as globalObserver } from '@utilities/observer';
 import { deleteBlocksLoadedBy, loadRemote, recoverDeletedBlock } from '../../utils';
diff --git a/src/blockly/blocks/tools/notify.js b/src/blockly/blocks/tools/notify.js
index 52f6a754f..11f32c5e1 100644
--- a/src/blockly/blocks/tools/notify.js
+++ b/src/blockly/blocks/tools/notify.js
@@ -1,4 +1,3 @@
-// https://blockly-demo.appspot.com/static/demos/blockfactory/index.html#pmhydb
 import { translate } from '@i18n';
 import config from '@currency-config';
 import { expectValue } from '../shared';
diff --git a/src/blockly/blocks/tools/time/epoch.js b/src/blockly/blocks/tools/time/epoch.js
index 667efb209..23e24cd49 100644
--- a/src/blockly/blocks/tools/time/epoch.js
+++ b/src/blockly/blocks/tools/time/epoch.js
@@ -1,4 +1,3 @@
-// https://blockly-demo.appspot.com/static/demos/blockfactory/index.html#3bwqd4
 import { translate } from '@i18n';
 
 Blockly.Blocks.epoch = {
diff --git a/src/blockly/blocks/tools/time/interval.js b/src/blockly/blocks/tools/time/interval.js
index 94c1fe6be..932a1fbfe 100644
--- a/src/blockly/blocks/tools/time/interval.js
+++ b/src/blockly/blocks/tools/time/interval.js
@@ -1,4 +1,3 @@
-// https://blockly-demo.appspot.com/static/demos/blockfactory/index.html#wupwb4
 import { translate } from '@i18n';
 import { disable } from '../../../utils';
 
diff --git a/src/blockly/blocks/tools/time/timeout.js b/src/blockly/blocks/tools/time/timeout.js
index 779a67464..111e5862a 100644
--- a/src/blockly/blocks/tools/time/timeout.js
+++ b/src/blockly/blocks/tools/time/timeout.js
@@ -1,4 +1,3 @@
-// https://blockly-demo.appspot.com/static/demos/blockfactory/index.html#wupwb4
 import { translate } from '@i18n';
 import { mainScope } from '../../../relationChecker';
 
diff --git a/src/blockly/blocks/tools/total_profit.js b/src/blockly/blocks/tools/total_profit.js
index 81a274a6b..7b71b7a33 100644
--- a/src/blockly/blocks/tools/total_profit.js
+++ b/src/blockly/blocks/tools/total_profit.js
@@ -1,4 +1,3 @@
-// https://blockly-demo.appspot.com/static/demos/blockfactory/index.html#3bwqd4
 import { translate } from '@i18n';
 
 Blockly.Blocks.total_profit = {
diff --git a/src/blockly/blocks/tools/total_runs.js b/src/blockly/blocks/tools/total_runs.js
index bad3530ed..04d340361 100644
--- a/src/blockly/blocks/tools/total_runs.js
+++ b/src/blockly/blocks/tools/total_runs.js
@@ -1,4 +1,3 @@
-// https://blockly-demo.appspot.com/static/demos/blockfactory/index.html#3bwqd4
 import { translate } from '@i18n';
 
 Blockly.Blocks.total_runs = {

From 10cf9e28eddbb4094234e67122dd0edea499349c Mon Sep 17 00:00:00 2001
From: Sandeep <sandeep@regentmarkets.com>
Date: Tue, 6 Feb 2024 13:33:54 +0800
Subject: [PATCH 3/4] refactor: :recycle: added global unhandledRejection
 handler to check the details of the error

---
 package-lock.json            |  7 +-----
 package.json                 |  3 +--
 public/index.html            |  7 +++++-
 src/app/App.jsx              | 45 ++++++++++++++++++++++++------------
 src/components/Main/main.jsx | 12 +---------
 src/index.js                 |  2 +-
 src/utilities/logger.js      |  6 ++---
 7 files changed, 42 insertions(+), 40 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index ec2c3d6df..4bb98d320 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -19,8 +19,7 @@
                 "commander": "^8.3.0",
                 "core-js": "^3.18",
                 "crc-32": "^1.2.0",
-                "js-cookie": "^3.0.1",
-                "jwt-decode": "^3.1.2",
+                "js-cookie": "^3.0.5",
                 "mobx": "^6.3.12",
                 "mobx-react": "^7.2.1",
                 "pako": "^1.0.11",
@@ -12555,10 +12554,6 @@
             "integrity": "sha512-g3UB796vUFIY90VIv/WX3L2c8CS2MdWUww3CNrYmqza1Fg0DURc2K/O4YrnklBdQarSJ/y8JnJYDGc+1iumQjg==",
             "peer": true
         },
-        "node_modules/jwt-decode": {
-            "version": "3.1.2",
-            "license": "MIT"
-        },
         "node_modules/kind-of": {
             "version": "6.0.3",
             "dev": true,
diff --git a/package.json b/package.json
index 8eae2779c..01bc9bf7d 100644
--- a/package.json
+++ b/package.json
@@ -117,8 +117,7 @@
         "commander": "^8.3.0",
         "core-js": "^3.18",
         "crc-32": "^1.2.0",
-        "js-cookie": "^3.0.1",
-        "jwt-decode": "^3.1.2",
+        "js-cookie": "^3.0.5",
         "mobx": "^6.3.12",
         "mobx-react": "^7.2.1",
         "pako": "^1.0.11",
diff --git a/public/index.html b/public/index.html
index 75a4a2f71..16bf1a446 100644
--- a/public/index.html
+++ b/public/index.html
@@ -37,6 +37,11 @@
                 top.location = self.location;
             }
         </script>
+        <script>
+            window.addEventListener('unhandledrejection', function (event) {
+                console.log('Unhandled rejection (promise: ', event.promise, ', reason: ', event.reason, ').');
+            });
+        </script>
     </head>
 
     <body>
@@ -55,7 +60,7 @@
             <div class="rect5"></div>
         </div>
 
-        <div id="main"></div>
+        <div id="binary-bot"></div>
 
         <form id="fileUploadForm" style="display: none">
             <input
diff --git a/src/app/App.jsx b/src/app/App.jsx
index 817da1654..854451603 100644
--- a/src/app/App.jsx
+++ b/src/app/App.jsx
@@ -5,6 +5,9 @@ import GTM from '@utilities/integrations/gtm';
 import { useSelector, useDispatch } from 'react-redux';
 import { api_base } from '@api-base';
 import { observer as globalObserver } from '@utilities/observer';
+import { isProduction } from '@utils';
+import initLogHandler from '@utilities/logger';
+import { getActiveLoginId } from '@storage';
 import trackjs_config from '../botPage/view/trackJs_config';
 import Routes from '../routes';
 import ActiveSymbols from '../botPage/common/symbolApi/activeSymbols';
@@ -13,19 +16,21 @@ import { setActiveSymbols } from '../redux-store/client-slice';
 const App = () => {
     const dispatch = useDispatch();
     const has_active_symbols = useSelector(state => state.client.active_symbols);
-    const has_logged_in = useSelector(state => state.client.is_logged);
+    const is_logged_in = useSelector(state => state.client.is_logged);
 
-    const initActiveSymbols = data => {
-        symbolPromise.then(() => {
-            try {
-                /* eslint-disable no-new */
-                new ActiveSymbols(data.active_symbols);
-            } catch (error) {
-                globalObserver.emit('Error', error);
-            }
-            dispatch(setActiveSymbols(data));
-        });
-    };
+    React.useEffect(() => {
+        if (isProduction()) {
+            TrackJS.install(trackjs_config);
+            GTM.init();
+        }
+    }, []);
+
+    React.useEffect(() => {
+        if (isProduction()) {
+            const user_id = getActiveLoginId();
+            initLogHandler(user_id);
+        }
+    }, [initLogHandler]);
 
     React.useEffect(() => {
         api_base.api.expectResponse('authorize').then(() =>
@@ -37,7 +42,7 @@ const App = () => {
         /* This code is used to monitor active_symbols when the user is not logged in and
         will initialize the app without requiring an authorization response. */
         const listenToActiveSymbols = data => {
-            if (!has_logged_in && data.msg_type === 'active_symbols') {
+            if (!is_logged_in && data.msg_type === 'active_symbols') {
                 initActiveSymbols(data);
             }
         };
@@ -49,8 +54,18 @@ const App = () => {
         };
     }, []);
 
-    TrackJS.install(trackjs_config);
-    GTM.init();
+    const initActiveSymbols = data => {
+        symbolPromise.then(() => {
+            try {
+                /* eslint-disable no-new */
+                new ActiveSymbols(data.active_symbols);
+            } catch (error) {
+                globalObserver.emit('Error', error);
+            }
+            dispatch(setActiveSymbols(data));
+        });
+    };
+
     $.ajaxSetup({
         cache: false,
     });
diff --git a/src/components/Main/main.jsx b/src/components/Main/main.jsx
index 082e14302..e4a0c216f 100644
--- a/src/components/Main/main.jsx
+++ b/src/components/Main/main.jsx
@@ -2,17 +2,15 @@ import React from 'react';
 import Helmet from 'react-helmet';
 import { useDispatch, useSelector } from 'react-redux';
 import { useNavigate } from 'react-router-dom';
-import { TrackJS } from 'trackjs';
 import { getRelatedDeriveOrigin, queryToObjectArray } from '@utils';
 import { translate } from '@i18n';
-import { getClientAccounts, isDone, getLanguage, getTourState, getActiveLoginId } from '@storage';
+import { getClientAccounts, isDone, getLanguage, getTourState } from '@storage';
 import SidebarToggle from '@components/common/SidebarToggle';
 import ToolBox from '@components/ToolBox';
 import useQuery from '@components/hooks/useQuery';
 import { updateActiveAccount, updateIsLogged, setLoginId } from '@redux-store/client-slice';
 import { setAccountSwitcherLoader, setShouldReloadWorkspace, updateShowTour } from '@redux-store/ui-slice';
 import { observer as globalObserver } from '@utilities/observer';
-import logHandler from '@utilities/logger';
 import { loginAndSetTokens } from '../../common/appId';
 import Blockly from '../../blockly';
 import LogTable from '../../botPage/view/LogTable';
@@ -29,10 +27,6 @@ const Main = () => {
     const { should_reload_workspace } = useSelector(state => state.ui);
     const query_object = useQuery();
 
-    React.useEffect(() => {
-        logHandler();
-    }, [logHandler]);
-
     React.useEffect(() => {
         window.addEventListener('storage', event => {
             if (event.key === 'active_loginid') {
@@ -112,10 +106,6 @@ const Main = () => {
             $('.show-on-load').show();
             $('.barspinner').hide();
             window.dispatchEvent(new Event('resize'));
-            const userId = getActiveLoginId();
-            if (userId) {
-                TrackJS.configure({ userId });
-            }
             return _blockly.initPromise;
         });
 
diff --git a/src/index.js b/src/index.js
index dff4d0c2a..2f584f1e0 100644
--- a/src/index.js
+++ b/src/index.js
@@ -15,5 +15,5 @@ ReactDOM.render(
     <Provider store={store}>
         <App />
     </Provider>,
-    document.getElementById('main')
+    document.getElementById('binary-bot')
 );
diff --git a/src/utilities/logger.js b/src/utilities/logger.js
index ce2e93fdd..f18f969ca 100644
--- a/src/utilities/logger.js
+++ b/src/utilities/logger.js
@@ -1,6 +1,5 @@
 import { TrackJS } from 'trackjs';
 import { isMobile } from '@utils';
-import { getActiveLoginId } from '@storage';
 import { observer as globalObserver } from '@utilities/observer';
 import { trackJSTrack } from '@utilities/integrations/trackJSTrack';
 import { isIOS } from './osDetect';
@@ -58,12 +57,11 @@ const waitForNotifications = () => {
     );
 };
 
-const logHandler = () => {
-    const userId = getActiveLoginId();
+const initLogHandler = userId => {
     if (userId) {
         TrackJS.configure({ userId });
     }
     waitForNotifications();
 };
 
-export default logHandler;
+export default initLogHandler;

From ecd6e3b4f3d1fe24666bf201c5776707f64c4735 Mon Sep 17 00:00:00 2001
From: Sandeep <sandeep@regentmarkets.com>
Date: Tue, 6 Feb 2024 17:34:19 +0800
Subject: [PATCH 4/4] refactor: :recycle: added stringified console and
 fallback for google drive promises

---
 public/index.html                         |  9 ++++++++-
 src/utilities/integrations/GoogleDrive.js | 11 +++++++++--
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/public/index.html b/public/index.html
index 16bf1a446..0eefb2c85 100644
--- a/public/index.html
+++ b/public/index.html
@@ -39,7 +39,14 @@
         </script>
         <script>
             window.addEventListener('unhandledrejection', function (event) {
-                console.log('Unhandled rejection (promise: ', event.promise, ', reason: ', event.reason, ').');
+                console.log(
+                    'Unhandled rejection (promise: ',
+                    event.promise,
+                    ', reason: ',
+                    event.reason,
+                    ').',
+                    JSON.stringify(event.promise)
+                );
             });
         </script>
     </head>
diff --git a/src/utilities/integrations/GoogleDrive.js b/src/utilities/integrations/GoogleDrive.js
index fc4244aa9..4c7506d62 100644
--- a/src/utilities/integrations/GoogleDrive.js
+++ b/src/utilities/integrations/GoogleDrive.js
@@ -71,7 +71,12 @@ class GoogleDriveUtil {
         this.auth = null;
         this.is_authorized = false;
         // Fetch Google API script and initialize class fields
-        loadExternalScript(this.api_url_identity).then(() => this.initUrlIdentity());
+        // eslint-disable-next-line no-console
+        loadExternalScript(this.api_url_identity)
+            .then(() => this.initUrlIdentity())
+            .catch(console.log);
+
+        // eslint-disable-next-line no-console
         loadExternalScript(this.api_url_gdrive)
             .then(() =>
                 gapi.load(this.auth_scope, async () => {
@@ -80,7 +85,9 @@ class GoogleDriveUtil {
             )
             .then(() => {
                 store.dispatch(setGdReady(true));
-            });
+                // eslint-disable-next-line no-console
+            })
+            .catch(console.error);
     }
 
     initUrlIdentity = () => {