fix: issues during conflict resolution

binary-com · May 24, 2023 · 48dcdce · 48dcdce
1 parent 2b86910
commit 48dcdce
Show file tree

Hide file tree

Showing 10 changed files with 22,879 additions and 43,751 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/account/src/Components/poi/idv-document-submit/idv-document-submit.tsx b/packages/account/src/Components/poi/idv-document-submit/idv-document-submit.tsx
@@ -53,7 +53,8 @@ const IdvDocumentSubmit = ({
     const [document_list, setDocumentList] = React.useState<object[]>([]);
     const [document_image, setDocumentImage] = React.useState<string | null>(null);
     const [is_input_disable, setInputDisable] = React.useState(true);
-    const [selected_doc, setSelectedDoc] = React.useState(null);
+    const [selected_doc, setSelectedDoc] = React.useState<string | null>(null);
+    const [input_value, setInputValue] = React.useState('');
 
     const document_data = selected_country.identity.services.idv.documents_supported;
 
@@ -273,19 +274,12 @@ const IdvDocumentSubmit = ({
                                                             example_format: string;
                                                         }) => {
                                                             if (item.text === 'No results found' || !item.text) {
-<<<<<<< HEAD:packages/account/src/Components/poi/idv-document-submit/idv-document-submit.tsx
                                                                 setSelectedDoc('');
                                                                 resetDocumentItemSelected(setFieldValue);
                                                             } else {
                                                                 if (typeof setFieldValue === 'function') {
                                                                     setFieldValue('document_type', item, true);
                                                                 }
-=======
-                                                                setSelectedDoc(null);
-                                                                resetDocumentItemSelected(setFieldValue);
-                                                            } else {
-                                                                setFieldValue('document_type', item, true);
->>>>>>> b1d739a041 (chore: update feature branch with master (#8525)):packages/account/src/Components/poi/idv-document-submit/idv-document-submit.jsx
                                                                 setSelectedDoc(item.id);
                                                                 if (has_visual_sample) {
                                                                     setDocumentImage(item.sample_image || '');
@@ -314,13 +308,9 @@ const IdvDocumentSubmit = ({
                                                         );
                                                         if (selected_document) {
                                                             setSelectedDoc(selected_document.id);
-<<<<<<< HEAD:packages/account/src/Components/poi/idv-document-submit/idv-document-submit.tsx
                                                             if (typeof setFieldValue === 'function') {
                                                                 setFieldValue('document_type', selected_document, true);
                                                             }
-=======
-                                                            setFieldValue('document_type', selected_document, true);
->>>>>>> b1d739a041 (chore: update feature branch with master (#8525)):packages/account/src/Components/poi/idv-document-submit/idv-document-submit.jsx
                                                             if (has_visual_sample) {
                                                                 setDocumentImage(selected_document.sample_image);
                                                             }
@@ -351,11 +341,7 @@ const IdvDocumentSubmit = ({
                                                     errors?.error_message
                                                 }
                                                 autoComplete='off'
-<<<<<<< HEAD:packages/account/src/Components/poi/idv-document-submit/idv-document-submit.tsx
                                                 placeholder={generatePlaceholderText(selected_doc || '')}
-=======
-                                                placeholder={generatePlaceholderText(selected_doc)}
->>>>>>> b1d739a041 (chore: update feature branch with master (#8525)):packages/account/src/Components/poi/idv-document-submit/idv-document-submit.jsx
                                                 value={values.document_number}
                                                 onPaste={preventEmptyClipboardPaste}
                                                 onBlur={handleBlur}

diff --git a/packages/appstore/src/modules/traders-hub/traders-hub.scss b/packages/appstore/src/modules/traders-hub/traders-hub.scss
@@ -2,10 +2,7 @@
     max-width: 123.2rem;
     margin: auto;
     padding: 2.4rem 0;
-<<<<<<< HEAD
-=======
     background-color: var(--general-section-1);
->>>>>>> 5bd27894e3 (Sergei / wall 272 / wallet desktop header (#8334))
 
     @include mobile {
         padding: 2rem;

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/cashier/src/pages/withdrawal/withdrawal.tsx b/packages/cashier/src/pages/withdrawal/withdrawal.tsx
@@ -18,7 +18,6 @@ import SideNote from '../../components/side-note';
 import USDTSideNote from '../../components/usdt-side-note';
 import { Virtual } from '../../components/cashier-container';
 import { useCashierStore } from '../../stores/useCashierStores';
-import { useCashierLocked, useIsSystemMaintenance } from '@deriv/hooks';
 
 type TWithdrawalSideNoteProps = {
     currency: string;

diff --git a/packages/components/stories/icon/icons.js b/packages/components/stories/icon/icons.js
@@ -268,6 +268,7 @@ export const icons =
         'IcAlertInfo',
         'IcAlertSuccess',
         'IcAlertTrustpilot',
+        'IcAlertWarningDark',
         'IcAlertWarning',
         'IcAmplifier',
         'IcArchive',
@@ -364,6 +365,7 @@ export const icons =
         'IcEmailOutlineNew',
         'IcEmailOutline',
         'IcEmailSentDashboard',
+        'IcEmailSentExpired',
         'IcEmailSentP2p',
         'IcEmailSent',
         'IcEmailSpam',

diff --git a/packages/core/src/Stores/client-store.js b/packages/core/src/Stores/client-store.js
@@ -1107,10 +1107,6 @@ export default class ClientStore extends BaseStore {
         this.is_authorize = value;
     }
 
-    setIsAuthorize(value) {
-        this.is_authorize = value;
-    }
-
     getBasicUpgradeInfo() {
         const upgradeable_landing_companies = [
             ...new Set(State.getResponse('authorize.upgradeable_landing_companies')),

diff --git a/packages/hooks/src/index.ts b/packages/hooks/src/index.ts
@@ -1,4 +1,5 @@
 export { default as useAccountTransferVisible } from './useAccountTransferVisible';
+export { default as useCfdAccounts } from './useCfdAccounts';
 export { default as useCFDAllAccounts } from './useCFDAllAccounts';
 export { default as useCFDDemoAccounts } from './useCFDDemoAccounts';
 export { default as useCFDRealAccounts } from './useCFDRealAccounts';

diff --git a/packages/stores/src/mockStore.ts b/packages/stores/src/mockStore.ts
@@ -5,17 +5,8 @@ const mock = (): TStores & { is_mock: boolean } => {
     return {
         is_mock: true,
         client: {
-            accounts: {
-                loginid: {
-                    account_type: 'trading',
-                    created_at: 1674633682,
-                    currency: 'USD',
-                    is_disabled: 0,
-                    is_virtual: 0,
-                    excluded_until: 0,
-                    landing_company_name: 'svg',
-                },
-            },
+            account_settings: {},
+            accounts: {},
             active_account_landing_company: '',
             account_limits: {
                 daily_transfers: {
@@ -285,6 +276,8 @@ const mock = (): TStores & { is_mock: boolean } => {
             is_real: false,
             selectRegion: jest.fn(),
             is_low_risk_cr_eu_real: false,
+            is_real_wallets_upgrade_on: false,
+            toggleWalletsUpgrade: jest.fn(),
             is_demo: false,
             financial_restricted_countries: false,
             selected_account_type: 'real',
@@ -295,10 +288,6 @@ const mock = (): TStores & { is_mock: boolean } => {
             setTogglePlatformType: jest.fn(),
             setSelectedAccount: jest.fn(),
             toggleAccountTransferModal: jest.fn(),
-            show_wallet_consent_popup: false,
-            setShouldShowWalletConsentPopup: jest.fn(),
-            is_real_wallets_upgrade_on: false,
-            toggleWalletsUpgrade: jest.fn(),
         },
         menu: {
             attach: jest.fn(),

diff --git a/packages/stores/types.ts b/packages/stores/types.ts
@@ -344,8 +344,6 @@ type TTradersHubStore = {
     setSelectedAccount: (account: { login?: string; account_id?: string }) => void;
     toggleAccountTransferModal: () => void;
     is_demo: boolean;
-    show_wallet_consent_popup: boolean;
-    setShouldShowWalletConsentPopup: (value: boolean) => void;
     is_real_wallets_upgrade_on: boolean;
     toggleWalletsUpgrade: (value: boolean) => void;
 };