Merge branch 'beta'

aminmarashi · aminmarashi · commit 6d92c174da5a · 2016-10-21T13:27:07.000+08:00
diff --git a/src/botPage/view/blockly/relationChecker.js b/src/botPage/view/blockly/relationChecker.js
@@ -1,11 +1,10 @@
 /* eslint-disable no-underscore-dangle */
 import { observer } from 'binary-common-utils/lib/observer'
-import { durationAccepted, expandDuration } from 'binary-common-utils/lib/tools'
 import config from '../../../common/const'
 import { bot } from '../../bot'
 import { translator } from '../../../common/translator'
 import { findTopParentBlock, addPurchaseOptions,
-  disable, enable } from './utils'
+  disable, enable, durationToSecond, expandDuration } from './utils'
 
 const isInteger = (amount) => !isNaN(+amount) && parseInt(amount, 10) === parseFloat(amount)
 const isInRange = (amount, min, max) => !isNaN(+amount) && +amount >= min && +amount <= max
@@ -38,13 +37,13 @@ const conditionFields = (blockObj, ev, calledByParent) => {
       if (duration !== '') {
         const minDuration = bot.symbol.getLimitation(
           blockObj.parentBlock_.type, blockObj.type).minDuration
-        if (!durationAccepted(duration + durationType, minDuration)) {
+        const durationInSeconds = durationToSecond(duration + durationType)
+        if (!durationInSeconds) {
+          observer.emit('ui.log.warn', translator.translateText('Duration must be a positive integer'))
+        } else if (durationInSeconds < durationToSecond(minDuration)) {
           observer.emit('ui.log.warn',
             `${translator.translateText('Minimum duration is')} ${expandDuration(minDuration)}`)
-        } else {
-          observer.emit('tour:ticks')
-        }
-        if (durationType === 't') {
+        } else if (durationType === 't') {
           if (!isInteger(duration) || !isInRange(duration, 5, 10)) {
             observer.emit('ui.log.warn',
               translator.translateText('Number of ticks must be between 5 and 10'))
diff --git a/src/botPage/view/blockly/utils.js b/src/botPage/view/blockly/utils.js
@@ -162,3 +162,34 @@ export const enable = (blockObj) => {
   blockObj.setDisabled(false)
   Blockly.Events.recordUndo = true
 }
+
+export const expandDuration = (duration) => `${duration.replace(/t/g, ' tick')
+    .replace(/s/g, ' second')
+    .replace(/m/g, ' minute')
+    .replace(/h/g, ' hour')
+    .replace(/d/g, ' day')}(s)`
+
+export const durationToSecond = (duration) => {
+  const parsedDuration = duration.match(/^([0-9]+)([stmhd])$/)
+  if (!parsedDuration) {
+    return null
+  }
+  const durationValue = parseFloat(parsedDuration[1])
+  const durationType = parsedDuration[2]
+  if (durationType === 's') {
+    return durationValue
+  }
+  if (durationType === 't') {
+    return durationValue * 2
+  }
+  if (durationType === 'm') {
+    return durationValue * 60
+  }
+  if (durationType === 'h') {
+    return durationValue * 60 * 60
+  }
+  if (durationType === 'd') {
+    return durationValue * 60 * 60 * 24
+  }
+  return null
+}
diff --git a/src/common/translations/de.js b/src/common/translations/de.js
@@ -136,6 +136,7 @@ module.exports = {
   "af145748c9cf765a3b059eec20cb1dbb899297d8": "Blocks are loaded successfully",
   "da162a909c2981ed318d23cd9a6be1d66e0a8400": "Unrecognized file format.",
   "c3c49d3e838c8fe813d360aea7dc6b792948afde": "Markets",
+  "2f9f9096be1a1c0569a9ce54e57f0420f6b3c2e9": "Duration must be a positive integer",
   "11ee9c5d534cc8d22651092222b532917594161a": "Minimum duration is",
   "5283ac04c9a8ba8a937d1edb4ba986aeefce8bf1": "Number of ticks must be between 5 and 10",
   "ace1342bc3720b77ce510b93074041e7386d209e": "Expiry time cannot be equal to start time",
diff --git a/src/common/translations/en.js b/src/common/translations/en.js
@@ -136,6 +136,7 @@ module.exports = {
   "af145748c9cf765a3b059eec20cb1dbb899297d8": "Blocks are loaded successfully",
   "da162a909c2981ed318d23cd9a6be1d66e0a8400": "Unrecognized file format.",
   "c3c49d3e838c8fe813d360aea7dc6b792948afde": "Markets",
+  "2f9f9096be1a1c0569a9ce54e57f0420f6b3c2e9": "Duration must be a positive integer",
   "11ee9c5d534cc8d22651092222b532917594161a": "Minimum duration is",
   "5283ac04c9a8ba8a937d1edb4ba986aeefce8bf1": "Number of ticks must be between 5 and 10",
   "ace1342bc3720b77ce510b93074041e7386d209e": "Expiry time cannot be equal to start time",
diff --git a/src/common/translations/es.js b/src/common/translations/es.js
@@ -136,6 +136,7 @@ module.exports = {
   "af145748c9cf765a3b059eec20cb1dbb899297d8": "Blocks are loaded successfully",
   "da162a909c2981ed318d23cd9a6be1d66e0a8400": "Unrecognized file format.",
   "c3c49d3e838c8fe813d360aea7dc6b792948afde": "Markets",
+  "2f9f9096be1a1c0569a9ce54e57f0420f6b3c2e9": "Duration must be a positive integer",
   "11ee9c5d534cc8d22651092222b532917594161a": "Minimum duration is",
   "5283ac04c9a8ba8a937d1edb4ba986aeefce8bf1": "Number of ticks must be between 5 and 10",
   "ace1342bc3720b77ce510b93074041e7386d209e": "Expiry time cannot be equal to start time",
diff --git a/src/common/translations/fr.js b/src/common/translations/fr.js
@@ -136,6 +136,7 @@ module.exports = {
   "af145748c9cf765a3b059eec20cb1dbb899297d8": "Blocks are loaded successfully",
   "da162a909c2981ed318d23cd9a6be1d66e0a8400": "Unrecognized file format.",
   "c3c49d3e838c8fe813d360aea7dc6b792948afde": "Markets",
+  "2f9f9096be1a1c0569a9ce54e57f0420f6b3c2e9": "Duration must be a positive integer",
   "11ee9c5d534cc8d22651092222b532917594161a": "Minimum duration is",
   "5283ac04c9a8ba8a937d1edb4ba986aeefce8bf1": "Number of ticks must be between 5 and 10",
   "ace1342bc3720b77ce510b93074041e7386d209e": "Expiry time cannot be equal to start time",
diff --git a/src/common/translations/id.js b/src/common/translations/id.js
@@ -136,6 +136,7 @@ module.exports = {
   "af145748c9cf765a3b059eec20cb1dbb899297d8": "Blocks are loaded successfully",
   "da162a909c2981ed318d23cd9a6be1d66e0a8400": "Unrecognized file format.",
   "c3c49d3e838c8fe813d360aea7dc6b792948afde": "Markets",
+  "2f9f9096be1a1c0569a9ce54e57f0420f6b3c2e9": "Duration must be a positive integer",
   "11ee9c5d534cc8d22651092222b532917594161a": "Minimum duration is",
   "5283ac04c9a8ba8a937d1edb4ba986aeefce8bf1": "Number of ticks must be between 5 and 10",
   "ace1342bc3720b77ce510b93074041e7386d209e": "Expiry time cannot be equal to start time",
diff --git a/src/common/translations/it.js b/src/common/translations/it.js
@@ -136,6 +136,7 @@ module.exports = {
   "af145748c9cf765a3b059eec20cb1dbb899297d8": "Blocks are loaded successfully",
   "da162a909c2981ed318d23cd9a6be1d66e0a8400": "Unrecognized file format.",
   "c3c49d3e838c8fe813d360aea7dc6b792948afde": "Markets",
+  "2f9f9096be1a1c0569a9ce54e57f0420f6b3c2e9": "Duration must be a positive integer",
   "11ee9c5d534cc8d22651092222b532917594161a": "Minimum duration is",
   "5283ac04c9a8ba8a937d1edb4ba986aeefce8bf1": "Number of ticks must be between 5 and 10",
   "ace1342bc3720b77ce510b93074041e7386d209e": "Expiry time cannot be equal to start time",
diff --git a/src/common/translations/pl.js b/src/common/translations/pl.js
@@ -136,6 +136,7 @@ module.exports = {
   "af145748c9cf765a3b059eec20cb1dbb899297d8": "Blocks are loaded successfully",
   "da162a909c2981ed318d23cd9a6be1d66e0a8400": "Unrecognized file format.",
   "c3c49d3e838c8fe813d360aea7dc6b792948afde": "Markets",
+  "2f9f9096be1a1c0569a9ce54e57f0420f6b3c2e9": "Duration must be a positive integer",
   "11ee9c5d534cc8d22651092222b532917594161a": "Minimum duration is",
   "5283ac04c9a8ba8a937d1edb4ba986aeefce8bf1": "Number of ticks must be between 5 and 10",
   "ace1342bc3720b77ce510b93074041e7386d209e": "Expiry time cannot be equal to start time",
diff --git a/src/common/translations/pt.js b/src/common/translations/pt.js
@@ -136,6 +136,7 @@ module.exports = {
   "af145748c9cf765a3b059eec20cb1dbb899297d8": "Blocks are loaded successfully",
   "da162a909c2981ed318d23cd9a6be1d66e0a8400": "Unrecognized file format.",
   "c3c49d3e838c8fe813d360aea7dc6b792948afde": "Markets",
+  "2f9f9096be1a1c0569a9ce54e57f0420f6b3c2e9": "Duration must be a positive integer",
   "11ee9c5d534cc8d22651092222b532917594161a": "Minimum duration is",
   "5283ac04c9a8ba8a937d1edb4ba986aeefce8bf1": "Number of ticks must be between 5 and 10",
   "ace1342bc3720b77ce510b93074041e7386d209e": "Expiry time cannot be equal to start time",
diff --git a/src/common/translations/ru.js b/src/common/translations/ru.js
@@ -136,6 +136,7 @@ module.exports = {
   "af145748c9cf765a3b059eec20cb1dbb899297d8": "Blocks are loaded successfully",
   "da162a909c2981ed318d23cd9a6be1d66e0a8400": "Unrecognized file format.",
   "c3c49d3e838c8fe813d360aea7dc6b792948afde": "Markets",
+  "2f9f9096be1a1c0569a9ce54e57f0420f6b3c2e9": "Duration must be a positive integer",
   "11ee9c5d534cc8d22651092222b532917594161a": "Minimum duration is",
   "5283ac04c9a8ba8a937d1edb4ba986aeefce8bf1": "Number of ticks must be between 5 and 10",
   "ace1342bc3720b77ce510b93074041e7386d209e": "Expiry time cannot be equal to start time",
diff --git a/src/common/translations/vi.js b/src/common/translations/vi.js
@@ -136,6 +136,7 @@ module.exports = {
   "af145748c9cf765a3b059eec20cb1dbb899297d8": "Blocks are loaded successfully",
   "da162a909c2981ed318d23cd9a6be1d66e0a8400": "Unrecognized file format.",
   "c3c49d3e838c8fe813d360aea7dc6b792948afde": "Markets",
+  "2f9f9096be1a1c0569a9ce54e57f0420f6b3c2e9": "Duration must be a positive integer",
   "11ee9c5d534cc8d22651092222b532917594161a": "Minimum duration is",
   "5283ac04c9a8ba8a937d1edb4ba986aeefce8bf1": "Number of ticks must be between 5 and 10",
   "ace1342bc3720b77ce510b93074041e7386d209e": "Expiry time cannot be equal to start time",
diff --git a/src/common/translations/zh_cn.js b/src/common/translations/zh_cn.js
@@ -136,6 +136,7 @@ module.exports = {
   "af145748c9cf765a3b059eec20cb1dbb899297d8": "Blocks are loaded successfully",
   "da162a909c2981ed318d23cd9a6be1d66e0a8400": "Unrecognized file format.",
   "c3c49d3e838c8fe813d360aea7dc6b792948afde": "Markets",
+  "2f9f9096be1a1c0569a9ce54e57f0420f6b3c2e9": "Duration must be a positive integer",
   "11ee9c5d534cc8d22651092222b532917594161a": "Minimum duration is",
   "5283ac04c9a8ba8a937d1edb4ba986aeefce8bf1": "Number of ticks must be between 5 and 10",
   "ace1342bc3720b77ce510b93074041e7386d209e": "Expiry time cannot be equal to start time",
diff --git a/src/common/translations/zh_tw.js b/src/common/translations/zh_tw.js
@@ -136,6 +136,7 @@ module.exports = {
   "af145748c9cf765a3b059eec20cb1dbb899297d8": "Blocks are loaded successfully",
   "da162a909c2981ed318d23cd9a6be1d66e0a8400": "Unrecognized file format.",
   "c3c49d3e838c8fe813d360aea7dc6b792948afde": "Markets",
+  "2f9f9096be1a1c0569a9ce54e57f0420f6b3c2e9": "Duration must be a positive integer",
   "11ee9c5d534cc8d22651092222b532917594161a": "Minimum duration is",
   "5283ac04c9a8ba8a937d1edb4ba986aeefce8bf1": "Number of ticks must be between 5 and 10",
   "ace1342bc3720b77ce510b93074041e7386d209e": "Expiry time cannot be equal to start time",
