Merge branch 'dev' into dev

ashkanx · web-flow · commit 68da45536de0 · 2019-06-14T08:47:37.000+02:00
diff --git a/src/botPage/view/blockly/customBlockly.js b/src/botPage/view/blockly/customBlockly.js
@@ -358,3 +358,21 @@ Blockly.Toolbox.TreeNode.prototype.onClick_ = function(_e) {
     }
     this.updateRow();
 };
+
+/**
+ * Preload all the audio files so that they play quickly when asked for.
+ * @package
+ */
+Blockly.WorkspaceAudio.prototype.preload = function() {
+    for (var name in this.SOUNDS_) {
+        var sound = this.SOUNDS_[name];
+        sound.volume = 0.01;
+        sound.play().catch(function() {});
+        sound.pause();
+        // iOS can only process one sound at a time.  Trying to load more than one
+        // corrupts the earlier ones.  Just load one and leave the others uncached.
+        if (goog.userAgent.IPAD || goog.userAgent.IPHONE) {
+            break;
+        }
+    }
+};
diff --git a/src/botPage/view/index.js b/src/botPage/view/index.js
@@ -5,6 +5,7 @@ import View from './View';
 import '../../common/binary-ui/dropdown';
 import Elevio from '../../common/elevio';
 import GTM from '../../common/gtm';
+import { isProduction } from '../../common/utils/tools';
 
 $.ajaxSetup({
     cache: false,
@@ -14,7 +15,7 @@ $.ajaxSetup({
 window._trackJs = {
     token      : '346262e7ffef497d85874322fff3bbf8',
     application: 'binary-bot',
-    enabled    : window.location.hostname !== 'localhost',
+    enabled    : isProduction(),
     console    : {
         display: false,
     },
diff --git a/static/css/_panel.scss b/static/css/_panel.scss
@@ -59,9 +59,14 @@ $disabled-color: #F2F2F2;
         font-size: 11px;
         color: lightgray;
     }
+    #current-trade-status{
+        margin-top: 3.5em;
+    }
     .stage {
         display: inline-block;
         margin: 0 8.68% 0 8.68%;
+        vertical-align: top;
+        max-width: 120px;
         .stage-tooltip .triangle {
             margin-top: 0.7em;
             margin-left: 50%;
@@ -75,11 +80,13 @@ $disabled-color: #F2F2F2;
         }
         .stage-tooltip.top {
             margin-bottom: 0.5em;
+            margin-top: -2.5em;
+            position: absolute;
         }
         .stage-tooltip p {
             font-size: 11px;
             text-align: center;
-            margin-top: -0.9em;
+            margin-top: -0.91em;
             padding: 0.5em;
             border-radius: 0.5em;
             background-color: #fef1cf;
@@ -101,6 +108,7 @@ $disabled-color: #F2F2F2;
     .stage-label {
         text-align: center;
         font-size: 11px;
+        min-height: 24px;
     }
     .circle-wrapper {
         width: $static-circle-diameter;
