Skip to content

Commit

Permalink
Unconfirmed tx in address list and input amounts on unconfirmed tx (d…
Browse files Browse the repository at this point in the history
…ecred#489)

This addresses the unconfirmed transactions not visible in address view and input amounts not visible in transaction view.

There were two major areas of work:
* Blending unconfirmed transactions with confirmed transactions in the current address view. Mostly extending what @chappjc already started.
* Compensating for AmountIn values not set in dcrd calls to mempool transactions.
  • Loading branch information
papacarp authored and JFixby committed Aug 1, 2018
1 parent 1f084b9 commit 9901380
Showing 1 changed file with 5 additions and 0 deletions.
5 changes: 5 additions & 0 deletions explorer/explorerroutes.go
Original file line number Diff line number Diff line change
Expand Up @@ -466,6 +466,7 @@ func (exp *explorerUI) AddressPage(w http.ResponseWriter, r *http.Request) {
// unconfirmed transactions (or none at all)
addrData = new(AddressInfo)
addrData.Address = address
<<<<<<< tier_10
<<<<<<< tier_10
addrData.Fullmode = true
addrData.Balance = &AddressBalance{}
Expand Down Expand Up @@ -505,6 +506,10 @@ func (exp *explorerUI) AddressPage(w http.ResponseWriter, r *http.Request) {
exp.StatusPage(w, defaultErrorCode, "could not find transactions for that address", ErrorStatusType)
return
>>>>>>> Consolidated debit view (#524)
=======
addrData.Fullmode = true
addrData.Balance = &AddressBalance{}
>>>>>>> Unconfirmed tx in address list and input amounts on unconfirmed tx (#489)
}

// Check for unconfirmed transactions
Expand Down

0 comments on commit 9901380

Please sign in to comment.