Merge branch 'master' into ako/FEQ-162/distinguish-dd-staging-logs

binary-com · May 10, 2023 · 87f2f59 · 87f2f59
2 parents 9c911fa + 57abe5f
commit 87f2f59
Show file tree

Hide file tree

Showing 17 changed files with 64 additions and 233 deletions.
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
@@ -1,34 +1,7 @@
 ## Changes:
 
-Please include a summary of the change and which issue is fixed below:
--   ...
+Please provide a summary of the change.
 
-## When you need to add unit test
+### Screenshots:
 
--   [ ] If this change disrupt current flow
--   [ ] If this change is adding new flow
-
-## When you need to add integration test
-
--   [ ] If components from external libraries are being used to define the flow, e.g. @deriv/components
--   [ ] If it relies on a very specific set of props with no default behavior for the current component.
-
-## Test coverage checklist (for reviewer)
-
--   [ ] Ensure utility / function has a test case 
--   [ ] Ensure all the tests are passing
-
-## Type of change
-
--   [ ] Bug fix
--   [ ] New feature
--   [ ] Update feature
--   [ ] Refactor code
--   [ ] Translation to code
--   [ ] Translation to crowdin
--   [ ] Script configuration
--   [ ] Improve performance
--   [ ] Style only
--   [ ] Dependency update
--   [ ] Documentation update
--   [ ] Release
+Please provide some screenshots of the change.
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/bot-web-ui/package.json b/packages/bot-web-ui/package.json
@@ -66,7 +66,7 @@
     "dependencies": {
         "@deriv/bot-skeleton": "^1.0.0",
         "@deriv/components": "^1.0.0",
-        "@deriv/deriv-charts": "1.1.9",
+        "@deriv/deriv-charts": "1.2.1",
         "@deriv/shared": "^1.0.0",
         "@deriv/translations": "^1.0.0",
         "classnames": "^2.2.6",

diff --git a/packages/core/package.json b/packages/core/package.json
@@ -95,7 +95,7 @@
         "@deriv/cfd": "^1.0.0",
         "@deriv/components": "^1.0.0",
         "@deriv/deriv-api": "^1.0.11",
-        "@deriv/deriv-charts": "1.1.9",
+        "@deriv/deriv-charts": "1.2.1",
         "@deriv/hooks": "^1.0.0",
         "@deriv/p2p": "^0.7.3",
         "@deriv/reports": "^1.0.0",

diff --git a/packages/core/src/App/Containers/CitizenshipModal/set-citizenship-form.jsx b/packages/core/src/App/Containers/CitizenshipModal/set-citizenship-form.jsx
@@ -1,44 +1,26 @@
 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, localize } from '@deriv/translations';
 
-const SetCitizenshipForm = ({ class_prefix, errors, touched, setFieldTouched, setFieldValue, citizenship_list }) => (
+const SetCitizenshipForm = ({ class_prefix, errors, touched, setFieldValue, citizenship_list }) => (
     <div className={`${class_prefix}__residence-selection`}>
         <Field name='citizenship'>
             {({ field }) => (
                 <React.Fragment>
-                    <DesktopWrapper>
-                        <Autocomplete
-                            {...field}
-                            autoComplete='off'
-                            input_id='dt_core_set-citizenship-form_signup-citizenship-select'
-                            className={`${class_prefix}__residence-field`}
-                            type='text'
-                            label={localize('Citizenship')}
-                            error={touched.citizenship && errors.citizenship}
-                            required
-                            list_items={citizenship_list}
-                            onItemSelection={({ value, text }) => setFieldValue('citizenship', value ? text : '', true)}
-                        />
-                    </DesktopWrapper>
-                    <MobileWrapper>
-                        <SelectNative
-                            placeholder={localize('Please select')}
-                            label={localize('Citizenship')}
-                            value={field.value}
-                            list_items={citizenship_list}
-                            error={touched.citizenship && errors.citizenship}
-                            required
-                            use_text
-                            onChange={e => {
-                                setFieldTouched('citizenship', true);
-                                setFieldValue('citizenship', e.target.value, true);
-                            }}
-                            should_hide_disabled_options={false}
-                        />
-                    </MobileWrapper>
+                    <Autocomplete
+                        {...field}
+                        autoComplete='off'
+                        input_id='dt_core_set-citizenship-form_signup-citizenship-select'
+                        className={`${class_prefix}__residence-field`}
+                        type='text'
+                        label={localize('Citizenship')}
+                        error={touched.citizenship && errors.citizenship}
+                        required
+                        list_items={citizenship_list}
+                        onItemSelection={({ value, text }) => setFieldValue('citizenship', value ? text : '', true)}
+                    />
                 </React.Fragment>
             )}
         </Field>

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
@@ -5,19 +5,26 @@ 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,
         toggleReadyToDepositModal: onClose,
         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
@@ -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 name='residence'>
                 {({ field }) => (
                     <React.Fragment>
-                        <DesktopWrapper>
-                            <Autocomplete
-                                {...field}
-                                autoComplete='off'
-                                input_id='dt_core_set-residence-form_signup-residence-select'
-                                className={`${class_prefix}__residence-field`}
-                                type='text'
-                                label={localize('Country of residence')}
-                                historyValue={history_value}
-                                error={touched.residence && errors.residence}
-                                required
-                                list_items={residence_list}
-                                onItemSelection={({ value, text }) =>
-                                    setFieldValue('residence', value ? text : '', true)
-                                }
-                            />
-                        </DesktopWrapper>
-                        <MobileWrapper>
-                            <SelectNative
-                                placeholder={localize('Please select')}
-                                label={localize('Country of residence')}
-                                value={field.value}
-                                list_items={residence_list}
-                                error={touched.residence && errors.residence}
-                                required
-                                use_text
-                                onChange={e => {
-                                    setFieldTouched('residence', true);
-                                    setFieldValue('residence', e.target.value, true);
-                                }}
-                            />
-                        </MobileWrapper>
+                        <Autocomplete
+                            {...field}
+                            autoComplete='off'
+                            input_id='dt_core_set-residence-form_signup-residence-select'
+                            className={`${class_prefix}__residence-field`}
+                            type='text'
+                            label={localize('Country of residence')}
+                            historyValue={history_value}
+                            error={touched.residence && errors.residence}
+                            required
+                            list_items={residence_list}
+                            onItemSelection={({ value, text }) => setFieldValue('residence', value ? text : '', true)}
+                        />
                     </React.Fragment>
                 )}
             </Field>

diff --git 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/...c/components/modal-manager/modals/email-link-verified-modal/email-link-verified-modal.jsx b/...c/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
@@ -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
diff --git 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
@@ -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 = {