theme-related cleanups

hollaex · Jan 4, 2023 · aa51693 · aa51693
1 parent 34f1c92
commit aa51693
Show file tree

Hide file tree

Showing 57 changed files with 46 additions and 243 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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 {
 					/>
 					<div
 						className={classnames(
-							getThemeClass(activeTheme),
 							activePath,
 							symbol,
 							fontClass,
@@ -744,7 +734,6 @@ class App extends Component {
 							className={classnames(
 								'app_container',
 								'd-flex',
-								getThemeClass(activeTheme),
 								activePath,
 								symbol,
 								fontClass,
@@ -881,7 +870,6 @@ class App extends Component {
 										)}
 										onCloseDialog={this.onCloseDialog}
 										shouldCloseOnOverlayClick={shouldCloseOnOverlayClick}
-										theme={activeTheme}
 										showCloseText={
 											!(
 												activeNotification.type === NOTIFICATIONS.STAKE ||
@@ -911,7 +899,6 @@ class App extends Component {
 											this.renderDialogContent(
 												activeNotification
 												// prices,
-												// activeTheme
 											)}
 									</Dialog>
 									{!isMobile && !isHome && features && features.chat && (
@@ -942,18 +929,12 @@ class App extends Component {
 						<SnackDialog />
 					</div>
 					<div
-						className={classnames(
-							getThemeClass(activeTheme),
-							languageClasses[0],
-							{
-								'layout-mobile': isMobile,
-								'layout-desktop': isBrowser,
-							}
-						)}
+						className={classnames(languageClasses[0], {
+							'layout-mobile': isMobile,
+							'layout-desktop': isBrowser,
+						})}
 					>
-						{showFooter && !isChartEmbed && (
-							<AppFooter theme={activeTheme} constants={constants} />
-						)}
+						{showFooter && !isChartEmbed && <AppFooter constants={constants} />}
 					</div>
 				</div>
 				{isAdmin() && isBrowser && !isChartEmbed && (
@@ -963,7 +944,6 @@ class App extends Component {
 					label="successful_dialog"
 					isOpen={isCustomNotification}
 					onCloseDialog={this.onCloseNotification}
-					theme={activeTheme}
 				>
 					<SuccessDisplay
 						onClick={this.onCloseNotification}

diff --git a/web/src/containers/App/index.js b/web/src/containers/App/index.js
@@ -59,7 +59,6 @@ const mapStateToProps = (store) => ({
 	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
@@ -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 {
 							)}
 					</Dialog>
 					{!isMobile ? (
-						<div
-							className={classnames(
-								'footer-wrapper',
-								getThemeClass(activeTheme)
-							)}
-						>
-							<AppFooter theme={activeTheme} constants={constants} />
+						<div className={classnames('footer-wrapper')}>
+							<AppFooter constants={constants} />
 						</div>
 					) : null}
 				</div>
@@ -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
@@ -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 && (
-									<TVChartContainer
-										activeTheme={activeTheme}
-										symbol={symbol}
-										pairData={pairData}
-									/>
+									<TVChartContainer symbol={symbol} pairData={pairData} />
 								)}
 							</TradeBlock>
 						</div>
@@ -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
@@ -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 && (
 						<div className="confirm-change-pwd-wrapper">
@@ -54,8 +52,4 @@ class ConfirmChangePassword extends Component {
 	}
 }
 
-const mapStateToProps = (store) => ({
-	activeTheme: store.app.theme,
-});
-
-export default connect(mapStateToProps)(ConfirmChangePassword);
+export default ConfirmChangePassword;
-Original file line number
+Diff line change
@@ Expand Up / @@ -192,7 +192,6 @@ class ChatMessageList extends Component { @@
     }
     const mapStateToProps = (store) => ({
-    	// activeTheme: store.app.theme,
     	is_hap: store.user.is_hap,
     });
@@ Expand Down @@