From 046bfd9922715cdf1213e8cf54a5ab267e1b99f2 Mon Sep 17 00:00:00 2001
From: hirad-deriv <hirad@re-work.dev>
Date: Wed, 28 Jun 2023 14:35:26 +0800
Subject: [PATCH 1/2] Hirad/ Fixed the issue where the user could not trade in
 deriv EZ (#9165)

* fix: fixed the issue where the user could not trade in the deriv EZ platform

* fix: changed the URL of Deriv EZ

* fix: adding empty commit to pass the tests

* fix: rerunning the tests
---
 packages/cfd/src/Helpers/constants.ts           |  2 +-
 .../cfd/src/Stores/Modules/CFD/cfd-store.js     | 17 ++++++++---------
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/packages/cfd/src/Helpers/constants.ts b/packages/cfd/src/Helpers/constants.ts
index fdad551a2643..c53bec4b320d 100644
--- 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
index bd38722f3b7d..6b1ba16564d8 100644
--- 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() {

From d5aae62b7d9f0679456062ee7a5da398a351419b Mon Sep 17 00:00:00 2001
From: "Ali(Ako) Hosseini" <ali.hosseini@deriv.com>
Date: Wed, 28 Jun 2023 14:50:46 +0800
Subject: [PATCH 2/2] fix: remove trackjs manual push (#9166)

---
 packages/core/src/Services/socket-general.js | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/packages/core/src/Services/socket-general.js b/packages/core/src/Services/socket-general.js
index 0ab8c26e633c..7bca534da868 100644
--- 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);