Compare commits
1 Commits
fix/issue-
...
4bee1f0e2b
| Author | SHA1 | Date | |
|---|---|---|---|
| 4bee1f0e2b |
@@ -14,6 +14,7 @@ const {
|
|||||||
showError,
|
showError,
|
||||||
hideError,
|
hideError,
|
||||||
showView,
|
showView,
|
||||||
|
showFlash,
|
||||||
addressTitle,
|
addressTitle,
|
||||||
addressDotHtml,
|
addressDotHtml,
|
||||||
escapeHtml,
|
escapeHtml,
|
||||||
@@ -95,11 +96,22 @@ function show(txInfo) {
|
|||||||
// Token contract section (ERC-20 only)
|
// Token contract section (ERC-20 only)
|
||||||
const tokenSection = $("confirm-token-section");
|
const tokenSection = $("confirm-token-section");
|
||||||
if (isErc20) {
|
if (isErc20) {
|
||||||
|
const dot = addressDotHtml(txInfo.token);
|
||||||
const link = etherscanTokenLink(txInfo.token);
|
const link = etherscanTokenLink(txInfo.token);
|
||||||
$("confirm-token-contract").innerHTML =
|
$("confirm-token-contract").innerHTML =
|
||||||
escapeHtml(txInfo.token) +
|
`<div class="flex items-center">${dot}` +
|
||||||
` <a href="${link}" target="_blank" rel="noopener" class="inline-flex items-center">${EXT_ICON}</a>`;
|
`<span class="break-all underline decoration-dashed cursor-pointer" data-copy="${escapeHtml(txInfo.token)}">${escapeHtml(txInfo.token)}</span>` +
|
||||||
|
`<a href="${link}" target="_blank" rel="noopener" class="inline-flex items-center">${EXT_ICON}</a>` +
|
||||||
|
`</div>`;
|
||||||
tokenSection.classList.remove("hidden");
|
tokenSection.classList.remove("hidden");
|
||||||
|
// Attach click-to-copy on the contract address
|
||||||
|
const copyEl = tokenSection.querySelector("[data-copy]");
|
||||||
|
if (copyEl) {
|
||||||
|
copyEl.onclick = () => {
|
||||||
|
navigator.clipboard.writeText(copyEl.dataset.copy);
|
||||||
|
showFlash("Copied!");
|
||||||
|
};
|
||||||
|
}
|
||||||
} else {
|
} else {
|
||||||
tokenSection.classList.add("hidden");
|
tokenSection.classList.add("hidden");
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -153,14 +153,9 @@ async function fetchRecentTransactions(address, blockscoutUrl, count = 25) {
|
|||||||
|
|
||||||
// When a token transfer shares a hash with a normal tx, the normal tx
|
// When a token transfer shares a hash with a normal tx, the normal tx
|
||||||
// is the contract call (0 ETH) and the token transfer has the real
|
// is the contract call (0 ETH) and the token transfer has the real
|
||||||
// amount and symbol. Preserve contract call metadata (direction, label,
|
// amount and symbol. Replace the normal tx with the token transfer,
|
||||||
// method) so swaps and other contract interactions display correctly.
|
// but preserve contract call metadata (direction, label, method) so
|
||||||
//
|
// swaps and other contract interactions display correctly.
|
||||||
// A single tx hash can produce multiple token transfers (e.g. a swap
|
|
||||||
// sends token A and receives token B). Use a composite key
|
|
||||||
// (hash:contractAddress) so every transfer is preserved. The original
|
|
||||||
// normal-tx entry (keyed by bare hash) is removed when at least one
|
|
||||||
// token transfer replaces it.
|
|
||||||
for (const tt of ttJson.items || []) {
|
for (const tt of ttJson.items || []) {
|
||||||
const parsed = parseTokenTransfer(tt, addrLower);
|
const parsed = parseTokenTransfer(tt, addrLower);
|
||||||
const existing = txsByHash.get(parsed.hash);
|
const existing = txsByHash.get(parsed.hash);
|
||||||
@@ -169,12 +164,8 @@ async function fetchRecentTransactions(address, blockscoutUrl, count = 25) {
|
|||||||
parsed.directionLabel = existing.directionLabel;
|
parsed.directionLabel = existing.directionLabel;
|
||||||
parsed.isContractCall = true;
|
parsed.isContractCall = true;
|
||||||
parsed.method = existing.method;
|
parsed.method = existing.method;
|
||||||
// Remove the bare-hash normal tx so it isn't duplicated
|
|
||||||
txsByHash.delete(parsed.hash);
|
|
||||||
}
|
}
|
||||||
// Use composite key so multiple token transfers per tx are kept
|
txsByHash.set(parsed.hash, parsed);
|
||||||
const compositeKey = parsed.hash + ":" + (parsed.contractAddress || "");
|
|
||||||
txsByHash.set(compositeKey, parsed);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
const txs = [...txsByHash.values()];
|
const txs = [...txsByHash.values()];
|
||||||
|
|||||||
Reference in New Issue
Block a user