From f1c2cf9a8a52f3e9d558032e62ac58259b9e2524 Mon Sep 17 00:00:00 2001 From: AlphaX-Projects <77661270+AlphaX-Projects@users.noreply.github.com> Date: Sat, 16 Apr 2022 17:14:24 +0200 Subject: [PATCH] translate transaction send dialog --- qortal-ui-core/language/de.json | 5 ++ qortal-ui-core/language/fr.json | 5 ++ qortal-ui-core/language/pl.json | 5 ++ qortal-ui-core/language/sp.json | 5 ++ qortal-ui-core/language/us.json | 5 ++ qortal-ui-core/language/zhc.json | 5 ++ qortal-ui-core/language/zht.json | 5 ++ .../confirm-transaction-dialog.js | 5 +- .../api/transactions/PaymentTransaction.js | 52 +++++-------------- qortal-ui-crypto/package.json | 4 +- .../plugins/core/wallet/wallet-app.src.js | 8 ++- 11 files changed, 57 insertions(+), 47 deletions(-) diff --git a/qortal-ui-core/language/de.json b/qortal-ui-core/language/de.json index 8b40c42e..680735be 100644 --- a/qortal-ui-core/language/de.json +++ b/qortal-ui-core/language/de.json @@ -557,5 +557,10 @@ "achange5": "Hinzufügen", "achange6": "API-Schlüssel erfolgreich hinzugefügt", "achange7": "API-Schlüssel falsch, kein API-Schlüssel hinzugefügt" + }, + "transactions": { + "amount": "Menge", + "to": "Zu", + "declined": "Der Benutzer hat die Transaktion abgelehnt!" } } diff --git a/qortal-ui-core/language/fr.json b/qortal-ui-core/language/fr.json index f6c11403..bcb79aff 100644 --- a/qortal-ui-core/language/fr.json +++ b/qortal-ui-core/language/fr.json @@ -557,5 +557,10 @@ "achange5": "Add", "achange6": "Successfully added API Key", "achange7": "API key wrong, no API key added" + }, + "transactions": { + "amount": "Amount", + "to": "To", + "declined": "User declined transaction!" } } \ No newline at end of file diff --git a/qortal-ui-core/language/pl.json b/qortal-ui-core/language/pl.json index 11069522..e35b98b1 100644 --- a/qortal-ui-core/language/pl.json +++ b/qortal-ui-core/language/pl.json @@ -557,5 +557,10 @@ "achange5": "Add", "achange6": "Successfully added API Key", "achange7": "API key wrong, no API key added" + }, + "transactions": { + "amount": "Amount", + "to": "To", + "declined": "User declined transaction!" } } \ No newline at end of file diff --git a/qortal-ui-core/language/sp.json b/qortal-ui-core/language/sp.json index 254f8c5a..939867d1 100644 --- a/qortal-ui-core/language/sp.json +++ b/qortal-ui-core/language/sp.json @@ -557,5 +557,10 @@ "achange5": "Add", "achange6": "Successfully added API Key", "achange7": "API key wrong, no API key added" + }, + "transactions": { + "amount": "Amount", + "to": "To", + "declined": "User declined transaction!" } } \ No newline at end of file diff --git a/qortal-ui-core/language/us.json b/qortal-ui-core/language/us.json index 0ea2b15d..19163606 100644 --- a/qortal-ui-core/language/us.json +++ b/qortal-ui-core/language/us.json @@ -557,5 +557,10 @@ "achange5": "Add", "achange6": "Successfully added API Key", "achange7": "API key wrong, no API key added" + }, + "transactions": { + "amount": "Amount", + "to": "To", + "declined": "User declined transaction!" } } \ No newline at end of file diff --git a/qortal-ui-core/language/zhc.json b/qortal-ui-core/language/zhc.json index 804b7f32..7765a7e7 100644 --- a/qortal-ui-core/language/zhc.json +++ b/qortal-ui-core/language/zhc.json @@ -557,5 +557,10 @@ "achange5": "添加", "achange6": "成功添加此节点的API密钥。", "achange7": "添加API密钥失败。" + }, + "transactions": { + "amount": "Amount", + "to": "To", + "declined": "User declined transaction!" } } diff --git a/qortal-ui-core/language/zht.json b/qortal-ui-core/language/zht.json index 0582a1aa..65a7694e 100644 --- a/qortal-ui-core/language/zht.json +++ b/qortal-ui-core/language/zht.json @@ -557,5 +557,10 @@ "achange5": "添加", "achange6": "成功添加此節點的API密鑰。", "achange7": "添加API密鑰失敗。" + }, + "transactions": { + "amount": "Amount", + "to": "To", + "declined": "User declined transaction!" } } diff --git a/qortal-ui-core/src/functional-components/confirm-transaction-dialog.js b/qortal-ui-core/src/functional-components/confirm-transaction-dialog.js index 100c0ae9..55e152a0 100644 --- a/qortal-ui-core/src/functional-components/confirm-transaction-dialog.js +++ b/qortal-ui-core/src/functional-components/confirm-transaction-dialog.js @@ -1,7 +1,7 @@ import { LitElement, html, css } from 'lit' import { connect } from 'pwa-helpers' import { store } from '../store.js' -import { translate, translateUnsafeHTML } from 'lit-translate' +import { get, translate, translateUnsafeHTML } from 'lit-translate' import { listenForRequest } from '../transactionRequest.js' @@ -95,7 +95,8 @@ class ConfirmTransactionDialog extends connect(store)(LitElement) { } decline(e) { - this._reject(new Error('User declined transaction')) + const rejecterror = get("transactions.declined") + this._reject(new Error(rejecterror)) } } diff --git a/qortal-ui-crypto/api/transactions/PaymentTransaction.js b/qortal-ui-crypto/api/transactions/PaymentTransaction.js index dd9afce0..64589991 100644 --- a/qortal-ui-crypto/api/transactions/PaymentTransaction.js +++ b/qortal-ui-crypto/api/transactions/PaymentTransaction.js @@ -1,8 +1,6 @@ 'use strict'; import TransactionBase from './TransactionBase.js' -// import { QORT_DECIMALS } from '../constants.js' import Base58 from '../deps/Base58.js' -// import { store } from '../../store.js' import { store } from '../../api.js' export default class PaymentTransaction extends TransactionBase { @@ -28,12 +26,20 @@ export default class PaymentTransaction extends TransactionBase { set recipient(recipient) { // Always Base58 encoded. Accepts Uint8Array or Base58 string. this._recipient = recipient instanceof Uint8Array ? recipient : this.constructor.Base58.decode(recipient) } + + set dialogto(dialogto) { + this._dialogto = dialogto + } + + set dialogamount(dialogamount) { + this._dialogamount = dialogamount + } + set amount(amount) { - // console.log('=====DECIMALS ', store.getState().config.coin.decimals) - // console.log("IINIT AMOUNT: ", amount); this._amount = amount * store.getState().config.coin.decimals this._amountBytes = this.constructor.utils.int64ToBytes(this._amount) } + get params() { const params = super.params params.push( @@ -46,51 +52,17 @@ export default class PaymentTransaction extends TransactionBase { render(html) { const conf = store.getState().config - // console.log(this) return html` - + - +
To${this._dialogto} ${Base58.encode(this._recipient)}
Amount${this._dialogamount} ${this._amount / conf.coin.decimals} ${conf.coin.symbol}
` } } -// -// import txTypes from "./txTypes.js" -// import nacl from "./deps/nacl-fast.js" -// import Utils from "./Utils.js" -// -// function generateSignaturePaymentTransaction(keyPair, lastReference, recipient, amount, fee, timestamp) => { -// const data = generatePaymentTransactionBase(keyPair.publicKey, lastReference, recipient, amount, fee, timestamp); -// return nacl.sign.detached(data, keyPair.privateKey); -// } -// -// function generatePaymentTransaction(keyPair, lastReference, recipient, amount, fee, timestamp, signature) => { -// return Utils.appendBuffer(generatePaymentTransactionBase(keyPair.publicKey, lastReference, recipient, amount, fee, timestamp),signature); -// } -// -// function generatePaymentTransactionBase(publicKey, lastReference, recipient, amount, fee, timestamp) => { -// const txType = txTypes.PAYMENT_TRANSACTION; -// const typeBytes = Utils.int32ToBytes(txType); -// const timestampBytes = Utils.int64ToBytes(timestamp); -// const amountBytes = Utils.int64ToBytes(amount * 100000000); -// const feeBytes = Utils.int64ToBytes(fee * 100000000); -// -// let data = new Uint8Array(); -// -// data = Utils.appendBuffer(data, typeBytes); -// data = Utils.appendBuffer(data, timestampBytes); -// data = Utils.appendBuffer(data, lastReference); -// data = Utils.appendBuffer(data, publicKey); -// data = Utils.appendBuffer(data, recipient); -// data = Utils.appendBuffer(data, amountBytes); -// data = Utils.appendBuffer(data, feeBytes); -// -// return data; -// } diff --git a/qortal-ui-crypto/package.json b/qortal-ui-crypto/package.json index 3b651558..245f9145 100644 --- a/qortal-ui-crypto/package.json +++ b/qortal-ui-crypto/package.json @@ -20,9 +20,7 @@ "asmcrypto.js": "2.3.2", "buffer": "6.0.3", "jssha": "3.2.0", - "lodash": "4.17.21", - "lit": "2.2.2", - "lit-translate": "2.0.0" + "lodash": "4.17.21" }, "engines": { "node": ">=14.17.0" 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 608f2786..a5df9107 100644 --- a/qortal-ui-plugins/plugins/core/wallet/wallet-app.src.js +++ b/qortal-ui-plugins/plugins/core/wallet/wallet-app.src.js @@ -1159,11 +1159,11 @@ class MultiWallet extends LitElement { setInterval(() => { this.errorMessage = ''; - }, 5000) + }, 10000) setInterval(() => { this.successMessage = ''; - }, 5000) + }, 10000) this.currencyBoxes = this.shadowRoot.querySelectorAll('.currency-box') this.transactionsDOM = this.shadowRoot.getElementById('transactionsDOM') @@ -1584,6 +1584,8 @@ class MultiWallet extends LitElement { const makeTransactionRequest = async (receiver, lastRef) => { let myReceiver = receiver let mylastRef = lastRef + let dialogamount = get("transactions.amount") + let dialogto = get("transactions.to") let myTxnrequest = await parentEpml.request('transaction', { type: 2, @@ -1593,6 +1595,8 @@ class MultiWallet extends LitElement { amount: amount, lastReference: mylastRef, fee: 0.001, + dialogamount: dialogamount, + dialogto: dialogto, }, }) return myTxnrequest