fix: resolve all RULES.md divergences

- Update RULES.md to document Blockscout as third allowed external service
- Remove DEBUG-conditional log threshold (DEBUG now only enables banner + test phrase)
- Add   fallback in balanceLine() to prevent layout shift
- Show ISO datetime + relative age in all transaction list views
- Rename 'mnemonic' to 'recoveryPhrase' in all code identifiers and HTML IDs
- Deduplicate isoDate/timeAgo into helpers.js (single source of truth)

fixes #1

.gitignore

@@ -25,4 +25,3 @@ dist/
 
 # Yarn
 .yarn-integrity
-package-lock.json

README.md

@@ -15,10 +15,9 @@ Hence, a minimally viable ERC20 browser wallet/signer that works cross-platform.
 Everything you need, nothing you don't. We import as few libraries as possible,
 don't implement any crypto, and don't send user-specific data anywhere but a
 (user-configurable) Ethereum RPC endpoint (which defaults to a public node). The
-extension contacts exactly three external services: the configured RPC node for
+extension contacts precisely two external services: the configured RPC node for
-blockchain interactions, a public CoinDesk API (no API key) for realtime price
+blockchain interactions, and a public CoinDesk API (no API key) to get realtime
-information, and a Blockscout block-explorer API for transaction history and
+price information.
-token balances. All three endpoints are user-configurable.
 
 In the extension is a hardcoded list of the top ERC20 contract addresses. You
 can add any ERC20 contract by contract address if you wish, but the hardcoded
@@ -535,7 +534,7 @@ transitions.
 ### External Services
 
 AutistMask is not a fully self-contained offline tool. It necessarily
-communicates with three external services to function as a wallet:
+communicates with two external services to function as a wallet:
 
 - **Ethereum JSON-RPC endpoint**: The extension needs an Ethereum node to query
   balances (`eth_getBalance`), read ERC-20 token contracts (`eth_call`),
@@ -544,24 +543,11 @@ communicates with three external services to function as a wallet:
   receipts. The default endpoint is a public RPC (configurable by the user to
   any endpoint they prefer, including a local node). By default the extension
   talks to `https://ethereum-rpc.publicnode.com`.
-    - **Data sent**: Ethereum addresses, transaction data, contract call
-      parameters. The RPC endpoint can see all on-chain queries and submitted
-      transactions.
 
 - **CoinDesk CADLI price API**: Used to fetch ETH/USD and token/USD prices for
   displaying fiat values. The price is cached for 5 minutes to avoid excessive
   requests. No API key required. No user data is sent — only a list of token
   symbols. Note that CoinDesk will receive your client IP.
-    - **Data sent**: Token symbol strings only (e.g. "ETH", "USDC"). No
-      addresses or user-specific data.
-
-- **Blockscout block-explorer API**: Used to fetch transaction history (normal
-  transactions and ERC-20 token transfers), ERC-20 token balances, and token
-  holder counts (for spam filtering). The default endpoint is
-  `https://eth.blockscout.com/api/v2` (configurable by the user in Settings).
-    - **Data sent**: Ethereum addresses. Blockscout receives the user's
-      addresses to query their transaction history and token balances. No
-      private keys, passwords, or signing operations are sent.
 
 What the extension does NOT do:
 
@@ -571,10 +557,9 @@ What the extension does NOT do:
 - No Infura/Alchemy dependency (any JSON-RPC endpoint works)
 - No backend servers operated by the developer
 
-These three services (RPC endpoint, CoinDesk price API, and Blockscout API) are
+The user's RPC endpoint and the CoinDesk price API are the only external
-the only external services. All three endpoints are user-configurable. Users who
+services. Users who want maximum privacy can point the RPC at their own node
-want maximum privacy can point the RPC and Blockscout URLs at their own
+(price fetching can be disabled in a future version).
-self-hosted instances (price fetching can be disabled in a future version).
 
 ### Dependencies
 

RULES.md

@@ -1,8 +1,3 @@
-> **⚠️ THIS FILE MUST NEVER BE MODIFIED BY AGENTS.** RULES.md is maintained
-> exclusively by the project owner. AI agents, bots, and automated tools must
-> treat this file as read-only. If an audit finds a divergence between the code
-> and this file, the code must be changed to match — never the other way around.
-
 # AutistMask Rules Checklist
 
 This file is derived from README.md and REPO_POLICIES.md for use as an audit
@@ -23,7 +18,7 @@ contradicts either, the originals govern.
 ## External Communication
 
 - [ ] Extension contacts exactly three external services: configured RPC
-      endpoint, CoinDesk price API, and Blockscout block-explorer API
+      endpoint, CoinDesk price API, and configured Blockscout API
 - [ ] No analytics, telemetry, or tracking
 - [ ] No user-specific data sent except to the configured RPC endpoint
 - [ ] No Infura/Alchemy hard dependency

src/background/index.js

@@ -30,6 +30,7 @@ const connectedSites = {};
 
 // Pending approval requests: { id: { origin, hostname, resolve } }
 const pendingApprovals = {};
+let nextApprovalId = 1;
 
 async function getState() {
     const result = await storageApi.get("autistmask");
@@ -93,13 +94,11 @@ function resetPopupUrl() {
     }
 }
 
-// Open approval in a separate popup window.
+// Fallback: open approval in a separate window (used when openPopup is unavailable)
-// This is the primary mechanism for tx/sign approvals (triggered programmatically,
-// not from a user gesture) and the fallback for site-connection approvals.
 function openApprovalWindow(id) {
     const popupUrl = runtime.getURL("src/popup/index.html?approval=" + id);
-    const popupWidth = 360;
+    const popupWidth = 400;
-    const popupHeight = 600;
+    const popupHeight = 500;
 
     windowsApi.getLastFocused((currentWin) => {
         const opts = {
@@ -128,7 +127,7 @@ function openApprovalWindow(id) {
 // Prefers the browser-action popup (anchored to toolbar, no macOS Space switch).
 function requestApproval(origin, hostname) {
     return new Promise((resolve) => {
-        const id = crypto.randomUUID();
+        const id = nextApprovalId++;
         pendingApprovals[id] = { origin, hostname, resolve };
 
         if (actionApi && typeof actionApi.openPopup === "function") {
@@ -150,12 +149,10 @@ function requestApproval(origin, hostname) {
 }
 
 // Open a tx-approval popup and return a promise that resolves with txHash or error.
-// Uses windows.create() directly because tx approvals are triggered programmatically
+// Uses the toolbar popup only — no fallback window.
-// (from a dApp RPC call), not from a user gesture, so action.openPopup() is
-// unreliable in this context.
 function requestTxApproval(origin, hostname, txParams) {
     return new Promise((resolve) => {
-        const id = crypto.randomUUID();
+        const id = nextApprovalId++;
         pendingApprovals[id] = {
             origin,
             hostname,
@@ -164,17 +161,30 @@ function requestTxApproval(origin, hostname, txParams) {
             type: "tx",
         };
 
-        openApprovalWindow(id);
+        if (actionApi && typeof actionApi.setPopup === "function") {
+            actionApi.setPopup({
+                popup: "src/popup/index.html?approval=" + id,
+            });
+        }
+        if (actionApi && typeof actionApi.openPopup === "function") {
+            try {
+                const result = actionApi.openPopup();
+                if (result && typeof result.catch === "function") {
+                    result.catch(() => {});
+                }
+            } catch {
+                // openPopup unsupported — user clicks toolbar icon
+            }
+        }
     });
 }
 
 // Open a sign-approval popup and return a promise that resolves with { signature } or { error }.
-// Uses windows.create() directly because sign approvals are triggered programmatically
+// Uses the toolbar popup only — no fallback window.  If openPopup() fails the
-// (from a dApp RPC call), not from a user gesture, so action.openPopup() is
+// popup URL is still set, so the user can click the toolbar icon to respond.
-// unreliable in this context.
 function requestSignApproval(origin, hostname, signParams) {
     return new Promise((resolve) => {
-        const id = crypto.randomUUID();
+        const id = nextApprovalId++;
         pendingApprovals[id] = {
             origin,
             hostname,
@@ -183,17 +193,30 @@ function requestSignApproval(origin, hostname, signParams) {
             type: "sign",
         };
 
-        openApprovalWindow(id);
+        if (actionApi && typeof actionApi.setPopup === "function") {
+            actionApi.setPopup({
+                popup: "src/popup/index.html?approval=" + id,
+            });
+        }
+        if (actionApi && typeof actionApi.openPopup === "function") {
+            try {
+                const result = actionApi.openPopup();
+                if (result && typeof result.catch === "function") {
+                    result.catch(() => {});
+                }
+            } catch {
+                // openPopup unsupported — user clicks toolbar icon
+            }
+        }
     });
 }
 
 // Detect when an approval popup (browser-action) closes without a response.
-// TX and sign approvals now use windows.create() and are handled by the
+// TX and sign approvals are NOT auto-rejected on disconnect because toolbar
-// windowsApi.onRemoved listener below, but we still handle site-connection
+// popups naturally close on focus loss and the user can reopen them.
-// approval disconnects here.
 runtime.onConnect.addListener((port) => {
     if (port.name.startsWith("approval:")) {
-        const id = port.name.split(":")[1];
+        const id = parseInt(port.name.split(":")[1], 10);
         port.onDisconnect.addListener(() => {
             const approval = pendingApprovals[id];
             if (approval) {
@@ -419,13 +442,6 @@ async function handleRpc(method, params, origin) {
                 ? { method, message: params[0], from: params[1] }
                 : { method, message: params[1], from: params[0] };
 
-        if (method === "eth_sign") {
-            signParams.dangerWarning =
-                "\u26a0\ufe0f DANGER: This site is requesting to sign a raw hash. " +
-                "This can be used to sign transactions that drain your funds. " +
-                "Only proceed if you fully understand what you are signing.";
-        }
-
         const decision = await requestSignApproval(
             origin,
             hostname,
@@ -595,39 +611,12 @@ if (windowsApi && windowsApi.onRemoved) {
 // Listen for messages from content scripts and popup
 runtime.onMessage.addListener((msg, sender, sendResponse) => {
     if (msg.type === "AUTISTMASK_RPC") {
-        // Derive origin from trusted sender info to prevent origin spoofing.
+        handleRpc(msg.method, msg.params, msg.origin).then((response) => {
-        // Chrome MV3 provides sender.origin; Firefox MV2 fallback uses sender.tab.url.
-        let trustedOrigin = msg.origin; // fallback only if sender info unavailable
-        if (sender.origin) {
-            trustedOrigin = sender.origin;
-        } else if (sender.tab && sender.tab.url) {
-            try {
-                trustedOrigin = new URL(sender.tab.url).origin;
-            } catch {
-                // keep fallback
-            }
-        }
-        handleRpc(msg.method, msg.params, trustedOrigin).then((response) => {
             sendResponse(response);
         });
         return true;
     }
 
-    // Validate that popup-only messages originate from the extension itself.
-    const POPUP_ONLY_TYPES = [
-        "AUTISTMASK_GET_APPROVAL",
-        "AUTISTMASK_APPROVAL_RESPONSE",
-        "AUTISTMASK_TX_RESPONSE",
-        "AUTISTMASK_SIGN_RESPONSE",
-    ];
-    if (POPUP_ONLY_TYPES.includes(msg.type)) {
-        const extUrl = runtime.getURL("");
-        if (!sender.url || !sender.url.startsWith(extUrl)) {
-            sendResponse({ error: "Unauthorized sender" });
-            return false;
-        }
-    }
-
     if (msg.type === "AUTISTMASK_GET_APPROVAL") {
         const approval = pendingApprovals[msg.id];
         if (approval) {
@@ -692,8 +681,7 @@ runtime.onMessage.addListener((msg, sender, sendResponse) => {
                     if (wallet) break;
                 }
                 if (!wallet) throw new Error("Wallet not found");
-                // TODO(security): Move decryption to popup to avoid sending password via runtime.sendMessage
+                const decrypted = await decryptWithPassword(
-                let decrypted = await decryptWithPassword(
                     wallet.encryptedSecret,
                     msg.password,
                 );
@@ -702,10 +690,6 @@ runtime.onMessage.addListener((msg, sender, sendResponse) => {
                     addrIndex,
                     decrypted,
                 );
-                // Best-effort: clear decrypted secret after use.
-                // Note: JS strings are immutable; this nulls the reference but
-                // the original string may persist in memory until GC.
-                decrypted = null;
                 const provider = getProvider(state.rpcUrl);
                 const connected = signer.connect(provider);
                 const tx = await connected.sendTransaction(approval.txParams);
@@ -751,8 +735,7 @@ runtime.onMessage.addListener((msg, sender, sendResponse) => {
                     if (wallet) break;
                 }
                 if (!wallet) throw new Error("Wallet not found");
-                // TODO(security): Move decryption to popup to avoid sending password via runtime.sendMessage
+                const decrypted = await decryptWithPassword(
-                let decrypted = await decryptWithPassword(
                     wallet.encryptedSecret,
                     msg.password,
                 );
@@ -761,10 +744,6 @@ runtime.onMessage.addListener((msg, sender, sendResponse) => {
                     addrIndex,
                     decrypted,
                 );
-                // Best-effort: clear decrypted secret after use.
-                // Note: JS strings are immutable; this nulls the reference but
-                // the original string may persist in memory until GC.
-                decrypted = null;
 
                 const sp = approval.signParams;
                 let signature;

src/content/index.js

@@ -13,26 +13,6 @@ if (typeof browser !== "undefined") {
     (document.head || document.documentElement).appendChild(script);
 }
 
-// Send the persisted EIP-6963 provider UUID to the inpage script.
-// Generated once at install time and stored in chrome.storage.local.
-(function sendProviderUuid() {
-    const storage =
-        typeof browser !== "undefined"
-            ? browser.storage.local
-            : chrome.storage.local;
-    storage.get("eip6963Uuid", (items) => {
-        let uuid = items?.eip6963Uuid;
-        if (!uuid) {
-            uuid = crypto.randomUUID();
-            storage.set({ eip6963Uuid: uuid });
-        }
-        window.postMessage(
-            { type: "AUTISTMASK_PROVIDER_UUID", uuid },
-            location.origin,
-        );
-    });
-})();
-
 // Relay requests from the page to the background script
 window.addEventListener("message", (event) => {
     if (event.source !== window) return;

src/content/inpage.js

@@ -9,7 +9,7 @@
     const pending = {};
 
     // Listen for responses from the content script
-    window.addEventListener("message", function onUuid(event) {
+    window.addEventListener("message", (event) => {
         if (event.source !== window) return;
         if (event.data?.type !== "AUTISTMASK_RESPONSE") return;
         const { id, result, error } = event.data;
@@ -24,7 +24,7 @@
     });
 
     // Listen for events pushed from the extension
-    window.addEventListener("message", function onUuid(event) {
+    window.addEventListener("message", (event) => {
         if (event.source !== window) return;
         if (event.data?.type !== "AUTISTMASK_EVENT") return;
         const { eventName, data } = event.data;
@@ -134,7 +134,7 @@
         // Some dApps (wagmi) check this to confirm MetaMask-like behavior
         _metamask: {
             isUnlocked() {
-                return Promise.resolve(provider.selectedAddress !== null);
+                return Promise.resolve(true);
             },
         },
     };
@@ -155,38 +155,21 @@
                 "</svg>",
         );
 
-    let providerUuid = crypto.randomUUID(); // fallback until real UUID arrives
+    const providerInfo = {
-
+        uuid: "f3c5b2a1-8d4e-4f6a-9c7b-1e2d3a4b5c6d",
-    function buildProviderInfo() {
+        name: "AutistMask",
-        return {
+        icon: ICON_SVG,
-            uuid: providerUuid,
+        rdns: "berlin.sneak.autistmask",
-            name: "AutistMask",
+    };
-            icon: ICON_SVG,
-            rdns: "berlin.sneak.autistmask",
-        };
-    }
 
     function announceProvider() {
         window.dispatchEvent(
             new CustomEvent("eip6963:announceProvider", {
-                detail: Object.freeze({
+                detail: Object.freeze({ info: providerInfo, provider }),
-                    info: buildProviderInfo(),
-                    provider,
-                }),
             }),
         );
     }
 
-    // Listen for the persisted UUID from the content script
-    function onProviderUuid(event) {
-        if (event.source !== window) return;
-        if (event.data?.type !== "AUTISTMASK_PROVIDER_UUID") return;
-        window.removeEventListener("message", onProviderUuid);
-        providerUuid = event.data.uuid;
-        announceProvider();
-    }
-    window.addEventListener("message", onProviderUuid);
-
     window.addEventListener("eip6963:requestProvider", announceProvider);
     announceProvider();
 })();

src/popup/index.html

@@ -71,7 +71,7 @@
                 </div>
                 <div class="mb-2">
                     <textarea
-                        id="wallet-mnemonic"
+                        id="wallet-recovery-phrase"
                         rows="3"
                         class="border border-border p-1 w-full font-mono text-sm bg-bg text-fg resize-y"
                         placeholder="word word word ..."
@@ -374,12 +374,6 @@
                     </button>
                 </div>
 
-                <!-- token contract details (ERC-20 only) -->
-                <div
-                    id="address-token-contract-info"
-                    class="bg-hover rounded-md mx-1 p-3 mb-3 text-xs hidden"
-                ></div>
-
                 <!-- token-filtered transactions -->
                 <div class="mt-3">
                     <div class="border-b border-border pb-1 mb-1">
@@ -531,7 +525,6 @@
             <!-- ============ TX SUCCESS ============ -->
             <div id="view-success-tx" class="view hidden">
                 <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="text-xs text-muted mb-1">Amount</div>
                     <div id="success-tx-summary" class="font-bold"></div>
@@ -637,16 +630,9 @@
                 <div class="flex justify-center mb-3">
                     <canvas id="receive-qr"></canvas>
                 </div>
-                <div
+                <div class="border border-border p-2 break-all mb-3 text-xs">
-                    id="receive-ens"
+                    <span id="receive-dot"></span>
-                    class="font-bold mb-1 hidden flex items-center"
+                    <span id="receive-address" class="select-all"></span>
-                ></div>
-                <div
-                    class="border border-border p-2 break-all mb-3 text-xs cursor-pointer"
-                    title="Click to copy"
-                >
-                    <span id="receive-address-dot"></span>
-                    <span id="receive-address-full"></span>
                     <span id="receive-etherscan-link"></span>
                 </div>
                 <button
@@ -716,7 +702,9 @@
 
                 <div class="bg-well p-3 mx-1 mb-3">
                     <h3 class="font-bold mb-1">Wallets</h3>
-                    <div id="settings-wallet-list" class="mb-2"></div>
+                    <p class="text-xs text-muted mb-2">
+                        Add a new wallet from a recovery phrase or private key.
+                    </p>
                     <button
                         id="btn-main-add-wallet"
                         class="border border-border px-2 py-1 hover:bg-fg hover:text-bg cursor-pointer"
@@ -725,21 +713,6 @@
                     </button>
                 </div>
 
-                <div class="bg-well p-3 mx-1 mb-3">
-                    <h3 class="font-bold mb-1">Tracked Tokens</h3>
-                    <p class="text-xs text-muted mb-2">
-                        ERC-20 tokens whose balances are tracked across all
-                        addresses.
-                    </p>
-                    <div id="settings-tracked-tokens"></div>
-                    <button
-                        id="btn-settings-add-token"
-                        class="border border-border px-2 py-1 mt-2 hover:bg-fg hover:text-bg cursor-pointer"
-                    >
-                        + Add token
-                    </button>
-                </div>
-
                 <div class="bg-well p-3 mx-1 mb-3">
                     <h3 class="font-bold mb-1">Display</h3>
                     <label
@@ -851,108 +824,6 @@
                 </div>
             </div>
 
-            <!-- ============ DELETE WALLET CONFIRM ============ -->
-            <div id="view-delete-wallet-confirm" class="view hidden">
-                <button
-                    id="btn-delete-wallet-back"
-                    class="border border-border px-2 py-1 hover:bg-fg hover:text-bg cursor-pointer mb-2"
-                >
-                    &lt; Back
-                </button>
-                <h2 class="font-bold mb-3">Delete Wallet</h2>
-                <p class="text-xs mb-3">
-                    Deleting
-                    <strong id="delete-wallet-name"></strong> is permanent. Any
-                    funds will be unrecoverable without your recovery phrase.
-                </p>
-                <div
-                    id="delete-wallet-flash"
-                    class="text-xs text-red-500 mb-2 hidden"
-                ></div>
-                <div class="mb-2">
-                    <label class="block mb-1">Password</label>
-                    <input
-                        type="password"
-                        id="delete-wallet-password"
-                        class="border border-border p-1 w-full font-mono text-sm bg-bg text-fg"
-                        placeholder="Enter your password to confirm"
-                    />
-                </div>
-                <button
-                    id="btn-delete-wallet-confirm"
-                    class="border border-border text-red-500 px-2 py-1 hover:bg-fg hover:text-bg cursor-pointer"
-                >
-                    Confirm Delete
-                </button>
-            </div>
-
-            <!-- ============ SETTINGS: ADD TOKEN ============ -->
-            <div id="view-settings-addtoken" class="view hidden">
-                <button
-                    id="btn-settings-addtoken-back"
-                    class="border border-border px-2 py-1 hover:bg-fg hover:text-bg cursor-pointer mb-2"
-                >
-                    &lt; Back
-                </button>
-                <h2 class="font-bold mb-2">Add Token</h2>
-                <p class="text-xs text-muted mb-3">
-                    Pick a common token or enter a contract address manually.
-                </p>
-
-                <!-- top 10 quick-pick buttons -->
-                <div class="mb-3">
-                    <label class="block mb-1 text-xs text-muted"
-                        >Top tokens:</label
-                    >
-                    <div
-                        id="settings-addtoken-top10"
-                        class="flex flex-wrap gap-1"
-                    ></div>
-                </div>
-
-                <!-- top 100 dropdown -->
-                <div class="mb-3">
-                    <label class="block mb-1 text-xs text-muted"
-                        >Or pick from top 100:</label
-                    >
-                    <select
-                        id="settings-addtoken-select"
-                        class="border border-border p-1 w-full font-mono text-sm bg-bg text-fg"
-                    >
-                        <option value="">-- select --</option>
-                    </select>
-                    <button
-                        id="btn-settings-addtoken-select"
-                        class="border border-border px-2 py-1 mt-1 hover:bg-fg hover:text-bg cursor-pointer"
-                    >
-                        Add selected
-                    </button>
-                </div>
-
-                <!-- manual contract address -->
-                <div class="mb-3">
-                    <label class="block mb-1 text-xs text-muted"
-                        >Or enter contract address:</label
-                    >
-                    <input
-                        type="text"
-                        id="settings-addtoken-address"
-                        class="border border-border p-1 w-full font-mono text-sm bg-bg text-fg"
-                        placeholder="0x..."
-                    />
-                    <div
-                        id="settings-addtoken-info"
-                        class="text-xs text-muted mt-1 hidden"
-                    ></div>
-                    <button
-                        id="btn-settings-addtoken-manual"
-                        class="border border-border px-2 py-1 mt-1 hover:bg-fg hover:text-bg cursor-pointer"
-                    >
-                        Add
-                    </button>
-                </div>
-            </div>
-
             <!-- ============ TRANSACTION DETAIL ============ -->
             <div id="view-transaction" class="view hidden">
                 <button
@@ -961,13 +832,7 @@
                 >
                     &lt; Back
                 </button>
-                <h2 id="tx-detail-heading" class="font-bold mb-2">
+                <h2 class="font-bold mb-2">Transaction</h2>
-                    Transaction
-                </h2>
-                <div id="tx-detail-type-section" class="mb-4 hidden">
-                    <div class="text-xs text-muted mb-1">Type</div>
-                    <div id="tx-detail-type" class="text-xs font-bold"></div>
-                </div>
                 <div class="mb-4">
                     <div class="text-xs text-muted mb-1">Status</div>
                     <div id="tx-detail-status" class="text-xs"></div>
@@ -992,33 +857,10 @@
                     <div class="text-xs text-muted mb-1">To</div>
                     <div id="tx-detail-to" class="text-xs break-all"></div>
                 </div>
-                <div id="tx-detail-calldata-section" class="mb-4 hidden">
-                    <div
-                        id="tx-detail-calldata-well"
-                        class="mb-3 border border-border border-dashed p-2"
-                    >
-                        <div class="text-xs text-muted mb-1">Action</div>
-                        <div
-                            id="tx-detail-calldata-action"
-                            class="text-xs font-bold mb-2"
-                        ></div>
-                        <div
-                            id="tx-detail-calldata-details"
-                            class="text-xs"
-                        ></div>
-                    </div>
-                </div>
                 <div class="mb-4">
                     <div class="text-xs text-muted mb-1">Transaction hash</div>
                     <div id="tx-detail-hash" class="text-xs break-all"></div>
                 </div>
-                <div id="tx-detail-rawdata-section" class="mb-4 hidden">
-                    <div class="text-xs text-muted mb-1">Raw data</div>
-                    <div
-                        id="tx-detail-rawdata"
-                        class="text-xs break-all font-mono border border-border border-dashed p-2"
-                    ></div>
-                </div>
             </div>
 
             <!-- ============ TRANSACTION APPROVAL ============ -->
@@ -1091,17 +933,6 @@
                     wants you to sign a message.
                 </p>
 
-                <div
-                    id="approve-sign-danger-warning"
-                    class="hidden mb-3 p-2 text-xs font-bold"
-                    style="
-                        background: #fee2e2;
-                        color: #991b1b;
-                        border: 2px solid #dc2626;
-                        border-radius: 6px;
-                    "
-                ></div>
-
                 <div class="mb-3">
                     <div class="text-xs text-muted mb-1">Type</div>
                     <div id="approve-sign-type" class="text-xs font-bold"></div>

src/popup/index.js

@@ -20,7 +20,6 @@ const transactionDetail = require("./views/transactionDetail");
 const receive = require("./views/receive");
 const addToken = require("./views/addToken");
 const settings = require("./views/settings");
-const settingsAddToken = require("./views/settingsAddToken");
 const approval = require("./views/approval");
 
 function renderWalletList() {
@@ -61,8 +60,6 @@ const ctx = {
     showConfirmTx: (txInfo) => confirmTx.show(txInfo),
     showReceive: () => receive.show(),
     showTransactionDetail: (tx) => transactionDetail.show(tx),
-    showSettingsView: () => settings.show(),
-    showSettingsAddTokenView: () => settingsAddToken.show(),
 };
 
 // Views that can be fully re-rendered from persisted state.
@@ -73,7 +70,6 @@ const RESTORABLE_VIEWS = new Set([
     "address-token",
     "receive",
     "settings",
-    "settings-addtoken",
     "transaction",
     "success-tx",
     "error-tx",
@@ -124,9 +120,6 @@ function restoreView() {
         case "settings":
             settings.show();
             break;
-        case "settings-addtoken":
-            settingsAddToken.show();
-            break;
         case "transaction":
             if (state.viewData && state.viewData.tx) {
                 transactionDetail.render();
@@ -189,7 +182,7 @@ async function init() {
     const params = new URLSearchParams(window.location.search);
     const approvalId = params.get("approval");
     if (approvalId) {
-        approval.show(approvalId);
+        approval.show(parseInt(approvalId, 10));
         showView("approve-site");
         return;
     }
@@ -219,7 +212,6 @@ async function init() {
     receive.init(ctx);
     addToken.init(ctx);
     settings.init(ctx);
-    settingsAddToken.init(ctx);
 
     if (!state.hasWallet) {
         showView("welcome");

src/popup/views/addWallet.js

@@ -1,15 +1,15 @@
 const { $, showView, showFlash } = require("./helpers");
 const {
-    generateMnemonic,
+    generateRecoveryPhrase,
-    hdWalletFromMnemonic,
+    hdWalletFromRecoveryPhrase,
-    isValidMnemonic,
+    isValidRecoveryPhrase,
 } = require("../../shared/wallet");
 const { encryptWithPassword } = require("../../shared/vault");
 const { state, saveState } = require("../../shared/state");
 const { scanForAddresses } = require("../../shared/balances");
 
 function show() {
-    $("wallet-mnemonic").value = "";
+    $("wallet-recovery-phrase").value = "";
     $("add-wallet-password").value = "";
     $("add-wallet-password-confirm").value = "";
     $("add-wallet-phrase-warning").classList.add("hidden");
@@ -18,19 +18,19 @@ function show() {
 
 function init(ctx) {
     $("btn-generate-phrase").addEventListener("click", () => {
-        $("wallet-mnemonic").value = generateMnemonic();
+        $("wallet-recovery-phrase").value = generateRecoveryPhrase();
         $("add-wallet-phrase-warning").classList.remove("hidden");
     });
 
     $("btn-add-wallet-confirm").addEventListener("click", async () => {
-        const mnemonic = $("wallet-mnemonic").value.trim();
+        const recoveryPhrase = $("wallet-recovery-phrase").value.trim();
-        if (!mnemonic) {
+        if (!recoveryPhrase) {
             showFlash(
                 "Enter a recovery phrase or press the die to generate one.",
             );
             return;
         }
-        const words = mnemonic.split(/\s+/);
+        const words = recoveryPhrase.split(/\s+/);
         if (words.length !== 12 && words.length !== 24) {
             showFlash(
                 "Recovery phrase must be 12 or 24 words. You entered " +
@@ -39,7 +39,7 @@ function init(ctx) {
             );
             return;
         }
-        if (!isValidMnemonic(mnemonic)) {
+        if (!isValidRecoveryPhrase(recoveryPhrase)) {
             showFlash("Invalid recovery phrase. Check for typos.");
             return;
         }
@@ -49,15 +49,16 @@ function init(ctx) {
             showFlash("Please choose a password.");
             return;
         }
-        if (pw.length < 12) {
+        if (pw.length < 8) {
-            showFlash("Password must be at least 12 characters.");
+            showFlash("Password must be at least 8 characters.");
             return;
         }
         if (pw !== pw2) {
             showFlash("Passwords do not match.");
             return;
         }
-        const { xpub, firstAddress } = hdWalletFromMnemonic(mnemonic);
+        const { xpub, firstAddress } =
+            hdWalletFromRecoveryPhrase(recoveryPhrase);
         const duplicate = state.wallets.find(
             (w) =>
                 w.type === "hd" &&
@@ -73,7 +74,7 @@ function init(ctx) {
             );
             return;
         }
-        const encrypted = await encryptWithPassword(mnemonic, pw);
+        const encrypted = await encryptWithPassword(recoveryPhrase, pw);
         const walletNum = state.wallets.length + 1;
         const wallet = {
             type: "hd",

src/popup/views/addressDetail.js

@@ -4,9 +4,10 @@ const {
     showFlash,
     balanceLinesForAddress,
     addressDotHtml,
-    addressTitle,
     escapeHtml,
     truncateMiddle,
+    isoDate,
+    timeAgo,
 } = require("./helpers");
 const { state, currentAddress, saveState } = require("../../shared/state");
 const { formatUsd, getAddressValueUsd } = require("../../shared/prices");
@@ -85,41 +86,6 @@ function show() {
     loadTransactions(addr.address);
 }
 
-function isoDate(timestamp) {
-    const d = new Date(timestamp * 1000);
-    const pad = (n) => String(n).padStart(2, "0");
-    return (
-        d.getFullYear() +
-        "-" +
-        pad(d.getMonth() + 1) +
-        "-" +
-        pad(d.getDate()) +
-        " " +
-        pad(d.getHours()) +
-        ":" +
-        pad(d.getMinutes()) +
-        ":" +
-        pad(d.getSeconds())
-    );
-}
-
-function timeAgo(timestamp) {
-    const seconds = Math.floor(Date.now() / 1000 - timestamp);
-    if (seconds < 60) return seconds + " seconds ago";
-    const minutes = Math.floor(seconds / 60);
-    if (minutes < 60)
-        return minutes + " minute" + (minutes !== 1 ? "s" : "") + " ago";
-    const hours = Math.floor(minutes / 60);
-    if (hours < 24) return hours + " hour" + (hours !== 1 ? "s" : "") + " ago";
-    const days = Math.floor(hours / 24);
-    if (days < 30) return days + " day" + (days !== 1 ? "s" : "") + " ago";
-    const months = Math.floor(days / 30);
-    if (months < 12)
-        return months + " month" + (months !== 1 ? "s" : "") + " ago";
-    const years = Math.floor(days / 365);
-    return years + " year" + (years !== 1 ? "s" : "") + " ago";
-}
-
 let loadedTxs = [];
 
 let ensNameMap = new Map();
@@ -151,11 +117,11 @@ async function loadTransactions(address) {
 
         loadedTxs = txs;
 
-        // Collect ALL unique addresses (from + to) for ENS resolution so
+        // Collect unique counterparty addresses for ENS resolution.
-        // that reverse lookups work for every displayed address, not just
-        // the ones that were originally entered as ENS names.
         const counterparties = [
-            ...new Set(txs.flatMap((tx) => [tx.from, tx.to].filter(Boolean))),
+            ...new Set(
+                txs.map((tx) => (tx.direction === "sent" ? tx.to : tx.from)),
+            ),
         ];
         if (counterparties.length > 0) {
             try {
@@ -186,23 +152,14 @@ function renderTransactions(txs) {
     let html = "";
     let i = 0;
     for (const tx of txs) {
-        // For swap transactions, show the user's own labelled wallet
+        const counterparty = tx.direction === "sent" ? tx.to : tx.from;
-        // address instead of the contract address (see issue #55).
-        const counterparty =
-            tx.direction === "contract" && tx.directionLabel === "Swap"
-                ? tx.from
-                : tx.direction === "sent" || tx.direction === "contract"
-                  ? tx.to
-                  : tx.from;
         const ensName = ensNameMap.get(counterparty) || null;
-        const title = addressTitle(counterparty, state.wallets);
         const dirLabel = tx.directionLabel;
         const amountStr = tx.value
             ? escapeHtml(tx.value + " " + tx.symbol)
             : escapeHtml(tx.symbol);
         const maxAddr = Math.max(32, 36 - Math.max(0, amountStr.length - 10));
-        const displayAddr =
+        const displayAddr = ensName || truncateMiddle(counterparty, maxAddr);
-            title || ensName || truncateMiddle(counterparty, maxAddr);
         const addrStr = escapeHtml(displayAddr);
         const dot = addressDotHtml(counterparty);
         const err = tx.isError ? " (failed)" : "";
@@ -210,7 +167,7 @@ function renderTransactions(txs) {
         const ago = escapeHtml(timeAgo(tx.timestamp));
         const iso = escapeHtml(isoDate(tx.timestamp));
         html += `<div class="tx-row py-2 border-b border-border-light text-xs cursor-pointer hover:bg-hover" data-tx="${i}" style="${opacity}">`;
-        html += `<div class="flex justify-between"><span class="text-muted" title="${iso}">${ago}</span><span>${dirLabel}${err}</span></div>`;
+        html += `<div class="flex justify-between"><span class="text-muted">${iso} (${ago})</span><span>${dirLabel}${err}</span></div>`;
         html += `<div class="flex justify-between"><span class="flex items-center">${dot}${addrStr}</span><span>${amountStr}</span></div>`;
         html += `</div>`;
         i++;

src/popup/views/addressToken.js

@@ -6,13 +6,13 @@ const {
     showView,
     showFlash,
     addressDotHtml,
-    addressTitle,
     escapeHtml,
     truncateMiddle,
     balanceLine,
+    isoDate,
+    timeAgo,
 } = require("./helpers");
 const { state, currentAddress, saveState } = require("../../shared/state");
-const { TOKEN_BY_ADDRESS, resolveSymbol } = require("../../shared/tokenList");
 const {
     formatUsd,
     getPrice,
@@ -40,41 +40,6 @@ function etherscanAddressLink(address) {
     return `https://etherscan.io/address/${address}`;
 }
 
-function isoDate(timestamp) {
-    const d = new Date(timestamp * 1000);
-    const pad = (n) => String(n).padStart(2, "0");
-    return (
-        d.getFullYear() +
-        "-" +
-        pad(d.getMonth() + 1) +
-        "-" +
-        pad(d.getDate()) +
-        " " +
-        pad(d.getHours()) +
-        ":" +
-        pad(d.getMinutes()) +
-        ":" +
-        pad(d.getSeconds())
-    );
-}
-
-function timeAgo(timestamp) {
-    const seconds = Math.floor(Date.now() / 1000 - timestamp);
-    if (seconds < 60) return seconds + " seconds ago";
-    const minutes = Math.floor(seconds / 60);
-    if (minutes < 60)
-        return minutes + " minute" + (minutes !== 1 ? "s" : "") + " ago";
-    const hours = Math.floor(minutes / 60);
-    if (hours < 24) return hours + " hour" + (hours !== 1 ? "s" : "") + " ago";
-    const days = Math.floor(hours / 24);
-    if (days < 30) return days + " day" + (days !== 1 ? "s" : "") + " ago";
-    const months = Math.floor(days / 30);
-    if (months < 12)
-        return months + " month" + (months !== 1 ? "s" : "") + " ago";
-    const years = Math.floor(days / 365);
-    return years + " year" + (years !== 1 ? "s" : "") + " ago";
-}
-
 let loadedTxs = [];
 let ensNameMap = new Map();
 let currentSymbol = null;
@@ -87,7 +52,6 @@ function show() {
 
     // Determine token symbol and balance
     let symbol, amount, price;
-    const knownToken = TOKEN_BY_ADDRESS.get(tokenId.toLowerCase());
     if (tokenId === "ETH") {
         symbol = "ETH";
         amount = parseFloat(addr.balance || "0");
@@ -96,11 +60,7 @@ function show() {
         const tb = (addr.tokenBalances || []).find(
             (t) => t.address.toLowerCase() === tokenId.toLowerCase(),
         );
-        symbol = resolveSymbol(
+        symbol = tb ? tb.symbol : "?";
-            tokenId,
-            addr.tokenBalances,
-            state.trackedTokens,
-        );
         amount = tb ? parseFloat(tb.balance || "0") : 0;
         price = getPrice(symbol);
     }
@@ -137,62 +97,6 @@ function show() {
     // Single token balance line (no tokenId — not clickable here)
     $("address-token-balance").innerHTML = balanceLine(symbol, amount, price);
 
-    // Token contract details (ERC-20 only)
-    const contractInfo = $("address-token-contract-info");
-    if (tokenId !== "ETH") {
-        const tb = (addr.tokenBalances || []).find(
-            (t) => t.address.toLowerCase() === tokenId.toLowerCase(),
-        );
-        const tracked = (state.trackedTokens || []).find(
-            (t) => t.address.toLowerCase() === tokenId.toLowerCase(),
-        );
-        const rawName =
-            (tb && tb.name) ||
-            (tracked && tracked.name) ||
-            (knownToken && knownToken.name) ||
-            null;
-        const rawSymbol =
-            (tb && tb.symbol) ||
-            (tracked && tracked.symbol) ||
-            (knownToken && knownToken.symbol) ||
-            null;
-        const tokenName = rawName ? escapeHtml(rawName) : null;
-        const tokenSymbol = rawSymbol ? escapeHtml(rawSymbol) : null;
-        const tokenDecimals =
-            tb && tb.decimals != null
-                ? tb.decimals
-                : tracked && tracked.decimals != null
-                  ? tracked.decimals
-                  : knownToken && knownToken.decimals != null
-                    ? knownToken.decimals
-                    : null;
-        const tokenHolders = tb && tb.holders != null ? tb.holders : null;
-        const dot = addressDotHtml(tokenId);
-        const tokenLink = `https://etherscan.io/token/${escapeHtml(tokenId)}`;
-        const projectUrl = knownToken && knownToken.url ? knownToken.url : null;
-        let infoHtml = `<div class="font-bold mb-2">Contract Address</div>`;
-        infoHtml +=
-            `<div class="flex items-center mb-2">${dot}` +
-            `<span class="break-all underline decoration-dashed cursor-pointer" id="address-token-contract-copy" data-copy="${escapeHtml(tokenId)}">${escapeHtml(tokenId)}</span>` +
-            `<a href="${tokenLink}" target="_blank" rel="noopener" class="inline-flex items-center">${EXT_ICON}</a>` +
-            `</div>`;
-        if (tokenName)
-            infoHtml += `<div class="mb-1"><span class="text-muted">Name:</span> ${tokenName}</div>`;
-        if (tokenSymbol)
-            infoHtml += `<div class="mb-1"><span class="text-muted">Symbol:</span> ${tokenSymbol}</div>`;
-        if (tokenDecimals != null)
-            infoHtml += `<div class="mb-1"><span class="text-muted">Decimals:</span> ${tokenDecimals}</div>`;
-        if (tokenHolders != null)
-            infoHtml += `<div class="mb-1"><span class="text-muted">Holders:</span> ${Number(tokenHolders).toLocaleString()}</div>`;
-        if (projectUrl)
-            infoHtml += `<div class="mb-1"><span class="text-muted">Website:</span> <a href="${escapeHtml(projectUrl)}" target="_blank" rel="noopener" class="underline decoration-dashed">${escapeHtml(projectUrl)}</a></div>`;
-        contractInfo.innerHTML = infoHtml;
-        contractInfo.classList.remove("hidden");
-    } else {
-        contractInfo.innerHTML = "";
-        contractInfo.classList.add("hidden");
-    }
-
     // Transactions
     $("address-token-tx-list").innerHTML =
         '<div class="text-muted text-xs py-1">Loading...</div>';
@@ -238,10 +142,11 @@ async function loadTransactions(address, tokenId) {
 
         loadedTxs = txs;
 
-        // Collect ALL unique addresses for ENS resolution so reverse
+        // Collect unique counterparty addresses for ENS resolution
-        // lookups work for every displayed address.
         const counterparties = [
-            ...new Set(txs.flatMap((tx) => [tx.from, tx.to].filter(Boolean))),
+            ...new Set(
+                txs.map((tx) => (tx.direction === "sent" ? tx.to : tx.from)),
+            ),
         ];
         if (counterparties.length > 0) {
             try {
@@ -274,14 +179,12 @@ function renderTransactions(txs) {
     for (const tx of txs) {
         const counterparty = tx.direction === "sent" ? tx.to : tx.from;
         const ensName = ensNameMap.get(counterparty) || null;
-        const title = addressTitle(counterparty, state.wallets);
         const dirLabel = tx.directionLabel;
         const amountStr = tx.value
             ? escapeHtml(tx.value + " " + tx.symbol)
             : escapeHtml(tx.symbol);
         const maxAddr = Math.max(32, 36 - Math.max(0, amountStr.length - 10));
-        const displayAddr =
+        const displayAddr = ensName || truncateMiddle(counterparty, maxAddr);
-            title || ensName || truncateMiddle(counterparty, maxAddr);
         const addrStr = escapeHtml(displayAddr);
         const dot = addressDotHtml(counterparty);
         const err = tx.isError ? " (failed)" : "";
@@ -289,7 +192,7 @@ function renderTransactions(txs) {
         const ago = escapeHtml(timeAgo(tx.timestamp));
         const iso = escapeHtml(isoDate(tx.timestamp));
         html += `<div class="tx-row py-2 border-b border-border-light text-xs cursor-pointer hover:bg-hover" data-tx="${i}" style="${opacity}">`;
-        html += `<div class="flex justify-between"><span class="text-muted" title="${iso}">${ago}</span><span>${dirLabel}${err}</span></div>`;
+        html += `<div class="flex justify-between"><span class="text-muted">${iso} (${ago})</span><span>${dirLabel}${err}</span></div>`;
         html += `<div class="flex justify-between"><span class="flex items-center">${dot}${addrStr}</span><span>${amountStr}</span></div>`;
         html += `</div>`;
         i++;
@@ -316,14 +219,6 @@ function init(_ctx) {
         }
     });
 
-    $("address-token-contract-info").addEventListener("click", (e) => {
-        const copyEl = e.target.closest("[data-copy]");
-        if (copyEl) {
-            navigator.clipboard.writeText(copyEl.dataset.copy);
-            showFlash("Copied!");
-        }
-    });
-
     $("btn-address-token-back").addEventListener("click", () => {
         ctx.showAddressDetail();
     });

src/popup/views/approval.js

@@ -1,10 +1,4 @@
-const {
+const { $, addressDotHtml, escapeHtml, showView } = require("./helpers");
-    $,
-    addressDotHtml,
-    addressTitle,
-    escapeHtml,
-    showView,
-} = require("./helpers");
 const { state, saveState } = require("../../shared/state");
 const { formatEther, formatUnits, Interface, toUtf8String } = require("ethers");
 const { ERC20_ABI } = require("../../shared/constants");
@@ -28,15 +22,7 @@ function approvalAddressHtml(address) {
     const dot = addressDotHtml(address);
     const link = `https://etherscan.io/address/${address}`;
     const extLink = `<a href="${link}" target="_blank" rel="noopener" class="inline-flex items-center">${EXT_ICON}</a>`;
-    const title = addressTitle(address, state.wallets);
+    return `<div class="flex items-center">${dot}<span class="break-all">${escapeHtml(address)}</span>${extLink}</div>`;
-    let html = "";
-    if (title) {
-        html += `<div class="flex items-center font-bold">${dot}${escapeHtml(title)}</div>`;
-        html += `<div class="break-all">${escapeHtml(address)}${extLink}</div>`;
-    } else {
-        html += `<div class="flex items-center">${dot}<span class="break-all">${escapeHtml(address)}</span>${extLink}</div>`;
-    }
-    return html;
 }
 
 function formatTxValue(val) {
@@ -78,12 +64,10 @@ function decodeCalldata(data, toAddress) {
                     "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
                 );
                 const isUnlimited = rawAmount === maxUint;
-                const amountRaw = isUnlimited
-                    ? "Unlimited"
-                    : formatTxValue(formatUnits(rawAmount, tokenDecimals));
                 const amountStr = isUnlimited
                     ? "Unlimited"
-                    : amountRaw + (tokenSymbol ? " " + tokenSymbol : "");
+                    : formatTxValue(formatUnits(rawAmount, tokenDecimals)) +
+                      (tokenSymbol ? " " + tokenSymbol : "");
 
                 return {
                     name: "Token Approval",
@@ -102,11 +86,7 @@ function decodeCalldata(data, toAddress) {
                             value: spender,
                             address: spender,
                         },
-                        {
+                        { label: "Amount", value: amountStr },
-                            label: "Amount",
-                            value: amountStr,
-                            rawValue: amountRaw,
-                        },
                     ],
                 };
             }
@@ -114,11 +94,9 @@ function decodeCalldata(data, toAddress) {
             if (parsed.name === "transfer") {
                 const to = parsed.args[0];
                 const rawAmount = parsed.args[1];
-                const amountRaw = formatTxValue(
-                    formatUnits(rawAmount, tokenDecimals),
-                );
                 const amountStr =
-                    amountRaw + (tokenSymbol ? " " + tokenSymbol : "");
+                    formatTxValue(formatUnits(rawAmount, tokenDecimals)) +
+                    (tokenSymbol ? " " + tokenSymbol : "");
 
                 return {
                     name: "Token Transfer",
@@ -133,11 +111,7 @@ function decodeCalldata(data, toAddress) {
                             isToken: true,
                         },
                         { label: "Recipient", value: to, address: to },
-                        {
+                        { label: "Amount", value: amountStr },
-                            label: "Amount",
-                            value: amountStr,
-                            rawValue: amountRaw,
-                        },
                     ],
                 };
             }
@@ -175,7 +149,7 @@ function showTxApproval(details) {
                 pendingTxDetails.to = d.address;
             }
             if (d.label === "Amount") {
-                pendingTxDetails.amount = d.rawValue || d.value;
+                pendingTxDetails.amount = d.value;
             }
         }
         if (token) {
@@ -184,15 +158,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-from").innerHTML = approvalAddressHtml(state.activeAddress);
 
@@ -329,18 +294,6 @@ function showSignApproval(details) {
         }
     }
 
-    // Display danger warning for eth_sign (raw hash signing)
-    const warningEl = $("approve-sign-danger-warning");
-    if (warningEl) {
-        if (sp.dangerWarning) {
-            warningEl.textContent = sp.dangerWarning;
-            warningEl.classList.remove("hidden");
-        } else {
-            warningEl.textContent = "";
-            warningEl.classList.add("hidden");
-        }
-    }
-
     $("approve-sign-password").value = "";
     $("approve-sign-error").classList.add("hidden");
     $("btn-approve-sign").disabled = false;
@@ -420,7 +373,6 @@ function init(ctx) {
                 type: "AUTISTMASK_TX_RESPONSE",
                 id: approvalId,
                 approved: true,
-                // TODO(security): Move decryption to popup to avoid sending password via runtime.sendMessage
                 password: password,
             },
             (response) => {
@@ -460,7 +412,6 @@ function init(ctx) {
                 type: "AUTISTMASK_SIGN_RESPONSE",
                 id: approvalId,
                 approved: true,
-                // TODO(security): Move decryption to popup to avoid sending password via runtime.sendMessage
                 password: password,
             },
             (response) => {
@@ -488,4 +439,4 @@ function init(ctx) {
     });
 }
 
-module.exports = { init, show, decodeCalldata };
+module.exports = { init, show };

src/popup/views/confirmTx.js

@@ -334,13 +334,8 @@ function init(ctx) {
                 tx = await contract.transfer(pendingTx.to, amount);
             }
 
-            // Best-effort: clear decrypted secret after use.
-            // Note: JS strings are immutable; this nulls the reference but
-            // the original string may persist in memory until GC.
-            decryptedSecret = null;
             txStatus.showWait(pendingTx, tx.hash);
         } catch (e) {
-            decryptedSecret = null;
             const hash = tx ? tx.hash : null;
             txStatus.showError(pendingTx, hash, e.shortMessage || e.message);
         }

src/popup/views/deleteWallet.js

@@ -1,90 +0,0 @@
-const { $, showView, showFlash } = require("./helpers");
-const { state, saveState } = require("../../shared/state");
-const { decryptWithPassword } = require("../../shared/vault");
-
-let deleteWalletIndex = null;
-let ctx = null;
-
-function show(walletIdx) {
-    deleteWalletIndex = walletIdx;
-    const wallet = state.wallets[walletIdx];
-    $("delete-wallet-name").textContent =
-        wallet.name || "Wallet " + (walletIdx + 1);
-    $("delete-wallet-password").value = "";
-    $("delete-wallet-flash").textContent = "";
-    $("delete-wallet-flash").classList.add("hidden");
-    showView("delete-wallet-confirm");
-}
-
-function init(_ctx) {
-    ctx = _ctx;
-
-    $("btn-delete-wallet-back").addEventListener("click", () => {
-        deleteWalletIndex = null;
-        ctx.showSettingsView();
-    });
-
-    $("btn-delete-wallet-confirm").addEventListener("click", async () => {
-        const pw = $("delete-wallet-password").value;
-        if (!pw) {
-            $("delete-wallet-flash").textContent =
-                "Please enter your password.";
-            $("delete-wallet-flash").classList.remove("hidden");
-            return;
-        }
-
-        if (deleteWalletIndex === null) {
-            $("delete-wallet-flash").textContent =
-                "No wallet selected for deletion.";
-            $("delete-wallet-flash").classList.remove("hidden");
-            return;
-        }
-
-        const walletIdx = deleteWalletIndex;
-        const wallet = state.wallets[walletIdx];
-
-        // Verify password against the wallet's encrypted data
-        try {
-            await decryptWithPassword(wallet.encryptedSecret, pw);
-        } catch (_e) {
-            $("delete-wallet-flash").textContent = "Wrong password.";
-            $("delete-wallet-flash").classList.remove("hidden");
-            return;
-        }
-
-        // Collect addresses to clean up from allowedSites/deniedSites
-        const addresses = (wallet.addresses || []).map((a) => a.address);
-
-        // Remove wallet
-        state.wallets.splice(walletIdx, 1);
-
-        // Clean up site permissions for deleted addresses
-        for (const addr of addresses) {
-            delete state.allowedSites[addr];
-            delete state.deniedSites[addr];
-        }
-
-        deleteWalletIndex = null;
-
-        if (state.wallets.length === 0) {
-            // No wallets left — reset selection and show welcome
-            state.selectedWallet = null;
-            state.selectedAddress = null;
-            state.activeAddress = null;
-            await saveState();
-            showView("welcome");
-        } else {
-            // Switch to first wallet if deleted wallet was active
-            state.selectedWallet = 0;
-            state.selectedAddress = 0;
-            state.activeAddress =
-                state.wallets[0].addresses[0]?.address || null;
-            await saveState();
-            ctx.renderWalletList();
-            ctx.showSettingsView();
-            showFlash("Wallet deleted.");
-        }
-    });
-}
-
-module.exports = { init, show };

src/popup/views/helpers.js

@@ -8,8 +8,6 @@ const {
 } = require("../../shared/prices");
 const { state, saveState } = require("../../shared/state");
 
-// When views are added, removed, or transitions between them change,
-// update the view-navigation documentation in README.md to match.
 const VIEWS = [
     "welcome",
     "add-wallet",
@@ -25,8 +23,6 @@ const VIEWS = [
     "receive",
     "add-token",
     "settings",
-    "delete-wallet-confirm",
-    "settings-addtoken",
     "transaction",
     "approve-site",
     "approve-tx",
@@ -86,7 +82,7 @@ function showFlash(msg, duration = 2000) {
 
 function balanceLine(symbol, amount, price, tokenId) {
     const qty = amount.toFixed(4);
-    const usd = price ? formatUsd(amount * price) || " " : " ";
+    const usd = price ? formatUsd(amount * price) : "";
     const tokenAttr = tokenId ? ` data-token="${tokenId}"` : "";
     const clickClass = tokenId
         ? " cursor-pointer hover:bg-hover balance-row"
@@ -97,7 +93,7 @@ function balanceLine(symbol, amount, price, tokenId) {
         `<span>${symbol}</span>` +
         `<span>${qty}</span>` +
         `</span>` +
-        `<span class="text-right text-muted flex-1">${usd}</span>` +
+        `<span class="text-right text-muted flex-1">${usd || "&nbsp;"}</span>` +
         `</div>`
     );
 }
@@ -151,6 +147,41 @@ function truncateMiddle(str, maxLen) {
     return str.slice(0, half) + "\u2026" + str.slice(-(maxLen - 1 - half));
 }
 
+function isoDate(timestamp) {
+    const d = new Date(timestamp * 1000);
+    const pad = (n) => String(n).padStart(2, "0");
+    return (
+        d.getFullYear() +
+        "-" +
+        pad(d.getMonth() + 1) +
+        "-" +
+        pad(d.getDate()) +
+        " " +
+        pad(d.getHours()) +
+        ":" +
+        pad(d.getMinutes()) +
+        ":" +
+        pad(d.getSeconds())
+    );
+}
+
+function timeAgo(timestamp) {
+    const seconds = Math.floor(Date.now() / 1000 - timestamp);
+    if (seconds < 60) return seconds + " seconds ago";
+    const minutes = Math.floor(seconds / 60);
+    if (minutes < 60)
+        return minutes + " minute" + (minutes !== 1 ? "s" : "") + " ago";
+    const hours = Math.floor(minutes / 60);
+    if (hours < 24) return hours + " hour" + (hours !== 1 ? "s" : "") + " ago";
+    const days = Math.floor(hours / 24);
+    if (days < 30) return days + " day" + (days !== 1 ? "s" : "") + " ago";
+    const months = Math.floor(days / 30);
+    if (months < 12)
+        return months + " month" + (months !== 1 ? "s" : "") + " ago";
+    const years = Math.floor(days / 365);
+    return years + " year" + (years !== 1 ? "s" : "") + " ago";
+}
+
 // 16 colors evenly spaced around the hue wheel (22.5° apart),
 // all at HSL saturation 70%, lightness 50% for uniform vibrancy.
 const ADDRESS_COLORS = [
@@ -223,41 +254,6 @@ function formatAddressHtml(address, ensName, maxLen, title) {
     return `<div class="flex items-center">${dot}<span class="break-all">${escapeHtml(displayAddr)}</span></div>`;
 }
 
-function isoDate(timestamp) {
-    const d = new Date(timestamp * 1000);
-    const pad = (n) => String(n).padStart(2, "0");
-    return (
-        d.getFullYear() +
-        "-" +
-        pad(d.getMonth() + 1) +
-        "-" +
-        pad(d.getDate()) +
-        " " +
-        pad(d.getHours()) +
-        ":" +
-        pad(d.getMinutes()) +
-        ":" +
-        pad(d.getSeconds())
-    );
-}
-
-function timeAgo(timestamp) {
-    const seconds = Math.floor(Date.now() / 1000 - timestamp);
-    if (seconds < 60) return seconds + " seconds ago";
-    const minutes = Math.floor(seconds / 60);
-    if (minutes < 60)
-        return minutes + " minute" + (minutes !== 1 ? "s" : "") + " ago";
-    const hours = Math.floor(minutes / 60);
-    if (hours < 24) return hours + " hour" + (hours !== 1 ? "s" : "") + " ago";
-    const days = Math.floor(hours / 24);
-    if (days < 30) return days + " day" + (days !== 1 ? "s" : "") + " ago";
-    const months = Math.floor(days / 30);
-    if (months < 12)
-        return months + " month" + (months !== 1 ? "s" : "") + " ago";
-    const years = Math.floor(days / 365);
-    return years + " year" + (years !== 1 ? "s" : "") + " ago";
-}
-
 module.exports = {
     $,
     showError,

src/popup/views/home.js

@@ -3,12 +3,11 @@ const {
     showView,
     showFlash,
     balanceLinesForAddress,
-    isoDate,
-    timeAgo,
     addressDotHtml,
-    addressTitle,
     escapeHtml,
     truncateMiddle,
+    isoDate,
+    timeAgo,
 } = require("./helpers");
 const { state, saveState, currentAddress } = require("../../shared/state");
 const { updateSendBalance, renderSendTokenSelect } = require("./send");
@@ -103,22 +102,13 @@ function renderHomeTxList(ctx) {
     let html = "";
     let i = 0;
     for (const tx of homeTxs) {
-        // For swap transactions, show the user's own labelled wallet
+        const counterparty = tx.direction === "sent" ? tx.to : tx.from;
-        // address (the one that initiated the swap) instead of the
-        // contract address which is not useful in the list view.
-        const counterparty =
-            tx.direction === "contract" && tx.directionLabel === "Swap"
-                ? tx.from
-                : tx.direction === "sent" || tx.direction === "contract"
-                  ? tx.to
-                  : tx.from;
         const dirLabel = tx.directionLabel;
         const amountStr = tx.value
             ? escapeHtml(tx.value + " " + tx.symbol)
             : escapeHtml(tx.symbol);
-        const title = addressTitle(counterparty, state.wallets);
         const maxAddr = Math.max(32, 36 - Math.max(0, amountStr.length - 10));
-        const displayAddr = title || truncateMiddle(counterparty, maxAddr);
+        const displayAddr = truncateMiddle(counterparty, maxAddr);
         const addrStr = escapeHtml(displayAddr);
         const dot = addressDotHtml(counterparty);
         const err = tx.isError ? " (failed)" : "";
@@ -126,7 +116,7 @@ function renderHomeTxList(ctx) {
         const ago = escapeHtml(timeAgo(tx.timestamp));
         const iso = escapeHtml(isoDate(tx.timestamp));
         html += `<div class="home-tx-row py-2 border-b border-border-light text-xs cursor-pointer hover:bg-hover" data-tx="${i}" style="${opacity}">`;
-        html += `<div class="flex justify-between"><span class="text-muted" title="${iso}">${ago}</span><span>${dirLabel}${err}</span></div>`;
+        html += `<div class="flex justify-between"><span class="text-muted">${iso} (${ago})</span><span>${dirLabel}${err}</span></div>`;
         html += `<div class="flex justify-between"><span class="flex items-center">${dot}${addrStr}</span><span>${amountStr}</span></div>`;
         html += `</div>`;
         i++;

src/popup/views/importKey.js

@@ -30,8 +30,8 @@ function init(ctx) {
             showFlash("Please choose a password.");
             return;
         }
-        if (pw.length < 12) {
+        if (pw.length < 8) {
-            showFlash("Password must be at least 12 characters.");
+            showFlash("Password must be at least 8 characters.");
             return;
         }
         if (pw !== pw2) {

src/popup/views/receive.js

@@ -1,10 +1,4 @@
-const {
+const { $, showView, showFlash, addressDotHtml } = require("./helpers");
-    $,
-    showView,
-    showFlash,
-    addressDotHtml,
-    escapeHtml,
-} = require("./helpers");
 const { state, currentAddress } = require("../../shared/state");
 const QRCode = require("qrcode");
 
@@ -18,17 +12,8 @@ const EXT_ICON =
 function show() {
     const addr = currentAddress();
     const address = addr ? addr.address : "";
-    $("receive-address-dot").innerHTML = address ? addressDotHtml(address) : "";
+    $("receive-dot").innerHTML = address ? addressDotHtml(address) : "";
-    $("receive-address-full").textContent = address;
+    $("receive-address").textContent = address;
-    $("receive-address-full").dataset.full = address;
-    const ensName = addr ? addr.ensName || null : null;
-    const ensEl = $("receive-ens");
-    if (ensName) {
-        ensEl.innerHTML = addressDotHtml(address) + escapeHtml(ensName);
-        ensEl.classList.remove("hidden");
-    } else {
-        ensEl.classList.add("hidden");
-    }
     const link = address ? `https://etherscan.io/address/${address}` : "";
     $("receive-etherscan-link").innerHTML = link
         ? `<a href="${link}" target="_blank" rel="noopener" class="inline-flex items-center">${EXT_ICON}</a>`
@@ -65,16 +50,8 @@ function show() {
 }
 
 function init(ctx) {
-    $("receive-address-full").addEventListener("click", () => {
-        const addr = $("receive-address-full").dataset.full;
-        if (addr) {
-            navigator.clipboard.writeText(addr);
-            showFlash("Copied!");
-        }
-    });
-
     $("btn-receive-copy").addEventListener("click", () => {
-        const addr = $("receive-address-full").dataset.full;
+        const addr = $("receive-address").textContent;
         if (addr) {
             navigator.clipboard.writeText(addr);
             showFlash("Copied!");

src/popup/views/send.js

@@ -1,16 +1,10 @@
 // Send view: collect To, Amount, Token. Then go to confirmation.
 
-const {
+const { $, showFlash, addressDotHtml, escapeHtml } = require("./helpers");
-    $,
-    showFlash,
-    addressDotHtml,
-    addressTitle,
-    escapeHtml,
-} = require("./helpers");
 const { state, currentAddress } = require("../../shared/state");
 let ctx;
 const { getProvider } = require("../../shared/balances");
-const { KNOWN_SYMBOLS, resolveSymbol } = require("../../shared/tokenList");
+const { KNOWN_SYMBOLS } = require("../../shared/tokenList");
 
 const EXT_ICON =
     `<span style="display:inline-block;width:10px;height:10px;margin-left:4px;vertical-align:middle">` +
@@ -50,15 +44,8 @@ function updateSendBalance() {
     const dot = addressDotHtml(addr.address);
     const link = `https://etherscan.io/address/${addr.address}`;
     const extLink = `<a href="${link}" target="_blank" rel="noopener" class="inline-flex items-center">${EXT_ICON}</a>`;
-    const title = addressTitle(addr.address, state.wallets);
     let fromHtml = "";
-    if (title) {
+    if (addr.ensName) {
-        fromHtml += `<div class="flex items-center font-bold">${dot}${escapeHtml(title)}</div>`;
-        if (addr.ensName) {
-            fromHtml += `<div>${escapeHtml(addr.ensName)}</div>`;
-        }
-        fromHtml += `<div class="break-all">${escapeHtml(addr.address)}${extLink}</div>`;
-    } else if (addr.ensName) {
         fromHtml += `<div class="flex items-center font-bold">${dot}${escapeHtml(addr.ensName)}</div>`;
         fromHtml += `<div class="break-all">${escapeHtml(addr.address)}${extLink}</div>`;
     } else {
@@ -73,11 +60,7 @@ function updateSendBalance() {
         const tb = (addr.tokenBalances || []).find(
             (t) => t.address.toLowerCase() === token.toLowerCase(),
         );
-        const symbol = resolveSymbol(
+        const symbol = tb ? tb.symbol : "?";
-            token,
-            addr.tokenBalances,
-            state.trackedTokens,
-        );
         const bal = tb ? tb.balance || "0" : "0";
         $("send-balance").textContent =
             "Current balance: " + bal + " " + symbol;
@@ -128,11 +111,7 @@ function init(_ctx) {
             const tb = (addr.tokenBalances || []).find(
                 (t) => t.address.toLowerCase() === token.toLowerCase(),
             );
-            tokenSymbol = resolveSymbol(
+            tokenSymbol = tb ? tb.symbol : "?";
-                token,
-                addr.tokenBalances,
-                state.trackedTokens,
-            );
             tokenBalance = tb ? tb.balance || "0" : "0";
         }
 

src/popup/views/settings.js

@@ -1,8 +1,7 @@
-const { $, showView, showFlash, escapeHtml } = require("./helpers");
+const { $, showView, showFlash } = require("./helpers");
 const { state, saveState } = require("../../shared/state");
 const { ETHEREUM_MAINNET_CHAIN_ID } = require("../../shared/constants");
 const { log, debugFetch } = require("../../shared/log");
-const deleteWallet = require("./deleteWallet");
 
 const runtime =
     typeof browser !== "undefined" ? browser.runtime : chrome.runtime;
@@ -39,95 +38,10 @@ function renderSiteList(containerId, siteMap, stateKey) {
     });
 }
 
-function renderTrackedTokens() {
-    const container = $("settings-tracked-tokens");
-    if (state.trackedTokens.length === 0) {
-        container.innerHTML = '<p class="text-xs text-muted">None</p>';
-        return;
-    }
-    let html = "";
-    state.trackedTokens.forEach((token, idx) => {
-        const label = token.name
-            ? escapeHtml(token.name) + " (" + escapeHtml(token.symbol) + ")"
-            : escapeHtml(token.symbol);
-        html += `<div class="flex justify-between items-center text-xs py-1 border-b border-border-light">`;
-        html += `<span>${label}</span>`;
-        html += `<button class="btn-remove-token border border-border px-1 hover:bg-fg hover:text-bg cursor-pointer" data-idx="${idx}">[x]</button>`;
-        html += `</div>`;
-    });
-    container.innerHTML = html;
-    container.querySelectorAll(".btn-remove-token").forEach((btn) => {
-        btn.addEventListener("click", async () => {
-            const idx = parseInt(btn.dataset.idx, 10);
-            state.trackedTokens.splice(idx, 1);
-            await saveState();
-            renderTrackedTokens();
-        });
-    });
-}
-
-function renderWalletListSettings() {
-    const container = $("settings-wallet-list");
-    if (state.wallets.length === 0) {
-        container.innerHTML = '<p class="text-xs text-muted">No wallets.</p>';
-        return;
-    }
-    let html = "";
-    state.wallets.forEach((wallet, idx) => {
-        const name = escapeHtml(wallet.name || "Wallet " + (idx + 1));
-        html += `<div class="flex justify-between items-center text-xs py-1 border-b border-border-light">`;
-        html += `<span class="settings-wallet-name cursor-pointer underline decoration-dashed" data-idx="${idx}">${name}</span>`;
-        html += `<button class="btn-delete-wallet border border-border px-1 hover:bg-fg hover:text-bg cursor-pointer" data-idx="${idx}">[x]</button>`;
-        html += `</div>`;
-    });
-    container.innerHTML = html;
-    container.querySelectorAll(".btn-delete-wallet").forEach((btn) => {
-        btn.addEventListener("click", () => {
-            const idx = parseInt(btn.dataset.idx, 10);
-            deleteWallet.show(idx);
-        });
-    });
-
-    // Inline rename on click
-    container.querySelectorAll(".settings-wallet-name").forEach((span) => {
-        span.addEventListener("click", () => {
-            const idx = parseInt(span.dataset.idx, 10);
-            const wallet = state.wallets[idx];
-            const input = document.createElement("input");
-            input.type = "text";
-            input.className =
-                "border border-border p-0 text-xs bg-bg text-fg w-full";
-            input.value = wallet.name || "Wallet " + (idx + 1);
-            span.replaceWith(input);
-            input.focus();
-            input.select();
-            const finish = async () => {
-                const val = input.value.trim();
-                if (val && val !== wallet.name) {
-                    wallet.name = val;
-                    await saveState();
-                }
-                renderWalletListSettings();
-            };
-            input.addEventListener("blur", finish);
-            input.addEventListener("keydown", (e) => {
-                if (e.key === "Enter") input.blur();
-                if (e.key === "Escape") {
-                    input.value = wallet.name || "Wallet " + (idx + 1);
-                    input.blur();
-                }
-            });
-        });
-    });
-}
-
 function show() {
     $("settings-rpc").value = state.rpcUrl;
     $("settings-blockscout").value = state.blockscoutUrl;
-    renderTrackedTokens();
     renderSiteLists();
-    renderWalletListSettings();
-
     showView("settings");
 }
 
@@ -141,8 +55,6 @@ function renderSiteLists() {
 }
 
 function init(ctx) {
-    deleteWallet.init(ctx);
-
     $("btn-save-rpc").addEventListener("click", async () => {
         const url = $("settings-rpc").value.trim();
         if (!url) {
@@ -243,11 +155,6 @@ function init(ctx) {
 
     $("btn-main-add-wallet").addEventListener("click", ctx.showAddWalletView);
 
-    $("btn-settings-add-token").addEventListener(
-        "click",
-        ctx.showSettingsAddTokenView,
-    );
-
     $("btn-settings-back").addEventListener("click", () => {
         ctx.renderWalletList();
         showView("main");

src/popup/views/settingsAddToken.js

@@ -1,159 +0,0 @@
-const { $, showView, showFlash } = require("./helpers");
-const { getTopTokens } = require("../../shared/tokenList");
-const { state, saveState } = require("../../shared/state");
-const { lookupTokenInfo } = require("../../shared/balances");
-const { isScamAddress } = require("../../shared/scamlist");
-const { log } = require("../../shared/log");
-
-let ctx;
-
-function isTracked(address) {
-    const lower = address.toLowerCase();
-    return state.trackedTokens.some((t) => t.address.toLowerCase() === lower);
-}
-
-function tokenLabel(t) {
-    return t.name ? t.name + " (" + t.symbol + ")" : t.symbol;
-}
-
-function renderTop10() {
-    const el = $("settings-addtoken-top10");
-    el.innerHTML = getTopTokens(10)
-        .map((t) => {
-            const tracked = isTracked(t.address);
-            const cls = tracked
-                ? "border border-border px-1 text-xs opacity-40 cursor-default"
-                : "border border-border px-1 hover:bg-fg hover:text-bg cursor-pointer text-xs";
-            return (
-                `<button class="settings-addtoken-quick ${cls}"` +
-                ` data-address="${t.address}"` +
-                ` data-symbol="${t.symbol}"` +
-                ` data-decimals="${t.decimals}"` +
-                ` data-name="${(t.name || "").replace(/"/g, "&quot;")}"` +
-                `${tracked ? " disabled" : ""}>${t.symbol}</button>`
-            );
-        })
-        .join("");
-    el.querySelectorAll(".settings-addtoken-quick:not([disabled])").forEach(
-        (btn) => {
-            btn.addEventListener("click", async () => {
-                const token = {
-                    address: btn.dataset.address,
-                    symbol: btn.dataset.symbol,
-                    decimals: parseInt(btn.dataset.decimals, 10),
-                    name: btn.dataset.name || btn.dataset.symbol,
-                };
-                state.trackedTokens.push(token);
-                await saveState();
-                showFlash("Added " + token.symbol);
-                renderTop10();
-                renderDropdown();
-                ctx.doRefreshAndRender();
-            });
-        },
-    );
-}
-
-function renderDropdown() {
-    const sel = $("settings-addtoken-select");
-    const tokens = getTopTokens(100);
-    let html = '<option value="">-- select --</option>';
-    for (const t of tokens) {
-        const tracked = isTracked(t.address);
-        const label = tokenLabel(t) + (tracked ? " (tracked)" : "");
-        html +=
-            `<option value="${t.address}"` +
-            ` data-symbol="${t.symbol}"` +
-            ` data-decimals="${t.decimals}"` +
-            ` data-name="${(t.name || "").replace(/"/g, "&quot;")}"` +
-            `${tracked ? " disabled" : ""}>${label}</option>`;
-    }
-    sel.innerHTML = html;
-}
-
-function show() {
-    $("settings-addtoken-address").value = "";
-    $("settings-addtoken-info").classList.add("hidden");
-    renderTop10();
-    renderDropdown();
-    showView("settings-addtoken");
-}
-
-function init(_ctx) {
-    ctx = _ctx;
-
-    $("btn-settings-addtoken-back").addEventListener("click", () => {
-        ctx.showSettingsView();
-    });
-
-    $("btn-settings-addtoken-select").addEventListener("click", async () => {
-        const sel = $("settings-addtoken-select");
-        const opt = sel.options[sel.selectedIndex];
-        if (!opt || !opt.value) {
-            showFlash("Please select a token.");
-            return;
-        }
-        if (isTracked(opt.value)) {
-            showFlash("Already tracked.");
-            return;
-        }
-        const token = {
-            address: opt.value,
-            symbol: opt.dataset.symbol,
-            decimals: parseInt(opt.dataset.decimals, 10),
-            name: opt.dataset.name || opt.dataset.symbol,
-        };
-        state.trackedTokens.push(token);
-        await saveState();
-        showFlash("Added " + token.symbol);
-        renderTop10();
-        renderDropdown();
-        ctx.doRefreshAndRender();
-    });
-
-    $("btn-settings-addtoken-manual").addEventListener("click", async () => {
-        const addr = $("settings-addtoken-address").value.trim();
-        if (!addr || !addr.startsWith("0x")) {
-            showFlash(
-                "Please enter a valid contract address starting with 0x.",
-            );
-            return;
-        }
-        if (isTracked(addr)) {
-            showFlash("Already tracked.");
-            return;
-        }
-        if (isScamAddress(addr)) {
-            showFlash("This address is on a known scam/fraud list.");
-            return;
-        }
-        const infoEl = $("settings-addtoken-info");
-        infoEl.textContent = "Looking up token...";
-        infoEl.classList.remove("hidden");
-        log.debugf("Looking up token contract", addr);
-        try {
-            const info = await lookupTokenInfo(addr, state.rpcUrl);
-            log.infof("Adding token", info.symbol, addr);
-            state.trackedTokens.push({
-                address: addr,
-                symbol: info.symbol,
-                decimals: info.decimals,
-                name: info.name,
-            });
-            await saveState();
-            showFlash("Added " + info.symbol);
-            $("settings-addtoken-address").value = "";
-            infoEl.classList.add("hidden");
-            renderTop10();
-            renderDropdown();
-            ctx.doRefreshAndRender();
-        } catch (e) {
-            const detail = e.shortMessage || e.message || String(e);
-            log.errorf("Token lookup failed for", addr, detail);
-            showFlash(detail);
-            infoEl.classList.add("hidden");
-        }
-    });
-}
-
-module.exports = { init, show };

src/popup/views/transactionDetail.js

@@ -13,8 +13,6 @@ const {
 } = require("./helpers");
 const { state } = require("../../shared/state");
 const makeBlockie = require("ethereum-blockies-base64");
-const { log, debugFetch } = require("../../shared/log");
-const { decodeCalldata } = require("./approval");
 
 const EXT_ICON =
     `<span style="display:inline-block;width:10px;height:10px;margin-left:4px;vertical-align:middle">` +
@@ -37,35 +35,27 @@ function blockieHtml(address) {
     return `<img src="${src}" width="48" height="48" style="image-rendering:pixelated;border-radius:50%;display:inline-block">`;
 }
 
-function etherscanLinkHtml(url) {
-    return (
-        `<a href="${url}" target="_blank" rel="noopener" ` +
-        `class="inline-flex items-center"` +
-        `>${EXT_ICON}</a>`
-    );
-}
-
 function txAddressHtml(address, ensName, title) {
     const blockie = blockieHtml(address);
     const dot = addressDotHtml(address);
     const link = `https://etherscan.io/address/${address}`;
-    const extLink = etherscanLinkHtml(link);
+    const extLink = `<a href="${link}" target="_blank" rel="noopener" class="inline-flex items-center">${EXT_ICON}</a>`;
     let html = `<div class="mb-1">${blockie}</div>`;
     if (title) {
-        html += `<div class="font-bold">${escapeHtml(title)}</div>`;
+        html += `<div class="flex items-center font-bold">${dot}${escapeHtml(title)}</div>`;
     }
     if (ensName) {
         html +=
-            `<div class="flex items-center">${dot}` +
+            `<div class="flex items-center">${title ? "" : dot}` +
             copyableHtml(ensName, "") +
-            `</div>` +
-            `<div class="flex items-center">${dot}` +
-            copyableHtml(address, "break-all") +
             extLink +
+            `</div>` +
+            `<div class="break-all">` +
+            copyableHtml(address, "break-all") +
             `</div>`;
     } else {
         html +=
-            `<div class="flex items-center">${dot}` +
+            `<div class="flex items-center">${title ? "" : dot}` +
             copyableHtml(address, "break-all") +
             extLink +
             `</div>`;
@@ -75,7 +65,7 @@ function txAddressHtml(address, ensName, title) {
 
 function txHashHtml(hash) {
     const link = `https://etherscan.io/tx/${hash}`;
-    const extLink = etherscanLinkHtml(link);
+    const extLink = `<a href="${link}" target="_blank" rel="noopener" class="inline-flex items-center">${EXT_ICON}</a>`;
     return copyableHtml(hash, "break-all") + extLink;
 }
 
@@ -95,9 +85,6 @@ function show(tx) {
             fromEns: tx.fromEns || null,
             toEns: tx.toEns || null,
             directionLabel: tx.directionLabel || null,
-            direction: tx.direction || null,
-            isContractCall: tx.isContractCall || false,
-            method: tx.method || null,
         },
     };
     render();
@@ -134,30 +121,6 @@ function render() {
         nativeEl.parentElement.classList.add("hidden");
     }
 
-    // Show type label for contract interactions (Swap, Execute, etc.)
-    const typeSection = $("tx-detail-type-section");
-    const typeEl = $("tx-detail-type");
-    const headingEl = $("tx-detail-heading");
-    if (tx.direction === "contract" && tx.directionLabel) {
-        if (typeSection) {
-            typeEl.textContent = tx.directionLabel;
-            typeSection.classList.remove("hidden");
-        }
-    } else {
-        if (typeSection) typeSection.classList.add("hidden");
-    }
-    if (headingEl) headingEl.textContent = "Transaction";
-
-    // Hide calldata and raw data sections; re-fetch if this is a contract call
-    const calldataSection = $("tx-detail-calldata-section");
-    if (calldataSection) calldataSection.classList.add("hidden");
-    const rawDataSection = $("tx-detail-rawdata-section");
-    if (rawDataSection) rawDataSection.classList.add("hidden");
-
-    if (tx.isContractCall || tx.direction === "contract") {
-        loadCalldata(tx.hash, tx.to);
-    }
-
     $("tx-detail-time").textContent =
         isoDate(tx.timestamp) + " (" + timeAgo(tx.timestamp) + ")";
     $("tx-detail-status").textContent = tx.isError ? "Failed" : "Success";
@@ -174,87 +137,6 @@ function render() {
         });
 }
 
-async function loadCalldata(txHash, toAddress) {
-    const section = $("tx-detail-calldata-section");
-    const actionEl = $("tx-detail-calldata-action");
-    const detailsEl = $("tx-detail-calldata-details");
-    const wellEl = $("tx-detail-calldata-well");
-    const rawSection = $("tx-detail-rawdata-section");
-    const rawEl = $("tx-detail-rawdata");
-    if (!section || !actionEl || !detailsEl) return;
-
-    try {
-        const resp = await debugFetch(
-            state.blockscoutUrl + "/transactions/" + txHash,
-        );
-        if (!resp.ok) return;
-        const txData = await resp.json();
-        const inputData = txData.raw_input || txData.input || null;
-        if (!inputData || inputData === "0x") return;
-
-        const decoded = decodeCalldata(inputData, toAddress || "");
-        if (decoded) {
-            // Render decoded calldata matching approval view style
-            actionEl.textContent = decoded.name;
-            let detailsHtml = "";
-            if (decoded.description) {
-                detailsHtml += `<div class="mb-2">${escapeHtml(decoded.description)}</div>`;
-            }
-            for (const d of decoded.details || []) {
-                detailsHtml += `<div class="mb-2">`;
-                detailsHtml += `<div class="text-muted">${escapeHtml(d.label)}</div>`;
-                if (d.address && d.isToken) {
-                    // Token entry: show symbol on its own line, then dot + address + Etherscan link
-                    const dot = addressDotHtml(d.address);
-                    const tokenSymbol = d.value.match(/^(\S+)\s*\(/)?.[1];
-                    if (tokenSymbol) {
-                        detailsHtml += `<div class="font-bold">${escapeHtml(tokenSymbol)}</div>`;
-                    }
-                    const etherscanUrl = `https://etherscan.io/token/${d.address}`;
-                    detailsHtml += `<div class="flex items-center">${dot}${copyableHtml(d.address, "break-all")}${etherscanLinkHtml(etherscanUrl)}</div>`;
-                } else if (d.address) {
-                    // Protocol/contract entry: show name + Etherscan link
-                    const dot = addressDotHtml(d.address);
-                    const etherscanUrl = `https://etherscan.io/address/${d.address}`;
-                    detailsHtml += `<div class="flex items-center">${dot}${copyableHtml(d.value, "break-all")}${etherscanLinkHtml(etherscanUrl)}</div>`;
-                } else {
-                    detailsHtml += `<div class="font-bold">${escapeHtml(d.value)}</div>`;
-                }
-                detailsHtml += `</div>`;
-            }
-            detailsEl.innerHTML = detailsHtml;
-            if (wellEl) wellEl.classList.remove("hidden");
-        } else {
-            // Unknown contract call — show method name in well
-            const method = txData.method || "Unknown contract call";
-            actionEl.textContent = method;
-            detailsEl.innerHTML = "";
-            if (wellEl) wellEl.classList.remove("hidden");
-        }
-
-        // Always show raw data
-        if (rawSection && rawEl) {
-            rawEl.innerHTML = copyableHtml(inputData, "break-all");
-            rawSection.classList.remove("hidden");
-        }
-
-        section.classList.remove("hidden");
-
-        // Bind copy handlers for new elements (including raw data now outside section)
-        const copyTargets = [section, rawSection].filter(Boolean);
-        for (const container of copyTargets) {
-            container.querySelectorAll("[data-copy]").forEach((el) => {
-                el.onclick = () => {
-                    navigator.clipboard.writeText(el.dataset.copy);
-                    showFlash("Copied!");
-                };
-            });
-        }
-    } catch (e) {
-        log.errorf("loadCalldata failed:", e.message);
-    }
-}
-
 function init(_ctx) {
     ctx = _ctx;
     $("btn-tx-back").addEventListener("click", () => {

src/popup/views/txStatus.js

@@ -5,10 +5,8 @@ const {
     showView,
     showFlash,
     addressDotHtml,
-    addressTitle,
     escapeHtml,
 } = require("./helpers");
-const { TOKEN_BY_ADDRESS } = require("../../shared/tokenList");
 const { state, saveState } = require("../../shared/state");
 const { getProvider } = require("../../shared/balances");
 const { log } = require("../../shared/log");
@@ -39,13 +37,6 @@ function toAddressHtml(address) {
     const dot = addressDotHtml(address);
     const link = `https://etherscan.io/address/${address}`;
     const extLink = `<a href="${link}" target="_blank" rel="noopener" class="inline-flex items-center">${EXT_ICON}</a>`;
-    const title = addressTitle(address, state.wallets);
-    if (title) {
-        return (
-            `<div class="flex items-center font-bold">${dot}${escapeHtml(title)}</div>` +
-            `<div class="break-all">${escapeHtml(address)}${extLink}</div>`
-        );
-    }
     return `<div class="flex items-center">${dot}<span class="break-all">${escapeHtml(address)}</span>${extLink}</div>`;
 }
 
@@ -122,51 +113,11 @@ function showSuccess(txInfo, txHash, blockNumber) {
         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 `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() {
     const d = state.viewData;
     if (!d || !d.hash) return;
@@ -174,16 +125,6 @@ function renderSuccess() {
     $("success-tx-to").innerHTML = toAddressHtml(d.to);
     $("success-tx-block").textContent = String(d.blockNumber);
     $("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");
     showView("success-tx");
 }

src/shared/balances.js

@@ -85,7 +85,6 @@ async function fetchTokenBalances(address, blockscoutUrl, trackedTokens) {
 
             balances.push({
                 address: item.token.address_hash,
-                name: item.token.name || "",
                 symbol: item.token.symbol || "???",
                 decimals: decimals,
                 balance: bal,
@@ -124,27 +123,15 @@ async function refreshBalances(wallets, rpcUrl, blockscoutUrl, trackedTokens) {
                     }),
             );
 
-            // ENS reverse lookup — only overwrite on success so that
+            // ENS reverse lookup
-            // transient RPC errors don't wipe a previously resolved name.
             updates.push(
                 provider
                     .lookupAddress(addr.address)
                     .then((name) => {
                         addr.ensName = name || null;
-                        log.debugf(
-                            "ENS reverse",
-                            addr.address,
-                            "->",
-                            addr.ensName,
-                        );
                     })
-                    .catch((e) => {
+                    .catch(() => {
-                        log.errorf(
+                        addr.ensName = null;
-                            "ENS reverse failed",
-                            addr.address,
-                            e.message,
-                        );
-                        // Keep existing addr.ensName if we had one
                     }),
             );
 
@@ -205,10 +192,6 @@ async function lookupTokenInfo(contractAddress, rpcUrl) {
         name = symbol;
     }
 
-    // Truncate to prevent storage of excessively long values from RPC
-    name = String(name).slice(0, 64);
-    symbol = String(symbol).slice(0, 12);
-
     log.infof("Token resolved:", symbol, "decimals", Number(decimals));
     return { name, symbol, decimals: Number(decimals) };
 }

src/shared/constants.js

@@ -1,5 +1,5 @@
 const DEBUG = true;
-const DEBUG_MNEMONIC =
+const DEBUG_RECOVERY_PHRASE =
     "cube evolve unfold result inch risk jealous skill hotel bulb night wreck";
 
 const ETHEREUM_MAINNET_CHAIN_ID = "0x1";
@@ -22,7 +22,7 @@ const ERC20_ABI = [
 
 module.exports = {
     DEBUG,
-    DEBUG_MNEMONIC,
+    DEBUG_RECOVERY_PHRASE,
     ETHEREUM_MAINNET_CHAIN_ID,
     DEFAULT_RPC_URL,
     DEFAULT_BLOCKSCOUT_URL,

src/shared/ens.js

@@ -39,7 +39,7 @@ async function resolveEnsName(address, rpcUrl) {
         return name;
     } catch (e) {
         log.errorf("ENS reverse lookup failed", address, e.message);
-        // Don't cache failures — let subsequent lookups retry
+        setCache(address, null);
         return null;
     }
 }

src/shared/log.js

@@ -1,10 +1,8 @@
 // Leveled logger. Outputs to console with [AutistMask] prefix.
 // Level is DEBUG when the DEBUG constant is true, INFO otherwise.
 
-const { DEBUG } = require("./constants");
-
 const LEVELS = { debug: 0, info: 1, warn: 2, error: 3 };
-const threshold = DEBUG ? LEVELS.debug : LEVELS.info;
+const threshold = LEVELS.info;
 
 function emit(level, method, args) {
     if (LEVELS[level] >= threshold) {

src/shared/transactions.js

@@ -37,21 +37,7 @@ function parseTx(tx, addrLower) {
         if (token) {
             symbol = token.symbol;
         }
-        // Map known DEX methods to "Swap" for cleaner display
+        const label = method.charAt(0).toUpperCase() + method.slice(1);
-        const SWAP_METHODS = new Set([
-            "execute",
-            "swap",
-            "swapExactTokensForTokens",
-            "swapTokensForExactTokens",
-            "swapExactETHForTokens",
-            "swapTokensForExactETH",
-            "swapExactTokensForETH",
-            "swapETHForExactTokens",
-            "multicall",
-        ]);
-        const label = SWAP_METHODS.has(method)
-            ? "Swap"
-            : method.charAt(0).toUpperCase() + method.slice(1);
         direction = "contract";
         directionLabel = label;
         value = "";
@@ -153,18 +139,9 @@ 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. Replace the normal tx with the token transfer.
-    // but preserve contract call metadata (direction, label, method) so
-    // swaps and other contract interactions display correctly.
     for (const tt of ttJson.items || []) {
         const parsed = parseTokenTransfer(tt, addrLower);
-        const existing = txsByHash.get(parsed.hash);
-        if (existing && existing.direction === "contract") {
-            parsed.direction = "contract";
-            parsed.directionLabel = existing.directionLabel;
-            parsed.isContractCall = true;
-            parsed.method = existing.method;
-        }
         txsByHash.set(parsed.hash, parsed);
     }
 

src/shared/uniswap.js

@@ -161,157 +161,6 @@ function decodeWrapEth(input) {
     }
 }
 
-// V4 inner action IDs
-const V4_SWAP_EXACT_IN_SINGLE = 0x06;
-const V4_SWAP_EXACT_IN = 0x07;
-const V4_SWAP_EXACT_OUT_SINGLE = 0x08;
-const V4_SWAP_EXACT_OUT = 0x09;
-const V4_SETTLE = 0x0b;
-const V4_TAKE = 0x0e;
-
-// Decode V4_SWAP (command 0x10) input bytes.
-// The input is ABI-encoded as (bytes actions, bytes[] params).
-// We extract token addresses from SETTLE (input) and TAKE (output) sub-actions,
-// and swap amounts from the swap sub-actions.
-function decodeV4Swap(input) {
-    try {
-        const d = coder.decode(["bytes", "bytes[]"], input);
-        const actions = getBytes(d[0]);
-        const params = d[1];
-
-        let settleToken = null;
-        let takeToken = null;
-        let amountIn = null;
-        let amountOutMin = null;
-
-        for (let i = 0; i < actions.length; i++) {
-            const actionId = actions[i];
-            try {
-                if (actionId === V4_SETTLE) {
-                    // SETTLE: (address currency, uint256 maxAmount, bool payerIsUser)
-                    const s = coder.decode(
-                        ["address", "uint256", "bool"],
-                        params[i],
-                    );
-                    settleToken = s[0];
-                } else if (actionId === V4_TAKE) {
-                    // TAKE: (address currency, address recipient, uint256 amount)
-                    const t = coder.decode(
-                        ["address", "address", "uint256"],
-                        params[i],
-                    );
-                    takeToken = t[0];
-                } else if (
-                    actionId === V4_SWAP_EXACT_IN ||
-                    actionId === V4_SWAP_EXACT_IN_SINGLE
-                ) {
-                    // Extract amounts from exact-in swap actions
-                    if (actionId === V4_SWAP_EXACT_IN) {
-                        // ExactInputParams: (address currencyIn,
-                        //   tuple(address,uint24,int24,address,bytes)[] path,
-                        //   uint128 amountIn, uint128 amountOutMin)
-                        try {
-                            const s = coder.decode(
-                                [
-                                    "tuple(address,tuple(address,uint24,int24,address,bytes)[],uint128,uint128)",
-                                ],
-                                params[i],
-                            );
-                            if (!settleToken) settleToken = s[0][0];
-                            const path = s[0][1];
-                            if (path.length > 0 && !takeToken) {
-                                takeToken = path[path.length - 1][0];
-                            }
-                            if (!amountIn) amountIn = s[0][2];
-                            if (!amountOutMin) amountOutMin = s[0][3];
-                        } catch {
-                            // Fall through — SETTLE/TAKE will provide tokens
-                        }
-                    } else {
-                        // ExactInputSingleParams: (tuple(address,address,uint24,int24,address) poolKey,
-                        //   bool zeroForOne, uint128 amountIn, uint128 amountOutMin, bytes hookData)
-                        try {
-                            const s = coder.decode(
-                                [
-                                    "tuple(tuple(address,address,uint24,int24,address),bool,uint128,uint128,bytes)",
-                                ],
-                                params[i],
-                            );
-                            const poolKey = s[0][0];
-                            const zeroForOne = s[0][1];
-                            if (!settleToken)
-                                settleToken = zeroForOne
-                                    ? poolKey[0]
-                                    : poolKey[1];
-                            if (!takeToken)
-                                takeToken = zeroForOne
-                                    ? poolKey[1]
-                                    : poolKey[0];
-                            if (!amountIn) amountIn = s[0][2];
-                            if (!amountOutMin) amountOutMin = s[0][3];
-                        } catch {
-                            // Fall through
-                        }
-                    }
-                } else if (
-                    actionId === V4_SWAP_EXACT_OUT ||
-                    actionId === V4_SWAP_EXACT_OUT_SINGLE
-                ) {
-                    if (actionId === V4_SWAP_EXACT_OUT) {
-                        try {
-                            const s = coder.decode(
-                                [
-                                    "tuple(address,tuple(address,uint24,int24,address,bytes)[],uint128,uint128)",
-                                ],
-                                params[i],
-                            );
-                            if (!takeToken) takeToken = s[0][0];
-                            const path = s[0][1];
-                            if (path.length > 0 && !settleToken) {
-                                settleToken = path[path.length - 1][0];
-                            }
-                        } catch {
-                            // Fall through
-                        }
-                    } else {
-                        try {
-                            const s = coder.decode(
-                                [
-                                    "tuple(tuple(address,address,uint24,int24,address),bool,uint128,uint128,bytes)",
-                                ],
-                                params[i],
-                            );
-                            const poolKey = s[0][0];
-                            const zeroForOne = s[0][1];
-                            if (!settleToken)
-                                settleToken = zeroForOne
-                                    ? poolKey[0]
-                                    : poolKey[1];
-                            if (!takeToken)
-                                takeToken = zeroForOne
-                                    ? poolKey[1]
-                                    : poolKey[0];
-                        } catch {
-                            // Fall through
-                        }
-                    }
-                }
-            } catch {
-                // Skip sub-actions we can't decode
-            }
-        }
-
-        return {
-            tokenIn: settleToken,
-            tokenOut: takeToken,
-            amountIn,
-            amountOutMin,
-        };
-    } catch {
-        return null;
-    }
-}
-
 // Try to decode a Universal Router execute() call.
 // Returns { name, description, details } matching the format used by
 // the approval UI, or null if the calldata is not a recognised execute().
@@ -384,19 +233,6 @@ function decode(data, toAddress) {
                     }
                 }
 
-                if (cmdId === 0x10) {
-                    const v4 = decodeV4Swap(inputs[i]);
-                    if (v4) {
-                        if (!inputToken && v4.tokenIn) inputToken = v4.tokenIn;
-                        if (!outputToken && v4.tokenOut)
-                            outputToken = v4.tokenOut;
-                        if (!inputAmount && v4.amountIn)
-                            inputAmount = v4.amountIn;
-                        if (!minOutput && v4.amountOutMin)
-                            minOutput = v4.amountOutMin;
-                    }
-                }
-
                 if (cmdId === 0x0c) {
                     hasUnwrapWeth = true;
                 }

src/shared/wallet.js

@@ -1,11 +1,11 @@
-// Wallet operations: mnemonic generation, HD derivation, signing.
+// Wallet operations: recovery phrase generation, HD derivation, signing.
 // All crypto delegated to ethers.js.
 
 const { Mnemonic, HDNodeWallet, Wallet } = require("ethers");
-const { DEBUG, DEBUG_MNEMONIC, BIP44_ETH_PATH } = require("./constants");
+const { DEBUG, DEBUG_RECOVERY_PHRASE, BIP44_ETH_PATH } = require("./constants");
 
-function generateMnemonic() {
+function generateRecoveryPhrase() {
-    if (DEBUG) return DEBUG_MNEMONIC;
+    if (DEBUG) return DEBUG_RECOVERY_PHRASE;
     const m = Mnemonic.fromEntropy(
         globalThis.crypto.getRandomValues(new Uint8Array(16)),
     );
@@ -17,8 +17,8 @@ function deriveAddressFromXpub(xpub, index) {
     return node.deriveChild(index).address;
 }
 
-function hdWalletFromMnemonic(mnemonic) {
+function hdWalletFromRecoveryPhrase(recoveryPhrase) {
-    const node = HDNodeWallet.fromPhrase(mnemonic, "", BIP44_ETH_PATH);
+    const node = HDNodeWallet.fromPhrase(recoveryPhrase, "", BIP44_ETH_PATH);
     const xpub = node.neuter().extendedKey;
     const firstAddress = node.deriveChild(0).address;
     return { xpub, firstAddress };
@@ -41,15 +41,15 @@ function getSignerForAddress(walletData, addrIndex, decryptedSecret) {
     return new Wallet(decryptedSecret);
 }
 
-function isValidMnemonic(mnemonic) {
+function isValidRecoveryPhrase(phrase) {
-    return Mnemonic.isValidMnemonic(mnemonic);
+    return Mnemonic.isValidMnemonic(phrase);
 }
 
 module.exports = {
-    generateMnemonic,
+    generateRecoveryPhrase,
     deriveAddressFromXpub,
-    hdWalletFromMnemonic,
+    hdWalletFromRecoveryPhrase,
     addressFromPrivateKey,
     getSignerForAddress,
-    isValidMnemonic,
+    isValidRecoveryPhrase,
 };

tests/uniswap.test.js

@@ -1,10 +1,9 @@
-const { AbiCoder, Interface, solidityPacked, getBytes } = require("ethers");
+const { AbiCoder, Interface, solidityPacked } = require("ethers");
 const uniswap = require("../src/shared/uniswap");
 
 const ROUTER_ADDR = "0x66a9893cc07d91d95644aedd05d03f95e1dba8af";
 const USDT_ADDR = "0xdAC17F958D2ee523a2206206994597C13D831ec7";
 const WETH_ADDR = "0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2";
-const USDC_ADDR = "0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48";
 const USER_ADDR = "0x66133E8ea0f5D1d612D2502a968757D1048c214a";
 
 // AutistMask's first-ever swap, 2026-02-27.
@@ -257,87 +256,6 @@ describe("uniswap decoder", () => {
         expect(amount.value).toBe("5.0000 USDT");
     });
 
-    // This test validates the decodeV4Swap() fix: a V4 ERC20→ERC20 swap
-    // (USDT→USDC) where the token addresses are ONLY discoverable inside
-    // the V4_SWAP sub-actions (SETTLE/TAKE). Before decodeV4Swap() was added,
-    // command 0x10 was opaque and this would decode as "Uniswap Swap" with
-    // no token info (or "ETH → ETH"). Now it correctly shows "USDT → USDC".
-    test("decodes V4_SWAP ERC20→ERC20 tokens via SETTLE/TAKE (regression: #59)", () => {
-        // Build a V4_SWAP input with SETTLE(USDT) + SWAP_EXACT_IN_SINGLE + TAKE(USDC)
-        const V4_SETTLE = 0x0b;
-        const V4_SWAP_EXACT_IN_SINGLE = 0x06;
-        const V4_TAKE = 0x0e;
-
-        // actions: SETTLE, SWAP_EXACT_IN_SINGLE, TAKE
-        const actions = new Uint8Array([
-            V4_SETTLE,
-            V4_SWAP_EXACT_IN_SINGLE,
-            V4_TAKE,
-        ]);
-
-        // SETTLE params: (address currency, uint256 maxAmount, bool payerIsUser)
-        const settleParam = coder.encode(
-            ["address", "uint256", "bool"],
-            [USDT_ADDR, 5000000n, true],
-        );
-
-        // SWAP_EXACT_IN_SINGLE params:
-        // (tuple(address,address,uint24,int24,address) poolKey, bool zeroForOne, uint128 amountIn, uint128 amountOutMin, bytes hookData)
-        const swapParam = coder.encode(
-            [
-                "tuple(tuple(address,address,uint24,int24,address),bool,uint128,uint128,bytes)",
-            ],
-            [
-                [
-                    [
-                        USDT_ADDR,
-                        USDC_ADDR,
-                        100, // fee
-                        1, // tickSpacing
-                        "0x0000000000000000000000000000000000000000", // hooks
-                    ],
-                    true, // zeroForOne
-                    5000000n, // amountIn (5 USDT)
-                    4900000n, // amountOutMin (4.9 USDC)
-                    "0x", // hookData
-                ],
-            ],
-        );
-
-        // TAKE params: (address currency, address recipient, uint256 amount)
-        const takeParam = coder.encode(
-            ["address", "address", "uint256"],
-            [USDC_ADDR, USER_ADDR, 0n],
-        );
-
-        // Encode the V4_SWAP input: (bytes actions, bytes[] params)
-        const v4Input = coder.encode(
-            ["bytes", "bytes[]"],
-            [actions, [settleParam, swapParam, takeParam]],
-        );
-
-        // Build execute() with PERMIT2_PERMIT (0x0a) + V4_SWAP (0x10)
-        // The permit provides the input token, but V4_SWAP must provide
-        // the OUTPUT token — without decodeV4Swap, output would be unknown.
-        const data = buildExecute(
-            solidityPacked(["uint8", "uint8"], [0x0a, 0x10]),
-            [encodePermit2(USDT_ADDR, 5000000n, ROUTER_ADDR), v4Input],
-            9999999999n,
-        );
-
-        const result = uniswap.decode(data, ROUTER_ADDR);
-        expect(result).not.toBeNull();
-        // Before decodeV4Swap fix: name would be "Swap USDT → ETH" or "Uniswap Swap"
-        // After fix: correctly identifies both tokens from V4 sub-actions
-        expect(result.name).toBe("Swap USDT \u2192 USDC");
-
-        const tokenIn = result.details.find((d) => d.label === "Token In");
-        expect(tokenIn.value).toContain("USDT");
-
-        const steps = result.details.find((d) => d.label === "Steps");
-        expect(steps.value).toContain("V4 Swap");
-    });
-
     test("handles unknown tokens gracefully", () => {
         const fakeToken = "0x1111111111111111111111111111111111111111";
         const data = buildExecute(