Compare commits
1 Commits
fix/70-con
...
59bec07987
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
59bec07987 |
@@ -463,12 +463,12 @@
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
<!-- ERC-20 token contract (hidden for ETH) -->
|
<!-- ERC-20 token contract (hidden for ETH) -->
|
||||||
|
<div id="confirm-token-section" class="mb-3 hidden">
|
||||||
|
<div class="text-xs text-muted mb-1">Token contract</div>
|
||||||
<div
|
<div
|
||||||
id="confirm-token-section"
|
id="confirm-token-contract"
|
||||||
class="bg-hover rounded-md mx-1 p-3 mb-3 text-xs hidden"
|
class="text-xs break-all"
|
||||||
>
|
></div>
|
||||||
<div class="font-bold mb-2">Token Contract</div>
|
|
||||||
<div id="confirm-token-contract" class="break-all"></div>
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="mb-3">
|
<div class="mb-3">
|
||||||
@@ -531,7 +531,6 @@
|
|||||||
<!-- ============ TX SUCCESS ============ -->
|
<!-- ============ TX SUCCESS ============ -->
|
||||||
<div id="view-success-tx" class="view hidden">
|
<div id="view-success-tx" class="view hidden">
|
||||||
<h2 class="font-bold mb-2">Transaction Confirmed</h2>
|
<h2 class="font-bold mb-2">Transaction Confirmed</h2>
|
||||||
<div id="success-tx-decoded" class="mb-3 hidden text-xs"></div>
|
|
||||||
<div class="mb-3">
|
<div class="mb-3">
|
||||||
<div class="text-xs text-muted mb-1">Amount</div>
|
<div class="text-xs text-muted mb-1">Amount</div>
|
||||||
<div id="success-tx-summary" class="font-bold"></div>
|
<div id="success-tx-summary" class="font-bold"></div>
|
||||||
@@ -637,10 +636,9 @@
|
|||||||
<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
|
<div class="border border-border p-2 break-all mb-3 text-xs">
|
||||||
class="border border-border p-2 break-all mb-3 text-xs cursor-pointer"
|
<span id="receive-dot"></span>
|
||||||
>
|
<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
|
||||||
|
|||||||
@@ -184,15 +184,6 @@ function showTxApproval(details) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Carry decoded calldata info through to success/error views
|
|
||||||
if (decoded) {
|
|
||||||
pendingTxDetails.decoded = {
|
|
||||||
name: decoded.name,
|
|
||||||
description: decoded.description,
|
|
||||||
details: decoded.details,
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
$("approve-tx-hostname").textContent = details.hostname;
|
$("approve-tx-hostname").textContent = details.hostname;
|
||||||
$("approve-tx-from").innerHTML = approvalAddressHtml(state.activeAddress);
|
$("approve-tx-from").innerHTML = approvalAddressHtml(state.activeAddress);
|
||||||
|
|
||||||
|
|||||||
@@ -95,22 +95,10 @@ 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">` +
|
escapeHtml(txInfo.token) +
|
||||||
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" id="confirm-token-contract-copy" 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>`;
|
|
||||||
if (txInfo.tokenName) {
|
|
||||||
$("confirm-token-contract").innerHTML +=
|
|
||||||
`<div class="mt-1"><span class="text-muted">Name:</span> ${escapeHtml(txInfo.tokenName)}</div>`;
|
|
||||||
}
|
|
||||||
if (txInfo.tokenSymbol) {
|
|
||||||
$("confirm-token-contract").innerHTML +=
|
|
||||||
`<div class="mt-1"><span class="text-muted">Symbol:</span> ${escapeHtml(txInfo.tokenSymbol)}</div>`;
|
|
||||||
}
|
|
||||||
tokenSection.classList.remove("hidden");
|
tokenSection.classList.remove("hidden");
|
||||||
} else {
|
} else {
|
||||||
tokenSection.classList.add("hidden");
|
tokenSection.classList.add("hidden");
|
||||||
@@ -285,13 +273,6 @@ function hidePasswordModal() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
function init(ctx) {
|
function init(ctx) {
|
||||||
$("confirm-token-section").addEventListener("click", (e) => {
|
|
||||||
const copyEl = e.target.closest("[data-copy]");
|
|
||||||
if (copyEl) {
|
|
||||||
navigator.clipboard.writeText(copyEl.dataset.copy);
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
$("btn-confirm-send").addEventListener("click", () => {
|
$("btn-confirm-send").addEventListener("click", () => {
|
||||||
showPasswordModal();
|
showPasswordModal();
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -1,10 +1,4 @@
|
|||||||
const {
|
const { $, showView, showFlash, addressDotHtml } = require("./helpers");
|
||||||
$,
|
|
||||||
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");
|
||||||
|
|
||||||
@@ -18,12 +12,8 @@ const EXT_ICON =
|
|||||||
function show() {
|
function show() {
|
||||||
const addr = currentAddress();
|
const addr = currentAddress();
|
||||||
const address = addr ? addr.address : "";
|
const address = addr ? addr.address : "";
|
||||||
const title = address ? addressTitle(address, state.wallets) : null;
|
$("receive-dot").innerHTML = address ? addressDotHtml(address) : "";
|
||||||
const ensName = addr ? addr.ensName || null : null;
|
$("receive-address").textContent = address;
|
||||||
$("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>`
|
||||||
@@ -60,16 +50,8 @@ 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-block").dataset.full;
|
const addr = $("receive-address").textContent;
|
||||||
if (addr) {
|
if (addr) {
|
||||||
navigator.clipboard.writeText(addr);
|
navigator.clipboard.writeText(addr);
|
||||||
showFlash("Copied!");
|
showFlash("Copied!");
|
||||||
|
|||||||
@@ -10,11 +10,7 @@ const {
|
|||||||
const { state, currentAddress } = require("../../shared/state");
|
const { state, currentAddress } = require("../../shared/state");
|
||||||
let ctx;
|
let ctx;
|
||||||
const { getProvider } = require("../../shared/balances");
|
const { getProvider } = require("../../shared/balances");
|
||||||
const {
|
const { KNOWN_SYMBOLS, resolveSymbol } = require("../../shared/tokenList");
|
||||||
KNOWN_SYMBOLS,
|
|
||||||
TOKEN_BY_ADDRESS,
|
|
||||||
resolveSymbol,
|
|
||||||
} = require("../../shared/tokenList");
|
|
||||||
|
|
||||||
const EXT_ICON =
|
const EXT_ICON =
|
||||||
`<span style="display:inline-block;width:10px;height:10px;margin-left:4px;vertical-align:middle">` +
|
`<span style="display:inline-block;width:10px;height:10px;margin-left:4px;vertical-align:middle">` +
|
||||||
@@ -128,7 +124,6 @@ function init(_ctx) {
|
|||||||
|
|
||||||
let tokenSymbol = null;
|
let tokenSymbol = null;
|
||||||
let tokenBalance = null;
|
let tokenBalance = null;
|
||||||
let tokenName = null;
|
|
||||||
if (token !== "ETH") {
|
if (token !== "ETH") {
|
||||||
const tb = (addr.tokenBalances || []).find(
|
const tb = (addr.tokenBalances || []).find(
|
||||||
(t) => t.address.toLowerCase() === token.toLowerCase(),
|
(t) => t.address.toLowerCase() === token.toLowerCase(),
|
||||||
@@ -139,17 +134,6 @@ function init(_ctx) {
|
|||||||
state.trackedTokens,
|
state.trackedTokens,
|
||||||
);
|
);
|
||||||
tokenBalance = tb ? tb.balance || "0" : "0";
|
tokenBalance = tb ? tb.balance || "0" : "0";
|
||||||
// Resolve token name from balances, tracked tokens, or known list
|
|
||||||
const lower = token.toLowerCase();
|
|
||||||
tokenName =
|
|
||||||
(tb && tb.name) ||
|
|
||||||
(
|
|
||||||
(state.trackedTokens || []).find(
|
|
||||||
(t) => t.address.toLowerCase() === lower,
|
|
||||||
) || {}
|
|
||||||
).name ||
|
|
||||||
(TOKEN_BY_ADDRESS.get(lower) || {}).name ||
|
|
||||||
null;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
ctx.showConfirmTx({
|
ctx.showConfirmTx({
|
||||||
@@ -161,7 +145,6 @@ function init(_ctx) {
|
|||||||
balance: addr.balance,
|
balance: addr.balance,
|
||||||
tokenSymbol: tokenSymbol,
|
tokenSymbol: tokenSymbol,
|
||||||
tokenBalance: tokenBalance,
|
tokenBalance: tokenBalance,
|
||||||
tokenName: tokenName,
|
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|||||||
@@ -143,10 +143,11 @@ 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");
|
||||||
|
|||||||
@@ -8,7 +8,6 @@ const {
|
|||||||
addressTitle,
|
addressTitle,
|
||||||
escapeHtml,
|
escapeHtml,
|
||||||
} = require("./helpers");
|
} = require("./helpers");
|
||||||
const { TOKEN_BY_ADDRESS } = require("../../shared/tokenList");
|
|
||||||
const { state, saveState } = require("../../shared/state");
|
const { state, saveState } = require("../../shared/state");
|
||||||
const { getProvider } = require("../../shared/balances");
|
const { getProvider } = require("../../shared/balances");
|
||||||
const { log } = require("../../shared/log");
|
const { log } = require("../../shared/log");
|
||||||
@@ -122,51 +121,11 @@ function showSuccess(txInfo, txHash, blockNumber) {
|
|||||||
to: txInfo.to,
|
to: txInfo.to,
|
||||||
hash: txHash,
|
hash: txHash,
|
||||||
blockNumber: blockNumber,
|
blockNumber: blockNumber,
|
||||||
decoded: txInfo.decoded || null,
|
|
||||||
};
|
};
|
||||||
renderSuccess();
|
renderSuccess();
|
||||||
ctx.doRefreshAndRender();
|
ctx.doRefreshAndRender();
|
||||||
}
|
}
|
||||||
|
|
||||||
function tokenLabel(address) {
|
|
||||||
const t = TOKEN_BY_ADDRESS.get(address.toLowerCase());
|
|
||||||
return t ? t.symbol : null;
|
|
||||||
}
|
|
||||||
|
|
||||||
function etherscanTokenLink(address) {
|
|
||||||
return `https://etherscan.io/token/${address}`;
|
|
||||||
}
|
|
||||||
|
|
||||||
function decodedDetailsHtml(decoded) {
|
|
||||||
if (!decoded || !decoded.details) return "";
|
|
||||||
let html = "";
|
|
||||||
if (decoded.name) {
|
|
||||||
html += `<div class="mb-2"><div class="text-xs text-muted mb-1">Action</div>`;
|
|
||||||
html += `<div class="font-bold">${escapeHtml(decoded.name)}</div></div>`;
|
|
||||||
}
|
|
||||||
if (decoded.description) {
|
|
||||||
html += `<div class="mb-2"><div class="text-xs text-muted mb-1">Description</div>`;
|
|
||||||
html += `<div>${escapeHtml(decoded.description)}</div></div>`;
|
|
||||||
}
|
|
||||||
for (const d of decoded.details) {
|
|
||||||
html += `<div class="mb-2">`;
|
|
||||||
html += `<div class="text-xs text-muted mb-1">${escapeHtml(d.label)}</div>`;
|
|
||||||
if (d.address) {
|
|
||||||
if (d.isToken) {
|
|
||||||
const sym = tokenLabel(d.address) || "Unknown token";
|
|
||||||
html += `<div class="font-bold">${escapeHtml(sym)}</div>`;
|
|
||||||
html += toAddressHtml(d.address);
|
|
||||||
} else {
|
|
||||||
html += toAddressHtml(d.address);
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
html += `<div class="font-bold">${escapeHtml(d.value)}</div>`;
|
|
||||||
}
|
|
||||||
html += `</div>`;
|
|
||||||
}
|
|
||||||
return html;
|
|
||||||
}
|
|
||||||
|
|
||||||
function renderSuccess() {
|
function renderSuccess() {
|
||||||
const d = state.viewData;
|
const d = state.viewData;
|
||||||
if (!d || !d.hash) return;
|
if (!d || !d.hash) return;
|
||||||
@@ -174,16 +133,6 @@ function renderSuccess() {
|
|||||||
$("success-tx-to").innerHTML = toAddressHtml(d.to);
|
$("success-tx-to").innerHTML = toAddressHtml(d.to);
|
||||||
$("success-tx-block").textContent = String(d.blockNumber);
|
$("success-tx-block").textContent = String(d.blockNumber);
|
||||||
$("success-tx-hash").innerHTML = txHashHtml(d.hash);
|
$("success-tx-hash").innerHTML = txHashHtml(d.hash);
|
||||||
|
|
||||||
// Show decoded calldata details if present
|
|
||||||
const decodedEl = $("success-tx-decoded");
|
|
||||||
if (decodedEl && d.decoded) {
|
|
||||||
decodedEl.innerHTML = decodedDetailsHtml(d.decoded);
|
|
||||||
decodedEl.classList.remove("hidden");
|
|
||||||
} else if (decodedEl) {
|
|
||||||
decodedEl.classList.add("hidden");
|
|
||||||
}
|
|
||||||
|
|
||||||
attachCopyHandlers("view-success-tx");
|
attachCopyHandlers("view-success-tx");
|
||||||
showView("success-tx");
|
showView("success-tx");
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user