Merge pull request #169 from rupato-deriv/Rupato/BOT-2436/Fix-for-currency-on-trade-definition-block

rupato-deriv · web-flow · commit e244c1043369 · 2024-12-13T12:16:39.000+08:00
Rupato/BOT-2436/fix: for currency on trade definition block
diff --git a/src/constants/quick-strategies/d_alembert.ts b/src/constants/quick-strategies/d_alembert.ts
@@ -64,7 +64,7 @@ export const D_ALEMBERT = (): TDescriptionItem[] => [
     {
         type: 'media',
         src: getImageLocation('dalembert.svg'),
-        alt: localize("An example of D’Alembert's Grind strategy"),
+        alt: localize('An example of D’Alembert strategy'),
     },
     {
         type: 'text',
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 { excludeOptionFromContextMenu, modifyContextMenu } from '../../../utils';
+import { excludeOptionFromContextMenu, modifyContextMenu, setCurrency } 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.'
@@ -50,9 +50,10 @@ window.Blockly.Blocks.accumulator_take_profit = {
         }
         if (
             (event.type === window.Blockly.Events.BLOCK_CREATE && event.ids.includes(this.id)) ||
-            (event.type === window.Blockly.Events.BLOCK_DRAG && !event.isStart)
+            (event.type === window.Blockly.Events.BLOCK_DRAG && !event.isStart) ||
+            (event.type === window.Blockly.Events.BLOCK_CHANGE && !event.isStart)
         ) {
-            this.setCurrency();
+            setCurrency(this);
         }
     },
     customContextMenu(menu) {
@@ -61,7 +62,6 @@ window.Blockly.Blocks.accumulator_take_profit = {
         modifyContextMenu(menu);
     },
     restricted_parents: ['trade_definition_accumulator'],
-    setCurrency: window.Blockly.Blocks.trade_definition_tradeoptions.setCurrency,
     getRequiredValueInputs() {
         const field_input = this.getInput('AMOUNT');
         if (field_input.connection.targetBlock()) {
diff --git a/src/external/bot-skeleton/scratch/blocks/Binary/Trade Definition/multiplier_stop_loss.js b/src/external/bot-skeleton/scratch/blocks/Binary/Trade Definition/multiplier_stop_loss.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 { modifyContextMenu, setCurrency } from '../../../utils';
 
 const description = localize(
     'Your contract is closed automatically when your loss is more than or equals to this amount. This block can only be used with the multipliers trade type.'
@@ -53,13 +53,13 @@ window.Blockly.Blocks.multiplier_stop_loss = {
         }
         if (
             (event.type === window.Blockly.Events.BLOCK_CREATE && event.ids.includes(this.id)) ||
-            (event.type === window.Blockly.Events.BLOCK_DRAG && !event.isStart)
+            (event.type === window.Blockly.Events.BLOCK_DRAG && !event.isStart) ||
+            (event.type === window.Blockly.Events.BLOCK_CHANGE && !event.isStart)
         ) {
-            this.setCurrency();
+            setCurrency(this);
         }
     },
     restricted_parents: ['trade_definition_multiplier'],
-    setCurrency: window.Blockly.Blocks.trade_definition_tradeoptions.setCurrency,
     getRequiredValueInputs() {
         const field_input = this.getInput('AMOUNT');
         if (field_input.connection.targetBlock()) {
diff --git a/src/external/bot-skeleton/scratch/blocks/Binary/Trade Definition/multiplier_take_profit.js b/src/external/bot-skeleton/scratch/blocks/Binary/Trade Definition/multiplier_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 { modifyContextMenu, setCurrency } 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 multipliers trade type.'
@@ -53,13 +53,13 @@ window.Blockly.Blocks.multiplier_take_profit = {
         }
         if (
             (event.type === window.Blockly.Events.BLOCK_CREATE && event.ids.includes(this.id)) ||
-            (event.type === window.Blockly.Events.BLOCK_DRAG && !event.isStart)
+            (event.type === window.Blockly.Events.BLOCK_DRAG && !event.isStart) ||
+            (event.type === window.Blockly.Events.BLOCK_CHANGE && !event.isStart)
         ) {
-            this.setCurrency();
+            setCurrency(this);
         }
     },
     restricted_parents: ['trade_definition_multiplier'],
-    setCurrency: window.Blockly.Blocks.trade_definition_tradeoptions.setCurrency,
     getRequiredValueInputs() {
         const field_input = this.getInput('AMOUNT');
         if (field_input.connection.targetBlock()) {
diff --git a/src/external/bot-skeleton/scratch/blocks/Binary/Trade Definition/trade_definition_accumulator.js b/src/external/bot-skeleton/scratch/blocks/Binary/Trade Definition/trade_definition_accumulator.js
@@ -4,7 +4,7 @@ import { config } from '../../../../constants/config';
 import ApiHelpers from '../../../../services/api/api-helpers';
 import { handleProposalRequestForAccumulators } from '../../../accumulators-proposal-handler';
 import DBotStore from '../../../dbot-store';
-import { modifyContextMenu, runGroupedEvents, runIrreversibleEvents } from '../../../utils';
+import { modifyContextMenu, runGroupedEvents, runIrreversibleEvents, setCurrency } from '../../../utils';
 
 window.Blockly.Blocks.trade_definition_accumulator = {
     init() {
@@ -127,7 +127,7 @@ window.Blockly.Blocks.trade_definition_accumulator = {
         const is_load_event = /^dbot-load/.test(event.group);
 
         if (event.type === window.Blockly.Events.BLOCK_CREATE && event.ids.includes(this.id)) {
-            this.setCurrency();
+            setCurrency(this);
             if (is_load_event) {
                 // Do NOT touch any values when a strategy is being loaded.
                 this.updateAccumulatorInput(false);
@@ -138,6 +138,7 @@ window.Blockly.Blocks.trade_definition_accumulator = {
         }
 
         if (event.type === window.Blockly.Events.BLOCK_CHANGE) {
+            setCurrency(this);
             this.validateBlocksInStatement();
             if (is_load_event) {
                 if (event.name === 'TRADETYPE_LIST') {
@@ -159,7 +160,6 @@ window.Blockly.Blocks.trade_definition_accumulator = {
         }
 
         if (event.type === window.Blockly.Events.BLOCK_DRAG && !event.isStart) {
-            this.setCurrency();
             this.validateBlocksInStatement();
             if (event.blockId === this.id) {
                 // Ensure this block is populated after initial drag from flyout.
@@ -238,7 +238,6 @@ window.Blockly.Blocks.trade_definition_accumulator = {
     customContextMenu(menu) {
         modifyContextMenu(menu);
     },
-    setCurrency: window.Blockly.Blocks.trade_definition_tradeoptions.setCurrency,
     restricted_parents: ['trade_definition'],
     getRequiredValueInputs() {
         return {
diff --git a/src/external/bot-skeleton/scratch/blocks/Binary/Trade Definition/trade_definition_multiplier.js b/src/external/bot-skeleton/scratch/blocks/Binary/Trade Definition/trade_definition_multiplier.js
@@ -3,7 +3,7 @@ import { localize } from '@deriv-com/translations';
 import { config } from '../../../../constants/config';
 import ApiHelpers from '../../../../services/api/api-helpers';
 import DBotStore from '../../../dbot-store';
-import { modifyContextMenu, runGroupedEvents, runIrreversibleEvents } from '../../../utils';
+import { modifyContextMenu, runGroupedEvents, runIrreversibleEvents, setCurrency } from '../../../utils';
 
 window.Blockly.Blocks.trade_definition_multiplier = {
     init() {
@@ -134,7 +134,7 @@ window.Blockly.Blocks.trade_definition_multiplier = {
         const is_load_event = /^dbot-load/.test(event.group);
 
         if (event.type === window.Blockly.Events.BLOCK_CREATE && event.ids.includes(this.id)) {
-            this.setCurrency();
+            setCurrency(this);
             if (is_load_event) {
                 // Do NOT touch any values when a strategy is being loaded.
                 this.updateMultiplierInput(false);
@@ -145,6 +145,7 @@ window.Blockly.Blocks.trade_definition_multiplier = {
         }
 
         if (event.type === window.Blockly.Events.BLOCK_CHANGE) {
+            setCurrency(this);
             this.validateBlocksInStatement();
             if (is_load_event) {
                 if (event.name === 'TRADETYPE_LIST') {
@@ -166,7 +167,6 @@ window.Blockly.Blocks.trade_definition_multiplier = {
         }
 
         if (event.type === window.Blockly.Events.BLOCK_DRAG && !event.isStart) {
-            this.setCurrency();
             this.validateBlocksInStatement();
             if (event.blockId === this.id) {
                 // Ensure this block is populated after initial drag from flyout.
@@ -245,7 +245,6 @@ window.Blockly.Blocks.trade_definition_multiplier = {
     customContextMenu(menu) {
         modifyContextMenu(menu);
     },
-    setCurrency: window.Blockly.Blocks.trade_definition_tradeoptions.setCurrency,
     restricted_parents: ['trade_definition'],
     getRequiredValueInputs() {
         return {
diff --git a/src/external/bot-skeleton/scratch/blocks/Binary/Trade Definition/trade_definition_tradeoptions.js b/src/external/bot-skeleton/scratch/blocks/Binary/Trade Definition/trade_definition_tradeoptions.js
@@ -4,7 +4,7 @@ import { localize } from '@deriv-com/translations';
 import { config } from '../../../../constants/config';
 import ApiHelpers from '../../../../services/api/api-helpers';
 import DBotStore from '../../../dbot-store';
-import { modifyContextMenu, runGroupedEvents, runIrreversibleEvents } from '../../../utils';
+import { modifyContextMenu, runGroupedEvents, runIrreversibleEvents, setCurrency } from '../../../utils';
 
 window.Blockly.Blocks.trade_definition_tradeoptions = {
     durations: [],
@@ -119,7 +119,7 @@ window.Blockly.Blocks.trade_definition_tradeoptions = {
             (event.type === window.Blockly.Events.BLOCK_CREATE && event.ids.includes(this.id)) ||
             (event.type === window.Blockly.Events.BLOCK_DRAG && !event.isStart)
         ) {
-            this.setCurrency();
+            setCurrency(this);
             this.updateAmountLimits();
         }
 
@@ -524,11 +524,6 @@ window.Blockly.Blocks.trade_definition_tradeoptions = {
 
         return container;
     },
-    setCurrency() {
-        const currency_field = this.getField('CURRENCY_LIST');
-        const { currency } = DBotStore.instance.client;
-        currency_field?.setText(getCurrencyDisplayCode(currency));
-    },
     restricted_parents: ['trade_definition'],
     getRequiredValueInputs() {
         return {
diff --git a/src/external/bot-skeleton/scratch/utils/index.js b/src/external/bot-skeleton/scratch/utils/index.js
@@ -1,5 +1,6 @@
 import { botNotification } from '@/components/bot-notification/bot-notification';
 import { notification_message } from '@/components/bot-notification/bot-notification-utils';
+import { getCurrencyDisplayCode } from '@/components/shared';
 import { localize } from '@deriv-com/translations';
 import { config } from '../../constants/config';
 import { LogTypes } from '../../constants/messages';
@@ -751,3 +752,9 @@ export const appendCollapsedProcedureBlocksFields = instance => {
         remove_last_input(collapsed_input);
     }
 };
+
+export const setCurrency = block_instance => {
+    const currency_field = block_instance.getField('CURRENCY_LIST');
+    const { currency } = DBotStore.instance.client;
+    currency_field?.setValue(getCurrencyDisplayCode(currency));
+};
diff --git a/src/stores/app-store.ts b/src/stores/app-store.ts
@@ -7,6 +7,7 @@ import {
     standalone_routes,
 } from '@/components/shared';
 import { api_base, ApiHelpers, DBot, runIrreversibleEvents } from '@/external/bot-skeleton';
+import { setCurrency } from '@/external/bot-skeleton/scratch/utils';
 import { TApiHelpersStore } from '@/types/stores.types';
 import { localize } from '@deriv-com/translations';
 import RootStore from './root-store';
@@ -224,7 +225,7 @@ export default class AppStore {
         // Syncs all trade options blocks' currency with the client's active currency.
         this.disposeCurrencyReaction = reaction(
             () => this.core.client.currency,
-            currency => {
+            () => {
                 if (!window.Blockly?.derivWorkspace) return;
 
                 const trade_options_blocks = window.Blockly?.derivWorkspace
@@ -237,7 +238,7 @@ export default class AppStore {
                             (b.isDescendantOf('trade_definition_multiplier') && b.category_ === 'trade_parameters')
                     );
 
-                trade_options_blocks.forEach(trade_options_block => trade_options_block.setCurrency(currency));
+                trade_options_blocks.forEach(trade_options_block => setCurrency(trade_options_block));
             }
         );
     };

Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@ export const D_ALEMBERT = (): TDescriptionItem[] => [`
`64`	`64`	`{`
`65`	`65`	`type: 'media',`
`66`	`66`	`src: getImageLocation('dalembert.svg'),`
`67`		`- alt: localize("An example of D’Alembert's Grind strategy"),`
	`67`	`+ alt: localize('An example of D’Alembert strategy'),`
`68`	`68`	`},`
`69`	`69`	`{`
`70`	`70`	`type: 'text',`