diff --git a/src/components/HFUI/HFUI.container.js b/src/components/HFUI/HFUI.container.js index ac2d886aa..54a1c1150 100644 --- a/src/components/HFUI/HFUI.container.js +++ b/src/components/HFUI/HFUI.container.js @@ -9,8 +9,6 @@ import { getCurrentMode, getShowAlgoPauseInfoSetting, getThemeSetting, - getIsBetaVersion, - getIsStrategiesTabVisible, SETTINGS_KEYS, getIsFullscreen, } from '../../redux/selectors/ui' @@ -33,7 +31,6 @@ const mapStateToProps = (state = {}) => { settingsShowAlgoPauseInfo: getShowAlgoPauseInfoSetting(state), settingsTheme: getThemeSetting(state), isBfxConnected: getIsBitfinexConnected(state), - showStrategies: getIsBetaVersion(state) || getIsStrategiesTabVisible(state), isFullscreen: getIsFullscreen(state), } } diff --git a/src/components/HFUI/HFUI.js b/src/components/HFUI/HFUI.js index f2879864a..4ee3147f5 100644 --- a/src/components/HFUI/HFUI.js +++ b/src/components/HFUI/HFUI.js @@ -43,7 +43,6 @@ const HFUI = (props) => { settingsShowAlgoPauseInfo, settingsTheme, isBfxConnected, - showStrategies, getPastStrategies, openAppSettingsModal, setApplicationHiddenStatus, @@ -167,12 +166,12 @@ const HFUI = (props) => { render={() => } exact /> - {showStrategies && Routes.strategyEditor && ( - } - /> - )} + ( + } + /> + ) } @@ -212,7 +211,6 @@ HFUI.propTypes = { settingsShowAlgoPauseInfo: PropTypes.bool, settingsTheme: PropTypes.oneOf([THEMES.LIGHT, THEMES.DARK]), isBfxConnected: PropTypes.bool, - showStrategies: PropTypes.bool, openAppSettingsModal: PropTypes.func.isRequired, setApplicationHiddenStatus: PropTypes.func.isRequired, updateFullscreenState: PropTypes.func.isRequired, @@ -224,7 +222,6 @@ HFUI.defaultProps = { settingsShowAlgoPauseInfo: true, settingsTheme: THEMES.DARK, isBfxConnected: false, - showStrategies: false, } export default HFUI diff --git a/src/components/Navbar/Navbar.js b/src/components/Navbar/Navbar.js index 5faad2acf..5c5d8cb34 100644 --- a/src/components/Navbar/Navbar.js +++ b/src/components/Navbar/Navbar.js @@ -18,14 +18,12 @@ import LayoutSettings from './Navbar.LayoutSettings' import APIBanner from './Navbar.APIBanner' import AppSettings from './Navbar.AppSettings' import RCDisclaimer from '../RCDisclaimer/RCDisclaimer' -import Routes, { strategyEditor } from '../../constants/routes' +import Routes from '../../constants/routes' import { isElectronApp } from '../../redux/config' import { getThemeSetting, THEMES, getIsPaperTrading, - getIsBetaVersion, - getIsStrategiesTabVisible, getUIState, } from '../../redux/selectors/ui' import { UI_MODAL_KEYS } from '../../redux/constants/modals' @@ -60,11 +58,9 @@ const Navbar = () => { const { t } = useTranslation() const settingsTheme = useSelector(getThemeSetting) const isPaperTrading = useSelector(getIsPaperTrading) - const isBetaVersion = useSelector(getIsBetaVersion) - const isStrategiesTabVisible = useSelector(getIsStrategiesTabVisible) const showRCDisclaimer = useSelector((state) => getUIState(state, UI_KEYS.isRCDisclaimerShown), ) - const showStrategies = isBetaVersion || isStrategiesTabVisible + const leafOptions = useMemo( () => getLeafDropdownOptions(settingsTheme), [settingsTheme], @@ -84,7 +80,7 @@ const Navbar = () => { />
    {_map(_values(Routes), ({ path, label }) => { - return showStrategies || path !== strategyEditor.path ? ( + return (
  • { })} />
  • - ) : null + ) })}
diff --git a/src/components/OrderForm/OrderForm.container.js b/src/components/OrderForm/OrderForm.container.js index c62a802a5..0543b1910 100644 --- a/src/components/OrderForm/OrderForm.container.js +++ b/src/components/OrderForm/OrderForm.container.js @@ -28,10 +28,8 @@ import { getCurrentMode, getIsPaperTrading, getMaxOrderCounts, - getIsBetaVersion, getUIState, getServicesStatus, - getIsRecurringAOVisible, } from '../../redux/selectors/ui' import { getScope } from '../../util/scope' import { UI_KEYS } from '../../redux/constants/ui_keys' @@ -66,9 +64,6 @@ const mapStateToProps = (state = {}) => { isOrderExecuting: getUIState(state, UI_KEYS.isOrderExecuting, false), aoParams: getAOParams(state), maxOrderCounts: getMaxOrderCounts(state), - isBetaVersion: getIsBetaVersion(state), - showAdvancedAlgos: - getIsRecurringAOVisible(state) || getIsBetaVersion(state), isAlgoWorkerStarted: getServicesStatus(state)?.algoWorker, } } diff --git a/src/components/StrategyEditor/StrategyEditor.container.js b/src/components/StrategyEditor/StrategyEditor.container.js index 49760a874..fc4290a22 100644 --- a/src/components/StrategyEditor/StrategyEditor.container.js +++ b/src/components/StrategyEditor/StrategyEditor.container.js @@ -16,8 +16,6 @@ import { import { getThemeSetting, getIsPaperTrading, - getStrategiesFeatureFlags, - getIsBetaVersion, getCurrentMode, getStrategyExecutionId, getServicesStatus, @@ -35,8 +33,6 @@ const mapStateToProps = (state = {}) => { executionState: getCurrentStrategyExecutionState(state), settingsTheme: getThemeSetting(state), isPaperTrading: getIsPaperTrading(state), - flags: getStrategiesFeatureFlags(state), - isBetaVersion: getIsBetaVersion(state), savedStrategies: getSavedStrategies(state), currentMode: getCurrentMode(state), executionId: getStrategyExecutionId(state), diff --git a/src/components/StrategyEditor/StrategyEditor.js b/src/components/StrategyEditor/StrategyEditor.js index 84d1f2400..db327fd79 100644 --- a/src/components/StrategyEditor/StrategyEditor.js +++ b/src/components/StrategyEditor/StrategyEditor.js @@ -83,8 +83,6 @@ const StrategyEditor = (props) => { isPaperTrading, dsExecuteBacktest, showError, - flags, - isBetaVersion, executionState, sectionErrors, savedStrategies, @@ -663,23 +661,22 @@ const StrategyEditor = (props) => { onRemoveStrategy={onRemoveStrategy} isWideSidebar={isWideSidebar} > - {(isBetaVersion || flags?.live_execution) && ( - - )} - {isPaperTrading && (isBetaVersion || flags?.backtest) && ( + + + {isPaperTrading ? ( { onCancelProcess={onCancelProcess} {...props} /> - )} - {(isBetaVersion || flags?.docs) && !isPaperTrading && ( - - )} - {(isBetaVersion || flags?.live_execution) && ( -
- )} + ) + : ( + + )} +
_get(state, `${path}.featureFlags`) -export const getStrategiesFeatureFlags = createSelector( - getFeatureFlags, - (allFlags) => allFlags?.strategy_editor, -) - -export const getIsStrategiesLiveExecVisible = createSelector( - getStrategiesFeatureFlags, - (strategiesFlags) => strategiesFlags?.live_execution, -) - -export const getIsStrategiesTabVisible = createSelector( - getStrategiesFeatureFlags, - (strategiesFlags) => _some(strategiesFlags, (flag) => flag === true), -) - export const getIsRecurringAOVisible = createSelector( getFeatureFlags, (flags) => flags?.recurring_AOs,