Merge branch 'master' of github.com:binary-com/deriv-app into niloo/8…

…4471/ts-migration-parent
suisin-deriv · Jan 8, 2023 · 9a49b2f · 9a49b2f
2 parents 3a2c274 + b134c88
commit 9a49b2f
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 2 deletions.
diff --git a/packages/bot-skeleton/src/scratch/dbot.js b/packages/bot-skeleton/src/scratch/dbot.js
@@ -243,6 +243,10 @@ class DBot {
         }
     }
 
+    terminateConnection = () => {
+        api_base.terminate();
+    };
+
     /**
      * Unselects any selected block before running the bot.
      */

diff --git a/packages/bot-skeleton/src/services/api/api-base.js b/packages/bot-skeleton/src/services/api/api-base.js
@@ -14,7 +14,7 @@ class APIBase {
     init(force_update = false) {
         if (getLoginId()) {
             this.toggleRunButton(true);
-            if (force_update && this.api) this.api.disconnect();
+            if (force_update) this.terminate();
             this.api = generateDerivApiInstance();
             this.initEventListeners();
             this.authorizeAndSubscribe();
@@ -24,6 +24,12 @@ class APIBase {
         }
     }
 
+    terminate() {
+        // eslint-disable-next-line no-console
+        console.log('connection terminated');
+        if (this.api) this.api.disconnect();
+    }
+
     initEventListeners() {
         if (window) {
             window.addEventListener('online', this.reconnectIfNotConnected);

diff --git a/packages/bot-web-ui/src/stores/app-store.js b/packages/bot-web-ui/src/stores/app-store.js
@@ -39,7 +39,7 @@ export default class AppStore {
 
     onUnmount() {
         DBot.terminateBot();
-
+        DBot.terminateConnection();
         if (Blockly.derivWorkspace) {
             clearInterval(Blockly.derivWorkspace.save_workspace_interval);
             Blockly.derivWorkspace.dispose();