Merge pull request #137 from rupato-deriv/Rupato/BOT-2405/Feature--up…

…date-standlone-with-qs Rupato/BOT-2405/Update standalone with quick strategy changes and endpoint url
deriv-com · Nov 25, 2024 · f769123 · f769123
2 parents fa0f17e + 24399df
commit f769123
Show file tree

Hide file tree

Showing 37 changed files with 8,420 additions and 60 deletions.
diff --git a/src/components/layout/header/header.tsx b/src/components/layout/header/header.tsx
@@ -1,6 +1,7 @@
+import React from 'react';
 import clsx from 'clsx';
 import { observer } from 'mobx-react-lite';
-import { standalone_routes } from '@/components/shared';
+import { generateOAuthURL, standalone_routes } from '@/components/shared';
 import Button from '@/components/shared_ui/button';
 import useActiveAccount from '@/hooks/api/account/useActiveAccount';
 import { useApiBase } from '@/hooks/useApiBase';
@@ -68,7 +69,7 @@ const AppHeader = observer(() => {
                     <Button
                         tertiary
                         onClick={() => {
-                            window.location.assign(getOauthURL());
+                            window.location.replace(generateOAuthURL());
                         }}
                     >
                         <Localize i18n_default_text='Log in' />

diff --git a/src/components/shared/utils/config/config.ts b/src/components/shared/utils/config/config.ts
@@ -1,3 +1,4 @@
+import { LocalStorageConstants, LocalStorageUtils, URLUtils } from '@deriv-com/utils';
 import { isStaging } from '../url/helpers';
 
 export const APP_IDS = {
@@ -140,3 +141,17 @@ export const getDebugServiceWorker = () => {
 
     return false;
 };
+
+export const generateOAuthURL = () => {
+    const { getOauthURL } = URLUtils;
+    const oauth_url = getOauthURL();
+    const original_url = new URL(oauth_url);
+    const configured_server_url = (LocalStorageUtils.getValue(LocalStorageConstants.configServerURL) ||
+        original_url.hostname) as string;
+
+    const valid_server_urls = ['green.derivws.com', 'red.derivws.com', 'blue.derivws.com'];
+    if (!valid_server_urls.includes(configured_server_url)) {
+        original_url.hostname = configured_server_url;
+    }
+    return original_url.toString() || oauth_url;
+};
diff --git a/src/external/bot-skeleton/scratch/accumulators-proposal-handler.js b/src/external/bot-skeleton/scratch/accumulators-proposal-handler.js
@@ -37,3 +37,32 @@ export const handleProposalRequestForAccumulators = instance => {
     };
     window.Blockly.accumulators_request = proposal_request;
 };
+
+export const requestProposalForQS = (input_values, ws) => {
+    const { amount, currency, symbol, growth_rate, limit_order } = input_values;
+    const { take_profit } = limit_order;
+
+    const proposal_request = {
+        ...DEFAULT_PROPOSAL_REQUEST,
+        amount,
+        currency,
+        symbol,
+        growth_rate,
+        subscribe: undefined,
+        limit_order: {
+            take_profit,
+        },
+    };
+
+    return ws
+        ?.send(proposal_request)
+        .then(response => {
+            if (response.error) {
+                return Promise.reject(response.error);
+            }
+            return response;
+        })
+        .catch(error => {
+            throw error;
+        });
+};
diff --git a/src/external/bot-skeleton/scratch/blockly.js b/src/external/bot-skeleton/scratch/blockly.js
@@ -18,6 +18,7 @@ const modifyBlocklyWorkSpaceContextMenu = () => {
         cleanWorkspace: localize('Clean up Blocks'),
         collapseWorkspace: localize('Collapse Blocks'),
         expandWorkspace: localize('Expand Blocks'),
+        workspaceDelete: localize('Delete All Blocks'),
     };
 
     Object.keys(items_to_localize).forEach(item_id => {

diff --git a/src/external/bot-skeleton/scratch/blocks/Binary/Trade Definition/accumulator_take_profit.js b/src/external/bot-skeleton/scratch/blocks/Binary/Trade Definition/accumulator_take_profit.js
@@ -1,7 +1,7 @@
 import { getCurrencyDisplayCode } from '@/components/shared';
 import { localize } from '@deriv-com/translations';
 import { config } from '../../../../constants/config';
-import { modifyContextMenu } from '../../../utils';
+import { excludeOptionFromContextMenu, modifyContextMenu } from '../../../utils';
 
 const description = localize(
     'Your contract is closed automatically when your profit is more than or equals to this amount. This block can only be used with the accumulator trade type.'
@@ -56,6 +56,8 @@ window.Blockly.Blocks.accumulator_take_profit = {
         }
     },
     customContextMenu(menu) {
+        const menu_items = [localize('Enable Block'), localize('Disable Block')];
+        excludeOptionFromContextMenu(menu, menu_items);
         modifyContextMenu(menu);
     },
     restricted_parents: ['trade_definition_accumulator'],

diff --git a/...rnal/bot-skeleton/scratch/blocks/Binary/Trade Definition/trade_definition_tradeoptions.js b/...rnal/bot-skeleton/scratch/blocks/Binary/Trade Definition/trade_definition_tradeoptions.js
@@ -527,7 +527,7 @@ window.Blockly.Blocks.trade_definition_tradeoptions = {
     setCurrency() {
         const currency_field = this.getField('CURRENCY_LIST');
         const { currency } = DBotStore.instance.client;
-        currency_field.setText(getCurrencyDisplayCode(currency));
+        currency_field?.setText(getCurrencyDisplayCode(currency));
     },
     restricted_parents: ['trade_definition'],
     getRequiredValueInputs() {

diff --git a/src/external/bot-skeleton/scratch/utils/index.js b/src/external/bot-skeleton/scratch/utils/index.js
@@ -654,13 +654,11 @@ const all_context_menu_options = [
     localize('Download Block'),
 ];
 
-// Need for later
-// const deleteLocaleText = localize("Delete");
-// const blocksLocaleText = localize("Blocks");
-// const deleteBlocksLocaleText = localize("Delete Blocks");
-// const deleteBlocksLocalePattern = new RegExp(`^${deleteLocaleText} \\d+ ${blocksLocaleText}$`);
+const deleteBlocksLocaleText = localize('Delete Block');
+const deleteAllBlocksLocaleText = localize('Delete All Blocks');
 
 export const modifyContextMenu = (menu, add_new_items = []) => {
+    console.log(menu);
     const include_items = [...common_included_items, ...add_new_items];
     include_items.forEach(item => {
         menu.push({
@@ -671,9 +669,18 @@ export const modifyContextMenu = (menu, add_new_items = []) => {
     });
 
     for (let i = 0; i < menu.length; i++) {
-        const localized_text = localize(menu[i].text);
-        if (all_context_menu_options.includes(localized_text)) {
-            menu[i].text = localized_text;
+        const menu_text = menu[i]?.text?.toLowerCase();
+        if (menu_text?.includes('delete')) {
+            if (menu_text.includes('block') && !menu_text.includes('blocks')) {
+                menu[i].text = deleteBlocksLocaleText;
+            } else {
+                menu[i].text = deleteAllBlocksLocaleText;
+            }
+        } else {
+            const localized_text = localize(menu[i].text);
+            if (all_context_menu_options.includes(localized_text)) {
+                menu[i].text = localized_text;
+            }
         }
     }
 };

diff --git a/src/external/bot-skeleton/services/api/contracts-for.js b/src/external/bot-skeleton/services/api/contracts-for.js
@@ -497,9 +497,16 @@ export default class ContractsFor {
         return trade_type_options;
     };
 
-    async getTradeTypesForQuickStrategy(symbol) {
+    async getTradeTypesForQuickStrategy(symbol, trade_type = '') {
         const trade_type_options = [];
         const filtered_trade_type_categories = [];
+        if (trade_type === 'ACCU') {
+            trade_type_options.push({
+                text: 'Buy',
+                value: 'ACCU',
+            });
+            return trade_type_options;
+        }
         const market = await this.getMarketBySymbol(symbol);
         const submarket = await this.getSubmarketBySymbol(symbol);
         const trade_type_categories = await this.getTradeTypeCategories(market, submarket, symbol);
@@ -618,7 +625,11 @@ export default class ContractsFor {
 
     getContractTypes = trade_type => {
         const { opposites } = config();
-        const categories = opposites[trade_type.toUpperCase()].map(opposite => ({
+        let trade_type_value = trade_type;
+        if (trade_type_value === 'ACCU') {
+            trade_type_value = 'accumulator';
+        }
+        const categories = opposites[trade_type_value.toUpperCase()].map(opposite => ({
             value: Object.keys(opposite)[0],
             text: Object.values(opposite)[0],
         }));

diff --git a/src/external/bot-skeleton/services/tradeEngine/trade/Sell.js b/src/external/bot-skeleton/services/tradeEngine/trade/Sell.js
@@ -78,7 +78,7 @@ export default Engine =>
                             ).then(proposal_open_contract_response => {
                                 const { proposal_open_contract } = proposal_open_contract_response;
 
-                                if (proposal_open_contract.status !== 'sold') {
+                                if (!proposal_open_contract.is_sold) {
                                     return Promise.reject(sell_error);
                                 }
 
@@ -99,9 +99,9 @@ export default Engine =>
                 // Restart buy/sell on error is enabled, don't recover from sell error.
                 if (!this.options.timeMachineEnabled) {
                     // eslint-disable-next-line no-promise-executor-return
-                    return doUntilDone(sellContractAndGetContractInfo, errors_to_ignore).then(sell_response =>
-                        onContractSold(sell_response)
-                    );
+                    return doUntilDone(sellContractAndGetContractInfo, errors_to_ignore)
+                        .then(sell_response => onContractSold(sell_response))
+                        .catch(error => error);
                 }
 
                 // If above checkbox not checked, try to recover from sell error.

diff --git a/src/external/bot-skeleton/services/tradeEngine/utils/helpers.js b/src/external/bot-skeleton/services/tradeEngine/utils/helpers.js
@@ -217,7 +217,9 @@ export const shouldThrowError = (error, errors_to_ignore = []) => {
         'OpenPositionLimitExceeded',
     ];
     updateErrorMessage(error);
-    const is_ignorable_error = errors_to_ignore.concat(default_errors_to_ignore).includes(error?.error?.code);
+    const is_ignorable_error = errors_to_ignore
+        .concat(default_errors_to_ignore)
+        .includes(error?.error?.code ?? error?.name);
 
     return !is_ignorable_error;
 };
@@ -237,7 +239,7 @@ export const recoverFromError = (promiseFn, recoverFn, errors_to_ignore, delay_i
                     return;
                 }
                 recoverFn(
-                    error?.error?.code,
+                    error?.error?.code ?? error?.name,
                     () =>
                         new Promise(recoverResolve => {
                             const getGlobalTimeouts = () => globalObserver.getState('global_timeouts') ?? [];