Bot Squad / New DBot Homepage (#6496) · binary-com/deriv-app@9047b46

vercel · 2023-05-29T07:51:33Z

Successfully deployed to the following URLs:

deriv-app – ./

binary.sx
deriv-app.vercel.app
deriv-app.binary.sx
deriv-app-git-master.binary.sx

-Original file line number
+Diff line change
@@ Expand Up / @@ -20,15 +20,16 @@ class DBotStore extends DBotStoreInterface { @@
             this.is_mobile = store.is_mobile || false;
             this.is_dark_mode_on = store.is_dark_mode_on || false;
             this.client = store.client;
+            this.dashboard = store.dashboard;
             this.flyout = store.flyout;
             this.toolbar = store.toolbar;
             this.toolbox = store.toolbox;
             this.save_modal = store.save_modal;
+            this.load_modal = store.load_modal;
             this.setContractUpdateConfig = store.setContractUpdateConfig;
             this.toggleStrategyModal = store.toggleStrategyModal;
             this.handleFileChange = store.handleFileChange;
-            this.startLoading = store.startLoading;
-            this.endLoading = store.endLoading;
+            this.setLoading = store.setLoading;
             reaction(
                 () => this.client.loginid,
@@ Expand Down @@

-Original file line number
+Diff line change
@@ Expand Up / @@ -23,6 +23,7 @@ class DBot { @@
          */
         async initWorkspace(public_path, store, api_helpers_store, is_mobile) {
             const recent_files = await getSavedWorkspaces();
             return new Promise((resolve, reject) => {
                 __webpack_public_path__ = public_path; // eslint-disable-line no-global-assign
                 ApiHelpers.setInstance(api_helpers_store);
@@ Expand All / @@ -46,18 +47,13 @@ class DBot { @@
                         return;
                     }
                     this.workspace = Blockly.inject(el_scratch_div, {
-                        grid: { spacing: 40, length: 11, colour: '#f3f3f3' },
                         media: `${__webpack_public_path__}media/`,
                         trashcan: !is_mobile,
                         zoom: { wheel: true, startScale: workspaceScale },
                         scrollbars: true,
                     });
                     this.workspace.cached_xml = { main: main_xml };
-                    this.workspace.save_workspace_interval = setInterval(async () => {
-                        // Periodically save the workspace.
-                        await saveWorkspaceToRecent(Blockly.Xml.workspaceToDom(this.workspace), save_types.UNSAVED);
-                    }, 10000);
                     this.workspace.addChangeListener(this.valueInputLimitationsListener.bind(this));
                     this.workspace.addChangeListener(event => updateDisabledBlocks(this.workspace, event));
@@ Expand All / @@ -73,12 +69,15 @@ class DBot { @@
                     // Push main.xml to workspace and reset the undo stack.
                     this.workspace.current_strategy_id = Blockly.utils.genUid();
                     Blockly.derivWorkspace.strategy_to_load = main_xml;
+                    Blockly.mainWorkspace.strategy_to_load = main_xml;
                     let file_name = config.default_file_name;
                     if (recent_files && recent_files.length) {
                         const latest_file = recent_files[0];
                         Blockly.derivWorkspace.strategy_to_load = latest_file.xml;
+                        Blockly.mainWorkspace.strategy_to_load = latest_file.xml;
                         file_name = latest_file.name;
                         Blockly.derivWorkspace.current_strategy_id = latest_file.id;
+                        Blockly.mainWorkspace.current_strategy_id = latest_file.id;
                     }
                     const event_group = `dbot-load${Date.now()}`;
@@ Expand Down Expand Up / @@ -108,6 +107,10 @@ class DBot { @@
             });
         }
+        async saveRecentWorkspace() {
+            await saveWorkspaceToRecent(Blockly.Xml.workspaceToDom(this.workspace), save_types.UNSAVED);
+        }
         /**
          * Allows you to add a function that needs to be executed before running the bot. Each
          * function needs to return true in order for the bot to run.
@@ Expand Down @@

-Original file line number
+Diff line change
@@ Expand Up @@
         this.setErrorHighlighted(collapsed && this.hasErrorHighlightedDescendant());
     };
+    export const blocksCoordinate = () => {
+        const during_purchase = Blockly.derivWorkspace?.getCanvas().children[1];
+        const after_purchase = Blockly.derivWorkspace?.getCanvas().children[2];
+        during_purchase?.setAttribute('transform', 'translate(720,0)');
+        after_purchase?.setAttribute('transform', 'translate(720,248)');
+    };
     /**
      * @deriv/bot: Add check for workspace.getCanvas() before appendChild() is called.
      */
@@ Expand Down @@

-Original file line number
+Diff line change
@@ Expand Up / @@ -64,10 +64,10 @@ Blockly.Css.CONTENT = [ @@
         '}',
         '.injectionDiv {',
-        'height: 100%;',
+        'height: calc(100vh - 11rem);',
         'position: relative;',
         'overflow: hidden;' /* So blocks in drag surface disappear at edges */,
-        'touch-action: none',
+        'touch-action: none;',
         '}',
         '.blocklyNonSelectable {',
@@ Expand Down Expand Up / @@ -635,7 +635,6 @@ Blockly.Css.CONTENT = [ @@
         '.blocklyMainBackground {',
         'stroke-width: 0;',
-        'fill: var(--general-main-1) !important',
         // 'stroke: #c6c6c6;',  /* Equates to #ddd due to border being off-pixel. */
         '}',
@@ Expand Down @@

-Original file line number
+Diff line change
@@ -1,22 +1,23 @@
-    const trashcan_margin = 16;
-    const core_footer_height = 36;
+    export const initTrashCan = (margin = 16, height = 36) => {
+        /**
+         * Distance between trashcan and bottom edge of workspace.
+         * @type {number}
+         * @private
+         */
+        Blockly.Trashcan.prototype.MARGIN_BOTTOM_ = margin * 2 + height; // eslint-disable-line
-    /**
-     * Distance between trashcan and bottom edge of workspace.
-     * @type {number}
-     * @private
-     */
-    Blockly.Trashcan.prototype.MARGIN_BOTTOM_ = trashcan_margin * 2 + core_footer_height; // eslint-disable-line
+        /**
+         * Distance between trashcan and right edge of workspace.
+         * @type {number}
+         * @private
+         */
+        Blockly.Trashcan.prototype.MARGIN_SIDE_ = margin; // eslint-disable-line
-    /**
-     * Distance between trashcan and right edge of workspace.
-     * @type {number}
-     * @private
-     */
-    Blockly.Trashcan.prototype.MARGIN_SIDE_ = trashcan_margin; // eslint-disable-line
+        /**
+         * Inspect the contents of the trash.
+         * @deriv/bot: Noop for us, restore original functionality when trashcan can be inspected.
+         */
+        Blockly.Trashcan.prototype.click = function () {};
-    /**
-     * Inspect the contents of the trash.
-     * @deriv/bot: Noop for us, restore original functionality when trashcan can be inspected.
-     */
-    Blockly.Trashcan.prototype.click = function () {};
+        window.dispatchEvent(new Event('resize')); // trigger UI update
+    };

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Commit

There are no files selected for viewing

1 comment on commit `9047b46`

vercel bot commented on `9047b46` May 29, 2023

Commit

There are no files selected for viewing

1 comment on commit 9047b46

vercel bot commented on 9047b46 May 29, 2023

Choose a reason for hiding this comment

deriv-app – ./

1 comment on commit `9047b46`

vercel bot commented on `9047b46` May 29, 2023