Merge pull request 'fix: show decoded swap details on success-tx view (closes #63)' (#64) from fix/63-swap-success-view into main
All checks were successful
check / check (push) Successful in 8s
All checks were successful
check / check (push) Successful in 8s
Reviewed-on: #64
This commit was merged in pull request #64.
This commit is contained in:
@@ -531,6 +531,7 @@
|
|||||||
<!-- ============ 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>
|
||||||
|
|||||||
@@ -184,6 +184,15 @@ 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);
|
||||||
|
|
||||||
|
|||||||
@@ -8,6 +8,7 @@ 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");
|
||||||
@@ -121,11 +122,51 @@ 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;
|
||||||
@@ -133,6 +174,16 @@ 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