chore: fixing merge conflict

Author: Hubert Koster

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://ws.binaryws.com/websockets/v3?app_id=1089');
+let socket = new WebSocket('wss://red.binaryws.com/websockets/v3?app_id=1089');
 ```
 
 :::caution
@@ -49,7 +49,7 @@ Here’s an example in `JavaScript`:
 
 ```js
 const app_id = 1089; // Replace with your app_id or leave as 1089 for testing.
-const socket = new WebSocket(`wss://ws.binaryws.com/websockets/v3?app_id=${app_id}`);
+const socket = new WebSocket(`wss://red.binaryws.com/websockets/v3?app_id=${app_id}`);
 
 socket.onopen = function (e) {
   console.log('[open] Connection established');

docs/guides/markup-calculation/index.md

@@ -21,7 +21,7 @@ description: How is markup calculated?
 
 ## Markup
 
-Increase your earnings by charging markups on each contract purchased through the trading app you've created with the Deriv API. The markup is defined by you and can be up to 5%.
+Increase your earnings by charging markups on each contract purchased through the trading app you've created with the Deriv API. The markup is defined by you and can be up to 3%.
 
 Below is an example of how the markup is calculated.
 

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

@@ -145,7 +145,7 @@ Your final code will be:
 
 ```js title="index.js"
 const app_id = 1089; // Replace with your app_id or leave as 1089 for testing.
-const websocket = new WebSocket(`wss://ws.binaryws.com/websockets/v3?app_id=${app_id}`);
+const websocket = new WebSocket(`wss://red.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/websocket-connection/index.md

@@ -17,13 +17,14 @@ If you're not familiar with WebSockets, please check out [our documentation](/do
 :::
 
 ### Set up a WebSocket connection
+
 <!-- To create a websocket connection, we want to use the Deriv websocket URL with an `app_id`. You can create your own app_id within your [dashboard](/dashboard) or keep the default `1089` app_id for testing. Keep in mind that eventually, you should make your own app_id. Especially if you would like to monetize your application. -->
 
 Next, we'll create a WebSocket connection to Deriv WebSocket Server as seen below:
 
 ```js title="index.js"
 const app_id = 1089; // Replace with your app_id or leave as 1089 for testing.
-const websocket = new WebSocket(`wss://ws.binaryws.com/websockets/v3?app_id=${app_id}`);
+const websocket = new WebSocket(`wss://red.binaryws.com/websockets/v3?app_id=${app_id}`);
 ```
 
 :::info
@@ -146,7 +147,7 @@ Your final code should be:
 
 ```js title="index.js"
 const app_id = 1089; // Replace with your app_id or leave as 1089 for testing.
-const websocket = new WebSocket(`wss://ws.binaryws.com/websockets/v3?app_id=${app_id}`);
+const websocket = new WebSocket(`wss://red.binaryws.com/websockets/v3?app_id=${app_id}`);
 const ping_interval = 12000; // it's in milliseconds, which equals to 120 seconds
 let interval;
 

examples/active_symbols/index.js

@@ -1,7 +1,7 @@
 import DerivAPIBasic from 'https://cdn.skypack.dev/@deriv/deriv-api/dist/DerivAPIBasic';
 
 const app_id = 1089; // Replace with your app_id or leave the current one for testing.
-const connection = new WebSocket(`wss://ws.binaryws.com/websockets/v3?app_id=${app_id}`);
+const connection = new WebSocket(`wss://red.binaryws.com/websockets/v3?app_id=${app_id}`);
 const api = new DerivAPIBasic({ connection });
 
 // Currently gets all available symbols.

examples/balance/index.js

@@ -1,7 +1,7 @@
 import DerivAPIBasic from 'https://cdn.skypack.dev/@deriv/deriv-api/dist/DerivAPIBasic';
 
 const app_id = 32404; // Replace with your app_id or leave the current one for testing.
-const connection = new WebSocket(`wss://ws.binaryws.com/websockets/v3?app_id=${app_id}`);
+const connection = new WebSocket(`wss://red.binaryws.com/websockets/v3?app_id=${app_id}`);
 const api = new DerivAPIBasic({ connection });
 
 // WARNING: Be careful to not leak your token here in the sandbox.

examples/buy_contract/index.js

@@ -1,7 +1,7 @@
 import DerivAPIBasic from 'https://cdn.skypack.dev/@deriv/deriv-api/dist/DerivAPIBasic';
 
 const app_id = 32436; // Replace with your app_id or leave the current test app_id.
-const connection = new WebSocket(`wss://ws.binaryws.com/websockets/v3?app_id=${app_id}`);
+const connection = new WebSocket(`wss://red.binaryws.com/websockets/v3?app_id=${app_id}`);
 const api = new DerivAPIBasic({ connection });
 
 // Use a demo account token to test with demo currency.

examples/contracts_for_symbol/index.js

@@ -1,7 +1,7 @@
 import DerivAPIBasic from 'https://cdn.skypack.dev/@deriv/deriv-api/dist/DerivAPIBasic';
 
 const app_id = 1089; // Replace with your app_id or leave the current test app_id.
-const connection = new WebSocket(`wss://ws.binaryws.com/websockets/v3?app_id=${app_id}`);
+const connection = new WebSocket(`wss://red.binaryws.com/websockets/v3?app_id=${app_id}`);
 const api = new DerivAPIBasic({ connection });
 
 const contracts_for_symbol_request = {

examples/expired_contracts/index.js

@@ -1,7 +1,7 @@
 import DerivAPIBasic from 'https://cdn.skypack.dev/@deriv/deriv-api/dist/DerivAPIBasic';
 
 const app_id = 32512; // Replace with your app_id or leave current one for testing.
-const connection = new WebSocket(`wss://ws.binaryws.com/websockets/v3?app_id=${app_id}`);
+const connection = new WebSocket(`wss://red.binaryws.com/websockets/v3?app_id=${app_id}`);
 const api = new DerivAPIBasic({ connection });
 
 let token = '';

examples/keep_alive/index.js

@@ -1,7 +1,7 @@
 import DerivAPIBasic from 'https://cdn.skypack.dev/@deriv/deriv-api/dist/DerivAPIBasic';
 
 const app_id = 1089; // Replace with your app_id or leave as 1089 for testing.
-const connection = new WebSocket(`wss://ws.binaryws.com/websockets/v3?app_id=${app_id}`);
+const connection = new WebSocket(`wss://red.binaryws.com/websockets/v3?app_id=${app_id}`);
 
 const api = new DerivAPIBasic({ connection });