From 8f0390911941ab3019c5fcab493ed20a4e842e8c Mon Sep 17 00:00:00 2001
From: Matthias <xmatthias@outlook.com>
Date: Fri, 8 Apr 2022 07:44:28 +0200
Subject: [PATCH] Update forcebuy to forceentry

---
 src/components/ftbot/BotControls.vue |  2 +-
 src/components/ftbot/BotStatus.vue   |  3 ++-
 src/types/types.ts                   |  3 ++-
 src/views/Backtesting.vue            | 10 ++++++++++
 4 files changed, 15 insertions(+), 3 deletions(-)

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 @@
       <ForceSellIcon />
     </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"
       :disabled="!isTrading || !isRunning"
       title="Force enter - Immediately buy an asset at an optional price. Sells are then handled according to strategy rules."
diff --git a/src/components/ftbot/BotStatus.vue b/src/components/ftbot/BotStatus.vue
index 039f4f30..0894a4c1 100644
--- a/src/components/ftbot/BotStatus.vue
+++ b/src/components/ftbot/BotStatus.vue
@@ -28,7 +28,8 @@
     </p>
     <p>
       Currently <strong>{{ botState.state }}</strong
-      >, <strong>forcebuy: {{ botState.forcebuy_enabled }}</strong>
+      >,
+      <strong>force entry: {{ botState.force_entry_enable || botState.forcebuy_enabled }}</strong>
     </p>
     <p>
       <strong>{{ botState.dry_run ? 'Dry-Run' : 'Live' }}</strong>
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 @@
         >
         </CandleChartContainer>
       </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>
 </template>
@@ -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 {