refinements based on requirements

hollaex · Jan 2, 2021 · 2bf50ab · 2bf50ab
1 parent e43e81c
commit 2bf50ab
Show file tree

Hide file tree

Showing 8 changed files with 26 additions and 54 deletions.
diff --git a/web/src/components/AppBar/_AppBar.scss b/web/src/components/AppBar/_AppBar.scss
@@ -205,7 +205,7 @@ $app-bar-add-tab-red: #ff0000;
 	}
 
 	.app_bar-icon-logo {
-		height: 5rem;
+		height: 10rem;
 		width: 5rem;
 		background-size: contain;
 		background-position: center;

diff --git a/web/src/components/AppBar/index.js b/web/src/components/AppBar/index.js
@@ -502,8 +502,7 @@ class AppBar extends Component {
 										</div>
 									</div>
 								</Link>
-								{constants.broker_enabled
-									? <Link to={`/quick-trade/${pair}`}>
+								<Link to={`/quick-trade/${pair}`}>
 										<div
 											className={classnames('app_bar-quicktrade', 'd-flex', {
 												'quick_trade-active': activePath === 'quick-trade'
@@ -517,9 +516,7 @@ class AppBar extends Component {
 												{STRINGS.QUICK_TRADE}
 											</div>
 										</div>
-									</Link>
-									: null
-								}
+								</Link>
 							</div>							
 							<MenuList
 								selectedMenu={selectedMenu}

diff --git a/web/src/components/CheckTitle/_CheckTitle.scss b/web/src/components/CheckTitle/_CheckTitle.scss
@@ -313,7 +313,7 @@ $notification-size: 1.5rem;
 		}
 	}
 	.mobile_tab-wrapper {
-		color: $dark-button-active;
+		color: #999;
 		border-top: 1px solid $dark-button-active;
 
 		svg {
@@ -328,10 +328,10 @@ $notification-size: 1.5rem;
 			.chat-setting,
 			.audio-setting,
 			.risk-setting {
-				fill: $dark-button-active;
+				fill: #999;
 			}
 			.pending-timer {
-				stroke: $dark-icon-color;
+				stroke: #999;
 			}
 		}
 	}

diff --git a/web/src/components/Sidebar/SidebarBottom.js b/web/src/components/Sidebar/SidebarBottom.js
@@ -26,39 +26,39 @@ export const SidebarBottom = ({ activePath = 'x', pair = '', isLogged, enabledPl
 					iconPath={ICONS.SIDEBAR_ACCOUNT_ACTIVE}
 					active={activePath === 'account'}
 				/>
-				{/* <SidebarButton
+				<SidebarButton
 					path={`/quick-trade/${pair}`}
 					title={STRINGS.QUICK_TRADE}
 					iconPath={activePath === 'quick-trade' ? ICONS.SIDEBAR_QUICK_TRADING_ACTIVE : ICONS.SIDEBAR_QUICK_TRADING_INACTIVE}
 					active={activePath === 'quick-trade'}
-				/> */}
+				/>
 				<SidebarButton
 					path={`/trade/${pair}`}
 					title={STRINGS.PRO_TRADE}
 					iconPath={ICONS.SIDEBAR_TRADING_ACTIVE}
 					active={activePath === 'trade'}
 				/>
-				{enabledPlugins.includes('chat')
+				{/*enabledPlugins.includes('chat')
 					? <SidebarButton
 						path={`/chat`}
 						title={STRINGS.USER_SETTINGS.TITLE_CHAT}
 						iconPath={ICONS.CHAT}
 						active={activePath === 'chat'}
 					/>
 					: <Fragment />
-				}
+				*/}
 				<SidebarButton
 					path="/wallet"
 					title={STRINGS.WALLET_TITLE}
 					iconPath={ICONS.SIDEBAR_WALLET_ACTIVE}
 					active={activePath === 'wallet'}
 				/>
-				<SidebarButton
+				{/*<SidebarButton
 					path={"/home"}
 					title={STRINGS.TRADE_TAB_POSTS}
 					iconPath={ICONS.SIDEBAR_POST_ACTIVE}
 					active={activePath === 'home'}
-				/>
+				/>*/}
 			</div> :
 			<div className="d-flex w-100 p-4">
 				<div className="w-50">

diff --git a/web/src/containers/Trade/Chart.js b/web/src/containers/Trade/Chart.js
@@ -44,7 +44,7 @@ function getStudiesOverrides(theme = 'white', color = {}) {
 class TVChartContainer extends React.PureComponent {
 	static defaultProps = {
 		symbol: 'xht-usdt', // the trading tab we are in should be passed here
-		interval: '60',
+		interval: '1D',
 		containerId: 'tv_chart_container',
 		libraryPath: '/charting_library/',
 		// chartsStorageUrl: 'https://saveload.tradingview.com',

diff --git a/web/src/containers/Trade/components/OrderEntry.js b/web/src/containers/Trade/components/OrderEntry.js
@@ -247,20 +247,20 @@ class OrderEntry extends Component {
 		}
 		if (notification.popup_order_confirmation) {
 			openCheckOrder(order, () => {
-				if (risk.popup_warning && riskySize <= size) {
-					order['order_portfolio_percentage'] = risk.order_portfolio_percentage
-					onRiskyTrade(order, () => {
-						submit(FORM_NAME);
-					});
-				} else {
+				// if (risk.popup_warning && riskySize <= size) {
+				// 	order['order_portfolio_percentage'] = risk.order_portfolio_percentage
+				// 	onRiskyTrade(order, () => {
+				// 		submit(FORM_NAME);
+				// 	});
+				// } else {
 					submit(FORM_NAME);
-				}
+				// }
 			});
 		} else if (risk.popup_warning && riskySize <= size) {
 			order['order_portfolio_percentage'] = risk.order_portfolio_percentage
-			onRiskyTrade(order, () => {
+			// onRiskyTrade(order, () => {
 				submit(FORM_NAME);
-			});
+			// });
 		} else {
 			submit(FORM_NAME);
 		}

diff --git a/web/src/containers/UserSettings/index.js b/web/src/containers/UserSettings/index.js
@@ -258,31 +258,6 @@ class UserSettings extends Component {
 						initialValues={audioFormInitialValues}
 					/>
 				)
-			},
-			{
-				title: isMobile ? (
-					<CustomMobileTabs
-						title={STRINGS.USER_SETTINGS.TITLE_MANAGE_RISK}
-						icon={ICONS.SETTING_RISK_ICON}
-					/>
-				) : (
-					<CustomTabs
-						title={STRINGS.USER_SETTINGS.TITLE_MANAGE_RISK}
-						icon={ICONS.SETTING_RISK_ICON}
-					/>
-				),
-				content: activeTab === 5 && (
-					<RiskForm
-						coins={coins}
-						onAdjustPortfolio={this.onAdjustPortfolio}
-						totalAssets={this.state.totalAssets}
-						onSubmit={(formProps) =>
-							this.onSubmitSettings(formProps, 'risk')
-						}
-						formFields={warningFormValues}
-						initialValues={settings.risk}
-					/>
-				)
 			}
 		];
 

diff --git a/web/src/index.css b/web/src/index.css
@@ -3898,7 +3898,7 @@ table th {
     align-items: center;
     padding: 0 8px; }
   .app_bar .app_bar-icon-logo {
-    height: 5rem;
+    height: 10rem;
     width: 5rem;
     background-size: contain;
     background-position: center;
@@ -4831,7 +4831,7 @@ table th {
       stroke: var(--dark-tab-active); }
 
 .dark-theme .mobile_tab-wrapper {
-  color: var(--dark-button-active);
+  color: #999;
   border-top: 1px solid var(--dark-button-active); }
   .dark-theme .mobile_tab-wrapper svg .verification-email,
   .dark-theme .mobile_tab-wrapper svg .verification-id,
@@ -4844,9 +4844,9 @@ table th {
   .dark-theme .mobile_tab-wrapper svg .chat-setting,
   .dark-theme .mobile_tab-wrapper svg .audio-setting,
   .dark-theme .mobile_tab-wrapper svg .risk-setting {
-    fill: var(--dark-button-active); }
+    fill: #999; }
   .dark-theme .mobile_tab-wrapper svg .pending-timer {
-    stroke: var(--dark-icon-color); }
+    stroke: #999; }
 
 .dark-theme .active_mobile_tab {
   color: var(--dark-font-main-text-color);