thisyahlen/chore: make traders hub default ui

packages/account/src/Components/Routes/binary-routes.tsx

@@ -7,7 +7,6 @@ import { TBinaryRoutes, TPlatformContext, TRoute } from 'Types';
 import RouteWithSubRoutes from './route-with-sub-routes';
 
 const BinaryRoutes = (props: TBinaryRoutes) => {
-    const { is_pre_appstore } = props;
     const { is_appstore } = React.useContext<TPlatformContext>(PlatformContext);
 
     return (
@@ -19,7 +18,7 @@ const BinaryRoutes = (props: TBinaryRoutes) => {
             }
         >
             <Switch>
-                {getRoutesConfig({ is_appstore, is_pre_appstore }).map((route: TRoute, idx: number) => (
+                {getRoutesConfig({ is_appstore }).map((route: TRoute, idx: number) => (
                     <RouteWithSubRoutes key={idx} {...route} {...props} />
                 ))}
             </Switch>

packages/account/src/Containers/account.jsx

@@ -2,7 +2,6 @@ import 'Styles/account.scss';
 
 import { FadeWrapper, Icon, Loading, PageOverlay, Text, VerticalTab } from '@deriv/components';
 import { PlatformContext, getSelectedRoute, isMobile, matchRoute, routes as shared_routes } from '@deriv/shared';
-
 import AccountLimitInfo from '../Sections/Security/AccountLimits/account-limits-info.jsx';
 import PropTypes from 'prop-types';
 import React from 'react';
@@ -53,15 +52,14 @@ const TradingHubLogout = ({ logout }) => {
 const PageOverlayWrapper = ({
     is_from_derivgo,
     is_appstore,
-    is_pre_appstore,
     list_groups,
     logout,
     onClickClose,
     selected_route,
     subroutes,
     history,
 }) => {
-    const routeToPrevious = () => (is_pre_appstore ? history.push(shared_routes.traders_hub) : onClickClose());
+    const routeToPrevious = () => history.push(shared_routes.traders_hub);
 
     if (isMobile() && selected_route) {
         return (
@@ -105,7 +103,7 @@ const PageOverlayWrapper = ({
                 is_full_width
                 list={subroutes}
                 list_groups={list_groups}
-                extra_content={is_pre_appstore && <TradingHubLogout logout={logout} />}
+                extra_content={<TradingHubLogout logout={logout} />}
             />
         </PageOverlay>
     );
@@ -118,7 +116,6 @@ const Account = ({
     is_from_derivgo,
     is_logged_in,
     is_logging_in,
-    is_pre_appstore,
     is_virtual,
     is_visible,
     location,
@@ -146,10 +143,6 @@ const Account = ({
 
     routes.forEach(menu_item => {
         menu_item.subroutes.forEach(route => {
-            if (route.path === shared_routes.languages) {
-                route.is_hidden = !is_pre_appstore;
-            }
-
             if (route.path === shared_routes.financial_assessment) {
                 route.is_disabled = is_virtual;
             }
@@ -205,7 +198,6 @@ const Account = ({
                 <PageOverlayWrapper
                     is_from_derivgo={is_from_derivgo}
                     is_appstore={is_appstore}
-                    is_pre_appstore={is_pre_appstore}
                     list_groups={list_groups}
                     logout={logout}
                     onClickClose={onClickClose}
@@ -226,7 +218,6 @@ Account.propTypes = {
     is_from_derivgo: PropTypes.bool,
     is_logged_in: PropTypes.bool,
     is_logging_in: PropTypes.bool,
-    is_pre_appstore: PropTypes.bool,
     is_virtual: PropTypes.bool,
     is_visible: PropTypes.bool,
     location: PropTypes.object,
@@ -244,7 +235,6 @@ export default connect(({ client, common, ui }) => ({
     is_from_derivgo: common.is_from_derivgo,
     is_logged_in: client.is_logged_in,
     is_logging_in: client.is_logging_in,
-    is_pre_appstore: client.is_pre_appstore,
     is_virtual: client.is_virtual,
     is_visible: ui.is_account_settings_visible,
     logout: client.logout,

packages/account/src/Types/common-prop.type.ts

@@ -94,7 +94,6 @@ export type TRouteConfig = TRoute & {
 };
 
 export type TBinaryRoutes = {
-    is_pre_appstore: boolean;
     is_logged_in: boolean;
     is_logging_in: boolean;
 };

packages/appstore/src/modules/onboarding/onboarding.tsx

@@ -29,14 +29,7 @@ const Onboarding = ({ contents = getTradingHubContents() }: TOnboardingProps) =>
     const number_of_steps = Object.keys(contents);
     const { traders_hub, client } = useStores();
     const { toggleIsTourOpen, selectAccountType, is_demo_low_risk, content_flag } = traders_hub;
-    const {
-        is_eu_country,
-        is_logged_in,
-        setIsPreAppStore,
-        is_landing_company_loaded,
-        prev_account_type,
-        setPrevAccountType,
-    } = client;
+    const { is_eu_country, is_logged_in, is_landing_company_loaded, prev_account_type, setPrevAccountType } = client;
     const [step, setStep] = React.useState<number>(1);
 
     const prevStep = () => {
@@ -46,7 +39,6 @@ const Onboarding = ({ contents = getTradingHubContents() }: TOnboardingProps) =>
     const nextStep = () => {
         if (step < number_of_steps.length) setStep(step + 1);
         if (step === number_of_steps.length) {
-            setIsPreAppStore(true);
             toggleIsTourOpen(true);
             history.push(routes.traders_hub);
             if (is_demo_low_risk) {
@@ -60,7 +52,6 @@ const Onboarding = ({ contents = getTradingHubContents() }: TOnboardingProps) =>
         toggleIsTourOpen(false);
         history.push(routes.traders_hub);
         await selectAccountType(prev_account_type);
-        setIsPreAppStore(true);
     };
 
     const eu_user =

packages/cashier/src/components/account-platform-icon/account-platform-icon.tsx

@@ -6,21 +6,19 @@ import { TAccountsList } from 'Types';
 type TAccountPlatformIcon = {
     size: number;
     account: TAccountsList['account'];
-    is_pre_appstore: boolean;
     icon_class_name?: string;
     appstore_icon_class_name?: string;
     appstoreIconOnClickHandler?: () => void;
 };
 
 const AccountPlatformIcon = ({
     account,
-    is_pre_appstore,
     size,
     icon_class_name,
     appstore_icon_class_name,
     appstoreIconOnClickHandler,
 }: TAccountPlatformIcon) => {
-    return is_pre_appstore && account.is_mt && account.platform_icon ? (
+    return account.is_mt && account.platform_icon ? (
         <TradingPlatformIcon
             icon={account.platform_icon}
             size={size}

packages/cashier/src/components/cashier-container/virtual/__tests__/virtual.spec.tsx

@@ -12,7 +12,6 @@ describe('<Virtual />', () => {
     beforeEach(() => {
         mockRootStore = {
             ui: { is_dark_mode_on: true, toggleAccountsDialog: jest.fn() },
-            client: { is_pre_appstore: true },
         };
     });
 

packages/cashier/src/components/cashier-container/virtual/virtual.tsx

@@ -1,18 +1,16 @@
 import classNames from 'classnames';
 import React from 'react';
-import { withRouter, useHistory } from 'react-router-dom';
+import { withRouter } from 'react-router-dom';
 import { Text } from '@deriv/components';
-import { isMobile, routes } from '@deriv/shared';
+import { isMobile } from '@deriv/shared';
 import { Localize } from '@deriv/translations';
 import { useStore, observer } from '@deriv/stores';
 import './virtual.scss';
 
 const Virtual = observer(() => {
     const {
         ui: { is_dark_mode_on, toggleAccountsDialog },
-        client: { is_pre_appstore },
     } = useStore();
-    const history = useHistory();
 
     return (
         <div className='cashier__wrapper' data-testid='dt_cashier_wrapper_id'>
@@ -46,12 +44,7 @@ const Virtual = observer(() => {
                                 key={1}
                                 className='virtual__account-switch-text'
                                 onClick={() => {
-                                    if (is_pre_appstore) {
-                                        history.push(routes.trade);
-                                        toggleAccountsDialog();
-                                    } else {
-                                        toggleAccountsDialog();
-                                    }
+                                    toggleAccountsDialog();
                                 }}
                             />,
                         ]}

packages/cashier/src/containers/cashier/cashier.tsx

@@ -30,7 +30,6 @@ type TCashierProps = RouteComponentProps & {
     routeBackInApp: TRootStore['common']['routeBackInApp'];
     toggleCashier: TRootStore['ui']['toggleCashier'];
     resetLastLocation: () => void;
-    is_pre_appstore: boolean;
 };
 
 type TCashierOptions = {
@@ -68,9 +67,9 @@ const Cashier = observer(({ history, location, routes: routes_config }: TCashier
     const { is_payment_agent_transfer_visible } = payment_agent_transfer;
     const { is_payment_agent_visible } = payment_agent;
     const { resetLastLocation } = account_prompt_dialog;
-    const { routeBackInApp, is_from_derivgo } = common;
+    const { is_from_derivgo } = common;
     const { is_cashier_visible: is_visible, toggleCashier } = ui;
-    const { is_account_setting_loaded, is_logged_in, is_logging_in, is_pre_appstore } = client;
+    const { is_account_setting_loaded, is_logged_in, is_logging_in } = client;
     const is_account_transfer_visible = useAccountTransferVisible();
     const is_onramp_visible = useOnrampVisible();
     const switchToReal = useSwitchToRealAccount();
@@ -99,7 +98,7 @@ const Cashier = observer(({ history, location, routes: routes_config }: TCashier
         })();
     }, [is_logged_in, onMount, setAccountSwitchListener]);
 
-    const onClickClose = () => (is_pre_appstore ? history.push(routes.traders_hub) : routeBackInApp(history));
+    const onClickClose = () => history.push(routes.traders_hub);
     const getMenuOptions = () => {
         const options: TCashierOptions[] = [];
         routes_config.forEach(route => {

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

@@ -182,12 +182,4 @@ describe('<AccountTransfer />', () => {
 
         expect(await screen.findByText('mockedAccountTransferReceipt')).toBeInTheDocument();
     });
-
-    it('should show the crypto transactions if triggered from recent transactions', async () => {
-        mockRootStore.modules.cashier.transaction_history.is_crypto_transactions_visible = true;
-
-        renderAccountTransfer();
-
-        expect(await screen.findByText('mockedCryptoTransactionsHistory')).toBeInTheDocument();
-    });
 });

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

@@ -120,7 +120,7 @@ describe('<AccountTransferForm />', () => {
         renderAccountTransferForm();
 
         expect(screen.getByTestId('dt_account_transfer_form_wrapper')).toBeInTheDocument();
-        expect(screen.getByText('Transfer between your accounts in Deriv')).toBeInTheDocument();
+        expect(screen.getByText('Cashier Error')).toBeInTheDocument();
     });
 
     it('should show loader if account_list.length === 0', () => {
@@ -218,19 +218,6 @@ describe('<AccountTransferForm />', () => {
         expect(screen.getByText('Cashier Error')).toBeInTheDocument();
     });
 
-    it('should show <AccountTransferNote /> component', () => {
-        (isMobile as jest.Mock).mockReturnValue(true);
-
-        renderAccountTransferForm();
-
-        expect(screen.getByText('Transfer limits may vary depending on the exchange rates.')).toBeInTheDocument();
-        expect(
-            screen.getByText(
-                'Transfers may be unavailable due to high volatility or technical issues and when the exchange markets are closed.'
-            )
-        ).toBeInTheDocument();
-    });
-
     it('should show proper hint about mt5 remained transfers', () => {
         (isMobile as jest.Mock).mockReturnValue(true);
         mockRootStore.client.account_limits = {
@@ -288,58 +275,4 @@ describe('<AccountTransferForm />', () => {
 
         expect(screen.getByText('You have 1 transfer remaining for today.')).toBeInTheDocument();
     });
-
-    it('should show proper note if transfer fee is 2% and is_crypto_to_crypto_transfer', () => {
-        (isMobile as jest.Mock).mockReturnValue(true);
-        mockRootStore.modules.cashier.account_transfer.selected_from.is_crypto = true;
-        mockRootStore.modules.cashier.account_transfer.selected_from.currency = 'BTC';
-        mockRootStore.modules.cashier.account_transfer.selected_to.is_crypto = true;
-        mockRootStore.modules.cashier.account_transfer.selected_to.currency = 'BTC';
-        mockRootStore.modules.cashier.account_transfer.transfer_fee = 2;
-
-        renderAccountTransferForm();
-
-        expect(
-            screen.getByText(
-                'We’ll charge a 2% transfer fee or 0 BTC, whichever is higher, for transfers between your Deriv cryptocurrency accounts. Please bear in mind that some transfers may not be possible.'
-            )
-        ).toBeInTheDocument();
-    });
-
-    it('should show proper note if transfer fee is 2%, is_mt_transfer, and is_dxtrade_allowed is false', () => {
-        (isMobile as jest.Mock).mockReturnValue(true);
-        mockRootStore.modules.cashier.account_transfer.selected_from.is_mt = true;
-        mockRootStore.modules.cashier.account_transfer.selected_to.is_mt = true;
-        mockRootStore.modules.cashier.account_transfer.transfer_fee = 2;
-
-        renderAccountTransferForm();
-
-        expect(
-            screen.getByText(
-                'We’ll charge a 2% transfer fee or 0 USD, whichever is higher, for transfers between your Deriv cryptocurrency and Deriv MT5 accounts. Please bear in mind that some transfers may not be possible.'
-            )
-        ).toBeInTheDocument();
-    });
-
-    it('should show proper note if transfer fee is 2% and is_mt_transfer is false', () => {
-        (isMobile as jest.Mock).mockReturnValue(true);
-        mockRootStore.modules.cashier.account_transfer.transfer_fee = 2;
-
-        renderAccountTransferForm();
-
-        expect(
-            screen.getByText(
-                'We’ll charge a 2% transfer fee or 0 USD, whichever is higher, for transfers between your Deriv fiat and Deriv cryptocurrency accounts. Please bear in mind that some transfers may not be possible.'
-            )
-        ).toBeInTheDocument();
-    });
-
-    it('should show proper note if transfer fee is null', () => {
-        (isMobile as jest.Mock).mockReturnValue(true);
-        mockRootStore.modules.cashier.account_transfer.transfer_fee = null;
-
-        renderAccountTransferForm();
-
-        expect(screen.getByText('Please bear in mind that some transfers may not be possible.')).toBeInTheDocument();
-    });
 });