Merge branch 'beta'

aminmarashi · aminmarashi · commit a13a0a213429 · 2016-10-20T18:26:24.000+08:00
diff --git a/src/botPage/bot/symbol/__tests__/activeSymbols.js b/src/botPage/bot/symbol/__tests__/activeSymbols.js
diff --git a/src/botPage/bot/symbol/activeSymbols.js b/src/botPage/bot/symbol/activeSymbols.js
@@ -57,11 +57,4 @@ export default class ActiveSymbols {
   getSymbols() {
     return parsedSymbols
   }
-  getSymbolNames() {
-    const symbols = _.clone(parsedSymbols)
-    for (const key of Object.keys(symbols)) {
-      symbols[key] = symbols[key].display
-    }
-    return symbols
-  }
 }
diff --git a/src/botPage/view/blockly/blocks/trade/markets.js b/src/botPage/view/blockly/blocks/trade/markets.js
@@ -5,29 +5,29 @@ import { bot } from '../../../../bot'
 import { BlocklyError } from '../../../../../common/error'
 
 export default () => {
-  const symbolNames = bot.symbol.activeSymbols.getSymbolNames()
-  for (const symbol of Object.keys(symbolNames)) {
-    const allowedCategories = bot.symbol.getAllowedCategoryNames(symbol)
+  const symbols = bot.symbol.activeSymbols.getSymbols()
+  for (const k of Object.keys(symbols)) {
+    const allowedCategories = bot.symbol.getAllowedCategoryNames(k)
     if (allowedCategories.length) {
-      Blockly.Blocks[symbol] = {
+      Blockly.Blocks[k] = {
         init: function init() {
           this.appendDummyInput()
-            .appendField(symbolNames[symbol])
+            .appendField(symbols[k].display)
           this.appendDummyInput()
             .appendField(`${translator.translateText('Accepts')}: (${allowedCategories})`)
           this.appendStatementInput('CONDITION')
             .setCheck('Condition')
           this.setInputsInline(false)
           this.setPreviousStatement(true, null)
           this.setColour('#f2f2f2')
-          this.setTooltip(`${translator.translateText('Chooses the symbol:')} ${symbolNames[symbol]}`); // eslint-disable-line max-len
+          this.setTooltip(`${translator.translateText('Chooses the symbol:')} ${symbols[k].display}`); // eslint-disable-line max-len
           this.setHelpUrl('https://github.com/binary-com/binary-bot/wiki')
         },
         onchange: function onchange(ev) {
           submarket(this, ev)
         },
       }
-      Blockly.JavaScript[symbol] = function market(block) {
+      Blockly.JavaScript[k] = function market(block) {
         const condition = Blockly.JavaScript.statementToCode(block, 'CONDITION')
         if (!condition) {
           return new BlocklyError(
@@ -37,7 +37,7 @@ export default () => {
       getTradeOptions = function getTradeOptions() {
         var tradeOptions = {}
         tradeOptions = ${condition.trim()}
-        tradeOptions.symbol = '${bot.symbol.activeSymbols.getSymbols()[symbol].symbol}'
+        tradeOptions.symbol = '${symbols[k].symbol}'
         return tradeOptions
       }
       `
diff --git a/src/botPage/view/blockly/relationChecker.js b/src/botPage/view/blockly/relationChecker.js
@@ -82,9 +82,9 @@ export const condition = (blockObj, ev, calledByParent) => {
       disable(blockObj,
         translator.translateText('Trade Type blocks have to be added to submarket blocks'))
     } else if (!bot.symbol.isConditionAllowedInSymbol(blockObj.parentBlock_.type, blockObj.type)) {
-      const symbol = bot.symbol.activeSymbols.getSymbolNames()[blockObj.parentBlock_.type]
       disable(blockObj,
-        `${symbol} ${translator.translateText('does not support category:')}`
+        `${bot.symbol.activeSymbols.getSymbols()[blockObj.parentBlock_.type].display}`
+        + ` ${translator.translateText('does not support category:')}`
         + ` ${bot.symbol.getCategoryNameForCondition(blockObj.type)}`
         + `, ${translator.translateText('Allowed categories are')}`
         + ` ${bot.symbol.getAllowedCategoryNames(blockObj.parentBlock_.type)}`)

Original file line number	Diff line number	Diff line change
`@@ -57,11 +57,4 @@ export default class ActiveSymbols {`
`57`	`57`	`getSymbols() {`
`58`	`58`	`return parsedSymbols`
`59`	`59`	`}`
`60`		`- getSymbolNames() {`
`61`		`- const symbols = _.clone(parsedSymbols)`
`62`		`- for (const key of Object.keys(symbols)) {`
`63`		`- symbols[key] = symbols[key].display`
`64`		`- }`
`65`		`- return symbols`
`66`		`- }`
`67`	`60`	`}`