Compare commits
7 Commits
9a7aa1f4fc
...
fix/issue-
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
256acbeeec | ||
| e8ede7010a | |||
| a2fbb0e30d | |||
| 24464ffe33 | |||
| 34c66d19c4 | |||
| e09904147b | |||
|
|
b02a1d3a55 |
@@ -637,9 +637,10 @@
|
|||||||
<div class="flex justify-center mb-3">
|
<div class="flex justify-center mb-3">
|
||||||
<canvas id="receive-qr"></canvas>
|
<canvas id="receive-qr"></canvas>
|
||||||
</div>
|
</div>
|
||||||
<div class="border border-border p-2 break-all mb-3 text-xs">
|
<div
|
||||||
<span id="receive-dot"></span>
|
class="border border-border p-2 break-all mb-3 text-xs cursor-pointer"
|
||||||
<span id="receive-address" class="select-all"></span>
|
>
|
||||||
|
<span id="receive-address-block" class="select-all"></span>
|
||||||
<span id="receive-etherscan-link"></span>
|
<span id="receive-etherscan-link"></span>
|
||||||
</div>
|
</div>
|
||||||
<button
|
<button
|
||||||
|
|||||||
@@ -1,4 +1,10 @@
|
|||||||
const { $, showView, showFlash, addressDotHtml } = require("./helpers");
|
const {
|
||||||
|
$,
|
||||||
|
showView,
|
||||||
|
showFlash,
|
||||||
|
formatAddressHtml,
|
||||||
|
addressTitle,
|
||||||
|
} = require("./helpers");
|
||||||
const { state, currentAddress } = require("../../shared/state");
|
const { state, currentAddress } = require("../../shared/state");
|
||||||
const QRCode = require("qrcode");
|
const QRCode = require("qrcode");
|
||||||
|
|
||||||
@@ -12,8 +18,12 @@ const EXT_ICON =
|
|||||||
function show() {
|
function show() {
|
||||||
const addr = currentAddress();
|
const addr = currentAddress();
|
||||||
const address = addr ? addr.address : "";
|
const address = addr ? addr.address : "";
|
||||||
$("receive-dot").innerHTML = address ? addressDotHtml(address) : "";
|
const title = address ? addressTitle(address, state.wallets) : null;
|
||||||
$("receive-address").textContent = address;
|
const ensName = addr ? addr.ensName || null : null;
|
||||||
|
$("receive-address-block").innerHTML = address
|
||||||
|
? formatAddressHtml(address, ensName, null, title)
|
||||||
|
: "";
|
||||||
|
$("receive-address-block").dataset.full = address;
|
||||||
const link = address ? `https://etherscan.io/address/${address}` : "";
|
const link = address ? `https://etherscan.io/address/${address}` : "";
|
||||||
$("receive-etherscan-link").innerHTML = link
|
$("receive-etherscan-link").innerHTML = link
|
||||||
? `<a href="${link}" target="_blank" rel="noopener" class="inline-flex items-center">${EXT_ICON}</a>`
|
? `<a href="${link}" target="_blank" rel="noopener" class="inline-flex items-center">${EXT_ICON}</a>`
|
||||||
@@ -50,8 +60,16 @@ function show() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
function init(ctx) {
|
function init(ctx) {
|
||||||
|
$("receive-address-block").addEventListener("click", () => {
|
||||||
|
const addr = $("receive-address-block").dataset.full;
|
||||||
|
if (addr) {
|
||||||
|
navigator.clipboard.writeText(addr);
|
||||||
|
showFlash("Copied!");
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
$("btn-receive-copy").addEventListener("click", () => {
|
$("btn-receive-copy").addEventListener("click", () => {
|
||||||
const addr = $("receive-address").textContent;
|
const addr = $("receive-address-block").dataset.full;
|
||||||
if (addr) {
|
if (addr) {
|
||||||
navigator.clipboard.writeText(addr);
|
navigator.clipboard.writeText(addr);
|
||||||
showFlash("Copied!");
|
showFlash("Copied!");
|
||||||
|
|||||||
@@ -143,11 +143,10 @@ function render() {
|
|||||||
typeEl.textContent = tx.directionLabel;
|
typeEl.textContent = tx.directionLabel;
|
||||||
typeSection.classList.remove("hidden");
|
typeSection.classList.remove("hidden");
|
||||||
}
|
}
|
||||||
if (headingEl) headingEl.textContent = tx.directionLabel;
|
|
||||||
} else {
|
} else {
|
||||||
if (typeSection) typeSection.classList.add("hidden");
|
if (typeSection) typeSection.classList.add("hidden");
|
||||||
if (headingEl) headingEl.textContent = "Transaction";
|
|
||||||
}
|
}
|
||||||
|
if (headingEl) headingEl.textContent = "Transaction";
|
||||||
|
|
||||||
// Hide calldata and raw data sections; re-fetch if this is a contract call
|
// Hide calldata and raw data sections; re-fetch if this is a contract call
|
||||||
const calldataSection = $("tx-detail-calldata-section");
|
const calldataSection = $("tx-detail-calldata-section");
|
||||||
|
|||||||
@@ -153,9 +153,14 @@ 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. Replace the normal tx with the token transfer,
|
// amount and symbol. Preserve contract call metadata (direction, label,
|
||||||
// but preserve contract call metadata (direction, label, method) so
|
// method) so swaps and other contract interactions display correctly.
|
||||||
// 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);
|
||||||
@@ -164,8 +169,12 @@ 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);
|
||||||
}
|
}
|
||||||
txsByHash.set(parsed.hash, parsed);
|
// Use composite key so multiple token transfers per tx are kept
|
||||||
|
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