jschulthess/qortal-ui
1
0
Fork 0
forked from Qortal/qortal-ui
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' into pirate-chain; fix translation conflicts

Browse Source 
# Conflicts:
#	qortal-ui-core/language/de.json
#	qortal-ui-core/language/es.json
#	qortal-ui-core/language/fr.json
#	qortal-ui-core/language/hindi.json
#	qortal-ui-core/language/hr.json
#	qortal-ui-core/language/hu.json
#	qortal-ui-core/language/it.json
#	qortal-ui-core/language/ko.json
#	qortal-ui-core/language/no.json
#	qortal-ui-core/language/pl.json
#	qortal-ui-core/language/pt.json
#	qortal-ui-core/language/ro.json
#	qortal-ui-core/language/rs.json
#	qortal-ui-core/language/ru.json
#	qortal-ui-core/language/us.json
#	qortal-ui-core/language/zhc.json
#	qortal-ui-core/language/zht.json
#	qortal-ui-plugins/plugins/core/trade-portal/trade-portal.src.js
This commit is contained in:
CalDescent 2022-08-19 14:04:07 +01:00
commit ef29eeac16
22 changed files with 249 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@ -36,7 +36,7 @@
"electron-log": "4.4.8" "electron-log": "4.4.8"
}, },
"devDependencies": { "devDependencies": {
"electron": "19.0.11", "electron": "19.0.13",
"electron-builder": "23.3.3", "electron-builder": "23.3.3",
"electron-notarize": "1.2.1", "electron-notarize": "1.2.1",
"electron-packager": "15.5.1", "electron-packager": "15.5.1",

8
qortal-ui-core/language/de.json
View File

@ -241,7 +241,11 @@
"wchange43":"Ihre Transaktion wird erst angezeigt, wenn sie bestätigt wurde. Seien Sie geduldig...", "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", "wchange45":"Sende alle",
"wchange46":"Memo" "wchange46":"An diese Adresse verschicken",
"wchange47":"Adressbuch",
"wchange48":"Dieses Adressbuch ist leer !",
"wchange49":"Zum Adressbuch hinzufügen",
"wchange50":"Memo"
}, },
"tradepage":{ "tradepage":{
"tchange1":"Handelsportal", "tchange1":"Handelsportal",
@ -618,4 +622,4 @@
"rewarddialog5":"Sie entfernen eine Prämienaktientransaktion, die mit dem Konto verknüpft ist:", "rewarddialog5":"Sie entfernen eine Prämienaktientransaktion, die mit dem Konto verknüpft ist:",
"rewarddialog6":"Wenn Sie auf „Bestätigen“ klicken, wird die Prämie entfernt und der Prägeschlüssel wird ungültig." "rewarddialog6":"Wenn Sie auf „Bestätigen“ klicken, wird die Prämie entfernt und der Prägeschlüssel wird ungültig."
} }
} }

8
qortal-ui-core/language/es.json
View File

@ -241,7 +241,11 @@
"wchange43":"Su transacción no se mostrará hasta que se confirme, sea paciente...", "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", "wchange45":"Envia todo",
"wchange46":"Memo" "wchange46":"Enviar a esta dirección",
"wchange47":"Directorio",
"wchange48":"Esta libreta de direcciones está vacía !",
"wchange49":"Agregar a la libreta de direcciones",
"wchange50":"Memo"
}, },
"tradepage":{ "tradepage":{
"tchange1":"Portal de Comercio", "tchange1":"Portal de Comercio",
@ -618,4 +622,4 @@
"rewarddialog5":"Está eliminando una transacción de recompensa compartida asociada con la cuenta:", "rewarddialog5":"Está eliminando una transacción de recompensa compartida asociada con la cuenta:",
"rewarddialog6":"Al presionar confirmar, se eliminará la recompensa compartida y la clave de acuñación dejará de ser válida." "rewarddialog6":"Al presionar confirmar, se eliminará la recompensa compartida y la clave de acuñación dejará de ser válida."
} }
} }

8
qortal-ui-core/language/fr.json
View File

@ -241,7 +241,11 @@
"wchange43":"Votre transaction ne s'affichera pas tant qu'elle n'aura pas été confirmée, soyez patient...", "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", "wchange45":"Envoyer tout",
"wchange46":"Memo" "wchange46":"Envoyer à cette adresse",
"wchange47":"Carnet d'adresses",
"wchange48":"Ce carnet d'adresses est vide !",
"wchange49":"Ajouter au carnet d'adresses",
"wchange50":"Memo"
}, },
"tradepage":{ "tradepage":{
"tchange1":"Portail de commerce", "tchange1":"Portail de commerce",
@ -618,4 +622,4 @@
"rewarddialog5":"Vous supprimez une transaction de partage de récompenses associée au compte :", "rewarddialog5":"Vous supprimez une transaction de partage de récompenses associée au compte :",
"rewarddialog6":"En appuyant sur confirmer, le partage de récompense sera supprimé et la clé de frappe deviendra invalide." "rewarddialog6":"En appuyant sur confirmer, le partage de récompense sera supprimé et la clé de frappe deviendra invalide."
} }
} }

8
qortal-ui-core/language/hindi.json
View File

@ -242,7 +242,11 @@
"wchange43":"कन्फर्म होने तक आपका ट्रांजैक्शन नहीं दिखेगा, धैर्य रखें...", "wchange43":"कन्फर्म होने तक आपका ट्रांजैक्शन नहीं दिखेगा, धैर्य रखें...",
"wchange44":"कृपया पुन: प्रयास करें...", "wchange44":"कृपया पुन: प्रयास करें...",
"wchange45":"सब भेजें", "wchange45":"सब भेजें",
"wchange46":"Memo" "wchange46":"इस पते पर भेजें",
"wchange47":"पता पुस्तिका",
"wchange48":"यह पता पुस्तिका खाली है !",
"wchange49":"पता सूची में जोड़ें",
"wchange50":"Memo"
}, },
"tradepage":{ "tradepage":{
"tchange1":"व्यापार पोर्टल", "tchange1":"व्यापार पोर्टल",
@ -619,4 +623,4 @@
"rewarddialog5":"आप खाते से जुड़े एक इनाम शेयर लेनदेन को हटा रहे हैं:", "rewarddialog5":"आप खाते से जुड़े एक इनाम शेयर लेनदेन को हटा रहे हैं:",
"rewarddialog6":"कन्फर्म दबाने पर, रिवॉर्डशेयर हटा दिया जाएगा और मिंटिंग की अमान्य हो जाएगी।" "rewarddialog6":"कन्फर्म दबाने पर, रिवॉर्डशेयर हटा दिया जाएगा और मिंटिंग की अमान्य हो जाएगी।"
} }
} }

8
qortal-ui-core/language/hr.json
View File

@ -241,7 +241,11 @@
"wchange43":"Vaša transakcija se neće prikazati dok se ne potvrdi, budite strpljivi...", "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", "wchange45":"Pošalji sve",
"wchange46":"Memo" "wchange46":"Šaljite na ovu adresu",
"wchange47":"Adresar",
"wchange48":"Ovaj adresar je prazan !",
"wchange49":"Dodaj u adresar",
"wchange50":"Memo"
}, },
"tradepage":{ "tradepage":{
"tchange1":"Portal razmjene", "tchange1":"Portal razmjene",
@ -618,4 +622,4 @@
"rewarddialog5":"Uklanjate transakciju dijeljenja nagrade povezanu s računom:", "rewarddialog5":"Uklanjate transakciju dijeljenja nagrade povezanu s računom:",
"rewarddialog6":"Pritiskom na potvrdu, dijeljenje nagrade bit će uklonjeno, a ključ za kovanje postat će nevažeći." "rewarddialog6":"Pritiskom na potvrdu, dijeljenje nagrade bit će uklonjeno, a ključ za kovanje postat će nevažeći."
} }
} }

8
qortal-ui-core/language/hu.json
View File

@ -241,7 +241,11 @@
"wchange43":"A tranzakció nem jelenik meg a megerősítésig, legyen türelemmel...", "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", "wchange45":"Az összes elküldése",
"wchange46":"Memo" "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",
"wchange50":"Memo"
}, },
"tradepage":{ "tradepage":{
"tchange1":"Kereskedelmi Portál", "tchange1":"Kereskedelmi Portál",
@ -618,4 +622,4 @@
"rewarddialog5":"Ön a következő fiókhoz társított jutalommegosztási tranzakciót távolít el:", "rewarddialog5":"Ön a következő fiókhoz társított jutalommegosztási tranzakciót távolít el:",
"rewarddialog6":"A megerősítés megnyomására a jutalommegosztás törlődik, és a pénzverési kulcs érvénytelenné válik." "rewarddialog6":"A megerősítés megnyomására a jutalommegosztás törlődik, és a pénzverési kulcs érvénytelenné válik."
} }
} }

8
qortal-ui-core/language/it.json
View File

@ -241,7 +241,11 @@
"wchange43":"La tua transazione non verrà mostrata fino a quando non sarà confermata, sii paziente...", "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", "wchange45":"Invia tutto",
"wchange46":"Memo" "wchange46":"Invia a questo indirizzo",
"wchange47":"Rubrica",
"wchange48":"Questa rubrica è vuota !",
"wchange49":"Aggiungi alla rubrica",
"wchange50":"Memo"
}, },
"tradepage":{ "tradepage":{
"tchange1":"Portale commerciale", "tchange1":"Portale commerciale",
@ -618,4 +622,4 @@
"rewarddialog5":"Stai rimuovendo una transazione di quota premio associata all'account:", "rewarddialog5":"Stai rimuovendo una transazione di quota premio associata all'account:",
"rewarddialog6":"Premendo conferma, la condivisione del premio verrà rimossa e la chiave di conio non sarà più valida." "rewarddialog6":"Premendo conferma, la condivisione del premio verrà rimossa e la chiave di conio non sarà più valida."
} }
} }

8
qortal-ui-core/language/ko.json
View File

@ -241,7 +241,11 @@
"wchange43":"확인될 때까지 거래가 표시되지 않습니다. 기다려 주십시오.", "wchange43":"확인될 때까지 거래가 표시되지 않습니다. 기다려 주십시오.",
"wchange44":"다시 시도하십시오...", "wchange44":"다시 시도하십시오...",
"wchange45":"모두 보내기", "wchange45":"모두 보내기",
"wchange46":"Memo" "wchange46":"이 주소로 보내기",
"wchange47":"주소록",
"wchange48":"이 주소록이 비어 있습니다 !",
"wchange49":"주소록에 추가하다",
"wchange50":"Memo"
}, },
"tradepage":{ "tradepage":{
"tchange1":"무역 포털", "tchange1":"무역 포털",
@ -618,4 +622,4 @@
"rewarddialog5":"계정과 연결된 보상 공유 트랜잭션을 제거하는 중입니다.", "rewarddialog5":"계정과 연결된 보상 공유 트랜잭션을 제거하는 중입니다.",
"rewarddialog6":"확인을 누르면 보상 공유가 제거되고 조폐 키가 유효하지 않게 됩니다." "rewarddialog6":"확인을 누르면 보상 공유가 제거되고 조폐 키가 유효하지 않게 됩니다."
} }
} }

8
qortal-ui-core/language/no.json
View File

@ -241,7 +241,11 @@
"wchange43":"Transaksjonen din vises ikke før den er bekreftet, vær tålmodig...", "wchange43":"Transaksjonen din vises ikke før den er bekreftet, vær tålmodig...",
"wchange44":"Vær så snill, prøv på nytt...", "wchange44":"Vær så snill, prøv på nytt...",
"wchange45":"Send alle", "wchange45":"Send alle",
"wchange46":"Memo" "wchange46":"Send til denne adressen",
"wchange47":"Adressebok",
"wchange48":"Denne adresseboken er tom !",
"wchange49":"Legg til i Adresseboken",
"wchange50":"Memo"
}, },
"tradepage":{ "tradepage":{
"tchange1":"Handelsportal", "tchange1":"Handelsportal",
@ -613,4 +617,4 @@
"rewarddialog5":"Du fjerner en transaksjon for belønningsdel knyttet til konto:", "rewarddialog5":"Du fjerner en transaksjon for belønningsdel knyttet til konto:",
"rewarddialog6":"Ved å trykke på Bekreft, vil belønningsdelen bli fjernet og mintnøkkelen blir ugyldig." "rewarddialog6":"Ved å trykke på Bekreft, vil belønningsdelen bli fjernet og mintnøkkelen blir ugyldig."
} }
} }

8
qortal-ui-core/language/pl.json
View File

@ -241,7 +241,11 @@
"wchange43":"Twoja transakcja nie pojawi się, dopóki nie zostanie potwierdzona, bądź cierpliwy...", "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", "wchange45":"Wyślij wszystko",
"wchange46":"Memo" "wchange46":"Wyślij na ten adres",
"wchange47":"Książka adresowa",
"wchange48":"Ta książka adresowa jest pusta !",
"wchange49":"Dodaj do książki adresowej",
"wchange50":"Memo"
}, },
"tradepage":{ "tradepage":{
"tchange1":"Portal Handlowy", "tchange1":"Portal Handlowy",
@ -618,4 +622,4 @@
"rewarddialog5":"Usuwasz transakcję dotyczącą udziału w nagrodach powiązaną z kontem:", "rewarddialog5":"Usuwasz transakcję dotyczącą udziału w nagrodach powiązaną z kontem:",
"rewarddialog6":"Po naciśnięciu przycisku Potwierdź udział w nagrodach zostanie usunięty, a klucz bicia stanie się nieważny." "rewarddialog6":"Po naciśnięciu przycisku Potwierdź udział w nagrodach zostanie usunięty, a klucz bicia stanie się nieważny."
} }
} }

8
qortal-ui-core/language/pt.json
View File

@ -241,7 +241,11 @@
"wchange43":"Sua transação não será exibida até ser confirmada, seja paciente...", "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", "wchange45":"Envie todos",
"wchange46":"Memo" "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",
"wchange50":"Memo"
}, },
"tradepage":{ "tradepage":{
"tchange1":"Portal do Comércio", "tchange1":"Portal do Comércio",
@ -618,4 +622,4 @@
"rewarddialog5":"Você está removendo uma transação de compartilhamento de recompensa associada à conta:", "rewarddialog5":"Você está removendo uma transação de compartilhamento de recompensa associada à conta:",
"rewarddialog6":"Ao pressionar confirmar, o rewardshare será removido e a chave de cunhagem se tornará inválida." "rewarddialog6":"Ao pressionar confirmar, o rewardshare será removido e a chave de cunhagem se tornará inválida."
} }
} }

8
qortal-ui-core/language/ro.json
View File

@ -241,7 +241,11 @@
"wchange43":"Tranzactia nu va aparea pana ce nu este confirmata, ai rabdare...", "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", "wchange45":"Trimite toate",
"wchange46":"Memo" "wchange46":"Trimiteti la aceasta adresa",
"wchange47":"Carte de adrese",
"wchange48":"Aceasta agenda de adrese este goala !",
"wchange49":"Adauga la agenda cu adrese",
"wchange50":"Memo"
}, },
"tradepage":{ "tradepage":{
"tchange1":"Portal de Tranzactionare", "tchange1":"Portal de Tranzactionare",
@ -618,4 +622,4 @@
"rewarddialog5":"Suntei pe cale sa stergeti o tranzactie de cota de recompensare asociata cu contul:", "rewarddialog5":"Suntei pe cale sa stergeti o tranzactie de cota de recompensare asociata cu contul:",
"rewarddialog6":"La apasarea butonului de confirmare, recompensa va fi eliminata, iar cheia de obtinere de recompensa (minting) va deveni invalida." "rewarddialog6":"La apasarea butonului de confirmare, recompensa va fi eliminata, iar cheia de obtinere de recompensa (minting) va deveni invalida."
} }
} }

8
qortal-ui-core/language/rs.json
View File

@ -241,7 +241,11 @@
"wchange43":"Vaša transakcija se neće prikazati dok se ne potvrdi, budite strpljivi...", "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", "wchange45":"Poslati sve",
"wchange46":"Memo" "wchange46":"Pošaljite na ovu adresu",
"wchange47":"Adresar",
"wchange48":"Ovaj adresar je prazan !",
"wchange49":"Dodaj u Adresar",
"wchange50":"Memo"
}, },
"tradepage":{ "tradepage":{
"tchange1":"Trgovinski prozor", "tchange1":"Trgovinski prozor",
@ -618,4 +622,4 @@
"rewarddialog5":"Uklanjate transakciju deljenja nagrade povezanu sa nalogom:", "rewarddialog5":"Uklanjate transakciju deljenja nagrade povezanu sa nalogom:",
"rewarddialog6":"Pritiskom na potvrdu, udeo nagrade će biti uklonjen i ključ za kovanje će postati nevažeći." "rewarddialog6":"Pritiskom na potvrdu, udeo nagrade će biti uklonjen i ključ za kovanje će postati nevažeći."
} }
} }

8
qortal-ui-core/language/ru.json
View File

@ -241,7 +241,11 @@
"wchange43":"Ваша транзакция не будет отображаться, пока не будет подтверждена, наберитесь терпения...", "wchange43":"Ваша транзакция не будет отображаться, пока не будет подтверждена, наберитесь терпения...",
"wchange44":"Пожалуйста, попробуйте еще раз...", "wchange44":"Пожалуйста, попробуйте еще раз...",
"wchange45":"Отправь все", "wchange45":"Отправь все",
"wchange46":"Memo" "wchange46":"Отправить на этот адрес",
"wchange47":"Адресная книга",
"wchange48":"Эта адресная книга пуста !",
"wchange49":"Добавить в адресную книгу",
"wchange50":"Memo"
}, },
"tradepage":{ "tradepage":{
"tchange1":"Торговый портал", "tchange1":"Торговый портал",
@ -613,4 +617,4 @@
"rewarddialog5":"Вы удаляете транзакцию распределения вознаграждения, связанную с аккаунтом:", "rewarddialog5":"Вы удаляете транзакцию распределения вознаграждения, связанную с аккаунтом:",
"rewarddialog6":"При нажатии кнопки подтверждения доля вознаграждения будет удалена, а ключ чеканки станет недействительным." "rewarddialog6":"При нажатии кнопки подтверждения доля вознаграждения будет удалена, а ключ чеканки станет недействительным."
} }
} }

9
qortal-ui-core/language/us.json
View File

@ -236,8 +236,11 @@
"wchange43":"Your transaction will not show until confirmed, be patient...", "wchange43":"Your transaction will not show until confirmed, be patient...",
"wchange44":"Please try again...", "wchange44":"Please try again...",
"wchange45":"Send all", "wchange45":"Send all",
"wchange46":"Memo" "wchange46":"Send to this address",
"wchange47":"Addressbook",
"wchange48":"This Addressbook is empty !",
"wchange49":"Add to Addressbook",
"wchange50":"Memo"
}, },
"tradepage":{ "tradepage":{
"tchange1":"Trade Portal", "tchange1":"Trade Portal",
@ -614,4 +617,4 @@
"rewarddialog5":"You are removing a reward share transaction associated with account:", "rewarddialog5":"You are removing a reward share transaction associated with account:",
"rewarddialog6":"On pressing confirm, the rewardshare will be removed and the minting key will become invalid." "rewarddialog6":"On pressing confirm, the rewardshare will be removed and the minting key will become invalid."
} }
} }

8
qortal-ui-core/language/zhc.json
View File

@ -241,7 +241,11 @@
"wchange43":"您的交易在确认之前不会显示，请耐心等待...", "wchange43":"您的交易在确认之前不会显示，请耐心等待...",
"wchange44":"请再试一次...", "wchange44":"请再试一次...",
"wchange45":"全部发送", "wchange45":"全部发送",
"wchange46":"Memo" "wchange46":"发送到这个地址",
"wchange47":"地址簿",
"wchange48":"此通讯录为空 !",
"wchange49":"加至地址簿",
"wchange50":"Memo"
}, },
"tradepage":{ "tradepage":{
"tchange1":"交易门户", "tchange1":"交易门户",
@ -618,4 +622,4 @@
"rewarddialog5":"您正在删除与此账号关联的铸币密钥：", "rewarddialog5":"您正在删除与此账号关联的铸币密钥：",
"rewarddialog6":"点击确认后，铸币密钥将被移除並失效。" "rewarddialog6":"点击确认后，铸币密钥将被移除並失效。"
} }
} }

8
qortal-ui-core/language/zht.json
View File

@ -241,7 +241,11 @@
"wchange43":"您的交易在確認之前不會顯示，請耐心等待...", "wchange43":"您的交易在確認之前不會顯示，請耐心等待...",
"wchange44":"請再試一次...", "wchange44":"請再試一次...",
"wchange45":"全部發送", "wchange45":"全部發送",
"wchange46":"Memo" "wchange46":"發送到這個地址",
"wchange47":"地址簿",
"wchange48":"此通訊錄為空 !",
"wchange49":"加至地址簿",
"wchange50":"Memo"
}, },
"tradepage":{ "tradepage":{
"tchange1":"交易門戶", "tchange1":"交易門戶",
@ -618,4 +622,4 @@
"rewarddialog5":"您正在刪除與此賬號關聯的鑄幣密鑰：", "rewarddialog5":"您正在刪除與此賬號關聯的鑄幣密鑰：",
"rewarddialog6":"點擊確認後，鑄幣密鑰將被移除並失效。" "rewarddialog6":"點擊確認後，鑄幣密鑰將被移除並失效。"
} }
} }

30
qortal-ui-core/package.json
View File

@ -19,22 +19,22 @@
"dependencies": { "dependencies": {
"@hapi/hapi": "20.2.2", "@hapi/hapi": "20.2.2",
"@hapi/inert": "7.0.0", "@hapi/inert": "7.0.0",
"sass": "1.54.3" "sass": "1.54.4"
}, },
"devDependencies": { "devDependencies": {
"@babel/core": "7.18.10", "@babel/core": "7.18.10",
"@material/mwc-button": "0.26.1", "@material/mwc-button": "0.27.0",
"@material/mwc-checkbox": "0.26.1", "@material/mwc-checkbox": "0.27.0",
"@material/mwc-dialog": "0.26.1", "@material/mwc-dialog": "0.27.0",
"@material/mwc-drawer": "0.26.1", "@material/mwc-drawer": "0.27.0",
"@material/mwc-fab": "0.26.1", "@material/mwc-fab": "0.27.0",
"@material/mwc-formfield": "0.26.1", "@material/mwc-formfield": "0.27.0",
"@material/mwc-icon": "0.26.1", "@material/mwc-icon": "0.27.0",
"@material/mwc-icon-button": "0.26.1", "@material/mwc-icon-button": "0.27.0",
"@material/mwc-list": "0.26.1", "@material/mwc-list": "0.27.0",
"@material/mwc-select": "0.26.1", "@material/mwc-select": "0.27.0",
"@material/mwc-snackbar": "0.26.1", "@material/mwc-snackbar": "0.27.0",
"@material/mwc-textfield": "0.26.1", "@material/mwc-textfield": "0.27.0",
"@polymer/app-layout": "3.1.0", "@polymer/app-layout": "3.1.0",
"@polymer/iron-collapse": "3.0.1", "@polymer/iron-collapse": "3.0.1",
"@polymer/iron-flex-layout": "3.0.1", "@polymer/iron-flex-layout": "3.0.1",
@ -65,14 +65,14 @@
"bcryptjs": "2.4.3", "bcryptjs": "2.4.3",
"epml": "0.3.3", "epml": "0.3.3",
"file-saver": "2.0.5", "file-saver": "2.0.5",
"lit": "2.2.8", "lit": "2.3.0",
"lit-translate": "2.0.1", "lit-translate": "2.0.1",
"postcss": "8.4.16", "postcss": "8.4.16",
"pwa-helpers": "0.9.1", "pwa-helpers": "0.9.1",
"random-sentence-generator": "0.0.8", "random-sentence-generator": "0.0.8",
"redux": "4.2.0", "redux": "4.2.0",
"redux-thunk": "2.4.1", "redux-thunk": "2.4.1",
"rollup": "2.77.2", "rollup": "2.78.0",
"rollup-plugin-node-globals": "1.4.0", "rollup-plugin-node-globals": "1.4.0",
"rollup-plugin-postcss": "4.0.2", "rollup-plugin-postcss": "4.0.2",
"rollup-plugin-progress": "1.1.2", "rollup-plugin-progress": "1.1.2",

30
qortal-ui-plugins/package.json
View File

@ -17,24 +17,24 @@
"author": "QORTAL <admin@qortal.org>", "author": "QORTAL <admin@qortal.org>",
"license": "GPL-3.0", "license": "GPL-3.0",
"dependencies": { "dependencies": {
"@material/mwc-list": "0.26.1", "@material/mwc-list": "0.27.0",
"@material/mwc-select": "0.26.1", "@material/mwc-select": "0.27.0",
"emoji-picker-js": "https://github.com/Qortal/emoji-picker-js" "emoji-picker-js": "https://github.com/Qortal/emoji-picker-js"
}, },
"devDependencies": { "devDependencies": {
"@babel/core": "7.18.10", "@babel/core": "7.18.10",
"@github/time-elements": "3.1.2", "@github/time-elements": "3.1.2",
"@material/mwc-button": "0.26.1", "@material/mwc-button": "0.27.0",
"@material/mwc-checkbox": "0.26.1", "@material/mwc-checkbox": "0.27.0",
"@material/mwc-dialog": "0.26.1", "@material/mwc-dialog": "0.27.0",
"@material/mwc-formfield": "0.26.1", "@material/mwc-formfield": "0.27.0",
"@material/mwc-icon": "0.26.1", "@material/mwc-icon": "0.27.0",
"@material/mwc-icon-button": "0.26.1", "@material/mwc-icon-button": "0.27.0",
"@material/mwc-slider": "0.26.1", "@material/mwc-slider": "0.27.0",
"@material/mwc-snackbar": "0.26.1", "@material/mwc-snackbar": "0.27.0",
"@material/mwc-tab": "0.26.1", "@material/mwc-tab": "0.27.0",
"@material/mwc-tab-bar": "0.26.1", "@material/mwc-tab-bar": "0.27.0",
"@material/mwc-textfield": "0.26.1", "@material/mwc-textfield": "0.27.0",
"@polymer/iron-icons": "3.0.1", "@polymer/iron-icons": "3.0.1",
"@polymer/paper-icon-button": "3.0.2", "@polymer/paper-icon-button": "3.0.2",
"@polymer/paper-progress": "3.0.1", "@polymer/paper-progress": "3.0.1",
@ -51,9 +51,9 @@
"@vaadin/icons": "23.1.5", "@vaadin/icons": "23.1.5",
"epml": "0.3.3", "epml": "0.3.3",
"html-escaper": "3.0.3", "html-escaper": "3.0.3",
"lit": "2.2.8", "lit": "2.3.0",
"lit-translate": "2.0.1", "lit-translate": "2.0.1",
"rollup": "2.77.2", "rollup": "2.78.0",
"rollup-plugin-node-globals": "1.4.0", "rollup-plugin-node-globals": "1.4.0",
"rollup-plugin-progress": "1.1.2", "rollup-plugin-progress": "1.1.2",
"rollup-plugin-terser": "7.0.2" "rollup-plugin-terser": "7.0.2"

27
qortal-ui-plugins/plugins/core/trade-portal/trade-portal.src.js
View File

@ -332,6 +332,7 @@ class TradePortal extends LitElement {
mwc-select#coinSelectionMenu { mwc-select#coinSelectionMenu {
font-size: 24px; font-size: 24px;
width:220px;
} }
mwc-select#coinSelectionMenu mwc-list-item { mwc-select#coinSelectionMenu mwc-list-item {
@ -1094,10 +1095,10 @@ class TradePortal extends LitElement {
let coinSelectionMenu = this.shadowRoot.getElementById("coinSelectionMenu") let coinSelectionMenu = this.shadowRoot.getElementById("coinSelectionMenu")
coinSelectionMenu.addEventListener('change', function () { coinSelectionMenu.addEventListener('change', function () {
_this.setForeignCoin(coinSelectionMenu.value) _this.setForeignCoin(coinSelectionMenu.value,false)
}) })
_this.setForeignCoin(coinSelectionMenu.value) _this.setForeignCoin(coinSelectionMenu.value,true)
}) })
parentEpml.imReady() parentEpml.imReady()
@ -1194,9 +1195,29 @@ class TradePortal extends LitElement {
} }
} }
setForeignCoin(coin) { setForeignCoin(coin,beingInitialized) {
let _this = this let _this = this
this.selectedCoin = coin 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")
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'+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")
let pairicon = (_this.listedCoins.get(_this.selectedCoin).coinCode).toLowerCase()
pairIconContainer.style.backgroundImage='url(/img/qort'+pairicon+'.png)'
}
this.isLoadingHistoricTrades = true this.isLoadingHistoricTrades = true
this.isLoadingOpenTrades = true this.isLoadingOpenTrades = true
this.createConnection() this.createConnection()

107
qortal-ui-plugins/plugins/core/wallet/wallet-app.src.js
View File

@ -831,7 +831,7 @@ class MultiWallet extends LitElement {
<span class="title"> ${translate("walletpage.wchange10")} </span> <span class="title"> ${translate("walletpage.wchange10")} </span>
<br /> <br />
<div style="display: inline;"> <div style="display: inline;">
<span>${this.selectedTransaction.btcReceiver}</span> <span>${this.selectedTransaction.btcReceiver}</span> <paper-icon-button icon="icons:send" @click=${() => this.sendToBtcAddress()} title="${translate("walletpage.wchange46")}"></paper-icon-button>
</div> </div>
<br /> <br />
<span class="title"> ${translate("walletpage.wchange12")} </span> <span class="title"> ${translate("walletpage.wchange12")} </span>
@ -882,7 +882,7 @@ class MultiWallet extends LitElement {
<span class="title"> ${translate("walletpage.wchange10")} </span> <span class="title"> ${translate("walletpage.wchange10")} </span>
<br /> <br />
<div style="display: inline;"> <div style="display: inline;">
<span>${this.selectedTransaction.ltcReceiver}</span> <paper-icon-button icon="icons:send" @click=${() => this.sendToLtcAddress()} title="Send to this address"></paper-icon-button> <span>${this.selectedTransaction.ltcReceiver}</span> <paper-icon-button icon="icons:send" @click=${() => this.sendToLtcAddress()} title="${translate("walletpage.wchange46")}"></paper-icon-button>
</div> </div>
<br /> <br />
<span class="title"> ${translate("walletpage.wchange12")} </span> <span class="title"> ${translate("walletpage.wchange12")} </span>
@ -933,9 +933,10 @@ class MultiWallet extends LitElement {
<br /> <br />
<span class="title"> ${translate("walletpage.wchange10")} </span> <span class="title"> ${translate("walletpage.wchange10")} </span>
<br /> <br />
<div> <div style="display: inline;">
<span>${this.selectedTransaction.dogeReceiver}</span> <span>${this.selectedTransaction.dogeReceiver}</span> <paper-icon-button icon="icons:send" @click=${() => this.sendToDogeAddress()} title="${translate("walletpage.wchange46")}"></paper-icon-button>
</div> </div>
<br />
<span class="title"> ${translate("walletpage.wchange12")} </span> <span class="title"> ${translate("walletpage.wchange12")} </span>
<br /> <br />
<div> <div>
@ -983,8 +984,8 @@ class MultiWallet extends LitElement {
</div> </div>
<span class="title"> ${translate("walletpage.wchange10")} </span> <span class="title"> ${translate("walletpage.wchange10")} </span>
<br /> <br />
<div> style="display: inline;" <div style="display: inline;">
<span>${this.selectedTransaction.dgbReceiver}</span> <span>${this.selectedTransaction.dgbReceiver}</span> <paper-icon-button icon="icons:send" @click=${() => this.sendToDgbAddress()} title="${translate("walletpage.wchange46")}"></paper-icon-button>
</div> </div>
<br /> <br />
<span class="title"> ${translate("walletpage.wchange12")} </span> <span class="title"> ${translate("walletpage.wchange12")} </span>
@ -1035,7 +1036,7 @@ class MultiWallet extends LitElement {
<span class="title"> ${translate("walletpage.wchange10")} </span> <span class="title"> ${translate("walletpage.wchange10")} </span>
<br /> <br />
<div style="display: inline;"> <div style="display: inline;">
<span>${this.selectedTransaction.rvnReceiver}</span> <span>${this.selectedTransaction.rvnReceiver}</span> <paper-icon-button icon="icons:send" @click=${() => this.sendToRvnAddress()} title="${translate("walletpage.wchange46")}"></paper-icon-button>
</div> </div>
<br /> <br />
<span class="title"> ${translate("walletpage.wchange12")} </span> <span class="title"> ${translate("walletpage.wchange12")} </span>
@ -1195,7 +1196,10 @@ class MultiWallet extends LitElement {
</p> </p>
<p> <p>
<span>Available balance:</span><br /> <span>Available balance:</span><br />
<span style="font-weight: bold;">${this.balanceString}</span> <span style="font-weight: bold;">${this.balanceString}</span><br />
<span style="float: left; font-weight: bold; display: inline;">
<vaadin-button theme="primary small" style="width: 100%;" @click=${() => this.calculateBtcAll()}><vaadin-icon icon="vaadin:coin-piles" slot="prefix"></vaadin-icon> ${translate("walletpage.wchange45")} BTC</vaadin-button>
</span><br /><span>&nbsp;</span>
</p> </p>
<p> <p>
<mwc-textfield <mwc-textfield
@ -1346,7 +1350,10 @@ class MultiWallet extends LitElement {
</p> </p>
<p> <p>
<span>${translate("walletpage.wchange19")}:</span><br /> <span>${translate("walletpage.wchange19")}:</span><br />
<span style="font-weight: bold;">${this.balanceString}</span> <span style="font-weight: bold;">${this.balanceString}</span><br />
<span style="float: left; font-weight: bold; display: inline;">
<vaadin-button theme="primary small" style="width: 100%;" @click=${() => this.calculateDogeAll()}><vaadin-icon icon="vaadin:coin-piles" slot="prefix"></vaadin-icon> ${translate("walletpage.wchange45")} DOGE</vaadin-button>
</span><br /><span>&nbsp;</span>
</p> </p>
<p> <p>
<mwc-textfield <mwc-textfield
@ -1422,7 +1429,10 @@ class MultiWallet extends LitElement {
</p> </p>
<p> <p>
<span>${translate("walletpage.wchange19")}:</span><br /> <span>${translate("walletpage.wchange19")}:</span><br />
<span style="font-weight: bold;">${this.balanceString}</span> <span style="font-weight: bold;">${this.balanceString}</span><br />
<span style="float: left; font-weight: bold; display: inline;">
<vaadin-button theme="primary small" style="width: 100%;" @click=${() => this.calculateDgbAll()}><vaadin-icon icon="vaadin:coin-piles" slot="prefix"></vaadin-icon> ${translate("walletpage.wchange45")} DGB</vaadin-button>
</span><br /><span>&nbsp;</span>
</p> </p>
<p> <p>
<mwc-textfield <mwc-textfield
@ -1498,7 +1508,10 @@ class MultiWallet extends LitElement {
</p> </p>
<p> <p>
<span>${translate("walletpage.wchange19")}:</span><br /> <span>${translate("walletpage.wchange19")}:</span><br />
<span style="font-weight: bold;">${this.balanceString}</span> <span style="font-weight: bold;">${this.balanceString}</span><br />
<span style="float: left; font-weight: bold; display: inline;">
<vaadin-button theme="primary small" style="width: 100%;" @click=${() => this.calculateRvnAll()}><vaadin-icon icon="vaadin:coin-piles" slot="prefix"></vaadin-icon> ${translate("walletpage.wchange45")} RVN</vaadin-button>
</span><br /><span>&nbsp;</span>
</p> </p>
<p> <p>
<mwc-textfield <mwc-textfield
@ -1604,7 +1617,7 @@ class MultiWallet extends LitElement {
<mwc-textfield <mwc-textfield
style="width: 100%;" style="width: 100%;"
id="arrrMemo" id="arrrMemo"
label="${translate("walletpage.wchange46")}" label="${translate("walletpage.wchange50")}"
type="text" type="text"
value="${this.arrrMemo}" value="${this.arrrMemo}"
maxLength="256" maxLength="256"
@ -2103,12 +2116,36 @@ class MultiWallet extends LitElement {
this.shadowRoot.querySelector('#showTransactionDetailsDialog').close() this.shadowRoot.querySelector('#showTransactionDetailsDialog').close()
} }
sendToBtcAddress() {
this.btcRecipient = this.selectedTransaction.btcReceiver
this.openSendBtc()
this.shadowRoot.querySelector('#showBtcTransactionDetailsDialog').close()
}
sendToLtcAddress() { sendToLtcAddress() {
this.ltcRecipient = this.selectedTransaction.ltcReceiver this.ltcRecipient = this.selectedTransaction.ltcReceiver
this.openSendLtc() this.openSendLtc()
this.shadowRoot.querySelector('#showLtcTransactionDetailsDialog').close() this.shadowRoot.querySelector('#showLtcTransactionDetailsDialog').close()
} }
sendToDogeAddress() {
this.dogeRecipient = this.selectedTransaction.dogeReceiver
this.openSendDoge()
this.shadowRoot.querySelector('#showDogeTransactionDetailsDialog').close()
}
sendToDgbAddress() {
this.dgbRecipient = this.selectedTransaction.dgbReceiver
this.openSendDgb()
this.shadowRoot.querySelector('#showDgbTransactionDetailsDialog').close()
}
sendToRvnAddress() {
this.rvnRecipient = this.selectedTransaction.rvnReceiver
this.openSendRvn()
this.shadowRoot.querySelector('#showRvnTransactionDetailsDialog').close()
}
calculateQortAll() { calculateQortAll() {
if (this.balance < 0.00100000) { if (this.balance < 0.00100000) {
let not_enough_string = get("walletpage.wchange26") let not_enough_string = get("walletpage.wchange26")
@ -2118,8 +2155,18 @@ class MultiWallet extends LitElement {
} }
} }
calculateBtcAll() {
if (this.balance < 0.00050000) {
let not_enough_string = get("walletpage.wchange26")
parentEpml.request('showSnackBar', `${not_enough_string}`)
} else {
this.btcAmount = (this.balance - 0.00050000).toFixed(8)
this.btcFeePerByte = 100
}
}
calculateLtcAll() { calculateLtcAll() {
if (this.balance < 0.00025000) { if (this.balance < 0.00050000) {
let not_enough_string = get("walletpage.wchange26") let not_enough_string = get("walletpage.wchange26")
parentEpml.request('showSnackBar', `${not_enough_string}`) parentEpml.request('showSnackBar', `${not_enough_string}`)
} else { } else {
@ -2128,12 +2175,42 @@ class MultiWallet extends LitElement {
} }
} }
calculateDogeAll() {
if (this.balance < 0.05000000) {
let not_enough_string = get("walletpage.wchange26")
parentEpml.request('showSnackBar', `${not_enough_string}`)
} else {
this.dogeAmount = (this.balance - 0.05000000).toFixed(8)
this.dogeFeePerByte = 1000
}
}
calculateDgbAll() {
if (this.balance < 0.00005000) {
let not_enough_string = get("walletpage.wchange26")
parentEpml.request('showSnackBar', `${not_enough_string}`)
} else {
this.dgbAmount = (this.balance - 0.00005000).toFixed(8)
this.dgbFeePerByte = 10
}
}
calculateRvnAll() {
if (this.balance < 0.00562500) {
let not_enough_string = get("walletpage.wchange26")
parentEpml.request('showSnackBar', `${not_enough_string}`)
} else {
this.rvnAmount = (this.balance - 0.00562500).toFixed(8)
this.rvnFeePerByte = 1125
}
}
renderSQB() { renderSQB() {
let displaybutton = this.selectedTransaction.recipient let displaybutton = this.selectedTransaction.recipient
if (displaybutton == null) { if (displaybutton == null) {
return html`<span>${this.selectedTransaction.recipient}</span>` return html`<span>${this.selectedTransaction.recipient}</span>`
} else { } else {
return html`<span>${this.selectedTransaction.recipient}</span> <paper-icon-button icon="icons:send" @click=${() => this.sendToQortAddress()} title="Send to this address"></paper-icon-button>` return html`<span>${this.selectedTransaction.recipient}</span> <paper-icon-button icon="icons:send" @click=${() => this.sendToQortAddress()} title="${translate("walletpage.wchange46")}"></paper-icon-button>`
} }
} }
@ -3450,7 +3527,7 @@ class MultiWallet extends LitElement {
<vaadin-grid-column <vaadin-grid-column
auto-width auto-width
resizable resizable
header="${translate("walletpage.wchange46")}" header="${translate("walletpage.wchange50")}"
.renderer=${(root, column, data) => { .renderer=${(root, column, data) => {
render(html`${data.item.memo}`, root) render(html`${data.item.memo}`, root)
}} }}