dev to beta

.eslintrc

@@ -19,7 +19,6 @@
   "globals": {
     "Blockly": false,
     "trackJs": false,
-    "amplitude": false,
     "jest": false
   },
   "plugins": [

src/botPage/bot/cli.js

@@ -3,7 +3,6 @@ import fs from 'fs';
 import readline from 'readline';
 import program from 'commander';
 import { observer as globalObserver } from '../../common/utils/observer';
-import { version } from '../../../package.json';
 import { createInterpreter } from './CliTools';
 
 const log = (...args) => console.log(`${new Date().toLocaleTimeString()}:`, ...args); // eslint-disable-line no-console
@@ -15,7 +14,6 @@ setInterval(() => {}, 2147483647); // Keep node alive
 let filename;
 
 program
-    .version(version)
     .usage('[filename]')
     .arguments('[filename]')
     .action(fn => {

src/botPage/view/blockly/blocks/trade/components.js

@@ -78,10 +78,14 @@ export const barrierOffset = block => {
             .appendField(new Blockly.FieldDropdown(config.barrierTypes), 'BARRIEROFFSETTYPE_LIST');
     } else {
         const barrierOffsetList = block.getField('BARRIEROFFSETTYPE_LIST');
-        if (!block.workspace.getBlockById('BARRIERVALUE')) {
+
+        if (
+            !block.workspace.getBlockById('BARRIERVALUE') &&
+            !block.getInput('BARRIEROFFSET').connection.isConnected()
+        ) {
             const barrierValue = block.workspace.newBlock('math_number', 'BARRIERVALUE');
             barrierOffsetList.setValue('+');
-            barrierValue.setFieldValue('0.274', 'NUM');
+            barrierValue.setFieldValue('0.27', 'NUM');
             barrierValue.setShadow(true);
             barrierValue.outputConnection.connect(block.getInput('BARRIEROFFSET').connection);
             barrierValue.initSvg();
@@ -99,10 +103,14 @@ export const secondBarrierOffset = block => {
             .appendField(new Blockly.FieldDropdown(config.barrierTypes), 'SECONDBARRIEROFFSETTYPE_LIST');
     } else {
         const barrierOffsetList = block.getField('SECONDBARRIEROFFSETTYPE_LIST');
-        if (!block.workspace.getBlockById('SECONDBARRIERVALUE')) {
+
+        if (
+            !block.workspace.getBlockById('SECONDBARRIERVALUE') &&
+            !block.getInput('SECONDBARRIEROFFSET').connection.isConnected()
+        ) {
             const secondBarrierValue = block.workspace.newBlock('math_number', 'SECONDBARRIERVALUE');
             barrierOffsetList.setValue('-');
-            secondBarrierValue.setFieldValue('0.274', 'NUM');
+            secondBarrierValue.setFieldValue('0.27', 'NUM');
             secondBarrierValue.setShadow(true);
             secondBarrierValue.outputConnection.connect(block.getInput('SECONDBARRIEROFFSET').connection);
             secondBarrierValue.initSvg();

src/botPage/view/blockly/customBlockly.js

@@ -261,3 +261,30 @@ Blockly.FieldLabel.prototype.init = function() {
     // Force a render.
     this.render_();
 };
+// Override inline editor blockly
+Blockly.FieldTextInput.prototype.showInlineEditor_ = function(quietInput) {
+    Blockly.WidgetDiv.show(this, this.sourceBlock_.RTL, this.widgetDispose_());
+    var div = Blockly.WidgetDiv.DIV;
+    // Create the input.
+    var htmlInput = document.createElement('input');
+    htmlInput.className = 'blocklyHtmlInput';
+    htmlInput.setAttribute('spellcheck', this.spellcheck_);
+    htmlInput.setAttribute('data-lpignore', 'true');
+    var fontSize = Blockly.FieldTextInput.FONTSIZE * this.workspace_.scale + 'pt';
+    div.style.fontSize = fontSize;
+    htmlInput.style.fontSize = fontSize;
+
+    Blockly.FieldTextInput.htmlInput_ = htmlInput;
+    div.appendChild(htmlInput);
+
+    htmlInput.value = htmlInput.defaultValue = this.text_;
+    htmlInput.oldValue_ = null;
+    this.validate_();
+    this.resizeEditor_();
+    if (!quietInput) {
+        htmlInput.focus();
+        htmlInput.select();
+    }
+
+    this.bindEvents_(htmlInput);
+};

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;
     }

src/botPage/view/blockly/utils.js

@@ -97,7 +97,12 @@ 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 (window.trackJs) {
+            trackJs.track(errorMessage);
+        }
     }
     return validTradeTypeCategory;
 };

src/botPage/view/index.js

@@ -5,7 +5,6 @@ import 'notifyjs-browser';
 import '../../common/binary-ui/dropdown';
 import Elevio from '../../common/elevio';
 import View from './View';
-import { version } from '../../../package.json';
 
 $.ajaxSetup({
     cache: false,
@@ -31,7 +30,6 @@ view.initPromise.then(() => {
     $('.barspinner').hide();
     window.dispatchEvent(new Event('resize'));
     Elevio.init();
-    trackJs.addMetadata('version', version);
     trackJs.configure({
         userId: $('.account-id')
             .first()

src/botPage/view/logger.js

@@ -1,7 +1,6 @@
 import { observer as globalObserver } from '../../common/utils/observer';
 import { getToken } from '../../common/utils/storageManager';
 import { translate } from '../../common/i18n';
-import { isVirtual } from '../common/tools';
 
 const log = (type, ...args) => {
     if (type === 'warn') {
@@ -91,8 +90,6 @@ const waitForNotifications = () => {
         'log.trade.finish',
     ];
 
-    const amplitudeList = ['log.bot.login', 'log.trade.finish'];
-
     logList.forEach(event => globalObserver.register(event, d => log('info', event, d)));
 
     globalObserver.register('Notify', notify);
@@ -102,21 +99,6 @@ const waitForNotifications = () => {
     notifList.forEach(className =>
         globalObserver.register(`ui.log.${className}`, message => notify({ className, message, position: 'right' }))
     );
-
-    amplitudeList.forEach(event => globalObserver.register(event, d => amplitude.getInstance().logEvent(event, d)));
-
-    globalObserver.register('log.revenue', data => {
-        const { user, profit, contract } = data;
-
-        if (typeof amplitude !== 'undefined' && !isVirtual(user)) {
-            const revenue = new amplitude.Revenue()
-                .setProductId(`${contract.underlying}.${contract.contract_type}`)
-                .setPrice(-profit)
-                .setRevenueType(profit < 0 ? 'loss' : 'win');
-
-            amplitude.getInstance().logRevenueV2(revenue, { contract });
-        }
-    });
 };
 
 const logHandler = () => {
@@ -125,10 +107,6 @@ const logHandler = () => {
         .attr('value');
     const userId = getToken(token).accountName;
 
-    if (amplitude) {
-        amplitude.getInstance().setUserId(userId);
-    }
-
     if (trackJs) {
         trackJs.configure({ userId });
     }

src/common/elevio.js

@@ -2,19 +2,26 @@ import { generateLiveApiInstance } from './appId';
 // import { getLanguage } from '../common/lang';
 import { getTokenList } from './utils/storageManager';
 import { translate } from '../common/i18n';
+import { getLanguage } from './lang';
 
 const Elevio = (() => {
     const init = () => {
         if (!window._elev) return; // eslint-disable-line no-underscore-dangle
+
+        // eslint-disable-next-line no-underscore-dangle
+        window._elev.on('widget:opened', () => window._elev.openArticle('43'));
+
         // eslint-disable-next-line no-underscore-dangle
         window._elev.on('load', elev => {
-            // const availableElevLanguages = ['es', 'id', 'pt', 'ru'];
-            // const currentLanguage = getLanguage().toLowerCase();
-            // if (availableElevLanguages.indexOf(currentLanguage) !== -1) {
-            //     window._elev.setLanguage(currentLanguage); // eslint-disable-line no-underscore-dangle
-            // }
-            // eslint-disable-next-line no-underscore-dangle
-            window._elev.setSettings({
+            const availableLanguages = ['en', 'es', 'id', 'pt', 'ru'];
+            const currentLanguage = getLanguage();
+            if (availableLanguages.includes(currentLanguage)) {
+                elev.setLanguage(currentLanguage);
+            } else {
+                elev.setLanguage('en');
+            }
+
+            elev.setSettings({
                 page_url: `${document.location.protocol}//${document.location.hostname}${document.location.pathname}`,
             });
             setUserInfo(elev);

static/css/_footer.scss

@@ -135,7 +135,7 @@
         font-size: $FONT_SIZE_XS;
         position: fixed;
         bottom: 0;
-        z-index: 10000;
+        z-index: 100 !important;
         width: 100%;
     }
     #status_notification {