From add708a797547347c6e296aa90ae74c2d5bdd14c Mon Sep 17 00:00:00 2001 From: AlphaX-Projects <77661270+AlphaX-Projects@users.noreply.github.com> Date: Sun, 14 Aug 2022 19:32:59 +0200 Subject: [PATCH 1/7] Add Send all button. Chat fix --- qortal-ui-core/language/de.json | 3 +- qortal-ui-core/language/es.json | 3 +- qortal-ui-core/language/fr.json | 5 +-- 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 | 5 ++- 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 | 5 +-- qortal-ui-core/language/us.json | 3 +- qortal-ui-core/language/zhc.json | 3 +- qortal-ui-core/language/zht.json | 3 +- qortal-ui-core/src/components/sidenav-menu.js | 12 +++---- .../plugins/core/components/ChatPage.js | 14 ++++++-- .../plugins/core/wallet/wallet-app.src.js | 36 ++++++++++++++++--- 20 files changed, 87 insertions(+), 32 deletions(-) diff --git a/qortal-ui-core/language/de.json b/qortal-ui-core/language/de.json index dd0acc7f..189db09c 100644 --- a/qortal-ui-core/language/de.json +++ b/qortal-ui-core/language/de.json @@ -239,7 +239,8 @@ "wchange41":"Status", "wchange42":"Bestätigungen", "wchange43":"Ihre Transaktion wird erst angezeigt, wenn sie bestätigt wurde. Seien Sie geduldig...", - "wchange44":"Bitte versuche es erneut..." + "wchange44":"Bitte versuche es erneut...", + "wchange45":"Sende alle" }, "tradepage":{ "tchange1":"Handelsportal", diff --git a/qortal-ui-core/language/es.json b/qortal-ui-core/language/es.json index 775b5b14..c495083e 100644 --- a/qortal-ui-core/language/es.json +++ b/qortal-ui-core/language/es.json @@ -239,7 +239,8 @@ "wchange41":"Estado", "wchange42":"Confirmaciones", "wchange43":"Su transacción no se mostrará hasta que se confirme, sea paciente...", - "wchange44":"Inténtalo de nuevo..." + "wchange44":"Inténtalo de nuevo...", + "wchange45":"Envia todo" }, "tradepage":{ "tchange1":"Portal de Comercio", diff --git a/qortal-ui-core/language/fr.json b/qortal-ui-core/language/fr.json index 3c2c0542..a77e729e 100644 --- a/qortal-ui-core/language/fr.json +++ b/qortal-ui-core/language/fr.json @@ -201,7 +201,7 @@ "wchange3":"Copier l’adresse du portefeuille dans le presse-papiers", "wchange4":"Adresse copiée dans le presse-papiers", "wchange5":"Détails de la transaction", - "wchange6":" Type de transaction", + "wchange6":"Type de transaction", "wchange7":"SORTANT", "wchange8":"ENTRANT", "wchange9":"Envoyeur", @@ -239,7 +239,8 @@ "wchange41":"Status", "wchange42":"Confirmations", "wchange43":"Votre transaction ne s'affichera pas tant qu'elle n'aura pas été confirmée, soyez patient...", - "wchange44":"Veuillez réessayer..." + "wchange44":"Veuillez réessayer...", + "wchange45":"Envoyer tout" }, "tradepage":{ "tchange1":"Portail de commerce", diff --git a/qortal-ui-core/language/hindi.json b/qortal-ui-core/language/hindi.json index 81314353..98cba547 100644 --- a/qortal-ui-core/language/hindi.json +++ b/qortal-ui-core/language/hindi.json @@ -240,7 +240,8 @@ "wchange41":"स्थिति", "wchange42":"पुष्टियों", "wchange43":"कन्फर्म होने तक आपका ट्रांजैक्शन नहीं दिखेगा, धैर्य रखें...", - "wchange44":"कृपया पुन: प्रयास करें..." + "wchange44":"कृपया पुन: प्रयास करें...", + "wchange45":"सब भेजें" }, "tradepage":{ "tchange1":"व्यापार पोर्टल", diff --git a/qortal-ui-core/language/hr.json b/qortal-ui-core/language/hr.json index 1c742765..6b2479ff 100644 --- a/qortal-ui-core/language/hr.json +++ b/qortal-ui-core/language/hr.json @@ -239,7 +239,8 @@ "wchange41":"Status", "wchange42":"Potvrde", "wchange43":"Vaša transakcija se neće prikazati dok se ne potvrdi, budite strpljivi...", - "wchange44":"Molim te pokušaj ponovno..." + "wchange44":"Molim te pokušaj ponovno...", + "wchange45":"Pošalji sve" }, "tradepage":{ "tchange1":"Portal razmjene", diff --git a/qortal-ui-core/language/hu.json b/qortal-ui-core/language/hu.json index 8b63acc2..ff480433 100644 --- a/qortal-ui-core/language/hu.json +++ b/qortal-ui-core/language/hu.json @@ -239,7 +239,8 @@ "wchange41":"Állapot", "wchange42":"Visszaigazolások", "wchange43":"A tranzakció nem jelenik meg a megerősítésig, legyen türelemmel...", - "wchange44":"Kérlek próbáld újra..." + "wchange44":"Kérlek próbáld újra...", + "wchange45":"Az összes elküldése" }, "tradepage":{ "tchange1":"Kereskedelmi Portál", diff --git a/qortal-ui-core/language/it.json b/qortal-ui-core/language/it.json index 5b3e313a..92e6f02d 100644 --- a/qortal-ui-core/language/it.json +++ b/qortal-ui-core/language/it.json @@ -239,7 +239,8 @@ "wchange41":"Stato", "wchange42":"Conferme", "wchange43":"La tua transazione non verrà mostrata fino a quando non sarà confermata, sii paziente...", - "wchange44":"Per favore riprova..." + "wchange44":"Per favore riprova...", + "wchange45":"Invia tutto" }, "tradepage":{ "tchange1":"Portale commerciale", diff --git a/qortal-ui-core/language/ko.json b/qortal-ui-core/language/ko.json index 426af652..8994777f 100644 --- a/qortal-ui-core/language/ko.json +++ b/qortal-ui-core/language/ko.json @@ -239,7 +239,8 @@ "wchange41":"상황", "wchange42":"확인", "wchange43":"확인될 때까지 거래가 표시되지 않습니다. 기다려 주십시오.", - "wchange44":"다시 시도하십시오..." + "wchange44":"다시 시도하십시오...", + "wchange45":"모두 보내기" }, "tradepage":{ "tchange1":"무역 포털", diff --git a/qortal-ui-core/language/no.json b/qortal-ui-core/language/no.json index d8825352..697ebf33 100644 --- a/qortal-ui-core/language/no.json +++ b/qortal-ui-core/language/no.json @@ -237,7 +237,10 @@ "wchange39":"Kan ikke kopiere adressen.", "wchange40":"BETALING", "wchange41":"Status", - "wchange42":"Bekreftelser" + "wchange42":"Bekreftelser", + "wchange43":"Transaksjonen din vises ikke før den er bekreftet, vær tålmodig...", + "wchange44":"Vær så snill, prøv på nytt...", + "wchange45":"Send alle" }, "tradepage":{ "tchange1":"Handelsportal", diff --git a/qortal-ui-core/language/pl.json b/qortal-ui-core/language/pl.json index 3c43c26f..6e557c1d 100644 --- a/qortal-ui-core/language/pl.json +++ b/qortal-ui-core/language/pl.json @@ -239,7 +239,8 @@ "wchange41":"Status", "wchange42":"Potwierdzenia", "wchange43":"Twoja transakcja nie pojawi się, dopóki nie zostanie potwierdzona, bądź cierpliwy...", - "wchange44":"Proszę spróbuj ponownie..." + "wchange44":"Proszę spróbuj ponownie...", + "wchange45":"Wyślij wszystko" }, "tradepage":{ "tchange1":"Portal Handlowy", diff --git a/qortal-ui-core/language/pt.json b/qortal-ui-core/language/pt.json index c9a0687f..f4fd9e00 100644 --- a/qortal-ui-core/language/pt.json +++ b/qortal-ui-core/language/pt.json @@ -239,7 +239,8 @@ "wchange41":"Status", "wchange42":"Confirmações", "wchange43":"Sua transação não será exibida até ser confirmada, seja paciente...", - "wchange44":"Por favor, tente novamente..." + "wchange44":"Por favor, tente novamente...", + "wchange45":"Envie todos" }, "tradepage":{ "tchange1":"Portal do Comércio", diff --git a/qortal-ui-core/language/ro.json b/qortal-ui-core/language/ro.json index 4dd38900..02f5df31 100644 --- a/qortal-ui-core/language/ro.json +++ b/qortal-ui-core/language/ro.json @@ -239,7 +239,8 @@ "wchange41":"Stare", "wchange42":"Confirmari", "wchange43":"Tranzactia nu va aparea pana ce nu este confirmata, ai rabdare...", - "wchange44":"Te rog incearca din nou..." + "wchange44":"Te rog incearca din nou...", + "wchange45":"Trimite toate" }, "tradepage":{ "tchange1":"Portal de Tranzactionare", diff --git a/qortal-ui-core/language/rs.json b/qortal-ui-core/language/rs.json index 55c9156d..7196810d 100644 --- a/qortal-ui-core/language/rs.json +++ b/qortal-ui-core/language/rs.json @@ -239,7 +239,8 @@ "wchange41":"Status", "wchange42":"Potvrde", "wchange43":"Vaša transakcija se neće prikazati dok se ne potvrdi, budite strpljivi...", - "wchange44":"Molim vas, pokušajte ponovo..." + "wchange44":"Molim vas, pokušajte ponovo...", + "wchange45":"Poslati sve" }, "tradepage":{ "tchange1":"Trgovinski prozor", diff --git a/qortal-ui-core/language/ru.json b/qortal-ui-core/language/ru.json index 470eb547..df148445 100644 --- a/qortal-ui-core/language/ru.json +++ b/qortal-ui-core/language/ru.json @@ -212,7 +212,7 @@ "wchange14":"Время", "wchange15":"Подпись транзакции", "wchange16":"Хэш транзакции", - "wchange17":"Отправитель", + "wchange17":"Отправлять", "wchange18":"От адреса", "wchange19":"Доступные средства", "wchange20":"Кому (адрес или имя)", @@ -239,7 +239,8 @@ "wchange41":"Статус", "wchange42":"Подтверждено", "wchange43":"Ваша транзакция не будет отображаться, пока не будет подтверждена, наберитесь терпения...", - "wchange44":"Пожалуйста, попробуйте еще раз..." + "wchange44":"Пожалуйста, попробуйте еще раз...", + "wchange45":"Отправь все" }, "tradepage":{ "tchange1":"Торговый портал", diff --git a/qortal-ui-core/language/us.json b/qortal-ui-core/language/us.json index 67d8de7d..6ed4f7f1 100644 --- a/qortal-ui-core/language/us.json +++ b/qortal-ui-core/language/us.json @@ -234,7 +234,8 @@ "wchange41":"Status", "wchange42":"Confirmations", "wchange43":"Your transaction will not show until confirmed, be patient...", - "wchange44":"Please try again..." + "wchange44":"Please try again...", + "wchange45":"Send all" }, "tradepage":{ "tchange1":"Trade Portal", diff --git a/qortal-ui-core/language/zhc.json b/qortal-ui-core/language/zhc.json index 61f7b230..5982c765 100644 --- a/qortal-ui-core/language/zhc.json +++ b/qortal-ui-core/language/zhc.json @@ -239,7 +239,8 @@ "wchange41":"状态", "wchange42":"确认数", "wchange43":"您的交易在确认之前不会显示,请耐心等待...", - "wchange44":"请再试一次..." + "wchange44":"请再试一次...", + "wchange45":"全部发送" }, "tradepage":{ "tchange1":"交易门户", diff --git a/qortal-ui-core/language/zht.json b/qortal-ui-core/language/zht.json index ea636566..28d75353 100644 --- a/qortal-ui-core/language/zht.json +++ b/qortal-ui-core/language/zht.json @@ -239,7 +239,8 @@ "wchange41":"狀態", "wchange42":"確認數", "wchange43":"您的交易在確認之前不會顯示,請耐心等待...", - "wchange44":"請再試一次..." + "wchange44":"請再試一次...", + "wchange45":"全部發送" }, "tradepage":{ "tchange1":"交易門戶", diff --git a/qortal-ui-core/src/components/sidenav-menu.js b/qortal-ui-core/src/components/sidenav-menu.js index 3b058c7e..b5bbd39c 100644 --- a/qortal-ui-core/src/components/sidenav-menu.js +++ b/qortal-ui-core/src/components/sidenav-menu.js @@ -152,12 +152,6 @@ class SidenavMenu extends connect(store)(LitElement) { > `} - - - + + + { - if (eachMessage.isText === true) { let _eachMessage = this.decodeMessage(eachMessage) if (this.messageSignature !== eachMessage.signature) { - this.messageSignature = eachMessage.signature - // What are we waiting for, send in the message immediately... this.renderNewMessage(_eachMessage) } + return _eachMessage + } else { + let _eachMessage = this.decodeMessage(eachMessage) + if (this.messageSignature !== eachMessage.signature) { + this.messageSignature = eachMessage.signature + this.renderNewMessage(_eachMessage) + } return _eachMessage } }) diff --git a/qortal-ui-plugins/plugins/core/wallet/wallet-app.src.js b/qortal-ui-plugins/plugins/core/wallet/wallet-app.src.js index 9118778a..82fc1a5d 100644 --- a/qortal-ui-plugins/plugins/core/wallet/wallet-app.src.js +++ b/qortal-ui-plugins/plugins/core/wallet/wallet-app.src.js @@ -433,7 +433,7 @@ class MultiWallet extends LitElement { background-image: url('/img/dgb.png'); } - .rvn .currency-image { + .rvn .currency-image { background-image: url('/img/rvn.png'); } @@ -988,7 +988,7 @@ class MultiWallet extends LitElement { - +

${translate("walletpage.wchange5")}


@@ -1051,7 +1051,10 @@ class MultiWallet extends LitElement {

${translate("walletpage.wchange19")}:
- ${this.balanceString} + ${this.balanceString}
+ + this.calculateQortAll()}> ${translate("walletpage.wchange45")} QORT +
 

${translate("walletpage.wchange19")}:
- ${this.balanceString} + ${this.balanceString}
+ + this.calculateLtcAll()}> ${translate("walletpage.wchange45")} LTC +
 

{ @@ -2190,6 +2216,7 @@ class MultiWallet extends LitElement { this.sendMoneyLoading = false this.btnDisable = false throw new Error(txnResponse) + console.log(txnResponse) } else { this.errorMessage = response.message this.sendMoneyLoading = false @@ -2198,6 +2225,7 @@ class MultiWallet extends LitElement { } } const res = await makeRequest() + console.log(res) manageResponse(res) this.showWallet() } From 679aa3857fdcbbf27cb859fb786655e5e185b177 Mon Sep 17 00:00:00 2001 From: AlphaX-Projects <77661270+AlphaX-Projects@users.noreply.github.com> Date: Tue, 16 Aug 2022 11:05:06 +0200 Subject: [PATCH 2/7] Fix pagination --- qortal-ui-plugins/plugins/core/qdn/websites.src.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/qortal-ui-plugins/plugins/core/qdn/websites.src.js b/qortal-ui-plugins/plugins/core/qdn/websites.src.js index 2bc6056d..b9e8f620 100644 --- a/qortal-ui-plugins/plugins/core/qdn/websites.src.js +++ b/qortal-ui-plugins/plugins/core/qdn/websites.src.js @@ -545,7 +545,7 @@ class Websites extends LitElement { const blockedNamesUrl = `${nodeUrl}/lists/blockedNames?apiKey=${this.getApiKey()}` const resources = await parentEpml.request('apiCall', { - url: `/arbitrary/resources?service=${this.service}&default=true&limit=0&reverse=false&includestatus=true&includemetadata=true` + url: `/arbitrary/resources?service=${this.service}&default=true&limit=0&reverse=false&includestatus=false&includemetadata=false` }) this.resources = resources @@ -553,7 +553,7 @@ class Websites extends LitElement { const followedResponse = await fetch(followedNamesUrl) const followednames = await followedResponse.json() let followedres = resources.filter((elm) => followednames.includes(elm.name)) - this.followedResources = followedres + this.followedResources = followedres const blockedResponse = await fetch(blockedNamesUrl) const blockednames = await blockedResponse.json() From eeeccb5a8adcaa22b282274f2553c6a031041341 Mon Sep 17 00:00:00 2001 From: AlphaX-Projects <77661270+AlphaX-Projects@users.noreply.github.com> Date: Tue, 16 Aug 2022 18:55:24 +0200 Subject: [PATCH 3/7] add send to address butoon in transaction details --- .../plugins/core/wallet/wallet-app.src.js | 63 +++++++++++++------ 1 file changed, 45 insertions(+), 18 deletions(-) diff --git a/qortal-ui-plugins/plugins/core/wallet/wallet-app.src.js b/qortal-ui-plugins/plugins/core/wallet/wallet-app.src.js index 82fc1a5d..8c19be4e 100644 --- a/qortal-ui-plugins/plugins/core/wallet/wallet-app.src.js +++ b/qortal-ui-plugins/plugins/core/wallet/wallet-app.src.js @@ -19,6 +19,8 @@ import '@material/mwc-textfield' import '@polymer/paper-progress/paper-progress.js' import '@polymer/paper-slider/paper-slider.js' import '@polymer/paper-spinner/paper-spinner-lite.js' +import '@polymer/paper-icon-button/paper-icon-button.js' +import '@polymer/iron-icons/iron-icons.js' import '@vaadin/button' import '@vaadin/grid' import '@vaadin/icon' @@ -760,7 +762,10 @@ class MultiWallet extends LitElement {

${this.selectedTransaction.creatorAddress}
${translate("walletpage.wchange10")}
-
${this.selectedTransaction.recipient}
+
+ ${this.renderSQB()} +
+
${!this.selectedTransaction.amount ? '' : html` ${translate("walletpage.wchange11")}
@@ -805,11 +810,12 @@ class MultiWallet extends LitElement {
${this.selectedTransaction.btcSender}
- ${translate("walletpage.wchange10")} + ${translate("walletpage.wchange10")}
-
+
${this.selectedTransaction.btcReceiver}
+
${translate("walletpage.wchange12")}
@@ -857,9 +863,10 @@ class MultiWallet extends LitElement {
${translate("walletpage.wchange10")}
-
- ${this.selectedTransaction.ltcReceiver} +
+ ${this.selectedTransaction.ltcReceiver} this.sendToLtcAddress()} title="Send to this address">
+
${translate("walletpage.wchange12")}
@@ -902,10 +909,11 @@ class MultiWallet extends LitElement {
${translate("walletpage.wchange9")}
-
+
${this.selectedTransaction.dogeSender}
- ${translate("walletpage.wchange10")} +
+ ${translate("walletpage.wchange10")}
${this.selectedTransaction.dogeReceiver} @@ -955,11 +963,12 @@ class MultiWallet extends LitElement {
${this.selectedTransaction.dgbSender}
- ${translate("walletpage.wchange10")} + ${translate("walletpage.wchange10")}
-
+
style="display: inline;" ${this.selectedTransaction.dgbReceiver}
+
${translate("walletpage.wchange12")}
@@ -1005,11 +1014,12 @@ class MultiWallet extends LitElement {
${this.selectedTransaction.rvnSender}
- ${translate("walletpage.wchange10")} + ${translate("walletpage.wchange10")}
-
+
${this.selectedTransaction.rvnReceiver}
+
${translate("walletpage.wchange12")}
@@ -1407,7 +1417,7 @@ class MultiWallet extends LitElement { - +
@@ -1762,7 +1772,7 @@ class MultiWallet extends LitElement { checkSelectedTextAndShowMenu() }) - this.shadowRoot.getElementById('rvnAmountInput').addEventListener('contextmenu', (event) => { + this.shadowRoot.getElementById('rvnAmountInput').addEventListener('contextmenu', (event) => { const getSelectedText = () => { var text = '' if (typeof window.getSelection != 'undefined') { @@ -1879,6 +1889,18 @@ class MultiWallet extends LitElement { this.errorMessage = '' } + sendToQortAddress() { + this.recipient = this.selectedTransaction.recipient + this.openSendQort() + this.shadowRoot.querySelector('#showTransactionDetailsDialog').close() + } + + sendToLtcAddress() { + this.ltcRecipient = this.selectedTransaction.ltcReceiver + this.openSendLtc() + this.shadowRoot.querySelector('#showLtcTransactionDetailsDialog').close() + } + calculateQortAll() { if (this.balance < 0.00100000) { let not_enough_string = get("walletpage.wchange26") @@ -1898,6 +1920,15 @@ class MultiWallet extends LitElement { } } + renderSQB() { + let displaybutton = this.selectedTransaction.recipient + if (displaybutton == null) { + return html`${this.selectedTransaction.recipient}` + } else { + return html`${this.selectedTransaction.recipient} this.sendToQortAddress()} title="Send to this address">` + } + } + renderFetchText() { return html`${translate("walletpage.wchange1")}` } @@ -2198,7 +2229,6 @@ class MultiWallet extends LitElement { } const response = await parentEpml.request('sendLtc', opts) return response - console.log(response) } const manageResponse = (response) => { @@ -2216,7 +2246,6 @@ class MultiWallet extends LitElement { this.sendMoneyLoading = false this.btnDisable = false throw new Error(txnResponse) - console.log(txnResponse) } else { this.errorMessage = response.message this.sendMoneyLoading = false @@ -2225,7 +2254,6 @@ class MultiWallet extends LitElement { } } const res = await makeRequest() - console.log(res) manageResponse(res) this.showWallet() } @@ -2454,7 +2482,6 @@ class MultiWallet extends LitElement { } const sortedTransactions = txs.sort(compareFn) - console.log(sortedTransactions) if (this._selectedWallet == coin) { this.wallets.get(this._selectedWallet).transactions = sortedTransactions } @@ -2606,7 +2633,7 @@ class MultiWallet extends LitElement { render(this.renderDogeTransactions(this.wallets.get(this._selectedWallet).transactions, this._selectedWallet), this.transactionsDOM) } else if (this._selectedWallet === 'dgb') { render(this.renderDgbTransactions(this.wallets.get(this._selectedWallet).transactions, this._selectedWallet), this.transactionsDOM) - } else if (this._selectedWallet === 'rvn') { + } else if (this._selectedWallet === 'rvn') { render(this.renderRvnTransactions(this.wallets.get(this._selectedWallet).transactions, this._selectedWallet), this.transactionsDOM) } } From f5a8bc94cffedf8549b162766781c97ec43fd909 Mon Sep 17 00:00:00 2001 From: proto <34919827+protoniuman@users.noreply.github.com> Date: Thu, 18 Aug 2022 01:30:46 +0100 Subject: [PATCH 4/7] Update trade-portal.src.js Added an icon to the coin selection menu --- .../core/trade-portal/trade-portal.src.js | 25 ++++++++++++++++--- 1 file changed, 22 insertions(+), 3 deletions(-) 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 28bc5809..7b588206 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 @@ -331,6 +331,7 @@ class TradePortal extends LitElement { mwc-select#coinSelectionMenu { font-size: 24px; + width:220px; } mwc-select#coinSelectionMenu mwc-list-item { @@ -1064,10 +1065,10 @@ class TradePortal extends LitElement { let coinSelectionMenu = this.shadowRoot.getElementById("coinSelectionMenu") coinSelectionMenu.addEventListener('change', function () { - _this.setForeignCoin(coinSelectionMenu.value) + _this.setForeignCoin(coinSelectionMenu.value,false) }) - _this.setForeignCoin(coinSelectionMenu.value) + _this.setForeignCoin(coinSelectionMenu.value,true) }) parentEpml.imReady() @@ -1140,9 +1141,27 @@ class TradePortal extends LitElement { }) } - setForeignCoin(coin) { + setForeignCoin(coin,beingInitialized) { let _this = this this.selectedCoin = coin + + let coinSelectionMenu=this.shadowRoot.getElementById("coinSelectionMenu") + + if(beingInitialized){ + //apply padding to the container + coinSelectionMenu.shadowRoot.querySelector('.mdc-select--outlined .mdc-select__anchor').setAttribute('style', 'padding-left: 60px;') + //create the coin pair container + let pairIconContainer = document.createElement("span") + pairIconContainer.setAttribute("class","pairIconContainer") + pairIconContainer.setAttribute('style', 'left: 10px;top: 50%;transform: translate(0, -50%);height: 26px;width: 45px;position: absolute;background-repeat: no-repeat;background-size: cover;background-image: url(/img/qort'+_this.listedCoins.get(_this.selectedCoin).coinCode+'.png);') + + //appending the coin pair container to the menu + coinSelectionMenu.shadowRoot.querySelector('.mdc-select--outlined .mdc-select__anchor').appendChild(pairIconContainer) + }else{//we need just to update the existing pair icon container + let pairIconContainer = coinSelectionMenu.shadowRoot.querySelector(".mdc-select--outlined .mdc-select__anchor span.pairIconContainer") + pairIconContainer.style.backgroundImage='url(/img/qort'+_this.listedCoins.get(_this.selectedCoin).coinCode+'.png)' + } + this.isLoadingHistoricTrades = true this.isLoadingOpenTrades = true this.createConnection() From c8894ae3e06ad154d647f2d0862475b96b4b1f23 Mon Sep 17 00:00:00 2001 From: AlphaX-Projects <77661270+AlphaX-Projects@users.noreply.github.com> Date: Thu, 18 Aug 2022 12:44:40 +0200 Subject: [PATCH 5/7] Finish send all and send to. Update deps --- 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 +- qortal-ui-core/package.json | 30 ++--- qortal-ui-plugins/package.json | 30 ++--- .../plugins/core/wallet/wallet-app.src.js | 103 +++++++++++++++--- 21 files changed, 155 insertions(+), 61 deletions(-) diff --git a/package.json b/package.json index 0359426d..296a5630 100644 --- a/package.json +++ b/package.json @@ -36,7 +36,7 @@ "electron-log": "4.4.8" }, "devDependencies": { - "electron": "19.0.11", + "electron": "19.0.13", "electron-builder": "23.3.3", "electron-notarize": "1.2.1", "electron-packager": "15.5.1", diff --git a/qortal-ui-core/language/de.json b/qortal-ui-core/language/de.json index 189db09c..560523a1 100644 --- a/qortal-ui-core/language/de.json +++ b/qortal-ui-core/language/de.json @@ -240,7 +240,8 @@ "wchange42":"Bestätigungen", "wchange43":"Ihre Transaktion wird erst angezeigt, wenn sie bestätigt wurde. Seien Sie geduldig...", "wchange44":"Bitte versuche es erneut...", - "wchange45":"Sende alle" + "wchange45":"Sende alle", + "wchange46":"An diese Adresse verschicken" }, "tradepage":{ "tchange1":"Handelsportal", diff --git a/qortal-ui-core/language/es.json b/qortal-ui-core/language/es.json index c495083e..08b4ff4c 100644 --- a/qortal-ui-core/language/es.json +++ b/qortal-ui-core/language/es.json @@ -240,7 +240,8 @@ "wchange42":"Confirmaciones", "wchange43":"Su transacción no se mostrará hasta que se confirme, sea paciente...", "wchange44":"Inténtalo de nuevo...", - "wchange45":"Envia todo" + "wchange45":"Envia todo", + "wchange46":"Enviar a esta dirección" }, "tradepage":{ "tchange1":"Portal de Comercio", diff --git a/qortal-ui-core/language/fr.json b/qortal-ui-core/language/fr.json index a77e729e..c8981cdb 100644 --- a/qortal-ui-core/language/fr.json +++ b/qortal-ui-core/language/fr.json @@ -240,7 +240,8 @@ "wchange42":"Confirmations", "wchange43":"Votre transaction ne s'affichera pas tant qu'elle n'aura pas été confirmée, soyez patient...", "wchange44":"Veuillez réessayer...", - "wchange45":"Envoyer tout" + "wchange45":"Envoyer tout", + "wchange46":"Envoyer à cette adresse" }, "tradepage":{ "tchange1":"Portail de commerce", diff --git a/qortal-ui-core/language/hindi.json b/qortal-ui-core/language/hindi.json index 98cba547..e713dbea 100644 --- a/qortal-ui-core/language/hindi.json +++ b/qortal-ui-core/language/hindi.json @@ -241,7 +241,8 @@ "wchange42":"पुष्टियों", "wchange43":"कन्फर्म होने तक आपका ट्रांजैक्शन नहीं दिखेगा, धैर्य रखें...", "wchange44":"कृपया पुन: प्रयास करें...", - "wchange45":"सब भेजें" + "wchange45":"सब भेजें", + "wchange46":"इस पते पर भेजें" }, "tradepage":{ "tchange1":"व्यापार पोर्टल", diff --git a/qortal-ui-core/language/hr.json b/qortal-ui-core/language/hr.json index 6b2479ff..19b504ce 100644 --- a/qortal-ui-core/language/hr.json +++ b/qortal-ui-core/language/hr.json @@ -240,7 +240,8 @@ "wchange42":"Potvrde", "wchange43":"Vaša transakcija se neće prikazati dok se ne potvrdi, budite strpljivi...", "wchange44":"Molim te pokušaj ponovno...", - "wchange45":"Pošalji sve" + "wchange45":"Pošalji sve", + "wchange46":"Šaljite na ovu adresu" }, "tradepage":{ "tchange1":"Portal razmjene", diff --git a/qortal-ui-core/language/hu.json b/qortal-ui-core/language/hu.json index ff480433..3fc25e2a 100644 --- a/qortal-ui-core/language/hu.json +++ b/qortal-ui-core/language/hu.json @@ -240,7 +240,8 @@ "wchange42":"Visszaigazolások", "wchange43":"A tranzakció nem jelenik meg a megerősítésig, legyen türelemmel...", "wchange44":"Kérlek próbáld újra...", - "wchange45":"Az összes elküldése" + "wchange45":"Az összes elküldése", + "wchange46":"Küldje el erre a címre" }, "tradepage":{ "tchange1":"Kereskedelmi Portál", diff --git a/qortal-ui-core/language/it.json b/qortal-ui-core/language/it.json index 92e6f02d..973297d6 100644 --- a/qortal-ui-core/language/it.json +++ b/qortal-ui-core/language/it.json @@ -240,7 +240,8 @@ "wchange42":"Conferme", "wchange43":"La tua transazione non verrà mostrata fino a quando non sarà confermata, sii paziente...", "wchange44":"Per favore riprova...", - "wchange45":"Invia tutto" + "wchange45":"Invia tutto", + "wchange46":"Invia a questo indirizzo" }, "tradepage":{ "tchange1":"Portale commerciale", diff --git a/qortal-ui-core/language/ko.json b/qortal-ui-core/language/ko.json index 8994777f..56503ff5 100644 --- a/qortal-ui-core/language/ko.json +++ b/qortal-ui-core/language/ko.json @@ -240,7 +240,8 @@ "wchange42":"확인", "wchange43":"확인될 때까지 거래가 표시되지 않습니다. 기다려 주십시오.", "wchange44":"다시 시도하십시오...", - "wchange45":"모두 보내기" + "wchange45":"모두 보내기", + "wchange46":"이 주소로 보내기" }, "tradepage":{ "tchange1":"무역 포털", diff --git a/qortal-ui-core/language/no.json b/qortal-ui-core/language/no.json index 697ebf33..b0e663a2 100644 --- a/qortal-ui-core/language/no.json +++ b/qortal-ui-core/language/no.json @@ -240,7 +240,8 @@ "wchange42":"Bekreftelser", "wchange43":"Transaksjonen din vises ikke før den er bekreftet, vær tålmodig...", "wchange44":"Vær så snill, prøv på nytt...", - "wchange45":"Send alle" + "wchange45":"Send alle", + "wchange46":"Send til denne adressen" }, "tradepage":{ "tchange1":"Handelsportal", diff --git a/qortal-ui-core/language/pl.json b/qortal-ui-core/language/pl.json index 6e557c1d..fd0c1495 100644 --- a/qortal-ui-core/language/pl.json +++ b/qortal-ui-core/language/pl.json @@ -240,7 +240,8 @@ "wchange42":"Potwierdzenia", "wchange43":"Twoja transakcja nie pojawi się, dopóki nie zostanie potwierdzona, bądź cierpliwy...", "wchange44":"Proszę spróbuj ponownie...", - "wchange45":"Wyślij wszystko" + "wchange45":"Wyślij wszystko", + "wchange46":"Wyślij na ten adres" }, "tradepage":{ "tchange1":"Portal Handlowy", diff --git a/qortal-ui-core/language/pt.json b/qortal-ui-core/language/pt.json index f4fd9e00..db413176 100644 --- a/qortal-ui-core/language/pt.json +++ b/qortal-ui-core/language/pt.json @@ -240,7 +240,8 @@ "wchange42":"Confirmações", "wchange43":"Sua transação não será exibida até ser confirmada, seja paciente...", "wchange44":"Por favor, tente novamente...", - "wchange45":"Envie todos" + "wchange45":"Envie todos", + "wchange46":"Enviar para este endereço" }, "tradepage":{ "tchange1":"Portal do Comércio", diff --git a/qortal-ui-core/language/ro.json b/qortal-ui-core/language/ro.json index 02f5df31..4cb2649e 100644 --- a/qortal-ui-core/language/ro.json +++ b/qortal-ui-core/language/ro.json @@ -240,7 +240,8 @@ "wchange42":"Confirmari", "wchange43":"Tranzactia nu va aparea pana ce nu este confirmata, ai rabdare...", "wchange44":"Te rog incearca din nou...", - "wchange45":"Trimite toate" + "wchange45":"Trimite toate", + "wchange46":"Trimiteti la aceasta adresa" }, "tradepage":{ "tchange1":"Portal de Tranzactionare", diff --git a/qortal-ui-core/language/rs.json b/qortal-ui-core/language/rs.json index 7196810d..8f23e049 100644 --- a/qortal-ui-core/language/rs.json +++ b/qortal-ui-core/language/rs.json @@ -240,7 +240,8 @@ "wchange42":"Potvrde", "wchange43":"Vaša transakcija se neće prikazati dok se ne potvrdi, budite strpljivi...", "wchange44":"Molim vas, pokušajte ponovo...", - "wchange45":"Poslati sve" + "wchange45":"Poslati sve", + "wchange46":"Pošaljite na ovu adresu" }, "tradepage":{ "tchange1":"Trgovinski prozor", diff --git a/qortal-ui-core/language/ru.json b/qortal-ui-core/language/ru.json index df148445..37eb425a 100644 --- a/qortal-ui-core/language/ru.json +++ b/qortal-ui-core/language/ru.json @@ -240,7 +240,8 @@ "wchange42":"Подтверждено", "wchange43":"Ваша транзакция не будет отображаться, пока не будет подтверждена, наберитесь терпения...", "wchange44":"Пожалуйста, попробуйте еще раз...", - "wchange45":"Отправь все" + "wchange45":"Отправь все", + "wchange46":"Отправить на этот адрес" }, "tradepage":{ "tchange1":"Торговый портал", diff --git a/qortal-ui-core/language/us.json b/qortal-ui-core/language/us.json index 6ed4f7f1..77026ebd 100644 --- a/qortal-ui-core/language/us.json +++ b/qortal-ui-core/language/us.json @@ -235,7 +235,8 @@ "wchange42":"Confirmations", "wchange43":"Your transaction will not show until confirmed, be patient...", "wchange44":"Please try again...", - "wchange45":"Send all" + "wchange45":"Send all", + "wchange46":"Send to this address" }, "tradepage":{ "tchange1":"Trade Portal", diff --git a/qortal-ui-core/language/zhc.json b/qortal-ui-core/language/zhc.json index 5982c765..b4611c18 100644 --- a/qortal-ui-core/language/zhc.json +++ b/qortal-ui-core/language/zhc.json @@ -240,7 +240,8 @@ "wchange42":"确认数", "wchange43":"您的交易在确认之前不会显示,请耐心等待...", "wchange44":"请再试一次...", - "wchange45":"全部发送" + "wchange45":"全部发送", + "wchange46":"发送到这个地址" }, "tradepage":{ "tchange1":"交易门户", diff --git a/qortal-ui-core/language/zht.json b/qortal-ui-core/language/zht.json index 28d75353..a466f2bf 100644 --- a/qortal-ui-core/language/zht.json +++ b/qortal-ui-core/language/zht.json @@ -240,7 +240,8 @@ "wchange42":"確認數", "wchange43":"您的交易在確認之前不會顯示,請耐心等待...", "wchange44":"請再試一次...", - "wchange45":"全部發送" + "wchange45":"全部發送", + "wchange46":"發送到這個地址" }, "tradepage":{ "tchange1":"交易門戶", diff --git a/qortal-ui-core/package.json b/qortal-ui-core/package.json index 54f1e6be..56b08fd7 100644 --- a/qortal-ui-core/package.json +++ b/qortal-ui-core/package.json @@ -19,22 +19,22 @@ "dependencies": { "@hapi/hapi": "20.2.2", "@hapi/inert": "7.0.0", - "sass": "1.54.3" + "sass": "1.54.4" }, "devDependencies": { "@babel/core": "7.18.10", - "@material/mwc-button": "0.26.1", - "@material/mwc-checkbox": "0.26.1", - "@material/mwc-dialog": "0.26.1", - "@material/mwc-drawer": "0.26.1", - "@material/mwc-fab": "0.26.1", - "@material/mwc-formfield": "0.26.1", - "@material/mwc-icon": "0.26.1", - "@material/mwc-icon-button": "0.26.1", - "@material/mwc-list": "0.26.1", - "@material/mwc-select": "0.26.1", - "@material/mwc-snackbar": "0.26.1", - "@material/mwc-textfield": "0.26.1", + "@material/mwc-button": "0.27.0", + "@material/mwc-checkbox": "0.27.0", + "@material/mwc-dialog": "0.27.0", + "@material/mwc-drawer": "0.27.0", + "@material/mwc-fab": "0.27.0", + "@material/mwc-formfield": "0.27.0", + "@material/mwc-icon": "0.27.0", + "@material/mwc-icon-button": "0.27.0", + "@material/mwc-list": "0.27.0", + "@material/mwc-select": "0.27.0", + "@material/mwc-snackbar": "0.27.0", + "@material/mwc-textfield": "0.27.0", "@polymer/app-layout": "3.1.0", "@polymer/iron-collapse": "3.0.1", "@polymer/iron-flex-layout": "3.0.1", @@ -65,14 +65,14 @@ "bcryptjs": "2.4.3", "epml": "0.3.3", "file-saver": "2.0.5", - "lit": "2.2.8", + "lit": "2.3.0", "lit-translate": "2.0.1", "postcss": "8.4.16", "pwa-helpers": "0.9.1", "random-sentence-generator": "0.0.8", "redux": "4.2.0", "redux-thunk": "2.4.1", - "rollup": "2.77.2", + "rollup": "2.78.0", "rollup-plugin-node-globals": "1.4.0", "rollup-plugin-postcss": "4.0.2", "rollup-plugin-progress": "1.1.2", diff --git a/qortal-ui-plugins/package.json b/qortal-ui-plugins/package.json index 3d9d5440..42ba39b1 100644 --- a/qortal-ui-plugins/package.json +++ b/qortal-ui-plugins/package.json @@ -17,24 +17,24 @@ "author": "QORTAL ", "license": "GPL-3.0", "dependencies": { - "@material/mwc-list": "0.26.1", - "@material/mwc-select": "0.26.1", + "@material/mwc-list": "0.27.0", + "@material/mwc-select": "0.27.0", "emoji-picker-js": "https://github.com/Qortal/emoji-picker-js" }, "devDependencies": { "@babel/core": "7.18.10", "@github/time-elements": "3.1.2", - "@material/mwc-button": "0.26.1", - "@material/mwc-checkbox": "0.26.1", - "@material/mwc-dialog": "0.26.1", - "@material/mwc-formfield": "0.26.1", - "@material/mwc-icon": "0.26.1", - "@material/mwc-icon-button": "0.26.1", - "@material/mwc-slider": "0.26.1", - "@material/mwc-snackbar": "0.26.1", - "@material/mwc-tab": "0.26.1", - "@material/mwc-tab-bar": "0.26.1", - "@material/mwc-textfield": "0.26.1", + "@material/mwc-button": "0.27.0", + "@material/mwc-checkbox": "0.27.0", + "@material/mwc-dialog": "0.27.0", + "@material/mwc-formfield": "0.27.0", + "@material/mwc-icon": "0.27.0", + "@material/mwc-icon-button": "0.27.0", + "@material/mwc-slider": "0.27.0", + "@material/mwc-snackbar": "0.27.0", + "@material/mwc-tab": "0.27.0", + "@material/mwc-tab-bar": "0.27.0", + "@material/mwc-textfield": "0.27.0", "@polymer/iron-icons": "3.0.1", "@polymer/paper-icon-button": "3.0.2", "@polymer/paper-progress": "3.0.1", @@ -51,9 +51,9 @@ "@vaadin/icons": "23.1.5", "epml": "0.3.3", "html-escaper": "3.0.3", - "lit": "2.2.8", + "lit": "2.3.0", "lit-translate": "2.0.1", - "rollup": "2.77.2", + "rollup": "2.78.0", "rollup-plugin-node-globals": "1.4.0", "rollup-plugin-progress": "1.1.2", "rollup-plugin-terser": "7.0.2" diff --git a/qortal-ui-plugins/plugins/core/wallet/wallet-app.src.js b/qortal-ui-plugins/plugins/core/wallet/wallet-app.src.js index 8c19be4e..b84beb3d 100644 --- a/qortal-ui-plugins/plugins/core/wallet/wallet-app.src.js +++ b/qortal-ui-plugins/plugins/core/wallet/wallet-app.src.js @@ -813,7 +813,7 @@ class MultiWallet extends LitElement { ${translate("walletpage.wchange10")}
- ${this.selectedTransaction.btcReceiver} + ${this.selectedTransaction.btcReceiver} this.sendToBtcAddress()} title="${translate("walletpage.wchange46")}">

${translate("walletpage.wchange12")} @@ -864,7 +864,7 @@ class MultiWallet extends LitElement { ${translate("walletpage.wchange10")}
- ${this.selectedTransaction.ltcReceiver} this.sendToLtcAddress()} title="Send to this address"> + ${this.selectedTransaction.ltcReceiver} this.sendToLtcAddress()} title="${translate("walletpage.wchange46")}">

${translate("walletpage.wchange12")} @@ -915,9 +915,10 @@ class MultiWallet extends LitElement {
${translate("walletpage.wchange10")}
-
- ${this.selectedTransaction.dogeReceiver} +
+ ${this.selectedTransaction.dogeReceiver} this.sendToDogeAddress()} title="${translate("walletpage.wchange46")}">
+
${translate("walletpage.wchange12")}
@@ -965,8 +966,8 @@ class MultiWallet extends LitElement {
${translate("walletpage.wchange10")}
-
style="display: inline;" - ${this.selectedTransaction.dgbReceiver} +
+ ${this.selectedTransaction.dgbReceiver} this.sendToDgbAddress()} title="${translate("walletpage.wchange46")}">

${translate("walletpage.wchange12")} @@ -1017,7 +1018,7 @@ class MultiWallet extends LitElement { ${translate("walletpage.wchange10")}
- ${this.selectedTransaction.rvnReceiver} + ${this.selectedTransaction.rvnReceiver} this.sendToRvnAddress()} title="${translate("walletpage.wchange46")}">

${translate("walletpage.wchange12")} @@ -1127,7 +1128,10 @@ class MultiWallet extends LitElement {

Available balance:
- ${this.balanceString} + ${this.balanceString}
+ + this.calculateBtcAll()}> ${translate("walletpage.wchange45")} BTC +
 

${translate("walletpage.wchange19")}:
- ${this.balanceString} + ${this.balanceString}
+ + this.calculateDogeAll()}> ${translate("walletpage.wchange45")} DOGE +
 

${translate("walletpage.wchange19")}:
- ${this.balanceString} + ${this.balanceString}
+ + this.calculateDgbAll()}> ${translate("walletpage.wchange45")} DGB +
 

${translate("walletpage.wchange19")}:
- ${this.balanceString} + ${this.balanceString}
+ + this.calculateRvnAll()}> ${translate("walletpage.wchange45")} RVN +
 

${this.selectedTransaction.recipient}` } else { - return html`${this.selectedTransaction.recipient} this.sendToQortAddress()} title="Send to this address">` + return html`${this.selectedTransaction.recipient} this.sendToQortAddress()} title="${translate("walletpage.wchange46")}">` } } From 778ef3590a7b5691ae9e4e6d0aed6354a58f4568 Mon Sep 17 00:00:00 2001 From: AlphaX-Projects <77661270+AlphaX-Projects@users.noreply.github.com> Date: Thu, 18 Aug 2022 12:48:41 +0200 Subject: [PATCH 6/7] Fixed image name to lowercase --- .../plugins/core/trade-portal/trade-portal.src.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) 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 7b588206..0144d678 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 @@ -1152,14 +1152,16 @@ class TradePortal extends LitElement { coinSelectionMenu.shadowRoot.querySelector('.mdc-select--outlined .mdc-select__anchor').setAttribute('style', 'padding-left: 60px;') //create the coin pair container let pairIconContainer = document.createElement("span") + let pairicon = (_this.listedCoins.get(_this.selectedCoin).coinCode).toLowerCase() pairIconContainer.setAttribute("class","pairIconContainer") - pairIconContainer.setAttribute('style', 'left: 10px;top: 50%;transform: translate(0, -50%);height: 26px;width: 45px;position: absolute;background-repeat: no-repeat;background-size: cover;background-image: url(/img/qort'+_this.listedCoins.get(_this.selectedCoin).coinCode+'.png);') + pairIconContainer.setAttribute('style', 'left: 10px;top: 50%;transform: translate(0, -50%);height: 26px;width: 45px;position: absolute;background-repeat: no-repeat;background-size: cover;background-image: url(/img/qort'+pairicon+'.png);') //appending the coin pair container to the menu coinSelectionMenu.shadowRoot.querySelector('.mdc-select--outlined .mdc-select__anchor').appendChild(pairIconContainer) }else{//we need just to update the existing pair icon container let pairIconContainer = coinSelectionMenu.shadowRoot.querySelector(".mdc-select--outlined .mdc-select__anchor span.pairIconContainer") - pairIconContainer.style.backgroundImage='url(/img/qort'+_this.listedCoins.get(_this.selectedCoin).coinCode+'.png)' + let pairicon = (_this.listedCoins.get(_this.selectedCoin).coinCode).toLowerCase() + pairIconContainer.style.backgroundImage='url(/img/qort'+pairicon+'.png)' } this.isLoadingHistoricTrades = true From 7cd440641b5d3cb7456a9f39c8ad23f1ceb4693b Mon Sep 17 00:00:00 2001 From: AlphaX-Projects <77661270+AlphaX-Projects@users.noreply.github.com> Date: Thu, 18 Aug 2022 18:13:11 +0200 Subject: [PATCH 7/7] Translations for Addressbook --- qortal-ui-core/language/de.json | 5 ++++- qortal-ui-core/language/es.json | 5 ++++- qortal-ui-core/language/fr.json | 5 ++++- qortal-ui-core/language/hindi.json | 5 ++++- qortal-ui-core/language/hr.json | 5 ++++- qortal-ui-core/language/hu.json | 5 ++++- qortal-ui-core/language/it.json | 5 ++++- qortal-ui-core/language/ko.json | 5 ++++- qortal-ui-core/language/no.json | 5 ++++- qortal-ui-core/language/pl.json | 5 ++++- qortal-ui-core/language/pt.json | 5 ++++- qortal-ui-core/language/ro.json | 5 ++++- qortal-ui-core/language/rs.json | 5 ++++- qortal-ui-core/language/ru.json | 5 ++++- qortal-ui-core/language/us.json | 5 ++++- qortal-ui-core/language/zhc.json | 5 ++++- qortal-ui-core/language/zht.json | 5 ++++- 17 files changed, 68 insertions(+), 17 deletions(-) diff --git a/qortal-ui-core/language/de.json b/qortal-ui-core/language/de.json index 560523a1..429a41b7 100644 --- a/qortal-ui-core/language/de.json +++ b/qortal-ui-core/language/de.json @@ -241,7 +241,10 @@ "wchange43":"Ihre Transaktion wird erst angezeigt, wenn sie bestätigt wurde. Seien Sie geduldig...", "wchange44":"Bitte versuche es erneut...", "wchange45":"Sende alle", - "wchange46":"An diese Adresse verschicken" + "wchange46":"An diese Adresse verschicken", + "wchange47":"Adressbuch", + "wchange48":"Dieses Adressbuch ist leer !", + "wchange49":"Zum Adressbuch hinzufügen" }, "tradepage":{ "tchange1":"Handelsportal", diff --git a/qortal-ui-core/language/es.json b/qortal-ui-core/language/es.json index 08b4ff4c..80e463c0 100644 --- a/qortal-ui-core/language/es.json +++ b/qortal-ui-core/language/es.json @@ -241,7 +241,10 @@ "wchange43":"Su transacción no se mostrará hasta que se confirme, sea paciente...", "wchange44":"Inténtalo de nuevo...", "wchange45":"Envia todo", - "wchange46":"Enviar a esta dirección" + "wchange46":"Enviar a esta dirección", + "wchange47":"Directorio", + "wchange48":"Esta libreta de direcciones está vacía !", + "wchange49":"Agregar a la libreta de direcciones" }, "tradepage":{ "tchange1":"Portal de Comercio", diff --git a/qortal-ui-core/language/fr.json b/qortal-ui-core/language/fr.json index c8981cdb..cc8548e0 100644 --- a/qortal-ui-core/language/fr.json +++ b/qortal-ui-core/language/fr.json @@ -241,7 +241,10 @@ "wchange43":"Votre transaction ne s'affichera pas tant qu'elle n'aura pas été confirmée, soyez patient...", "wchange44":"Veuillez réessayer...", "wchange45":"Envoyer tout", - "wchange46":"Envoyer à cette adresse" + "wchange46":"Envoyer à cette adresse", + "wchange47":"Carnet d'adresses", + "wchange48":"Ce carnet d'adresses est vide !", + "wchange49":"Ajouter au carnet d'adresses" }, "tradepage":{ "tchange1":"Portail de commerce", diff --git a/qortal-ui-core/language/hindi.json b/qortal-ui-core/language/hindi.json index e713dbea..abea6eed 100644 --- a/qortal-ui-core/language/hindi.json +++ b/qortal-ui-core/language/hindi.json @@ -242,7 +242,10 @@ "wchange43":"कन्फर्म होने तक आपका ट्रांजैक्शन नहीं दिखेगा, धैर्य रखें...", "wchange44":"कृपया पुन: प्रयास करें...", "wchange45":"सब भेजें", - "wchange46":"इस पते पर भेजें" + "wchange46":"इस पते पर भेजें", + "wchange47":"पता पुस्तिका", + "wchange48":"यह पता पुस्तिका खाली है !", + "wchange49":"पता सूची में जोड़ें" }, "tradepage":{ "tchange1":"व्यापार पोर्टल", diff --git a/qortal-ui-core/language/hr.json b/qortal-ui-core/language/hr.json index 19b504ce..ce661bdd 100644 --- a/qortal-ui-core/language/hr.json +++ b/qortal-ui-core/language/hr.json @@ -241,7 +241,10 @@ "wchange43":"Vaša transakcija se neće prikazati dok se ne potvrdi, budite strpljivi...", "wchange44":"Molim te pokušaj ponovno...", "wchange45":"Pošalji sve", - "wchange46":"Šaljite na ovu adresu" + "wchange46":"Šaljite na ovu adresu", + "wchange47":"Adresar", + "wchange48":"Ovaj adresar je prazan !", + "wchange49":"Dodaj u adresar" }, "tradepage":{ "tchange1":"Portal razmjene", diff --git a/qortal-ui-core/language/hu.json b/qortal-ui-core/language/hu.json index 3fc25e2a..f3fec587 100644 --- a/qortal-ui-core/language/hu.json +++ b/qortal-ui-core/language/hu.json @@ -241,7 +241,10 @@ "wchange43":"A tranzakció nem jelenik meg a megerősítésig, legyen türelemmel...", "wchange44":"Kérlek próbáld újra...", "wchange45":"Az összes elküldése", - "wchange46":"Küldje el erre a címre" + "wchange46":"Küldje el erre a címre", + "wchange47":"Címjegyzék", + "wchange48":"Ez a címjegyzék üres !", + "wchange49":"Hozzáadás a címjegyzékhez" }, "tradepage":{ "tchange1":"Kereskedelmi Portál", diff --git a/qortal-ui-core/language/it.json b/qortal-ui-core/language/it.json index 973297d6..b5f6d9a8 100644 --- a/qortal-ui-core/language/it.json +++ b/qortal-ui-core/language/it.json @@ -241,7 +241,10 @@ "wchange43":"La tua transazione non verrà mostrata fino a quando non sarà confermata, sii paziente...", "wchange44":"Per favore riprova...", "wchange45":"Invia tutto", - "wchange46":"Invia a questo indirizzo" + "wchange46":"Invia a questo indirizzo", + "wchange47":"Rubrica", + "wchange48":"Questa rubrica è vuota !", + "wchange49":"Aggiungi alla rubrica" }, "tradepage":{ "tchange1":"Portale commerciale", diff --git a/qortal-ui-core/language/ko.json b/qortal-ui-core/language/ko.json index 56503ff5..e8c57fc0 100644 --- a/qortal-ui-core/language/ko.json +++ b/qortal-ui-core/language/ko.json @@ -241,7 +241,10 @@ "wchange43":"확인될 때까지 거래가 표시되지 않습니다. 기다려 주십시오.", "wchange44":"다시 시도하십시오...", "wchange45":"모두 보내기", - "wchange46":"이 주소로 보내기" + "wchange46":"이 주소로 보내기", + "wchange47":"주소록", + "wchange48":"이 주소록이 비어 있습니다 !", + "wchange49":"주소록에 추가하다" }, "tradepage":{ "tchange1":"무역 포털", diff --git a/qortal-ui-core/language/no.json b/qortal-ui-core/language/no.json index b0e663a2..a0ca2e06 100644 --- a/qortal-ui-core/language/no.json +++ b/qortal-ui-core/language/no.json @@ -241,7 +241,10 @@ "wchange43":"Transaksjonen din vises ikke før den er bekreftet, vær tålmodig...", "wchange44":"Vær så snill, prøv på nytt...", "wchange45":"Send alle", - "wchange46":"Send til denne adressen" + "wchange46":"Send til denne adressen", + "wchange47":"Adressebok", + "wchange48":"Denne adresseboken er tom !", + "wchange49":"Legg til i Adresseboken" }, "tradepage":{ "tchange1":"Handelsportal", diff --git a/qortal-ui-core/language/pl.json b/qortal-ui-core/language/pl.json index fd0c1495..be76d298 100644 --- a/qortal-ui-core/language/pl.json +++ b/qortal-ui-core/language/pl.json @@ -241,7 +241,10 @@ "wchange43":"Twoja transakcja nie pojawi się, dopóki nie zostanie potwierdzona, bądź cierpliwy...", "wchange44":"Proszę spróbuj ponownie...", "wchange45":"Wyślij wszystko", - "wchange46":"Wyślij na ten adres" + "wchange46":"Wyślij na ten adres", + "wchange47":"Książka adresowa", + "wchange48":"Ta książka adresowa jest pusta !", + "wchange49":"Dodaj do książki adresowej" }, "tradepage":{ "tchange1":"Portal Handlowy", diff --git a/qortal-ui-core/language/pt.json b/qortal-ui-core/language/pt.json index db413176..58906973 100644 --- a/qortal-ui-core/language/pt.json +++ b/qortal-ui-core/language/pt.json @@ -241,7 +241,10 @@ "wchange43":"Sua transação não será exibida até ser confirmada, seja paciente...", "wchange44":"Por favor, tente novamente...", "wchange45":"Envie todos", - "wchange46":"Enviar para este endereço" + "wchange46":"Enviar para este endereço", + "wchange47":"Livro de endereços", + "wchange48":"Este catálogo de endereços está vazio !", + "wchange49":"Adicionar ao catálogo de endereços" }, "tradepage":{ "tchange1":"Portal do Comércio", diff --git a/qortal-ui-core/language/ro.json b/qortal-ui-core/language/ro.json index 4cb2649e..7a638f71 100644 --- a/qortal-ui-core/language/ro.json +++ b/qortal-ui-core/language/ro.json @@ -241,7 +241,10 @@ "wchange43":"Tranzactia nu va aparea pana ce nu este confirmata, ai rabdare...", "wchange44":"Te rog incearca din nou...", "wchange45":"Trimite toate", - "wchange46":"Trimiteti la aceasta adresa" + "wchange46":"Trimiteti la aceasta adresa", + "wchange47":"Carte de adrese", + "wchange48":"Aceasta agenda de adrese este goala !", + "wchange49":"Adauga la agenda cu adrese" }, "tradepage":{ "tchange1":"Portal de Tranzactionare", diff --git a/qortal-ui-core/language/rs.json b/qortal-ui-core/language/rs.json index 8f23e049..d480eb9d 100644 --- a/qortal-ui-core/language/rs.json +++ b/qortal-ui-core/language/rs.json @@ -241,7 +241,10 @@ "wchange43":"Vaša transakcija se neće prikazati dok se ne potvrdi, budite strpljivi...", "wchange44":"Molim vas, pokušajte ponovo...", "wchange45":"Poslati sve", - "wchange46":"Pošaljite na ovu adresu" + "wchange46":"Pošaljite na ovu adresu", + "wchange47":"Adresar", + "wchange48":"Ovaj adresar je prazan !", + "wchange49":"Dodaj u Adresar" }, "tradepage":{ "tchange1":"Trgovinski prozor", diff --git a/qortal-ui-core/language/ru.json b/qortal-ui-core/language/ru.json index 37eb425a..97cc5ab3 100644 --- a/qortal-ui-core/language/ru.json +++ b/qortal-ui-core/language/ru.json @@ -241,7 +241,10 @@ "wchange43":"Ваша транзакция не будет отображаться, пока не будет подтверждена, наберитесь терпения...", "wchange44":"Пожалуйста, попробуйте еще раз...", "wchange45":"Отправь все", - "wchange46":"Отправить на этот адрес" + "wchange46":"Отправить на этот адрес", + "wchange47":"Адресная книга", + "wchange48":"Эта адресная книга пуста !", + "wchange49":"Добавить в адресную книгу" }, "tradepage":{ "tchange1":"Торговый портал", diff --git a/qortal-ui-core/language/us.json b/qortal-ui-core/language/us.json index 77026ebd..f830a7df 100644 --- a/qortal-ui-core/language/us.json +++ b/qortal-ui-core/language/us.json @@ -236,7 +236,10 @@ "wchange43":"Your transaction will not show until confirmed, be patient...", "wchange44":"Please try again...", "wchange45":"Send all", - "wchange46":"Send to this address" + "wchange46":"Send to this address", + "wchange47":"Addressbook", + "wchange48":"This Addressbook is empty !", + "wchange49":"Add to Addressbook" }, "tradepage":{ "tchange1":"Trade Portal", diff --git a/qortal-ui-core/language/zhc.json b/qortal-ui-core/language/zhc.json index b4611c18..80894f45 100644 --- a/qortal-ui-core/language/zhc.json +++ b/qortal-ui-core/language/zhc.json @@ -241,7 +241,10 @@ "wchange43":"您的交易在确认之前不会显示,请耐心等待...", "wchange44":"请再试一次...", "wchange45":"全部发送", - "wchange46":"发送到这个地址" + "wchange46":"发送到这个地址", + "wchange47":"地址簿", + "wchange48":"此通讯录为空 !", + "wchange49":"加至地址簿" }, "tradepage":{ "tchange1":"交易门户", diff --git a/qortal-ui-core/language/zht.json b/qortal-ui-core/language/zht.json index a466f2bf..4b248e2a 100644 --- a/qortal-ui-core/language/zht.json +++ b/qortal-ui-core/language/zht.json @@ -241,7 +241,10 @@ "wchange43":"您的交易在確認之前不會顯示,請耐心等待...", "wchange44":"請再試一次...", "wchange45":"全部發送", - "wchange46":"發送到這個地址" + "wchange46":"發送到這個地址", + "wchange47":"地址簿", + "wchange48":"此通訊錄為空 !", + "wchange49":"加至地址簿" }, "tradepage":{ "tchange1":"交易門戶",