diff --git a/packages/components/src/components/icon/rebranding/ic-rebranding-binary-bot.svg b/packages/components/src/components/icon/rebranding/ic-rebranding-binary-bot.svg index 7914a83d16ce..96ae7ed12d8c 100644 --- a/packages/components/src/components/icon/rebranding/ic-rebranding-binary-bot.svg +++ b/packages/components/src/components/icon/rebranding/ic-rebranding-binary-bot.svg @@ -1 +1,13 @@ - \ No newline at end of file + + + + + + + \ No newline at end of file diff --git a/packages/components/src/components/icon/rebranding/ic-rebranding-deriv-bot.svg b/packages/components/src/components/icon/rebranding/ic-rebranding-deriv-bot.svg index 87b201c0d01c..be28716788f1 100644 --- a/packages/components/src/components/icon/rebranding/ic-rebranding-deriv-bot.svg +++ b/packages/components/src/components/icon/rebranding/ic-rebranding-deriv-bot.svg @@ -1 +1 @@ - + \ No newline at end of file diff --git a/packages/components/src/components/icon/rebranding/ic-rebranding-deriv-trader.svg b/packages/components/src/components/icon/rebranding/ic-rebranding-deriv-trader.svg index 0c46d7dbaff3..be5f02bbdafc 100644 --- a/packages/components/src/components/icon/rebranding/ic-rebranding-deriv-trader.svg +++ b/packages/components/src/components/icon/rebranding/ic-rebranding-deriv-trader.svg @@ -1 +1 @@ - + \ No newline at end of file diff --git a/packages/components/src/components/icon/rebranding/ic-rebranding-dmt5.svg b/packages/components/src/components/icon/rebranding/ic-rebranding-dmt5.svg index b632e15afc5a..240b5a28713c 100644 --- a/packages/components/src/components/icon/rebranding/ic-rebranding-dmt5.svg +++ b/packages/components/src/components/icon/rebranding/ic-rebranding-dmt5.svg @@ -1 +1 @@ - + \ No newline at end of file diff --git a/packages/components/src/components/icon/rebranding/ic-rebranding-dxtrade.svg b/packages/components/src/components/icon/rebranding/ic-rebranding-dxtrade.svg index 2e1bdd8f4c3f..987cfe75b7e5 100644 --- a/packages/components/src/components/icon/rebranding/ic-rebranding-dxtrade.svg +++ b/packages/components/src/components/icon/rebranding/ic-rebranding-dxtrade.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/packages/components/src/components/icon/rebranding/ic-rebranding-smarttrader.svg b/packages/components/src/components/icon/rebranding/ic-rebranding-smarttrader.svg index ed8a981ae5a6..f83ecbd8d6d8 100644 --- a/packages/components/src/components/icon/rebranding/ic-rebranding-smarttrader.svg +++ b/packages/components/src/components/icon/rebranding/ic-rebranding-smarttrader.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/packages/core/src/App/Components/Layout/Header/__tests__/platform-switcher.spec.tsx b/packages/core/src/App/Components/Layout/Header/__tests__/platform-switcher.spec.tsx index 82d2cd134d1f..ec0c34795ab3 100644 --- a/packages/core/src/App/Components/Layout/Header/__tests__/platform-switcher.spec.tsx +++ b/packages/core/src/App/Components/Layout/Header/__tests__/platform-switcher.spec.tsx @@ -9,16 +9,6 @@ jest.mock('@deriv/shared', () => ({ isMobile: jest.fn(() => true), })); -const mock_connect_props = { - is_dark_mode: false, -}; - -jest.mock('Stores/connect.js', () => ({ - __esModule: true, - default: 'mockedDefaultExport', - connect: () => Component => props => Component({ ...props, ...mock_connect_props }), -})); - const withRouter = (Component: React.ComponentType) => { const history = createBrowserHistory(); const WrapperComponent = (props: T & U) => ( diff --git a/packages/core/src/App/Components/Layout/Header/platform-dropdown.jsx b/packages/core/src/App/Components/Layout/Header/platform-dropdown.jsx index 3dad33474730..249b79b304ff 100644 --- a/packages/core/src/App/Components/Layout/Header/platform-dropdown.jsx +++ b/packages/core/src/App/Components/Layout/Header/platform-dropdown.jsx @@ -17,7 +17,7 @@ const PlatformBox = ({ platform: { icon, description } }) => ( ); -const PlatformDropdownContent = ({ platform, app_routing_history, hide_dropdown_items, is_dark_mode }) => { +const PlatformDropdownContent = ({ platform, app_routing_history, hide_dropdown_items }) => { return !hide_dropdown_items ? (platform.link_to && ( getActivePlatform(app_routing_history) === platform.name} > - + )) || ( - + ) : null; }; -const PlatformDropdown = ({ app_routing_history, closeDrawer, platform_config, is_pre_appstore, is_dark_mode }) => { +const PlatformDropdown = ({ app_routing_history, closeDrawer, platform_config, is_pre_appstore }) => { React.useEffect(() => { window.addEventListener('popstate', closeDrawer); return () => { @@ -74,7 +74,6 @@ const PlatformDropdown = ({ app_routing_history, closeDrawer, platform_config, i platform={platform} app_routing_history={app_routing_history} hide_dropdown_items={should_hide_dropdown_item} - is_dark_mode={is_dark_mode} /> ); diff --git a/packages/core/src/App/Components/Layout/Header/platform-switcher.jsx b/packages/core/src/App/Components/Layout/Header/platform-switcher.jsx index 896ab6c8db73..4e549c71505e 100644 --- a/packages/core/src/App/Components/Layout/Header/platform-switcher.jsx +++ b/packages/core/src/App/Components/Layout/Header/platform-switcher.jsx @@ -10,7 +10,6 @@ import PropTypes from 'prop-types'; import React from 'react'; import classNames from 'classnames'; import { withRouter } from 'react-router-dom'; -import { connect } from 'Stores/connect'; const PlatformSwitcher = ({ toggleDrawer, @@ -20,7 +19,6 @@ const PlatformSwitcher = ({ is_landing_company_loaded, is_logged_in, is_logging_in, - is_dark_mode, }) => { const [is_open, setIsOpen] = React.useState(false); @@ -55,7 +53,6 @@ const PlatformSwitcher = ({ data-testid='dt_platform_switcher' className={classNames( 'platform-switcher', - { 'platform-switcher--dark-mode': is_dark_mode }, { 'platform-switcher--active': is_open }, { 'platform-switcher--is-mobile': isMobile() } )} @@ -85,7 +82,6 @@ const PlatformSwitcher = ({ closeDrawer={closeDrawer} app_routing_history={app_routing_history} is_pre_appstore={is_pre_appstore} - is_dark_mode={is_dark_mode} /> @@ -97,14 +93,9 @@ PlatformSwitcher.propTypes = { toggleDrawer: PropTypes.func, app_routing_history: PropTypes.array, is_pre_appstore: PropTypes.bool, - is_dark_mode: PropTypes.bool, is_landing_company_loaded: PropTypes.bool, is_logged_in: PropTypes.bool, is_logging_in: PropTypes.bool, }; -export default withRouter( - connect(({ ui }) => ({ - is_dark_mode: ui.is_dark_mode_on, - }))(PlatformSwitcher) -); +export default withRouter(PlatformSwitcher); diff --git a/packages/core/src/sass/app/_common/components/platform-switcher.scss b/packages/core/src/sass/app/_common/components/platform-switcher.scss index 50cb89ad1106..31942400d035 100644 --- a/packages/core/src/sass/app/_common/components/platform-switcher.scss +++ b/packages/core/src/sass/app/_common/components/platform-switcher.scss @@ -5,10 +5,6 @@ transition: background-color 0.3s; cursor: pointer; - &--dark-mode { - color: #fff; - } - &:not(&--is-mobile):hover { background-color: var(--general-hover); }