Merge branch 'master' into 92483/fix_padding_for_language

binary-com · Jun 28, 2023 · 0362f49 · 0362f49
2 parents 15d413a + d5aae62
commit 0362f49
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 13 deletions.
diff --git a/packages/cfd/src/Helpers/constants.ts b/packages/cfd/src/Helpers/constants.ts
@@ -120,7 +120,7 @@ const getDerivEzWebTerminalLink = (category: string, token?: string) => {
     let url = DERIVEZ_URL;
 
     if (token) {
-        url += `?token=${token}`;
+        url += `?lang=en&token=${token}`;
     }
 
     return url;

diff --git a/packages/cfd/src/Stores/Modules/CFD/cfd-store.js b/packages/cfd/src/Stores/Modules/CFD/cfd-store.js
@@ -126,15 +126,14 @@ export default class CFDStore extends BaseStore {
             }
         );
 
-        // todo: uncomment this once derivez tokens are ready
-        // reaction(
-        //     () => [this.root_store.client.derivez_accounts_list],
-        //     () => {
-        //         if (this.root_store.client.derivez_accounts_list.length > 0) {
-        //         this.loadDerivezTokens();
-        //         }
-        //     }
-        // );
+        reaction(
+            () => [this.root_store.client.derivez_accounts_list],
+            () => {
+                if (this.root_store.client.derivez_accounts_list.length > 0) {
+                    this.loadDerivezTokens();
+                }
+            }
+        );
     }
 
     get account_title() {

diff --git a/packages/core/src/Services/socket-general.js b/packages/core/src/Services/socket-general.js
@@ -204,9 +204,6 @@ const BinarySocketGeneral = (() => {
                 ) {
                     return;
                 }
-                if (!['reset_password'].includes(msg_type)) {
-                    if (window.TrackJS) window.TrackJS.track('Custom InvalidToken error');
-                }
                 // eslint-disable-next-line no-case-declarations
                 const active_platform = getActivePlatform(common_store.app_routing_history);