fix: persist confirm-tx view across popup close/reopen

The confirm-tx view was not in RESTORABLE_VIEWS, so closing and
reopening the popup would fall back to the main view, losing the
pending transaction confirmation.

Save pendingTx data to state.viewData when showing confirm-tx and
add confirm-tx to the set of restorable views with proper restore
logic.

Closes #77

src/popup/index.js

@@ -75,6 +75,7 @@ const RESTORABLE_VIEWS = new Set([
     "settings",
     "settings-addtoken",
     "transaction",
+    "confirm-tx",
     "success-tx",
     "error-tx",
 ]);
@@ -134,6 +135,13 @@ function restoreView() {
                 fallbackView();
             }
             break;
+        case "confirm-tx":
+            if (state.viewData && state.viewData.pendingTx) {
+                confirmTx.show(state.viewData.pendingTx);
+            } else {
+                fallbackView();
+            }
+            break;
         case "success-tx":
             if (state.viewData && state.viewData.hash) {
                 txStatus.renderSuccess();

src/popup/views/confirmTx.js

@@ -18,7 +18,7 @@ const {
     addressDotHtml,
     escapeHtml,
 } = require("./helpers");
-const { state } = require("../../shared/state");
+const { state, saveState } = require("../../shared/state");
 const { getSignerForAddress } = require("../../shared/wallet");
 const { decryptWithPassword } = require("../../shared/vault");
 const { formatUsd, getPrice } = require("../../shared/prices");
@@ -219,6 +219,10 @@ function show(txInfo) {
     $("confirm-fee-amount").textContent = "Estimating...";
     showView("confirm-tx");
 
+    // Persist txInfo so the view survives popup close/reopen
+    state.viewData = { pendingTx: txInfo };
+    saveState();
+
     estimateGas(txInfo);
 }
 

src/shared/transactions.js

@@ -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
     // 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 || []) {
         const parsed = parseTokenTransfer(tt, addrLower);
         const existing = txsByHash.get(parsed.hash);
@@ -164,8 +166,13 @@ async function fetchRecentTransactions(address, blockscoutUrl, count = 25) {
             parsed.directionLabel = existing.directionLabel;
             parsed.isContractCall = true;
             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()];