Update and fixx

qortal-ui-core/language/de.json

@@ -35,7 +35,8 @@
       "groupmanagement":"GRUPPENMANAGEMENT",
       "puzzles":"RÄTSEL",
       "nodemanagement":"KNOTENVERWALTUNG",
-      "trading":"HANDELN"
+      "trading":"HANDELN",
+      "groups":"GRUPPEN"
    },
    "login":{
       "login":"Einloggen",

qortal-ui-core/language/es.json

@@ -35,7 +35,8 @@
       "groupmanagement":"GESTIÓN DE GRUPO",
       "puzzles":"ROMPECABEZAS",
       "nodemanagement":"GESTIÓN DE NODO",
-      "trading":"COMERCIO"
+      "trading":"COMERCIO",
+      "groups":"GRUPOS"
    },
    "login":{
       "login":"Iniciar sesión",

qortal-ui-core/language/fr.json

@@ -35,7 +35,8 @@
       "groupmanagement":"GESTION DE GROUPES",
       "puzzles":"PUZZLES",
       "nodemanagement":"GESTION DE NOEUDS",
-      "trading":"COMMERCE"
+      "trading":"COMMERCE",
+      "groups":"GROUPES"
    },
    "login":{
       "login":"Connexion",

qortal-ui-core/language/hindi.json

@@ -36,7 +36,8 @@
       "groupmanagement":"समूह प्रबंधन",
       "puzzles":"पहेलि",
       "nodemanagement":"नोड प्रबंधन",
-      "trading":"व्यापार"
+      "trading":"व्यापार",
+      "groups":"समूह"
    },
    "login":{
       "login":"लॉग इन करें",

qortal-ui-core/language/hr.json

@@ -35,7 +35,8 @@
       "groupmanagement":"UPRAVLJANJE GRUPAMA",
       "puzzles":"ZAGONETKE",
       "nodemanagement":"UPRAVLJANJE ČVOROVIMA",
-      "trading":"TRGOVANJE"
+      "trading":"TRGOVANJE",
+      "groups":"GRUPE"
    },
    "login":{
       "login":"Prijavi se",

qortal-ui-core/language/hu.json

@@ -35,7 +35,8 @@
       "groupmanagement":"CSOPORTKEZELÉS",
       "puzzles":"REJTVÉNYEK",
       "nodemanagement":"CSOMÓPONTKEZELÉS",
-      "trading":"KERESKEDÉS"
+      "trading":"KERESKEDÉS",
+      "groups":"CSOPORTOK"
    },
    "login":{
       "login":"Bejelentkezés",

qortal-ui-core/language/it.json

@@ -35,7 +35,8 @@
       "groupmanagement":"GESTIONE DEI GRUPPI",
       "puzzles":"PUZZLES",
       "nodemanagement":"GESTIONE DEI NODI",
-      "trading":"COMMERCIO"
+      "trading":"COMMERCIO",
+      "groups":"GRUPPI"
    },
    "login":{
       "login":"Login",

qortal-ui-core/language/ko.json

@@ -35,7 +35,8 @@
       "groupmanagement":"그룹 관리",
       "puzzles":"퍼즐",
       "nodemanagement":"노드 관리",
-      "trading":"무역"
+      "trading":"무역",
+      "groups":"여러 떼"
    },
    "login":{
       "login":"로그인",

qortal-ui-core/language/no.json

@@ -35,7 +35,8 @@
       "groupmanagement":"GRUPPEADMINISTRASJON",
       "puzzles":"PUZZLES",
       "nodemanagement":"NODEADMINISTRASJON",
-      "trading":"HANDEL"
+      "trading":"HANDEL",
+      "groups":"GRUPPER"
    },
    "login":{
       "login":"Logg på",

qortal-ui-core/language/pl.json

@@ -35,7 +35,8 @@
       "groupmanagement":"ZARZĄDZANIE GRUPAMI",
       "puzzles":"PUZZLE",
       "nodemanagement":"ZARZĄDZANIE WĘZŁAMI",
-      "trading":"HANDLOWY"
+      "trading":"HANDLOWY",
+      "groups":"GRUPY"
    },
    "login":{
       "login":"Zaloguj się",

qortal-ui-core/language/pt.json

@@ -35,7 +35,8 @@
       "groupmanagement":"GESTÃO DE GRUPOS",
       "puzzles":"ENIGMAS",
       "nodemanagement":"GERENCIAMENTO DO NÓDULO",
-      "trading":"NEGOCIAÇÃO"
+      "trading":"NEGOCIAÇÃO",
+      "groups":"GRUPOS"
    },
    "login":{
       "login":"Login",

qortal-ui-core/language/ro.json

@@ -35,7 +35,8 @@
       "groupmanagement":"GESTIONARE GRUP",
       "puzzles":"PUZZLE-URI",
       "nodemanagement":"GESTIONARE NOD",
-      "trading":"COMERCIAL"
+      "trading":"COMERCIAL",
+      "groups":"GRUPURI"
    },
    "login":{
       "login":"Login",

qortal-ui-core/language/rs.json

@@ -35,7 +35,8 @@
       "groupmanagement":"MENADŽMENT GRUPA",
       "puzzles":"SLAGALICE",
       "nodemanagement":"MENADŽMENT ČVORIŠTA",
-      "trading":"TRADING"
+      "trading":"TRADING",
+      "groups":"GRUPE"
    },
    "login":{
       "login":"Prijava",

qortal-ui-core/language/ru.json

@@ -35,7 +35,8 @@
       "groupmanagement":"УПРАВЛЕНИЕ ГРУППАМИ",
       "puzzles":"ГОЛОВОЛОМКИ",
       "nodemanagement":"УПРАВЛЕНИЕ УЗЛАМИ",
-      "trading":"ТОРГОВЛЯ"
+      "trading":"ТОРГОВЛЯ",
+      "groups":"ГРУППЫ"
    },
    "login":{
       "login":"Войти",

qortal-ui-core/language/us.json

@@ -35,7 +35,8 @@
       "groupmanagement":"GROUP MANAGEMENT",
       "puzzles":"PUZZLES",
       "nodemanagement":"NODE MANAGEMENT",
-      "trading":"TRADING"
+      "trading":"TRADING",
+      "groups":"GROUPS"
    },
    "login":{
       "login":"Login",

qortal-ui-core/language/zhc.json

@@ -35,7 +35,8 @@
       "groupmanagement":"群组管理",
       "puzzles":"益智游戏",
       "nodemanagement":"节点管理",
-      "trading":"贸易"
+      "trading":"贸易",
+      "groups":"团体"
    },
    "login":{
       "login":"登入",

qortal-ui-core/language/zht.json

@@ -35,7 +35,8 @@
       "groupmanagement":"群組管理",
       "puzzles":"益智遊戲",
       "nodemanagement":"節點管理",
-      "trading":"貿易"
+      "trading":"貿易",
+      "groups":"團體"
    },
    "login":{
       "login":"登入",

qortal-ui-core/src/components/app-view.js

@@ -480,17 +480,11 @@ class AppView extends connect(store)(LitElement) {
 
         window.addEventListener('storage', async () => {
             this.tradeBotBtcBook = JSON.parse(localStorage.getItem(this.botBtcWallet) || "[]")
-            await appDelay(500)
             this.tradeBotLtcBook = JSON.parse(localStorage.getItem(this.botLtcWallet) || "[]")
-            await appDelay(500)
             this.tradeBotDogeBook = JSON.parse(localStorage.getItem(this.botDogeWallet) || "[]")
-            await appDelay(500)
             this.tradeBotDgbBook = JSON.parse(localStorage.getItem(this.botDgbWallet) || "[]")
-            await appDelay(500)
             this.tradeBotRvnBook = JSON.parse(localStorage.getItem(this.botRvnWallet) || "[]")
-            await appDelay(500)
             this.tradeBotArrrBook = JSON.parse(localStorage.getItem(this.botArrrWallet) || "[]")
-            await appDelay(500)
         })
 
         this.renderBalances()
@@ -523,7 +517,7 @@ class AppView extends connect(store)(LitElement) {
                     }
                 }).filter(item => !!item)
 
-                await this.updateBtcWalletBalance()
+                await appDelay(1000)
                 filterMyBotPriceTradesBTC()
                 setTimeout(getOpenTradesBTC, 150000)
             }
@@ -602,10 +596,10 @@ class AppView extends connect(store)(LitElement) {
 
                 this.tradeBotBtcBook = JSON.parse(localStorage.getItem(this.botBtcWallet) || "[]")
 
-                await appDelay(1000)
-
                 this.botBtcBuyAtAddress = tradebtcataddress
 
+                await appDelay(1000)
+
                 this.buyBtcAction()
 
                 if (this.isEmptyArray(this.tradeBotBtcBook) === true) {
@@ -623,7 +617,6 @@ class AppView extends connect(store)(LitElement) {
                 if (this.isEmptyArray(this.tradeBotBtcBook) === true) {
                     return
                 } else {
-                    await this.updateBtcWalletBalance()
                     const checkBotBtcFunds = this.round(parseFloat(this.tradeBotBtcBook[0].botBtcQortAmount) * parseFloat(this.tradeBotBtcBook[0].botBtcPrice))
                     const myBotBtcFunds = this.round(parseFloat(this.btcWalletBalance))
 
@@ -664,7 +657,7 @@ class AppView extends connect(store)(LitElement) {
                     }
                 }).filter(item => !!item)
 
-                await this.updateLtcWalletBalance()
+                await appDelay(1000)
                 filterMyBotPriceTradesLTC()
                 setTimeout(getOpenTradesLTC, 150000)
             }
@@ -743,10 +736,10 @@ class AppView extends connect(store)(LitElement) {
 
                 this.tradeBotLtcBook = JSON.parse(localStorage.getItem(this.botLtcWallet) || "[]")
 
-                await appDelay(1000)
-
                 this.botLtcBuyAtAddress = tradeltcataddress
 
+                await appDelay(1000)
+
                 this.buyLtcAction()
 
                 if (this.isEmptyArray(this.tradeBotLtcBook) === true) {
@@ -764,7 +757,6 @@ class AppView extends connect(store)(LitElement) {
                 if (this.isEmptyArray(this.tradeBotLtcBook) === true) {
                     return
                 } else {
-                    await this.updateLtcWalletBalance()
                     const checkBotLtcFunds = this.round(parseFloat(this.tradeBotLtcBook[0].botLtcQortAmount) * parseFloat(this.tradeBotLtcBook[0].botLtcPrice))
                     const myBotLtcFunds = this.round(parseFloat(this.ltcWalletBalance))
 
@@ -805,7 +797,7 @@ class AppView extends connect(store)(LitElement) {
                     }
                 }).filter(item => !!item)
 
-                await this.updateDogeWalletBalance()
+                await appDelay(1000)
                 filterMyBotPriceTradesDOGE()
                 setTimeout(getOpenTradesDOGE, 150000)
             }
@@ -884,10 +876,10 @@ class AppView extends connect(store)(LitElement) {
 
                 this.tradeBotDogeBook = JSON.parse(localStorage.getItem(this.botDogeWallet) || "[]")
 
-                await appDelay(1000)
-
                 this.botDogeBuyAtAddress = tradedogeataddress
 
+                await appDelay(1000)
+
                 this.buyDogeAction()
 
                 if (this.isEmptyArray(this.tradeBotDogeBook) === true) {
@@ -905,7 +897,6 @@ class AppView extends connect(store)(LitElement) {
                 if (this.isEmptyArray(this.tradeBotDogeBook) === true) {
                     return
                 } else {
-                    await this.updateDogeWalletBalance()
                     const checkBotDogeFunds = this.round(parseFloat(this.tradeBotDogeBook[0].botDogeQortAmount) * parseFloat(this.tradeBotDogeBook[0].botDogePrice))
                     const myBotDogeFunds = this.round(parseFloat(this.dogeWalletBalance))
 
@@ -946,6 +937,8 @@ class AppView extends connect(store)(LitElement) {
                     }
                 }).filter(item => !!item)
 
+                await appDelay(1000)
+                filterMyBotPriceTradesDGB()
                 setTimeout(getOpenTradesDGB, 150000)
             }
         }
@@ -1023,10 +1016,10 @@ class AppView extends connect(store)(LitElement) {
 
                 this.tradeBotDgbBook = JSON.parse(localStorage.getItem(this.botDgbWallet) || "[]")
 
-                await appDelay(1000)
-
                 this.botDgbBuyAtAddress = tradedgbataddress
 
+                await appDelay(1000)
+
                 this.buyDgbAction()
 
                 if (this.isEmptyArray(this.tradeBotDgbBook) === true) {
@@ -1044,7 +1037,6 @@ class AppView extends connect(store)(LitElement) {
                 if (this.isEmptyArray(this.tradeBotDgbBook) === true) {
                     return
                 } else {
-                    await this.updateDgbWalletBalance()
                     const checkBotDgbFunds = this.round(parseFloat(this.tradeBotDgbBook[0].botDgbQortAmount) * parseFloat(this.tradeBotDgbBook[0].botDgbPrice))
                     const myBotDgbFunds = this.round(parseFloat(this.dgbWalletBalance))
 
@@ -1085,6 +1077,8 @@ class AppView extends connect(store)(LitElement) {
                     }
                 }).filter(item => !!item)
 
+                await appDelay(1000)
+                filterMyBotPriceTradesRVN()
                 setTimeout(getOpenTradesRVN, 150000)
             }
         }
@@ -1162,10 +1156,10 @@ class AppView extends connect(store)(LitElement) {
 
                 this.tradeBotRvnBook = JSON.parse(localStorage.getItem(this.botRvnWallet) || "[]")
 
-                await appDelay(1000)
-
                 this.botRvnBuyAtAddress = tradervnataddress
 
+                await appDelay(1000)
+
                 this.buyRvnAction()
 
                 if (this.isEmptyArray(this.tradeBotRvnBook) === true) {
@@ -1183,7 +1177,6 @@ class AppView extends connect(store)(LitElement) {
                 if (this.isEmptyArray(this.tradeBotRvnBook) === true) {
                     return
                 } else {
-                    await this.updateRvnWalletBalance()
                     const checkBotRvnFunds = this.round(parseFloat(this.tradeBotRvnBook[0].botRvnQortAmount) * parseFloat(this.tradeBotRvnBook[0].botRvnPrice))
                     const myBotRvnFunds = this.round(parseFloat(this.rvnWalletBalance))
 
@@ -1224,6 +1217,8 @@ class AppView extends connect(store)(LitElement) {
                     }
                 }).filter(item => !!item)
 
+                await appDelay(1000)
+                filterMyBotPriceTradesARRR()
                 setTimeout(getOpenTradesARRR, 150000)
             }
         }
@@ -1301,10 +1296,10 @@ class AppView extends connect(store)(LitElement) {
 
                 this.tradeBotArrrBook = JSON.parse(localStorage.getItem(this.botArrrWallet) || "[]")
 
-                await appDelay(1000)
-
                 this.botArrrBuyAtAddress = tradearrrataddress
 
+                await appDelay(1000)
+
                 this.buyArrrAction()
 
                 if (this.isEmptyArray(this.tradeBotArrrBook) === true) {
@@ -1322,7 +1317,6 @@ class AppView extends connect(store)(LitElement) {
                 if (this.isEmptyArray(this.tradeBotArrrBook) === true) {
                     return
                 } else {
-                    await this.updateArrrWalletBalance()
                     const checkBotArrrFunds = this.round(parseFloat(this.tradeBotArrrBook[0].botArrrQortAmount) * parseFloat(this.tradeBotArrrBook[0].botArrrPrice))
                     const myBotArrrFunds = this.round(parseFloat(this.arrrWalletBalance))
 

qortal-ui-core/src/components/sidenav-menu.js

@@ -195,6 +195,18 @@ class SidenavMenu extends connect(store)(LitElement) {
 				>
 					<vaadin-icon icon="vaadin:desktop" slot="icon" ></vaadin-icon>
 				</side-menu-item>
+				<side-menu-item
+					label="${translate('sidemenu.groups')}"
+					expanded
+				>
+					<vaadin-icon icon="vaadin:group" slot="icon"></vaadin-icon>
+					<side-menu-item
+						label="${translate('sidemenu.groupmanagement')}"
+						href="/app/group-management"
+					>
+						<vaadin-icon icon="vaadin:group" slot="icon"></vaadin-icon>
+					</side-menu-item>
+				</side-menu-item>
 				<side-menu-item
 					label="${translate('sidemenu.puzzles')}"
 					href="/app/puzzles"
@@ -212,12 +224,6 @@ class SidenavMenu extends connect(store)(LitElement) {
 					>
 						<vaadin-icon icon="vaadin:database" slot="icon"></vaadin-icon>
 					</side-menu-item>
-					<side-menu-item
-						label="${translate('sidemenu.groupmanagement')}"
-						href="/app/group-management"
-					>
-						<vaadin-icon icon="vaadin:group" slot="icon"></vaadin-icon>
-					</side-menu-item>
 					${this.renderNodeManagement()}
 				</side-menu-item>
 				<div>

qortal-ui-plugins/plugins/core/main.src.js

@@ -53,29 +53,11 @@ parentEpml.ready().then(() => {
 			parent: false,
 		},
 		{
-			url: 'trade-bot-btc',
+			url: 'trade-bot-portal',
 			domain: 'core',
-			page: 'trade-bot/trade-bot-btc/index.html',
+			page: 'trade-bot/index.html',
-			title: 'Auto Buy With BTC',
+			title: 'Auto Buy',
-			icon: 'vaadin:automation',
+			icon: 'vaadin:calc-book',
-			menus: [],
-			parent: false,
-		},
-		{
-			url: 'trade-bot-ltc',
-			domain: 'core',
-			page: 'trade-bot/trade-bot-ltc/index.html',
-			title: 'Auto Buy With LTC',
-			icon: 'vaadin:automation',
-			menus: [],
-			parent: false,
-		},
-		{
-			url: 'trade-bot-doge',
-			domain: 'core',
-			page: 'trade-bot/trade-bot-doge/index.html',
-			title: 'Auto Buy With DOGE',
-			icon: 'vaadin:automation',
 			menus: [],
 			parent: false,
 		},

qortal-ui-plugins/plugins/core/trade-bot/trade-bot-portal.src.js

@@ -799,6 +799,12 @@ class TradeBotPortal extends LitElement {
         this.displayTradeAddress = ''
         this.displayTradeLevel = ''
         this.displayTradeBalance = ''
+        this.tradeBotBtcBook = []
+        this.tradeBotLtcBook = []
+        this.tradeBotDogeBook = []
+        this.tradeBotDgbBook = []
+        this.tradeBotRvnBook = []
+        this.tradeBotArrrBook = []
     }
 
     openTradesTemplate() {
@@ -2004,6 +2010,12 @@ class TradeBotPortal extends LitElement {
         )
 
         window.addEventListener('storage', () => {
+            this.tradeBotBtcBook = JSON.parse(localStorage.getItem(this.btcWallet) || "[]")
+            this.tradeBotLtcBook = JSON.parse(localStorage.getItem(this.ltcWallet) || "[]")
+            this.tradeBotDogeBook = JSON.parse(localStorage.getItem(this.dogeWallet) || "[]")
+            this.tradeBotDgbBook = JSON.parse(localStorage.getItem(this.dgbWallet) || "[]")
+            this.tradeBotRvnBook = JSON.parse(localStorage.getItem(this.rvnWallet) || "[]")
+            this.tradeBotArrrBook = JSON.parse(localStorage.getItem(this.arrrWallet) || "[]")
             const checkLanguage = localStorage.getItem('qortalLanguage')
             const checkTheme = localStorage.getItem('qortalTheme')
 
@@ -2011,12 +2023,6 @@ class TradeBotPortal extends LitElement {
 
             this.theme = (checkTheme === 'dark') ? 'dark' : 'light'
             document.querySelector('html').setAttribute('theme', this.theme)
-            this.tradeBotBtcBook = JSON.parse(localStorage.getItem(this.btcWallet) || "[]")
-            this.tradeBotLtcBook = JSON.parse(localStorage.getItem(this.ltcWallet) || "[]")
-            this.tradeBotDogeBook = JSON.parse(localStorage.getItem(this.dogeWallet) || "[]")
-            this.tradeBotDgbBook = JSON.parse(localStorage.getItem(this.dgbWallet) || "[]")
-            this.tradeBotRvnBook = JSON.parse(localStorage.getItem(this.rvnWallet) || "[]")
-            this.tradeBotArrrBook = JSON.parse(localStorage.getItem(this.arrrWallet) || "[]")
         })
 
         window.onkeyup = (e) => {