From 442ea2e3663d62fd17bfbcf9c34551ebc5ddad0c Mon Sep 17 00:00:00 2001
From: AlphaX-Projects <77661270+AlphaX-Projects@users.noreply.github.com>
Date: Tue, 15 Nov 2022 16:51:02 +0100
Subject: [PATCH] user can set default price for sell trade by clicking on
button (feat. by irohdw)
---
qortal-ui-core/language/de.json | 3 +-
qortal-ui-core/language/es.json | 3 +-
qortal-ui-core/language/fr.json | 3 +-
qortal-ui-core/language/hindi.json | 3 +-
qortal-ui-core/language/hr.json | 3 +-
qortal-ui-core/language/hu.json | 3 +-
qortal-ui-core/language/it.json | 3 +-
qortal-ui-core/language/ko.json | 3 +-
qortal-ui-core/language/no.json | 3 +-
qortal-ui-core/language/pl.json | 3 +-
qortal-ui-core/language/pt.json | 3 +-
qortal-ui-core/language/ro.json | 3 +-
qortal-ui-core/language/rs.json | 3 +-
qortal-ui-core/language/ru.json | 3 +-
qortal-ui-core/language/us.json | 3 +-
qortal-ui-core/language/zhc.json | 3 +-
qortal-ui-core/language/zht.json | 3 +-
.../core/trade-portal/trade-portal.src.js | 65 ++++++++++++-------
18 files changed, 75 insertions(+), 41 deletions(-)
diff --git a/qortal-ui-core/language/de.json b/qortal-ui-core/language/de.json
index 64b4dba6..ebbe5c20 100644
--- a/qortal-ui-core/language/de.json
+++ b/qortal-ui-core/language/de.json
@@ -321,7 +321,8 @@
"tchange43":"MEINE KAUFGESCHICHTE",
"tchange44":"Automatischer Kaufauftrag erfolgreich hinzugefügt!",
"tchange45":"AUTO KAUFEN MIT",
- "tchange46":"AUTOKAUF"
+ "tchange46":"AUTOKAUF",
+ "tchange47":"Verkaufe für diesen Preis"
},
"rewardsharepage":{
"rchange1":"Belohnungsanteile",
diff --git a/qortal-ui-core/language/es.json b/qortal-ui-core/language/es.json
index e77ff9ce..4bc2e336 100644
--- a/qortal-ui-core/language/es.json
+++ b/qortal-ui-core/language/es.json
@@ -321,7 +321,8 @@
"tchange43":"MI HISTORIAL DE COMPRAS",
"tchange44":"Orden de compra automática agregada con éxito!",
"tchange45":"AUTO COMPRAR CON",
- "tchange46":"COMPRA AUTOMÁTICA"
+ "tchange46":"COMPRA AUTOMÁTICA",
+ "tchange47":"Vender por este precio"
},
"rewardsharepage":{
"rchange1":"Rewardshares",
diff --git a/qortal-ui-core/language/fr.json b/qortal-ui-core/language/fr.json
index 51926f65..728bc3f1 100644
--- a/qortal-ui-core/language/fr.json
+++ b/qortal-ui-core/language/fr.json
@@ -321,7 +321,8 @@
"tchange43":"MON HISTORIQUE D'ACHAT",
"tchange44":"Commande d'achat automatique ajoutée avec succès !",
"tchange45":"ACHAT AUTO AVEC",
- "tchange46":"ACHAT AUTOMATIQUE"
+ "tchange46":"ACHAT AUTOMATIQUE",
+ "tchange47":"Vendre à ce prix"
},
"rewardsharepage":{
"rchange1":"Récompenses",
diff --git a/qortal-ui-core/language/hindi.json b/qortal-ui-core/language/hindi.json
index ecb68c14..2a2feb50 100644
--- a/qortal-ui-core/language/hindi.json
+++ b/qortal-ui-core/language/hindi.json
@@ -322,7 +322,8 @@
"tchange43":"मेरा इतिहास खरीदें",
"tchange44":"स्वतः खरीद आदेश सफलतापूर्वक जोड़ा गया!",
"tchange45":"ऑटो के साथ खरीदें",
- "tchange46":"ऑटो खरीदें"
+ "tchange46":"ऑटो खरीदें",
+ "tchange47":"इस कीमत पर बेचें"
},
"rewardsharepage":{
"rchange1":"रिवॉर्डशेयर",
diff --git a/qortal-ui-core/language/hr.json b/qortal-ui-core/language/hr.json
index 2b75d2c0..d83f334d 100644
--- a/qortal-ui-core/language/hr.json
+++ b/qortal-ui-core/language/hr.json
@@ -321,7 +321,8 @@
"tchange43":"MOJA POVIJEST KUPNJE",
"tchange44":"Uspješno dodana automatska narudžba za kupnju!",
"tchange45":"AUTO KUPITE SA",
- "tchange46":"AUTO OTKUP"
+ "tchange46":"AUTO OTKUP",
+ "tchange47":"Prodaj za ovu cijenu"
},
"rewardsharepage":{
"rchange1":"Nagradni udio (Rewardshares)",
diff --git a/qortal-ui-core/language/hu.json b/qortal-ui-core/language/hu.json
index 6d1b137a..a71fd60e 100644
--- a/qortal-ui-core/language/hu.json
+++ b/qortal-ui-core/language/hu.json
@@ -321,7 +321,8 @@
"tchange43":"VÁSÁRLÁSI TÖRTÉNETEM",
"tchange44":"Az automatikus vásárlási rendelés sikeresen hozzáadva!",
"tchange45":"AUTOMATIKUS VÁSÁRLÁS",
- "tchange46":"AUTOMATIKUS VÁSÁRLÁS"
+ "tchange46":"AUTOMATIKUS VÁSÁRLÁS",
+ "tchange47":"Eladni ezen az áron"
},
"rewardsharepage":{
"rchange1":"Jutalommegosztások",
diff --git a/qortal-ui-core/language/it.json b/qortal-ui-core/language/it.json
index 05533904..6c1acd65 100644
--- a/qortal-ui-core/language/it.json
+++ b/qortal-ui-core/language/it.json
@@ -321,7 +321,8 @@
"tchange43":"LA MIA STORIA DI ACQUISTO",
"tchange44":"Ordine di acquisto automatico aggiunto con successo!",
"tchange45":"ACQUISTA AUTO CON",
- "tchange46":"ACQUISTO AUTO"
+ "tchange46":"ACQUISTO AUTO",
+ "tchange47":"Vendi a questo prezzo"
},
"rewardsharepage":{
"rchange1":"Quote di ricompensa",
diff --git a/qortal-ui-core/language/ko.json b/qortal-ui-core/language/ko.json
index d6f69bd8..791fac74 100644
--- a/qortal-ui-core/language/ko.json
+++ b/qortal-ui-core/language/ko.json
@@ -321,7 +321,8 @@
"tchange43":"내 구매 내역",
"tchange44":"자동 구매 주문을 성공적으로 추가했습니다!",
"tchange45":"자동 구매",
- "tchange46":"자동 구매"
+ "tchange46":"자동 구매",
+ "tchange47":"이 가격에 팔아요"
},
"rewardsharepage":{
"rchange1":"보상 공유",
diff --git a/qortal-ui-core/language/no.json b/qortal-ui-core/language/no.json
index 3c67e75a..39d3da2c 100644
--- a/qortal-ui-core/language/no.json
+++ b/qortal-ui-core/language/no.json
@@ -321,7 +321,8 @@
"tchange43":"MIN KJØPSHISTORIE",
"tchange44":"Autokjøpsordre er lagt til!",
"tchange45":"AUTOKJØP MED",
- "tchange46":"AUTOKJØP"
+ "tchange46":"AUTOKJØP",
+ "tchange47":"Selges for denne prisen"
},
"rewardsharepage":{
"rchange1":"Belønningsdel",
diff --git a/qortal-ui-core/language/pl.json b/qortal-ui-core/language/pl.json
index c5ede25d..bc93b764 100644
--- a/qortal-ui-core/language/pl.json
+++ b/qortal-ui-core/language/pl.json
@@ -321,7 +321,8 @@
"tchange43":"MOJA HISTORIA ZAKUPÓW",
"tchange44":"Pomyślnie dodano automatyczne zamówienie zakupu!",
"tchange45":"AUTO KUP Z",
- "tchange46":"AUTO KUP"
+ "tchange46":"AUTO KUP",
+ "tchange47":"Sprzedaj za tę cenę"
},
"rewardsharepage":{
"rchange1":"Podział nagród",
diff --git a/qortal-ui-core/language/pt.json b/qortal-ui-core/language/pt.json
index 821abb4c..513ff6ac 100644
--- a/qortal-ui-core/language/pt.json
+++ b/qortal-ui-core/language/pt.json
@@ -321,7 +321,8 @@
"tchange43":"MEU HISTÓRICO DE COMPRAS",
"tchange44":"Pedido de compra automática adicionado com sucesso!",
"tchange45":"COMPRA AUTOMÁTICA COM",
- "tchange46":"COMPRA AUTOMÁTICA"
+ "tchange46":"COMPRA AUTOMÁTICA",
+ "tchange47":"Vendo por este preço"
},
"rewardsharepage":{
"rchange1":"Ações de recompensa",
diff --git a/qortal-ui-core/language/ro.json b/qortal-ui-core/language/ro.json
index cfb054e0..cee5d56e 100644
--- a/qortal-ui-core/language/ro.json
+++ b/qortal-ui-core/language/ro.json
@@ -321,7 +321,8 @@
"tchange43":"ISTORICUL MEU DE CUMPARARI",
"tchange44":"Comanda de cumparare automata a fost adaugata cu succes!",
"tchange45":"CUMPARA AUTOMATA CU",
- "tchange46":"CUMPARARE AUTOMATA"
+ "tchange46":"CUMPARARE AUTOMATA",
+ "tchange47":"Vinde la acest pret"
},
"rewardsharepage":{
"rchange1":"Cote de recompensa",
diff --git a/qortal-ui-core/language/rs.json b/qortal-ui-core/language/rs.json
index d67b977f..819fc931 100644
--- a/qortal-ui-core/language/rs.json
+++ b/qortal-ui-core/language/rs.json
@@ -321,7 +321,8 @@
"tchange43":"MOJA ISTORIJA KUPOVINE",
"tchange44":"Narudžbina za automatsku kupovinu je uspešno dodata!",
"tchange45":"AUTO KUPI SA",
- "tchange46":"AUTO BUI"
+ "tchange46":"AUTO BUI",
+ "tchange47":"Prodaj za ovu cenu"
},
"rewardsharepage":{
"rchange1":"Udeo nagrade",
diff --git a/qortal-ui-core/language/ru.json b/qortal-ui-core/language/ru.json
index 897c0621..bf0cf3cc 100644
--- a/qortal-ui-core/language/ru.json
+++ b/qortal-ui-core/language/ru.json
@@ -321,7 +321,8 @@
"tchange43":"МОЯ ИСТОРИЯ ПОКУПОК",
"tchange44":"Заказ на автоматическую покупку успешно добавлен!",
"tchange45":"АВТО КУПИТЬ С",
- "tchange46":"АВТО КУПИТЬ"
+ "tchange46":"АВТО КУПИТЬ",
+ "tchange47":"Продать по этой цене"
},
"rewardsharepage":{
"rchange1":"Вознаграждения",
diff --git a/qortal-ui-core/language/us.json b/qortal-ui-core/language/us.json
index 022472d5..e89fe59b 100644
--- a/qortal-ui-core/language/us.json
+++ b/qortal-ui-core/language/us.json
@@ -321,7 +321,8 @@
"tchange43":"MY BUY HISTORY",
"tchange44":"Successfully added auto buy order!",
"tchange45":"AUTO BUY WITH",
- "tchange46":"AUTO BUY"
+ "tchange46":"AUTO BUY",
+ "tchange47":"Sell for this price"
},
"rewardsharepage":{
"rchange1":"Rewardshares",
diff --git a/qortal-ui-core/language/zhc.json b/qortal-ui-core/language/zhc.json
index 7d10ae01..770f63cd 100644
--- a/qortal-ui-core/language/zhc.json
+++ b/qortal-ui-core/language/zhc.json
@@ -321,7 +321,8 @@
"tchange43":"我的购买历史",
"tchange44":"成功添加自动买单！",
"tchange45":"自动购买",
- "tchange46":"自动购买"
+ "tchange46":"自动购买",
+ "tchange47":"以这个价格出售"
},
"rewardsharepage":{
"rchange1":"铸币密钥",
diff --git a/qortal-ui-core/language/zht.json b/qortal-ui-core/language/zht.json
index dc6d1a76..4ff9cd53 100644
--- a/qortal-ui-core/language/zht.json
+++ b/qortal-ui-core/language/zht.json
@@ -321,7 +321,8 @@
"tchange43":"我的購買歷史",
"tchange44":"成功添加自動買單！",
"tchange45":"自動購買",
- "tchange46":"自動購買"
+ "tchange46":"自動購買",
+ "tchange47":"以這個價格出售"
},
"rewardsharepage":{
"rchange1":"鑄幣密鑰",
diff --git a/qortal-ui-plugins/plugins/core/trade-portal/trade-portal.src.js b/qortal-ui-plugins/plugins/core/trade-portal/trade-portal.src.js
index b850b33c..b317facd 100644
--- a/qortal-ui-plugins/plugins/core/trade-portal/trade-portal.src.js
+++ b/qortal-ui-plugins/plugins/core/trade-portal/trade-portal.src.js
@@ -72,7 +72,8 @@ class TradePortal extends LitElement {
tradeAddressResult: { type: Array },
displayTradeAddress: { type: String },
displayTradeLevel: { type: String },
- displayTradeBalance: { type: String }
+ displayTradeBalance: { type: String },
+ qortRatio: {type: Number}
}
}
@@ -1175,6 +1176,7 @@ class TradePortal extends LitElement {
${translate("tradepage.tchange33")} ${this.listedCoins.get(this.selectedCoin).coinCode} ${translate("tradepage.tchange40")}
1 QORT = ${this.exchangeRateQort()} ${this.listedCoins.get(this.selectedCoin).coinCode}
+ this.setDefaultSellPrice()}>
@@ -1300,11 +1302,7 @@ class TradePortal extends LitElement {
use(checkLanguage)
- if (checkTheme === 'dark') {
- this.theme = 'dark'
- } else {
- this.theme = 'light'
- }
+ this.theme = (checkTheme === 'dark') ? 'dark' : 'light'
document.querySelector('html').setAttribute('theme', this.theme)
})
@@ -1370,11 +1368,7 @@ class TradePortal extends LitElement {
changeTheme() {
const checkTheme = localStorage.getItem('qortalTheme')
- if (checkTheme === 'dark') {
- this.theme = 'dark';
- } else {
- this.theme = 'light';
- }
+ this.theme = (checkTheme === 'dark') ? 'dark' : 'light'
document.querySelector('html').setAttribute('theme', this.theme);
}
@@ -1398,19 +1392,29 @@ class TradePortal extends LitElement {
}
exchangeRateQort() {
- if (this.listedCoins.get(this.selectedCoin).coinCode === "BTC") {
- return html`${this.qortbtc}`
- } else if (this.listedCoins.get(this.selectedCoin).coinCode === "LTC") {
- return html`${this.qortltc}`
- } else if (this.listedCoins.get(this.selectedCoin).coinCode === "DOGE") {
- return html`${this.qortdoge}`
- } else if (this.listedCoins.get(this.selectedCoin).coinCode === "DGB") {
- return html`${this.qortdgb}`
- } else if (this.listedCoins.get(this.selectedCoin).coinCode === "RVN") {
- return html`${this.qortrvn}`
- } else if (this.listedCoins.get(this.selectedCoin).coinCode === "ARRR") {
- return html`${this.qortarrr}`
+ switch(this.listedCoins.get(this.selectedCoin).coinCode) {
+ case "BTC":
+ this.qortRatio = this.qortbtc
+ break
+ case "LTC":
+ this.qortRatio = this.qortltc
+ break
+ case "DOGE":
+ this.qortRatio = this.qortdoge
+ break
+ case "DGB":
+ this.qortRatio = this.qortdgb
+ break
+ case "RVN":
+ this.qortRatio = this.qortrvn
+ break
+ case "ARRR":
+ this.qortRatio = this.qortarrr
+ break
+ default:
+ break
}
+ return html`${this.qortRatio}`
}
exchangeRateForeign() {
@@ -1562,12 +1566,22 @@ class TradePortal extends LitElement {
}
displayTabContent(tab) {
+ const tabPane = this.shadowRoot.getElementById("tabs-1")
+ tabPane.setAttribute("activeIndex", (tab === 'buy') ? '0': '1')
+
const tabBuyContent = this.shadowRoot.getElementById('tab-buy-content')
- const tabSellContent = this.shadowRoot.getElementById('tab-sell-content')
tabBuyContent.style.display = (tab === 'buy') ? 'block' : 'none'
+
+ const tabSellContent = this.shadowRoot.getElementById('tab-sell-content')
tabSellContent.style.display = (tab === 'sell') ? 'block' : 'none'
}
+ setDefaultSellPrice() {
+ this.displayTabContent('sell')
+ const tabSellPrice = this.shadowRoot.getElementById('sellPriceInput')
+ tabSellPrice.value = this.qortRatio.isNaN ? 0 : this.qortRatio
+ }
+
async reRenderHistoricTrades() {
this.requestUpdate()
await this.updateComplete
@@ -1596,10 +1610,13 @@ class TradePortal extends LitElement {
if (Number(haveFunds) > Number(buyFunds)) {
this.buyBtnDisable = false
this.autoBuyWarning = false
+ this.displayTabContent('buy')
} else {
this.buyBtnDisable = true
this.autoBuyWarning = true
+ this.displayTabContent('buy')
}
+
}
async getAllForAddress(tradeAddress) {