Merge branch 'master' into 93000/fix_change_theme_translation_issue

deriv-com · Jun 30, 2023 · afc1ee1 · afc1ee1
2 parents 2ab1ebf + f88bb22
commit afc1ee1
Show file tree

Hide file tree

Showing 11 changed files with 30 additions and 115 deletions.
diff --git a/packages/appstore/src/components/cfds-listing/index.tsx b/packages/appstore/src/components/cfds-listing/index.tsx
@@ -283,7 +283,7 @@ const CFDsListing = () => {
             )}
 
             {/* TODO: remove is_real flag to unblock the flow for derivez real account creation */}
-            {is_landing_company_loaded && !is_real
+            {/* {is_landing_company_loaded && !is_real
                 ? available_derivez_accounts?.map((account: AvailableAccount) => {
                       const existing_accounts = getExistingAccounts(account.platform, account.market_type);
                       const has_existing_accounts = existing_accounts.length > 0;
@@ -342,7 +342,7 @@ const CFDsListing = () => {
                           />
                       );
                   })
-                : !is_real && <PlatformLoader />}
+                : !is_real && <PlatformLoader />} */}
         </ListingContainer>
     );
 };

diff --git a/packages/appstore/src/components/onboarding-new/__tests__/static-dashboard.spec.tsx b/packages/appstore/src/components/onboarding-new/__tests__/static-dashboard.spec.tsx
diff --git a/packages/appstore/src/components/onboarding-new/static-dashboard.tsx b/packages/appstore/src/components/onboarding-new/static-dashboard.tsx
@@ -564,7 +564,7 @@ const StaticDashboard = ({
                                     is_financial_last_step={is_financial_last_step}
                                     is_eu_user={is_eu_user}
                                 />
-                                <StaticCFDAccountManager
+                                {/* <StaticCFDAccountManager
                                     type='Financial'
                                     platform='derivez'
                                     appname={localize('Deriv EZ')}
@@ -580,7 +580,7 @@ const StaticDashboard = ({
                                     is_blurry={is_blurry}
                                     is_onboarding_animated={is_onboarding_animated}
                                     is_eu_user={is_eu_user}
-                                />
+                                /> */}
                             </div>
                         )}
                     </div>

diff --git a/packages/bot-skeleton/src/services/api/api-middleware.js b/packages/bot-skeleton/src/services/api/api-middleware.js
@@ -11,11 +11,11 @@ let dataDogEnv = '';
 
 if (isProduction) {
     dataDogVersion = `deriv-app-${process.env.CIRCLE_TAG}`;
-    dataDogSessionSampleRate = +process.env.DATADOG_SESSION_SAMPLE_RATE ?? 10;
+    dataDogSessionSampleRate = 5;
     dataDogEnv = 'production';
 } else if (isStaging) {
     dataDogVersion = `deriv-app-staging-v${formatDate(new Date(), 'YYYYMMDD')}-${formatTime(Date.now(), 'HH:mm')}`;
-    dataDogSessionSampleRate = 100;
+    dataDogSessionSampleRate = 5;
     dataDogEnv = 'staging';
 }
 
@@ -30,41 +30,15 @@ datadogLogs.init({
 });
 
 export const REQUESTS = [
+    'active_symbols',
     'authorize',
     'balance',
-    'active_symbols',
-    'transaction',
-    'ticks_history',
-    'forget',
-    'proposal_open_contract',
-    'proposal',
     'buy',
-    'exchange_rates',
-    'trading_times',
-    'time',
-    'get_account_status',
-    'get_settings',
-    'payout_currencies',
-    'website_status',
-    'get_financial_assessment',
-    'mt5_login_list',
-    'get_self_exclusion',
-    'landing_company',
-    'get_limits',
-    'paymentagent_list',
-    'platform',
-    'trading_platform_available_accounts',
-    'trading_platform_accounts',
-    'statement',
-    'landing_company_details',
-    'contracts_for',
-    'residence_list',
-    'account_security',
-    'p2p_advertiser_info',
-    'platform',
-    'history',
-    'amount',
+    'proposal',
+    'proposal_open_contract',
     'run-proposal',
+    'transaction',
+    'ticks_history',
 ];
 
 class APIMiddleware {

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
@@ -117,24 +117,23 @@ export default class CFDStore extends BaseStore {
             loadDerivezTokens: action.bound,
         });
 
-        reaction(
-            () => [this.root_store.client.dxtrade_accounts_list],
-            () => {
-                if (this.root_store.client.dxtrade_accounts_list.length > 0) {
-                    this.loadDxtradeTokens();
-                }
-            }
-        );
-
-        // todo: uncomment this once derivez tokens are ready
         // reaction(
-        //     () => [this.root_store.client.derivez_accounts_list],
+        //     () => [this.root_store.client.dxtrade_accounts_list],
         //     () => {
-        //         if (this.root_store.client.derivez_accounts_list.length > 0) {
-        //         this.loadDerivezTokens();
+        //         if (this.root_store.client.dxtrade_accounts_list.length > 0) {
+        //             this.loadDxtradeTokens();
         //         }
         //     }
         // );
+
+        reaction(
+            () => [this.root_store.client.derivez_accounts_list],
+            () => {
+                if (this.root_store.client.derivez_accounts_list.length > 0) {
+                    this.loadDerivezTokens();
+                }
+            }
+        );
     }
 
     get account_title() {
@@ -692,7 +691,6 @@ export default class CFDStore extends BaseStore {
             const has_existing_account = this.root_store.client.dxtrade_accounts_list.some(
                 account => account.account_type === account_type
             );
-
             if (!this.dxtrade_tokens[account_type] && has_existing_account) {
                 WS.getServiceToken(CFD_PLATFORMS.DXTRADE, account_type).then(response =>
                     this.setDxtradeToken(response, account_type)
@@ -703,8 +701,8 @@ export default class CFDStore extends BaseStore {
 
     setDerivezToken(response, server) {
         if (!response.error) {
-            const { derivez } = response.service_token;
-            this.derivez_tokens[server] = derivez.token;
+            const { pandats } = response.service_token;
+            this.derivez_tokens[server] = pandats.token;
         }
     }
 

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);
 

diff --git a/packages/core/src/_common/base/socket_base.js b/packages/core/src/_common/base/socket_base.js
@@ -384,7 +384,7 @@ const BinarySocketBase = (() => {
         let temp_service = platform;
         if (platform === CFD_PLATFORMS.DERIVEZ) temp_service = 'pandats';
 
-        deriv_api.send({
+        return deriv_api.send({
             service_token: 1,
             service: temp_service,
             server,

diff --git a/packages/p2p/src/translations/de.json b/packages/p2p/src/translations/de.json
@@ -293,7 +293,7 @@
     "-1088454544": "Holen Sie sich einen neuen Link",
     "-2124584325": "Wir haben deine Bestellung verifiziert",
     "-848068683": "Klicken Sie auf den Link in der E-Mail, die wir Ihnen gesendet haben, um diese Transaktion zu autorisieren.",
-    "-1238182882": "Der Link läuft in 10 Minuten ab.",
+    "-1238182882": "Der Link wird in 10 Minuten ablaufen.",
     "-142727028": "Die E-Mail befindet sich in Ihrem Spam-Ordner (manchmal gehen dort Dinge verloren).",
     "-227512949": "Überprüfe deine Rechtschreibung oder verwende einen anderen Begriff.",
     "-1554938377": "Zahlungsmethode suchen",

diff --git a/packages/stores/src/mockStore.ts b/packages/stores/src/mockStore.ts
@@ -123,6 +123,7 @@ const mock = (): TStores & { is_mock: boolean } => {
             is_deposit_lock: false,
             is_dxtrade_allowed: false,
             is_eu: false,
+            is_eu_country: false,
             is_financial_account: false,
             is_financial_information_incomplete: false,
             is_low_risk: false,

diff --git a/packages/stores/types.ts b/packages/stores/types.ts
@@ -129,6 +129,7 @@ type TNotification =
 
 type TClientStore = {
     accounts: { [k: string]: TActiveAccount };
+    is_eu_country: boolean;
     active_accounts: TActiveAccount[];
     active_account_landing_company: string;
     trading_platform_available_accounts: TTradingPlatformAvailableAccount[];