Browse Source

Add unconfirmed tx to the Qortal Wallet tx list

Chat and Genesis tx are excluded.  Icon color is red when confirmations are 0, and orange when 1 or 2.
pull/41/head
QuickMythril 2 years ago committed by GitHub
parent
commit
7679526749
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 10
      qortal-ui-plugins/plugins/core/wallet/wallet-app.src.js

10
qortal-ui-plugins/plugins/core/wallet/wallet-app.src.js

@ -2373,9 +2373,12 @@ class MultiWallet extends LitElement {
})
const txsQort = await parentEpml.request('apiCall', {
url: `/transactions/search?address=${this.wallets.get('qort').wallet.address}&confirmationStatus=CONFIRMED&reverse=true`,
})
const pendingTxsQort = await parentEpml.request('apiCall', {
url: `/transactions/unconfirmed?creator=${this.wallets.get('qort').wallet.base58PublicKey}&reverse=true&txType=PAYMENT&txType=REGISTER_NAME&txType=UPDATE_NAME&txType=SELL_NAME&txType=CANCEL_SELL_NAME&txType=BUY_NAME&txType=CREATE_POLL&txType=VOTE_ON_POLL&txType=ARBITRARY&txType=ISSUE_ASSET&txType=TRANSFER_ASSET&txType=CREATE_ASSET_ORDER&txType=CANCEL_ASSET_ORDER&txType=MULTI_PAYMENT&txType=DEPLOY_AT&txType=MESSAGE&txType=PUBLICIZE&txType=AIRDROP&txType=AT&txType=CREATE_GROUP&txType=UPDATE_GROUP&txType=ADD_GROUP_ADMIN&txType=REMOVE_GROUP_ADMIN&txType=GROUP_BAN&txType=CANCEL_GROUP_BAN&txType=GROUP_KICK&txType=GROUP_INVITE&txType=CANCEL_GROUP_INVITE&txType=JOIN_GROUP&txType=LEAVE_GROUP&txType=GROUP_APPROVAL&txType=SET_GROUP&txType=UPDATE_ASSET&txType=ACCOUNT_FLAGS&txType=ENABLE_FORGING&txType=REWARD_SHARE&txType=ACCOUNT_LEVEL&txType=TRANSFER_PRIVS&txType=PRESENCE`,
})
if (this._selectedWallet == coin) {
this.wallets.get(coin).transactions = txsQort
this.wallets.get(coin).transactions = pendingTxsQort.concat(txsQort)
}
break
case 'btc':
@ -2592,10 +2595,13 @@ class MultiWallet extends LitElement {
return render(html``, root)
}
const confirmed = data.item.confirmations >= requiredConfirmations
const unconfirmed = data.item.confirmations == 0
if (confirmed) {
render(html`<mwc-icon title="${data.item.confirmations} ${translate("walletpage.wchange42")}" style="color: #00C851">check</mwc-icon>`, root)
} else if (unconfirmed) {
render(html`<mwc-icon title="${data.item.confirmations || 0}/${requiredConfirmations} ${translate("walletpage.wchange42")}" style="color: #F44336">schedule</mwc-icon>`, root)
} else {
render(html`<mwc-icon title="${data.item.confirmations || 0}/${requiredConfirmations} ${translate("walletpage.wchange42")}" style="color: #777">schedule</mwc-icon>`, root)
render(html`<mwc-icon title="${data.item.confirmations}/${requiredConfirmations} ${translate("walletpage.wchange42")}" style="color: #B47D00">schedule</mwc-icon>`, root)
}
}}
>

Loading…
Cancel
Save