From 3db8243a77661f8c5fec49b5d934420d916733eb Mon Sep 17 00:00:00 2001
From: user <user@Mac.lan guest wan>
Date: Sat, 28 Feb 2026 12:23:06 -0800
Subject: [PATCH] refactor: consolidate wallet import into unified add-wallet
 view with navigation stack

- Merge mnemonic, private key, and xprv import into a single add-wallet view
  with tab-style mode selector instead of separate views with text links
- Add view navigation stack to helpers.js so back buttons return to the
  actual previous view instead of hardcoded destinations
- Remove separate import-key and import-xprv views from HTML
- Remove importKey.js and importXprv.js from index.js (files kept but unused)
- Fix import-xprv never rendering (was missing from VIEWS array)

Closes #20
---
 src/popup/index.html         | 230 +++++++++++-----------------
 src/popup/index.js           |   6 -
 src/popup/views/addWallet.js | 281 +++++++++++++++++++++++++----------
 src/popup/views/helpers.js   |  24 ++-
 4 files changed, 313 insertions(+), 228 deletions(-)

diff --git a/src/popup/index.html b/src/popup/index.html
index 924a6fe..bb2c3b4 100644
--- a/src/popup/index.html
+++ b/src/popup/index.html
@@ -56,39 +56,103 @@
                     &lt; Back
                 </button>
                 <h2 class="font-bold mb-2">Add Wallet</h2>
-                <p class="mb-2">
-                    Enter your 12 or 24 word recovery phrase below, or click the
-                    button to roll the die for a new one.
-                </p>
-                <div class="mb-1 flex justify-end">
+
+                <!-- Mode selector tabs -->
+                <div class="flex gap-1 mb-3">
                     <button
-                        id="btn-generate-phrase"
-                        class="border border-border px-2 py-1 hover:bg-fg hover:text-bg cursor-pointer text-xs"
-                        title="Generate a random recovery phrase"
+                        id="btn-mode-mnemonic"
+                        class="border border-border px-2 py-1 cursor-pointer text-xs bg-fg text-bg"
                     >
-                        [&#9856;]
+                        Recovery Phrase
+                    </button>
+                    <button
+                        id="btn-mode-key"
+                        class="border border-border px-2 py-1 cursor-pointer text-xs hover:bg-fg hover:text-bg"
+                    >
+                        Private Key
+                    </button>
+                    <button
+                        id="btn-mode-xprv"
+                        class="border border-border px-2 py-1 cursor-pointer text-xs hover:bg-fg hover:text-bg"
+                    >
+                        xprv
                     </button>
                 </div>
-                <div class="mb-2">
-                    <textarea
-                        id="wallet-mnemonic"
-                        rows="3"
-                        class="border border-border p-1 w-full font-mono text-sm bg-bg text-fg resize-y"
-                        placeholder="word word word ..."
-                    ></textarea>
+
+                <!-- ---- Mnemonic mode ---- -->
+                <div id="add-wallet-mode-mnemonic">
+                    <p class="mb-2">
+                        Enter your 12 or 24 word recovery phrase below, or click
+                        the button to roll the die for a new one.
+                    </p>
+                    <div class="mb-1 flex justify-end">
+                        <button
+                            id="btn-generate-phrase"
+                            class="border border-border px-2 py-1 hover:bg-fg hover:text-bg cursor-pointer text-xs"
+                            title="Generate a random recovery phrase"
+                        >
+                            [&#9856;]
+                        </button>
+                    </div>
+                    <div class="mb-2">
+                        <textarea
+                            id="wallet-mnemonic"
+                            rows="3"
+                            class="border border-border p-1 w-full font-mono text-sm bg-bg text-fg resize-y"
+                            placeholder="word word word ..."
+                        ></textarea>
+                    </div>
+                    <div
+                        id="add-wallet-phrase-warning"
+                        class="text-xs mb-2 border border-border border-dashed p-2 hidden"
+                    >
+                        Write these words down and keep them safe. Anyone with
+                        them can take your funds; if you lose them, your wallet
+                        is gone.
+                    </div>
                 </div>
-                <div
-                    id="add-wallet-phrase-warning"
-                    class="text-xs mb-2 border border-border border-dashed p-2 hidden"
-                >
-                    Write these words down and keep them safe. Anyone with them
-                    can take your funds; if you lose them, your wallet is gone.
+
+                <!-- ---- Private key mode ---- -->
+                <div id="add-wallet-mode-key" class="hidden">
+                    <p class="mb-2">
+                        Paste your private key below. This wallet will have a
+                        single address.
+                    </p>
+                    <div class="mb-2">
+                        <input
+                            type="password"
+                            id="import-private-key"
+                            class="border border-border p-1 w-full font-mono text-sm bg-bg text-fg"
+                            placeholder="0x..."
+                        />
+                    </div>
                 </div>
+
+                <!-- ---- xprv mode ---- -->
+                <div id="add-wallet-mode-xprv" class="hidden">
+                    <p class="mb-2">
+                        Paste your extended private key (xprv) below. This will
+                        import the HD wallet and scan for used addresses.
+                    </p>
+                    <div class="mb-2">
+                        <input
+                            type="password"
+                            id="import-xprv-key"
+                            class="border border-border p-1 w-full font-mono text-sm bg-bg text-fg"
+                            placeholder="xprv..."
+                        />
+                    </div>
+                </div>
+
+                <!-- Shared password fields -->
                 <div class="mb-2" id="add-wallet-password-section">
                     <label class="block mb-1">Choose a password</label>
-                    <p class="text-xs text-muted mb-1">
-                        This password encrypts your recovery phrase on this
-                        device. You will need it to send funds.
+                    <p
+                        id="add-wallet-password-hint"
+                        class="text-xs text-muted mb-1"
+                    >
+                        This password encrypts your secret on this device. You
+                        will need it to send funds.
                     </p>
                     <input
                         type="password"
@@ -110,122 +174,6 @@
                 >
                     Add
                 </button>
-                <div class="mt-3 text-xs text-muted">
-                    Have a private key instead?
-                    <button
-                        id="btn-add-wallet-import-key"
-                        class="underline cursor-pointer bg-transparent border-none text-fg text-xs font-mono p-0"
-                    >
-                        Import private key
-                    </button>
-                </div>
-                <div class="mt-1 text-xs text-muted">
-                    Have an extended private key (xprv)?
-                    <button
-                        id="btn-add-wallet-import-xprv"
-                        class="underline cursor-pointer bg-transparent border-none text-fg text-xs font-mono p-0"
-                    >
-                        Import xprv
-                    </button>
-                </div>
-            </div>
-
-            <!-- ============ IMPORT PRIVATE KEY ============ -->
-            <div id="view-import-key" class="view hidden">
-                <button
-                    id="btn-import-key-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">Import Private Key</h2>
-                <p class="mb-2">
-                    Paste your private key below. This wallet will have a single
-                    address.
-                </p>
-                <div class="mb-2">
-                    <input
-                        type="password"
-                        id="import-private-key"
-                        class="border border-border p-1 w-full font-mono text-sm bg-bg text-fg"
-                        placeholder="0x..."
-                    />
-                </div>
-                <div class="mb-2" id="import-key-password-section">
-                    <label class="block mb-1">Choose a password</label>
-                    <p class="text-xs text-muted mb-1">
-                        This password encrypts your private key on this device.
-                        You will need it to send funds.
-                    </p>
-                    <input
-                        type="password"
-                        id="import-key-password"
-                        class="border border-border p-1 w-full font-mono text-sm bg-bg text-fg"
-                    />
-                </div>
-                <div class="mb-2" id="import-key-password-confirm-section">
-                    <label class="block mb-1">Confirm password</label>
-                    <input
-                        type="password"
-                        id="import-key-password-confirm"
-                        class="border border-border p-1 w-full font-mono text-sm bg-bg text-fg"
-                    />
-                </div>
-                <button
-                    id="btn-import-key-confirm"
-                    class="border border-border px-2 py-1 hover:bg-fg hover:text-bg cursor-pointer"
-                >
-                    Import
-                </button>
-            </div>
-
-            <!-- ============ IMPORT XPRV ============ -->
-            <div id="view-import-xprv" class="view hidden">
-                <button
-                    id="btn-import-xprv-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">Import Extended Private Key</h2>
-                <p class="mb-2">
-                    Paste your extended private key (xprv) below. This will
-                    import the HD wallet and scan for used addresses.
-                </p>
-                <div class="mb-2">
-                    <input
-                        type="password"
-                        id="import-xprv-key"
-                        class="border border-border p-1 w-full font-mono text-sm bg-bg text-fg"
-                        placeholder="xprv..."
-                    />
-                </div>
-                <div class="mb-2" id="import-xprv-password-section">
-                    <label class="block mb-1">Choose a password</label>
-                    <p class="text-xs text-muted mb-1">
-                        This password encrypts your key on this device. You will
-                        need it to send funds.
-                    </p>
-                    <input
-                        type="password"
-                        id="import-xprv-password"
-                        class="border border-border p-1 w-full font-mono text-sm bg-bg text-fg"
-                    />
-                </div>
-                <div class="mb-2" id="import-xprv-password-confirm-section">
-                    <label class="block mb-1">Confirm password</label>
-                    <input
-                        type="password"
-                        id="import-xprv-password-confirm"
-                        class="border border-border p-1 w-full font-mono text-sm bg-bg text-fg"
-                    />
-                </div>
-                <button
-                    id="btn-import-xprv-confirm"
-                    class="border border-border px-2 py-1 hover:bg-fg hover:text-bg cursor-pointer"
-                >
-                    Import
-                </button>
             </div>
 
             <!-- ============ MAIN VIEW: ALL WALLETS & ADDRESSES ============ -->
diff --git a/src/popup/index.js b/src/popup/index.js
index bfdb6ee..29e27ab 100644
--- a/src/popup/index.js
+++ b/src/popup/index.js
@@ -10,8 +10,6 @@ const { $, showView } = require("./views/helpers");
 const home = require("./views/home");
 const welcome = require("./views/welcome");
 const addWallet = require("./views/addWallet");
-const importKey = require("./views/importKey");
-const importXprv = require("./views/importXprv");
 const addressDetail = require("./views/addressDetail");
 const addressToken = require("./views/addressToken");
 const send = require("./views/send");
@@ -55,8 +53,6 @@ const ctx = {
     renderWalletList,
     doRefreshAndRender,
     showAddWalletView: () => addWallet.show(),
-    showImportKeyView: () => importKey.show(),
-    showImportXprvView: () => importXprv.show(),
     showAddressDetail: () => addressDetail.show(),
     showAddressToken: () => addressToken.show(),
     showAddTokenView: () => addToken.show(),
@@ -211,8 +207,6 @@ async function init() {
 
     welcome.init(ctx);
     addWallet.init(ctx);
-    importKey.init(ctx);
-    importXprv.init(ctx);
     home.init(ctx);
     addressDetail.init(ctx);
     addressToken.init(ctx);
diff --git a/src/popup/views/addWallet.js b/src/popup/views/addWallet.js
index ca8c4c6..830602e 100644
--- a/src/popup/views/addWallet.js
+++ b/src/popup/views/addWallet.js
@@ -1,48 +1,62 @@
-const { $, showView, showFlash } = require("./helpers");
+const { $, showView, showFlash, goBack } = require("./helpers");
 const {
     generateMnemonic,
     hdWalletFromMnemonic,
+    hdWalletFromXprv,
     isValidMnemonic,
+    isValidXprv,
+    addressFromPrivateKey,
 } = require("../../shared/wallet");
 const { encryptWithPassword } = require("../../shared/vault");
 const { state, saveState } = require("../../shared/state");
 const { scanForAddresses } = require("../../shared/balances");
 
+let currentMode = "mnemonic"; // "mnemonic" | "key" | "xprv"
+
+const MODES = ["mnemonic", "key", "xprv"];
+
+function setMode(mode) {
+    currentMode = mode;
+    for (const m of MODES) {
+        const section = $("add-wallet-mode-" + m);
+        if (section) section.classList.toggle("hidden", m !== mode);
+        const btn = $("btn-mode-" + m);
+        if (btn) {
+            if (m === mode) {
+                btn.classList.add("bg-fg", "text-bg");
+                btn.classList.remove("hover:bg-fg", "hover:text-bg");
+            } else {
+                btn.classList.remove("bg-fg", "text-bg");
+                btn.classList.add("hover:bg-fg", "hover:text-bg");
+            }
+        }
+    }
+}
+
 function show() {
     $("wallet-mnemonic").value = "";
+    $("import-private-key").value = "";
+    $("import-xprv-key").value = "";
     $("add-wallet-password").value = "";
     $("add-wallet-password-confirm").value = "";
     $("add-wallet-phrase-warning").classList.add("hidden");
+    setMode("mnemonic");
     showView("add-wallet");
 }
 
 function init(ctx) {
+    // Mode switching
+    $("btn-mode-mnemonic").addEventListener("click", () => setMode("mnemonic"));
+    $("btn-mode-key").addEventListener("click", () => setMode("key"));
+    $("btn-mode-xprv").addEventListener("click", () => setMode("xprv"));
+
     $("btn-generate-phrase").addEventListener("click", () => {
         $("wallet-mnemonic").value = generateMnemonic();
         $("add-wallet-phrase-warning").classList.remove("hidden");
     });
 
     $("btn-add-wallet-confirm").addEventListener("click", async () => {
-        const mnemonic = $("wallet-mnemonic").value.trim();
-        if (!mnemonic) {
-            showFlash(
-                "Enter a recovery phrase or press the die to generate one.",
-            );
-            return;
-        }
-        const words = mnemonic.split(/\s+/);
-        if (words.length !== 12 && words.length !== 24) {
-            showFlash(
-                "Recovery phrase must be 12 or 24 words. You entered " +
-                    words.length +
-                    ".",
-            );
-            return;
-        }
-        if (!isValidMnemonic(mnemonic)) {
-            showFlash("Invalid recovery phrase. Check for typos.");
-            return;
-        }
+        // Shared password validation
         const pw = $("add-wallet-password").value;
         const pw2 = $("add-wallet-password-confirm").value;
         if (!pw) {
@@ -57,78 +71,187 @@ function init(ctx) {
             showFlash("Passwords do not match.");
             return;
         }
-        const { xpub, firstAddress } = hdWalletFromMnemonic(mnemonic);
-        const duplicate = state.wallets.find(
-            (w) =>
-                w.type === "hd" &&
-                w.addresses[0] &&
-                w.addresses[0].address.toLowerCase() ===
-                    firstAddress.toLowerCase(),
-        );
-        if (duplicate) {
-            showFlash(
-                "This recovery phrase is already added (" +
-                    duplicate.name +
-                    ").",
-            );
-            return;
-        }
-        const encrypted = await encryptWithPassword(mnemonic, pw);
-        const walletNum = state.wallets.length + 1;
-        const wallet = {
-            type: "hd",
-            name: "Wallet " + walletNum,
-            xpub: xpub,
-            encryptedSecret: encrypted,
-            nextIndex: 1,
-            addresses: [
-                { address: firstAddress, balance: "0.0000", tokenBalances: [] },
-            ],
-        };
-        state.wallets.push(wallet);
-        state.hasWallet = true;
-        await saveState();
-        ctx.renderWalletList();
-        showView("main");
 
-        // Scan for used HD addresses beyond index 0.
-        showFlash("Scanning for addresses...", 30000);
-        const scan = await scanForAddresses(xpub, state.rpcUrl);
-        if (scan.addresses.length > 1) {
-            wallet.addresses = scan.addresses.map((a) => ({
-                address: a.address,
-                balance: "0.0000",
-                tokenBalances: [],
-            }));
-            wallet.nextIndex = scan.nextIndex;
-            await saveState();
-            ctx.renderWalletList();
-            showFlash("Found " + scan.addresses.length + " addresses.");
-        } else {
-            showFlash("Ready.", 1000);
+        if (currentMode === "mnemonic") {
+            await handleMnemonic(ctx, pw);
+        } else if (currentMode === "key") {
+            await handlePrivateKey(ctx, pw);
+        } else if (currentMode === "xprv") {
+            await handleXprv(ctx, pw);
         }
-
-        ctx.doRefreshAndRender();
     });
 
     $("btn-add-wallet-back").addEventListener("click", () => {
         if (!state.hasWallet) {
-            showView("welcome");
+            goBack("welcome");
         } else {
             ctx.renderWalletList();
-            showView("main");
+            goBack("main");
         }
     });
+}
 
-    $("btn-add-wallet-import-key").addEventListener(
-        "click",
-        ctx.showImportKeyView,
+async function handleMnemonic(ctx, pw) {
+    const mnemonic = $("wallet-mnemonic").value.trim();
+    if (!mnemonic) {
+        showFlash("Enter a recovery phrase or press the die to generate one.");
+        return;
+    }
+    const words = mnemonic.split(/\s+/);
+    if (words.length !== 12 && words.length !== 24) {
+        showFlash(
+            "Recovery phrase must be 12 or 24 words. You entered " +
+                words.length +
+                ".",
+        );
+        return;
+    }
+    if (!isValidMnemonic(mnemonic)) {
+        showFlash("Invalid recovery phrase. Check for typos.");
+        return;
+    }
+    const { xpub, firstAddress } = hdWalletFromMnemonic(mnemonic);
+    const duplicate = state.wallets.find(
+        (w) =>
+            w.type === "hd" &&
+            w.addresses[0] &&
+            w.addresses[0].address.toLowerCase() === firstAddress.toLowerCase(),
     );
+    if (duplicate) {
+        showFlash(
+            "This recovery phrase is already added (" + duplicate.name + ").",
+        );
+        return;
+    }
+    const encrypted = await encryptWithPassword(mnemonic, pw);
+    const walletNum = state.wallets.length + 1;
+    const wallet = {
+        type: "hd",
+        name: "Wallet " + walletNum,
+        xpub: xpub,
+        encryptedSecret: encrypted,
+        nextIndex: 1,
+        addresses: [
+            { address: firstAddress, balance: "0.0000", tokenBalances: [] },
+        ],
+    };
+    state.wallets.push(wallet);
+    state.hasWallet = true;
+    await saveState();
+    ctx.renderWalletList();
+    showView("main");
 
-    $("btn-add-wallet-import-xprv").addEventListener(
-        "click",
-        ctx.showImportXprvView,
+    showFlash("Scanning for addresses...", 30000);
+    const scan = await scanForAddresses(xpub, state.rpcUrl);
+    if (scan.addresses.length > 1) {
+        wallet.addresses = scan.addresses.map((a) => ({
+            address: a.address,
+            balance: "0.0000",
+            tokenBalances: [],
+        }));
+        wallet.nextIndex = scan.nextIndex;
+        await saveState();
+        ctx.renderWalletList();
+        showFlash("Found " + scan.addresses.length + " addresses.");
+    } else {
+        showFlash("Ready.", 1000);
+    }
+
+    ctx.doRefreshAndRender();
+}
+
+async function handlePrivateKey(ctx, pw) {
+    const key = $("import-private-key").value.trim();
+    if (!key) {
+        showFlash("Please enter your private key.");
+        return;
+    }
+    let addr;
+    try {
+        addr = addressFromPrivateKey(key);
+    } catch (e) {
+        showFlash("Invalid private key.");
+        return;
+    }
+    const encrypted = await encryptWithPassword(key, pw);
+    const walletNum = state.wallets.length + 1;
+    state.wallets.push({
+        type: "key",
+        name: "Wallet " + walletNum,
+        encryptedSecret: encrypted,
+        addresses: [{ address: addr, balance: "0.0000", tokenBalances: [] }],
+    });
+    state.hasWallet = true;
+    await saveState();
+    ctx.renderWalletList();
+    showView("main");
+
+    ctx.doRefreshAndRender();
+}
+
+async function handleXprv(ctx, pw) {
+    const xprv = $("import-xprv-key").value.trim();
+    if (!xprv) {
+        showFlash("Please enter your extended private key.");
+        return;
+    }
+    if (!isValidXprv(xprv)) {
+        showFlash("Invalid extended private key.");
+        return;
+    }
+    let result;
+    try {
+        result = hdWalletFromXprv(xprv);
+    } catch (e) {
+        showFlash("Invalid extended private key.");
+        return;
+    }
+    const { xpub, firstAddress } = result;
+    const duplicate = state.wallets.find(
+        (w) =>
+            (w.type === "hd" || w.type === "xprv") &&
+            w.addresses[0] &&
+            w.addresses[0].address.toLowerCase() === firstAddress.toLowerCase(),
     );
+    if (duplicate) {
+        showFlash("This key is already added (" + duplicate.name + ").");
+        return;
+    }
+    const encrypted = await encryptWithPassword(xprv, pw);
+    const walletNum = state.wallets.length + 1;
+    const wallet = {
+        type: "xprv",
+        name: "Wallet " + walletNum,
+        xpub: xpub,
+        encryptedSecret: encrypted,
+        nextIndex: 1,
+        addresses: [
+            { address: firstAddress, balance: "0.0000", tokenBalances: [] },
+        ],
+    };
+    state.wallets.push(wallet);
+    state.hasWallet = true;
+    await saveState();
+    ctx.renderWalletList();
+    showView("main");
+
+    showFlash("Scanning for addresses...", 30000);
+    const scan = await scanForAddresses(xpub, state.rpcUrl);
+    if (scan.addresses.length > 1) {
+        wallet.addresses = scan.addresses.map((a) => ({
+            address: a.address,
+            balance: "0.0000",
+            tokenBalances: [],
+        }));
+        wallet.nextIndex = scan.nextIndex;
+        await saveState();
+        ctx.renderWalletList();
+        showFlash("Found " + scan.addresses.length + " addresses.");
+    } else {
+        showFlash("Ready.", 1000);
+    }
+
+    ctx.doRefreshAndRender();
 }
 
 module.exports = { init, show };
diff --git a/src/popup/views/helpers.js b/src/popup/views/helpers.js
index 8fdfe65..323e3e2 100644
--- a/src/popup/views/helpers.js
+++ b/src/popup/views/helpers.js
@@ -13,7 +13,6 @@ const { state, saveState } = require("../../shared/state");
 const VIEWS = [
     "welcome",
     "add-wallet",
-    "import-key",
     "main",
     "address",
     "address-token",
@@ -34,6 +33,9 @@ const VIEWS = [
     "export-privkey",
 ];
 
+// Simple view history stack for back-button navigation.
+const viewStack = [];
+
 function $(id) {
     return document.getElementById(id);
 }
@@ -48,7 +50,13 @@ function hideError(id) {
     $(id).classList.add("hidden");
 }
 
-function showView(name) {
+function showView(name, opts) {
+    const skipPush = opts && opts.skipPush;
+    if (!skipPush && state.currentView && state.currentView !== name) {
+        viewStack.push(state.currentView);
+        // Keep the stack bounded to avoid unbounded growth.
+        if (viewStack.length > 20) viewStack.splice(0, viewStack.length - 20);
+    }
     for (const v of VIEWS) {
         const el = document.getElementById(`view-${v}`);
         if (el) {
@@ -66,6 +74,17 @@ function showView(name) {
     }
 }
 
+// Navigate to the previous view in the stack. Falls back to fallbackView
+// (default "main") when the stack is empty.
+function goBack(fallbackView) {
+    const prev = viewStack.pop();
+    if (prev) {
+        showView(prev, { skipPush: true });
+    } else {
+        showView(fallbackView || "main", { skipPush: true });
+    }
+}
+
 let flashTimer = null;
 
 function clearFlash() {
@@ -264,6 +283,7 @@ module.exports = {
     showError,
     hideError,
     showView,
+    goBack,
     showFlash,
     balanceLine,
     balanceLinesForAddress,