From 7ded0034f5f4a5371a02e2e65da61d40a474e259 Mon Sep 17 00:00:00 2001 From: AlphaX-Projects <77661270+AlphaX-Projects@users.noreply.github.com> Date: Sun, 4 Jun 2023 14:29:13 +0200 Subject: [PATCH] Add show all payments --- core/language/de.json | 8 +- core/language/es.json | 8 +- core/language/fr.json | 10 +- core/language/hindi.json | 8 +- core/language/hr.json | 8 +- core/language/hu.json | 8 +- core/language/it.json | 8 +- core/language/jp.json | 8 +- core/language/ko.json | 8 +- core/language/no.json | 8 +- core/language/pl.json | 8 +- core/language/pt.json | 8 +- core/language/ro.json | 8 +- core/language/rs.json | 8 +- core/language/ru.json | 8 +- core/language/us.json | 8 +- core/language/zhc.json | 8 +- core/language/zht.json | 8 +- .../user-info-view/user-info-view.js | 112 ++++++++++++++++-- 19 files changed, 177 insertions(+), 81 deletions(-) diff --git a/core/language/de.json b/core/language/de.json index 97cd9f99..6e256df8 100644 --- a/core/language/de.json +++ b/core/language/de.json @@ -898,9 +898,7 @@ "nchange29": "Prägekonto erfolgreich entfernt!", "nchange30": "Fehler beim Entfernen des Prägekontos!", "nchange31": "Knoten stoppen", - "nchange32": "Stoppanforderung erfolgreich gesendet!", - "nchange33": "Knoten neu starten", - "nchange34": "Neustartanforderung erfolgreich gesendet!" + "nchange32": "Stoppanforderung erfolgreich gesendet!" }, "transpage": { "tchange1": "Transaktionsanfrage", @@ -981,7 +979,9 @@ "exp18": "Zahlungen", "exp19": "Gesendet", "exp20": "Empfangen", - "exp21": "Trades" + "exp21": "Trades", + "exp22": "LETZTE 5 ZAHLUNGEN", + "exp23": "Alle Zahlungen anzeigen" }, "managegroup": { "mg1": "Gruppenmitglieder", diff --git a/core/language/es.json b/core/language/es.json index 04d367df..8004ae76 100644 --- a/core/language/es.json +++ b/core/language/es.json @@ -898,9 +898,7 @@ "nchange29": "Eliminación exitosa de la cuenta de acuñación!", "nchange30": "Fallo en la eliminación de la cuenta de acuñación!", "nchange31": "Detener Nodo", - "nchange32": "Solicitud de detención enviada con éxito!", - "nchange33": "Reiniciar Nodo", - "nchange34": "Solicitud de reinicio enviada con éxito!" + "nchange32": "Solicitud de detención enviada con éxito!" }, "transpage": { "tchange1": "Solicitud de transacción", @@ -981,7 +979,9 @@ "exp18": "Pagos", "exp19": "Enviado", "exp20": "Recibido", - "exp21": "Oficios" + "exp21": "Oficios", + "exp22": "ULTIMOS 5 PAGOS", + "exp23": "Mostrar todos los pagos" }, "managegroup": { "mg1": "Miembros del grupo", diff --git a/core/language/fr.json b/core/language/fr.json index 0daf77b6..3969e9f2 100644 --- a/core/language/fr.json +++ b/core/language/fr.json @@ -897,10 +897,8 @@ "nchange28": "Échec de l’ajout d’un noeud de frappe!", "nchange29": "Suppression réussie du compte de frappe!", "nchange30": "Echec de la suppression du compte de frappe!", - "nchange31": "Arrêter le noeud", - "nchange32": "Demande d’arrêt envoyée avec succès!", - "nchange33": "Redémarrer le noeud", - "nchange34": "Demande de redémarrage envoyée avec succès!" + "nchange31": "Arreter le noeud", + "nchange32": "Demande d’arrêt envoyée avec succès!" }, "transpage": { "tchange1": "Demande de transaction", @@ -981,7 +979,9 @@ "exp18": "Paiements", "exp19": "Envoyé", "exp20": "Reçu", - "exp21": "Métiers" + "exp21": "Métiers", + "exp22": "5 DERNIERS PAIEMENTS", + "exp23": "Afficher tous les paiements" }, "managegroup": { "mg1": "Membres du groupe", diff --git a/core/language/hindi.json b/core/language/hindi.json index 8bcf3151..7fcb7f0c 100644 --- a/core/language/hindi.json +++ b/core/language/hindi.json @@ -899,9 +899,7 @@ "nchange29": "मिंटिंग अकाउंट को सफलतापूर्वक हटाया गया!", "nchange30": "खनन खाता हटाने में विफल!", "nchange31": "स्टॉप नोड", - "nchange32": "स्टॉप अनुरोध सफलतापूर्वक भेजा गया!", - "nchange33": "नोड फिर से चालू करें", - "nchange34": "रीस्टार्ट अनुरोध सफलतापूर्वक भेजा गया!" + "nchange32": "स्टॉप अनुरोध सफलतापूर्वक भेजा गया!" }, "transpage": { "tchange1": "लेनदेन अनुरोध", @@ -982,7 +980,9 @@ "exp18": "भुगतान", "exp19": "भेजा गया", "exp20": "प्राप्त", - "exp21": "ट्रेडों" + "exp21": "ट्रेडों", + "exp22": "पिछले 5 भुगतान", + "exp23": "सभी भुगतान दिखाएं" }, "managegroup": { "mg1": "समूह के सदस्य", diff --git a/core/language/hr.json b/core/language/hr.json index 9f16b7d7..b555bbeb 100644 --- a/core/language/hr.json +++ b/core/language/hr.json @@ -898,9 +898,7 @@ "nchange29": "Uspješno uklonjen minter račun!", "nchange30": "Neuspješno uklanjanje minter računa!", "nchange31": "Zaustavi čvor", - "nchange32": "Uspješno poslan zahtjev za zaustavljenje!", - "nchange33": "Ponovo pokreni čvor", - "nchange34": "Uspješno poslan zahtjev za ponovnim pokretanjem!" + "nchange32": "Uspješno poslan zahtjev za zaustavljenje!" }, "transpage": { "tchange1": "Zahtjev za transakciju", @@ -981,7 +979,9 @@ "exp18": "Plaćanja", "exp19": "Poslano", "exp20": "Primljeno", - "exp21": "Obrta" + "exp21": "Obrta", + "exp22": "ZADNJIH 5 UPLATA", + "exp23": "Prikaži sva plaćanja" }, "managegroup": { "mg1": "Članovi grupe", diff --git a/core/language/hu.json b/core/language/hu.json index 49a737a0..59b03c50 100644 --- a/core/language/hu.json +++ b/core/language/hu.json @@ -898,9 +898,7 @@ "nchange29": "Sikerült eltávolítani a verési fiókot!", "nchange30": "Nem sikerült eltávolítani a verési fiókot!", "nchange31": "Csomópont Leállítás", - "nchange32": "Sikeresen Elküldött Stop Kérés!", - "nchange33": "Csomópont Újraindítása", - "nchange34": "Sikeresen Elküldött Újraindítási Kérés!" + "nchange32": "Sikeresen Elküldött Stop Kérés!" }, "transpage": { "tchange1": "Tranzakciós Kérelem", @@ -981,7 +979,9 @@ "exp18": "Kifizetések", "exp19": "Elküldve", "exp20": "Fogadott", - "exp21": "Passzátszelek" + "exp21": "Passzátszelek", + "exp22": "UTOLSÓ 5 FIZETÉS", + "exp23": "Minden kifizetés megjelenítése" }, "managegroup": { "mg1": "Csoporttagok", diff --git a/core/language/it.json b/core/language/it.json index c9d830b2..625065d4 100644 --- a/core/language/it.json +++ b/core/language/it.json @@ -898,9 +898,7 @@ "nchange29": "Conto di minting rimosso con successo!", "nchange30": "Impossibile rimuovere l'account di minting!", "nchange31": "Arresta nodo", - "nchange32": "Richiesta di arresto inviata con successo!", - "nchange33": "Riavvia nodo", - "nchange34": "Richiesta di riavvio inviata con successo!" + "nchange32": "Richiesta di arresto inviata con successo!" }, "transpage": { "tchange1": "Richiesta di transazione", @@ -981,7 +979,9 @@ "exp18": "Pagamenti", "exp19": "Inviato", "exp20": "Ricevuto", - "exp21": "Mestieri" + "exp21": "Mestieri", + "exp22": "ULTIMI 5 PAGAMENTI", + "exp23": "Mostra tutti i pagamenti" }, "managegroup": { "mg1": "Membri del gruppo", diff --git a/core/language/jp.json b/core/language/jp.json index 06cf2daa..a082039c 100644 --- a/core/language/jp.json +++ b/core/language/jp.json @@ -40,7 +40,9 @@ "groups": "グループ", "sm1": "名前", "sm2": "名前の管理", - "sm3": "名前マーケット" + "sm3": "名前マーケット", + "exp22": "最後の 5 回の支払い", + "exp23": "すべての支払いを表示" }, "login": { "login": "ログイン", @@ -1064,7 +1066,7 @@ "inf14": "を右記の通貨で", "inf15": "アクティブな自動購入注文", "inf16": "自動購入", - "inf17": "ライトモードに切り替える", - "inf18": "ダークモードに切り替える" + "inf17": "ライトテーマに切り替える", + "inf18": "ダークテーマに切り替える" } } diff --git a/core/language/ko.json b/core/language/ko.json index c63e7dc9..3cb34c4c 100644 --- a/core/language/ko.json +++ b/core/language/ko.json @@ -898,9 +898,7 @@ "nchange29": "민팅 계정이 제거되었습니다!", "nchange30": "민팅 계정을 제거하지 못했습니다!", "nchange31": "노드 중지", - "nchange32": "중지 요청을 성공적으로 전송했습니다!", - "nchange33": "노드 재시작", - "nchange34": "다시 시작 요청을 성공적으로 보냈습니다!" + "nchange32": "중지 요청을 성공적으로 전송했습니다.!" }, "transpage": { "tchange1": "거래요청", @@ -981,7 +979,9 @@ "exp18": "결제", "exp19": "보냈습니다", "exp20": "수신됨", - "exp21": "거래" + "exp21": "거래", + "exp22": "마지막 5회 결제", + "exp23": "모든 결제 보기" }, "managegroup": { "mg1": "그룹 구성원", diff --git a/core/language/no.json b/core/language/no.json index 9afc0111..bb5a1db8 100644 --- a/core/language/no.json +++ b/core/language/no.json @@ -898,9 +898,7 @@ "nchange29": "Mintekontoen ble fjernet!", "nchange30": "Kunne ikke fjerne mintekontoen!", "nchange31": "Stopp noden", - "nchange32": "Stoppforespørsel sendt!", - "nchange33": "Omstart noden", - "nchange34": "Omstartsforespørsel sendt!" + "nchange32": "Stoppforespørsel sendt!" }, "transpage": { "tchange1": "Transaksjonsforespørsel", @@ -981,7 +979,9 @@ "exp18": "Betalinger", "exp19": "Sendt", "exp20": "Motta", - "exp21": "Handler" + "exp21": "Handler", + "exp22": "SISTE 5 BETALINGER", + "exp23": "Vis alle betalinger" }, "managegroup": { "mg1": "Gruppemedlemmer", diff --git a/core/language/pl.json b/core/language/pl.json index 5944526b..4fb13215 100644 --- a/core/language/pl.json +++ b/core/language/pl.json @@ -898,9 +898,7 @@ "nchange29": "Pomyślnie usunięto konto mintowania!", "nchange30": "Nie udało się usunąć konta mintowania!", "nchange31": "Zatrzymaj węzeł", - "nchange32": "Pomyślnie wysłane żądanie zatrzymania!", - "nchange33": "Uruchom ponownie węzeł", - "nchange34": "Pomyślnie wysłane żądanie ponownego uruchomienia!" + "nchange32": "Pomyślnie wysłane żądanie zatrzymania!" }, "transpage": { "tchange1": "Żądanie transakcji", @@ -981,7 +979,9 @@ "exp18": "Płatności", "exp19": "Wysłane", "exp20": "Otrzymano", - "exp21": "Transakcji" + "exp21": "Transakcji", + "exp22": "OSTATNIE 5 PŁATNOŚCI", + "exp23": "Pokaż wszystkie płatności" }, "managegroup": { "mg1": "Członkowie grupy", diff --git a/core/language/pt.json b/core/language/pt.json index 756a49ab..1dfdac72 100644 --- a/core/language/pt.json +++ b/core/language/pt.json @@ -898,9 +898,7 @@ "nchange29": "Conta de Mineração removida com sucesso!", "nchange30": "Falha em remover a conta de mineração", "nchange31": "Parar Nódulo", - "nchange32": "Pedido de parada enviado com sucesso!", - "nchange33": "Reiniciar Nódulo", - "nchange34": "Pedido de reinicialização enviado com sucesso!" + "nchange32": "Pedido de parada enviado com sucesso!" }, "transpage": { "tchange1": "Pedido de transação", @@ -981,7 +979,9 @@ "exp18": "Pagamentos", "exp19": "Enviado", "exp20": "Recebido", - "exp21": "Comércios" + "exp21": "Comércios", + "exp22": "ÚLTIMOS 5 PAGAMENTOS", + "exp23": "Mostrar todos os pagamentos" }, "managegroup": { "mg1": "Membros do grupo", diff --git a/core/language/ro.json b/core/language/ro.json index ede9a1bd..8068ad2b 100644 --- a/core/language/ro.json +++ b/core/language/ro.json @@ -898,9 +898,7 @@ "nchange29": "S-a eliminat cu succes contul de producator de moneda (minting)!", "nchange30": "Nu a reusit eliminare contulului de recompensare (minting)!", "nchange31": "Opreste Nodul", - "nchange32": "Cerere de Oprire Trimisă cu Succes!", - "nchange33": "Reporniți Nodul", - "nchange34": "Cerere de Repornire a Fost Trimisă cu Succes!" + "nchange32": "Cerere de Oprire Trimisa cu Succes!" }, "transpage": { "tchange1": "Cerere de tranzactionare", @@ -981,7 +979,9 @@ "exp18": "Plăti", "exp19": "Trimis", "exp20": "Primit", - "exp21": "Meserii" + "exp21": "Meserii", + "exp22": "ULTIMELE 5 PĂȚI", + "exp23": "Afișați toate plățile" }, "managegroup": { "mg1": "Membrii grupului", diff --git a/core/language/rs.json b/core/language/rs.json index 7eb3df86..7c5c0aaa 100644 --- a/core/language/rs.json +++ b/core/language/rs.json @@ -898,9 +898,7 @@ "nchange29": "Minting nalog uspešno uklonjen!", "nchange30": "Minting nalog neuspešno uklonjen!", "nchange31": "Zaustavite čvor", - "nchange32": "Zahtev za zaustavljanje uspešno poslat!", - "nchange33": "Ponovo pokreni čvor", - "nchange34": "Zahtev za ponovno pokretanje uspešno poslat!" + "nchange32": "Zahtev za zaustavljanje uspešno poslat!" }, "transpage": { "tchange1": "Zahtev za transakcijom", @@ -981,7 +979,9 @@ "exp18": "Plaćanja", "exp19": "Poslato", "exp20": "Primljeno", - "exp21": "Trgovine" + "exp21": "Trgovine", + "exp22": "POSLEDNJIH 5 PLAĆANJA", + "exp23": "Prikaži sva plaćanja" }, "managegroup": { "mg1": "Članovi grupe", diff --git a/core/language/ru.json b/core/language/ru.json index 172647a2..454f1653 100644 --- a/core/language/ru.json +++ b/core/language/ru.json @@ -898,9 +898,7 @@ "nchange29": "Учетная запись Minting успешно удалена!", "nchange30": "Не удалось удалить учетную запись Minting!", "nchange31": "Остановить узел", - "nchange32": "Запрос на остановку успешно отправлен!", - "nchange33": "Перезапустить узел", - "nchange34": "Запрос на перезапуск успешно отправлен!" + "nchange32": "Запрос на остановку успешно отправлен!" }, "transpage": { "tchange1": "Запрос транзакции", @@ -981,7 +979,9 @@ "exp18": "Платежи", "exp19": "Отправлено", "exp20": "Получено", - "exp21": "Сделок" + "exp21": "Сделок", + "exp22": "ПОСЛЕДНИЕ 5 ПЛАТЕЖЕЙ", + "exp23": "Показать все платежи" }, "managegroup": { "mg1": "Члены группы", diff --git a/core/language/us.json b/core/language/us.json index 7d203f7c..00ea1133 100644 --- a/core/language/us.json +++ b/core/language/us.json @@ -899,9 +899,7 @@ "nchange29": "Successfully Removed Minting Account!", "nchange30": "Failed to Remove Minting Account!", "nchange31": "Stop Node", - "nchange32": "Successfully Sent Stop Request!", - "nchange33": "Restart Node", - "nchange34": "Successfully Sent Restart Request!" + "nchange32": "Successfully Sent Stop Request!" }, "transpage": { "tchange1": "Transaction request", @@ -982,7 +980,9 @@ "exp18": "Payments", "exp19": "Sent", "exp20": "Received", - "exp21": "Trades" + "exp21": "Trades", + "exp22": "LAST 5 PAYMENTS", + "exp23": "Show All Payments" }, "managegroup": { "mg1": "Group Members", diff --git a/core/language/zhc.json b/core/language/zhc.json index f8cd057b..5348b834 100644 --- a/core/language/zhc.json +++ b/core/language/zhc.json @@ -898,9 +898,7 @@ "nchange29": "成功从此节点中移除铸币账号!", "nchange30": "未能从此节点中移除铸币账号!", "nchange31": "关闭节点", - "nchange32": "成功发送关闭节点请求!", - "nchange33": "重启节点", - "nchange34": "成功发送重启节点请求!" + "nchange32": "成功发送关闭节点请求!" }, "transpage": { "tchange1": "请求交易", @@ -981,7 +979,9 @@ "exp18": "付款", "exp19": "已发送", "exp20": "已收到", - "exp21": "交易" + "exp21": "交易", + "exp22": "最近 5 笔付款", + "exp23": "显示所有付款" }, "managegroup": { "mg1": "群组成员", diff --git a/core/language/zht.json b/core/language/zht.json index 851c3e94..597b7a97 100644 --- a/core/language/zht.json +++ b/core/language/zht.json @@ -898,9 +898,7 @@ "nchange29": "成功從此節點中移除鑄幣賬號!", "nchange30": "未能從此節點中移除鑄幣賬號!", "nchange31": "關閉節點", - "nchange32": "成功發送關閉節點請求!", - "nchange33": "重啟節點", - "nchange34": "成功發送重啟節點請求!" + "nchange32": "成功發送關閉節點請求!" }, "transpage": { "tchange1": "請求交易", @@ -981,7 +979,9 @@ "exp18": "付款", "exp19": "已發送", "exp20": "已收到", - "exp21": "交易" + "exp21": "交易", + "exp22": "最近 5 筆付款", + "exp23": "顯示所有付款" }, "managegroup": { "mg1": "群組成員", diff --git a/core/src/components/user-info-view/user-info-view.js b/core/src/components/user-info-view/user-info-view.js index fdf0c97c..892f1265 100644 --- a/core/src/components/user-info-view/user-info-view.js +++ b/core/src/components/user-info-view/user-info-view.js @@ -2,7 +2,6 @@ import { LitElement, html, css } from 'lit' import { render } from 'lit/html.js' import { connect } from 'pwa-helpers' import { store } from '../../store.js' -import { doLogout } from '../../redux/app/app-actions.js' import { get, translate, translateUnsafeHTML } from 'lit-translate' import '@polymer/paper-dialog/paper-dialog.js' @@ -48,6 +47,7 @@ class UserInfoView extends connect(store)(LitElement) { explorerSoldRVNTrades: { type: Array }, explorerSoldARRRTrades: { type: Array }, allPayments: { type: Array }, + slicedArray: { type: Array }, allReceivedPayments: { type: Array }, allSendPayments: { type: Array }, actualBlockheight: { type: Number }, @@ -267,8 +267,24 @@ class UserInfoView extends connect(store)(LitElement) { --mdc-theme-primary: var(--mdc-theme-error) } + .warning { + --mdc-theme-primary: #f0ad4e; + } + + .green { + --mdc-theme-primary: #198754; + } + .buttons { - text-align:right; + display: inline; + float: right; + margin-bottom: 5px; + } + + .paybutton { + display: inline; + float: left; + margin-bottom: 5px; } .loadingContainer { @@ -315,6 +331,15 @@ class UserInfoView extends connect(store)(LitElement) { height: 250px; } + .box-info-full { + margin: 0; + padding: 0; + display: flex; + flex-flow: column; + height: 450px; + width: 450px; + } + header { display: flex; flex: 0 1 auto; @@ -322,7 +347,7 @@ class UserInfoView extends connect(store)(LitElement) { justify-content: center; padding: 0px 10px; font-size: 16px; - color: var(--white); + color: var(--black); background-color: var(--tradehead); border-left: 1px solid var(--tradeborder); border-top: 1px solid var(--tradeborder); @@ -479,6 +504,7 @@ class UserInfoView extends connect(store)(LitElement) { this.explorerSoldRVNTrades = [] this.explorerSoldARRRTrades = [] this.allPayments = [] + this.slicedArray = [] this.allReceivedPayments = [] this.allSendPayments = [] this.actualBlockheight = 0 @@ -1107,10 +1133,66 @@ class UserInfoView extends connect(store)(LitElement) {
+
${translate("explorerpage.exp22")}
+
+
${translate("login.loading")}
+ + { + render(html`${translate("walletpage.wchange40")} ${data.item.creatorAddress === this.displayAddress ? html`${translate("walletpage.wchange7")}` : html`${translate("walletpage.wchange8")}`} `, root) + }} + > + + + { + const dateString = new Date(data.item.timestamp).toLocaleDateString() + render(html`${dateString}`, root) + }} + > + + { + render(html`info`, root) + }} + > + + + ${this.isEmptyArray(this.slicedArray) ? html` + ${translate("walletpage.wchange38")} + `: ''} +
+
+
+
+ + this.showAllPayments()}>${translate("explorerpage.exp23")} + + + this.openTrades()}>${translate("explorerpage.exp21")} + this.closeCompleteInfoDialog()} dialog-dismiss>${translate("general.close")} + +
+ + + +
+

${translate("explorerpage.exp17")}

+
+
+
+
${translate("explorerpage.exp17")}
${translate("login.loading")}
- +
-
- this.openTrades()}>${translate("explorerpage.exp21")} - this.closeCompleteInfoDialog()} dialog-dismiss>${translate("general.close")} +
+ + this.closeShowAllPaymentsDialog()} dialog-dismiss>${translate("general.close")} +
@@ -1420,14 +1503,15 @@ class UserInfoView extends connect(store)(LitElement) { founderStatus() { if (this.addressResult.flags === 1) { - return html`${translate("general.yes")}` + return html`${translate("general.yes")}` } else { - return html`${translate("general.no")}` + return html`${translate("general.no")}` } } async getPaymentsGridItems() { this.allPayments = [] + this.slicedArray = [] this.allReceivedPayments = [] this.allSendPayments = [] this.totalSent = 0 @@ -1455,6 +1539,8 @@ class UserInfoView extends connect(store)(LitElement) { } }).filter(item => !!item) + this.slicedArray = this.allPayments.slice(0, 5) + this.allSendPayments = this.allPayments.map(item => { const searchSendAddress = item.creatorAddress if (searchSendAddress == paymentsAddress) { @@ -1506,6 +1592,10 @@ class UserInfoView extends connect(store)(LitElement) { this.shadowRoot.getElementById('showTxDetailsDialog').open() } + showAllPayments() { + this.shadowRoot.getElementById('showAllPaymentsDialog').open() + } + async getBoughtBTCGridItems() { const myNode = store.getState().app.nodeConfig.knownNodes[store.getState().app.nodeConfig.node] const nodeUrl = myNode.protocol + '://' + myNode.domain + ':' + myNode.port @@ -1851,6 +1941,10 @@ class UserInfoView extends connect(store)(LitElement) { this.shadowRoot.getElementById('userSoldDialog').close() } + closeShowAllPaymentsDialog() { + this.shadowRoot.getElementById('showAllPaymentsDialog').close() + } + getApiKey() { const apiNode = store.getState().app.nodeConfig.knownNodes[store.getState().app.nodeConfig.node]; let apiKey = apiNode.apiKey;