From eeeccb5a8adcaa22b282274f2553c6a031041341 Mon Sep 17 00:00:00 2001 From: AlphaX-Projects <77661270+AlphaX-Projects@users.noreply.github.com> Date: Tue, 16 Aug 2022 18:55:24 +0200 Subject: [PATCH] add send to address butoon in transaction details --- .../plugins/core/wallet/wallet-app.src.js | 63 +++++++++++++------ 1 file changed, 45 insertions(+), 18 deletions(-) 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 82fc1a5d..8c19be4e 100644 --- a/qortal-ui-plugins/plugins/core/wallet/wallet-app.src.js +++ b/qortal-ui-plugins/plugins/core/wallet/wallet-app.src.js @@ -19,6 +19,8 @@ import '@material/mwc-textfield' import '@polymer/paper-progress/paper-progress.js' import '@polymer/paper-slider/paper-slider.js' import '@polymer/paper-spinner/paper-spinner-lite.js' +import '@polymer/paper-icon-button/paper-icon-button.js' +import '@polymer/iron-icons/iron-icons.js' import '@vaadin/button' import '@vaadin/grid' import '@vaadin/icon' @@ -760,7 +762,10 @@ class MultiWallet extends LitElement {
${this.selectedTransaction.creatorAddress}
${translate("walletpage.wchange10")}
-
${this.selectedTransaction.recipient}
+
+ ${this.renderSQB()} +
+
${!this.selectedTransaction.amount ? '' : html` ${translate("walletpage.wchange11")}
@@ -805,11 +810,12 @@ class MultiWallet extends LitElement {
${this.selectedTransaction.btcSender}
- ${translate("walletpage.wchange10")} + ${translate("walletpage.wchange10")}
-
+
${this.selectedTransaction.btcReceiver}
+
${translate("walletpage.wchange12")}
@@ -857,9 +863,10 @@ class MultiWallet extends LitElement {
${translate("walletpage.wchange10")}
-
- ${this.selectedTransaction.ltcReceiver} +
+ ${this.selectedTransaction.ltcReceiver} this.sendToLtcAddress()} title="Send to this address">
+
${translate("walletpage.wchange12")}
@@ -902,10 +909,11 @@ class MultiWallet extends LitElement {
${translate("walletpage.wchange9")}
-
+
${this.selectedTransaction.dogeSender}
- ${translate("walletpage.wchange10")} +
+ ${translate("walletpage.wchange10")}
${this.selectedTransaction.dogeReceiver} @@ -955,11 +963,12 @@ class MultiWallet extends LitElement {
${this.selectedTransaction.dgbSender}
- ${translate("walletpage.wchange10")} + ${translate("walletpage.wchange10")}
-
+
style="display: inline;" ${this.selectedTransaction.dgbReceiver}
+
${translate("walletpage.wchange12")}
@@ -1005,11 +1014,12 @@ class MultiWallet extends LitElement {
${this.selectedTransaction.rvnSender}
- ${translate("walletpage.wchange10")} + ${translate("walletpage.wchange10")}
-
+
${this.selectedTransaction.rvnReceiver}
+
${translate("walletpage.wchange12")}
@@ -1407,7 +1417,7 @@ class MultiWallet extends LitElement { - +
@@ -1762,7 +1772,7 @@ class MultiWallet extends LitElement { checkSelectedTextAndShowMenu() }) - this.shadowRoot.getElementById('rvnAmountInput').addEventListener('contextmenu', (event) => { + this.shadowRoot.getElementById('rvnAmountInput').addEventListener('contextmenu', (event) => { const getSelectedText = () => { var text = '' if (typeof window.getSelection != 'undefined') { @@ -1879,6 +1889,18 @@ class MultiWallet extends LitElement { this.errorMessage = '' } + sendToQortAddress() { + this.recipient = this.selectedTransaction.recipient + this.openSendQort() + this.shadowRoot.querySelector('#showTransactionDetailsDialog').close() + } + + sendToLtcAddress() { + this.ltcRecipient = this.selectedTransaction.ltcReceiver + this.openSendLtc() + this.shadowRoot.querySelector('#showLtcTransactionDetailsDialog').close() + } + calculateQortAll() { if (this.balance < 0.00100000) { let not_enough_string = get("walletpage.wchange26") @@ -1898,6 +1920,15 @@ class MultiWallet extends LitElement { } } + renderSQB() { + let displaybutton = this.selectedTransaction.recipient + if (displaybutton == null) { + return html`${this.selectedTransaction.recipient}` + } else { + return html`${this.selectedTransaction.recipient} this.sendToQortAddress()} title="Send to this address">` + } + } + renderFetchText() { return html`${translate("walletpage.wchange1")}` } @@ -2198,7 +2229,6 @@ class MultiWallet extends LitElement { } const response = await parentEpml.request('sendLtc', opts) return response - console.log(response) } const manageResponse = (response) => { @@ -2216,7 +2246,6 @@ 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 @@ -2225,7 +2254,6 @@ class MultiWallet extends LitElement { } } const res = await makeRequest() - console.log(res) manageResponse(res) this.showWallet() } @@ -2454,7 +2482,6 @@ class MultiWallet extends LitElement { } const sortedTransactions = txs.sort(compareFn) - console.log(sortedTransactions) if (this._selectedWallet == coin) { this.wallets.get(this._selectedWallet).transactions = sortedTransactions } @@ -2606,7 +2633,7 @@ class MultiWallet extends LitElement { render(this.renderDogeTransactions(this.wallets.get(this._selectedWallet).transactions, this._selectedWallet), this.transactionsDOM) } else if (this._selectedWallet === 'dgb') { render(this.renderDgbTransactions(this.wallets.get(this._selectedWallet).transactions, this._selectedWallet), this.transactionsDOM) - } else if (this._selectedWallet === 'rvn') { + } else if (this._selectedWallet === 'rvn') { render(this.renderRvnTransactions(this.wallets.get(this._selectedWallet).transactions, this._selectedWallet), this.transactionsDOM) } }