chore: fixing merge conflicts

Author: Hubert Koster

config/v3/app_register/send.json

@@ -14,9 +14,9 @@
       "enum": [1]
     },
     "app_markup_percentage": {
-      "description": "[Optional] Markup to be added to contract prices (as a percentage of contract payout).",
+      "description": "[Optional] Markup to be added to contract prices (as a percentage of contract payout). Max markup: 3%.",
       "type": "number",
-      "maximum": 5,
+      "maximum": 3,
       "minimum": 0
     },
     "appstore": {

config/v3/app_update/send.json

@@ -13,9 +13,9 @@
       "type": "integer"
     },
     "app_markup_percentage": {
-      "description": "[Optional] Markup to be added to contract prices (as a percentage of contract payout).",
+      "description": "[Optional] Markup to be added to contract prices (as a percentage of contract payout). Max markup: 3%.",
       "type": "number",
-      "maximum": 5,
+      "maximum": 3,
       "minimum": 0
     },
     "appstore": {

docs/core-concepts/api-calls-anatomy/index.md

@@ -24,9 +24,9 @@ All API calls have a send functionality for making a request and receiving a res
 
 Several API calls provide the `subscribe` functionality. When you subscribe to an API call, you will receive a continuous stream from data of this particular API call.
 
-Some of these API calls automatically subscribe (e.g. [ticks](https://api.deriv.com/api-explorer#ticks)) and some have an optional `subscribe` field. If you pass `1` to the `subscribe` field, the subscription will start and the server will continue to send the requested data until you unsubscribe by calling the `Forget` or `Forget all` API calls.
+Some of these API calls automatically subscribe (e.g. [ticks](/api-explorer#ticks)) and some have an optional `subscribe` field. If you pass `1` to the `subscribe` field, the subscription will start and the server will continue to send the requested data until you unsubscribe by calling the `Forget` or `Forget all` API calls.
 
-For example, you can call [Tick History](https://api.deriv.com/api-explorer#ticks_history) to receive tick history data. But when you add the `subscribe` option to this call, you will receive the tick history data you requested in the first response, and you will continue to receive a new response every time there is a new tick published by the server for the given symbol.
+For example, you can call [Tick History](/api-explorer#ticks_history) to receive tick history data. But when you add the `subscribe` option to this call, you will receive the tick history data you requested in the first response, and you will continue to receive a new response every time there is a new tick published by the server for the given symbol.
 
 In the message stream from `subscribe`, there is a field called `subscription`. This is the `Stream ID`. With this ID, you can identify the message stream in your logic and stop the stream with `Forget` and `Forget All` API calls.
 
@@ -41,7 +41,7 @@ If you call the API with the `send` functionality, then the server will only sen
 If you want to stop the message stream created by `subscribe`, you will have to call the `Forget` API call with the correct `Stream ID`. Otherwise, you can use the `Forget All` API call to stop streams by their `Method name`.
 
 :::caution
-For more information on the `Forget` API call, have a look at [Forget](https://api.deriv.com/api-explorer#forget) and [Forget All](https://api.deriv.com/api-explorer#forget_all) in the API explorer.
+For more information on the `Forget` API call, have a look at [Forget](/api-explorer#forget) and [Forget All](/api-explorer#forget_all) in the API explorer.
 :::
 
 ## Request data
@@ -64,15 +64,15 @@ A `Residence List` call returns a list of countries and 2-letter country codes,
 
 The request data for this call is as below:
 
-```ts
+```ts showLineNumbers
 {
   residence_list: 1; // Api Call Method Name
   passthrough?: object; // Optional
   req_id?: number; // Optional
 }
 ```
 
-The `residence_list` field is the `method name` for the call and is required. There may be other required fields related to this type of the request you want to send. To know more about `Residence List` and other API calls, please check them out in [API Explorer](https://api.deriv.com/api-explorer#residence_list).
+The `residence_list` field is the `method name` for the call and is required. There may be other required fields related to this type of the request you want to send. To know more about `Residence List` and other API calls, please check them out in [API Explorer](/api-explorer#residence_list).
 
 ### Optional fields
 
@@ -87,7 +87,7 @@ Whatever you pass to this field will be returned back to you inside a `response`
 You may need to `tag` your requests and pass them through our `WebSocket` calls. You can do so by passing a `number` to this field. It can be helpful when you need to map `requests` to `responses`.
 
 :::caution
-To learn about additional optional fields specific to each API call, please refer to our [API Explorer](https://api.deriv.com/api-explorer).
+To learn about additional optional fields specific to each API call, please refer to our [API Explorer](/api-explorer).
 :::
 
 ## Response data
@@ -96,7 +96,7 @@ When you get the response for the call, there will be a `Field` with the same na
 
 The response for the `Residence List` call:
 
-```js
+```js showLineNumbers
 {
   echo_req: {
     req_id: 1,
@@ -163,7 +163,7 @@ The response for the `Residence List` call:
 };
 ```
 
-Here the `residence_list` is the `method name`, and it contains the actual data you requested. To keep it short, we haven't included the rest of the array. You can check the actual response [here](https://api.deriv.com/api-explorer#residence_list).
+Here the `residence_list` is the `method name`, and it contains the actual data you requested. To keep it short, we haven't included the rest of the array. You can check the actual response [here](/api-explorer#residence_list).
 
 #### The `echo_req` field
 
@@ -173,7 +173,7 @@ This `Field` contains the exact `Request Data` you sent to the server.
 
 This `Field` helps you determine which `message` data you're getting on the message event of the WebSocket connection. For example, your `onmessage` event handler for your WebSocket connection in `JavaScript` would be:
 
-```js
+```js showLineNumbers
 socket.onmessage = (event) => {
   const receivedMessage = JSON.parse(event.data);
 

docs/core-concepts/authorization-authentication/index.md

@@ -33,7 +33,7 @@ Please refer to [Setting up a Deriv application](docs/setting-up-a-deriv-applica
 
 An API token is a unique identifier of a client that requests access from a server. It's the simplest way of authorisation.
 
-The access level for each API token has to match the required access level of each API call, which can be found in the [API Explorer](https://api.deriv.com/api-explorer) as well.
+The access level for each API token has to match the required access level of each API call, which can be found in the [API Explorer](/api-explorer) as well.
 
 For example, on the screenshot below, you can see that to be able to use the Account Status, a token with read access level must be used.
 
@@ -71,7 +71,7 @@ Once a user signs up/logs in, they will be redirected to the URL that you entere
 
 The query parameters in the redirect URL are the user's accounts and their related session tokens. You can map the query parameters to an array using the following approach:
 
-```js
+```js showLineNumbers
 const user_accounts = [
   {
     account: 'cr799393',
@@ -86,17 +86,17 @@ const user_accounts = [
 ];
 ```
 
-To authorise the user based on the user's **selected** account, call the [authorize](https://api.deriv.com/api-explorer#authorize) API call with the user's **selected** account **session token**:
+To authorise the user based on the user's **selected** account, call the [authorize](/api-explorer#authorize) API call with the user's **selected** account **session token**:
 
-```js
+```js showLineNumbers
 {
   "authorize": "a1-f7pnteezo4jzhpxclctizt27hyeot"
 }
 ```
 
 The response for the `authorize` call would be an object as below:
 
-```js
+```js showLineNumbers
 {
     "account_list": [
       {

docs/core-concepts/websocket/index.md

@@ -25,7 +25,7 @@ WebSocket is especially great for services that require continuous data exchange
 To open a WebSocket connection, we need to create `new WebSocket` using the special protocol `ws`or `wss` in the url. Here is how you can do that in `JavaScript`:
 
 ```js
-let socket = new WebSocket('wss://red.binaryws.com/websockets/v3?app_id=1089');
+let socket = new WebSocket('wss://ws.binaryws.com/websockets/v3?app_id=1089');
 ```
 
 :::caution
@@ -47,9 +47,9 @@ Sending a message can be done via socket.send(data).
 
 Here’s an example in `JavaScript`:
 
-```js
+```js showLineNumbers
 const app_id = 1089; // Replace with your app_id or leave as 1089 for testing.
-const socket = new WebSocket(`wss://red.binaryws.com/websockets/v3?app_id=${app_id}`);
+const socket = new WebSocket(`wss://ws.binaryws.com/websockets/v3?app_id=${app_id}`);
 
 socket.onopen = function (e) {
   console.log('[open] Connection established');

docs/languages/javascript/get-country-list/index.md

@@ -17,7 +17,7 @@ You can learn more about countries [here](/docs/terminology/trading/residence-li
 
 To get a list of countries, update the open event listener using the following approach:
 
-```js title="index.js"
+```js title="index.js" showLineNumbers
 const ping_interval = 12000; // it's in milliseconds, which equals to 120 seconds
 let interval;
 // subscribe to `open` event
@@ -38,7 +38,7 @@ websocket.addEventListener('open', (event) => {
 
 Now, update the `message` event listener to render the data:
 
-```js title="index.js"
+```js title="index.js" showLineNumbers
 // subscribe to `message` event
 websocket.addEventListener('message', (event) => {
   const receivedMessage = JSON.parse(event.data);
@@ -58,7 +58,7 @@ websocket.addEventListener('message', (event) => {
 
 The response should be an object:
 
-```json
+```json showLineNumbers
 {
   "echo_req": {
     "req_id": 1,
@@ -143,9 +143,9 @@ You will need detailed content about `IDV` and `ONFIDO` identity services, their
 
 Your final code will be:
 
-```js title="index.js"
+```js title="index.js" showLineNumbers
 const app_id = 1089; // Replace with your app_id or leave as 1089 for testing.
-const websocket = new WebSocket(`wss://red.binaryws.com/websockets/v3?app_id=${app_id}`);
+const websocket = new WebSocket(`wss://ws.binaryws.com/websockets/v3?app_id=${app_id}`);
 const ping_interval = 12000; // it's in milliseconds, which equals to 120 seconds
 let interval;
 

docs/languages/javascript/project-setup/index.md

@@ -38,11 +38,11 @@ Now, open the `index.html` file or use the [Live Server Extension](https://marke
 
 Now, change the content of the files using the following approach:
 
-```js title="index.js"
-console.log("we will create our websocket connection here");
+```js title="index.js" showLineNumbers
+console.log('we will create our websocket connection here');
 ```
 
-```html title="index.html"
+```html title="index.html" showLineNumbers
 <!DOCTYPE html>
 <html lang="en">
   <head>

docs/languages/javascript/websocket-connection/index.md

@@ -22,9 +22,9 @@ If you're not familiar with WebSockets, please check out [our documentation](/do
 
 Next, we'll create a WebSocket connection to Deriv WebSocket Server as seen below:
 
-```js title="index.js"
+```js title="index.js" showLineNumbers
 const app_id = 1089; // Replace with your app_id or leave as 1089 for testing.
-const websocket = new WebSocket(`wss://red.binaryws.com/websockets/v3?app_id=${app_id}`);
+const websocket = new WebSocket(`wss://ws.binaryws.com/websockets/v3?app_id=${app_id}`);
 ```
 
 :::info
@@ -46,7 +46,7 @@ Generally, we have 4 events on `WebSocket connections`:
 
 Let's add an event listener for these events on our WebSocket connection.
 
-```js title="index.js"
+```js title="index.js" showLineNumbers
 // subscribe to `open` event
 websocket.addEventListener('open', (event) => {
   console.log('websocket connection established: ', event);
@@ -72,13 +72,13 @@ Now, open the `index.html` file in our browser and check your developer console.
 
 ### Send and receive data
 
-Our WebSocket server provides [ping/pong](/api-explorer#ping) functionality. Let's use it in our demo project to send and receive data. Change the event listeners for `open` and `message` as below:
+Our WebSocket server provides <a href="/api-explorer#ping" target="_blank" rel="noopener noreferrer">ping/pong</a> functionality. Let's use it in our demo project to send and receive data. Change the event listeners for `open` and `message` as below:
 
 :::caution
 The `send` function on the WebSocket connection, only receives `string`, `ArrayBuffer`, `Blob`, `TypedArray` and `DataView`. You can read more about them on [MDN](https://developer.mozilla.org/en-US/docs/Web/API/WebSocket/send). This means, if we want to send an `object`, we have to stringify it with `JSON.stringify` first.
 :::
 
-```js title="index.js"
+```js title="index.js" showLineNumbers
 // subscribe to `open` event
 websocket.addEventListener('open', (event) => {
   console.log('websocket connection established: ', event);
@@ -95,7 +95,7 @@ websocket.addEventListener('message', (event) => {
 
 The `receivedMessage` would be an object like so:
 
-```js
+```js showLineNumbers
 {
   echo_req: {
       ping: 1
@@ -119,7 +119,7 @@ By default, `WebSocket connections` will be closed when no traffic is sent betwe
 
 A simple setup example would be the following:
 
-```js title="index.js"
+```js title="index.js" showLineNumbers
 const ping_interval = 12000; // it's in milliseconds, which equals to 120 seconds
 let interval;
 websocket.addEventListener('open', (event) => {
@@ -145,9 +145,9 @@ Now, when the connection is `established`, we start sending `ping` requests with
 
 Your final code should be:
 
-```js title="index.js"
+```js title="index.js" showLineNumbers
 const app_id = 1089; // Replace with your app_id or leave as 1089 for testing.
-const websocket = new WebSocket(`wss://red.binaryws.com/websockets/v3?app_id=${app_id}`);
+const websocket = new WebSocket(`wss://ws.binaryws.com/websockets/v3?app_id=${app_id}`);
 const ping_interval = 12000; // it's in milliseconds, which equals to 120 seconds
 let interval;
 

docs/setting-up-a-deriv-application.md

@@ -14,15 +14,11 @@ keywords:
 description: How to setup Deriv application
 ---
 
-:::danger
-For the reviewer, Links in this section will be provided in the future.
-:::
-
 #### Deriv account
 
-If you don't have a Deriv account yet, you can easily create one by visiting our signup page or using the [new_account_virtual](/api-explorer#new_account_virtual) API call. It's completely free. And if you have an account already, please log in using your account details. To avoid any accidental loss of funds during testing, we recommend using your demo account instead of a real account.
+If you don't have a Deriv account yet, you can easily create one by visiting our signup page or using the <a href="/api-explorer#new_account_virtual" target="_blank" rel="noopener noreferrer">new_account_virtual</a> API call. It's completely free. And if you have an account already, please log in using your account details. To avoid any accidental loss of funds during testing, we recommend using your demo account instead of a real account.
 
-To earn markup, get a Deriv real account to receive your monthly earnings. You can also create a real account using [new_account_real](/api-explorer#new_account_real) or [new_account_maltainvest](/api-explorer#new_account_maltainvest) API calls.
+To earn markup, get a Deriv real account to receive your monthly earnings. You can also create a real account using <a href="/api-explorer#new_account_real" target="_blank" rel="noopener noreferrer">new_account_real</a> or <a href="/api-explorer#new_account_maltainvest" target="_blank" rel="noopener noreferrer">new_account_maltainvest</a> API calls.
 
 :::caution
 To create Deriv applications, you'll need an API token with the Admin scope for the account you wish to use for your application.
@@ -38,7 +34,7 @@ To create a new API token, follow these steps:
 2. Provide a name for your token
 3. Click **Create**
 
-Alternatively, you can create an API token via the [api_token](/api-explorer#api_token) API call.
+Alternatively, you can create an API token via the <a href="/api-explorer#api_token" target="_blank" rel="noopener noreferrer">api_token</a> API call.
 
 :::caution
 You need a token with the `Admin` scope to create an application.

docusaurus.config.js

@@ -57,6 +57,9 @@ const config = {
         theme: {
           customCss: [require.resolve('./src/styles/index.scss')],
         },
+        googleTagManager: {
+          containerId: 'GTM-NF7884S',
+        },
       }),
     ],
   ],