From 43768dc38752b55cc5e1797c80cd956536626cb5 Mon Sep 17 00:00:00 2001
From: sidhujag <jsidhu@blockchainfoundry.co>
Date: Fri, 11 Sep 2020 09:27:30 -0700
Subject: [PATCH] cleanup

---
 api/xpub.go | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/api/xpub.go b/api/xpub.go
index 10c89575..67bdb74a 100644
--- a/api/xpub.go
+++ b/api/xpub.go
@@ -557,6 +557,7 @@ func (w *Worker) GetXpubAddress(xpub string, page int, txsOnPage int, option Acc
 	var xpubAddresses map[string]struct{}
 	if option > AccountDetailsBasic {
 		tokens = make(bchain.Tokens, 0, 4)
+		tokensAsset = make(bchain.Tokens, 0, 4)
 		xpubAddresses = make(map[string]struct{})
 	}
 	for ci, da := range [][]xpubAddress{data.addresses, data.changeAddresses} {
@@ -581,9 +582,6 @@ func (w *Worker) GetXpubAddress(xpub string, page int, txsOnPage int, option Acc
 								filter.TokensToReturn == TokensToReturnUsed && token.BalanceSat != nil ||
 								filter.TokensToReturn == TokensToReturnNonzeroBalance && token.BalanceSat != nil && token.BalanceSat.AsInt64() != 0 {
 									if token.Type != bchain.XPUBAddressTokenType {
-										if tokensAsset == nil {
-											tokensAsset = make(bchain.Tokens, 0, 4)
-										}
 										tokensAsset = append(tokensAsset, token)
 									} else {
 										tokens = append(tokens, token)
@@ -612,12 +610,14 @@ func (w *Worker) GetXpubAddress(xpub string, page int, txsOnPage int, option Acc
 		Txids:                 txids,
 		UsedTokens:            usedTokens,
 		Tokens:                tokens,
-		TokensAsset:           tokensAsset,
 		XPubAddresses:         xpubAddresses,
 	}
 	if usedAssetTokens > 0 {
 		addr.UsedAssetTokens = usedAssetTokens
 	}
+	if len(tokensAsset) > 0 {
+		addr.TokensAsset = tokensAsset
+	}
 	glog.Info("GetXpubAddress ", xpub[:16], ", ", len(data.addresses)+len(data.changeAddresses), " derived addresses, ", txCount, " confirmed txs, finished in ", time.Since(start))
 	return &addr, nil
 }