diff --git a/packages/appstore/src/components/modals/regulators-compare-modal/regulators-compare-modal-content.tsx b/packages/appstore/src/components/modals/regulators-compare-modal/regulators-compare-modal-content.tsx index cb5e1025f5b2..dc63d16c7f00 100644 --- a/packages/appstore/src/components/modals/regulators-compare-modal/regulators-compare-modal-content.tsx +++ b/packages/appstore/src/components/modals/regulators-compare-modal/regulators-compare-modal-content.tsx @@ -9,7 +9,7 @@ import { TRowItem, } from 'Constants/regulators-modal-content'; -const Row = ({ attribute, content }: TRegulatorsContentProps) => { +const Row = ({ attribute, content, id }: TRegulatorsContentProps) => { return ( @@ -22,7 +22,7 @@ const Row = ({ attribute, content }: TRegulatorsContentProps) => { {Array.isArray(content[rowKey]) ? ( (content[rowKey] as TRowItem[])?.map(item => ( { + useP2PCompletedOrdersNotification(); + const notifications_toggler_el = (
{ + const { client, common, ui, notifications, traders_hub } = useStore(); + const { + account_switcher_disabled_message: acc_switcher_disabled_message, + disableApp, + enableApp, + header_extension, + is_account_switcher_disabled: is_acc_switcher_disabled, + is_accounts_switcher_on: is_acc_switcher_on, + is_app_disabled, + is_route_modal_on, + openRealAccountSignup, + toggleAccountsDialog, + is_trading_assessment_for_existing_user_enabled, + is_mobile, + } = ui; + const { + account_type, + balance, + currency, + country_standpoint, + is_bot_allowed, + is_eu, + is_logged_in, + is_logging_in, + is_mt5_allowed, + is_dxtrade_allowed, + is_virtual, + is_landing_company_loaded, + is_switching, + } = client; + const { current_language, platform, app_routing_history } = common; + const { setTogglePlatformType } = traders_hub; + const { + addNotificationMessage, + client_notifications, + is_notifications_visible, + notifications: { length: notifications_count }, + removeNotificationMessage, + toggleNotificationsModal: toggleNotifications, + } = notifications; + + const history = useHistory(); + + const addUpdateNotification = () => addNotificationMessage(client_notifications.new_version_available); + const removeUpdateNotification = React.useCallback( + () => removeNotificationMessage({ key: 'new_version_available' }), + [removeNotificationMessage] + ); + + React.useEffect(() => { + document.addEventListener('IgnorePWAUpdate', removeUpdateNotification); + return () => document.removeEventListener('IgnorePWAUpdate', removeUpdateNotification); + }, [removeUpdateNotification]); + + const onClickDeposit = () => history.push(routes.cashier_deposit); + + const filterPlatformsForClients = (payload: typeof platform_config) => + payload.filter(config => { + if (config.link_to === routes.mt5) { + return !is_logged_in || is_mt5_allowed; + } + if (config.link_to === routes.dxtrade) { + return is_dxtrade_allowed; + } + if ( + config.link_to === routes.bot || + config.href === routes.binarybot || + config.href === routes.smarttrader + ) { + return is_bot_allowed; + } + return true; + }); + + return ( +
+
+
+ +
+ + + +
+ history.push(routes.wallets)} /> + + + + + {header_extension && is_logged_in && ( +
{header_extension}
+ )} + + +
+
+ {(is_logging_in || is_switching) && ( +
2, + })} + > + +
+ )} + +
+ +
+
+
+ {/* + Prevent the modals that are part of Real Account signup to get triggered when the corresponding store value changes by + removing the parent element from DOM + */} + {!is_trading_assessment_for_existing_user_enabled && } + + +
+ ); +}; + +export default DefaultHeaderWallets; diff --git a/packages/core/src/App/Containers/Layout/header/dtrader-header-wallets.tsx b/packages/core/src/App/Containers/Layout/header/dtrader-header-wallets.tsx index 70772ef23e26..d52d1d46de8f 100644 --- a/packages/core/src/App/Containers/Layout/header/dtrader-header-wallets.tsx +++ b/packages/core/src/App/Containers/Layout/header/dtrader-header-wallets.tsx @@ -1,7 +1,7 @@ import React from 'react'; import classNames from 'classnames'; import { withRouter } from 'react-router-dom'; -import { DesktopWrapper, MobileWrapper } from '@deriv/components'; +import { DesktopWrapper, MobileWrapper, StaticUrl } from '@deriv/components'; import { observer, useStore } from '@deriv/stores'; import { routes, platforms } from '@deriv/shared'; import { MenuLinks, PlatformSwitcher } from 'App/Components/Layout/Header'; @@ -12,7 +12,9 @@ import SetAccountCurrencyModal from 'App/Containers/SetAccountCurrencyModal'; import NewVersionNotification from 'App/Containers/new-version-notification.jsx'; import ToggleMenuDrawer from 'App/Components/Layout/Header/toggle-menu-drawer.jsx'; import AccountsInfoLoaderWallets from 'App/Components/Layout/Header/wallets/accounts-info-loader-wallets'; -import TradersHubHomeButton from './traders-hub-home-button'; +import DerivBrandLogo from 'Assets/SvgComponents/header/deriv-logo-short.svg'; +import WalletsLogo from 'Assets/SvgComponents/header/wallets-logo.svg'; +import { useHistory } from 'react-router'; const Divider = () =>
; @@ -22,6 +24,7 @@ const MenuLeft = observer(() => { const { app_routing_history, current_language } = common; const { header_extension } = ui; const { setTogglePlatformType } = traders_hub; + const history = useHistory(); const filterPlatformsForClients = (payload: typeof platform_config) => payload.filter(config => { @@ -44,6 +47,12 @@ const MenuLeft = observer(() => { return (
+
+ + + +
+ history.push(routes.wallets)} /> {
{header_extension}
)} - - -
); @@ -79,11 +85,6 @@ const MenuRight = observer(() => { 'header__menu-right--hidden': is_mobile && is_logging_in, })} > - -
- -
- {(is_logging_in || is_switching) && (
{ @@ -14,7 +16,6 @@ const Header = observer(() => { const { accounts, is_logged_in, setAccounts, loginid, switchAccount } = client; const { pathname } = useLocation(); - useP2PCompletedOrdersNotification(); const is_wallets_cashier_route = pathname.includes(routes.wallets_cashier); const traders_hub_routes = @@ -52,7 +53,7 @@ const Header = observer(() => { if (is_logged_in) { let result; if (traders_hub_routes) { - result = ; + result = should_show_wallets ? : ; } else if (pathname === routes.onboarding) { result = null; } else { @@ -62,7 +63,7 @@ const Header = observer(() => { } else if (pathname === routes.onboarding) { return null; } - return ; + return is_next_wallet_enabled ? : ; }); export default Header; diff --git a/packages/core/src/App/Containers/Layout/header/traders-hub-header-wallets.tsx b/packages/core/src/App/Containers/Layout/header/traders-hub-header-wallets.tsx new file mode 100644 index 000000000000..4066b27f06f1 --- /dev/null +++ b/packages/core/src/App/Containers/Layout/header/traders-hub-header-wallets.tsx @@ -0,0 +1,193 @@ +import * as React from 'react'; +import classNames from 'classnames'; +import { useHistory, useLocation } from 'react-router-dom'; +import { DesktopWrapper, Icon, MobileWrapper, Popover, StaticUrl } from '@deriv/components'; +import { useIsRealAccountNeededForCashier } from '@deriv/hooks'; +import { routes, platforms, formatMoney } from '@deriv/shared'; +import { observer, useStore } from '@deriv/stores'; +import { Localize } from '@deriv/translations'; +import { MenuLinks } from 'App/Components/Layout/Header'; +import platform_config from 'App/Constants/platform-config'; +import ToggleMenuDrawer from 'App/Components/Layout/Header/toggle-menu-drawer.jsx'; +import { BinaryLink } from 'App/Components/Routes'; +import DerivBrandLogo from 'Assets/SvgComponents/header/deriv-rebranding-logo.svg'; +import DerivBrandShortLogo from 'Assets/SvgComponents/header/deriv-logo-short.svg'; +import WalletsLogo from 'Assets/SvgComponents/header/wallets-logo.svg'; +import RealAccountSignup from 'App/Containers/RealAccountSignup'; +import AccountInfo from 'App/Components/Layout/Header/account-info'; +import SetAccountCurrencyModal from 'App/Containers/SetAccountCurrencyModal'; +import CurrencySelectionModal from '../../CurrencySelectionModal'; +import DefaultMobileLinks from './default-mobile-links'; +import ShowNotifications from './show-notifications'; +import TradersHubOnboarding from './traders-hub-onboarding'; + +type TPlatformConfig = typeof platform_config; +type TPlatforms = typeof platforms; + +const TradersHubHeaderWallets = observer(() => { + const { client, common, traders_hub, ui } = useStore(); + const { + account_type, + balance, + country_standpoint, + currency, + has_any_real_account, + is_eu, + is_logged_in, + is_mt5_allowed, + is_virtual, + } = client; + const { platform } = common; + const { modal_data } = traders_hub; + const { + header_extension, + is_accounts_switcher_on, + is_app_disabled, + is_route_modal_on, + account_switcher_disabled_message, + toggleAccountsDialog, + toggleNeedRealAccountForCashierModal, + toggleReadyToDepositModal, + } = ui; + const history = useHistory(); + const { pathname } = useLocation(); + const cashier_routes = pathname.startsWith(routes.cashier); + const real_account_needed_for_cashier = useIsRealAccountNeededForCashier(); + const account_balance = formatMoney(currency, balance ?? '', true); + + const filterPlatformsForClients = (payload: TPlatformConfig) => + payload.filter(config => { + if (config.link_to === routes.mt5) { + return !is_logged_in || is_mt5_allowed; + } + return true; + }); + + const toggleModal = () => { + if (!has_any_real_account) { + toggleReadyToDepositModal(); + } else if (window.location.pathname === routes.traders_hub) { + toggleNeedRealAccountForCashierModal(); + } + }; + + const handleClickCashier = () => { + if ((!has_any_real_account && is_virtual) || real_account_needed_for_cashier) { + toggleModal(); + } else { + history.push(routes.cashier_deposit); + } + }; + + return ( +
+
+ + + {header_extension && is_logged_in &&
{header_extension}
} +
+ + + +
+ + +
+ + + +
+ history.push(routes.wallets)} + /> + + +
+ +
+
+
+
+ +
+
+ +
+ } + should_disable_pointer_events + zIndex={'9999'} + > + + + + + {cashier_routes && ( +
+ +
+ )} +
+
+ + + +
+
+ {cashier_routes ? ( + +
+ +
+
+ +
+ + ) : ( + + )} +
+
+ + + + +
+ ); +}); + +export default TradersHubHeaderWallets; diff --git a/packages/core/src/Assets/SvgComponents/header/deriv-logo-short.svg b/packages/core/src/Assets/SvgComponents/header/deriv-logo-short.svg new file mode 100644 index 000000000000..d664dc044097 --- /dev/null +++ b/packages/core/src/Assets/SvgComponents/header/deriv-logo-short.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/packages/core/src/Assets/SvgComponents/header/wallets-logo.svg b/packages/core/src/Assets/SvgComponents/header/wallets-logo.svg new file mode 100644 index 000000000000..7712f7e80051 --- /dev/null +++ b/packages/core/src/Assets/SvgComponents/header/wallets-logo.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/packages/core/src/sass/app/_common/layout/header.scss b/packages/core/src/sass/app/_common/layout/header.scss index b9b0ae34b6e9..a5de595ae503 100644 --- a/packages/core/src/sass/app/_common/layout/header.scss +++ b/packages/core/src/sass/app/_common/layout/header.scss @@ -163,6 +163,12 @@ align-items: center; overflow: hidden; } + + &-logo { + align-self: center; + margin: 0 1.2rem; + cursor: pointer; + } } &__menu-right { justify-content: flex-end; diff --git a/packages/core/src/sass/app/_common/layout/traders-hub-header.scss b/packages/core/src/sass/app/_common/layout/traders-hub-header.scss index 1c5b291cb5a6..5ed3a2ca8b10 100644 --- a/packages/core/src/sass/app/_common/layout/traders-hub-header.scss +++ b/packages/core/src/sass/app/_common/layout/traders-hub-header.scss @@ -242,3 +242,11 @@ } } } + +.traders-hub-header-wallets { + &__logo { + align-self: center; + margin: 0 1.2rem; + cursor: pointer; + } +} diff --git a/packages/tradershub/src/AppContent.tsx b/packages/tradershub/src/AppContent.tsx index 879b31e7be3c..52ebefed7253 100644 --- a/packages/tradershub/src/AppContent.tsx +++ b/packages/tradershub/src/AppContent.tsx @@ -2,7 +2,8 @@ import React from 'react'; import { Router } from './routes'; const AppContent = () => ( -
+
+
); diff --git a/packages/tradershub/src/components/CurrencySwitcher/CurrencySwitcher.tsx b/packages/tradershub/src/components/CurrencySwitcher/CurrencySwitcher.tsx index 4afcf96f9679..92ba3c3fe060 100644 --- a/packages/tradershub/src/components/CurrencySwitcher/CurrencySwitcher.tsx +++ b/packages/tradershub/src/components/CurrencySwitcher/CurrencySwitcher.tsx @@ -50,19 +50,6 @@ const CurrencySwitcher = () => { const iconCurrency = isDemo ? 'virtual' : activeAccount?.currency ?? 'virtual'; - const renderButton = () => { - return ( - - ); - }; - if (!isSuccess) return ; return ( @@ -89,11 +76,20 @@ const CurrencySwitcher = () => { onClick={() => { show( - - + + - {renderButton()} + + + ); }} diff --git a/packages/tradershub/src/components/Loaders/CurrencySwitcherLoader.tsx b/packages/tradershub/src/components/Loaders/CurrencySwitcherLoader.tsx index 584dac1827b0..2a959decbb41 100644 --- a/packages/tradershub/src/components/Loaders/CurrencySwitcherLoader.tsx +++ b/packages/tradershub/src/components/Loaders/CurrencySwitcherLoader.tsx @@ -1,9 +1,9 @@ import React from 'react'; const CurrencySwitcherLoader = () => ( -
+
-
+
diff --git a/packages/tradershub/src/components/Modal/Modal.tsx b/packages/tradershub/src/components/Modal/Modal.tsx index 1f88feda8aae..afbe806c29c1 100644 --- a/packages/tradershub/src/components/Modal/Modal.tsx +++ b/packages/tradershub/src/components/Modal/Modal.tsx @@ -46,7 +46,7 @@ const Modal = ({ children, className }: TModal) => { return (
diff --git a/packages/tradershub/src/components/Modal/ModalContent.tsx b/packages/tradershub/src/components/Modal/ModalContent.tsx index edce934356bd..8464b65fd007 100644 --- a/packages/tradershub/src/components/Modal/ModalContent.tsx +++ b/packages/tradershub/src/components/Modal/ModalContent.tsx @@ -10,7 +10,7 @@ import { TModalComponents } from './Modal'; * @returns {JSX.Element} The ModalContent component. */ const ModalContent = ({ children, className }: TModalComponents) => ( -
{children}
+
{children}
); export default ModalContent; diff --git a/packages/tradershub/src/components/TradingAccountsList/TradingAccountsList.tsx b/packages/tradershub/src/components/TradingAccountsList/TradingAccountsList.tsx index 4a68edcc4ef5..2e991c50aa18 100644 --- a/packages/tradershub/src/components/TradingAccountsList/TradingAccountsList.tsx +++ b/packages/tradershub/src/components/TradingAccountsList/TradingAccountsList.tsx @@ -9,8 +9,8 @@ const TradingAccountsList = () => { const { switchAccount } = useAuthorize(); return ( -
-
+
+
{tradingAccountsList ?.filter(account => !account.is_virtual) .map(account => { diff --git a/packages/tradershub/src/routes/TradersHubRoute/TradersHubRoute.tsx b/packages/tradershub/src/routes/TradersHubRoute/TradersHubRoute.tsx index df9e083a2ecf..5c7f7f737d9c 100644 --- a/packages/tradershub/src/routes/TradersHubRoute/TradersHubRoute.tsx +++ b/packages/tradershub/src/routes/TradersHubRoute/TradersHubRoute.tsx @@ -24,7 +24,7 @@ const TradersHubRoute = () => {
- + diff --git a/packages/wallets/component-tests/crypto-payment-redirection.spec.tsx b/packages/wallets/component-tests/crypto-payment-redirection.spec.tsx index 3658e1ba6ece..9c083f650538 100644 --- a/packages/wallets/component-tests/crypto-payment-redirection.spec.tsx +++ b/packages/wallets/component-tests/crypto-payment-redirection.spec.tsx @@ -261,7 +261,7 @@ test.describe('Wallets - Crypto withdrawal', () => { page.locator( '.wallets-withdrawal-crypto-amount-converter .wallets-textfield:first-child .wallets-textfield__message-container--msg' ) - ).toHaveText('The current allowed withdraw amount is 0.00027139 to 10.00000000 BTC.'); + ).toHaveText('Insufficient funds'); // given valid amount, no error message should be visible await page.fill('#cryptoAmount', '1'); diff --git a/packages/wallets/src/components/Base/WalletTextField/WalletTextField.scss b/packages/wallets/src/components/Base/WalletTextField/WalletTextField.scss index ea5cfab6aa35..5ec158f07518 100644 --- a/packages/wallets/src/components/Base/WalletTextField/WalletTextField.scss +++ b/packages/wallets/src/components/Base/WalletTextField/WalletTextField.scss @@ -20,18 +20,13 @@ border: 1px solid var(--brand-blue, #ec3f3f); } - .wallets-textfield__field, .wallets-textfield__label { color: #ec3f3f; } + .wallets-textfield__field:focus ~ .wallets-textfield__label { color: #ec3f3f; } - - .wallets-textfield__icon-left, - .wallets-textfield__icon-right { - filter: invert(37%) sepia(87%) saturate(4597%) hue-rotate(343deg) brightness(98%) contrast(87%); //#ec3f3f for svg icon - } } &--disabled { diff --git a/packages/wallets/src/features/cashier/modules/WithdrawalCrypto/utils/__tests__/withdrawalCryptoValidators.spec.ts b/packages/wallets/src/features/cashier/modules/WithdrawalCrypto/utils/__tests__/withdrawalCryptoValidators.spec.ts index 0dab724c9315..b990e9bb828c 100644 --- a/packages/wallets/src/features/cashier/modules/WithdrawalCrypto/utils/__tests__/withdrawalCryptoValidators.spec.ts +++ b/packages/wallets/src/features/cashier/modules/WithdrawalCrypto/utils/__tests__/withdrawalCryptoValidators.spec.ts @@ -126,10 +126,22 @@ describe('withdrawalCryptoValidator', () => { expect(fiatAmountMessages).toEqual('Should be a valid number.'); }); - it('should return "Insufficient funds" if amount > balance', () => { + it('should return "Insufficient funds" if amount > balance regardless of the verification status of the user', () => { mockValue = '11.0000000'; - const cryptoAmountMessages = validateCryptoInput( + let cryptoAmountMessages = validateCryptoInput( + mockActiveWallet, + mockFractionalDigits, + mockIsClientVerified, + mockRemainder, + mockValue + ); + + expect(cryptoAmountMessages).toEqual('Insufficient funds'); + + mockIsClientVerified = false; + + cryptoAmountMessages = validateCryptoInput( mockActiveWallet, mockFractionalDigits, mockIsClientVerified, @@ -140,8 +152,9 @@ describe('withdrawalCryptoValidator', () => { expect(cryptoAmountMessages).toEqual('Insufficient funds'); }); - it('should return error if amount > max withdrawal limit OR amount < min withdrawal limit for a verified user', () => { - mockValue = '11.0000000'; + it('should return limit error if amount < min withdrawal limit but is still less than the balance for verified user', () => { + mockValue = '0.5000000'; + mockIsClientVerified = true; const cryptoAmountMessages = validateCryptoInput( mockActiveWallet, @@ -151,11 +164,26 @@ describe('withdrawalCryptoValidator', () => { mockValue ); - expect(cryptoAmountMessages).toEqual('Insufficient funds'); + expect(cryptoAmountMessages).toEqual('The current allowed withdraw amount is 1.0000000 to 10.0000000 BTC.'); }); - it('should return error if amount > max withdrawal limit OR amount < min withdrawal limit for an unverified user', () => { - mockValue = '11.0000000'; + it('should not return limit error if amount is within limits but is still less than the balance for verified user', () => { + mockValue = '9.5000000'; + mockIsClientVerified = true; + + const cryptoAmountMessages = validateCryptoInput( + mockActiveWallet, + mockFractionalDigits, + mockIsClientVerified, + mockRemainder, + mockValue + ); + + expect(cryptoAmountMessages).toEqual(undefined); + }); + + it('should not return limit error if amount is within limits but is still less than the balance for unverified user', () => { + mockValue = '8.5000000'; mockIsClientVerified = false; const cryptoAmountMessages = validateCryptoInput( @@ -166,19 +194,22 @@ describe('withdrawalCryptoValidator', () => { mockValue ); - expect(cryptoAmountMessages).toEqual(`The current allowed withdraw amount is 1.0000000 to 9.0000000 BTC.`); + expect(cryptoAmountMessages).toEqual(undefined); }); - it('should return "This field is required." if no value is passed to crypto input field', () => { + it('should return limit error if amount > max withdrawal limit but is still less than the balance for unverified user', () => { + mockValue = '9.5000000'; + mockIsClientVerified = false; + const cryptoAmountMessages = validateCryptoInput( mockActiveWallet, mockFractionalDigits, mockIsClientVerified, mockRemainder, - '' + mockValue ); - expect(cryptoAmountMessages).toEqual('This field is required.'); + expect(cryptoAmountMessages).toEqual('The current allowed withdraw amount is 1.0000000 to 9.0000000 BTC.'); }); it('should return "This field is required." if no value is passed to crypto address field', () => { diff --git a/packages/wallets/src/features/cashier/modules/WithdrawalCrypto/utils/withdrawalCryptoValidators.ts b/packages/wallets/src/features/cashier/modules/WithdrawalCrypto/utils/withdrawalCryptoValidators.ts index 8acb7119e167..309e2106ab9b 100644 --- a/packages/wallets/src/features/cashier/modules/WithdrawalCrypto/utils/withdrawalCryptoValidators.ts +++ b/packages/wallets/src/features/cashier/modules/WithdrawalCrypto/utils/withdrawalCryptoValidators.ts @@ -58,8 +58,6 @@ const validateCryptoInput = ( remainder: number, value: string ) => { - if (!value.length) return helperMessageMapper.fieldRequired; - if (!activeWallet?.balance || !activeWallet?.currency || !activeWallet?.currency_config || !fractionalDigits.crypto) return; @@ -69,12 +67,14 @@ const validateCryptoInput = ( const amount = parseFloat(value); + if (amount > activeWallet.balance) return helperMessageMapper.insufficientFunds; + const MIN_WITHDRAWAL_AMOUNT = activeWallet.currency_config.minimum_withdrawal; - const MAX_WITHDRAWAL_AMOUNT = remainder < activeWallet.balance ? remainder : activeWallet.balance; + const MAX_WITHDRAWAL_AMOUNT = + !isClientVerified && remainder < activeWallet.balance ? remainder : activeWallet.balance; - if (isClientVerified && amount > activeWallet.balance) return helperMessageMapper.insufficientFunds; - else if (MIN_WITHDRAWAL_AMOUNT && (amount < MIN_WITHDRAWAL_AMOUNT || amount > MAX_WITHDRAWAL_AMOUNT)) { + if (MIN_WITHDRAWAL_AMOUNT && (amount < MIN_WITHDRAWAL_AMOUNT || amount > MAX_WITHDRAWAL_AMOUNT)) { return helperMessageMapper.withdrawalLimitError( MIN_WITHDRAWAL_AMOUNT.toFixed(fractionalDigits.crypto), `${MAX_WITHDRAWAL_AMOUNT.toFixed(fractionalDigits.crypto)} ${activeWallet.currency}` diff --git a/packages/wallets/src/features/cfd/modals/DxtradeEnterPasswordModal/DxtradeEnterPasswordModal.tsx b/packages/wallets/src/features/cfd/modals/DxtradeEnterPasswordModal/DxtradeEnterPasswordModal.tsx index ab4ac1626d95..1a0c69d1d6a4 100644 --- a/packages/wallets/src/features/cfd/modals/DxtradeEnterPasswordModal/DxtradeEnterPasswordModal.tsx +++ b/packages/wallets/src/features/cfd/modals/DxtradeEnterPasswordModal/DxtradeEnterPasswordModal.tsx @@ -49,15 +49,11 @@ const DxtradeEnterPasswordModal = () => { if (isSuccess) { if (accountType === 'demo') { return ( - { - hide(); - }} - size='lg' - > - OK - +
+ + OK + +
); } return ( diff --git a/packages/wallets/src/features/cfd/screens/EnterPassword/EnterPassword.scss b/packages/wallets/src/features/cfd/screens/EnterPassword/EnterPassword.scss index 48abef4a9ea8..87f265bdb4e0 100644 --- a/packages/wallets/src/features/cfd/screens/EnterPassword/EnterPassword.scss +++ b/packages/wallets/src/features/cfd/screens/EnterPassword/EnterPassword.scss @@ -35,6 +35,8 @@ @include mobile { text-align: center; gap: 1.6rem; + width: 100%; + align-items: center; } }