diff --git a/qortal-ui-core/language/de.json b/qortal-ui-core/language/de.json index 0e2cd415..64abc7ff 100644 --- a/qortal-ui-core/language/de.json +++ b/qortal-ui-core/language/de.json @@ -714,6 +714,7 @@ "exp17":"ALLE ZAHLUNGEN", "exp18":"Zahlungen", "exp19":"Gesendet", - "exp20":"Empfangen" + "exp20":"Empfangen", + "exp21":"Trades" } } diff --git a/qortal-ui-core/language/es.json b/qortal-ui-core/language/es.json index 00ccd4ea..ea86f955 100644 --- a/qortal-ui-core/language/es.json +++ b/qortal-ui-core/language/es.json @@ -714,6 +714,7 @@ "exp17":"TODOS LOS PAGOS", "exp18":"Pagos", "exp19":"Enviado", - "exp20":"Recibido" + "exp20":"Recibido", + "exp21":"Oficios" } -} \ No newline at end of file +} diff --git a/qortal-ui-core/language/fr.json b/qortal-ui-core/language/fr.json index 047ad02a..a96d51f3 100644 --- a/qortal-ui-core/language/fr.json +++ b/qortal-ui-core/language/fr.json @@ -714,6 +714,7 @@ "exp17":"TOUS LES PAIEMENTS", "exp18":"Paiements", "exp19":"Envoyé", - "exp20":"Reçu" + "exp20":"Reçu", + "exp21":"Métiers" } -} \ No newline at end of file +} diff --git a/qortal-ui-core/language/hindi.json b/qortal-ui-core/language/hindi.json index ac18e0fc..2c1a7ea4 100644 --- a/qortal-ui-core/language/hindi.json +++ b/qortal-ui-core/language/hindi.json @@ -715,6 +715,7 @@ "exp17":"सभी भुगतान", "exp18":"भुगतान", "exp19":"भेजा गया", - "exp20":"प्राप्त" + "exp20":"प्राप्त", + "exp21":"ट्रेडों" } -} \ No newline at end of file +} diff --git a/qortal-ui-core/language/hr.json b/qortal-ui-core/language/hr.json index 3172d663..c877db78 100644 --- a/qortal-ui-core/language/hr.json +++ b/qortal-ui-core/language/hr.json @@ -715,6 +715,7 @@ "exp17":"SVA PLAĆANJA", "exp18":"Plaćanja", "exp19":"Poslano", - "exp20":"Primljeno" + "exp20":"Primljeno", + "exp21":"Obrta", } -} \ No newline at end of file +} diff --git a/qortal-ui-core/language/hu.json b/qortal-ui-core/language/hu.json index 67274c4d..5d4d4af1 100644 --- a/qortal-ui-core/language/hu.json +++ b/qortal-ui-core/language/hu.json @@ -714,6 +714,7 @@ "exp17":"MINDEN FIZETÉS", "exp18":"Kifizetések", "exp19":"Elküldve", - "exp20":"Fogadott" + "exp20":"Fogadott", + "exp21":"Passzátszelek" } -} \ No newline at end of file +} diff --git a/qortal-ui-core/language/it.json b/qortal-ui-core/language/it.json index 6d583861..79c748e4 100644 --- a/qortal-ui-core/language/it.json +++ b/qortal-ui-core/language/it.json @@ -714,6 +714,7 @@ "exp17":"TUTTI I PAGAMENTI", "exp18":"Pagamenti", "exp19":"Inviato", - "exp20":"Ricevuto" + "exp20":"Ricevuto", + "exp21":"Mestieri" } -} \ No newline at end of file +} diff --git a/qortal-ui-core/language/ko.json b/qortal-ui-core/language/ko.json index 2a9779b9..de167a31 100644 --- a/qortal-ui-core/language/ko.json +++ b/qortal-ui-core/language/ko.json @@ -714,6 +714,7 @@ "exp17":"모든 결제", "exp18":"결제", "exp19":"보냈습니다", - "exp20":"수신됨" + "exp20":"수신됨", + "exp21":"거래" } -} \ No newline at end of file +} diff --git a/qortal-ui-core/language/no.json b/qortal-ui-core/language/no.json index 5dc9a729..79ebccab 100644 --- a/qortal-ui-core/language/no.json +++ b/qortal-ui-core/language/no.json @@ -714,6 +714,7 @@ "exp17":"ALLE BETALINGER", "exp18":"Betalinger", "exp19":"Sendt", - "exp20":"Motta" + "exp20":"Motta", + "exp21":"Handler" } -} \ No newline at end of file +} diff --git a/qortal-ui-core/language/pl.json b/qortal-ui-core/language/pl.json index dfc77238..460cc01c 100644 --- a/qortal-ui-core/language/pl.json +++ b/qortal-ui-core/language/pl.json @@ -714,6 +714,7 @@ "exp17":"WSZYSTKIE PŁATNOŚCI", "exp18":"Płatności", "exp19":"Wysłane", - "exp20":"Otrzymano" + "exp20":"Otrzymano", + "exp21":"Transakcji" } -} \ No newline at end of file +} diff --git a/qortal-ui-core/language/pt.json b/qortal-ui-core/language/pt.json index 334d23a7..56754f31 100644 --- a/qortal-ui-core/language/pt.json +++ b/qortal-ui-core/language/pt.json @@ -714,6 +714,7 @@ "exp17":"TODOS OS PAGAMENTOS", "exp18":"Pagamentos", "exp19":"Enviado", - "exp20":"Recebido" + "exp20":"Recebido", + "exp21":"Comércios" } -} \ No newline at end of file +} diff --git a/qortal-ui-core/language/ro.json b/qortal-ui-core/language/ro.json index 50913767..a1321514 100644 --- a/qortal-ui-core/language/ro.json +++ b/qortal-ui-core/language/ro.json @@ -714,6 +714,7 @@ "exp17":"TOATE PLĂTILE", "exp18":"Plăti", "exp19":"Trimis", - "exp20":"Primit" + "exp20":"Primit", + "exp21":"Meserii" } -} \ No newline at end of file +} diff --git a/qortal-ui-core/language/rs.json b/qortal-ui-core/language/rs.json index 0b383550..df8042b6 100644 --- a/qortal-ui-core/language/rs.json +++ b/qortal-ui-core/language/rs.json @@ -714,6 +714,7 @@ "exp17": "SVA PLAĆANJA", "exp18":"Plaćanja", "exp19":"Poslato", - "exp20":"Primljeno" + "exp20":"Primljeno", + "exp21":"Trgovine" } -} \ No newline at end of file +} diff --git a/qortal-ui-core/language/ru.json b/qortal-ui-core/language/ru.json index 059f3341..5278e99c 100644 --- a/qortal-ui-core/language/ru.json +++ b/qortal-ui-core/language/ru.json @@ -714,6 +714,7 @@ "exp17":"ВСЕ ПЛАТЕЖИ", "exp18":"Платежи", "exp19":"Отправлено", - "exp20":"Получено" + "exp20":"Получено", + "exp21":"Сделок" } -} \ No newline at end of file +} diff --git a/qortal-ui-core/language/us.json b/qortal-ui-core/language/us.json index eff34218..41370e8d 100644 --- a/qortal-ui-core/language/us.json +++ b/qortal-ui-core/language/us.json @@ -714,6 +714,7 @@ "exp17":"ALL PAYMENTS", "exp18":"Payments", "exp19":"Sent", - "exp20":"Received" + "exp20":"Received", + "exp21":"Trades" } } diff --git a/qortal-ui-core/language/zhc.json b/qortal-ui-core/language/zhc.json index 34bdfb6b..33e55ba5 100644 --- a/qortal-ui-core/language/zhc.json +++ b/qortal-ui-core/language/zhc.json @@ -714,6 +714,7 @@ "exp17":"所有付款", "exp18":"付款", "exp19":"已发送", - "exp20":"收到" + "exp20":"收到", + "exp21":"行业" } -} \ No newline at end of file +} diff --git a/qortal-ui-core/language/zht.json b/qortal-ui-core/language/zht.json index 0acf6dd8..a7275455 100644 --- a/qortal-ui-core/language/zht.json +++ b/qortal-ui-core/language/zht.json @@ -714,6 +714,7 @@ "exp17":"所有付款", "exp18":"付款", "exp19":"已發送", - "exp20":"收到" + "exp20":"收到", + "exp21":"行業" } -} \ No newline at end of file +} diff --git a/qortal-ui-core/src/components/user-info-view/user-info-view.js b/qortal-ui-core/src/components/user-info-view/user-info-view.js index 0d0818cf..ada00969 100644 --- a/qortal-ui-core/src/components/user-info-view/user-info-view.js +++ b/qortal-ui-core/src/components/user-info-view/user-info-view.js @@ -1063,21 +1063,6 @@ class UserInfoView extends connect(store)(LitElement) { render() { return html` - -
- ${translate("mintingpage.mchange27")} ${this.displayLevel} - ${this.founderBadge()} - ${this.avatarImage()} -

${this.infoAccountName}

-

${this.displayAddress}

-

${translate("explorerpage.exp2")}: ${this.displayBalance} QORT

-
-
- this.openMoreInfoDialog()}>${translate("explorerpage.exp3")} - this.closeInfoDialog()} dialog-dismiss>${translate("general.close")} -
- -

${this.infoAccountName}

@@ -1162,6 +1147,7 @@ class UserInfoView extends connect(store)(LitElement) {
+ this.openTrades()}>${translate("explorerpage.exp21")} this.closeCompleteInfoDialog()} dialog-dismiss>${translate("general.close")}
@@ -1177,18 +1163,17 @@ class UserInfoView extends connect(store)(LitElement) { - +
- this.openCompleteInfoDialog()}>

this.openUserBoughtDialog()}>

this.openUserSoldDialog()}>

- this.closeMoreInfoDialog()} dialog-dismiss>${translate("general.close")} + this.closeTrades()} dialog-dismiss>${translate("general.close")}
- +
${this.boughtBTCTemplate()} @@ -1208,7 +1193,7 @@ class UserInfoView extends connect(store)(LitElement) {
- +
${this.soldBTCTemplate()} @@ -1328,7 +1313,11 @@ class UserInfoView extends connect(store)(LitElement) { await this.getAddressUserBalance(myAddress) this.displayAddress = this.addressResult.address this.displayLevel = this.addressResult.level - this.shadowRoot.getElementById('userInfoDialog').open() + this.isLoadingCompleteInfo = true + this.shadowRoot.getElementById('userFullInfoDialog').open() + await this.getStartMint() + await this.getPaymentsGridItems() + this.isLoadingCompleteInfo = false } async getAddressUserInfo(infoAddress) { @@ -1782,20 +1771,11 @@ class UserInfoView extends connect(store)(LitElement) { }).filter(item => !!item) } - openMoreInfoDialog() { - this.shadowRoot.getElementById('userMoreInfoDialog').open() + openTrades() { + this.shadowRoot.getElementById('userTrades').open() this.shadowRoot.getElementById('userInfoDialog').close() } - async openCompleteInfoDialog() { - this.isLoadingCompleteInfo = true - this.shadowRoot.getElementById('userFullInfoDialog').open() - this.shadowRoot.getElementById('userMoreInfoDialog').close() - await this.getStartMint() - await this.getPaymentsGridItems() - this.isLoadingCompleteInfo = false - } - async openUserBoughtDialog() { this.shadowRoot.getElementById('userBoughtDialog').open() this.explorerBoughtBTCTrades = [] @@ -1852,16 +1832,12 @@ class UserInfoView extends connect(store)(LitElement) { this.isLoadingSoldTradesARRR = false } - closeInfoDialog() { - this.shadowRoot.getElementById('userInfoDialog').close() - } - closeErrorDialog() { this.shadowRoot.getElementById('userErrorDialog').close() } - closeMoreInfoDialog() { - this.shadowRoot.getElementById('userMoreInfoDialog').close() + closeTrades() { + this.shadowRoot.getElementById('userTrades').close() } closeCompleteInfoDialog() { @@ -1895,4 +1871,4 @@ class UserInfoView extends connect(store)(LitElement) { } } -window.customElements.define('user-info-view', UserInfoView) \ No newline at end of file +window.customElements.define('user-info-view', UserInfoView)