fix: derive hasWallet from the wallet list on load (closes #195)

loadState() took hasWallet straight from storage, so any profile persisted
with the flag out of step with wallets stayed broken on every subsequent
load rather than only until the next write. The flag is now derived from
wallets.length at load time.

The only consumer is the popup's welcome-vs-wallet-list gate in
src/popup/index.js; the only writers set it true alongside an added
wallet. Nothing reads it expecting it to differ from wallets.length, so
deriving is safe and needs no write-back on load.

README.md

@@ -980,7 +980,7 @@ Currently supported:
 
 ### Wallet Management
 
-- [x] Delete wallet (with confirmation)
+- [ ] Delete wallet (with confirmation)
 - [ ] Delete address from HD wallet (with confirmation)
 - [ ] Show wallet's recovery phrase (requires password)
 

TODO.md

@@ -48,10 +48,6 @@ undefined identifiers, which is how
   of trusting the persisted flag, so a profile already saved inconsistent no
   longer stays broken on every load
   ([#195](https://git.eeqj.de/sneak/AutistMask/issues/195)).
-- 2026-08-11: Wallet deletion repairs its own state — `hasWallet` follows the
-  remaining wallets, the selection only moves when it was deleted, and the
-  active-address change is broadcast to connected sites
-  ([#156](https://git.eeqj.de/sneak/AutistMask/issues/156)).
 - 2026-08-11: `TODO.md` Workflow rewritten to the branch-and-PR-per-issue model
   on `next`, with Status and Next Step refreshed
   ([#191](https://git.eeqj.de/sneak/AutistMask/issues/191)).

src/popup/views/deleteWallet.js

@@ -1,10 +1,6 @@
 const { $, showView, showFlash, goBack, clearViewStack } = require("./helpers");
 const { state, saveState } = require("../../shared/state");
 const { decryptWithPassword } = require("../../shared/vault");
-const {
-    removeWalletFromState,
-    broadcastActiveChanged,
-} = require("../../shared/walletDelete");
 
 let deleteWalletIndex = null;
 let ctx = null;
@@ -62,24 +58,35 @@ function init(_ctx) {
             return;
         }
 
-        // Remove the wallet and repair selection, permissions and hasWallet
+        // Collect addresses to clean up from allowedSites/deniedSites
-        const { activeAddressChanged } = removeWalletFromState(
+        const addresses = (wallet.addresses || []).map((a) => a.address);
-            state,
+
-            walletIdx,
+        // 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.hasWallet) {
+        if (state.wallets.length === 0) {
+            // No wallets left — reset selection and show welcome
+            state.selectedWallet = null;
+            state.selectedAddress = null;
+            state.activeAddress = null;
             clearViewStack();
             await saveState();
-            // Save before broadcasting: the background reads the active
-            // address back out of storage to build accountsChanged.
-            if (activeAddressChanged) broadcastActiveChanged();
             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();
-            if (activeAddressChanged) broadcastActiveChanged();
             // Reset stack to [main] so Settings back goes home.
             // Use require() lazily to avoid circular dependency
             // (settings.js requires deleteWallet.js).

src/shared/walletDelete.js

@@ -1,70 +0,0 @@
-// Wallet deletion state transition, kept out of the view so the selection
-// and broadcast rules are testable without a DOM.
-
-// Remove wallet `walletIdx` from `state` and repair the derived state.
-//
-// Rules:
-//   - `hasWallet` tracks whether any wallet remains.
-//   - Site permissions are dropped for every address of the deleted wallet.
-//   - `selectedWallet` follows the splice: it is decremented when a wallet
-//     before it was removed, and falls back to the first remaining wallet's
-//     first address only when the selection itself was deleted.
-//   - `activeAddress` is only moved when it belonged to the deleted wallet;
-//     the fallback is the first remaining wallet's first address, or null
-//     when no wallet remains.
-//
-// Returns whether `activeAddress` changed, so the caller can broadcast it.
-function removeWalletFromState(state, walletIdx) {
-    const wallet = state.wallets[walletIdx];
-    const addresses = (wallet.addresses || []).map((a) => a.address);
-    const previousActive = state.activeAddress;
-    const activeWasDeleted =
-        previousActive !== null &&
-        previousActive !== undefined &&
-        addresses.some(
-            (a) => a.toLowerCase() === String(previousActive).toLowerCase(),
-        );
-
-    state.wallets.splice(walletIdx, 1);
-
-    for (const addr of addresses) {
-        delete state.allowedSites[addr];
-        delete state.deniedSites[addr];
-    }
-
-    state.hasWallet = state.wallets.length > 0;
-
-    const fallbackAddress = state.hasWallet
-        ? state.wallets[0].addresses[0]?.address || null
-        : null;
-
-    if (!state.hasWallet) {
-        state.selectedWallet = null;
-        state.selectedAddress = null;
-    } else if (state.selectedWallet === walletIdx) {
-        state.selectedWallet = 0;
-        state.selectedAddress = 0;
-    } else if (
-        typeof state.selectedWallet === "number" &&
-        state.selectedWallet > walletIdx
-    ) {
-        state.selectedWallet -= 1;
-    }
-
-    if (activeWasDeleted || !state.hasWallet) {
-        state.activeAddress = fallbackAddress;
-    }
-
-    return { activeAddressChanged: state.activeAddress !== previousActive };
-}
-
-// Tell the background the active address changed, so it re-emits
-// accountsChanged to connected sites. Same call shape as the address
-// switch in the home view.
-function broadcastActiveChanged() {
-    const runtime =
-        typeof browser !== "undefined" ? browser.runtime : chrome.runtime;
-    runtime.sendMessage({ type: "AUTISTMASK_ACTIVE_CHANGED" });
-}
-
-module.exports = { removeWalletFromState, broadcastActiveChanged };

tests/walletDelete.test.js

@@ -1,129 +0,0 @@
-const {
-    removeWalletFromState,
-    broadcastActiveChanged,
-} = require("../src/shared/walletDelete");
-
-// Fixed addresses — never used for anything but these tests.
-const A0 = "0x66133E8ea0f5D1d612D2502a968757D1048c214a";
-const A1 = "0xdAC17F958D2ee523a2206206994597C13D831ec7";
-const B0 = "0x2260FAC5E5542a773Aa44fBCfeDf7C193bc2C599";
-const C0 = "0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48";
-
-function wallet(name, addresses) {
-    return {
-        name,
-        addresses: addresses.map((address) => ({ address })),
-    };
-}
-
-// A three-wallet state; wallet A is an HD wallet with two addresses.
-function makeState(overrides = {}) {
-    return {
-        hasWallet: true,
-        wallets: [wallet("A", [A0, A1]), wallet("B", [B0]), wallet("C", [C0])],
-        selectedWallet: 0,
-        selectedAddress: 0,
-        activeAddress: A0,
-        allowedSites: {
-            [A0]: ["a.example"],
-            [A1]: ["b.example"],
-            [B0]: ["c.example"],
-        },
-        deniedSites: { [A1]: ["d.example"], [C0]: ["e.example"] },
-        ...overrides,
-    };
-}
-
-describe("removeWalletFromState", () => {
-    test("deleting the last wallet clears hasWallet", () => {
-        const state = makeState({
-            wallets: [wallet("A", [A0])],
-            allowedSites: { [A0]: ["a.example"] },
-            deniedSites: {},
-        });
-
-        const { activeAddressChanged } = removeWalletFromState(state, 0);
-
-        expect(state.hasWallet).toBe(false);
-        expect(state.wallets).toEqual([]);
-        expect(state.selectedWallet).toBeNull();
-        expect(state.selectedAddress).toBeNull();
-        expect(state.activeAddress).toBeNull();
-        expect(activeAddressChanged).toBe(true);
-    });
-
-    test("deleting a non-selected wallet leaves the selection intact", () => {
-        const state = makeState({
-            selectedWallet: 2,
-            selectedAddress: 0,
-            activeAddress: C0,
-        });
-
-        const { activeAddressChanged } = removeWalletFromState(state, 1);
-
-        // Wallet C moved from index 2 to index 1 by the splice.
-        expect(state.wallets.map((w) => w.name)).toEqual(["A", "C"]);
-        expect(state.selectedWallet).toBe(1);
-        expect(state.selectedAddress).toBe(0);
-        expect(state.activeAddress).toBe(C0);
-        expect(activeAddressChanged).toBe(false);
-        expect(state.hasWallet).toBe(true);
-    });
-
-    test("deleting a wallet after the selection does not shift it", () => {
-        const state = makeState({
-            selectedWallet: 1,
-            selectedAddress: 0,
-            activeAddress: B0,
-        });
-
-        const { activeAddressChanged } = removeWalletFromState(state, 2);
-
-        expect(state.selectedWallet).toBe(1);
-        expect(state.activeAddress).toBe(B0);
-        expect(activeAddressChanged).toBe(false);
-    });
-
-    test("deleting the active wallet falls back to the first remaining address", () => {
-        const state = makeState({
-            selectedWallet: 0,
-            selectedAddress: 1,
-            activeAddress: A1,
-        });
-
-        const { activeAddressChanged } = removeWalletFromState(state, 0);
-
-        expect(state.wallets.map((w) => w.name)).toEqual(["B", "C"]);
-        expect(state.selectedWallet).toBe(0);
-        expect(state.selectedAddress).toBe(0);
-        expect(state.activeAddress).toBe(B0);
-        expect(activeAddressChanged).toBe(true);
-        expect(state.hasWallet).toBe(true);
-    });
-
-    test("site permissions are dropped for every address of the wallet", () => {
-        const state = makeState();
-
-        removeWalletFromState(state, 0);
-
-        expect(state.allowedSites).toEqual({ [B0]: ["c.example"] });
-        expect(state.deniedSites).toEqual({ [C0]: ["e.example"] });
-    });
-});
-
-describe("broadcastActiveChanged", () => {
-    afterEach(() => {
-        delete global.chrome;
-    });
-
-    test("sends AUTISTMASK_ACTIVE_CHANGED to the background", () => {
-        const sendMessage = jest.fn();
-        global.chrome = { runtime: { sendMessage } };
-
-        broadcastActiveChanged();
-
-        expect(sendMessage).toHaveBeenCalledWith({
-            type: "AUTISTMASK_ACTIVE_CHANGED",
-        });
-    });
-});