diff --git a/web/src/components/AppBar/_AppBar.scss b/web/src/components/AppBar/_AppBar.scss index 2698bf938a..adf86c4ae0 100644 --- 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 index 02be044b73..e8d601cfca 100644 --- a/web/src/components/AppBar/index.js +++ b/web/src/components/AppBar/index.js @@ -502,8 +502,7 @@ class AppBar extends Component { - {constants.broker_enabled - ? +
- - : null - } + - {/* */} + /> - {enabledPlugins.includes('chat') + {/*enabledPlugins.includes('chat') ? : - } + */} - + />*/} :
diff --git a/web/src/containers/Trade/Chart.js b/web/src/containers/Trade/Chart.js index 619df66482..be162763b8 100644 --- 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 index ad82570c2f..b18e811696 100644 --- 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 index 2bb62e6f57..81188e9f6c 100644 --- 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 ? ( - - ) : ( - - ), - content: activeTab === 5 && ( - - this.onSubmitSettings(formProps, 'risk') - } - formFields={warningFormValues} - initialValues={settings.risk} - /> - ) } ]; diff --git a/web/src/index.css b/web/src/index.css index 4f1a573173..8c2ddab8ed 100644 --- 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);