fix: merged master into my branch and resolved conflicts

shayan-deriv · Dec 19, 2022 · bf38746 · bf38746
2 parents 9cca6b3 + a60ddf2
commit bf38746
Show file tree

Hide file tree

Showing 142 changed files with 2,945 additions and 2,639 deletions.
diff --git a/packages/account/build/webpack.config.js b/packages/account/build/webpack.config.js
@@ -42,7 +42,6 @@ module.exports = function (env) {
             'poi-expired': 'Components/poi/status/expired',
             'poi-missing-personal-details': 'Components/poi/missing-personal-details',
             'poi-unsupported': 'Components/poi/status/unsupported',
-            'poi-unverified': 'Components/poi/status/unverified',
             'poi-upload-complete': 'Components/poi/status/upload-complete',
             'poi-verified': 'Components/poi/status/verified',
             'proof-of-address-container': 'Sections/Verification/ProofOfAddress/proof-of-address-container.jsx',

diff --git a/packages/account/src/Components/poi/status/unverified/__tests__/unverified.spec.js b/packages/account/src/Components/poi/status/unverified/__tests__/unverified.spec.js
diff --git a/packages/account/src/Components/poi/status/unverified/index.js b/packages/account/src/Components/poi/status/unverified/index.js
diff --git a/packages/account/src/Components/poi/status/unverified/unverified.jsx b/packages/account/src/Components/poi/status/unverified/unverified.jsx
diff --git a/packages/account/src/Configs/trading-assessment-config.js b/packages/account/src/Configs/trading-assessment-config.js
@@ -165,7 +165,7 @@ export const trading_assessment_questions = [
             },
             {
                 text: localize(
-                    'Place a bet on the price movement of an asset where the outcome is a fixed return or nothing at all.'
+                    'Place a position on the price movement of an asset where the outcome is a fixed return or nothing at all.'
                 ),
                 value: 'Place a bet on the price movement.',
             },

diff --git a/packages/account/src/Sections/Profile/PersonalDetails/personal-details.jsx b/packages/account/src/Sections/Profile/PersonalDetails/personal-details.jsx
@@ -922,7 +922,12 @@ export const PersonalDetailsForm = ({
                                                     </fieldset>
                                                 )}
                                                 {'tax_identification_number' in values && (
-                                                    <fieldset className='account-form__fieldset'>
+                                                    <fieldset
+                                                        className={classNames('account-form__fieldset', {
+                                                            'account-form__fieldset--tin':
+                                                                getWarningMessages(values).tax_identification_number,
+                                                        })}
+                                                    >
                                                         <Input
                                                             data-lpignore='true'
                                                             type='text'

diff --git a/packages/account/src/Styles/account.scss b/packages/account/src/Styles/account.scss
@@ -216,12 +216,6 @@ $MIN_HEIGHT_FLOATING: calc(
                 margin-bottom: 0;
             }
 
-            .emp-status {
-                .dc-select-native__wrapper {
-                    margin-top: 3rem;
-                }
-            }
-
             .dc-dropdown-container {
                 .dc-dropdown__display-text,
                 .dc-list__item-text {
@@ -393,6 +387,14 @@ $MIN_HEIGHT_FLOATING: calc(
                 grid-gap: 8px;
             }
 
+            &--tin {
+                display: grid;
+                grid-gap: 0.4rem;
+                grid-template-rows: 1fr 1fr;
+                max-width: 40rem;
+                margin-bottom: 1rem;
+            }
+
             .datepicker {
                 max-width: unset;
 

diff --git a/packages/appstore/src/components/CFDs/cfd-demo-accounts.tsx b/packages/appstore/src/components/CFDs/cfd-demo-accounts.tsx
@@ -11,14 +11,12 @@ const CFDDemoAccounts = ({ isDerivedVisible, isFinancialVisible, current_list }:
     const { is_eu } = client;
     const account_name = is_eu ? 'CFDs' : 'Financial';
     const account_desc = is_eu
-        ? 'Trade CFDs on forex, stocks, stock indices, synthetic indices, cryptocurrencies, and commodities with leverage.'
-        : 'Trade CFDs on Deriv MT5 with forex, stocks & indices, commodities, and cryptocurrencies.';
+        ? 'Trade CFDs on MT5 with forex, stocks, stock indices, synthetics, cryptocurrencies, and commodities.'
+        : 'Trade CFDs on MT5 with forex, stocks, stock indices, commodities, and cryptocurrencies.';
     const available_demo_accounts: TStaticAccountProps[] = [
         {
             name: 'Derived',
-            description: localize(
-                'Trade CFDs on Deriv MT5 with Derived indices that simulate real-world market movements.'
-            ),
+            description: localize('Trade CFDs on MT5 with synthetics, baskets, and derived FX.'),
             is_visible: isDerivedVisible(CFD_PLATFORMS.MT5),
             disabled: false,
             platform: CFD_PLATFORMS.MT5,
@@ -35,9 +33,7 @@ const CFDDemoAccounts = ({ isDerivedVisible, isFinancialVisible, current_list }:
         {
             name: 'Deriv X',
             is_visible: isDerivedVisible(CFD_PLATFORMS.DXTRADE),
-            description: localize(
-                'Trade CFDs on Deriv X with Derived indices, forex, stocks & indices, commodities and cryptocurrencies.'
-            ),
+            description: localize('Trade CFDs on Deriv X with financial markets and our Derived indices.'),
             disabled: false,
             platform: CFD_PLATFORMS.DXTRADE,
             type: 'all',

diff --git a/packages/appstore/src/components/CFDs/cfd-real-accounts.tsx b/packages/appstore/src/components/CFDs/cfd-real-accounts.tsx
@@ -38,14 +38,12 @@ const CFDRealAccounts = ({
     const history = useHistory();
     const account_name = is_eu ? 'CFDs' : 'Financial';
     const account_desc = is_eu
-        ? 'Trade CFDs on forex, stocks, stock indices, synthetic indices, cryptocurrencies, and commodities with leverage.'
-        : 'Trade CFDs on Deriv MT5 with forex, stocks & indices, commodities, and cryptocurrencies.';
+        ? 'Trade CFDs on MT5 with forex, stocks, stock indices, synthetics, cryptocurrencies, and commodities.'
+        : 'Trade CFDs on MT5 with forex, stocks, stock indices, commodities, and cryptocurrencies.';
     const available_real_accounts: TStaticAccountProps[] = [
         {
             name: 'Derived',
-            description: localize(
-                'Trade CFDs on Deriv MT5 with Derived indices that simulate real-world market movements.'
-            ),
+            description: localize('Trade CFDs on MT5 with synthetics, baskets, and derived FX.'),
             is_visible: isDerivedVisible(CFD_PLATFORMS.MT5),
             disabled: has_cfd_account_error(CFD_PLATFORMS.MT5),
             platform: CFD_PLATFORMS.MT5,
@@ -61,9 +59,7 @@ const CFDRealAccounts = ({
         },
         {
             name: 'Deriv X',
-            description: localize(
-                'Trade CFDs on Deriv X with Derived indices, forex, stocks & indices, commodities and cryptocurrencies.'
-            ),
+            description: localize('Trade CFDs on Deriv X with financial markets and our Derived indices.'),
             is_visible: isDerivedVisible(CFD_PLATFORMS.DXTRADE),
             disabled: has_cfd_account_error(CFD_PLATFORMS.DXTRADE),
             platform: CFD_PLATFORMS.DXTRADE,

diff --git a/packages/appstore/src/components/account/account.scss b/packages/appstore/src/components/account/account.scss
@@ -3,6 +3,7 @@
     flex-direction: row;
     align-items: center;
     padding: 0.4rem 2rem;
+    grid-template-columns: auto 1fr;
     position: relative;
     border-radius: 0.6rem 0.6rem 0 0;
     flex-shrink: 0;
@@ -11,11 +12,16 @@
     &-active {
         background: var(--general-section-5);
     }
+    &-modal {
+        width: 100%;
+        padding: 0.4rem 1rem;
+    }
 
     @include mobile {
-        gap: 0.4rem;
+        gap: 0.6rem;
         border-radius: 0.4rem 0.4rem 0 0;
         padding: 0.8rem 1.6rem;
+        grid-template-columns: 1fr auto 0.5fr;
     }
     &__dropdown {
         @include mobile {
@@ -32,20 +38,38 @@
         }
     }
     &__details-wrapper {
-        display: flex;
-        flex-direction: column;
-        align-items: flex-start;
-        padding: 0;
+        display: grid;
         width: 100%;
-        @include mobile {
-            width: 100%;
-        }
-        &--number {
-            color: var(--text-less-prominent);
+        grid-template-areas:
+            'txt btn btn'
+            'txt btn btn'
+            'bal bal bal';
+        grid-template-rows: repeat(2, 1fr) auto;
+        grid-template-columns: repeat(2, auto) 1fr;
+        gap: 0.5rem;
+        &--text {
+            grid-area: txt;
+            display: flex;
+            flex-direction: column;
+            align-items: flex-start;
+            &-id {
+                color: var(--text-less-prominent);
+            }
         }
         &--balance {
+            grid-area: bal;
             color: var(--text-general);
         }
+        &--btn {
+            grid-area: btn;
+            justify-self: end;
+            align-self: center;
+            font-size: 1.2rem;
+            border-radius: 0.4rem;
+            @include mobile {
+                justify-self: center;
+            }
+        }
     }
     &__button-wrapper {
         font-size: 1.2rem;
@@ -59,9 +83,5 @@
         @include mobile {
             padding: 0 3.1rem;
         }
-        &-modal {
-            width: 100%;
-            padding: 0.4rem 1rem;
-        }
     }
 }