Qortal/qortal-ui
4
1
Fork 4
mirror of https://github.com/Qortal/qortal-ui.git synced 2025-02-12 02:05:51 +00:00
Code Issues Projects Releases Wiki Activity

Add fee to SEND_COIN modal

Browse Source
This commit is contained in:
QuickMythril 2023-05-25 16:28:57 -04:00
parent fe8c871b0e
commit e87d455ee1
1 changed files with 24 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
plugins/plugins/core/qdn/browser/browser.src.js
View File

@ -1702,9 +1702,9 @@ class WebBrowser extends LitElement {
const walletBalanceDecimals = Number(transformDecimals) const walletBalanceDecimals = Number(transformDecimals)
const amountDecimals = Number(amount) * QORT_DECIMALS const amountDecimals = Number(amount) * QORT_DECIMALS
const balance = (Number(transformDecimals) / 1e8).toFixed(8) const balance = (Number(transformDecimals) / 1e8).toFixed(8)
const fee = await this.sendQortFee() const feeAmount = await this.sendQortFee()
if (amountDecimals + (fee * QORT_DECIMALS) > walletBalanceDecimals) { if (amountDecimals + (feeAmount * QORT_DECIMALS) > walletBalanceDecimals) {
let errorMsg = "Insufficient Funds!" let errorMsg = "Insufficient Funds!"
let failedMsg = get("walletpage.wchange26") let failedMsg = get("walletpage.wchange26")
let pleaseMsg = get("walletpage.wchange44") let pleaseMsg = get("walletpage.wchange44")
@ -1739,7 +1739,8 @@ class WebBrowser extends LitElement {
amount, amount,
recipient, recipient,
coin, coin,
balance balance,
feeAmount
} }
) )
@ -1837,7 +1838,7 @@ class WebBrowser extends LitElement {
recipientName: recipientName, recipientName: recipientName,
amount: amount, amount: amount,
lastReference: mylastRef, lastReference: mylastRef,
fee: fee, fee: feeAmount,
dialogamount: dialogamount, dialogamount: dialogamount,
dialogto: dialogto, dialogto: dialogto,
dialogAddress, dialogAddress,
@ -1879,6 +1880,7 @@ class WebBrowser extends LitElement {
const coin = data.coin const coin = data.coin
const xprv58 = this.btcWallet.derivedMasterPrivateKey const xprv58 = this.btcWallet.derivedMasterPrivateKey
const feePerByte = data.fee ? data.fee : this.btcFeePerByte const feePerByte = data.fee ? data.fee : this.btcFeePerByte
const feeAmount = (feePerByte / 1e8).toFixed(8)
const btcWalletBalance = await parentEpml.request('apiCall', { const btcWalletBalance = await parentEpml.request('apiCall', {
url: `/crosschain/btc/walletbalance?apiKey=${this.getApiKey()}`, url: `/crosschain/btc/walletbalance?apiKey=${this.getApiKey()}`,
@ -1923,7 +1925,8 @@ class WebBrowser extends LitElement {
amount, amount,
recipient, recipient,
coin, coin,
balance balance,
feeAmount
} }
) )
@ -1986,6 +1989,7 @@ class WebBrowser extends LitElement {
const coin = data.coin const coin = data.coin
const xprv58 = this.ltcWallet.derivedMasterPrivateKey const xprv58 = this.ltcWallet.derivedMasterPrivateKey
const feePerByte = data.fee ? data.fee : this.ltcFeePerByte const feePerByte = data.fee ? data.fee : this.ltcFeePerByte
const feeAmount = (feePerByte / 1e8).toFixed(8)
const ltcWalletBalance = await parentEpml.request('apiCall', { const ltcWalletBalance = await parentEpml.request('apiCall', {
url: `/crosschain/ltc/walletbalance?apiKey=${this.getApiKey()}`, url: `/crosschain/ltc/walletbalance?apiKey=${this.getApiKey()}`,
@ -2030,7 +2034,8 @@ class WebBrowser extends LitElement {
amount, amount,
recipient, recipient,
coin, coin,
balance balance,
feeAmount
} }
) )
@ -2093,6 +2098,7 @@ class WebBrowser extends LitElement {
const coin = data.coin const coin = data.coin
const xprv58 = this.dogeWallet.derivedMasterPrivateKey const xprv58 = this.dogeWallet.derivedMasterPrivateKey
const feePerByte = data.fee ? data.fee : this.dogeFeePerByte const feePerByte = data.fee ? data.fee : this.dogeFeePerByte
const feeAmount = (feePerByte / 1e8).toFixed(8)
const dogeWalletBalance = await parentEpml.request('apiCall', { const dogeWalletBalance = await parentEpml.request('apiCall', {
url: `/crosschain/doge/walletbalance?apiKey=${this.getApiKey()}`, url: `/crosschain/doge/walletbalance?apiKey=${this.getApiKey()}`,
@ -2137,7 +2143,8 @@ class WebBrowser extends LitElement {
amount, amount,
recipient, recipient,
coin, coin,
balance balance,
feeAmount
} }
) )
@ -2200,6 +2207,7 @@ class WebBrowser extends LitElement {
const coin = data.coin const coin = data.coin
const xprv58 = this.dgbWallet.derivedMasterPrivateKey const xprv58 = this.dgbWallet.derivedMasterPrivateKey
const feePerByte = data.fee ? data.fee : this.dgbFeePerByte const feePerByte = data.fee ? data.fee : this.dgbFeePerByte
const feeAmount = (feePerByte / 1e8).toFixed(8)
const dgbWalletBalance = await parentEpml.request('apiCall', { const dgbWalletBalance = await parentEpml.request('apiCall', {
url: `/crosschain/dgb/walletbalance?apiKey=${this.getApiKey()}`, url: `/crosschain/dgb/walletbalance?apiKey=${this.getApiKey()}`,
@ -2244,7 +2252,8 @@ class WebBrowser extends LitElement {
amount, amount,
recipient, recipient,
coin, coin,
balance balance,
feeAmount
} }
) )
@ -2307,6 +2316,7 @@ class WebBrowser extends LitElement {
const coin = data.coin const coin = data.coin
const xprv58 = this.rvnWallet.derivedMasterPrivateKey const xprv58 = this.rvnWallet.derivedMasterPrivateKey
const feePerByte = data.fee ? data.fee : this.rvnFeePerByte const feePerByte = data.fee ? data.fee : this.rvnFeePerByte
const feeAmount = (feePerByte / 1e8).toFixed(8)
const rvnWalletBalance = await parentEpml.request('apiCall', { const rvnWalletBalance = await parentEpml.request('apiCall', {
url: `/crosschain/rvn/walletbalance?apiKey=${this.getApiKey()}`, url: `/crosschain/rvn/walletbalance?apiKey=${this.getApiKey()}`,
@ -2351,7 +2361,8 @@ class WebBrowser extends LitElement {
amount, amount,
recipient, recipient,
coin, coin,
balance balance,
feeAmount
} }
) )
@ -2437,6 +2448,7 @@ class WebBrowser extends LitElement {
const arrrAmountDecimals = Number(amount) * QORT_DECIMALS const arrrAmountDecimals = Number(amount) * QORT_DECIMALS
const balance = (Number(arrrWalletBalance) / 1e8).toFixed(8) const balance = (Number(arrrWalletBalance) / 1e8).toFixed(8)
const fee = 10000 const fee = 10000
const feeAmount = (fee / 1e8).toFixed(8)
if (arrrAmountDecimals + fee > arrrWalletBalanceDecimals) { if (arrrAmountDecimals + fee > arrrWalletBalanceDecimals) {
this.loader.hide() this.loader.hide()
@ -2458,7 +2470,8 @@ class WebBrowser extends LitElement {
amount, amount,
recipient, recipient,
coin, coin,
balance balance,
feeAmount
} }
) )
@ -2889,6 +2902,7 @@ async function showModalAndWait(type, data) {
<p style="font-size: 16px;overflow-wrap: anywhere;" class="modal-paragraph"><span style="font-weight: bold">${get("walletpage.wchange19")}:</span> ${data.balance} ${data.coin}</p> <p style="font-size: 16px;overflow-wrap: anywhere;" class="modal-paragraph"><span style="font-weight: bold">${get("walletpage.wchange19")}:</span> ${data.balance} ${data.coin}</p>
<p style="font-size: 16px;overflow-wrap: anywhere;" class="modal-paragraph"><span style="font-weight: bold">${get("walletpage.wchange10")}:</span> ${data.recipient}</p> <p style="font-size: 16px;overflow-wrap: anywhere;" class="modal-paragraph"><span style="font-weight: bold">${get("walletpage.wchange10")}:</span> ${data.recipient}</p>
<p style="font-size: 16px;overflow-wrap: anywhere;" class="modal-paragraph"><span style="font-weight: bold">${get("walletpage.wchange11")}:</span> ${data.amount} ${data.coin}</p> <p style="font-size: 16px;overflow-wrap: anywhere;" class="modal-paragraph"><span style="font-weight: bold">${get("walletpage.wchange11")}:</span> ${data.amount} ${data.coin}</p>
<p style="font-size: 16px;overflow-wrap: anywhere;" class="modal-paragraph"><span style="font-weight: bold">${get("walletpage.wchange36")}:</span> ${data.feeAmount} ${data.coin}</p>
</div> </div>
` : ''} ` : ''}