All checks were successful
check / check (push) Successful in 25s
## Summary Fixes the view stack pop bug where pressing Back in Settings (or any view) always returned to Main instead of the previous view. Closes [issue #134](#134) ## Problem The popup UI had no navigation stack. Every back button was hardcoded to a specific destination (usually Main). The reported path: > Main → Address → Transaction → Settings (gear icon) → Back ...would go to Main instead of returning to the Transaction view. ## Solution Implemented a proper view navigation stack (like iOS) as already described in the README: - **`viewStack`** array added to persisted state — survives popup close/reopen - **`pushCurrentView()`** — pushes the current view name onto the stack before any forward navigation - **`goBack()`** — pops the stack and shows the previous view; falls back to Main if the stack is empty; re-renders the wallet list when returning to Main - **`clearViewStack()`** — resets the stack for root transitions (e.g., after adding/deleting a wallet) ### What Changed 1. **helpers.js** — Added navigation stack functions (`pushCurrentView`, `goBack`, `clearViewStack`, `setRenderMain`) 2. **state.js** — Added `viewStack` to persisted state 3. **index.js** — All `ctx.show*()` wrappers now push before navigating forward; gear button uses stack for toggle behavior 4. **All view back buttons** — Replaced hardcoded destinations with `goBack()` (settings, addressDetail, addressToken, transactionDetail, send, receive, addToken, confirmTx, addWallet, settingsAddToken, deleteWallet, export-privkey) 5. **Direct `showView()` forward navigations** — Added `pushCurrentView()` calls before `showView("send")` in addressDetail, addressToken, and home; before `showView("export-privkey")` in addressDetail; before `deleteWallet.show()` in settings 6. **Reset-to-root transitions** — `clearViewStack()` called after adding a wallet (all 3 import types), after deleting the last wallet, and after transaction completion (Done button) ### Navigation Paths Verified - **Main → Settings → Back** → returns to Main ✓ - **Main → Address → Settings → Back** → returns to Address ✓ - **Main → Address → Transaction → Settings → Back** → returns to Transaction ✓ (the reported bug) - **Main → Address → Token → Send → ConfirmTx → Back → Back → Back → Back** → unwinds correctly through each view back to Main ✓ - **Main → Address → Token → Transaction → Settings → Back** → returns to Transaction ✓ - **Settings → Add Wallet → (add) → Main** → stack cleared, fresh root ✓ - **Settings → Delete Wallet → Back** → returns to Settings ✓ - **Settings → Delete Wallet → (confirm)** → stack reset to [main], settings shown ✓ - **Address → Send → ConfirmTx → (broadcast) → SuccessTx → Done** → stack reset, returns to address context ✓ - **Popup close/reopen** → viewStack persisted, back navigation still works ✓ Co-authored-by: user <user@Mac.lan guest wan> Reviewed-on: #146 Co-authored-by: clawbot <clawbot@noreply.example.org> Co-committed-by: clawbot <clawbot@noreply.example.org>
246 lines
7.5 KiB
JavaScript
246 lines
7.5 KiB
JavaScript
// Post-broadcast transaction status views: wait, success, error.
|
|
|
|
const {
|
|
$,
|
|
showView,
|
|
addressTitle,
|
|
escapeHtml,
|
|
renderAddressHtml,
|
|
attachCopyHandlers,
|
|
copyableHtml,
|
|
etherscanLinkHtml,
|
|
clearViewStack,
|
|
} = require("./helpers");
|
|
const { TOKEN_BY_ADDRESS } = require("../../shared/tokenList");
|
|
const { state, saveState, currentNetwork } = require("../../shared/state");
|
|
const { getProvider } = require("../../shared/balances");
|
|
const { log } = require("../../shared/log");
|
|
|
|
let ctx;
|
|
let elapsedTimer = null;
|
|
let pollTimer = null;
|
|
|
|
function clearTimers() {
|
|
if (elapsedTimer) {
|
|
clearInterval(elapsedTimer);
|
|
elapsedTimer = null;
|
|
}
|
|
if (pollTimer) {
|
|
clearInterval(pollTimer);
|
|
pollTimer = null;
|
|
}
|
|
}
|
|
|
|
function toAddressHtml(address) {
|
|
const title = addressTitle(address, state.wallets);
|
|
return renderAddressHtml(address, { title });
|
|
}
|
|
|
|
function txHashHtml(hash) {
|
|
const link = `${currentNetwork().explorerUrl}/tx/${hash}`;
|
|
return copyableHtml(hash, "break-all") + etherscanLinkHtml(link);
|
|
}
|
|
|
|
function blockNumberHtml(blockNumber) {
|
|
const num = String(blockNumber);
|
|
const link = `${currentNetwork().explorerUrl}/block/${num}`;
|
|
return copyableHtml(num) + etherscanLinkHtml(link);
|
|
}
|
|
|
|
function showWait(txInfo, txHash) {
|
|
clearTimers();
|
|
|
|
const symbol = txInfo.token === "ETH" ? "ETH" : txInfo.tokenSymbol || "?";
|
|
$("wait-tx-summary").textContent = txInfo.amount + " " + symbol;
|
|
$("wait-tx-to").innerHTML = toAddressHtml(txInfo.to);
|
|
$("wait-tx-hash").innerHTML = txHashHtml(txHash);
|
|
attachCopyHandlers("view-wait-tx");
|
|
|
|
const broadcastTime = Date.now();
|
|
$("wait-tx-status").textContent = "Waiting for confirmation... 0s";
|
|
|
|
elapsedTimer = setInterval(() => {
|
|
const elapsed = Math.floor((Date.now() - broadcastTime) / 1000);
|
|
$("wait-tx-status").textContent =
|
|
"Waiting for confirmation... " + elapsed + "s";
|
|
}, 1000);
|
|
|
|
const provider = getProvider(state.rpcUrl);
|
|
pollTimer = setInterval(async () => {
|
|
try {
|
|
const receipt = await provider.getTransactionReceipt(txHash);
|
|
if (receipt) {
|
|
showSuccess(txInfo, txHash, receipt.blockNumber);
|
|
}
|
|
} catch (e) {
|
|
log.errorf("poll receipt failed:", e.message);
|
|
}
|
|
|
|
const elapsed = Math.floor((Date.now() - broadcastTime) / 1000);
|
|
if (elapsed >= 60) {
|
|
showError(
|
|
txInfo,
|
|
txHash,
|
|
"Transaction was not confirmed within 60 seconds. It may still confirm later \u2014 check Etherscan.",
|
|
);
|
|
}
|
|
}, 10000);
|
|
|
|
showView("wait-tx");
|
|
}
|
|
|
|
function showSuccess(txInfo, txHash, blockNumber) {
|
|
clearTimers();
|
|
|
|
const symbol = txInfo.token === "ETH" ? "ETH" : txInfo.tokenSymbol || "?";
|
|
state.viewData = {
|
|
amount: txInfo.amount,
|
|
symbol: symbol,
|
|
to: txInfo.to,
|
|
hash: txHash,
|
|
blockNumber: blockNumber,
|
|
decoded: txInfo.decoded || null,
|
|
};
|
|
renderSuccess();
|
|
ctx.doRefreshAndRender();
|
|
}
|
|
|
|
function tokenLabel(address) {
|
|
const t = TOKEN_BY_ADDRESS.get(address.toLowerCase());
|
|
return t ? t.symbol : null;
|
|
}
|
|
|
|
function etherscanTokenLink(address) {
|
|
return `${currentNetwork().explorerUrl}/token/${address}`;
|
|
}
|
|
|
|
function decodedDetailsHtml(decoded) {
|
|
if (!decoded || !decoded.details) return "";
|
|
let html = `<div class="border border-border border-dashed p-2 mb-3">`;
|
|
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>`;
|
|
}
|
|
html += `</div>`;
|
|
return html;
|
|
}
|
|
|
|
function renderSuccess() {
|
|
const d = state.viewData;
|
|
if (!d || !d.hash) return;
|
|
|
|
const hasDecoded = d.decoded && d.decoded.details;
|
|
|
|
// When decoded details are present, the Amount and To are already
|
|
// shown inside the decoded well — hide the top-level duplicates.
|
|
const summarySection = $("success-tx-summary").parentElement;
|
|
const toSection = $("success-tx-to").parentElement;
|
|
if (hasDecoded) {
|
|
summarySection.classList.add("hidden");
|
|
toSection.classList.add("hidden");
|
|
} else {
|
|
summarySection.classList.remove("hidden");
|
|
toSection.classList.remove("hidden");
|
|
$("success-tx-summary").textContent = d.amount + " " + d.symbol;
|
|
$("success-tx-to").innerHTML = toAddressHtml(d.to);
|
|
}
|
|
|
|
$("success-tx-block").innerHTML = blockNumberHtml(d.blockNumber);
|
|
$("success-tx-hash").innerHTML = txHashHtml(d.hash);
|
|
|
|
// Show decoded calldata details if present
|
|
const decodedEl = $("success-tx-decoded");
|
|
if (decodedEl && hasDecoded) {
|
|
decodedEl.innerHTML = decodedDetailsHtml(d.decoded);
|
|
decodedEl.classList.remove("hidden");
|
|
} else if (decodedEl) {
|
|
decodedEl.classList.add("hidden");
|
|
}
|
|
|
|
attachCopyHandlers("view-success-tx");
|
|
showView("success-tx");
|
|
}
|
|
|
|
function showError(txInfo, txHash, message) {
|
|
clearTimers();
|
|
|
|
const symbol = txInfo.token === "ETH" ? "ETH" : txInfo.tokenSymbol || "?";
|
|
state.viewData = {
|
|
amount: txInfo.amount,
|
|
symbol: symbol,
|
|
to: txInfo.to,
|
|
hash: txHash || null,
|
|
message: message,
|
|
};
|
|
renderError();
|
|
}
|
|
|
|
function renderError() {
|
|
const d = state.viewData;
|
|
if (!d || !d.message) return;
|
|
$("error-tx-summary").textContent = d.amount + " " + d.symbol;
|
|
$("error-tx-to").innerHTML = toAddressHtml(d.to);
|
|
$("error-tx-message").textContent = d.message;
|
|
|
|
if (d.hash) {
|
|
$("error-tx-hash").innerHTML = txHashHtml(d.hash);
|
|
$("error-tx-hash-section").classList.remove("hidden");
|
|
attachCopyHandlers("view-error-tx");
|
|
} else {
|
|
$("error-tx-hash-section").classList.add("hidden");
|
|
}
|
|
|
|
showView("error-tx");
|
|
}
|
|
|
|
function isApprovalPopup() {
|
|
return new URLSearchParams(window.location.search).has("approval");
|
|
}
|
|
|
|
function navigateBack() {
|
|
if (isApprovalPopup()) {
|
|
window.close();
|
|
return;
|
|
}
|
|
// After a completed transaction, reset the navigation stack
|
|
// and go directly to the address view (token or detail).
|
|
// Use require() lazily to call show() without the ctx push wrapper.
|
|
clearViewStack();
|
|
state.viewStack.push("main");
|
|
if (state.selectedToken) {
|
|
state.viewStack.push("address");
|
|
require("./addressToken").show();
|
|
} else {
|
|
require("./addressDetail").show();
|
|
}
|
|
}
|
|
|
|
function init(_ctx) {
|
|
ctx = _ctx;
|
|
|
|
$("btn-success-tx-done").addEventListener("click", navigateBack);
|
|
$("btn-error-tx-done").addEventListener("click", navigateBack);
|
|
}
|
|
|
|
module.exports = { init, showWait, showError, renderSuccess, renderError };
|