(BIDS-2504) use existing formatting function

gobitfly · Oct 2, 2023 · 37facc7 · 37facc7
1 parent 8cc32c2
commit 37facc7
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 16 deletions.
diff --git a/templates/validator/tables.html b/templates/validator/tables.html
@@ -416,13 +416,7 @@ <h6 class="">This table displays the deposits made to the Ethereum staking depos
           <tbody>
             {{ range $i, $deposit := .Deposits.Eth1Deposits }}
               <tr>
-                <td>
-                  {{ if $deposit.FromName }}
-                    {{ formatEth1Name $deposit.FromName }}
-                  {{ else }}
-                    {{ formatEth1Address $deposit.FromAddress }}
-                  {{ end }}
-                </td>
+                <td>{{ formatAddressAsLink $deposit.FromAddress $deposit.FromName false false}}</td>
                 <td>{{ formatEth1TxHash $deposit.TxHash }}</td>
                 <td>{{ formatEth1Block $deposit.BlockNumber }}</td>
                 <td>{{ formatTimestamp $deposit.BlockTs }}</td>

diff --git a/utils/eth1.go b/utils/eth1.go
@@ -200,9 +200,9 @@ func FormatAddressAsLink(address []byte, name string, verified bool, isContract
 
 	if len(name) > 0 {
 		if verified {
-			ret = fmt.Sprintf("<a class=\"text-monospace\" href=\"/address/%s\">✔ %s (%s…%s)</a> %v", addressString, name, addressString[:8], addressString[len(addressString)-6:], CopyButton(addressString))
+			ret = fmt.Sprintf("<a class=\"text-monospace\" href=\"/address/%s\">✔ %s</a> %v", addressString, name, CopyButton(addressString))
 		} else {
-			ret = fmt.Sprintf("<a class=\"text-monospace\" href=\"/address/%s\">%s %s…%s</a> %v", addressString, name, addressString[:8], addressString[len(addressString)-6:], CopyButton(addressString))
+			ret = fmt.Sprintf("<a class=\"text-monospace\" href=\"/address/%s\">%s</a> %v", addressString, name, CopyButton(addressString))
 		}
 	} else {
 		ret = fmt.Sprintf("<a class=\"text-monospace\" href=\"/address/%s\">%s…%s</a> %v", addressString, addressString[:8], addressString[len(addressString)-6:], CopyButton(addressString))

diff --git a/utils/format.go b/utils/format.go
@@ -339,12 +339,6 @@ func FormatEth1Address(addr []byte) template.HTML {
 	return template.HTML(fmt.Sprintf("<a href=\"/address/%s\" class=\"text-monospace\">%s…</a>%s", eth1Addr, eth1Addr[:8], copyBtn))
 }
 
-// FormatEth1Name will return the eth1-name formated as html
-func FormatEth1Name(addr string) template.HTML {
-	copyBtn := CopyButton(addr)
-	return template.HTML(fmt.Sprintf("<a href=\"/address/%s\">%s</a>%s", addr, addr, copyBtn))
-}
-
 // FormatEth1Block will return the eth1-block formated as html
 func FormatEth1Block(block uint64) template.HTML {
 	return template.HTML(fmt.Sprintf("<a href=\"/block/%[1]d\">%[1]d</a>", block))

diff --git a/utils/utils.go b/utils/utils.go
@@ -98,7 +98,6 @@ func GetTemplateFuncs() template.FuncMap {
 		"formatEth1Block":                         FormatEth1Block,
 		"formatEth1BlockHash":                     FormatEth1BlockHash,
 		"formatEth1Address":                       FormatEth1Address,
-		"formatEth1Name":                          FormatEth1Name,
 		"formatEth1AddressStringLowerCase":        FormatEth1AddressStringLowerCase,
 		"formatEth1TxHash":                        FormatEth1TxHash,
 		"formatGraffiti":                          FormatGraffiti,