Merge branch master of https://github.com/binary-com/deriv-app into p…

…a-sign-up

.gitignore

@@ -19,8 +19,8 @@ packages/account/lib/
 packages/components/.out
 packages/components/src/components/icon/icons-manifest.js
 packages/p2p/lib/
+packages/appstore/dist/
 packages/appstore/lib/
-packages/appstore/.out
 .env
 nx-cloud.env
 

packages/account/package.json

@@ -45,8 +45,7 @@
         "react": "^16.14.0",
         "react-dom": "^16.14.0",
         "react-router": "^5.2.0",
-        "react-router-dom": "^5.2.0",
-        "react-i18next": "^11.11.0"
+        "react-router-dom": "^5.2.0"
     },
     "devDependencies": {
         "@babel/eslint-parser": "^7.17.0",

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

@@ -5,7 +5,7 @@ import getRoutesConfig from 'Constants/routes-config';
 import RouteWithSubRoutes from './route-with-sub-routes.jsx';
 
 const BinaryRoutes = props => {
-    const { is_appstore, is_pre_appstore } = React.useContext(PlatformContext);
+    const { is_appstore } = React.useContext(PlatformContext);
     return (
         <React.Suspense
             fallback={() => {
@@ -17,7 +17,7 @@ const BinaryRoutes = props => {
             }}
         >
             <Switch>
-                {getRoutesConfig({ is_appstore, is_pre_appstore }).map((route, idx) => (
+                {getRoutesConfig({ is_appstore }).map((route, idx) => (
                     <RouteWithSubRoutes key={idx} {...route} {...props} />
                 ))}
             </Switch>

packages/account/src/Constants/routes-config.js

@@ -17,14 +17,13 @@ import {
     LoginHistory,
     AccountClosed,
     DeactivateAccount,
-    LanguageSettings,
 } from 'Sections';
 
 // Error Routes
 const Page404 = React.lazy(() => moduleLoader(() => import(/* webpackChunkName: "404" */ 'Modules/Page404')));
 
 // Order matters
-const initRoutesConfig = ({ is_appstore, is_pre_appstore }) => [
+const initRoutesConfig = ({ is_appstore }) => [
     {
         path: routes.account_closed,
         component: AccountClosed,
@@ -59,15 +58,6 @@ const initRoutesConfig = ({ is_appstore, is_pre_appstore }) => [
                         component: FinancialAssessment,
                         getTitle: () => localize('Financial assessment'),
                     },
-                    ...(is_pre_appstore
-                        ? [
-                              {
-                                  path: routes.languages,
-                                  component: LanguageSettings,
-                                  getTitle: () => localize('Languages'),
-                              },
-                          ]
-                        : []),
                 ],
             },
             {
@@ -157,9 +147,9 @@ let routesConfig;
 // For default page route if page/path is not found, must be kept at the end of routes_config array
 const route_default = { component: Page404, getTitle: () => localize('Error 404') };
 
-const getRoutesConfig = ({ is_appstore, is_pre_appstore }) => {
+const getRoutesConfig = ({ is_appstore }) => {
     if (!routesConfig) {
-        routesConfig = initRoutesConfig({ is_appstore, is_pre_appstore });
+        routesConfig = initRoutesConfig({ is_appstore });
         routesConfig.push(route_default);
     }
     return routesConfig;

packages/account/src/Containers/account.jsx

@@ -1,14 +1,13 @@
 import PropTypes from 'prop-types';
 import React from 'react';
 import { withRouter } from 'react-router-dom';
-import { VerticalTab, FadeWrapper, PageOverlay, Loading, Text, Icon } from '@deriv/components';
+import { VerticalTab, FadeWrapper, PageOverlay, Loading, Text } from '@deriv/components';
 import { routes as shared_routes, isMobile, matchRoute, getSelectedRoute, PlatformContext } from '@deriv/shared';
 import { localize } from '@deriv/translations';
 import { connect } from 'Stores/connect';
 import { flatten } from '../Helpers/flatten';
 import AccountLimitInfo from '../Sections/Security/AccountLimits/account-limits-info.jsx';
 import 'Styles/account.scss';
-import { useHistory } from 'react-router';
 
 const AccountLogout = ({ logout, history }) => {
     return (
@@ -20,27 +19,7 @@ const AccountLogout = ({ logout, history }) => {
             }}
         >
             <div className='dc-vertical-tab__header-group account__logout-tab'>
-                <Text size='xxs' weight='normal'>
-                    {localize('Log out')}
-                </Text>
-            </div>
-        </div>
-    );
-};
-
-const TradingHubLogout = ({ logout }) => {
-    const history = useHistory();
-    return (
-        <div
-            className='dc-vertical-tab__header-account__logout-tab'
-            onClick={() => {
-                logout();
-                history.push(shared_routes.index);
-            }}
-        >
-            <div className='dc-vertical-tab__header-account__logout'>
-                <Icon icon='IcLogout' className='dc-vertical-tab__header-account__logout--icon' />
-                <Text size='xs' weight='bold'>
+                <Text color='general' size='xxs' weight='normal'>
                     {localize('Log out')}
                 </Text>
             </div>
@@ -51,13 +30,11 @@ const TradingHubLogout = ({ logout }) => {
 const PageOverlayWrapper = ({
     is_from_derivgo,
     is_appstore,
-    is_pre_appstore,
     list_groups,
     logout,
     onClickClose,
     selected_route,
     subroutes,
-    history,
 }) => {
     if (isMobile() && selected_route) {
         return (
@@ -97,7 +74,6 @@ const PageOverlayWrapper = ({
                 is_full_width
                 list={subroutes}
                 list_groups={list_groups}
-                extra_content={is_pre_appstore && <TradingHubLogout logout={logout} />}
             />
         </PageOverlay>
     );
@@ -119,7 +95,7 @@ const Account = ({
     should_allow_authentication,
     toggleAccount,
 }) => {
-    const { is_appstore, is_pre_appstore } = React.useContext(PlatformContext);
+    const { is_appstore } = React.useContext(PlatformContext);
     const subroutes = flatten(routes.map(i => i.subroutes));
     let list_groups = [...routes];
     list_groups = list_groups.map(route_group => ({
@@ -183,14 +159,12 @@ 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}
                     platform={platform}
                     selected_route={selected_route}
                     subroutes={subroutes}
-                    history={history}
                 />
             </div>
         </FadeWrapper>

packages/account/src/Sections/index.js

@@ -13,7 +13,6 @@ import ConnectedApps from 'Sections/Security/ConnectedApps';
 import LoginHistory from 'Sections/Security/LoginHistory';
 import AccountClosed from 'Sections/Security/AccountClosed';
 import DeactivateAccount from 'Sections/Security/DeactivateAccount'; // TODO: Remove once mobile team has changed this link
-import LanguageSettings from 'Sections/Profile/LanguageSettings';
 
 export {
     AccountLimits,
@@ -31,5 +30,4 @@ export {
     LoginHistory,
     AccountClosed,
     DeactivateAccount,
-    LanguageSettings,
 };

packages/account/src/Styles/account.scss

@@ -24,22 +24,6 @@ $MIN_HEIGHT_FLOATING: calc(
             padding-left: 4.4rem;
             background-color: var(--general-main-1);
         }
-        &__header {
-            &-account__logout {
-                margin-top: 1rem;
-                align-items: center;
-                justify-content: center;
-                display: flex;
-                border: 2px solid var(--border-normal-1);
-                padding: 1rem;
-                border-radius: 0.5rem;
-                cursor: pointer;
-
-                &--icon {
-                    margin-right: 0.8rem;
-                }
-            }
-        }
     }
 
     .dc-vertical-tab--dashboard {