From f6c0e3d0b6503fd81657170f08bd43565d766218 Mon Sep 17 00:00:00 2001
From: Matthias <xmatthias@outlook.com>
Date: Sun, 4 Jun 2023 15:45:49 +0200
Subject: [PATCH] Improve exchange Select behavior

---
 src/components/ftbot/ExchangeSelect.vue | 39 ++++++++++++++++---------
 src/stores/pairlistConfig.ts            |  9 ++++--
 src/types/types.ts                      |  2 +-
 3 files changed, 33 insertions(+), 17 deletions(-)

diff --git a/src/components/ftbot/ExchangeSelect.vue b/src/components/ftbot/ExchangeSelect.vue
index 48679631..5a8c806d 100644
--- a/src/components/ftbot/ExchangeSelect.vue
+++ b/src/components/ftbot/ExchangeSelect.vue
@@ -19,7 +19,7 @@
 
 <script setup lang="ts">
 import { useBotStore } from '@/stores/ftbotwrapper';
-import { computed, onMounted } from 'vue';
+import { computed, onMounted, watch } from 'vue';
 import { ExchangeSelection } from '@/types';
 
 const exchangeModel = defineModel({
@@ -44,20 +44,33 @@ const exchangeList = computed(() => {
     .map((e) => e.name);
 });
 
-const tradeModes = computed<Record<string, unknown>[]>(() => {
-  const val = botStore.activeBot.exchangeList
-    .find((ex) => ex.name === exchangeModel.value.exchange)
-    ?.trade_modes.map((tm) => {
-      return (
-        {
-          text: `${tm.margin_mode} ${tm.trading_mode}`,
-          value: tm,
-        } ?? []
-      );
-    });
-  return (val ?? []) as Record<string, unknown>[];
+const tradeModesTyped = computed(() => {
+  const val = botStore.activeBot.exchangeList.find(
+    (ex) => ex.name === exchangeModel.value.exchange,
+  )?.trade_modes;
+  return val ?? [];
 });
 
+const tradeModes = computed<Record<string, unknown>[]>(() => {
+  return tradeModesTyped.value.map((tm) => {
+    return (
+      {
+        text: `${tm.margin_mode} ${tm.trading_mode}`,
+        value: tm,
+      } ?? []
+    );
+  }) as Record<string, unknown>[];
+});
+
+watch(
+  () => exchangeModel.value.exchange,
+  () => {
+    if (tradeModesTyped.value.length < 2) {
+      exchangeModel.value.trade_mode = tradeModesTyped.value[0];
+    }
+  },
+);
+
 onMounted(() => {
   if (botStore.activeBot.exchangeList.length === 0) {
     botStore.activeBot.getExchangeList();
diff --git a/src/stores/pairlistConfig.ts b/src/stores/pairlistConfig.ts
index c93a7a5b..d9935bc2 100644
--- a/src/stores/pairlistConfig.ts
+++ b/src/stores/pairlistConfig.ts
@@ -26,10 +26,13 @@ export const usePairlistConfigStore = defineStore(
     const blacklist = ref<string[]>([]);
     const customExchange = ref<boolean>(false);
     const selectedExchange = ref<ExchangeSelection>({
-      exchange: '',
+      exchange: botStore.activeBot?.botState.exchange ?? '',
       trade_mode: {
-        trading_mode: TradingMode.SPOT,
-        margin_mode: MarginMode.NONE,
+        trading_mode: botStore.activeBot?.botState.trading_mode ?? TradingMode.SPOT,
+        margin_mode:
+          botStore.activeBot?.botState.trading_mode === TradingMode.FUTURES
+            ? MarginMode.ISOLATED
+            : MarginMode.NONE,
       },
     });
 
diff --git a/src/types/types.ts b/src/types/types.ts
index 64c13465..887f62b1 100644
--- a/src/types/types.ts
+++ b/src/types/types.ts
@@ -81,7 +81,7 @@ export enum TradingMode {
 }
 
 export enum MarginMode {
-  NONE = 'none',
+  NONE = '',
   ISOLATED = 'isolated',
   // CROSS = 'cross',
 }