lychiyu/frequi_origin
1
0
Fork 0
mirror of https://github.com/freqtrade/frequi.git synced 2024-09-21 18:11:08 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Update forcebuy to forceentry

Browse Source
This commit is contained in:
Matthias 2022-04-08 07:44:28 +02:00
parent 6b5f8e84f7
commit 8f03909119
4 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/ftbot/BotControls.vue
View File

@ -41,7 +41,7 @@
<ForceSellIcon /> <ForceSellIcon />
</button> </button>
<button <button
v-if="botState && botState.forcebuy_enabled" v-if="botState && (botState.force_entry_enable || botState.forcebuy_enabled)"
class="btn btn-secondary btn-sm ml-1" class="btn btn-secondary btn-sm ml-1"
:disabled="!isTrading || !isRunning" :disabled="!isTrading || !isRunning"
title="Force enter - Immediately buy an asset at an optional price. Sells are then handled according to strategy rules." title="Force enter - Immediately buy an asset at an optional price. Sells are then handled according to strategy rules."

3
src/components/ftbot/BotStatus.vue
View File

@ -28,7 +28,8 @@
</p> </p>
<p> <p>
Currently <strong>{{ botState.state }}</strong Currently <strong>{{ botState.state }}</strong
>, <strong>forcebuy: {{ botState.forcebuy_enabled }}</strong> >,
<strong>force entry: {{ botState.force_entry_enable || botState.forcebuy_enabled }}</strong>
</p> </p>
<p> <p>
<strong>{{ botState.dry_run ? 'Dry-Run' : 'Live' }}</strong> <strong>{{ botState.dry_run ? 'Dry-Run' : 'Live' }}</strong>

3
src/types/types.ts
View File

@ -124,7 +124,8 @@ export interface BotState {
unfilledtimeout: UnfilledTimeout; unfilledtimeout: UnfilledTimeout;
order_types: OrderTypes; order_types: OrderTypes;
exchange: string; exchange: string;
forcebuy_enabled: boolean; forcebuy_enabled?: boolean; // Deprecated
force_entry_enable?: boolean;
max_open_trades: number; max_open_trades: number;
minimal_roi: object; minimal_roi: object;
stake_amount: string; stake_amount: string;

10
src/views/Backtesting.vue
View File

@ -272,6 +272,14 @@
> >
</CandleChartContainer> </CandleChartContainer>
</div> </div>
<b-card header="Single trades" class="row mt-2 w-100">
<TradeList
class="row trade-history mt-2 w-100"
:trades="selectedBacktestResult.trades"
:show-filter="true"
:stake-currency="selectedBacktestResult.stake_currency"
/>
</b-card>
</div> </div>
</div> </div>
</template> </template>
@ -289,6 +297,7 @@ import CumProfitChart from '@/components/charts/CumProfitChart.vue';
import TradesLogChart from '@/components/charts/TradesLog.vue'; import TradesLogChart from '@/components/charts/TradesLog.vue';
import PairSummary from '@/components/ftbot/PairSummary.vue'; import PairSummary from '@/components/ftbot/PairSummary.vue';
import TimeframeSelect from '@/components/ftbot/TimeframeSelect.vue'; import TimeframeSelect from '@/components/ftbot/TimeframeSelect.vue';
import TradeList from '@/components/ftbot/TradeList.vue';
import { import {
BacktestPayload, BacktestPayload,
@ -318,6 +327,7 @@ const ftbot = namespace(StoreModules.ftbot);
ValuePair, ValuePair,
PairSummary, PairSummary,
TimeframeSelect, TimeframeSelect,
TradeList,
}, },
}) })
export default class Backtesting extends Vue { export default class Backtesting extends Vue {