{({ field }) => (
-
- setFieldValue('citizenship', value ? text : '', true)}
- />
-
-
- {
- setFieldTouched('citizenship', true);
- setFieldValue('citizenship', e.target.value, true);
- }}
- should_hide_disabled_options={false}
- />
-
+ setFieldValue('citizenship', value ? text : '', true)}
+ />
)}
diff --git a/packages/core/src/App/Containers/Modals/ready-to-deposit-modal/ready-to-deposit-modal.tsx b/packages/core/src/App/Containers/Modals/ready-to-deposit-modal/ready-to-deposit-modal.tsx
index a9a3c66a6dcd..4484f8517a5b 100644
--- a/packages/core/src/App/Containers/Modals/ready-to-deposit-modal/ready-to-deposit-modal.tsx
+++ b/packages/core/src/App/Containers/Modals/ready-to-deposit-modal/ready-to-deposit-modal.tsx
@@ -5,7 +5,7 @@ import { useStore, observer } from '@deriv/stores';
import './ready-to-deposit-modal.scss';
const ReadyToDepositModal = observer(() => {
- const { ui, traders_hub } = useStore();
+ const { ui, traders_hub, client } = useStore();
const { is_eu_user } = traders_hub;
const {
is_ready_to_deposit_modal_visible: is_open,
@@ -13,11 +13,18 @@ const ReadyToDepositModal = observer(() => {
disableApp,
enableApp,
openRealAccountSignup,
+ setShouldShowCooldownModal,
} = ui;
+ const { real_account_creation_unlock_date } = client;
const createAccount = () => {
onClose();
- return is_eu_user ? openRealAccountSignup('maltainvest') : openRealAccountSignup();
+ if (real_account_creation_unlock_date) {
+ return setShouldShowCooldownModal(true);
+ } else if (is_eu_user) {
+ return openRealAccountSignup('maltainvest');
+ }
+ return openRealAccountSignup();
};
return (
diff --git a/packages/core/src/App/Containers/SetResidenceModal/set-residence-form.jsx b/packages/core/src/App/Containers/SetResidenceModal/set-residence-form.jsx
index d0418cab274f..e9c52dd1ff81 100644
--- a/packages/core/src/App/Containers/SetResidenceModal/set-residence-form.jsx
+++ b/packages/core/src/App/Containers/SetResidenceModal/set-residence-form.jsx
@@ -1,7 +1,7 @@
import { Field } from 'formik';
import PropTypes from 'prop-types';
import React from 'react';
-import { Autocomplete, DesktopWrapper, MobileWrapper, SelectNative, Text } from '@deriv/components';
+import { Autocomplete, Text } from '@deriv/components';
import { localize } from '@deriv/translations';
const SetResidenceForm = ({
@@ -26,38 +26,19 @@ const SetResidenceForm = ({
{({ field }) => (
-
-
- setFieldValue('residence', value ? text : '', true)
- }
- />
-
-
- {
- setFieldTouched('residence', true);
- setFieldValue('residence', e.target.value, true);
- }}
- />
-
+ setFieldValue('residence', value ? text : '', true)}
+ />
)}
diff --git a/packages/core/src/Services/ws-methods.js b/packages/core/src/Services/ws-methods.js
index 80ceab624bb7..6765de4ca3fc 100644
--- a/packages/core/src/Services/ws-methods.js
+++ b/packages/core/src/Services/ws-methods.js
@@ -1,6 +1,5 @@
import BinarySocket from '_common/base/socket_base';
-import { trackJSNetworkMonitor } from '@deriv/shared';
const WS = BinarySocket;
-export default trackJSNetworkMonitor(WS);
+export default WS;
diff --git a/packages/p2p/src/components/modal-manager/modals/email-link-verified-modal/email-link-verified-modal.jsx b/packages/p2p/src/components/modal-manager/modals/email-link-verified-modal/email-link-verified-modal.jsx
index dc42a2076d57..f55530f72a20 100644
--- a/packages/p2p/src/components/modal-manager/modals/email-link-verified-modal/email-link-verified-modal.jsx
+++ b/packages/p2p/src/components/modal-manager/modals/email-link-verified-modal/email-link-verified-modal.jsx
@@ -33,7 +33,7 @@ const EmailLinkVerifiedModal = () => {
large
primary
onClick={() => {
- hideModal();
+ hideModal({ should_hide_all_modals: true });
order_store.confirmOrder(is_buy_order_for_user);
}}
>
diff --git a/packages/shared/src/services/index.ts b/packages/shared/src/services/index.ts
index 33c0e02743b6..20f6ca4ceb72 100644
--- a/packages/shared/src/services/index.ts
+++ b/packages/shared/src/services/index.ts
@@ -1,2 +1 @@
export * from './ws-methods';
-export { trackJSNetworkMonitor } from './trackjs';
diff --git a/packages/shared/src/services/trackjs.ts b/packages/shared/src/services/trackjs.ts
deleted file mode 100644
index 6a67bed13523..000000000000
--- a/packages/shared/src/services/trackjs.ts
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
- Responses that should be ignored upon receiving errors.
- We still log them, but having an error inside of these
- will not break the queue and send them to trackjs.
- This will look for predefined `ignored_responses_in_trackjs` from GTM, if
- there is none, then it just does not filter out any response.
-*/
-declare global {
- interface Window {
- ignored_responses_in_trackjs: [];
- TrackJS: { console: { log: (arg0: unknown[]) => void }; track: (arg0: object) => void };
- }
-}
-
-const getIgnoredResponseKeywords = () => {
- return window.ignored_responses_in_trackjs || [];
-};
-
-class ResponseQueue {
- list: unknown[];
- size: number;
- constructor() {
- this.list = [];
- this.size = 3;
- }
-
- add(response: unknown) {
- this.list.unshift(response);
- }
-
- remove() {
- this.list.pop();
- }
-
- push(response: unknown) {
- if (this.list.length >= this.size) {
- this.remove();
- }
- this.add(response);
- }
-
- fresh() {
- this.list = [];
- }
-}
-
-const queue = new ResponseQueue();
-
-/**
- * Listen on method calls and inspect the response to see if error is thrown.
- * Handling the response status is NOT this function's responsibility
- */
-export const ApiCallProxyHandler = {
- get(target: object, prop_key: PropertyKey, receiver: string) {
- try {
- const target_value = Reflect.get(target, prop_key, receiver);
- if (typeof target_value === 'function') {
- return (...args: string[]) => {
- const result = target_value.apply(this, args);
- if (result instanceof Promise) {
- return new Promise(resolve => {
- result
- .then(response => {
- if (response.error) {
- queue.push(response);
- if (window.TrackJS) window.TrackJS.console.log(queue.list);
- queue.fresh();
- if (
- window.TrackJS &&
- !getIgnoredResponseKeywords().some(
- (item: string) => item === response.error.code
- )
- ) {
- window.TrackJS.track(response.error.code);
- }
- }
- queue.push(response);
- resolve(response);
- })
- .catch(error => {
- if (window.TrackJS) {
- window.TrackJS.console.log(queue.list);
- window.TrackJS.track(error.getMessage());
- }
- });
- });
- }
- return result;
- };
- }
- return target_value;
- } catch (error: unknown) {
- if (error instanceof Error) {
- throw new Error(error.message);
- }
- }
- return null;
- },
-};
-
-export const trackJSNetworkMonitor = (obj: Record
) => new Proxy(obj, ApiCallProxyHandler);
diff --git a/packages/stores/src/mockStore.ts b/packages/stores/src/mockStore.ts
index 1e66b0ccb439..89ec006cf13b 100644
--- a/packages/stores/src/mockStore.ts
+++ b/packages/stores/src/mockStore.ts
@@ -198,6 +198,7 @@ const mock = (): TStores => {
setTwoFAStatus: jest.fn(),
has_changed_two_fa: false,
setTwoFAChangedStatus: jest.fn(),
+ real_account_creation_unlock_date: 0,
},
common: {
error: {
@@ -253,6 +254,7 @@ const mock = (): TStores => {
is_ready_to_deposit_modal_visible: false,
is_need_real_account_for_cashier_modal_visible: false,
toggleNeedRealAccountForCashierModal: jest.fn(),
+ setShouldShowCooldownModal: jest.fn(),
},
traders_hub: {
closeModal: jest.fn(),
diff --git a/packages/stores/types.ts b/packages/stores/types.ts
index e114d70cce3c..3211e4dac9da 100644
--- a/packages/stores/types.ts
+++ b/packages/stores/types.ts
@@ -191,6 +191,7 @@ type TClientStore = {
setTwoFAStatus: (status: boolean) => void;
has_changed_two_fa: boolean;
setTwoFAChangedStatus: (status: boolean) => void;
+ real_account_creation_unlock_date: number;
};
type TCommonStoreError = {
@@ -248,6 +249,7 @@ type TUiStore = {
is_ready_to_deposit_modal_visible: boolean;
is_need_real_account_for_cashier_modal_visible: boolean;
toggleNeedRealAccountForCashierModal: () => void;
+ setShouldShowCooldownModal: (value: boolean) => void;
};
type TMenuStore = {
diff --git a/packages/trader/package.json b/packages/trader/package.json
index 612df0c6b790..9a4c7e1114d9 100644
--- a/packages/trader/package.json
+++ b/packages/trader/package.json
@@ -82,7 +82,7 @@
"@deriv/api-types": "^1.0.94",
"@deriv/components": "^1.0.0",
"@deriv/deriv-api": "^1.0.11",
- "@deriv/deriv-charts": "1.1.9",
+ "@deriv/deriv-charts": "1.2.1",
"@deriv/reports": "^1.0.0",
"@deriv/shared": "^1.0.0",
"@deriv/stores": "^1.0.0",
diff --git a/packages/trader/src/Modules/SmartChart/Components/toolbar-widgets.jsx b/packages/trader/src/Modules/SmartChart/Components/toolbar-widgets.jsx
index db799d507ccb..f98fa5684f6d 100644
--- a/packages/trader/src/Modules/SmartChart/Components/toolbar-widgets.jsx
+++ b/packages/trader/src/Modules/SmartChart/Components/toolbar-widgets.jsx
@@ -2,13 +2,10 @@ import PropTypes from 'prop-types';
import React from 'react';
import { isDesktop, isMobile } from '@deriv/shared';
import { ChartMode, DrawTools, Share, StudyLegend, Views, ToolbarWidget } from 'Modules/SmartChart';
-import { connect } from 'Stores/connect';
-const ToolbarWidgets = ({ is_accumulator, position, updateChartType, updateGranularity }) => (
+const ToolbarWidgets = ({ position, updateChartType, updateGranularity }) => (
- {!is_accumulator && (
-
- )}
+
{isDesktop() && }
{isDesktop() && }
{isDesktop() && }
@@ -20,11 +17,6 @@ ToolbarWidgets.propTypes = {
position: PropTypes.string,
updateChartType: PropTypes.func,
updateGranularity: PropTypes.func,
- is_accumulator: PropTypes.func,
};
-export default React.memo(
- connect(({ modules }) => ({
- is_accumulator: modules.trade.is_accumulator,
- }))(ToolbarWidgets)
-);
+export default React.memo(ToolbarWidgets);
diff --git a/packages/trader/src/Modules/Trading/Containers/trade.jsx b/packages/trader/src/Modules/Trading/Containers/trade.jsx
index ee477cd765fe..61950b4261a7 100644
--- a/packages/trader/src/Modules/Trading/Containers/trade.jsx
+++ b/packages/trader/src/Modules/Trading/Containers/trade.jsx
@@ -4,7 +4,6 @@ import classNames from 'classnames';
import { DesktopWrapper, Div100vhContainer, MobileWrapper, SwipeableWrapper } from '@deriv/components';
import { isDesktop, isMobile } from '@deriv/shared';
import ChartLoader from 'App/Components/Elements/chart-loader.jsx';
-import { isDigitTradeType } from 'Modules/Trading/Helpers/digits';
import { connect } from 'Stores/connect';
import PositionsDrawer from 'App/Components/Elements/PositionsDrawer';
import MarketIsClosedOverlay from 'App/Components/Elements/market-is-closed-overlay.jsx';
@@ -31,7 +30,6 @@ const BottomWidgetsMobile = ({ tick, digits, setTick, setDigits }) => {
};
const Trade = ({
- contract_type,
form_components,
getFirstOpenMarket,
should_show_active_symbols_loading,
@@ -182,13 +180,7 @@ const Trade = ({