Merge branch 'master' into evgeniy-wall-376/likhith-wall-379/verifica…

…tion_ux_improvement_with_example

packages/appstore/src/components/main-title-bar/index.tsx

@@ -25,7 +25,7 @@ const MainTitleBar = () => {
                 <div className='main-title-bar'>
                     <div className='main-title-bar__right'>
                         <Text size='m' weight='bold'>
-                            {localize("Trader's hub")}
+                            {localize("Trader's Hub")}
                         </Text>
                         <AccountTypeDropdown />
                     </div>
@@ -35,7 +35,7 @@ const MainTitleBar = () => {
             </DesktopWrapper>
             <MobileWrapper>
                 <Text weight='bold' className='main-title-bar__text'>
-                    {localize("Trader's hub")}
+                    {localize("Trader's Hub")}
                 </Text>
                 <div className='main-title-bar-mobile'>
                     <div className='main-title-bar-mobile--account-type-dropdown'>

packages/appstore/src/constants/tour-steps-config-new.tsx

@@ -50,7 +50,7 @@ export const getTourStepConfig = (): Step[] => [
         title: (
             <React.Fragment>
                 <Text as='p' weight='bold' color='brand-red-coral'>
-                    {localize("Trader's hub tour")}
+                    {localize("Trader's Hub tour")}
                 </Text>
                 <div className='toggle-account-type__divider' />
             </React.Fragment>
@@ -81,7 +81,7 @@ export const getTourStepConfigHighRisk = (): Step[] => [
         title: (
             <React.Fragment>
                 <Text as='p' weight='bold' color='brand-red-coral'>
-                    {localize("Trader's hub tour")}
+                    {localize("Trader's Hub tour")}
                     <div className='toggle-account-type__divider' />
                 </Text>
             </React.Fragment>

packages/appstore/src/constants/trading-hub-content.tsx

@@ -42,7 +42,7 @@ export const getTradingHubContents = (): TTradingHubContents => ({
                 }}
             />
         ),
-        footer_header: localize("Welcome to Trader's hub"),
+        footer_header: localize("Welcome to Trader's Hub"),
         footer_text: localize('This is your personal start page for Deriv'),
         has_next_content: false,
     },

packages/cashier/src/pages/account-transfer/account-transfer-no-account/__tests__/account-transfer-no-account.spec.tsx

@@ -37,7 +37,7 @@ describe('<AccountTransferNoAccount />', () => {
         renderAccountTransferNoAccountWithRouter();
 
         expect(screen.getByText('Transferring funds will require you to create a second account.')).toBeInTheDocument();
-        expect(screen.getByText("Back to trader's hub")).toBeInTheDocument();
+        expect(screen.getByText("Back to Trader's Hub")).toBeInTheDocument();
     });
 
     it('should show "Transferring funds will require you to create a second account." message and "Back to traders hub" button when is_dxtrade_allowed=true', () => {
@@ -46,13 +46,13 @@ describe('<AccountTransferNoAccount />', () => {
         renderAccountTransferNoAccountWithRouter();
 
         expect(screen.getByText('Transferring funds will require you to create a second account.')).toBeInTheDocument();
-        expect(screen.getByText("Back to trader's hub")).toBeInTheDocument();
+        expect(screen.getByText("Back to Trader's Hub")).toBeInTheDocument();
     });
 
     it('should navigate to traders hub, when the "Back to traders hub" button was clicked', () => {
         renderAccountTransferNoAccountWithRouter();
 
-        const back_to_traders_hub_btn = screen.getByText("Back to trader's hub");
+        const back_to_traders_hub_btn = screen.getByText("Back to Trader's Hub");
         fireEvent.click(back_to_traders_hub_btn);
 
         expect(history.location.pathname).toBe(routes.traders_hub);
@@ -63,7 +63,7 @@ describe('<AccountTransferNoAccount />', () => {
 
         renderAccountTransferNoAccountWithRouter();
 
-        const back_to_traders_hub_btn = screen.getByText("Back to trader's hub");
+        const back_to_traders_hub_btn = screen.getByText("Back to Trader's Hub");
         fireEvent.click(back_to_traders_hub_btn);
 
         expect(history.location.pathname).toBe(routes.traders_hub);

packages/cashier/src/pages/account-transfer/account-transfer-no-account/account-transfer-no-account.tsx

@@ -35,7 +35,7 @@ const AccountTransferNoAccount = observer(() => {
                     history.push(routes.traders_hub);
                 }}
             >
-                <Localize i18n_default_text="Back to trader's hub" />
+                <Localize i18n_default_text="Back to Trader's Hub" />
             </Button>
         </div>
     );

packages/core/src/App/Components/Layout/Header/platform-dropdown.jsx

@@ -65,7 +65,7 @@ const PlatformDropdown = ({ app_routing_history, closeDrawer, platform_config, s
                     }}
                 >
                     <Text size='xs' weight='bold' align='center' className='platform-dropdown__cta--link'>
-                        <Localize i18n_default_text="Looking for CFDs? Go to Trader's hub" />
+                        <Localize i18n_default_text="Looking for CFDs? Go to Trader's Hub" />
                     </Text>
                 </BinaryLink>
             </div>

packages/core/src/App/Components/Layout/Header/toggle-menu-drawer.jsx

@@ -514,7 +514,7 @@ const ToggleMenuDrawer = observer(({ platform_config }) => {
                                         <MenuLink
                                             link_to={routes.traders_hub}
                                             icon={is_dark_mode ? 'IcAppstoreHomeDark' : 'IcAppstoreTradersHubHome'}
-                                            text={localize("Trader's hub")}
+                                            text={localize("Trader's Hub")}
                                             onClickLink={toggleDrawer}
                                         />
                                     </MobileDrawer.Item>

packages/core/src/App/Containers/AccountSwitcher/account-switcher.jsx

@@ -22,6 +22,7 @@ import AccountList from './account-switcher-account-list.jsx';
 import AccountWrapper from './account-switcher-account-wrapper.jsx';
 import { getSortedAccountList, getSortedCFDList, isDemo } from './helpers';
 import { BinaryLink } from 'App/Components/Routes';
+import { useHasSetCurrency } from '@deriv/hooks';
 
 const AccountSwitcher = ({
     available_crypto_currencies,
@@ -168,9 +169,7 @@ const AccountSwitcher = ({
         return [];
     };
 
-    const hasSetCurrency = () => {
-        return account_list.filter(account => !account.is_virtual).some(account => account.title !== 'Real');
-    };
+    const hasSetCurrency = useHasSetCurrency();
 
     const getTotalDemoAssets = () => {
         const vrtc_balance = accounts[vrtc_loginid] ? accounts[vrtc_loginid].balance : 0;
@@ -429,7 +428,7 @@ const AccountSwitcher = ({
                     <div className='acc-switcher__traders-hub'>
                         <BinaryLink onClick={handleRedirect} className='acc-switcher__traders-hub--link'>
                             <Text size='xs' align='center' className='acc-switcher__traders-hub--text'>
-                                <Localize i18n_default_text="Looking for CFD accounts? Go to Trader's hub" />
+                                <Localize i18n_default_text="Looking for CFD accounts? Go to Trader's Hub" />
                             </Text>
                         </BinaryLink>
                     </div>
@@ -511,7 +510,7 @@ const AccountSwitcher = ({
                         className='acc-switcher__btn--traders_hub'
                         secondary
                         onClick={
-                            has_any_real_account && !hasSetCurrency()
+                            has_any_real_account && !hasSetCurrency
                                 ? setAccountCurrency
                                 : () => openRealAccountSignup('manage')
                         }

packages/core/src/App/Containers/Layout/header/trading-hub-header.jsx

@@ -39,7 +39,7 @@ export const TradersHubHomeButton = ({ is_dark_mode }) => {
                 />
             </div>
             <Text className='trading-hub-header__tradershub--text'>
-                <Localize i18n_default_text="Trader's hub" />
+                <Localize i18n_default_text="Trader's Hub" />
             </Text>
         </div>
     );

packages/core/src/App/Containers/SetAccountCurrencyModal/set-currency-modal.jsx

@@ -39,7 +39,7 @@ const SetAccountCurrencyModal = ({
                             toggleModal();
                             // timeout is to ensure no jumpy animation when modals are overlapping enter/exit transitions
                             setTimeout(() => {
-                                setCurrency();
+                                setCurrency('set_currency');
                             }, 250);
                         }}
                         primary

packages/core/src/sass/app/_common/components/platform-dropdown.scss

@@ -54,6 +54,8 @@
 
         @include mobile {
             position: relative;
+            padding: 1rem 0 0 1.3rem;
+            text-align: center;
         }
     }