Compare commits
4 Commits
a655c546b7
...
fix/77-con
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
d2f7284975 | ||
| 9444b06b52 | |||
| c2fdb3e0c1 | |||
|
|
4157732f4b |
@@ -75,6 +75,7 @@ const RESTORABLE_VIEWS = new Set([
|
|||||||
"settings",
|
"settings",
|
||||||
"settings-addtoken",
|
"settings-addtoken",
|
||||||
"transaction",
|
"transaction",
|
||||||
|
"confirm-tx",
|
||||||
"success-tx",
|
"success-tx",
|
||||||
"error-tx",
|
"error-tx",
|
||||||
]);
|
]);
|
||||||
@@ -134,6 +135,13 @@ function restoreView() {
|
|||||||
fallbackView();
|
fallbackView();
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
case "confirm-tx":
|
||||||
|
if (state.viewData && state.viewData.pendingTx) {
|
||||||
|
confirmTx.show(state.viewData.pendingTx);
|
||||||
|
} else {
|
||||||
|
fallbackView();
|
||||||
|
}
|
||||||
|
break;
|
||||||
case "success-tx":
|
case "success-tx":
|
||||||
if (state.viewData && state.viewData.hash) {
|
if (state.viewData && state.viewData.hash) {
|
||||||
txStatus.renderSuccess();
|
txStatus.renderSuccess();
|
||||||
|
|||||||
@@ -14,12 +14,11 @@ const {
|
|||||||
showError,
|
showError,
|
||||||
hideError,
|
hideError,
|
||||||
showView,
|
showView,
|
||||||
showFlash,
|
|
||||||
addressTitle,
|
addressTitle,
|
||||||
addressDotHtml,
|
addressDotHtml,
|
||||||
escapeHtml,
|
escapeHtml,
|
||||||
} = require("./helpers");
|
} = require("./helpers");
|
||||||
const { state } = require("../../shared/state");
|
const { state, saveState } = require("../../shared/state");
|
||||||
const { getSignerForAddress } = require("../../shared/wallet");
|
const { getSignerForAddress } = require("../../shared/wallet");
|
||||||
const { decryptWithPassword } = require("../../shared/vault");
|
const { decryptWithPassword } = require("../../shared/vault");
|
||||||
const { formatUsd, getPrice } = require("../../shared/prices");
|
const { formatUsd, getPrice } = require("../../shared/prices");
|
||||||
@@ -96,22 +95,11 @@ 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 =
|
||||||
`<div class="flex items-center">${dot}` +
|
escapeHtml(txInfo.token) +
|
||||||
`<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>`;
|
||||||
`<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");
|
||||||
}
|
}
|
||||||
@@ -231,6 +219,10 @@ function show(txInfo) {
|
|||||||
$("confirm-fee-amount").textContent = "Estimating...";
|
$("confirm-fee-amount").textContent = "Estimating...";
|
||||||
showView("confirm-tx");
|
showView("confirm-tx");
|
||||||
|
|
||||||
|
// Persist txInfo so the view survives popup close/reopen
|
||||||
|
state.viewData = { pendingTx: txInfo };
|
||||||
|
saveState();
|
||||||
|
|
||||||
estimateGas(txInfo);
|
estimateGas(txInfo);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -153,9 +153,11 @@ 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. A single transaction (e.g. a swap) can produce
|
||||||
// but preserve contract call metadata (direction, label, method) so
|
// multiple token transfers (one per token involved), so we key token
|
||||||
// swaps and other contract interactions display correctly.
|
// transfers by hash + contract address to keep all of them. We also
|
||||||
|
// preserve contract-call metadata (direction, label, method) from the
|
||||||
|
// matching normal tx so swaps display correctly.
|
||||||
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 +166,13 @@ 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 doesn't appear as a
|
||||||
|
// duplicate with empty value; token transfers replace it.
|
||||||
|
txsByHash.delete(parsed.hash);
|
||||||
}
|
}
|
||||||
txsByHash.set(parsed.hash, parsed);
|
// Use composite key so multiple token transfers per tx are kept.
|
||||||
|
const ttKey = parsed.hash + ":" + (parsed.contractAddress || "");
|
||||||
|
txsByHash.set(ttKey, parsed);
|
||||||
}
|
}
|
||||||
|
|
||||||
const txs = [...txsByHash.values()];
|
const txs = [...txsByHash.values()];
|
||||||
|
|||||||
Reference in New Issue
Block a user