Merge pull request #50 from amina-deriv/amina/wall-616/verification

Amina/wall 616/fix:verification_flow_mismatch
farrah-deriv · Jun 27, 2023 · 283dced · 283dced
2 parents dfc93db + 27b465d
commit 283dced
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 8 deletions.
diff --git a/packages/account/src/Configs/get-status-badge-config.js b/packages/account/src/Configs/get-status-badge-config.js
@@ -38,10 +38,10 @@ const getStatusBadgeConfig = (account_status, openFailedVerificationModal, selec
             return {
                 text: (
                     <Localize
-                        i18n_default_text='<0>Need verification.</0><1>Verify now</1>'
+                        i18n_default_text='<0>Needs verification.</0><1>Verify now</1>'
                         components={[
                             <Text key={0} weight='bold' size='xxxs' color='var(--status-info)' />,
-                            <Link key={1} className='link-need-verification' to='/account/proof-of-identity' />,
+                            <Link key={1} className='link-need-verification' to='/account/proof-of-identity' />, // TODO: [deriv-eu] change this link when we have the new verification pop-up
                         ]}
                     />
                 ),

diff --git a/packages/appstore/src/components/containers/trading-app-card.tsx b/packages/appstore/src/components/containers/trading-app-card.tsx
@@ -10,7 +10,7 @@ import { AvailableAccount, TDetailsOfEachMT5Loginid } from 'Types';
 import { useStores } from 'Stores/index';
 import { observer } from 'mobx-react-lite';
 import { localize } from '@deriv/translations';
-import { CFD_PLATFORMS, ContentFlag, getStaticUrl } from '@deriv/shared';
+import { CFD_PLATFORMS, ContentFlag, getStaticUrl, Jurisdiction } from '@deriv/shared';
 
 const TradingAppCard = ({
     availability,
@@ -118,7 +118,10 @@ const TradingAppCard = ({
                         onAction={onAction}
                         is_external={is_external}
                         new_tab={new_tab}
-                        is_buttons_disabled={!!mt5_acc_auth_status}
+                        is_buttons_disabled={
+                            //For MF, we enable the button even if account is not authenticated. Rest of jurisdictions, disable the button for pending, failed and needs verification
+                            !is_eu_user && !!mt5_acc_auth_status
+                        }
                         is_account_being_created={!!is_account_being_created}
                         is_real={is_real}
                     />

diff --git a/packages/cashier/src/pages/account-transfer/account-transfer.tsx b/packages/cashier/src/pages/account-transfer/account-transfer.tsx
@@ -24,7 +24,10 @@ type TAccountTransferProps = {
 };
 
 const AccountTransfer = observer(({ onClickDeposit, onClickNotes, onClose, setSideNotes }: TAccountTransferProps) => {
-    const { client } = useStore();
+    const {
+        client,
+        traders_hub: { is_eu_user },
+    } = useStore();
     const { account_transfer, general_store, transaction_history } = useCashierStore();
 
     const {
@@ -84,7 +87,9 @@ const AccountTransfer = observer(({ onClickDeposit, onClickNotes, onClose, setSi
     if (is_loading || is_switching || is_loading_status) {
         return <Loading className='cashier__loader' is_fullscreen={false} />;
     }
-    if (is_cashier_locked) {
+
+    // TODO:  modify the condition once cashier changes are done.
+    if (is_cashier_locked && !is_eu_user) {
         return <CashierLocked />;
     }
     if (is_transfer_locked) {

diff --git a/packages/cfd/src/Constants/cfd_compare_account_content.ts b/packages/cfd/src/Constants/cfd_compare_account_content.ts
@@ -46,13 +46,13 @@ export const getEuRealContent = (): TCompareAccountContentProps[] => [
         values: {
             financial_maltainvest: [
                 { text: localize('Synthetics'), options: { should_show_asterick_at_end: true } },
-                { text: localize('Forex: standard') },
+                { text: localize('Forex(standard)') },
                 { text: localize('Stocks') },
                 { text: localize('Stock indices') },
                 { text: localize('Commodities') },
                 { text: localize('Cryptocurrencies') },
                 {
-                    text: localize('*Boom 300 and Crash 300 Index'),
+                    text: localize('*Volatility 250 Index, Volatility 150 Index, Boom 300 and Crash 300 Index'),
                     options: { color: 'loss-danger', weight: 'bold', styles: { paddingTop: '2rem' } },
                 },
             ],