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] 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() }