From 82f66e05b3986a0d8519548adf2d3b5654c28bd9 Mon Sep 17 00:00:00 2001 From: Amam Mustofa Date: Tue, 19 Feb 2019 17:23:00 +0800 Subject: [PATCH 1/4] add trackjs error --- src/botPage/view/blockly/utils.js | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/botPage/view/blockly/utils.js b/src/botPage/view/blockly/utils.js index cf8879e3f8..032219e2e3 100644 --- a/src/botPage/view/blockly/utils.js +++ b/src/botPage/view/blockly/utils.js @@ -97,7 +97,14 @@ export const strategyHasValidTradeTypeCategory = xml => { return false; }); if (!validTradeTypeCategory) { - globalObserver.emit('ui.log.error', translate('The strategy you tried to import is invalid.')); + const errorMessage = translate('The strategy you tried to import is invalid.'); + globalObserver.emit('ui.log.error', errorMessage); + + if (trackJs) { + const errorWithCode = new Error(errorMessage); + + trackJs.track(errorWithCode); + } } return validTradeTypeCategory; }; From 8c6424342f4baa534cd204f930668842ce5367d6 Mon Sep 17 00:00:00 2001 From: Amam Mustofa Date: Tue, 19 Feb 2019 17:32:07 +0800 Subject: [PATCH 2/4] condition of trackJs --- src/botPage/view/blockly/utils.js | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/botPage/view/blockly/utils.js b/src/botPage/view/blockly/utils.js index 032219e2e3..fe6134f221 100644 --- a/src/botPage/view/blockly/utils.js +++ b/src/botPage/view/blockly/utils.js @@ -98,13 +98,9 @@ export const strategyHasValidTradeTypeCategory = xml => { }); if (!validTradeTypeCategory) { const errorMessage = translate('The strategy you tried to import is invalid.'); - globalObserver.emit('ui.log.error', errorMessage); - - if (trackJs) { - const errorWithCode = new Error(errorMessage); - trackJs.track(errorWithCode); - } + globalObserver.emit('ui.log.error', errorMessage); + window.trackJs && trackJs.console.error(errorMessage); // eslint-disable-line no-unused-expressions } return validTradeTypeCategory; }; From fb35badd0b9f47570be55fc3c0e3f380c095ee57 Mon Sep 17 00:00:00 2001 From: Amam Mustofa Date: Tue, 19 Feb 2019 17:33:54 +0800 Subject: [PATCH 3/4] change from console to track --- src/botPage/view/blockly/utils.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/botPage/view/blockly/utils.js b/src/botPage/view/blockly/utils.js index fe6134f221..a748581488 100644 --- a/src/botPage/view/blockly/utils.js +++ b/src/botPage/view/blockly/utils.js @@ -100,7 +100,7 @@ export const strategyHasValidTradeTypeCategory = xml => { const errorMessage = translate('The strategy you tried to import is invalid.'); globalObserver.emit('ui.log.error', errorMessage); - window.trackJs && trackJs.console.error(errorMessage); // eslint-disable-line no-unused-expressions + window.trackJs && trackJs.track(errorMessage); // eslint-disable-line no-unused-expressions } return validTradeTypeCategory; }; From 02b8a2ad47cda2c8e9abd8da9cd908cef01416a9 Mon Sep 17 00:00:00 2001 From: Amam Mustofa Date: Tue, 19 Feb 2019 18:11:49 +0800 Subject: [PATCH 4/4] invalid financial market condition --- src/botPage/view/blockly/index.js | 3 +++ src/botPage/view/blockly/utils.js | 6 ++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/botPage/view/blockly/index.js b/src/botPage/view/blockly/index.js index 47ec73cead..1ea3de507a 100644 --- a/src/botPage/view/blockly/index.js +++ b/src/botPage/view/blockly/index.js @@ -72,6 +72,9 @@ const marketsWereRemoved = xml => { }, ], }); + if (window.trackJs) { + trackJs.track('Invalid financial market'); + } $('#unavailableMarkets').dialog('open'); return true; } diff --git a/src/botPage/view/blockly/utils.js b/src/botPage/view/blockly/utils.js index a748581488..ece0b55396 100644 --- a/src/botPage/view/blockly/utils.js +++ b/src/botPage/view/blockly/utils.js @@ -98,9 +98,11 @@ export const strategyHasValidTradeTypeCategory = xml => { }); if (!validTradeTypeCategory) { const errorMessage = translate('The strategy you tried to import is invalid.'); - globalObserver.emit('ui.log.error', errorMessage); - window.trackJs && trackJs.track(errorMessage); // eslint-disable-line no-unused-expressions + + if (window.trackJs) { + trackJs.track(errorMessage); + } } return validTradeTypeCategory; };