From b4b8074fa16c277fde5506afde5dc4343643d40f Mon Sep 17 00:00:00 2001 From: AlphaX-Projects <77661270+AlphaX-Projects@users.noreply.github.com> Date: Sat, 10 Sep 2022 17:43:39 +0200 Subject: [PATCH] move exchange rate --- package.json | 2 +- 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 | 137 +++++------------- 19 files changed, 69 insertions(+), 121 deletions(-) diff --git a/package.json b/package.json index 003c6f50..0596bf26 100644 --- a/package.json +++ b/package.json @@ -36,7 +36,7 @@ "electron-log": "4.4.8" }, "devDependencies": { - "electron": "20.1.0", + "electron": "17.4.11", "electron-builder": "23.3.3", "electron-notarize": "1.2.1", "electron-packager": "16.0.0", diff --git a/qortal-ui-core/language/de.json b/qortal-ui-core/language/de.json index e122569d..246b11f2 100644 --- a/qortal-ui-core/language/de.json +++ b/qortal-ui-core/language/de.json @@ -298,7 +298,8 @@ "tchange29":"ABBRECHEN", "tchange30":"Guthaben konnte nicht abgerufen werden. Versuchen Sie es nochmal!", "tchange31":"VERKAUFT", - "tchange32":"GEKAUFT" + "tchange32":"GEKAUFT", + "tchange33":"Tauschrate" }, "rewardsharepage":{ "rchange1":"Belohnungsanteile", diff --git a/qortal-ui-core/language/es.json b/qortal-ui-core/language/es.json index b396e4bf..cf993b28 100644 --- a/qortal-ui-core/language/es.json +++ b/qortal-ui-core/language/es.json @@ -298,7 +298,8 @@ "tchange29":"CANCELAR", "tchange30":"Fallo en la obtención del saldo. Inténtelo de nuevo!", "tchange31":"VENDIDO", - "tchange32":"COMPRADO" + "tchange32":"COMPRADO", + "tchange33":"Tipo de cambio" }, "rewardsharepage":{ "rchange1":"Rewardshares", diff --git a/qortal-ui-core/language/fr.json b/qortal-ui-core/language/fr.json index d2220619..2c499699 100644 --- a/qortal-ui-core/language/fr.json +++ b/qortal-ui-core/language/fr.json @@ -298,7 +298,8 @@ "tchange29":"ANNULER", "tchange30":"Échec de la récupération du solde. Réessayez!", "tchange31":"VENDU", - "tchange32":"ACHETE" + "tchange32":"ACHETE", + "tchange33":"Taux de change" }, "rewardsharepage":{ "rchange1":"Récompenses", diff --git a/qortal-ui-core/language/hindi.json b/qortal-ui-core/language/hindi.json index 2e1a70db..e8d64167 100644 --- a/qortal-ui-core/language/hindi.json +++ b/qortal-ui-core/language/hindi.json @@ -299,7 +299,8 @@ "tchange29":"रद्द करें", "tchange30":"शेष को लाने में विफल फिर से प्रयास करें!", "tchange31":"बेचा", - "tchange32":"खरीद लिया" + "tchange32":"खरीद लिया", + "tchange33":"विनिमय दर" }, "rewardsharepage":{ "rchange1":"रिवॉर्डशेयर", diff --git a/qortal-ui-core/language/hr.json b/qortal-ui-core/language/hr.json index adc663b3..38cf73c1 100644 --- a/qortal-ui-core/language/hr.json +++ b/qortal-ui-core/language/hr.json @@ -298,7 +298,8 @@ "tchange29":"OTKAŽI", "tchange30":"Neuspješno dohvatiti stanje. Pokušajte ponovno!", "tchange31":"PRODANO", - "tchange32":"KUPLJENO" + "tchange32":"KUPLJENO", + "tchange33":"Tečaj" }, "rewardsharepage":{ "rchange1":"Nagradni udio (Rewardshares)", diff --git a/qortal-ui-core/language/hu.json b/qortal-ui-core/language/hu.json index 07cb222e..7445c8d8 100644 --- a/qortal-ui-core/language/hu.json +++ b/qortal-ui-core/language/hu.json @@ -298,7 +298,8 @@ "tchange29":"ÉRVÉNYTELENÍT", "tchange30":"Nem sikerült lekérni az egyenleget. Próbáld újra!", "tchange31":"ELADOTT", - "tchange32":"VÁSÁROLT" + "tchange32":"VÁSÁROLT", + "tchange33":"Árfolyam" }, "rewardsharepage":{ "rchange1":"Jutalommegosztások", diff --git a/qortal-ui-core/language/it.json b/qortal-ui-core/language/it.json index ad0f39cb..587a87a3 100644 --- a/qortal-ui-core/language/it.json +++ b/qortal-ui-core/language/it.json @@ -298,7 +298,8 @@ "tchange29":"CANCELLA", "tchange30":"Impossibile recuperare il saldo. Riprova!", "tchange31":"VENDUTO", - "tchange32":"ACQUISTATO" + "tchange32":"ACQUISTATO", + "tchange33":"Tasso di cambio" }, "rewardsharepage":{ "rchange1":"Quote di ricompensa", diff --git a/qortal-ui-core/language/ko.json b/qortal-ui-core/language/ko.json index ee074395..efc18008 100644 --- a/qortal-ui-core/language/ko.json +++ b/qortal-ui-core/language/ko.json @@ -298,7 +298,8 @@ "tchange29":"취소하다", "tchange30":"밸런스를 가져오지 못했습니다. 다시 시도하십시오.!", "tchange31":"판매된", - "tchange32":"구매된" + "tchange32":"구매된", + "tchange33":"환율" }, "rewardsharepage":{ "rchange1":"보상 공유", diff --git a/qortal-ui-core/language/no.json b/qortal-ui-core/language/no.json index 4470776f..a623ef89 100644 --- a/qortal-ui-core/language/no.json +++ b/qortal-ui-core/language/no.json @@ -298,7 +298,8 @@ "tchange29":"AVBRYT", "tchange30":"Kunne ikke hente saldoen. Prøv igjen!", "tchange31":"SOLGT", - "tchange32":"KJØPT" + "tchange32":"KJØPT", + "tchange33":"Vekslingskurs" }, "rewardsharepage":{ "rchange1":"Belønningsdel", diff --git a/qortal-ui-core/language/pl.json b/qortal-ui-core/language/pl.json index 4e21efd7..b380d406 100644 --- a/qortal-ui-core/language/pl.json +++ b/qortal-ui-core/language/pl.json @@ -298,7 +298,8 @@ "tchange29":"ANULUJ", "tchange30":"Nie udało się pobrać salda. Spróbuj ponownie!", "tchange31":"SPRZEDANY", - "tchange32":"KUPIONY" + "tchange32":"KUPIONY", + "tchange33":"Kurs wymiany" }, "rewardsharepage":{ "rchange1":"Podział nagród", diff --git a/qortal-ui-core/language/pt.json b/qortal-ui-core/language/pt.json index 8048fe76..0513d173 100644 --- a/qortal-ui-core/language/pt.json +++ b/qortal-ui-core/language/pt.json @@ -298,7 +298,8 @@ "tchange29":"CANCELAR", "tchange30":"Falha buscando Saldo. Tente novamente!", "tchange31":"VENDIDO", - "tchange32":"COMPRADO" + "tchange32":"COMPRADO", + "tchange33":"Taxa de câmbio" }, "rewardsharepage":{ "rchange1":"Ações de recompensa", diff --git a/qortal-ui-core/language/ro.json b/qortal-ui-core/language/ro.json index 33da9c49..5cfc955c 100644 --- a/qortal-ui-core/language/ro.json +++ b/qortal-ui-core/language/ro.json @@ -298,7 +298,8 @@ "tchange29":"ANULARE", "tchange30":"Nu s-a reusit actualizarea soldului. Mai incearca odata!", "tchange31":"VANDUT", - "tchange32":"CUMPARAT" + "tchange32":"CUMPARAT", + "tchange33":"Rata de schimb" }, "rewardsharepage":{ "rchange1":"Cote de recompensa", diff --git a/qortal-ui-core/language/rs.json b/qortal-ui-core/language/rs.json index 5fc7106a..b4bd0d61 100644 --- a/qortal-ui-core/language/rs.json +++ b/qortal-ui-core/language/rs.json @@ -298,7 +298,8 @@ "tchange29":"OTKAZIVANJE", "tchange30":"Neuspešna provera salda. Pokušajte ponovo!", "tchange31":"PRODATO", - "tchange32":"KUPLJENO" + "tchange32":"KUPLJENO", + "tchange33":"Kurs" }, "rewardsharepage":{ "rchange1":"Udeo nagrade", diff --git a/qortal-ui-core/language/ru.json b/qortal-ui-core/language/ru.json index d7c66f52..84d70c7f 100644 --- a/qortal-ui-core/language/ru.json +++ b/qortal-ui-core/language/ru.json @@ -298,7 +298,8 @@ "tchange29":"ОТМЕНА", "tchange30":"Не удалось получить баланс. Повторите попытку!", "tchange31":"ПРОДАНО", - "tchange32":"КУПИЛ" + "tchange32":"КУПИЛ", + "tchange33":"Обменный курс" }, "rewardsharepage":{ "rchange1":"Вознаграждения", diff --git a/qortal-ui-core/language/us.json b/qortal-ui-core/language/us.json index 8b36fed0..f0f6702a 100644 --- a/qortal-ui-core/language/us.json +++ b/qortal-ui-core/language/us.json @@ -298,7 +298,8 @@ "tchange29":"CANCEL", "tchange30":"Failed to Fetch Balance. Try again!", "tchange31":"SOLD", - "tchange32":"BOUGHT" + "tchange32":"BOUGHT", + "tchange33":"Exchange Rate" }, "rewardsharepage":{ "rchange1":"Rewardshares", diff --git a/qortal-ui-core/language/zhc.json b/qortal-ui-core/language/zhc.json index 9716b483..3c8a6871 100644 --- a/qortal-ui-core/language/zhc.json +++ b/qortal-ui-core/language/zhc.json @@ -298,7 +298,8 @@ "tchange29":"取消交易", "tchange30":"加载余额失败。请重新尝试!", "tchange31":"已卖出", - "tchange32":"已买入" + "tchange32":"已买入", + "tchange33":"汇率" }, "rewardsharepage":{ "rchange1":"铸币密钥", diff --git a/qortal-ui-core/language/zht.json b/qortal-ui-core/language/zht.json index 323054e6..d0abd6c0 100644 --- a/qortal-ui-core/language/zht.json +++ b/qortal-ui-core/language/zht.json @@ -298,7 +298,8 @@ "tchange29":"取消交易", "tchange30":"加載餘額失敗。請重新嘗試!", "tchange31":"已賣出", - "tchange32":"已買入" + "tchange32":"已買入", + "tchange33":"匯率" }, "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 dd4ada27..78b279c3 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 @@ -85,20 +85,17 @@ class TradePortal extends LitElement { --_lumo-grid-border-color: var(--border); --_lumo-grid-secondary-border-color: var(--border2); } - paper-spinner-lite { height: 30px; width: 30px; --paper-spinner-color: var(--mdc-theme-primary); --paper-spinner-stroke-width: 3px; } - mwc-tab-bar { --mdc-text-transform: none; --mdc-tab-color-default: var(--black); --mdc-tab-text-label-color-default: var(--black); } - #tabs-1 { --mdc-tab-height: 42px; border-left: 1px solid var(--tradeborder); @@ -106,49 +103,39 @@ class TradePortal extends LitElement { border-right: 1px solid var(--tradeborder); color: var(--black); } - #tab-buy[active] { --mdc-theme-primary: rgba(55, 160, 51, 0.9); } - #tabs-1-content { height: 100%; padding-bottom: 10px; } - #tabs-1-content > div { height: 100%; border: 1px solid var(--tradeborder); } - #tabs-1-content .card { border: none; } - #tabs-1-content .btn-clear { --mdc-icon-button-size: 32px; color: var(--black); } - #tab-sell[active] { --mdc-theme-primary: rgb(255, 89, 89); } - #trade-portal-page { background: var(--white); padding: 12px 24px; } - .divCard { border: 1px solid var(--black); padding: 1em; box-shadow: 0 0.3px 1px 0 rgba(0, 0, 0, 0.14), 0 1px 1px -1px rgba(0, 0, 0, 0.12), 0 1px 2px 0 rgba(0, 0, 0, 0.2); } - h2 { margin: 0; } - h2, h3, h4, @@ -156,7 +143,6 @@ class TradePortal extends LitElement { color: var(--black); font-weight: 400; } - header { display: flex; flex: 0 1 auto; @@ -171,17 +157,14 @@ class TradePortal extends LitElement { border-right: 1px solid var(--tradeborder); min-height: 40px; } - p { margin-bottom: 12px; } - #trade-portal { max-width: 100vw; margin-left: auto; margin-right: auto; } - .box { margin: 0; padding: 0; @@ -189,38 +172,29 @@ class TradePortal extends LitElement { flex-flow: column; height: 100%; } - #first-trade-section { margin-bottom: 10px; } - #first-trade-section > div { } - #second-trade-section { margin-bottom: 10px; } - #second-trade-section > div { } - #third-trade-section { margin-bottom: 10px; } - #third-trade-section > div { } - .trade-chart { background-color: var(--white); border: 2px #ddd solid; text-align: center; } - .open-trades { text-align: center; } - .no-last-seen { background: rgb(255, 89, 89); padding: 9px 1.3px; @@ -228,11 +202,9 @@ class TradePortal extends LitElement { width: 1rem; margin: 0 auto; } - .open-market-container { text-align: center; } - .card { padding: 1em; border: 1px var(--tradeborder) solid; @@ -242,23 +214,19 @@ class TradePortal extends LitElement { justify-content: space-evenly; min-height: inherit; } - .cancel { --mdc-theme-primary: rgb(255, 89, 89); } - .border-wrapper { border: 1px var(--tradeborder) solid; overflow: hidden; } - .amt-text { color: var(--tradehave); font-size: 15px; margin-top: 5px; margin-bottom: 12px; } - .exchange { color: var(--black); font-size: 18px; @@ -266,31 +234,26 @@ class TradePortal extends LitElement { margin-top: 5px; margin-bottom: 10px; } - .clear-button { display: inline; float: right; margin-bottom: 5px; } - .exhcnage-text { display: inline; float: left; margin-bottom: 5px; } - .balance-text { display: inline; float: right; margin-bottom: 5px; } - .fee-text { display: inline; float: left; margin-bottom: 5px; } - .tab-text { color: var(--tradehave); font-size: 12px; @@ -298,58 +261,46 @@ class TradePortal extends LitElement { margin-top: 2px; margin-bottom: -12px; } - .historic-trades { text-align: center; } - .my-open-orders { text-align: center; } - .my-historic-trades { text-align: center; } - .buttons { width: auto !important; } - .buy-button { --mdc-theme-primary: rgba(55, 160, 51, 0.9); } - .sell-button { --mdc-theme-primary: rgb(255, 89, 89); } - .full-width { background-color: var(--white); border: 2px #ddd solid; height: 100px; text-align: center; } - vaading-grid { font-size: .8em; } - vaadin-grid-column { flex-grow: 1; } - .loadingContainer { height: 100%; width: 100%; } - .loading, .loading:after { border-radius: 50%; width: 5em; height: 5em; } - .loading { margin: 10px auto; border-width: .6em; @@ -361,16 +312,13 @@ class TradePortal extends LitElement { transform: translateZ(0px); animation: 1.1s linear 0s infinite normal none running loadingAnimation; } - mwc-select#coinSelectionMenu { font-size: 24px; width:220px; } - mwc-select#coinSelectionMenu mwc-list-item { line-height: 30px; } - .coinName::before { content: ""; display: inline-block; @@ -382,37 +330,29 @@ class TradePortal extends LitElement { left: 10px; top: 10px; } - .btc.coinName:before { background-image: url('/img/qortbtc.png'); } - .ltc.coinName:before { background-image: url('/img/qortltc.png'); } - .doge.coinName:before { background-image: url('/img/qortdoge.png'); } - .dgb.coinName:before { background-image: url('/img/qortdgb.png'); } - .rvn.coinName:before { background-image: url('/img/qortrvn.png'); } - .arrr.coinName:before { background-image: url('/img/qortarrr.png'); } - .coinName { display: inline-block; height: 26px; padding-left: 45px; } - @-webkit-keyframes loadingAnimation { 0% { -webkit-transform: rotate(0deg); @@ -423,7 +363,6 @@ class TradePortal extends LitElement { transform: rotate(360deg); } } - @keyframes loadingAnimation { 0% { -webkit-transform: rotate(0deg); @@ -439,7 +378,6 @@ class TradePortal extends LitElement { * { } #trade-portal {} - #first-trade-section { display: grid; grid-template-columns:1fr 1fr 2fr; @@ -450,7 +388,6 @@ class TradePortal extends LitElement { align-items: stretch; margin-bottom: 10px; } - #second-trade-section { display: grid; grid-template-columns: 2fr 1fr; @@ -461,7 +398,6 @@ class TradePortal extends LitElement { align-items: stretch; margin-bottom: 10px; } - } ` } @@ -733,7 +669,7 @@ class TradePortal extends LitElement { - ` + ` } openMarketTemplate() { @@ -747,10 +683,9 @@ class TradePortal extends LitElement {
- - - 1 ${this.listedCoins.get(this.selectedCoin).coinCode} = ${this.exchangeRateForeign()} QORT - +
+ +
${translate("tradepage.tchange8")} (QORT)*

- - - 1 QORT = ${this.exchangeRateQort()} ${this.listedCoins.get(this.selectedCoin).coinCode} - +
+ +
${translate("tradepage.tchange8")} (QORT)*

- ` + ` } myOpenOrdersTemplate() { @@ -948,7 +882,7 @@ class TradePortal extends LitElement {
- ` + ` } myHistoricTradesTemplate() { @@ -1008,7 +942,7 @@ class TradePortal extends LitElement { - ` + ` } render() { @@ -1022,7 +956,7 @@ class TradePortal extends LitElement { QORT / DOGE QORT / DGB QORT / RVN - QORT / ARRR + QORT / ARRR
@@ -1037,11 +971,15 @@ class TradePortal extends LitElement {
+
+

${translate("tradepage.tchange33")}

+

1 QORT = ${this.exchangeRateQort()} ${this.listedCoins.get(this.selectedCoin).coinCode}

+

${translate("tradepage.tchange7")}

-
+
@@ -1053,7 +991,7 @@ class TradePortal extends LitElement {
${translate("general.close")} - ` + ` } firstUpdated() { @@ -1302,15 +1240,14 @@ class TradePortal extends LitElement { url: _url, method: 'POST', body: _body, + }).then((res) => { + if (isNaN(Number(res))) { + let snack1string = get("tradepage.tchange30") + parentEpml.request('showSnackBar', `${snack1string}`) + } else { + this.listedCoins.get(this.selectedCoin).balance = (Number(res) / 1e8).toFixed(8) + } }) - .then((res) => { - if (isNaN(Number(res))) { - let snack1string = get("tradepage.tchange30") - parentEpml.request('showSnackBar', `${snack1string}`) - } else { - this.listedCoins.get(this.selectedCoin).balance = (Number(res) / 1e8).toFixed(8) - } - }) } async fetchWalletAddress(coin) { @@ -1889,7 +1826,7 @@ class TradePortal extends LitElement { // Fill Historic Trades and Filter Stuck Trades if (this.listedCoins.get(this.selectedCoin).tradeOffersSocketCounter === 1) { - setTimeout(() => this.filterStuckTrades(tradeStates), 50) + setTimeout(() => this.filterStuckTrades(tradeStates), 250) } } @@ -1973,7 +1910,7 @@ class TradePortal extends LitElement { const startOfferPresenceMapping = async () => { if (presenceTxns !== null) { await asyncForEach(presenceTxns, async (presence) => { - await waitFor(50) + await waitFor(250) let offerIndex = offeringTrades.findIndex((offeringTrade) => offeringTrade.qortalCreatorTradeAddress === presence.address) offerIndex !== -1 ? (offeringTrades[offerIndex].lastSeen = presence.timestamp) : null }) @@ -1981,7 +1918,7 @@ class TradePortal extends LitElement { if (tradePresenceTxns !== null) { await asyncForEach(tradePresenceTxns, async (tradePresence) => { - await waitFor(50) + await waitFor(250) let offerIndex = offeringTrades.findIndex((offeringTrade) => offeringTrade.qortalCreatorTradeAddress === tradePresence.tradeAddress) offerIndex !== -1 ? (offeringTrades[offerIndex].tradePresenceExpiry = tradePresence.timestamp) : null }) @@ -2001,7 +1938,7 @@ class TradePortal extends LitElement { const socket = new WebSocket(socketLink) // Open Connection socket.onopen = () => { - setTimeout(pingSocket, 50) + setTimeout(pingSocket, 250) tradeOffersSocketCounter += 1 } // Message Event @@ -2038,7 +1975,7 @@ class TradePortal extends LitElement { const socket = new WebSocket(socketLink) // Open Connection socket.onopen = () => { - setTimeout(pingSocket, 50) + setTimeout(pingSocket, 250) } // Message Event socket.onmessage = (e) => { @@ -2072,7 +2009,7 @@ class TradePortal extends LitElement { const socket = new WebSocket(socketLink) // Open Connection socket.onopen = () => { - setTimeout(pingSocket, 50) + setTimeout(pingSocket, 250) } // Message Event socket.onmessage = (e) => { @@ -2103,7 +2040,7 @@ class TradePortal extends LitElement { const socket = new WebSocket(socketLink) // Open Connection socket.onopen = () => { - setTimeout(pingSocket, 50) + setTimeout(pingSocket, 250) } // Message Event socket.onmessage = (e) => { @@ -2628,18 +2565,12 @@ class TradePortal extends LitElement { const modifiers = [ { searchValue: 'NODEURL', replaceValue: nodeUrl }, - { searchValue: 'FOREIGN_BLOCKCHAIN', replaceValue: this.selectedCoin, }, + { searchValue: 'FOREIGN_BLOCKCHAIN', replaceValue: this.selectedCoin }, ] workers.get(this.selectedCoin).tradesConnectedWorker = this.inlineWorker(this.initSocket, modifiers) - workers.get(this.selectedCoin).tradesConnectedWorker.addEventListener( - 'message', - function (event) { - handleMessage(event.data) - }, - { passive: true } - ) + workers.get(this.selectedCoin).tradesConnectedWorker.addEventListener('message', function (event) { handleMessage(event.data) }, { passive: true }) workers.get(this.selectedCoin).tradesConnectedWorker.postMessage({ type: "set_coin", content: this.selectedCoin }) } @@ -2758,4 +2689,4 @@ class TradePortal extends LitElement { } } -window.customElements.define('trade-portal', TradePortal) +window.customElements.define('trade-portal', TradePortal) \ No newline at end of file