[BOT]-Mayuran/BOT-2295/safari svh drop down not loading issue

packages/bot-skeleton/src/scratch/blocks/Advanced/List/lists_create_with.js

@@ -1,6 +1,11 @@
 import { localize } from '@deriv/translations';
 import { plusIconDark } from '../../images';
-import { runIrreversibleEvents, runGroupedEvents, modifyContextMenu } from '../../../utils';
+import {
+    runIrreversibleEvents,
+    runGroupedEvents,
+    modifyContextMenu,
+    replaceDropdownIconsForSafari,
+} from '../../../utils';
 
 Blockly.Blocks.lists_create_with = {
     protected_statements: ['STACK'],
@@ -61,10 +66,10 @@ Blockly.Blocks.lists_create_with = {
         });
     },
     onchange(event) {
+        replaceDropdownIconsForSafari(this, 'VARIABLE');
         if (!this.workspace || Blockly.derivWorkspace.isFlyoutVisible || this.workspace.isDragging()) {
             return;
         }
-
         if (event.type === Blockly.Events.BLOCK_DRAG && !event.isStart) {
             // Only allow "text_statement" type blocks
             const blocks_in_stack = this.getBlocksInStatement('STACK');

packages/bot-skeleton/src/scratch/blocks/Advanced/List/lists_getIndex.js

@@ -1,5 +1,5 @@
 import { localize } from '@deriv/translations';
-import { modifyContextMenu } from '../../../utils';
+import { modifyContextMenu, replaceDropdownIconsForSafari } from '../../../utils';
 
 Blockly.Blocks.lists_getIndex = {
     init() {
@@ -43,6 +43,10 @@ Blockly.Blocks.lists_getIndex = {
             category: Blockly.Categories.List,
         };
     },
+    onchange() {
+        replaceDropdownIconsForSafari(this, 'MODE');
+        replaceDropdownIconsForSafari(this, 'WHERE');
+    },
     mutationToDom() {
         const container = document.createElement('mutation');
         const isStatement = !this.outputConnection;

packages/bot-skeleton/src/scratch/blocks/Advanced/List/lists_getSublist.js

@@ -1,5 +1,5 @@
 import { localize } from '@deriv/translations';
-import { modifyContextMenu } from '../../../utils';
+import { modifyContextMenu, replaceDropdownIconsForSafari } from '../../../utils';
 
 Blockly.Blocks.lists_getSublist = {
     init() {
@@ -41,6 +41,10 @@ Blockly.Blocks.lists_getSublist = {
             category: Blockly.Categories.List,
         };
     },
+    onchange() {
+        replaceDropdownIconsForSafari(this, 'WHERE1');
+        replaceDropdownIconsForSafari(this, 'WHERE2');
+    },
     mutationToDom() {
         const container = document.createElement('mutation');
         const isAt1 = this.getInput('AT1').type === Blockly.INPUT_VALUE;

packages/bot-skeleton/src/scratch/blocks/Advanced/List/lists_indexOf.js

@@ -1,5 +1,5 @@
 import { localize } from '@deriv/translations';
-import { modifyContextMenu } from '../../../utils';
+import { modifyContextMenu, replaceDropdownIconsForSafari } from '../../../utils';
 
 Blockly.Blocks.lists_indexOf = {
     init() {
@@ -49,6 +49,9 @@ Blockly.Blocks.lists_indexOf = {
             description: localize('This block gives you the position of an item in a given list.'),
         };
     },
+    onchange() {
+        replaceDropdownIconsForSafari(this, 'END');
+    },
     getRequiredValueInputs() {
         return {
             VALUE: null,

packages/bot-skeleton/src/scratch/blocks/Advanced/List/lists_setIndex.js

@@ -1,5 +1,5 @@
 import { localize } from '@deriv/translations';
-import { modifyContextMenu } from '../../../utils';
+import { modifyContextMenu, replaceDropdownIconsForSafari } from '../../../utils';
 
 Blockly.Blocks.lists_setIndex = {
     init() {
@@ -42,6 +42,10 @@ Blockly.Blocks.lists_setIndex = {
             category: Blockly.Categories.List,
         };
     },
+    onchange() {
+        replaceDropdownIconsForSafari(this, 'MODE');
+        replaceDropdownIconsForSafari(this, 'WHERE');
+    },
     mutationToDom() {
         const container = document.createElement('mutation');
         const isAt = this.getInput('AT').type === Blockly.INPUT_VALUE;

packages/bot-skeleton/src/scratch/blocks/Advanced/List/lists_sort.js

@@ -1,5 +1,5 @@
 import { localize } from '@deriv/translations';
-import { modifyContextMenu } from '../../../utils';
+import { modifyContextMenu, replaceDropdownIconsForSafari } from '../../../utils';
 
 Blockly.Blocks.lists_sort = {
     init() {
@@ -52,6 +52,10 @@ Blockly.Blocks.lists_sort = {
             ),
         };
     },
+    onchange() {
+        replaceDropdownIconsForSafari(this, 'TYPE');
+        replaceDropdownIconsForSafari(this, 'DIRECTION');
+    },
     getRequiredValueInputs() {
         return {
             LIST: null,

packages/bot-skeleton/src/scratch/blocks/Advanced/List/lists_split.js

@@ -1,5 +1,5 @@
 import { localize } from '@deriv/translations';
-import { modifyContextMenu } from '../../../utils';
+import { modifyContextMenu, replaceDropdownIconsForSafari } from '../../../utils';
 
 Blockly.Blocks.lists_split = {
     init() {
@@ -39,6 +39,9 @@ Blockly.Blocks.lists_split = {
             category: Blockly.Categories.List,
         };
     },
+    onchange() {
+        replaceDropdownIconsForSafari(this, 'MODE');
+    },
     mutationToDom() {
         const container = document.createElement('mutation');
         container.setAttribute('mode', this.getFieldValue('MODE'));

packages/bot-skeleton/src/scratch/blocks/Advanced/Loops/controls_flow_statements.js

@@ -1,5 +1,5 @@
 import { localize } from '@deriv/translations';
-import { modifyContextMenu } from '../../../utils';
+import { modifyContextMenu, replaceDropdownIconsForSafari } from '../../../utils';
 
 Blockly.Blocks.controls_flow_statements = {
     init() {
@@ -41,6 +41,9 @@ Blockly.Blocks.controls_flow_statements = {
     customContextMenu(menu) {
         modifyContextMenu(menu);
     },
+    onchange() {
+        replaceDropdownIconsForSafari(this, 'FLOW');
+    },
 };
 
 Blockly.JavaScript.javascriptGenerator.forBlock.controls_flow_statements = block => {

packages/bot-skeleton/src/scratch/blocks/Advanced/Loops/controls_for.js

@@ -1,5 +1,5 @@
 import { localize } from '@deriv/translations';
-import { modifyContextMenu } from '../../../utils';
+import { modifyContextMenu, replaceDropdownIconsForSafari } from '../../../utils';
 
 Blockly.Blocks.controls_for = {
     init() {
@@ -65,6 +65,9 @@ Blockly.Blocks.controls_for = {
             ),
         };
     },
+    onchange() {
+        replaceDropdownIconsForSafari(this, 'VAR');
+    },
     getRequiredValueInputs() {
         return {
             FROM: null,

packages/bot-skeleton/src/scratch/blocks/Advanced/Loops/controls_forEach.js

@@ -1,5 +1,5 @@
 import { localize } from '@deriv/translations';
-import { modifyContextMenu } from '../../../utils';
+import { modifyContextMenu, replaceDropdownIconsForSafari } from '../../../utils';
 
 Blockly.Blocks.controls_forEach = {
     init() {
@@ -47,6 +47,9 @@ Blockly.Blocks.controls_forEach = {
             ),
         };
     },
+    onchange() {
+        replaceDropdownIconsForSafari(this, 'VAR');
+    },
     getRequiredValueInputs() {
         return {
             LIST: null,

packages/bot-skeleton/src/scratch/blocks/Advanced/Loops/controls_whileUntil.js

@@ -1,5 +1,5 @@
 import { localize } from '@deriv/translations';
-import { modifyContextMenu } from '../../../utils';
+import { modifyContextMenu, replaceDropdownIconsForSafari } from '../../../utils';
 
 Blockly.Blocks.controls_whileUntil = {
     init() {
@@ -46,6 +46,9 @@ Blockly.Blocks.controls_whileUntil = {
             description: localize('This block repeats instructions as long as a given condition is true.'),
         };
     },
+    onchange() {
+        replaceDropdownIconsForSafari(this, 'MODE');
+    },
     getRequiredValueInputs() {
         return {
             BOOL: null,

packages/bot-skeleton/src/scratch/blocks/Binary/After Purchase/check_result.js

@@ -1,6 +1,6 @@
 import { localize } from '@deriv/translations';
 import { config } from '../../../../constants/config';
-import { modifyContextMenu } from '../../../utils';
+import { modifyContextMenu, replaceDropdownIconsForSafari } from '../../../utils';
 
 Blockly.Blocks.contract_check_result = {
     init() {
@@ -32,6 +32,7 @@ Blockly.Blocks.contract_check_result = {
         };
     },
     onchange(event) {
+        replaceDropdownIconsForSafari(this, 'CHECK_RESULT');
         if (!this.workspace || Blockly.derivWorkspace.isFlyoutVisible || this.workspace.isDragging()) {
             return;
         }

packages/bot-skeleton/src/scratch/blocks/Binary/After Purchase/read_details.js

@@ -1,6 +1,6 @@
 import { localize } from '@deriv/translations';
 import { config } from '../../../../constants/config';
-import { modifyContextMenu } from '../../../utils';
+import { modifyContextMenu, replaceDropdownIconsForSafari } from '../../../utils';
 
 Blockly.Blocks.read_details = {
     init() {
@@ -31,6 +31,9 @@ Blockly.Blocks.read_details = {
             description: localize('This block gives you information about your last contract.'),
         };
     },
+    onchange() {
+        replaceDropdownIconsForSafari(this, 'DETAIL_INDEX');
+    },
     customContextMenu(menu) {
         modifyContextMenu(menu);
     },

packages/bot-skeleton/src/scratch/blocks/Binary/Tick Analysis/check_direction.js

@@ -1,6 +1,6 @@
 import { localize } from '@deriv/translations';
 import { config } from '../../../../constants/config';
-import { modifyContextMenu } from '../../../utils';
+import { modifyContextMenu, replaceDropdownIconsForSafari } from '../../../utils';
 
 Blockly.Blocks.check_direction = {
     init() {
@@ -33,6 +33,9 @@ Blockly.Blocks.check_direction = {
             ),
         };
     },
+    onchange() {
+        replaceDropdownIconsForSafari(this, 'CHECK_DIRECTION');
+    },
     customContextMenu(menu) {
         modifyContextMenu(menu);
     },

packages/bot-skeleton/src/scratch/blocks/Binary/Tick Analysis/get_ohlc.js

@@ -1,6 +1,6 @@
 import { localize } from '@deriv/translations';
 import { config } from '../../../../constants/config';
-import { modifyContextMenu } from '../../../utils';
+import { modifyContextMenu, replaceDropdownIconsForSafari } from '../../../utils';
 
 Blockly.Blocks.get_ohlc = {
     init() {
@@ -39,6 +39,9 @@ Blockly.Blocks.get_ohlc = {
             description: localize('This block gives you a specific candle from within the selected time interval.'),
         };
     },
+    onchange() {
+        replaceDropdownIconsForSafari(this, 'CANDLEINTERVAL_LIST');
+    },
     getRequiredValueInputs() {
         return {
             CANDLEINDEX: null,

packages/bot-skeleton/src/scratch/blocks/Binary/Tick Analysis/ohlc.js

@@ -1,6 +1,6 @@
 import { localize } from '@deriv/translations';
 import { config } from '../../../../constants/config';
-import { modifyContextMenu } from '../../../utils';
+import { modifyContextMenu, replaceDropdownIconsForSafari } from '../../../utils';
 
 Blockly.Blocks.ohlc = {
     init() {
@@ -33,6 +33,9 @@ Blockly.Blocks.ohlc = {
             description: localize('This block gives you a list of candles within a selected time interval.'),
         };
     },
+    onchange() {
+        replaceDropdownIconsForSafari(this, 'CANDLEINTERVAL_LIST');
+    },
     customContextMenu(menu) {
         modifyContextMenu(menu);
     },

packages/bot-skeleton/src/scratch/blocks/Binary/Tick Analysis/ohlc_values.js

@@ -1,6 +1,6 @@
 import { localize } from '@deriv/translations';
 import { config } from '../../../../constants/config';
-import { modifyContextMenu } from '../../../utils';
+import { modifyContextMenu, replaceDropdownIconsForSafari } from '../../../utils';
 
 Blockly.Blocks.ohlc_values = {
     init() {
@@ -46,6 +46,10 @@ Blockly.Blocks.ohlc_values = {
             ),
         };
     },
+    onchange() {
+        replaceDropdownIconsForSafari(this, 'CANDLEINTERVAL_LIST');
+        replaceDropdownIconsForSafari(this, 'OHLCFIELD_LIST');
+    },
     customContextMenu(menu) {
         modifyContextMenu(menu);
     },

packages/bot-skeleton/src/scratch/blocks/Binary/Tick Analysis/readOhlc.js

@@ -1,6 +1,6 @@
 import { localize } from '@deriv/translations';
 import { config } from '../../../../constants/config';
-import { modifyContextMenu } from '../../../utils';
+import { modifyContextMenu, replaceDropdownIconsForSafari } from '../../../utils';
 
 Blockly.Blocks.read_ohlc = {
     init() {
@@ -47,6 +47,10 @@ Blockly.Blocks.read_ohlc = {
             description: localize('This block gives you the specified candle value for a selected time interval.'),
         };
     },
+    onchange() {
+        replaceDropdownIconsForSafari(this, 'OHLCFIELD_LIST');
+        replaceDropdownIconsForSafari(this, 'CANDLEINTERVAL_LIST');
+    },
     getRequiredValueInputs() {
         return {
             CANDLEINDEX: null,

packages/bot-skeleton/src/scratch/blocks/Binary/Tools/Candle/ohlc_values_in_list.js

@@ -1,6 +1,6 @@
 import { localize } from '@deriv/translations';
 import { config } from '../../../../../constants/config';
-import { modifyContextMenu } from '../../../../utils';
+import { modifyContextMenu, replaceDropdownIconsForSafari } from '../../../../utils';
 
 Blockly.Blocks.ohlc_values_in_list = {
     init() {
@@ -38,6 +38,9 @@ Blockly.Blocks.ohlc_values_in_list = {
             description: localize('This block gives you the selected candle value from a list of candles.'),
         };
     },
+    onchange() {
+        replaceDropdownIconsForSafari(this, 'OHLCFIELD_LIST');
+    },
     getRequiredValueInputs() {
         return {
             OHLCLIST: null,

packages/bot-skeleton/src/scratch/blocks/Binary/Tools/Candle/read_ohlc_obj.js

@@ -1,6 +1,6 @@
 import { localize } from '@deriv/translations';
 import { config } from '../../../../../constants/config';
-import { modifyContextMenu } from '../../../../utils';
+import { modifyContextMenu, replaceDropdownIconsForSafari } from '../../../../utils';
 
 Blockly.Blocks.read_ohlc_obj = {
     init() {
@@ -38,6 +38,9 @@ Blockly.Blocks.read_ohlc_obj = {
             description: localize('This block gives you the selected candle value.'),
         };
     },
+    onchange() {
+        replaceDropdownIconsForSafari(this, 'OHLCFIELD_LIST');
+    },
     getRequiredValueInputs() {
         return {
             OHLCOBJ: null,

packages/bot-skeleton/src/scratch/blocks/Binary/Tools/Misc/balance.js

@@ -1,6 +1,6 @@
 import { localize } from '@deriv/translations';
 import { config } from '../../../../../constants/config';
-import { modifyContextMenu } from '../../../../utils';
+import { modifyContextMenu, replaceDropdownIconsForSafari } from '../../../../utils';
 
 Blockly.Blocks.balance = {
     init() {
@@ -43,6 +43,9 @@ Blockly.Blocks.balance = {
             ),
         };
     },
+    onchange() {
+        replaceDropdownIconsForSafari(this, 'BALANCE_TYPE');
+    },
     customContextMenu(menu) {
         modifyContextMenu(menu);
     },