Merge pull request #210 from hubert-deriv/reverting_tag_20230712_0

Author: hubert-deriv

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
@@ -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://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/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 3%.
+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%.
 
 Below is an example of how the markup is calculated.
 

docs/intro.md

@@ -16,13 +16,6 @@ keywords:
 description: Getting started with Deriv API
 ---
 
-:::danger
-Kindly be informed that due to recent API usage guidelines, all third-party apps communications must use Deriv's API red servers at the following address
-`red.binaryws.com`.
-This restriction will be applied after 7 days and any traffic to the other servers from third-party apps will be rejected.
-Please take the necessary action before the effective date.
-:::
-
 Our Documentation is divided in several sections:
 
 - [Core concepts](category/core-concepts)

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://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/websocket-connection/index.md

@@ -24,7 +24,7 @@ Next, we'll create a WebSocket connection to Deriv WebSocket Server as seen belo
 
 ```js title="index.js"
 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
@@ -147,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://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;
 

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://red.binaryws.com/websockets/v3?app_id=${app_id}`);
+const connection = new WebSocket(`wss://ws.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://red.binaryws.com/websockets/v3?app_id=${app_id}`);
+const connection = new WebSocket(`wss://ws.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://red.binaryws.com/websockets/v3?app_id=${app_id}`);
+const connection = new WebSocket(`wss://ws.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://red.binaryws.com/websockets/v3?app_id=${app_id}`);
+const connection = new WebSocket(`wss://ws.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://red.binaryws.com/websockets/v3?app_id=${app_id}`);
+const connection = new WebSocket(`wss://ws.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://red.binaryws.com/websockets/v3?app_id=${app_id}`);
+const connection = new WebSocket(`wss://ws.binaryws.com/websockets/v3?app_id=${app_id}`);
 
 const api = new DerivAPIBasic({ connection });
 

examples/open_contracts/index.js

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

examples/portfolio/index.js

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

examples/profit_table/index.js

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

examples/proposal/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://red.binaryws.com/websockets/v3?app_id=${app_id}`);
+const connection = new WebSocket(`wss://ws.binaryws.com/websockets/v3?app_id=${app_id}`);
 const api = new DerivAPIBasic({ connection });
 
 const proposal_request = {

examples/statement/index.js

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

examples/ticks/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://red.binaryws.com/websockets/v3?app_id=${app_id}`);
+const connection = new WebSocket(`wss://ws.binaryws.com/websockets/v3?app_id=${app_id}`);
 const api = new DerivAPIBasic({ connection });
 const tickStream = () => api.subscribe({ ticks: 'R_100' });
 

examples/ticks_history/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://red.binaryws.com/websockets/v3?app_id=${app_id}`);
+const connection = new WebSocket(`wss://ws.binaryws.com/websockets/v3?app_id=${app_id}`);
 const api = new DerivAPIBasic({ connection });
 
 const ticks_history_request = {

examples/website_status/index.js

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

src/features/dashboard/components/AppForm/__tests__/app-form.test.tsx

@@ -158,7 +158,7 @@ describe('App Form', () => {
     await userEvent.click(submitButton);
 
     const appMarkupPercentageError = await screen.findByText(
-      'Your markup value must be equal to or above 0.00 and no more than 3.00.',
+      'Your markup value must be equal to or above 0.00 and no more than 5.00.',
     );
 
     expect(appMarkupPercentageError).toBeInTheDocument();

src/features/dashboard/components/AppForm/index.tsx

@@ -163,7 +163,7 @@ const AppForm = ({
                   <label htmlFor='app_markup_percentage'>Markup percentage (optional)</label>
                 </div>
                 <Text as='p' type='paragraph-1' className={styles.helperText}>
-                  Enter 0 if you don&lsquo;t want to earn a markup. Max markup: 3%
+                  Enter 0 if you don&lsquo;t want to earn a markup. Max markup: 5%
                 </Text>
                 {errors && errors?.app_markup_percentage && (
                   <Text as='span' type='paragraph-1' className='error-message'>

src/features/dashboard/types.ts

@@ -1,6 +1,6 @@
 import * as yup from 'yup';
 
-const markupPercentageRegex = /^((([0-2]\.([0-9]([0-9])?)?))||([3]\.([0]([0])?)?)||([0-3]))$/;
+const markupPercentageRegex = /^((([0-4]\.([0-9]([0-9])?)?))||([5]\.([0]([0])?)?)||([0-5]))$/;
 const urlRegex = /^[a-z][a-z0-9.+-]*:\/\/[0-9a-zA-Z.-]+[%/\w .-]*$/;
 
 const base_schema = {
@@ -34,7 +34,7 @@ const base_schema = {
     .max(4, 'Your markup value cannot be more than 4 characters.')
     .matches(
       markupPercentageRegex,
-      'Your markup value must be equal to or above 0.00 and no more than 3.00.',
+      'Your markup value must be equal to or above 0.00 and no more than 5.00.',
     ),
   app_id: yup.number(),
 };