V20190211_0

src/botPage/common/symbolApi/index.js

@@ -1,7 +1,7 @@
 import ActiveSymbols from './activeSymbols';
 import config from '../../common/const';
 import { getObjectValue } from '../../../common/utils/tools';
-import { getTokenList } from '../../../common/utils/storageManager';
+import { getTokenList, removeAllTokens } from '../../../common/utils/storageManager';
 
 const noop = () => {};
 
@@ -44,7 +44,7 @@ export default class _Symbol {
     constructor(api) {
         this.api = api;
         this.initPromise = new Promise(resolve => {
-            const getActiveSymbolsPromise = () => {
+            const getActiveSymbolsLogic = () => {
                 this.api.getActiveSymbolsBrief().then(r => {
                     this.activeSymbols = new ActiveSymbols(r.active_symbols);
                     this.api.getAssetIndex().then(r2 => {
@@ -53,17 +53,19 @@ export default class _Symbol {
                     }, noop);
                 }, noop);
             };
-            // Authorize when possible for accurate offered symbols, assetindex
-            const getAuthorisePromise = () => {
-                const tokenList = getTokenList();
-                if (tokenList.length) {
-                    return this.api.authorize(tokenList[0].token);
-                }
-                return new Promise(r => r());
-            };
-            getAuthorisePromise()
-                .then(() => getActiveSymbolsPromise(), noop)
-                .catch(() => getActiveSymbolsPromise(), noop);
+            // Authorize the WS connection when possible for accurate offered Symbols & AssetIndex
+            const tokenList = getTokenList();
+            if (tokenList.length) {
+                this.api
+                    .authorize(tokenList[0].token)
+                    .then(getActiveSymbolsLogic())
+                    .catch(() => {
+                        removeAllTokens();
+                        getActiveSymbolsLogic();
+                    });
+            } else {
+                getActiveSymbolsLogic();
+            }
         });
     }
     /* eslint-disable class-methods-use-this */

src/botPage/view/View.js

@@ -56,10 +56,6 @@ api.events.on('website_status', response => {
     }
 });
 
-api.send({ time: '1' }).then(response => {
-    ReactDOM.render(<ServerTime startTime={response.time} />, $('#server-time')[0]);
-});
-
 api.events.on('balance', response => {
     const {
         balance: { balance: b, currency },
@@ -175,11 +171,12 @@ const getActiveToken = (tokenList, activeToken) => {
 
 const updateTokenList = () => {
     const tokenList = getTokenList();
-    const loginButton = $('#login');
-    const accountList = $('#account-list');
+    const loginButton = $('#login, #toolbox-login');
+    const accountList = $('#account-list, #toolbox-account-list');
     if (tokenList.length === 0) {
         loginButton.show();
         accountList.hide();
+
         $('.account-id')
             .removeAttr('value')
             .text('');
@@ -190,7 +187,6 @@ const updateTokenList = () => {
     } else {
         loginButton.hide();
         accountList.show();
-
         const activeToken = getActiveToken(tokenList, getStorage(AppConstants.STORAGE_ACTIVE_TOKEN));
         updateLogo(activeToken.token);
         addBalanceForToken(activeToken.token);
@@ -200,7 +196,6 @@ const updateTokenList = () => {
         }
         tokenList.forEach(tokenInfo => {
             const prefix = isVirtual(tokenInfo) ? 'Virtual Account' : `${tokenInfo.loginInfo.currency} Account`;
-
             if (tokenInfo === activeToken) {
                 $('.account-id')
                     .attr('value', `${tokenInfo.token}`)
@@ -277,6 +272,7 @@ export default class View {
                         applyToolboxPermissions();
                         renderReactComponents();
                         if (!getTokenList().length) updateLogo();
+                        this.showHeader(getStorage('showHeader') !== 'false');
                         resolve();
                     });
                 });
@@ -468,11 +464,13 @@ export default class View {
 
         $('#showSummary').click(showSummary);
 
+        $('#toggleHeaderButton').click(() => this.showHeader($('#header').is(':hidden')));
+
         $('#loadXml').click(() => {
             $('#files').click();
         });
 
-        $('#logout').click(() => {
+        $('#logout, #toolbox-logout').click(() => {
             setBeforeUnload(true);
             logout();
             hideRealityCheck();
@@ -573,7 +571,7 @@ export default class View {
                 .catch(() => {});
         });
 
-        $('#login')
+        $('#login, #toolbox-login')
             .bind('click.login', () => {
                 setBeforeUnload(true);
                 document.location = getOAuthURL();
@@ -636,6 +634,22 @@ export default class View {
             }
         });
     }
+    showHeader = show => {
+        const $header = $('#header');
+        const $topbarAccount = $('#toolbox-account');
+        const $toggleHeaderButton = $('.icon-hide-header');
+        if (show) {
+            $header.show(0);
+            $topbarAccount.hide(0);
+            $toggleHeaderButton.removeClass('enabled');
+        } else {
+            $header.hide(0);
+            $topbarAccount.show(0);
+            $toggleHeaderButton.addClass('enabled');
+        }
+        setStorage('showHeader', show);
+        window.dispatchEvent(new Event('resize'));
+    };
 }
 
 function initRealityCheck(stopCallback) {
@@ -648,6 +662,7 @@ function initRealityCheck(stopCallback) {
     );
 }
 function renderReactComponents() {
+    ReactDOM.render(<ServerTime api={api} />, $('#server-time')[0]);
     ReactDOM.render(<Tour />, $('#tour')[0]);
     ReactDOM.render(
         <OfficialVersionWarning

src/botPage/view/blockly/blocks/shared.js

@@ -3,7 +3,12 @@ import { symbolApi } from '../../shared';
 import config from '../../../common/const';
 import { generateLiveApiInstance } from '../../../../common/appId';
 import { translate } from '../../../../common/i18n';
-import { get as getStorage, set as setStorage, getTokenList } from '../../../../common/utils/storageManager';
+import {
+    get as getStorage,
+    set as setStorage,
+    getTokenList,
+    removeAllTokens,
+} from '../../../../common/utils/storageManager';
 
 let purchaseChoices = [[translate('Click to select'), '']];
 
@@ -136,21 +141,27 @@ export const dependentFieldMapping = {
 
 export const getAvailableDurations = (symbol, selectedContractType) => {
     const contractsForStore = JSON.parse(getStorage('contractsForStore') || '[]');
-    const tokenList = getTokenList();
+    let tokenList = getTokenList();
     const defaultDurations = [
         [translate('Ticks'), 't'],
         [translate('Seconds'), 's'],
         [translate('Minutes'), 'm'],
         [translate('Hours'), 'h'],
         [translate('Days'), 'd'],
     ];
+
     const getContractsForSymbolFromApi = async underlyingSymbol => {
         // Refactor this when reducing WS connections
-        let api = generateLiveApiInstance();
+        const api = generateLiveApiInstance();
 
         // Try to authorize for accurate contracts response
         if (tokenList.length) {
-            await api.authorize(tokenList[0].token);
+            try {
+                await api.authorize(tokenList[0].token);
+            } catch (e) {
+                removeAllTokens();
+                tokenList = [];
+            }
         }
 
         const response = await api.getContractsForSymbol(underlyingSymbol);
@@ -176,7 +187,6 @@ export const getAvailableDurations = (symbol, selectedContractType) => {
             setStorage('contractsForStore', JSON.stringify(contractsForStore));
         }
         api.disconnect();
-        api = null;
         return contractsForSymbol;
     };
     const getDurationsForContract = contractsForSymbol => {

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

@@ -76,6 +76,17 @@ export const barrierOffset = block => {
             .setCheck('Number')
             .appendField(`${translate('Barrier Offset')} 1:`)
             .appendField(new Blockly.FieldDropdown(config.barrierTypes), 'BARRIEROFFSETTYPE_LIST');
+    } else {
+        const barrierOffsetList = block.getField('BARRIEROFFSETTYPE_LIST');
+        if (!block.workspace.getBlockById('BARRIERVALUE')) {
+            const barrierValue = block.workspace.newBlock('math_number', 'BARRIERVALUE');
+            barrierOffsetList.setValue('+');
+            barrierValue.setFieldValue('0.274', 'NUM');
+            barrierValue.setShadow(true);
+            barrierValue.outputConnection.connect(block.getInput('BARRIEROFFSET').connection);
+            barrierValue.initSvg();
+            barrierValue.render();
+        }
     }
 };
 
@@ -86,6 +97,17 @@ export const secondBarrierOffset = block => {
             .setCheck('Number')
             .appendField(`${translate('Barrier Offset')} 2:`)
             .appendField(new Blockly.FieldDropdown(config.barrierTypes), 'SECONDBARRIEROFFSETTYPE_LIST');
+    } else {
+        const barrierOffsetList = block.getField('SECONDBARRIEROFFSETTYPE_LIST');
+        if (!block.workspace.getBlockById('SECONDBARRIERVALUE')) {
+            const secondBarrierValue = block.workspace.newBlock('math_number', 'SECONDBARRIERVALUE');
+            barrierOffsetList.setValue('-');
+            secondBarrierValue.setFieldValue('0.274', 'NUM');
+            secondBarrierValue.setShadow(true);
+            secondBarrierValue.outputConnection.connect(block.getInput('SECONDBARRIEROFFSET').connection);
+            secondBarrierValue.initSvg();
+            secondBarrierValue.render();
+        }
     }
 };
 

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

@@ -30,8 +30,7 @@ const decorateTrade = ev => {
     }
     if ([Blockly.Events.CHANGE, Blockly.Events.MOVE, Blockly.Events.CREATE].includes(ev.type)) {
         const symbol = trade.getFieldValue('SYMBOL_LIST');
-
-        if (symbol && (ev.group === 'reset' || ev.type !== Blockly.Events.CREATE)) {
+        if (symbol) {
             globalObserver.emit('bot.init', symbol);
         }
 

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

@@ -38,9 +38,13 @@ export default () => {
                     const tradeType = getTradeType(this);
 
                     const prevSelectedDuration = durationTypeList.getValue();
+
+                    Blockly.Events.recordUndo = false;
                     this.setFieldValue(translate('Loading...'), 'DURATIONTYPE_LIST');
+                    Blockly.Events.recordUndo = true;
 
                     getAvailableDurations(symbol, tradeType).then(durations => {
+                        Blockly.Events.recordUndo = false;
                         // Prevent UI flickering by only updating field if options have changed
                         // eslint-disable-next-line no-underscore-dangle
                         if (JSON.stringify(durationTypeList.menuGenerator_) !== JSON.stringify(durations)) {
@@ -56,6 +60,7 @@ export default () => {
                         } else {
                             this.setFieldValue(translate('Not available'), 'DURATIONTYPE_LIST');
                         }
+                        Blockly.Events.recordUndo = true;
                     });
                 }
             }

src/botPage/view/blockly/index.js

@@ -243,11 +243,11 @@ export default class _Blockly {
                         this.blocksXmlStr = Blockly.Xml.domToPrettyText(main);
                         Blockly.Xml.domToWorkspace(main.getElementsByTagName('xml')[0], workspace);
                         this.zoomOnPlusMinus();
-                        Blockly.mainWorkspace.clearUndo();
                         disposeBlocksWithLoaders();
                         setTimeout(() => {
                             setBeforeUnload(true);
                             Blockly.mainWorkspace.cleanUp();
+                            Blockly.mainWorkspace.clearUndo();
                         }, 0);
                         resolve();
                     });
@@ -417,3 +417,43 @@ while(true) {
     }
     /* eslint-enable */
 }
+
+// Hooks to override default Blockly behaviour
+/* eslint-disable no-unused-expressions */
+const originalContextMenuFn = Blockly.ContextMenu.show;
+Blockly.ContextMenu.show = (e, menuOptions, rtl) => {
+    // Rename 'Clean up blocks'
+    menuOptions.some(option => {
+        if (option.text === Blockly.Msg.CLEAN_UP) {
+            option.text = translate('Rearrange vertically'); // eslint-disable-line no-param-reassign
+            return true;
+        }
+        return false;
+    }) &&
+        /* Remove delete all blocks, but only when 'Clean up blocks' is available (i.e. workspace)
+         * This allows users to still delete root blocks containing blocks
+         */
+        menuOptions.some((option, i) => {
+            if (
+                option.text === Blockly.Msg.DELETE_BLOCK ||
+                option.text.replace(/[0-9]+/, '%1') === Blockly.Msg.DELETE_X_BLOCKS
+            ) {
+                menuOptions.splice(i, 1);
+                return true;
+            }
+            return false;
+        });
+    // Open the Elev.io widget when clicking 'Help'
+    // eslint-disable-next-line no-underscore-dangle
+    if (window._elev) {
+        menuOptions.some(option => {
+            if (option.text === Blockly.Msg.HELP) {
+                option.callback = () => window._elev.openHome(); // eslint-disable-line no-param-reassign, no-underscore-dangle
+                return true;
+            }
+            return false;
+        });
+    }
+    originalContextMenuFn(e, menuOptions, rtl);
+};
+/* eslint-enable */

src/botPage/view/react-components/HeaderWidgets.js

@@ -1,25 +1,35 @@
 import React, { Component } from 'react';
 
 export default class ServerTime extends Component {
-    constructor() {
+    constructor(props) {
         super();
         this.state = {};
+        const getServerTime = () => {
+            props.api.send({ time: '1' }).then(response =>
+                this.setState(
+                    {
+                        date: new Date(response.time * 1000),
+                    },
+                    this.updateTime()
+                )
+            );
+        };
+        getServerTime();
+        setInterval(() => this.updateTime(), 1000);
+        setInterval(() => getServerTime(), 30000);
     }
     updateTime() {
-        this.date.setSeconds(this.date.getSeconds() + 1);
-        const year = this.date.getUTCFullYear();
-        const month = `0${this.date.getMonth() + 1}`.slice(-2);
-        const date = `0${this.date.getUTCDate()}`.slice(-2);
-        const hours = `0${this.date.getUTCHours()}`.slice(-2);
-        const minutes = `0${this.date.getMinutes()}`.slice(-2);
-        const seconds = `0${this.date.getSeconds()}`.slice(-2);
-        this.setState({ date: `${year}-${month}-${date} ${hours}:${minutes}:${seconds} GMT` });
-    }
-    componentWillMount() {
-        this.date = new Date(this.props.startTime * 1000);
-        setInterval(() => this.updateTime(), 1000);
+        if (!this.state.date) return;
+        this.state.date.setSeconds(this.state.date.getSeconds() + 1);
+        const year = this.state.date.getUTCFullYear();
+        const month = `0${this.state.date.getMonth() + 1}`.slice(-2);
+        const day = `0${this.state.date.getUTCDate()}`.slice(-2);
+        const hours = `0${this.state.date.getUTCHours()}`.slice(-2);
+        const minutes = `0${this.state.date.getMinutes()}`.slice(-2);
+        const seconds = `0${this.state.date.getSeconds()}`.slice(-2);
+        this.setState({ dateString: `${year}-${month}-${day} ${hours}:${minutes}:${seconds} GMT` });
     }
     render() {
-        return <b>{this.state.date}</b>;
+        return <b>{this.state.dateString}</b>;
     }
 }