From aa51693bfe150d903a88436839df12a1cd6dcdaa Mon Sep 17 00:00:00 2001 From: Amir Hossein Salar Date: Wed, 4 Jan 2023 20:35:00 +0330 Subject: [PATCH] theme-related cleanups --- .../src/components/Dialog/DesktopDialog.js | 5 --- web/src/components/AppFooter/index.js | 1 - web/src/components/Chat/ChatMessageList.js | 1 - web/src/components/Dialog/DesktopDialog.js | 15 ++----- web/src/components/Dialog/MobileDialog.js | 4 -- web/src/components/Loader/index.js | 5 +-- web/src/components/Table/TableBody.js | 1 + web/src/containers/App/App.js | 44 +++++-------------- web/src/containers/App/index.js | 1 - web/src/containers/AuthContainer/index.js | 14 +----- web/src/containers/ChartEmbed/index.js | 9 +--- .../containers/ConfirmChangePassword/index.js | 8 +--- web/src/containers/ExpiredExchange/index.js | 13 +----- .../containers/HelpfulResourcesForm/index.js | 1 - web/src/containers/Home/index.js | 1 - web/src/containers/Login/index.js | 1 - web/src/containers/MobileHome/index.js | 12 +---- .../components/AddLanguageModal.js | 1 - .../OperatorControls/components/AddSection.js | 1 - .../OperatorControls/components/AddTheme.js | 1 - .../components/AllIconsModal.js | 1 - .../components/AllStringsModal.js | 1 - .../components/ConfigsModal.js | 1 - .../OperatorControls/components/Sections.js | 1 - .../components/StringSettings.js | 1 - .../components/ThemeSettings.js | 1 - .../OperatorControls/components/UploadIcon.js | 1 - web/src/containers/OperatorControls/index.js | 4 -- web/src/containers/QuickTrade/index.js | 3 -- .../containers/RequestResetPassword/index.js | 8 +--- web/src/containers/ResetPassword/index.js | 9 +--- web/src/containers/Signup/SignupSuccess.js | 2 +- web/src/containers/Signup/index.js | 3 +- .../Summary/MobileAccountTypeList.js | 2 - web/src/containers/Summary/MobileSummary.js | 11 +---- .../Summary/components/AccountDetails.js | 4 -- .../Summary/components/AccountTypeDetails.js | 2 - .../Summary/components/FeesAndLimits.js | 1 - web/src/containers/Summary/index.js | 7 --- web/src/containers/Trade/ChartContainer.js | 6 ++- web/src/containers/Trade/MobileChart.js | 7 +-- web/src/containers/Trade/MobileOrders.js | 3 +- .../Trade/components/MobileOrdersWrapper.js | 2 - .../containers/Trade/components/TradeBlock.js | 5 +-- web/src/containers/Trade/index.js | 20 +-------- web/src/containers/TradeTabs/index.js | 1 - .../containers/TransactionsHistory/index.js | 4 +- web/src/containers/UserSecurity/ApiKey.js | 4 -- .../containers/UserSecurity/ApiKeyModal.js | 1 - web/src/containers/UserSecurity/index.js | 2 - web/src/containers/Verification/index.js | 7 +-- .../EmailRequestSuccess.js | 2 +- .../VerificationEmailRequest/index.js | 10 +---- web/src/containers/Wallet/MainWallet.js | 1 - .../Withdraw/Fiat/WithdrawalForm.js | 2 - web/src/containers/Withdraw/form.js | 4 -- web/src/utils/theme.js | 6 +-- 57 files changed, 46 insertions(+), 243 deletions(-) diff --git a/plugins/src/components/Dialog/DesktopDialog.js b/plugins/src/components/Dialog/DesktopDialog.js index 1cdd7afd9b..bbe42c3d45 100644 --- a/plugins/src/components/Dialog/DesktopDialog.js +++ b/plugins/src/components/Dialog/DesktopDialog.js @@ -12,7 +12,6 @@ class Dialog extends PureComponent { closeButton: PropTypes.func, onCloseDialog: PropTypes.func, children: PropTypes.node.isRequired, - disableTheme: PropTypes.bool, }; onRequestClose = (e) => { @@ -30,9 +29,7 @@ class Dialog extends PureComponent { shouldCloseOnOverlayClick, showCloseText, dialogId, - theme, className, - disableTheme, bodyOpenClassName, strings: STRINGS, } = this.props; @@ -76,10 +73,8 @@ class Dialog extends PureComponent { Modal.setAppElement('#root'); Dialog.defaultProps = { - disableTheme: false, shouldCloseOnOverlayClick: true, showCloseText: true, - theme: '', className: '', strings: {}, }; diff --git a/web/src/components/AppFooter/index.js b/web/src/components/AppFooter/index.js index 8076e5d728..d7d5cfae03 100644 --- a/web/src/components/AppFooter/index.js +++ b/web/src/components/AppFooter/index.js @@ -38,7 +38,6 @@ const generateSectionsText = (links = {}, ICONS) => { const AppFooter = ({ className, - theme, constants = { description: '' }, constants: { links = {} }, icons: ICONS, diff --git a/web/src/components/Chat/ChatMessageList.js b/web/src/components/Chat/ChatMessageList.js index 48ab59966a..20ce3fe383 100644 --- a/web/src/components/Chat/ChatMessageList.js +++ b/web/src/components/Chat/ChatMessageList.js @@ -192,7 +192,6 @@ class ChatMessageList extends Component { } const mapStateToProps = (store) => ({ - // activeTheme: store.app.theme, is_hap: store.user.is_hap, }); diff --git a/web/src/components/Dialog/DesktopDialog.js b/web/src/components/Dialog/DesktopDialog.js index 057d68b41c..4cf6995246 100644 --- a/web/src/components/Dialog/DesktopDialog.js +++ b/web/src/components/Dialog/DesktopDialog.js @@ -6,7 +6,6 @@ import Ionicon from 'react-ionicons'; import { Button, ActionNotification } from 'components'; import STRINGS from 'config/localizedStrings'; import { getClasesForLanguage, getLanguage } from 'utils/string'; -import { getThemeClass } from 'utils/theme'; import withEdit from 'components/EditProvider/withEdit'; class Dialog extends PureComponent { @@ -16,7 +15,6 @@ class Dialog extends PureComponent { closeButton: PropTypes.func, onCloseDialog: PropTypes.func, children: PropTypes.node.isRequired, - disableTheme: PropTypes.bool, }; onRequestClose = (e) => { @@ -35,9 +33,7 @@ class Dialog extends PureComponent { shouldCloseOnOverlayClick, showCloseText, dialogId, - theme, className, - disableTheme, bodyOpenClassName, isEditMode, } = this.props; @@ -49,12 +45,9 @@ class Dialog extends PureComponent { contentLabel={label} onRequestClose={this.onRequestClose} shouldCloseOnOverlayClick={shouldCloseOnOverlayClick} - portalClassName={classnames( - className, - languageClasses, - disableTheme ? '' : getThemeClass(theme), - { 'layout-edit': isEditMode } - )} + portalClassName={classnames(className, languageClasses, { + 'layout-edit': isEditMode, + })} bodyOpenClassName={bodyOpenClassName} > {showCloseText && !closeButton && ( @@ -84,10 +77,8 @@ class Dialog extends PureComponent { Modal.setAppElement('#root'); Dialog.defaultProps = { - disableTheme: false, shouldCloseOnOverlayClick: true, showCloseText: true, - theme: '', className: '', }; diff --git a/web/src/components/Dialog/MobileDialog.js b/web/src/components/Dialog/MobileDialog.js index 1572a52104..b8f0e33f4c 100644 --- a/web/src/components/Dialog/MobileDialog.js +++ b/web/src/components/Dialog/MobileDialog.js @@ -5,7 +5,6 @@ import Modal from 'react-modal'; import { isLoggedIn } from 'utils/token'; import { MobileBarBack } from 'components'; import { getClasesForLanguage, getLanguage } from 'utils/string'; -import { getThemeClass } from 'utils/theme'; import { ICONS } from 'config/constants'; import { ReactSVG } from 'react-svg'; @@ -58,7 +57,6 @@ class Dialog extends PureComponent { children, label, dialogId, - theme, className, useFullScreen = false, compressed = false, @@ -75,7 +73,6 @@ class Dialog extends PureComponent { portalClassName={classnames( className, languageClasses, - getThemeClass(theme), 'layout-mobile', { compressed, @@ -103,7 +100,6 @@ Modal.setAppElement('#root'); Dialog.defaultProps = { shouldCloseOnOverlayClick: true, showCloseText: true, - theme: '', className: '', }; diff --git a/web/src/components/Loader/index.js b/web/src/components/Loader/index.js index 0ae043967e..7b8b908dd9 100644 --- a/web/src/components/Loader/index.js +++ b/web/src/components/Loader/index.js @@ -34,10 +34,7 @@ Loader.defaultProps = { className: '', }; -const mapStateToProps = ({ - app: { theme: activeTheme, constants: { color = {} } = {} }, -}) => ({ - activeTheme, +const mapStateToProps = ({ app: { constants: { color = {} } = {} } }) => ({ color, }); diff --git a/web/src/components/Table/TableBody.js b/web/src/components/Table/TableBody.js index 0822749a90..ae9d9f5a3b 100644 --- a/web/src/components/Table/TableBody.js +++ b/web/src/components/Table/TableBody.js @@ -52,6 +52,7 @@ class TableRow extends Component { const { isExpanded } = this.state; const isRemoveData = cancelDelayData.filter((data) => data === row.id); const isExpandable = rowExpandable(row); + //TODO: hard-coded colors const subTrClsName = activeTheme === 'white' ? 'sub-tr-bg-white' : 'sub-tr-bg'; diff --git a/web/src/containers/App/App.js b/web/src/containers/App/App.js index a32b81cab9..8d6cccd37c 100644 --- a/web/src/containers/App/App.js +++ b/web/src/containers/App/App.js @@ -11,7 +11,7 @@ import querystring from 'query-string'; // import { CaretLeftOutlined, CaretRightOutlined } from '@ant-design/icons'; // import { Button } from 'antd'; import { setSideBarState, getSideBarState } from 'utils/sideBar'; -import AppMenuSidebar from '../../components/AppMenuSidebar'; +import AppMenuSidebar from 'components/AppMenuSidebar'; import { addElements, injectHTML } from 'utils/script'; import { SuccessDisplay } from 'components'; @@ -29,13 +29,9 @@ import { import { storeTools } from 'actions/toolsAction'; import STRINGS from 'config/localizedStrings'; -import { - getThemeClass, - getChatMinimized, - setChatMinimized, -} from '../../utils/theme'; -import { checkUserSessionExpired } from '../../utils/utils'; -import { getTokenTimestamp, isLoggedIn, isAdmin } from '../../utils/token'; +import { getChatMinimized, setChatMinimized } from 'utils/theme'; +import { checkUserSessionExpired } from 'utils/utils'; +import { getTokenTimestamp, isLoggedIn, isAdmin } from 'utils/token'; import { AppBar, AppMenuBar, @@ -47,7 +43,7 @@ import { SnackNotification, SnackDialog, PairTabs, -} from '../../components'; +} from 'components'; import { ContactForm, HelpfulResourcesForm, @@ -66,11 +62,8 @@ import MarketSelector from 'components/AppBar/MarketSelector'; import ConnectViaDesktop from 'containers/Stake/components/ConnectViaDesktop'; import ConfigureApps from 'containers/Apps/ConfigureApps'; -import { - getClasesForLanguage, - getFontClassForLanguage, -} from '../../utils/string'; -import { getExchangeInitialized } from '../../utils/initialize'; +import { getClasesForLanguage, getFontClassForLanguage } from 'utils/string'; +import { getExchangeInitialized } from 'utils/initialize'; import Socket from './Socket'; import Container from './Container'; @@ -491,7 +484,6 @@ class App extends Component { type={type} data={data} onClose={this.onCloseDialog} - activeTheme={this.props.activeTheme} /> ); case MARKET_SELECTOR: @@ -651,7 +643,6 @@ class App extends Component { // verification_level, activeLanguage, // openContactForm, - activeTheme, // unreadMessages, router, location, @@ -728,7 +719,6 @@ class App extends Component { />
{!isMobile && !isHome && features && features.chat && ( @@ -942,18 +929,12 @@ class App extends Component {
- {showFooter && !isChartEmbed && ( - - )} + {showFooter && !isChartEmbed && }
{isAdmin() && isBrowser && !isChartEmbed && ( @@ -963,7 +944,6 @@ class App extends Component { label="successful_dialog" isOpen={isCustomNotification} onCloseDialog={this.onCloseNotification} - theme={activeTheme} > ({ activeNotification: store.app.activeNotification, // verification_level: store.user.verification_level, activeLanguage: store.app.language, - activeTheme: store.app.theme, // user: store.user, pair: store.app.pair, pairs: store.app.pairs, diff --git a/web/src/containers/AuthContainer/index.js b/web/src/containers/AuthContainer/index.js index 44960c8eb9..3715bf6d7a 100644 --- a/web/src/containers/AuthContainer/index.js +++ b/web/src/containers/AuthContainer/index.js @@ -9,7 +9,6 @@ import { AppFooter, Dialog } from 'components'; import { HelpfulResourcesForm } from 'containers'; import { FLEX_CENTER_CLASSES } from 'config/constants'; import { getClasesForLanguage } from 'utils/string'; -import { getThemeClass } from 'utils/theme'; import { getExchangeInfo, closeNotification, @@ -86,7 +85,6 @@ class AuthContainer extends Component { const { dialogIsOpen } = this.state; const { activeLanguage, - activeTheme, children, constants = { captcha: {} }, icons: ICONS = {}, @@ -105,7 +103,6 @@ class AuthContainer extends Component { 'auth-wrapper', 'w-100', 'h-100', - getThemeClass(activeTheme), { 'layout-mobile': isMobile, 'layout-desktop': isBrowser, @@ -129,7 +126,6 @@ class AuthContainer extends Component { className="app-dialog" onCloseDialog={this.onCloseDialog} shouldCloseOnOverlayClick={false} - theme={activeTheme} showCloseText={false} compressed={false} style={{ 'z-index': 100 }} @@ -144,13 +140,8 @@ class AuthContainer extends Component { )} {!isMobile ? ( -
- +
+
) : null}
@@ -161,7 +152,6 @@ class AuthContainer extends Component { const mapStateToProps = (store) => ({ activeLanguage: store.app.language, - activeTheme: store.app.theme, info: store.app.info, constants: store.app.constants, activeNotification: store.app.activeNotification, diff --git a/web/src/containers/ChartEmbed/index.js b/web/src/containers/ChartEmbed/index.js index 644b85a6a5..86bcd5b040 100644 --- a/web/src/containers/ChartEmbed/index.js +++ b/web/src/containers/ChartEmbed/index.js @@ -64,7 +64,7 @@ class ChartEmbed extends PureComponent { }; render() { - const { pair, pairData, activeTheme } = this.props; + const { pair, pairData } = this.props; const { chartHeight, symbol } = this.state; if (symbol !== pair || !pairData) { @@ -101,11 +101,7 @@ class ChartEmbed extends PureComponent { pair={pair} > {pair && chartHeight > 0 && ( - + )} @@ -122,7 +118,6 @@ const mapStateToProps = (state) => { return { pair, pairData, - activeTheme: state.app.theme, isReady: state.app.isReady, constants: state.app.constants, }; diff --git a/web/src/containers/ConfirmChangePassword/index.js b/web/src/containers/ConfirmChangePassword/index.js index 26da083995..82b7fb581f 100644 --- a/web/src/containers/ConfirmChangePassword/index.js +++ b/web/src/containers/ConfirmChangePassword/index.js @@ -1,5 +1,4 @@ import React, { Component } from 'react'; -import { connect } from 'react-redux'; import { Dialog } from 'components'; import ResetPasswordSuccess from 'containers/ResetPassword/ResetPasswordSuccess'; @@ -37,7 +36,6 @@ class ConfirmChangePassword extends Component { isOpen={this.state.showContactForm} label="confirm-change-pwd-modal" onCloseDialog={this.onCloseDialog} - theme={this.props.activeTheme} > {this.state.showContactForm && (
@@ -54,8 +52,4 @@ class ConfirmChangePassword extends Component { } } -const mapStateToProps = (store) => ({ - activeTheme: store.app.theme, -}); - -export default connect(mapStateToProps)(ConfirmChangePassword); +export default ConfirmChangePassword; diff --git a/web/src/containers/ExpiredExchange/index.js b/web/src/containers/ExpiredExchange/index.js index 13b0ff5a58..e0a3468e78 100644 --- a/web/src/containers/ExpiredExchange/index.js +++ b/web/src/containers/ExpiredExchange/index.js @@ -4,7 +4,6 @@ import { ReactSVG } from 'react-svg'; import { connect } from 'react-redux'; import { bindActionCreators } from 'redux'; import moment from 'moment'; -import { getThemeClass } from 'utils/theme'; import { FLEX_CENTER_CLASSES, EXCHANGE_URL } from 'config/constants'; import { getExchangeInfo } from 'actions/appActions'; import { logout } from 'actions/authAction'; @@ -41,16 +40,9 @@ class Expired extends Component { goToAccount = () => this.props.router.replace('/account'); render() { - const { activeTheme, icons: ICONS } = this.props; + const { icons: ICONS } = this.props; return ( -
+
({ info: store.app.info, - activeTheme: store.app.theme, }); const mapDispatchToProps = (dispatch) => ({ diff --git a/web/src/containers/HelpfulResourcesForm/index.js b/web/src/containers/HelpfulResourcesForm/index.js index fa87873fe2..f60a949346 100644 --- a/web/src/containers/HelpfulResourcesForm/index.js +++ b/web/src/containers/HelpfulResourcesForm/index.js @@ -149,7 +149,6 @@ class HelpfulResourcesForm extends Component { const mapStateToProps = (store) => ({ email: store.user.email, contactFormData: store.app.contactFormData, - activeTheme: store.app.theme, constants: store.app.constants, }); diff --git a/web/src/containers/Home/index.js b/web/src/containers/Home/index.js index 2ee54d5f34..708446a190 100644 --- a/web/src/containers/Home/index.js +++ b/web/src/containers/Home/index.js @@ -1131,7 +1131,6 @@ const mapStateToProps = (store) => { // quickTradeData: store.orderbook.quickTrade, activeLanguage: store.app.language, info: store.app.info, - activeTheme: store.app.theme, constants: store.app.constants, tickers: store.app.tickers, orderLimits: qtlimits, diff --git a/web/src/containers/Login/index.js b/web/src/containers/Login/index.js index 4cb621a360..39244f9164 100644 --- a/web/src/containers/Login/index.js +++ b/web/src/containers/Login/index.js @@ -252,7 +252,6 @@ class Login extends Component { className="login-dialog" useFullScreen={isMobile} showBar={otpDialogIsOpen} - theme={activeTheme} > {otpDialogIsOpen && } {logoutDialogIsOpen && ( diff --git a/web/src/containers/MobileHome/index.js b/web/src/containers/MobileHome/index.js index de2838025a..239dc2a383 100644 --- a/web/src/containers/MobileHome/index.js +++ b/web/src/containers/MobileHome/index.js @@ -6,23 +6,16 @@ import { isBrowser, isMobile } from 'react-device-detect'; import STRINGS from 'config/localizedStrings'; import { AppFooter, NotificationsList } from 'components'; import { getClasesForLanguage } from 'utils/string'; -import { getThemeClass } from 'utils/theme'; class Home extends Component { render() { - const { - activeTheme, - activeLanguage, - constants, - enabledPlugins, - } = this.props; + const { activeLanguage, constants, enabledPlugins } = this.props; return (
- +
); @@ -106,7 +99,6 @@ class Home extends Component { } const mapStateToProps = (state) => ({ - activeTheme: state.app.theme, activeLanguage: state.app.language, constants: state.app.constants, enabledPlugins: state.app.enabledPlugins, diff --git a/web/src/containers/OperatorControls/components/AddLanguageModal.js b/web/src/containers/OperatorControls/components/AddLanguageModal.js index d34d25fff5..908fd91756 100644 --- a/web/src/containers/OperatorControls/components/AddLanguageModal.js +++ b/web/src/containers/OperatorControls/components/AddLanguageModal.js @@ -35,7 +35,6 @@ class AddLanguageModal extends Component { isOpen={isOpen} label="operator-controls-modal" className="operator-controls__modal" - disableTheme={true} onCloseDialog={() => onCloseDialog(true)} shouldCloseOnOverlayClick={true} showCloseText={true} diff --git a/web/src/containers/OperatorControls/components/AddSection.js b/web/src/containers/OperatorControls/components/AddSection.js index 59d404d30a..0396fbcfb4 100644 --- a/web/src/containers/OperatorControls/components/AddSection.js +++ b/web/src/containers/OperatorControls/components/AddSection.js @@ -34,7 +34,6 @@ class SectionsModal extends Component { isOpen={isOpen} label="operator-controls-modal" className="operator-controls__modal" - disableTheme={true} onCloseDialog={onCloseDialog} shouldCloseOnOverlayClick={true} showCloseText={true} diff --git a/web/src/containers/OperatorControls/components/AddTheme.js b/web/src/containers/OperatorControls/components/AddTheme.js index c189f70a15..c3fc74441b 100644 --- a/web/src/containers/OperatorControls/components/AddTheme.js +++ b/web/src/containers/OperatorControls/components/AddTheme.js @@ -252,7 +252,6 @@ class AddTheme extends Component { isOpen={isOpen} label="operator-controls-modal" className="operator-controls__modal add-theme" - disableTheme={true} onCloseDialog={() => onCloseDialog(true)} shouldCloseOnOverlayClick={true} showCloseText={true} diff --git a/web/src/containers/OperatorControls/components/AllIconsModal.js b/web/src/containers/OperatorControls/components/AllIconsModal.js index c18b261950..bcf702649a 100644 --- a/web/src/containers/OperatorControls/components/AllIconsModal.js +++ b/web/src/containers/OperatorControls/components/AllIconsModal.js @@ -159,7 +159,6 @@ class AllIconsModal extends Component { isOpen={isOpen} label="operator-controls-modal" className="operator-controls__modal extended" - disableTheme={true} onCloseDialog={onCloseDialog} shouldCloseOnOverlayClick={true} showCloseText={true} diff --git a/web/src/containers/OperatorControls/components/AllStringsModal.js b/web/src/containers/OperatorControls/components/AllStringsModal.js index d4ae758515..fda92d07f4 100644 --- a/web/src/containers/OperatorControls/components/AllStringsModal.js +++ b/web/src/containers/OperatorControls/components/AllStringsModal.js @@ -56,7 +56,6 @@ class AllStringsModal extends Component { isOpen={isOpen} label="operator-controls-modal" className="operator-controls__modal extended" - disableTheme={true} onCloseDialog={onCloseDialog} shouldCloseOnOverlayClick={true} showCloseText={true} diff --git a/web/src/containers/OperatorControls/components/ConfigsModal.js b/web/src/containers/OperatorControls/components/ConfigsModal.js index 1754028aea..43777783a3 100644 --- a/web/src/containers/OperatorControls/components/ConfigsModal.js +++ b/web/src/containers/OperatorControls/components/ConfigsModal.js @@ -169,7 +169,6 @@ const ConfigsModal = ({ isOpen={isOpen} label="operator-controls-modal" className="operator-controls__modal add-theme" - disableTheme={true} onCloseDialog={onClose} shouldCloseOnOverlayClick={true} showCloseText={true} diff --git a/web/src/containers/OperatorControls/components/Sections.js b/web/src/containers/OperatorControls/components/Sections.js index 03710d5500..504d7b6d77 100644 --- a/web/src/containers/OperatorControls/components/Sections.js +++ b/web/src/containers/OperatorControls/components/Sections.js @@ -89,7 +89,6 @@ class SectionsModal extends Component { isOpen={isOpen} label="operator-controls-modal" className="operator-controls__modal" - disableTheme={true} onCloseDialog={onCloseDialog} shouldCloseOnOverlayClick={true} showCloseText={true} diff --git a/web/src/containers/OperatorControls/components/StringSettings.js b/web/src/containers/OperatorControls/components/StringSettings.js index 13f20814a8..d0c36fc603 100644 --- a/web/src/containers/OperatorControls/components/StringSettings.js +++ b/web/src/containers/OperatorControls/components/StringSettings.js @@ -111,7 +111,6 @@ class StringSettingsModal extends Component { isOpen={isOpen} label="operator-controls-modal" className="operator-controls__modal" - disableTheme={true} onCloseDialog={() => onCloseDialog(true)} shouldCloseOnOverlayClick={true} showCloseText={true} diff --git a/web/src/containers/OperatorControls/components/ThemeSettings.js b/web/src/containers/OperatorControls/components/ThemeSettings.js index d3b1de85da..eff9198e0c 100644 --- a/web/src/containers/OperatorControls/components/ThemeSettings.js +++ b/web/src/containers/OperatorControls/components/ThemeSettings.js @@ -119,7 +119,6 @@ class ThemeSettingsModal extends Component { isOpen={isOpen} label="operator-controls-modal" className="operator-controls__modal" - disableTheme={true} onCloseDialog={() => onCloseDialog(true)} shouldCloseOnOverlayClick={true} showCloseText={true} diff --git a/web/src/containers/OperatorControls/components/UploadIcon.js b/web/src/containers/OperatorControls/components/UploadIcon.js index 4afc8f30b7..27ddb5d6f0 100644 --- a/web/src/containers/OperatorControls/components/UploadIcon.js +++ b/web/src/containers/OperatorControls/components/UploadIcon.js @@ -170,7 +170,6 @@ class UploadIcon extends Component { isOpen={isOpen} label="operator-controls-modal" className="operator-controls__modal" - disableTheme={true} onCloseDialog={onCloseDialog} shouldCloseOnOverlayClick={!loading} showCloseText={!loading} diff --git a/web/src/containers/OperatorControls/index.js b/web/src/containers/OperatorControls/index.js index eebf68cdc6..8ef6dbd280 100644 --- a/web/src/containers/OperatorControls/index.js +++ b/web/src/containers/OperatorControls/index.js @@ -1074,7 +1074,6 @@ class OperatorControls extends Component { isOpen={isEditMode && isEditModalOpen} label="operator-controls-modal" className="operator-controls__modal" - disableTheme={true} onCloseDialog={this.closeEditModal} shouldCloseOnOverlayClick={true} showCloseText={true} @@ -1242,7 +1241,6 @@ class OperatorControls extends Component { isOpen={isExitConfirmationOpen} label="operator-controls-modal" className="operator-controls__modal" - disableTheme={true} onCloseDialog={this.closeExitConfirmationModal} shouldCloseOnOverlayClick={true} showCloseText={true} @@ -1276,7 +1274,6 @@ class OperatorControls extends Component { isOpen={isExitConsoleConfirmationOpen} label="operator-controls-modal" className="operator-controls__modal" - disableTheme={true} onCloseDialog={this.closeExitConsoleConfirmationModal} shouldCloseOnOverlayClick={true} showCloseText={true} @@ -1309,7 +1306,6 @@ class OperatorControls extends Component { isOpen={isPublishConfirmationOpen} label="operator-controls-modal" className="operator-controls__modal" - disableTheme={true} onCloseDialog={this.closePublishConfirmationModal} shouldCloseOnOverlayClick={true} showCloseText={true} diff --git a/web/src/containers/QuickTrade/index.js b/web/src/containers/QuickTrade/index.js index b70c1de494..6e22131dd4 100644 --- a/web/src/containers/QuickTrade/index.js +++ b/web/src/containers/QuickTrade/index.js @@ -1116,7 +1116,6 @@ class QuickTradeContainer extends PureComponent { render() { const { pairData = {}, - activeTheme, orderLimits, pairs, coins, @@ -1265,7 +1264,6 @@ class QuickTradeContainer extends PureComponent { onCloseDialog={this.onCloseDialog} shouldCloseOnOverlayClick={false} showCloseText={false} - theme={activeTheme} style={{ 'z-index': 100 }} > {isLoading ? ( @@ -1382,7 +1380,6 @@ const mapStateToProps = (store) => { pairs: store.app.pairs, coins: store.app.coins, tickers: store.app.tickers, - activeTheme: store.app.theme, activeLanguage: store.app.language, orderLimits: qtlimits, user: store.user, diff --git a/web/src/containers/RequestResetPassword/index.js b/web/src/containers/RequestResetPassword/index.js index cc42c206d1..5fccfcc83c 100644 --- a/web/src/containers/RequestResetPassword/index.js +++ b/web/src/containers/RequestResetPassword/index.js @@ -92,12 +92,7 @@ class RequestResetPassword extends Component { }; render() { - const { - languageClasses, - activeTheme, - icons: ICONS, - openContactForm, - } = this.props; + const { languageClasses, icons: ICONS, openContactForm } = this.props; const { success, showContactForm, formFields } = this.state; return ( @@ -161,7 +156,6 @@ class RequestResetPassword extends Component { style={{ 'z-index': 100 }} className={classnames(languageClasses)} showCloseText={false} - theme={activeTheme} > ({ - activeTheme: store.app.theme, constants: store.app.constants, }); diff --git a/web/src/containers/Signup/SignupSuccess.js b/web/src/containers/Signup/SignupSuccess.js index 529f63d3cd..ddf65a9801 100644 --- a/web/src/containers/Signup/SignupSuccess.js +++ b/web/src/containers/Signup/SignupSuccess.js @@ -23,7 +23,7 @@ const BottomLink = () => ( ); -const SignupSuccess = ({ icons: ICONS, ...rest }) => { +const SignupSuccess = ({ icons: ICONS }) => { return (
{isMobile && } - +
); } @@ -230,7 +230,6 @@ class Signup extends Component { style={{ 'z-index': 100 }} className={classnames(languageClasses)} showCloseText={false} - theme={activeTheme} >
@@ -100,12 +97,7 @@ const MobileSummary = ({ stringId="SUMMARY.MARKETS" title={STRINGS['SUMMARY.MARKETS']} > - +
{/*
@@ -139,7 +131,6 @@ const MobileSummary = ({ pairs={pairs} user={user} balance={balance} - activeTheme={activeTheme} selectedAccount={selectedAccount} onAccountTypeChange={onAccountTypeChange} onFeesAndLimits={onFeesAndLimits} diff --git a/web/src/containers/Summary/components/AccountDetails.js b/web/src/containers/Summary/components/AccountDetails.js index 3d383916a9..929c0e5921 100644 --- a/web/src/containers/Summary/components/AccountDetails.js +++ b/web/src/containers/Summary/components/AccountDetails.js @@ -10,7 +10,6 @@ import STRINGS from 'config/localizedStrings'; const AccountDetails = ({ user, - activeTheme, coins, pairs, selectedAccount, @@ -56,7 +55,6 @@ const AccountDetails = ({ coins={coins} config={config} balance={balance} - activeTheme={activeTheme} selectedAccount={selectedAccount} lastMonthVolume={lastMonthVolume} onAccountTypeChange={onAccountTypeChange} @@ -67,7 +65,6 @@ const AccountDetails = ({ ) : (
({ - activeTheme: state.app.theme, pairs: state.app.pairs, coins: state.app.coins, constants: state.app.constants, diff --git a/web/src/containers/Summary/index.js b/web/src/containers/Summary/index.js index 16accd4040..40c71e1652 100644 --- a/web/src/containers/Summary/index.js +++ b/web/src/containers/Summary/index.js @@ -124,7 +124,6 @@ class Summary extends Component { const { user, balance, - activeTheme, pairs, coins, verification_level, @@ -177,7 +176,6 @@ class Summary extends Component { pairs={pairs} coins={coins} config={config_level} - activeTheme={activeTheme} selectedAccount={selectedAccount} logout={this.logoutConfirm} balance={balance} @@ -207,7 +205,6 @@ class Summary extends Component { pairs={pairs} coins={coins} config={config_level} - activeTheme={activeTheme} onFeesAndLimits={this.onFeesAndLimits} onUpgradeAccount={this.onUpgradeAccount} onInviteFriends={this.onInviteFriends} @@ -252,7 +249,6 @@ class Summary extends Component { totalAssets={totalAssets} balance={balance} coins={coins} - activeTheme={activeTheme} /> {/*
*/} @@ -267,7 +263,6 @@ class Summary extends Component { user={user} coins={coins} pairs={pairs} - activeTheme={activeTheme} router={router} /> @@ -295,7 +290,6 @@ class Summary extends Component { user={user} coins={coins} pairs={pairs} - activeTheme={activeTheme} config={config_level} currentTradingAccount={currentTradingAccount.symbol} selectedAccount={selectedAccount} @@ -321,7 +315,6 @@ const mapStateToProps = (state) => ({ user: state.user || {}, verification_level: state.user.verification_level, balance: state.user.balance, - activeTheme: state.app.theme, prices: state.orderbook.prices, price: state.orderbook.price, orders: state.order.activeOrders, diff --git a/web/src/containers/Trade/ChartContainer.js b/web/src/containers/Trade/ChartContainer.js index 61150566b5..618820846f 100644 --- a/web/src/containers/Trade/ChartContainer.js +++ b/web/src/containers/Trade/ChartContainer.js @@ -15,6 +15,7 @@ const mapStateToProps = (state) => { return { tradeHistory, constants: state.app.constants, + activeTheme: state.app.theme, }; }; @@ -22,4 +23,7 @@ const mapDispatchToProps = (dispatch) => ({ setChartHigh: bindActionCreators(setChartHigh, dispatch), }); -export default connect(mapStateToProps, mapDispatchToProps)(withConfig(ChartContainer)); +export default connect( + mapStateToProps, + mapDispatchToProps +)(withConfig(ChartContainer)); diff --git a/web/src/containers/Trade/MobileChart.js b/web/src/containers/Trade/MobileChart.js index b281132b57..b2d4ba215d 100644 --- a/web/src/containers/Trade/MobileChart.js +++ b/web/src/containers/Trade/MobileChart.js @@ -26,7 +26,6 @@ class MobileChart extends Component { const { pair, pairData, - activeTheme, activeLanguage, symbol, // constants, @@ -54,11 +53,7 @@ class MobileChart extends Component { alignChildTitle={true} > {pair && chartHeight > 0 && ( - + )} diff --git a/web/src/containers/Trade/MobileOrders.js b/web/src/containers/Trade/MobileOrders.js index a63a0221f9..757569b70a 100644 --- a/web/src/containers/Trade/MobileOrders.js +++ b/web/src/containers/Trade/MobileOrders.js @@ -16,7 +16,6 @@ const MobileOrders = ({ pair, pairData, userTrades, - activeTheme, isLoggedIn, pairs, coins, @@ -60,7 +59,7 @@ const MobileOrders = ({ onCancelAll={cancelAllOrders} /> ) : ( - + )} )} ({ - activeTheme: store.app.theme, -}); +const mapStateToProps = () => ({}); const mapDispatchToProps = (dispatch) => ({ toggleTool: bindActionCreators(toggleTool, dispatch), diff --git a/web/src/containers/Trade/index.js b/web/src/containers/Trade/index.js index 840ad18692..bf23cd4f0d 100644 --- a/web/src/containers/Trade/index.js +++ b/web/src/containers/Trade/index.js @@ -487,7 +487,6 @@ class Trade extends PureComponent { orderbookReady, balance, activeLanguage, - activeTheme, settings, pairs, coins, @@ -579,12 +578,7 @@ class Trade extends PureComponent { tool={key} > {pair && chartHeight > 0 && ( - + )}
@@ -642,7 +636,6 @@ class Trade extends PureComponent { discount={discount} pairs={pairs} coins={coins} - activeTheme={activeTheme} isLoggedIn={isLoggedIn()} goToTransactionsHistory={this.goToTransactionsHistory} goToPair={this.goToPair} @@ -660,7 +653,6 @@ class Trade extends PureComponent { discount={discount} pairs={pairs} coins={coins} - activeTheme={activeTheme} isLoggedIn={isLoggedIn()} goToTransactionsHistory={this.goToTransactionsHistory} goToPair={this.goToPair} @@ -678,11 +670,7 @@ class Trade extends PureComponent { className="f-1" tool={key} > - +
); @@ -731,7 +719,6 @@ class Trade extends PureComponent { orderbookReady, balance, activeLanguage, - activeTheme, settings, orderLimits, pairs, @@ -764,7 +751,6 @@ class Trade extends PureComponent { pair={pair} pairData={pairData} activeLanguage={activeLanguage} - activeTheme={activeTheme} symbol={symbol} orderLimits={orderLimits} /> @@ -799,7 +785,6 @@ class Trade extends PureComponent { pairData={pairData} pairs={pairs} coins={coins} - activeTheme={activeTheme} /> ), }, @@ -909,7 +894,6 @@ const mapStateToProps = (state) => { balance: state.user.balance, orderbookReady: true, activeLanguage: state.app.language, - activeTheme: state.app.theme, fees: feesDataSelector(state), settings: state.user.settings, orderLimits: state.app.orderLimits, diff --git a/web/src/containers/TradeTabs/index.js b/web/src/containers/TradeTabs/index.js index 1c8e1051b0..4a6d650e74 100644 --- a/web/src/containers/TradeTabs/index.js +++ b/web/src/containers/TradeTabs/index.js @@ -246,7 +246,6 @@ class AddTradeTab extends Component { } const mapStateToProps = (store) => ({ - activeTheme: store.app.theme, pairs: store.app.pairs, tickers: store.app.tickers, pair: store.app.pair, diff --git a/web/src/containers/TransactionsHistory/index.js b/web/src/containers/TransactionsHistory/index.js index 9a44aaebb2..cbcd8672a1 100644 --- a/web/src/containers/TransactionsHistory/index.js +++ b/web/src/containers/TransactionsHistory/index.js @@ -575,7 +575,7 @@ class TransactionsHistory extends Component { }; render() { - const { id, activeTheme, coins, icons: ICONS } = this.props; + const { id, coins, icons: ICONS } = this.props; let { activeTab, dialogIsOpen, amount, currency } = this.state; const { onCloseDialog } = this; @@ -689,7 +689,6 @@ class TransactionsHistory extends Component { ({ withdrawals: withdrawalHistorySelector(store), symbol: store.orderbook.symbol, activeLanguage: store.app.language, - activeTheme: store.app.theme, cancelData: store.wallet.withdrawalCancelData, discount: store.user.discount || 0, }); diff --git a/web/src/containers/UserSecurity/ApiKey.js b/web/src/containers/UserSecurity/ApiKey.js index e71a250a85..39c719703f 100644 --- a/web/src/containers/UserSecurity/ApiKey.js +++ b/web/src/containers/UserSecurity/ApiKey.js @@ -124,7 +124,6 @@ class ApiKey extends Component { fetching, otp_enabled, openOtp, - activeTheme, icons: ICONS, } = this.props; @@ -173,7 +172,6 @@ class ApiKey extends Component { @@ -208,7 +205,6 @@ const mapStateToProps = (state) => ({ tokens: state.user.tokens, fetching: state.user.fetching, error: state.user.error, - activeTheme: state.app.theme, constants: state.app.constants, }); diff --git a/web/src/containers/UserSecurity/ApiKeyModal.js b/web/src/containers/UserSecurity/ApiKeyModal.js index e56b6769d0..6fdb46a227 100644 --- a/web/src/containers/UserSecurity/ApiKeyModal.js +++ b/web/src/containers/UserSecurity/ApiKeyModal.js @@ -155,7 +155,6 @@ class ApiKeyModal extends Component { const selector = formValueSelector(FORM_NAME); const mapStateToForm = (state) => ({ tokenName: selector(state, 'name'), - activeTheme: state.app.theme, }); export default connect(mapStateToForm)(withConfig(ApiKeyModal)); diff --git a/web/src/containers/UserSecurity/index.js b/web/src/containers/UserSecurity/index.js index 0604f2f126..8acfd62044 100644 --- a/web/src/containers/UserSecurity/index.js +++ b/web/src/containers/UserSecurity/index.js @@ -635,7 +635,6 @@ class UserVerification extends Component { label="security-modal" onCloseDialog={this.onCloseDialog} showCloseText={!(otp.error || modalText)} - theme={this.props.activeTheme} > {dialogIsOpen && !otp.requesting ? ( this.renderModalContent( @@ -675,7 +674,6 @@ const mapStateToProps = (state) => ({ logins: state.wallet.logins, user: state.user, activeLanguage: state.app.language, - activeTheme: state.app.theme, constants: state.app.constants, }); diff --git a/web/src/containers/Verification/index.js b/web/src/containers/Verification/index.js index 4a938c612c..5d6d639f94 100644 --- a/web/src/containers/Verification/index.js +++ b/web/src/containers/Verification/index.js @@ -32,7 +32,6 @@ import { getClasesForLanguage, getFontClassForLanguage } from 'utils/string'; import { ContactForm } from 'containers'; import { NOTIFICATIONS, openContactForm } from 'actions/appActions'; import { setMe, updateDocuments, updateUser } from 'actions/userAction'; -import { getThemeClass } from 'utils/theme'; import MobileVerificationHome from './MobileVerificationHome'; // import MobileTabs from './MobileTabs'; import { verifyBankData } from 'actions/verificationActions'; @@ -686,7 +685,7 @@ class Verification extends Component { onLogout = () => this.props.logout(''); render() { - const { activeLanguage, activeTheme, icons: ICONS } = this.props; + const { activeLanguage, icons: ICONS } = this.props; const { activeTab, tabs, @@ -714,7 +713,6 @@ class Verification extends Component { className={classnames( 'app_container-main', 'my-3', - getThemeClass(activeTheme), fontClass, languageClasses[0], { @@ -726,7 +724,6 @@ class Verification extends Component { {/* {!isMobile && {this.renderDialogContent(dialogType)} @@ -769,7 +765,6 @@ const mapStateToProps = (state) => { ultimate_fiat: state.app.features.ultimate_fiat, activeLanguage: state.app.language, // token: state.auth.token, - activeTheme: state.app.theme, user: state.user, enabledPlugins: state.app.enabledPlugins, constants: state.app.constants, diff --git a/web/src/containers/VerificationEmailRequest/EmailRequestSuccess.js b/web/src/containers/VerificationEmailRequest/EmailRequestSuccess.js index f375250225..f2a615ffe9 100644 --- a/web/src/containers/VerificationEmailRequest/EmailRequestSuccess.js +++ b/web/src/containers/VerificationEmailRequest/EmailRequestSuccess.js @@ -5,7 +5,7 @@ import STRINGS from 'config/localizedStrings'; import withConfig from 'components/ConfigProvider/withConfig'; import { FLEX_CENTER_CLASSES } from 'config/constants'; -const EmailRequestSuccess = ({ onClick, icons: ICONS, ...rest }) => { +const EmailRequestSuccess = ({ onClick, icons: ICONS }) => { return (
({ - activeTheme: store.app.theme, constants: store.app.constants, }); diff --git a/web/src/containers/Wallet/MainWallet.js b/web/src/containers/Wallet/MainWallet.js index dff4af3ca4..e198f60d66 100644 --- a/web/src/containers/Wallet/MainWallet.js +++ b/web/src/containers/Wallet/MainWallet.js @@ -322,7 +322,6 @@ const mapStateToProps = (store) => ({ pairs: store.app.pairs, prices: store.orderbook.prices, balance: store.user.balance, - activeTheme: store.app.theme, activeLanguage: store.app.language, bankaccount: store.user.userData.bank_account, totalAsset: store.asset.totalAsset, diff --git a/web/src/containers/Withdraw/Fiat/WithdrawalForm.js b/web/src/containers/Withdraw/Fiat/WithdrawalForm.js index f92832dd4f..d9adbbd3f9 100644 --- a/web/src/containers/Withdraw/Fiat/WithdrawalForm.js +++ b/web/src/containers/Withdraw/Fiat/WithdrawalForm.js @@ -289,7 +289,6 @@ class Index extends Component { render() { const { user: { id_data = {} } = {}, - activeTheme, submitting, error, currency, @@ -356,7 +355,6 @@ class Index extends Component { label="withdraw-modal" onCloseDialog={this.onCloseDialog} shouldCloseOnOverlayClick={dialogOtpOpen} - theme={activeTheme} showCloseText={false} > {dialogOtpOpen ? ( diff --git a/web/src/containers/Withdraw/form.js b/web/src/containers/Withdraw/form.js index 8adb0e1a53..3d3e80063b 100644 --- a/web/src/containers/Withdraw/form.js +++ b/web/src/containers/Withdraw/form.js @@ -286,7 +286,6 @@ class Form extends Component { openContactForm, formValues, currentPrice, - activeTheme, coins, titleSection, icons: ICONS, @@ -348,7 +347,6 @@ class Form extends Component { label="withdraw-modal" onCloseDialog={this.onCloseDialog} shouldCloseOnOverlayClick={dialogOtpOpen} - theme={activeTheme} showCloseText={false} > {dialogOtpOpen ? ( @@ -375,7 +373,6 @@ class Form extends Component { label="withdraw-modal" onCloseDialog={closeQRScanner} shouldCloseOnOverlayClick={false} - theme={activeTheme} showCloseText={true} > {qrScannerOpen && ( @@ -419,7 +416,6 @@ const mapStateToForm = (state) => ({ 'email', 'fee_type' ), - activeTheme: state.app.theme, coins: state.app.coins, targets: state.app.targets, balance: state.user.balance, diff --git a/web/src/utils/theme.js b/web/src/utils/theme.js index fc3078c07a..063ba1472c 100644 --- a/web/src/utils/theme.js +++ b/web/src/utils/theme.js @@ -1,4 +1,4 @@ -import { THEME_DEFAULT, CHAT_STATUS_KEY } from '../config/constants'; +import { THEME_DEFAULT, CHAT_STATUS_KEY } from 'config/constants'; export const getTheme = (theme = '') => { // const indexOfTheme = THEMES.indexOf(theme); @@ -8,10 +8,6 @@ export const getTheme = (theme = '') => { return theme || THEME_DEFAULT; }; -export const getThemeClass = (theme = '') => { - return `${getTheme(theme)}-theme`; -}; - export const getChatMinimized = () => { const minimized = localStorage.getItem(CHAT_STATUS_KEY) || false; return !!minimized;