diff --git a/src/components/ftbot/BotControls.vue b/src/components/ftbot/BotControls.vue index 04deab86..fc429637 100644 --- a/src/components/ftbot/BotControls.vue +++ b/src/components/ftbot/BotControls.vue @@ -41,7 +41,7 @@ Currently {{ botState.state }}, forcebuy: {{ botState.forcebuy_enabled }} + >, + force entry: {{ botState.force_entry_enable || botState.forcebuy_enabled }} {{ botState.dry_run ? 'Dry-Run' : 'Live' }} diff --git a/src/types/types.ts b/src/types/types.ts index 61e47d55..597f6d2c 100644 --- a/src/types/types.ts +++ b/src/types/types.ts @@ -124,7 +124,8 @@ export interface BotState { unfilledtimeout: UnfilledTimeout; order_types: OrderTypes; exchange: string; - forcebuy_enabled: boolean; + forcebuy_enabled?: boolean; // Deprecated + force_entry_enable?: boolean; max_open_trades: number; minimal_roi: object; stake_amount: string; diff --git a/src/views/Backtesting.vue b/src/views/Backtesting.vue index b545afb4..7185c3bd 100644 --- a/src/views/Backtesting.vue +++ b/src/views/Backtesting.vue @@ -272,6 +272,14 @@ > + + + @@ -289,6 +297,7 @@ import CumProfitChart from '@/components/charts/CumProfitChart.vue'; import TradesLogChart from '@/components/charts/TradesLog.vue'; import PairSummary from '@/components/ftbot/PairSummary.vue'; import TimeframeSelect from '@/components/ftbot/TimeframeSelect.vue'; +import TradeList from '@/components/ftbot/TradeList.vue'; import { BacktestPayload, @@ -318,6 +327,7 @@ const ftbot = namespace(StoreModules.ftbot); ValuePair, PairSummary, TimeframeSelect, + TradeList, }, }) export default class Backtesting extends Vue {
Currently {{ botState.state }}, forcebuy: {{ botState.forcebuy_enabled }} + >, + force entry: {{ botState.force_entry_enable || botState.forcebuy_enabled }}
{{ botState.dry_run ? 'Dry-Run' : 'Live' }} diff --git a/src/types/types.ts b/src/types/types.ts index 61e47d55..597f6d2c 100644 --- a/src/types/types.ts +++ b/src/types/types.ts @@ -124,7 +124,8 @@ export interface BotState { unfilledtimeout: UnfilledTimeout; order_types: OrderTypes; exchange: string; - forcebuy_enabled: boolean; + forcebuy_enabled?: boolean; // Deprecated + force_entry_enable?: boolean; max_open_trades: number; minimal_roi: object; stake_amount: string; diff --git a/src/views/Backtesting.vue b/src/views/Backtesting.vue index b545afb4..7185c3bd 100644 --- a/src/views/Backtesting.vue +++ b/src/views/Backtesting.vue @@ -272,6 +272,14 @@ > + + + @@ -289,6 +297,7 @@ import CumProfitChart from '@/components/charts/CumProfitChart.vue'; import TradesLogChart from '@/components/charts/TradesLog.vue'; import PairSummary from '@/components/ftbot/PairSummary.vue'; import TimeframeSelect from '@/components/ftbot/TimeframeSelect.vue'; +import TradeList from '@/components/ftbot/TradeList.vue'; import { BacktestPayload, @@ -318,6 +327,7 @@ const ftbot = namespace(StoreModules.ftbot); ValuePair, PairSummary, TimeframeSelect, + TradeList, }, }) export default class Backtesting extends Vue {