diff --git a/package-lock.json b/package-lock.json index ccea4f72d2..10da2ed78e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -220,9 +220,9 @@ } }, "@binary-com/smartcharts": { - "version": "0.3.8", - "resolved": "https://registry.npmjs.org/@binary-com/smartcharts/-/smartcharts-0.3.8.tgz", - "integrity": "sha512-hPO3zL+vPI6YjOnSe2MJSx2OIbdsRQ4pnxL88/1YYUVmzGP93M9RJllc+IVuaU1bKqboJc2htlxvv56BpGWFtQ==", + "version": "0.3.9", + "resolved": "https://registry.npmjs.org/@binary-com/smartcharts/-/smartcharts-0.3.9.tgz", + "integrity": "sha512-dI+f5yjPffrA+yI0gMzcBOXwIr5LKePS2Hr1t36rgf7nzHE2mqsc/E15T/BIJwZYGFxrbMMwhguQ/W+Y4UrH9Q==", "requires": { "event-emitter-es6": "^1.1.5", "lodash.debounce": "^4.0.8", @@ -5311,8 +5311,7 @@ "version": "2.1.1", "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=", - "dev": true, - "optional": true + "dev": true }, "aproba": { "version": "1.2.0", @@ -5336,15 +5335,13 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz", "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=", - "dev": true, - "optional": true + "dev": true }, "brace-expansion": { "version": "1.1.11", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", "dev": true, - "optional": true, "requires": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -5361,22 +5358,19 @@ "version": "1.1.0", "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz", "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=", - "dev": true, - "optional": true + "dev": true }, "concat-map": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=", - "dev": true, - "optional": true + "dev": true }, "console-control-strings": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz", "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=", - "dev": true, - "optional": true + "dev": true }, "core-util-is": { "version": "1.0.2", @@ -5507,8 +5501,7 @@ "version": "2.0.3", "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz", "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=", - "dev": true, - "optional": true + "dev": true }, "ini": { "version": "1.3.5", @@ -5522,7 +5515,6 @@ "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz", "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=", "dev": true, - "optional": true, "requires": { "number-is-nan": "^1.0.0" } @@ -5539,7 +5531,6 @@ "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", "dev": true, - "optional": true, "requires": { "brace-expansion": "^1.1.7" } @@ -5548,15 +5539,13 @@ "version": "0.0.8", "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz", "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=", - "dev": true, - "optional": true + "dev": true }, "minipass": { "version": "2.3.5", "resolved": "https://registry.npmjs.org/minipass/-/minipass-2.3.5.tgz", "integrity": "sha512-Gi1W4k059gyRbyVUZQ4mEqLm0YIUiGYfvxhF6SIlk3ui1WVxMTGfGdQ2SInh3PDrRTVvPKgULkpJtT4RH10+VA==", "dev": true, - "optional": true, "requires": { "safe-buffer": "^5.1.2", "yallist": "^3.0.0" @@ -5577,7 +5566,6 @@ "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=", "dev": true, - "optional": true, "requires": { "minimist": "0.0.8" } @@ -5666,8 +5654,7 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz", "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=", - "dev": true, - "optional": true + "dev": true }, "object-assign": { "version": "4.1.1", @@ -5681,7 +5668,6 @@ "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", "dev": true, - "optional": true, "requires": { "wrappy": "1" } @@ -5777,8 +5763,7 @@ "version": "5.1.2", "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==", - "dev": true, - "optional": true + "dev": true }, "safer-buffer": { "version": "2.1.2", @@ -5820,7 +5805,6 @@ "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz", "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=", "dev": true, - "optional": true, "requires": { "code-point-at": "^1.0.0", "is-fullwidth-code-point": "^1.0.0", @@ -5842,7 +5826,6 @@ "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", "dev": true, - "optional": true, "requires": { "ansi-regex": "^2.0.0" } @@ -5891,15 +5874,13 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=", - "dev": true, - "optional": true + "dev": true }, "yallist": { "version": "3.0.3", "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.0.3.tgz", "integrity": "sha512-S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A==", - "dev": true, - "optional": true + "dev": true } } }, @@ -8715,7 +8696,7 @@ "dev": true, "requires": { "acorn": "^4.0.11", - "clone": "github:aminmarashi/clone#d97b4f" + "clone": "github:aminmarashi/clone#d97b4f0ff3d3afebcaaf4a2ecc9c50fbce914900" }, "dependencies": { "acorn": { @@ -14721,9 +14702,9 @@ } }, "url-search-params-polyfill": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/url-search-params-polyfill/-/url-search-params-polyfill-5.0.0.tgz", - "integrity": "sha512-+SCD22QJp4UnqPOI5UTTR0Ljuh8cHbjEf1lIiZrZ8nHTlTixqwVsVQTSfk5vrmDz7N09/Y+ka5jQr0ff35FnQQ==" + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/url-search-params-polyfill/-/url-search-params-polyfill-5.1.0.tgz", + "integrity": "sha512-yjFY7uw2xRf9e8Mg4ZVkZwtp8dMCC4cbBkEIZiTDpuSY2WJ9+Quw0wRhxncv32qaMQwmBQT+P847rO8PrFhhDA==" }, "use": { "version": "3.1.1", diff --git a/package.json b/package.json index 10e621f36a..ac5f01aeb2 100644 --- a/package.json +++ b/package.json @@ -134,7 +134,7 @@ "ws": "^3.3.3" }, "dependencies": { - "@binary-com/smartcharts": "^0.3.8", + "@binary-com/smartcharts": "^0.3.9", "babel": "^6.23.0", "binary-style": "^0.2.4", "blockly": "github:google/blockly#59e5ac6", diff --git a/src/botPage/view/blockly/blocks/trade/tradeOptions.js b/src/botPage/view/blockly/blocks/trade/tradeOptions.js index a9a5f44157..f3266c543f 100644 --- a/src/botPage/view/blockly/blocks/trade/tradeOptions.js +++ b/src/botPage/view/blockly/blocks/trade/tradeOptions.js @@ -1,6 +1,5 @@ import { setInputList, updateInputList, getParentValue } from './tools'; import { - expectValue, haveContractsForSymbol, getContractsAvailableForSymbol, getDurationsForContracts, @@ -312,15 +311,10 @@ export default () => { }, }; Blockly.JavaScript.tradeOptions = block => { - const tradeDefBlock = findTopParentBlock(block); - if (!tradeDefBlock) { - return ''; - } - - const durationValue = expectValue(block, 'DURATION'); + const durationValue = Blockly.JavaScript.valueToCode(block, 'DURATION', Blockly.JavaScript.ORDER_ATOMIC) || '0'; const durationType = block.getFieldValue('DURATIONTYPE_LIST'); const currency = block.getFieldValue('CURRENCY_LIST'); - const amount = expectValue(block, 'AMOUNT'); + const amount = Blockly.JavaScript.valueToCode(block, 'AMOUNT', Blockly.JavaScript.ORDER_ATOMIC) || '0'; const isVisibleField = field => block.getInput(field) && block.getInput(field).isVisible(); @@ -329,18 +323,29 @@ export default () => { let secondBarrierOffsetValue = 'undefined'; if (isVisibleField('PREDICTION')) { - predictionValue = expectValue(block, 'PREDICTION'); + predictionValue = + Blockly.JavaScript.valueToCode(block, 'PREDICTION', Blockly.JavaScript.ORDER_ATOMIC) || '0'; } + + const getBarrierValue = (barrierOffsetType, value) => { + // Variables should not be encapsulated in quotes + if (/^(\d+(\.\d+)?)$/.test(value)) { + return barrierOffsetType === 'absolute' ? `'${value}'` : `'${barrierOffsetType}${value}'`; + } + return barrierOffsetType === 'absolute' ? value : `'${barrierOffsetType}' + ${value}`; + }; + if (isVisibleField('BARRIEROFFSET')) { const barrierOffsetType = block.getFieldValue('BARRIEROFFSETTYPE_LIST'); - const value = expectValue(block, 'BARRIEROFFSET'); - barrierOffsetValue = barrierOffsetType === 'absolute' ? `'${value}'` : `'${barrierOffsetType}${value}'`; + const value = + Blockly.JavaScript.valueToCode(block, 'BARRIEROFFSET', Blockly.JavaScript.ORDER_ATOMIC) || '0'; + barrierOffsetValue = getBarrierValue(barrierOffsetType, value); } if (isVisibleField('SECONDBARRIEROFFSET')) { const barrierOffsetType = block.getFieldValue('SECONDBARRIEROFFSETTYPE_LIST'); - const value = expectValue(block, 'SECONDBARRIEROFFSET'); - secondBarrierOffsetValue = - barrierOffsetType === 'absolute' ? `'${value}'` : `'${barrierOffsetType}${value}'`; + const value = + Blockly.JavaScript.valueToCode(block, 'SECONDBARRIEROFFSET', Blockly.JavaScript.ORDER_ATOMIC) || '0'; + secondBarrierOffsetValue = getBarrierValue(barrierOffsetType, value); } const code = `