resolved conflicts

Author: vinu-deriv

.github/actions/build/action.yml

@@ -1,6 +1,14 @@
 name: build
 description: Build all packages
 inputs:
+  NODE_ENV:
+    description: 'Node environment'
+    required: false
+    default: 'test'
+  REF_NAME:
+    description: 'Git ref name'
+    required: true
+    default: 'test'
   GD_API_KEY:
     description: "Google drive api key"
     required: false
@@ -13,14 +21,24 @@ inputs:
   TRACKJS_TOKEN:
     description: "trackjs token"
     required: false
+  DATADOG_CLIENT_LOGS_TOKEN:
+    description: 'Datadog client token for logs'
+    required: false
+  DATADOG_LOGS_SESSION_SAMPLE_RATE:
+    description: 'Datadog session sample rate for logs'
+    required: false
 runs:
   using: composite
   steps:
     - name: Build all packages
       env:
+        NODE_ENV: ${{ inputs.NODE_ENV }}
         GD_CLIENT_ID: ${{ inputs.GD_CLIENT_ID }}
         GD_API_KEY: ${{ inputs.GD_API_KEY }}
         GD_APP_ID: ${{ inputs.GD_APP_ID }}
         TRACKJS_TOKEN: ${{ inputs.TRACKJS_TOKEN }}
+        DATADOG_CLIENT_LOGS_TOKEN: ${{ inputs.DATADOG_CLIENT_LOGS_TOKEN }}
+        DATADOG_LOGS_SESSION_SAMPLE_RATE: ${{ inputs.DATADOG_LOGS_SESSION_SAMPLE_RATE }}
+        REF_NAME: ${{ inputs.REF_NAME }}
       run: npm run build
       shell: bash

.github/workflows/generate_preview_link.yml

@@ -47,10 +47,14 @@ jobs:
             - name: Build
               uses: './.github/actions/build'
               with:
+                  NODE_ENV: staging
                   GD_API_KEY: ${{ secrets.GD_API_KEY }}
                   GD_APP_ID: ${{ secrets.GD_APP_ID }}
                   GD_CLIENT_ID: ${{ secrets.GD_CLIENT_ID }}
                   TRACKJS_TOKEN: ${{ secrets.TRACKJS_TOKEN }}
+                  DATADOG_CLIENT_LOGS_TOKEN: ${{ secrets.DATADOG_CLIENT_LOGS_TOKEN }}
+                  DATADOG_LOGS_SESSION_SAMPLE_RATE: ${{ secrets.DATADOG_LOGS_SESSION_SAMPLE_RATE }}
+                  REF_NAME: ${{ github.ref_name }}
 
             - name: 'Run Tests'
               run: npm run test

.github/workflows/release_production.yml

@@ -22,10 +22,14 @@ jobs:
       - name: Build
         uses: "./.github/actions/build"
         with:
+          NODE_ENV: production
           GD_API_KEY: ${{ secrets.GD_API_KEY }}
           GD_APP_ID: ${{ secrets.GD_APP_ID }}
           GD_CLIENT_ID: ${{ secrets.GD_CLIENT_ID }}
           TRACKJS_TOKEN: ${{ secrets.TRACKJS_TOKEN }}
+          DATADOG_CLIENT_LOGS_TOKEN: ${{ secrets.DATADOG_CLIENT_LOGS_TOKEN }}
+          DATADOG_LOGS_SESSION_SAMPLE_RATE: ${{ secrets.DATADOG_LOGS_SESSION_SAMPLE_RATE }}
+          REF_NAME: ${{ github.ref_name }}
       - name: Test
         uses: "./.github/actions/test"
       - name: Versioning

.github/workflows/release_staging.yml

@@ -20,10 +20,14 @@ jobs:
       - name: Build
         uses: "./.github/actions/build"
         with:
+          NODE_ENV: staging
           GD_API_KEY: ${{ secrets.GD_API_KEY }}
           GD_APP_ID: ${{ secrets.GD_APP_ID }}
           GD_CLIENT_ID: ${{ secrets.GD_CLIENT_ID }}
           TRACKJS_TOKEN: ${{ secrets.TRACKJS_TOKEN }}
+          DATADOG_CLIENT_LOGS_TOKEN: ${{ secrets.DATADOG_CLIENT_LOGS_TOKEN }}
+          DATADOG_LOGS_SESSION_SAMPLE_RATE: ${{ secrets.DATADOG_LOGS_SESSION_SAMPLE_RATE }}
+          REF_NAME: ${{ github.ref_name }}
       - name: Test
         uses: "./.github/actions/test"
       - name: Deploy to Cloudflare Pages

404.md

@@ -4,4 +4,4 @@ permalink: /404.html
 ---
 
 The page you are looking for does not exist.
-Are you lost? Click [here](https://bot.binary.com/).
+Are you lost? Click [here](https://bot.deriv.com/).

README.md

@@ -5,7 +5,7 @@
 
 Visual automation for binary bot on deriv - [bot.deriv.com](https://bot.deriv.com)
 
-Binary Bot on Deriv uses [Google Blockly](https://developers.google.com/blockly) to provide a puzzle like automation environment to trade using binary.com API version 3.
+Binary Bot on Deriv uses [Google Blockly](https://developers.google.com/blockly) to provide a puzzle like automation environment to trade using api.deriv.com API version 3.
 
 ## Pre-installation
 
@@ -147,11 +147,11 @@ User can make changes to Deriv branding related logo, text and their visibility.
 ### Running with a specific endpoint **Use only if you know what you're doing**
 
 ```
-ENDPOINT='wss://ws.binaryws.com/websockets/v3?l=en&app_id=1169' bot bot-example.js
+ENDPOINT='wss://ws.derivws.com/websockets/v3?l=en&app_id=1169' bot bot-example.js
 
 ```
 
-To set the endpoint for running the application on the localhost. For this, Go to http://localbot.binary.sx/endpoint.html. Make sure the Server is set to blue.binaryws.com and O Auth App ID is 16014 Click submit
+To set the endpoint for running the application on the localhost. For this, Go to http://localbot.binary.sx/endpoint.html. Make sure the Server is set to blue.derivws.com and O Auth App ID is 16014 Click submit
 
 ## Think you found a bug?
 

docs/Bot.md

@@ -52,11 +52,11 @@ Bot.stop
 | amount | <code>number</code> | Amount for the contract |
 | currency | <code>string</code> | The currency for the contract |
 | basis | <code>string</code> | Basis for the contract ("stake") |
-| candleInterval | <code>number</code> | Interval for candles list (valid inputs in   [#ticks_history](https://developers.binary.com/api/#ticks_history)) |
+| candleInterval | <code>number</code> | Interval for candles list (valid inputs in   [#ticks_history](https://api.deriv.com/api-explorer#ticks_history)) |
 | contractTypes | <code>Array.&lt;string&gt;</code> | The desired contract types |
 | duration | <code>number</code> | Contract duration |
-| duration_unit | <code>string</code> | Contract duration unit (valid inputs in   [#proposal](https://developers.binary.com/api/#proposal)) |
-| symbol | <code>string</code> | The underlying symbol (valid inputs in   [#active_symbols](https://developers.binary.com/api/#active_symbols)) |
+| duration_unit | <code>string</code> | Contract duration unit (valid inputs in   [#proposal](https://api.deriv.com/api-explorer#proposal)) |
+| symbol | <code>string</code> | The underlying symbol (valid inputs in   [#active_symbols](https://api.deriv.com/api-explorer#active_symbols)) |
 | restartOnError | <code>boolean</code> | Whether to restart on error or not |
 | prediction | <code>number</code> | prediction number for trades (optional) |
 | barrierOffset | <code>number</code> | barrier offset for the trade (optional) |