+
{{- /* WALLET DETAILS */ -}}
-
+
![]()
@@ -230,8 +230,55 @@
{{- /* END STAKING */ -}}
{{/* END WALLET DETAILS */}}
+ {{- /* TRANSACTION HISTORY */ -}}
+
+
{{/* END TRANSACTION HISTORY */}}
+
{{- /* MARKETS OVERVIEW */ -}}
-
+
+
+ [[[asset_name tx_history]]]
+
+
+
+
+
+ Load earlier transactions...
+
+ | [[[Time]]] | +[[[Type]]] | +[[[ID]]] | +[[[Amount]]] | +
|---|---|---|---|
|
+
+ Pending
+ |
+ + + | ++ + | ++ + | +
| + + | +|||
+ [[[no_tx_history]]]
+
+
+
[[[asset_name Markets]]]
@@ -272,7 +319,7 @@
{{/* END MARKETS OVERVIEW */}}
{{- /* RECENT ORDERS */ -}}
-
+
{{template "bottom"}}
diff --git a/client/webserver/site/src/js/app.ts b/client/webserver/site/src/js/app.ts
index dd229d4301..6b8c754664 100644
--- a/client/webserver/site/src/js/app.ts
+++ b/client/webserver/site/src/js/app.ts
@@ -45,7 +45,11 @@ import {
BotConfig,
MMStartStopNote,
MarketMakingStatus,
- MarketMakingConfig
+ MarketMakingConfig,
+ WalletTransaction,
+ TxHistoryResult,
+ WalletNote,
+ TransactionNote
} from './registry'
const idel = Doc.idel // = element by id
@@ -107,6 +111,7 @@ export default class Application {
noteReceivers: Record void>[]
marketMakingCfg: MarketMakingConfig
marketMakingStatus: MarketMakingStatus | undefined
+ txHistoryMap: Record
constructor () {
this.notes = []
@@ -116,6 +121,7 @@ export default class Application {
this.noteReceivers = []
this.fiatRatesMap = {}
this.showPopups = State.fetchLocal(State.popupsLK) === '1'
+ this.txHistoryMap = {}
console.log('Decred DEX Client App, Build', this.commitHash.substring(0, 7))
@@ -543,6 +549,23 @@ export default class Application {
}
}
+ handleNewTransactionNote (assetID: number, tx: WalletTransaction) {
+ const txHistory = this.txHistoryMap[assetID]
+ if (!txHistory) return
+ txHistory.txs.unshift(tx)
+ }
+
+ handleTxUpdateNote (assetID: number, tx: WalletTransaction) {
+ const txHistory = this.txHistoryMap[assetID]
+ if (!txHistory) return
+ for (let i = 0; i < txHistory.txs.length; i++) {
+ if (txHistory.txs[i].id === tx.id) {
+ txHistory.txs[i] = tx
+ break
+ }
+ }
+ }
+
/*
* setNotes sets the current notification cache and populates the notification
* display.
@@ -665,6 +688,18 @@ export default class Application {
const n = note as MMStartStopNote
if (!this.marketMakingStatus) return
this.marketMakingStatus.running = n.running
+ break
+ }
+ case 'walletnote': {
+ const n = note as WalletNote
+ if (n.payload.route === 'transaction') {
+ const txNote = n.payload as TransactionNote
+ if (txNote.new) {
+ this.handleNewTransactionNote(n.payload.assetID, txNote.transaction)
+ } else {
+ this.handleTxUpdateNote(n.payload.assetID, txNote.transaction)
+ }
+ }
}
}
}
@@ -1029,6 +1064,78 @@ export default class Application {
status.runningBots = res.runningBots
return status
}
+
+ /*
+ * txHistory loads the tx history for an asset. If the results are not
+ * already cached, they are cached. If we have reached the oldest tx,
+ * this is also cached. If the exact amount of transactions as have been
+ * made are requested, we will not know if we have reached the last tx
+ * until a subsequent call.
+ */
+ async txHistory (assetID: number, n: number, after?: string): Promise {
+ const url = '/api/txhistory'
+ const cachedTxHistory = this.txHistoryMap[assetID]
+ if (!cachedTxHistory) {
+ const res = await postJSON(url, {
+ n: n,
+ assetID: assetID
+ })
+ if (!this.checkResponse(res)) {
+ throw new Error(res.msg)
+ }
+ let txs : WalletTransaction[] | null | undefined = res.txs
+ if (!txs) {
+ txs = []
+ }
+ this.txHistoryMap[assetID] = {
+ txs: txs,
+ lastTx: txs.length < n
+ }
+ return this.txHistoryMap[assetID]
+ }
+ const txs : WalletTransaction[] = []
+ let lastTx = false
+ const startIndex = after ? cachedTxHistory.txs.findIndex(tx => tx.id === after) + 1 : 0
+ if (after && startIndex === -1) {
+ throw new Error('invalid after tx ' + after)
+ }
+ let lastIndex = startIndex
+ for (let i = startIndex; i < cachedTxHistory.txs.length && txs.length < n; i++) {
+ txs.push(cachedTxHistory.txs[i])
+ lastIndex = i
+ }
+ if (cachedTxHistory.lastTx && lastIndex === cachedTxHistory.txs.length - 1) {
+ lastTx = true
+ }
+ if (txs.length < n && !cachedTxHistory.lastTx) {
+ const res = await postJSON(url, {
+ n: n - txs.length + 1, // + 1 because first result will be refID
+ assetID: assetID,
+ refID: after,
+ past: true
+ })
+ if (!this.checkResponse(res)) {
+ throw new Error(res.msg)
+ }
+ let resTxs : WalletTransaction[] | null | undefined = res.txs
+ if (!resTxs) {
+ resTxs = []
+ }
+ if (resTxs.length > 0 && after) {
+ if (resTxs[0].id === after) {
+ resTxs.shift()
+ } else {
+ // Implies a bug in the client
+ console.error('First tx history element != refID')
+ }
+ }
+ cachedTxHistory.lastTx = resTxs.length < n - txs.length
+ lastTx = cachedTxHistory.lastTx
+ txs.push(...resTxs)
+ cachedTxHistory.txs.push(...resTxs)
+ }
+ return { txs, lastTx }
+ }
}
/* getSocketURI returns the websocket URI for the client. */
diff --git a/client/webserver/site/src/js/locales.ts b/client/webserver/site/src/js/locales.ts
index ac2c30212d..ac9c3d7667 100644
--- a/client/webserver/site/src/js/locales.ts
+++ b/client/webserver/site/src/js/locales.ts
@@ -157,6 +157,21 @@ export const ID_NO_WALLET_MSG = 'ID_NO_WALLET_MSG'
export const ID_TRADING_TIER_UPDATED = 'TRADING_TIER_UPDATED'
export const ID_INVALID_TIER_VALUE = 'INVALID_TIER_VALUE'
export const ID_INVALID_COMPS_VALUE = 'INVALID_COMPS_VALUE'
+export const ID_TX_TYPE_UNKNOWN = 'TX_TYPE_UNKNOWN'
+export const ID_TX_TYPE_SEND = 'TX_TYPE_SEND'
+export const ID_TX_TYPE_RECEIVE = 'TX_TYPE_RECEIVE'
+export const ID_TX_TYPE_SWAP = 'TX_TYPE_SWAP'
+export const ID_TX_TYPE_REDEEM = 'TX_TYPE_REDEEM'
+export const ID_TX_TYPE_REFUND = 'TX_TYPE_REFUND'
+export const ID_TX_TYPE_SPLIT = 'TX_TYPE_SPLIT'
+export const ID_TX_TYPE_CREATE_BOND = 'TX_TYPE_CREATE_BOND'
+export const ID_TX_TYPE_REDEEM_BOND = 'TX_TYPE_REDEEM_BOND'
+export const ID_TX_TYPE_APPROVE_TOKEN = 'TX_TYPE_APPROVE_TOKEN'
+export const ID_TX_TYPE_ACCELERATION = 'TX_TYPE_ACCELERATION'
+export const ID_TX_TYPE_SELF_SEND = 'TX_TYPE_SELF_SEND'
+export const ID_TX_TYPE_REVOKE_TOKEN_APPROVAL = 'TX_TYPE_REVOKE_TOKEN_APPROVAL'
+export const ID_PENDING = 'PENDING'
+export const ID_CONFIRMED = 'CONFIRMED'
export const enUS: Locale = {
[ID_NO_PASS_ERROR_MSG]: 'password cannot be empty',
@@ -315,7 +330,22 @@ export const enUS: Locale = {
[ID_TRADING_TIER_UPDATED]: 'Trading Tier Updated',
[ID_INVALID_TIER_VALUE]: 'Invalid tier value',
[ID_INVALID_COMPS_VALUE]: 'Invalid comps value',
- [ID_API_ERROR]: 'api error: {{ msg }}'
+ [ID_API_ERROR]: 'api error: {{ msg }}',
+ [ID_TX_TYPE_UNKNOWN]: 'Unknown',
+ [ID_TX_TYPE_SEND]: 'Send',
+ [ID_TX_TYPE_RECEIVE]: 'Receive',
+ [ID_TX_TYPE_SWAP]: 'Swap',
+ [ID_TX_TYPE_REDEEM]: 'Redeem',
+ [ID_TX_TYPE_REFUND]: 'Refund',
+ [ID_TX_TYPE_SPLIT]: 'Split',
+ [ID_TX_TYPE_CREATE_BOND]: 'Create Bond',
+ [ID_TX_TYPE_REDEEM_BOND]: 'Redeem Bond',
+ [ID_TX_TYPE_APPROVE_TOKEN]: 'Approve Token',
+ [ID_TX_TYPE_ACCELERATION]: 'Acceleration',
+ [ID_PENDING]: 'Pending',
+ [ID_CONFIRMED]: 'Confirmed',
+ [ID_TX_TYPE_SELF_SEND]: 'Self Send',
+ [ID_TX_TYPE_REVOKE_TOKEN_APPROVAL]: 'Revoke Token Approval'
}
export const ptBR: Locale = {
diff --git a/client/webserver/site/src/js/registry.ts b/client/webserver/site/src/js/registry.ts
index 817cbbbf88..54bea77748 100644
--- a/client/webserver/site/src/js/registry.ts
+++ b/client/webserver/site/src/js/registry.ts
@@ -399,6 +399,11 @@ export interface CustomWalletNote extends BaseWalletNote {
payload: any
}
+export interface TransactionNote extends BaseWalletNote {
+ transaction: WalletTransaction
+ new: boolean
+}
+
export interface WalletNote extends CoreNote {
payload: BaseWalletNote
}
@@ -813,6 +818,30 @@ export interface VotingServiceProvider {
netShare: number
}
+export interface BondTxInfo {
+ bondID: string
+ lockTime: number
+ accountID: string
+}
+
+export interface WalletTransaction {
+ type: number
+ id: string
+ amount: number
+ fees: number
+ timestamp: number
+ blockNumber: number
+ tokenID?: number
+ recipient?: string
+ bondInfo?: BondTxInfo
+ additionalData: Record
+}
+
+export interface TxHistoryResult {
+ txs : WalletTransaction[]
+ lastTx: boolean
+}
+
export interface Application {
assets: Record
seedGenTime: number
@@ -867,6 +896,7 @@ export interface Application {
updateMarketMakingConfig (cfg: BotConfig): Promise
removeMarketMakingConfig (cfg: BotConfig): Promise
setMarketMakingEnabled (host: string, baseAsset: number, quoteAsset: number, enabled: boolean): void
+ txHistory(assetID: number, n: number, after?: string): Promise
}
// TODO: Define an interface for Application?
diff --git a/client/webserver/site/src/js/wallets.ts b/client/webserver/site/src/js/wallets.ts
index 7b493400fe..d1d5fc842c 100644
--- a/client/webserver/site/src/js/wallets.ts
+++ b/client/webserver/site/src/js/wallets.ts
@@ -38,7 +38,10 @@ import {
TicketStakingStatus,
VotingServiceProvider,
Ticket,
- TicketStats
+ TicketStats,
+ TxHistoryResult,
+ TransactionNote,
+ WalletTransaction
} from './registry'
import { CoinExplorers } from './order'
@@ -90,6 +93,36 @@ export const ticketStatusTranslationKeys = [
intl.ID_TICKET_STATUS_REVOKED
]
+/*
+const txTypeUnknown = 0
+const txTypeSend = 1
+const txTypeReceive = 2
+const txTypeSwap = 3
+const txTypeRedeem = 4
+const txTypeRefund = 5
+const txTypeSplit = 6
+const txTypeCreateBond = 7
+const txTypeRedeemBond = 8
+const txTypeApproveToken = 9
+const txTypeAcceleration = 10
+*/
+
+const txTypeTranslationKeys = [
+ intl.ID_TX_TYPE_UNKNOWN,
+ intl.ID_TX_TYPE_SEND,
+ intl.ID_TX_TYPE_RECEIVE,
+ intl.ID_TX_TYPE_SWAP,
+ intl.ID_TX_TYPE_REDEEM,
+ intl.ID_TX_TYPE_REFUND,
+ intl.ID_TX_TYPE_SPLIT,
+ intl.ID_TX_TYPE_CREATE_BOND,
+ intl.ID_TX_TYPE_REDEEM_BOND,
+ intl.ID_TX_TYPE_APPROVE_TOKEN,
+ intl.ID_TX_TYPE_ACCELERATION,
+ intl.ID_TX_TYPE_SELF_SEND,
+ intl.ID_TX_TYPE_REVOKE_TOKEN_APPROVAL
+]
+
const ticketPageSize = 10
const scanStartMempool = -1
@@ -150,6 +183,8 @@ export default class WalletsPage extends BasePage {
maxSend: number
unapprovingTokenVersion: number
ticketPage: TicketPagination
+ oldestTx: WalletTransaction | undefined
+ currTx: WalletTransaction | undefined
constructor (body: HTMLElement) {
super()
@@ -182,6 +217,12 @@ export default class WalletsPage extends BasePage {
Doc.bind(page.lockBttn, 'click', () => this.lock(this.selectedAssetID))
Doc.bind(page.reconfigureBttn, 'click', () => this.showReconfig(this.selectedAssetID))
Doc.bind(page.rescanWallet, 'click', () => this.rescanWallet(this.selectedAssetID))
+ Doc.bind(page.earlierTxs, 'click', () => this.loadEarlierTxs())
+
+ Doc.bind(page.copyTxIDBtn, 'click', () => { this.copyTxDetail(this.currTx?.id || '', page.txDetailsID, page.copyTxIDBtn) })
+ Doc.bind(page.copyRecipientBtn, 'click', () => { this.copyTxDetail(this.currTx?.recipient || '', page.txDetailsRecipient, page.copyRecipientBtn) })
+ Doc.bind(page.copyBondIDBtn, 'click', () => { this.copyTxDetail(this.currTx?.bondInfo?.bondID || '', page.txDetailsBondID, page.copyBondIDBtn) })
+ Doc.bind(page.copyBondAccountIDBtn, 'click', () => { this.copyTxDetail(this.currTx?.bondInfo?.accountID || '', page.txDetailsBondAccountID, page.copyBondAccountIDBtn) })
// Bind the new wallet form.
this.newWalletForm = new NewWalletForm(page.newWalletForm, (assetID: number) => {
@@ -314,6 +355,7 @@ export default class WalletsPage extends BasePage {
closePopups () {
Doc.hide(this.page.forms)
+ this.currTx = undefined
if (this.animation) this.animation.stop()
}
@@ -843,6 +885,7 @@ export default class WalletsPage extends BasePage {
this.updateDisplayedAsset(assetID)
this.showAvailableMarkets(assetID)
this.showRecentActivity(assetID)
+ this.showTxHistory(assetID)
this.updateTicketBuyer(assetID)
}
@@ -1418,6 +1461,247 @@ export default class WalletsPage extends BasePage {
page.orderActivityBox.classList.remove('invisible')
}
+ updateTxHistoryRow (row: PageElement, tx: WalletTransaction, assetID: number) {
+ const tmpl = Doc.parseTemplate(row)
+ const date = new Date(tx.timestamp * 1000)
+ const dateStr = date.toLocaleDateString()
+ const timeStr = date.toLocaleTimeString()
+ tmpl.time.textContent = `${dateStr} ${timeStr}`
+ Doc.setVis(tx.timestamp === 0, tmpl.pending)
+ Doc.setVis(tx.timestamp !== 0, tmpl.time)
+ let txType = intl.prep(txTypeTranslationKeys[tx.type])
+ if (tx.tokenID && tx.tokenID !== assetID) {
+ const tokenSymbol = app().assets[tx.tokenID].symbol.split('.')[0].toUpperCase()
+ txType = `${tokenSymbol} ${txType}`
+ }
+ tmpl.type.textContent = txType
+
+ if (tx.id.length > 12) {
+ tmpl.id.textContent = `${tx.id.substring(0, 6)}...${tx.id.substring(tx.id.length - 6)}`
+ tmpl.id.dataset.tooltip = tx.id
+ } else {
+ tmpl.id.textContent = tx.id
+ }
+ tmpl.amount.textContent = Doc.formatCoinValue(tx.amount, app().unitInfo(assetID))
+ }
+
+ txHistoryRow (tx: WalletTransaction, assetID: number) : PageElement {
+ const row = this.page.txHistoryRow.cloneNode(true) as PageElement
+ row.dataset.txid = tx.id
+ Doc.bind(row, 'click', () => this.showTxDetailsPopup(tx))
+ this.updateTxHistoryRow(row, tx, assetID)
+ return row
+ }
+
+ txHistoryDateRow (date: string) : PageElement {
+ const row = this.page.txHistoryDateRow.cloneNode(true) as PageElement
+ const tmpl = Doc.parseTemplate(row)
+ tmpl.date.textContent = date
+ return row
+ }
+
+ async copyTxDetail (detail: string, textEl: PageElement, btnEl: PageElement) {
+ try {
+ await navigator.clipboard.writeText(detail)
+ } catch (err) {
+ console.error('Unable to copy: ', err)
+ }
+ const originalColor = textEl.style.color
+ textEl.style.color = '#1e7d11'
+ btnEl.style.color = '#1e7d11'
+ setTimeout(() => {
+ textEl.style.color = originalColor
+ btnEl.style.color = originalColor
+ }, 350)
+ }
+
+ trimStr (text: string) : string {
+ if (text.length > 20) {
+ return `${text.substring(0, 10)}...${text.substring(text.length - 10)}`
+ }
+ return text
+ }
+
+ setTxDetailsPopupElements (tx: WalletTransaction) {
+ const page = this.page
+ this.currTx = tx
+
+ // Block explorer
+ const assetExplorer = CoinExplorers[this.selectedAssetID]
+ if (assetExplorer && assetExplorer[0]) {
+ page.txViewBlockExplorer.href = assetExplorer[0](tx.id)
+ }
+
+ // Tx type
+ let txType = intl.prep(txTypeTranslationKeys[tx.type])
+ if (tx.tokenID && tx.tokenID !== this.selectedAssetID) {
+ const tokenSymbol = app().assets[tx.tokenID].symbol.split('.')[0].toUpperCase()
+ txType = `${tokenSymbol} ${txType}`
+ }
+ page.txDetailsType.textContent = txType
+
+ // Amount
+ const amt = Doc.formatCoinValue(tx.amount, app().unitInfo(this.selectedAssetID))
+ let amtUnit : string
+ if (tx.tokenID) {
+ amtUnit = app().assets[tx.tokenID].symbol.split('.')[0].toUpperCase()
+ } else {
+ amtUnit = app().assets[this.selectedAssetID].symbol.split('.')[0].toUpperCase()
+ }
+ page.txDetailsAmount.textContent = `${amt} ${amtUnit}`
+
+ // Fee
+ let feeAsset = this.selectedAssetID
+ if (tx.tokenID !== undefined) {
+ const asset = app().assets[tx.tokenID]
+ if (asset.token) {
+ feeAsset = asset.token.parentID
+ } else {
+ console.error(`wallet transaction ${tx.id} is supposed to be a token tx, but asset ${tx.tokenID} is not a token`)
+ }
+ }
+ const fee = Doc.formatCoinValue(tx.fees, app().unitInfo(feeAsset))
+ page.txDetailsFee.textContent = `${fee} ${app().assets[feeAsset].symbol.toUpperCase()}`
+
+ // Time / block number
+ page.txDetailsBlockNumber.textContent = `${tx.blockNumber}`
+ const date = new Date(tx.timestamp * 1000)
+ const dateStr = date.toLocaleDateString()
+ const timeStr = date.toLocaleTimeString()
+ page.txDetailsTimestamp.textContent = `${dateStr} ${timeStr}`
+ Doc.setVis(tx.blockNumber === 0, page.timestampPending, page.blockNumberPending)
+ Doc.setVis(tx.blockNumber !== 0, page.txDetailsBlockNumber, page.txDetailsTimestamp)
+
+ // Tx ID
+ page.txDetailsID.textContent = this.trimStr(tx.id)
+
+ // Recipient
+ if (tx.recipient) {
+ Doc.show(page.txDetailsRecipientSection)
+ page.txDetailsRecipient.textContent = this.trimStr(tx.recipient)
+ } else {
+ Doc.hide(page.txDetailsRecipientSection)
+ }
+
+ // Bond Info
+ if (tx.bondInfo) {
+ Doc.show(page.txDetailsBondSection)
+ page.txDetailsBondID.textContent = this.trimStr(tx.bondInfo.bondID)
+ const date = new Date(tx.bondInfo.lockTime * 1000)
+ const dateStr = date.toLocaleDateString()
+ const timeStr = date.toLocaleTimeString()
+ page.txDetailsBondLocktime.textContent = `${dateStr} ${timeStr}`
+ Doc.setVis(tx.bondInfo.accountID !== '', page.txDetailsBondAccountIDSection)
+ page.txDetailsBondAccountID.textContent = this.trimStr(tx.bondInfo.accountID)
+ } else {
+ Doc.hide(page.txDetailsBondSection)
+ }
+ }
+
+ showTxDetailsPopup (tx: WalletTransaction) {
+ const page = this.page
+ this.setTxDetailsPopupElements(tx)
+ this.showForm(page.txDetails)
+ }
+
+ newestDate () : string {
+ if (this.page.txHistoryTableBody.firstChild) {
+ const tmpl = Doc.parseTemplate(this.page.txHistoryTableBody.firstChild as PageElement)
+ return tmpl.date.textContent || ''
+ }
+ return ''
+ }
+
+ txDate (tx: WalletTransaction) : string {
+ if (tx.timestamp === 0) {
+ return (new Date()).toLocaleDateString()
+ }
+ return (new Date(tx.timestamp * 1000)).toLocaleDateString()
+ }
+
+ handleTxNote (tx: WalletTransaction, newTx: boolean) {
+ if (newTx) {
+ if (!this.page.txHistoryTableBody.firstChild) {
+ this.page.txHistoryTableBody.appendChild(this.txHistoryDateRow(this.txDate(tx)))
+ this.page.txHistoryTableBody.appendChild(this.txHistoryRow(tx, this.selectedAssetID))
+ } else if (this.txDate(tx) !== this.newestDate()) {
+ this.page.txHistoryTableBody.insertBefore(this.txHistoryRow(tx, this.selectedAssetID), this.page.txHistoryTableBody.firstChild)
+ this.page.txHistoryTableBody.insertBefore(this.txHistoryDateRow(this.txDate(tx)), this.page.txHistoryTableBody.firstChild)
+ } else {
+ this.page.txHistoryTableBody.insertBefore(this.txHistoryRow(tx, this.selectedAssetID), this.page.txHistoryTableBody.children[1])
+ }
+ return
+ }
+ for (const row of this.page.txHistoryTableBody.children) {
+ const peRow = row as PageElement
+ if (peRow.dataset.txid === tx.id) {
+ this.updateTxHistoryRow(peRow, tx, this.selectedAssetID)
+ break
+ }
+ }
+ if (tx.id === this.currTx?.id) {
+ this.setTxDetailsPopupElements(tx)
+ }
+ }
+
+ async showTxHistory (assetID: number) {
+ const page = this.page
+ let txRes : TxHistoryResult
+ Doc.hide(page.txHistoryTable, page.noTxHistory, page.earlierTxs)
+ if (!app().assets[assetID].wallet) return
+ try {
+ txRes = await app().txHistory(assetID, 10)
+ } catch (err) {
+ return
+ }
+ if (txRes.txs.length === 0) {
+ Doc.show(page.noTxHistory)
+ return
+ }
+ Doc.empty(page.txHistoryTableBody)
+
+ let oldestDate = this.txDate(txRes.txs[0])
+ page.txHistoryTableBody.appendChild(this.txHistoryDateRow(oldestDate))
+ for (const tx of txRes.txs) {
+ const date = this.txDate(tx)
+ if (date !== oldestDate) {
+ oldestDate = date
+ page.txHistoryTableBody.appendChild(this.txHistoryDateRow(date))
+ }
+ const row = this.txHistoryRow(tx, assetID)
+ page.txHistoryTableBody.appendChild(row)
+ }
+ this.oldestTx = txRes.txs[txRes.txs.length - 1]
+ Doc.show(page.txHistoryTable)
+ Doc.setVis(!txRes.lastTx, page.earlierTxs)
+ }
+
+ async loadEarlierTxs () {
+ if (!this.oldestTx) return
+ const page = this.page
+ let txRes : TxHistoryResult
+ try {
+ txRes = await app().txHistory(this.selectedAssetID, 10, this.oldestTx.id)
+ } catch (err) {
+ console.error(err)
+ return
+ }
+ let oldestDate = this.txDate(this.oldestTx)
+ for (const tx of txRes.txs) {
+ const date = this.txDate(tx)
+ if (date !== oldestDate) {
+ oldestDate = date
+ page.txHistoryTableBody.appendChild(this.txHistoryDateRow(date))
+ }
+ const row = this.txHistoryRow(tx, this.selectedAssetID)
+ page.txHistoryTableBody.appendChild(row)
+ }
+ Doc.setVis(!txRes.lastTx, page.earlierTxs)
+ if (txRes.txs.length > 0) {
+ this.oldestTx = txRes.txs[txRes.txs.length - 1]
+ }
+ }
+
async rescanWallet (assetID: number) {
const page = this.page
Doc.hide(page.reconfigErr)
@@ -1942,6 +2226,12 @@ export default class WalletsPage extends BasePage {
}
case 'ticketPurchaseUpdate': {
this.processTicketPurchaseUpdate(walletNote as CustomWalletNote)
+ break
+ }
+ case 'transaction': {
+ const n = walletNote as TransactionNote
+ if (n.assetID === this.selectedAssetID) this.handleTxNote(n.transaction, n.new)
+ break
}
}
}
diff --git a/client/webserver/webserver.go b/client/webserver/webserver.go
index 789a437aeb..cbebceea22 100644
--- a/client/webserver/webserver.go
+++ b/client/webserver/webserver.go
@@ -167,6 +167,7 @@ type clientCore interface {
SetVotingPreferences(assetID uint32, choices, tSpendPolicy, treasuryPolicy map[string]string) error
ListVSPs(assetID uint32) ([]*asset.VotingServiceProvider, error)
TicketPage(assetID uint32, scanStart int32, n, skipN int) ([]*asset.Ticket, error)
+ TxHistory(assetID uint32, n int, refID *dex.Bytes, past bool) ([]*asset.WalletTransaction, error)
}
// genCertPair generates a key/cert pair to the paths provided.
@@ -521,6 +522,7 @@ func New(cfg *Config) (*WebServer, error) {
apiAuth.Post("/approvetoken", s.apiApproveToken)
apiAuth.Post("/unapprovetoken", s.apiUnapproveToken)
apiAuth.Post("/approvetokenfee", s.apiApproveTokenFee)
+ apiAuth.Post("/txhistory", s.apiTxHistory)
apiAuth.Post("/shieldedstatus", s.apiShieldedStatus)
apiAuth.Post("/newshieldedaddress", s.apiNewShieldedAddress)
[[[Recent asset_name Activity]]]
@@ -885,6 +932,58 @@
+
+ {{- /* TX DETAILS */ -}}
+
+