Merge pull request #2681 from binary-com/dev

dev to beta

Author: Aaron

.circleci/config.yml

@@ -94,17 +94,14 @@ commands:
       - run:
           name: Building docker image for << parameters.target >>
           command: |
-            build_tag="${CIRCLE_SHA1}"
-            [ "<< parameters.target >>" == "beta" ] && build_tag="beta-${CIRCLE_SHA1}"
-            docker build -t ${DOCKHUB_ORGANISATION}/binary-static-bot:${build_tag} -t ${DOCKHUB_ORGANISATION}/binary-static-bot:latest .
+            build_latest="latest"
+            [ "<< parameters.target >>" == "beta" ]  && build_latest="beta-latest"
+            docker build -t ${DOCKHUB_ORGANISATION}/binary-static-bot:${CIRCLE_TAG} -t ${DOCKHUB_ORGANISATION}/binary-static-bot:${build_latest} .
       - run:
           name: Pushing Image to docker hub
           command: |
-            build_tag="${CIRCLE_SHA1}"
-            [ "<< parameters.target >>" == "beta" ] && build_tag="beta-${CIRCLE_SHA1}"
             echo $DOCKERHUB_PASSWORD | docker login -u $DOCKERHUB_USERNAME --password-stdin
-            docker push ${DOCKHUB_ORGANISATION}/binary-static-bot:${build_tag}
-            docker push ${DOCKHUB_ORGANISATION}/binary-static-bot:latest
+            docker push ${DOCKHUB_ORGANISATION}/binary-static-bot
   k8s_deploy:
     description: "Deploy to k8s cluster"
     parameters:
@@ -126,11 +123,10 @@ commands:
                 CA_CRT="${!CA_CRT_REF}"
                 KUBE_SERVER="${!KUBE_SERVER_REF}"
                 SERVICEACCOUNT_TOKEN="${!SERVICEACCOUNT_TOKEN_REF}"
-                build_tag="${CIRCLE_SHA1}"
                 deployment_target="bot-binary-com"
-                [ "<< parameters.target >>" == "beta" ] && build_tag="beta-${CIRCLE_SHA1}" && deployment_target="bot-beta-binary-com"
+                [ "<< parameters.target >>" == "beta" ] && deployment_target="bot-beta-binary-com"
                 echo $CA_CRT | base64 --decode > ca.crt
-                kubectl --server=${KUBE_SERVER} --certificate-authority=ca.crt --token=$SERVICEACCOUNT_TOKEN set image deployment/${deployment_target} ${deployment_target}=${DOCKHUB_ORGANISATION}/binary-static-bot:${build_tag}
+                kubectl --server=${KUBE_SERVER} --certificate-authority=ca.crt --token=$SERVICEACCOUNT_TOKEN set image deployment/${deployment_target} ${deployment_target}=${DOCKHUB_ORGANISATION}/binary-static-bot:${CIRCLE_TAG}
               fi
             done
 

package.json

@@ -21,10 +21,11 @@
   },
   "scripts": {
     "start": "gulp watch",
-    "test": "eslint src/ && jest -w 1",
+    "test": "eslint src/",
     "release": "d() { test -z $1 && echo 'Please specify branch.' && exit 1; (git show-branch $1) || exit 1;  git stash; git checkout $1; npm i; rm -rf branch/$1; mkdir -p branch/$1 ; gulp build-min; cp -r www/ branch/$1; gulp release-branch --branch $1;}; d",
     "release-production": "d() { git stash; git checkout master; npm i;gulp build-min;gulp release-master;}; d",
-    "build": "webpack --config webpack.config.cli.js"
+    "build": "webpack --config webpack.config.cli.js",
+    "build-min": "gulp build-min"
   },
   "husky": {
     "hooks": {

src/botPage/bot/TradeEngine/Purchase.js

@@ -3,6 +3,7 @@ import { recoverFromError, doUntilDone } from '../tools';
 import { contractStatus, info, notify } from '../broadcast';
 import { purchaseSuccessful } from './state/actions';
 import { BEFORE_PURCHASE } from './state/constants';
+import GTM from '../../../common/gtm';
 
 let delayIndex = 0;
 
@@ -17,6 +18,7 @@ export default Engine =>
             const { currency, proposal } = this.selectProposal(contractType);
             const onSuccess = r => {
                 const { buy } = r;
+                GTM.pushDataLayer({ event: 'bot_purchase', buy_price: proposal.ask_price });
 
                 contractStatus({
                     id  : 'contract.purchase_recieved',

src/botPage/view/blockly/index.js

@@ -26,7 +26,7 @@ import { getLanguage } from '../../../common/lang';
 import { observer as globalObserver } from '../../../common/utils/observer';
 import { showDialog } from '../../bot/tools';
 import GTM from '../../../common/gtm';
-import { parseQueryString } from '../../../common/utils/tools';
+import { parseQueryString, isProduction } from '../../../common/utils/tools';
 import { TrackJSError } from '../logger';
 import config from '../../common/const';
 
@@ -56,7 +56,7 @@ const disposeBlocksWithLoaders = () => {
 
 const marketsWereRemoved = xml => {
     if (!Array.from(xml.children).every(block => !removeUnavailableMarkets(block))) {
-        if (window.trackJs) {
+        if (window.trackJs && isProduction()) {
             trackJs.track('Invalid financial market');
         }
         showDialog({

src/botPage/view/logger.js

@@ -1,5 +1,6 @@
 import { observer as globalObserver } from '../../common/utils/observer';
 import { getToken } from '../../common/utils/storageManager';
+import { isProduction } from '../../common/utils/tools';
 
 const log = (type, ...args) => {
     if (type === 'warn') {
@@ -66,7 +67,7 @@ const notifyError = error => {
 
     notify({ className: 'error', message, position: 'right' });
 
-    if (trackJs) {
+    if (trackJs && isProduction()) {
         trackJs.console.log(error);
         trackJs.track(code || error.name);
     }

src/common/integrations/GoogleDrive.js

@@ -1,7 +1,7 @@
 /* global google,gapi */
 import { getLanguage } from '../lang';
 import { observer as globalObserver } from '../utils/observer';
-import { translate } from '../utils/tools';
+import { translate, isProduction } from '../utils/tools';
 import config from '../../botPage/common/const';
 import { load } from '../../botPage/view/blockly';
 import { TrackJSError } from '../../botPage/view/logger';
@@ -42,7 +42,7 @@ class GoogleDrive {
                                 .removeClass('invisible');
                         },
                         error => {
-                            if (window.trackJs) {
+                            if (window.trackJs && isProduction()) {
                                 trackJs.track(
                                     `${translate(
                                         'There was an error initialising Google Drive'
@@ -53,7 +53,7 @@ class GoogleDrive {
                     );
             },
             onerror: error => {
-                if (window.trackJs) {
+                if (window.trackJs && isProduction()) {
                     trackJs.track(
                         `${translate('There was an error loading Google Drive libraries')} - Error: ${JSON.stringify(
                             error