@avalix/chroma 0.0.15 → 1.0.0

package/src/wallets/metamask.test.ts

@@ -13,11 +13,11 @@ vi.mock('node:fs', async () => {
     ...actual,
     default: {
       ...actual,
-      existsSync: vi.fn(),
-      readdirSync: vi.fn(),
+      promises: {
+        ...actual.promises,
+        readdir: vi.fn(),
+      },
     },
-    existsSync: vi.fn(),
-    readdirSync: vi.fn(),
   }
 })
 
@@ -43,21 +43,20 @@ describe('metamask wallet', () => {
   })
 
   describe('getMetaMaskExtensionPath', () => {
+    const mockReaddir = () => vi.mocked(fs.promises.readdir) as unknown as ReturnType<typeof vi.fn>
+
     it('should return extension path when extension exists', async () => {
-      const mockedFs = vi.mocked(fs)
-      mockedFs.existsSync.mockReturnValue(true)
-      mockedFs.readdirSync.mockReturnValue(['manifest.json'] as any)
+      mockReaddir().mockResolvedValueOnce(['manifest.json'])
 
       const result = await getMetaMaskExtensionPath()
 
       expect(result).toContain('.chroma')
       expect(result).toContain(METAMASK_CONFIG.extensionName)
-      expect(mockedFs.existsSync).toHaveBeenCalled()
+      expect(fs.promises.readdir).toHaveBeenCalled()
     })
 
     it('should throw error when extension directory does not exist', async () => {
-      const mockedFs = vi.mocked(fs)
-      mockedFs.existsSync.mockReturnValue(false)
+      mockReaddir().mockRejectedValueOnce(Object.assign(new Error('ENOENT'), { code: 'ENOENT' }))
 
       await expect(getMetaMaskExtensionPath()).rejects.toThrow(
         'MetaMask extension not found',
@@ -65,9 +64,7 @@ describe('metamask wallet', () => {
     })
 
     it('should throw error when extension directory is empty', async () => {
-      const mockedFs = vi.mocked(fs)
-      mockedFs.existsSync.mockReturnValue(true)
-      mockedFs.readdirSync.mockReturnValue([])
+      mockReaddir().mockResolvedValueOnce([])
 
       await expect(getMetaMaskExtensionPath()).rejects.toThrow(
         'MetaMask extension not found',
@@ -75,8 +72,7 @@ describe('metamask wallet', () => {
     })
 
     it('should include download instructions in error message', async () => {
-      const mockedFs = vi.mocked(fs)
-      mockedFs.existsSync.mockReturnValue(false)
+      mockReaddir().mockRejectedValueOnce(Object.assign(new Error('ENOENT'), { code: 'ENOENT' }))
 
       await expect(getMetaMaskExtensionPath()).rejects.toThrow(
         'npx @avalix/chroma download-extensions',
@@ -84,9 +80,7 @@ describe('metamask wallet', () => {
     })
 
     it('should use correct path structure', async () => {
-      const mockedFs = vi.mocked(fs)
-      mockedFs.existsSync.mockReturnValue(true)
-      mockedFs.readdirSync.mockReturnValue(['manifest.json'] as any)
+      mockReaddir().mockResolvedValueOnce(['manifest.json'])
 
       const result = await getMetaMaskExtensionPath()
 

package/src/wallets/metamask.ts

@@ -2,12 +2,13 @@ import type { BrowserContext, Page } from '@playwright/test'
 import fs from 'node:fs'
 import path from 'node:path'
 import process from 'node:process'
+import { DEFAULT_TEST_PASSWORD } from '../utils/test-defaults.js'
 
 // MetaMask specific configuration
 // https://github.com/MetaMask/metamask-extension/releases
-const VERSION = '13.17.0'
+const VERSION = '13.28.0'
 export const METAMASK_CONFIG = {
-  downloadUrl: `https://github.com/MetaMask/metamask-extension/releases/download/v${VERSION}/metamask-flask-chrome-${VERSION}-flask.0.zip`,
+  downloadUrl: `https://github.com/MetaMask/metamask-extension/releases/download/v${VERSION}/metamask-chrome-${VERSION}.zip`,
   extensionName: `metamask-extension-${VERSION}`,
 } as const
 
@@ -16,8 +17,9 @@ export async function getMetaMaskExtensionPath(): Promise<string> {
   const extensionsDir = path.resolve(process.cwd(), '.chroma')
   const extensionDir = path.join(extensionsDir, METAMASK_CONFIG.extensionName)
 
-  // Check if extension exists
-  if (!fs.existsSync(extensionDir) || fs.readdirSync(extensionDir).length === 0) {
+  // Check if extension exists (readdir rejects if missing → treat as empty)
+  const entries = await fs.promises.readdir(extensionDir).catch(() => [] as string[])
+  if (entries.length === 0) {
     throw new Error(
       `MetaMask extension not found at: ${extensionDir}\n\n`
       + `Please download the extension first by running:\n`
@@ -48,7 +50,6 @@ async function findOnboardingPage(
     for (const p of pages) {
       if (p.url().includes(`chrome-extension://${extensionId}/`)) {
         await p.waitForLoadState('domcontentloaded')
-        await p.getByText('I accept the risks').click()
         return p
       }
     }
@@ -100,8 +101,6 @@ async function findExtensionPopup(
   throw new Error(`MetaMask side panel not found for ID: ${extensionId}`)
 }
 
-const METAMASK_PASSWORD = 'h3llop0lkadot!'
-
 // Helper function to complete MetaMask onboarding flow
 async function completeOnboarding(
   extensionPage: Page,
@@ -125,8 +124,8 @@ async function completeOnboarding(
   await extensionPage.getByTestId('import-srp-confirm').click()
 
   // Set password
-  await extensionPage.getByTestId('create-password-new-input').fill(METAMASK_PASSWORD)
-  await extensionPage.getByTestId('create-password-confirm-input').fill(METAMASK_PASSWORD)
+  await extensionPage.getByTestId('create-password-new-input').fill(DEFAULT_TEST_PASSWORD)
+  await extensionPage.getByTestId('create-password-confirm-input').fill(DEFAULT_TEST_PASSWORD)
   await extensionPage.getByTestId('create-password-terms').click()
   await extensionPage.getByTestId('create-password-submit').click()
 
@@ -136,12 +135,6 @@ async function completeOnboarding(
 
   // Complete onboarding
   await extensionPage.getByTestId('manage-default-settings').click()
-  await extensionPage.getByTestId('category-item-General').click()
-  await extensionPage.getByTestId('basic-functionality-toggle').locator('.toggle-button').click()
-  await extensionPage.getByText('I understand and want to continue').click()
-  await extensionPage.getByTestId('basic-configuration-modal-toggle-button').click()
-  await extensionPage.getByTestId('category-back-button').click()
-
   await extensionPage.getByTestId('category-item-Assets').click()
   await extensionPage.getByTestId('privacy-settings-settings').locator('.toggle-button').nth(0).click()
   await extensionPage.getByTestId('privacy-settings-settings').locator('.toggle-button').nth(1).click()
@@ -155,44 +148,30 @@ async function completeOnboarding(
   await extensionPage.close()
 }
 
-// MetaMask specific authorization implementation
-// Handles the "connect" popup when a dapp requests wallet connection
-export async function authorizeMetaMask(
-  page: Page & { __extensionContext: BrowserContext, __extensionId: string },
-): Promise<void> {
-  const context = page.__extensionContext
-  const extensionId = page.__extensionId
-
-  const extensionPopup = await findExtensionPopup(context, extensionId)
-
-  // Click "Connect" to authorize the dapp
-  await extensionPopup.getByTestId('confirm-btn').click()
-  await extensionPopup.close()
-}
-
-// MetaMask specific confirm implementation
-// Handles the confirm popup (e.g. sign message, send transaction)
-export async function confirmMetaMask(
-  page: Page & { __extensionContext: BrowserContext, __extensionId: string },
+// Approve a MetaMask popup — covers both the dapp connect popup ("Connect"
+// button = `confirm-btn`) and the sign / transaction popup ("Confirm" button
+// = `confirm-footer-button`). The two flows share the same find-popup,
+// click, close shape, so a single function accepts whichever button the
+// popup presents.
+export async function approveMetaMask(
+  context: BrowserContext,
+  extensionId: string,
 ): Promise<void> {
-  const context = page.__extensionContext
-  const extensionId = page.__extensionId
-
   const extensionPopup = await findExtensionPopup(context, extensionId)
 
-  // Click "Confirm"
-  await extensionPopup.getByTestId('confirm-footer-button').click()
+  const approveButton = extensionPopup.getByTestId('confirm-btn')
+    .or(extensionPopup.getByTestId('confirm-footer-button'))
+    .or(extensionPopup.getByTestId('confirm-sign-message-confirm-snap-footer-button'))
+  await approveButton.first().click()
   await extensionPopup.close()
 }
 
 // MetaMask specific reject implementation
 // Handles the reject/cancel popup (e.g. reject transaction, switch chain)
 export async function rejectMetaMask(
-  page: Page & { __extensionContext: BrowserContext, __extensionId: string },
+  context: BrowserContext,
+  extensionId: string,
 ): Promise<void> {
-  const context = page.__extensionContext
-  const extensionId = page.__extensionId
-
   const extensionPopup = await findExtensionPopup(context, extensionId)
 
   // Click "Reject" or "Cancel" - MetaMask uses confirm-footer-cancel for tx/sign reject
@@ -203,34 +182,86 @@ export async function rejectMetaMask(
   await extensionPopup.close()
 }
 
-// Unlock MetaMask by navigating to unlock page and filling password
+// Unlock MetaMask and leave its side panel open for the rest of the session.
+//
+// Idempotent: callers can invoke this from a fixture on every test without
+// tracking state. The function:
+//   1. Reuses the unlock tab MetaMask auto-opens on a locked profile (e.g. a
+//      cloned userDataDir) — opening a second one leaves the auto-opened tab
+//      around and queues dapp requests behind it.
+//   2. After unlock succeeds, navigates that same tab to `sidepanel.html` so
+//      the wallet UI stays visible throughout the test session.
+//   3. If MetaMask is already unlocked, just ensures a side panel tab exists.
 export async function unlockMetaMask(
-  page: Page & { __extensionContext: BrowserContext, __extensionId: string },
+  context: BrowserContext,
+  extensionId: string,
 ): Promise<void> {
-  const context = page.__extensionContext
-  const extensionId = page.__extensionId
+  const sidePanelUrl = `chrome-extension://${extensionId}/sidepanel.html`
+  const extensionUrlPrefix = `chrome-extension://${extensionId}/`
+
+  // Poll for one of two signals:
+  //   - an unlock tab → MetaMask auto-opened it on a locked profile
+  //   - any non-unlock extension page → MetaMask is already unlocked
+  //     (e.g. the sidepanel left over from a prior test in this worker)
+  // 10s deadline accommodates slow CI cold starts; the already-unlocked
+  // branch short-circuits within one tick on worker-scoped reuse, so the
+  // longer ceiling only applies on the first unlock per worker.
+  let unlockPage: Page | undefined
+  const deadline = Date.now() + 10_000
+  while (Date.now() < deadline) {
+    const extensionPages = context.pages().filter(p =>
+      p.url().startsWith(extensionUrlPrefix),
+    )
+
+    unlockPage = extensionPages.find(p => p.url().includes('unlock'))
+    if (unlockPage)
+      break
+
+    // A non-unlock extension page means MetaMask has booted unlocked; fall
+    // through to the sidepanel branch.
+    if (extensionPages.length > 0)
+      break
+
+    await new Promise(resolve => setTimeout(resolve, 100))
+  }
+
+  if (unlockPage) {
+    await unlockPage.bringToFront()
+    await unlockPage.waitForLoadState('domcontentloaded')
 
-  const unlockUrl = `chrome-extension://${extensionId}/home.html#/onboarding/unlock`
-  const unlockPage = await context.newPage()
-  await unlockPage.goto(unlockUrl)
-  await unlockPage.waitForLoadState('domcontentloaded')
+    // Fill password and unlock
+    await unlockPage.getByTestId('unlock-password').fill(DEFAULT_TEST_PASSWORD)
+    await unlockPage.getByTestId('unlock-submit').click()
 
-  // Fill password and unlock
-  await unlockPage.getByTestId('unlock-password').fill(METAMASK_PASSWORD)
-  await unlockPage.getByTestId('unlock-submit').click()
+    // Some MetaMask versions show a post-unlock completion screen. Click it
+    // if present, otherwise continue — the absence is not an error.
+    await unlockPage.getByTestId('onboarding-complete-done').click({ timeout: 3_000 }).catch(() => {})
+
+    // Navigate to the side panel and leave the tab open for the session.
+    await unlockPage.goto(sidePanelUrl)
+    await unlockPage.waitForLoadState('domcontentloaded')
+    return
+  }
 
-  // await unlockPage.getByTestId('onboarding-complete-done').click()
-  await unlockPage.close()
+  // No unlock tab seen — either MetaMask is already unlocked, or it never
+  // booted within the deadline. Ensure a sidepanel tab exists; downstream
+  // calls will surface a clear failure if the profile turns out to still be
+  // locked.
+  const existing = context.pages().find(p => p.url().startsWith(sidePanelUrl))
+  if (existing)
+    return
+
+  const sidePanel = await context.newPage()
+  await sidePanel.goto(sidePanelUrl)
+  await sidePanel.waitForLoadState('domcontentloaded')
 }
 
 // MetaMask specific seed phrase import implementation
 export async function importSeedPhrase(
-  page: Page & { __extensionContext: BrowserContext, __extensionId: string },
+  context: BrowserContext,
+  extensionId: string,
   { seedPhrase }: { seedPhrase: string },
 ): Promise<void> {
-  const context = page.__extensionContext
-  const extensionId = page.__extensionId
-
   const extensionPage = await findOnboardingPage(context, extensionId)
 
   try {

package/src/wallets/polkadot-js.test.ts

@@ -13,11 +13,11 @@ vi.mock('node:fs', async () => {
     ...actual,
     default: {
       ...actual,
-      existsSync: vi.fn(),
-      readdirSync: vi.fn(),
+      promises: {
+        ...actual.promises,
+        readdir: vi.fn(),
+      },
     },
-    existsSync: vi.fn(),
-    readdirSync: vi.fn(),
   }
 })
 
@@ -43,21 +43,20 @@ describe('polkadot-js wallet', () => {
   })
 
   describe('getPolkadotJSExtensionPath', () => {
+    const mockReaddir = () => vi.mocked(fs.promises.readdir) as unknown as ReturnType<typeof vi.fn>
+
     it('should return extension path when extension exists', async () => {
-      const mockedFs = vi.mocked(fs)
-      mockedFs.existsSync.mockReturnValue(true)
-      mockedFs.readdirSync.mockReturnValue(['manifest.json'] as any)
+      mockReaddir().mockResolvedValueOnce(['manifest.json'])
 
       const result = await getPolkadotJSExtensionPath()
 
       expect(result).toContain('.chroma')
       expect(result).toContain(POLKADOT_JS_CONFIG.extensionName)
-      expect(mockedFs.existsSync).toHaveBeenCalled()
+      expect(fs.promises.readdir).toHaveBeenCalled()
     })
 
     it('should throw error when extension directory does not exist', async () => {
-      const mockedFs = vi.mocked(fs)
-      mockedFs.existsSync.mockReturnValue(false)
+      mockReaddir().mockRejectedValueOnce(Object.assign(new Error('ENOENT'), { code: 'ENOENT' }))
 
       await expect(getPolkadotJSExtensionPath()).rejects.toThrow(
         'Polkadot-JS extension not found',
@@ -65,9 +64,7 @@ describe('polkadot-js wallet', () => {
     })
 
     it('should throw error when extension directory is empty', async () => {
-      const mockedFs = vi.mocked(fs)
-      mockedFs.existsSync.mockReturnValue(true)
-      mockedFs.readdirSync.mockReturnValue([])
+      mockReaddir().mockResolvedValueOnce([])
 
       await expect(getPolkadotJSExtensionPath()).rejects.toThrow(
         'Polkadot-JS extension not found',
@@ -75,8 +72,7 @@ describe('polkadot-js wallet', () => {
     })
 
     it('should include download instructions in error message', async () => {
-      const mockedFs = vi.mocked(fs)
-      mockedFs.existsSync.mockReturnValue(false)
+      mockReaddir().mockRejectedValueOnce(Object.assign(new Error('ENOENT'), { code: 'ENOENT' }))
 
       await expect(getPolkadotJSExtensionPath()).rejects.toThrow(
         'npx @avalix/chroma download-extensions',
@@ -84,9 +80,7 @@ describe('polkadot-js wallet', () => {
     })
 
     it('should use correct path structure', async () => {
-      const mockedFs = vi.mocked(fs)
-      mockedFs.existsSync.mockReturnValue(true)
-      mockedFs.readdirSync.mockReturnValue(['manifest.json'] as any)
+      mockReaddir().mockResolvedValueOnce(['manifest.json'])
 
       const result = await getPolkadotJSExtensionPath()
 

package/src/wallets/polkadot-js.ts

@@ -1,8 +1,10 @@
-import type { BrowserContext, Page } from '@playwright/test'
+import type { BrowserContext } from '@playwright/test'
 import type { WalletAccount } from '../context-playwright/types.js'
 import fs from 'node:fs'
 import path from 'node:path'
 import process from 'node:process'
+import { findExtensionPopup } from '../utils/find-extension-popup.js'
+import { DEFAULT_TEST_PASSWORD } from '../utils/test-defaults.js'
 
 // Polkadot-JS specific configuration
 // https://github.com/polkadot-js/extension/releases
@@ -12,42 +14,14 @@ export const POLKADOT_JS_CONFIG = {
   extensionName: `polkadot-extension-${VERSION}`,
 } as const
 
-/*
- * Helper function to find extension popup
- * Coverage excluded: requires real browser context with Chrome extension APIs.
- */
-/* c8 ignore start */
-async function findExtensionPopup(context: BrowserContext, extensionId: string): Promise<Page> {
-  // Wait for extension popup to appear with retry logic
-  const maxAttempts = 10
-  const retryDelay = 500
-
-  for (let attempt = 0; attempt < maxAttempts; attempt++) {
-    const pages = context.pages()
-    for (const p of pages) {
-      if (p.url().includes(`chrome-extension://${extensionId}/`)) {
-        await p.waitForLoadState('domcontentloaded')
-        return p
-      }
-    }
-
-    // If not found, wait a bit before retrying
-    if (attempt < maxAttempts - 1) {
-      await new Promise(resolve => setTimeout(resolve, retryDelay))
-    }
-  }
-
-  throw new Error(`Extension popup not found for ID: ${extensionId}`)
-}
-/* c8 ignore stop */
-
 // Get Polkadot-JS extension path
 export async function getPolkadotJSExtensionPath(): Promise<string> {
   const extensionsDir = path.resolve(process.cwd(), '.chroma')
   const extensionDir = path.join(extensionsDir, POLKADOT_JS_CONFIG.extensionName)
 
-  // Check if extension exists
-  if (!fs.existsSync(extensionDir) || fs.readdirSync(extensionDir).length === 0) {
+  // Check if extension exists (readdir rejects if missing → treat as empty)
+  const entries = await fs.promises.readdir(extensionDir).catch(() => [] as string[])
+  if (entries.length === 0) {
     throw new Error(
       `Polkadot-JS extension not found at: ${extensionDir}\n\n`
       + `Please download the extension first by running:\n`
@@ -67,12 +41,10 @@ export async function getPolkadotJSExtensionPath(): Promise<string> {
 
 // Polkadot-JS specific account import implementation
 export async function importPolkadotJSAccount(
-  page: Page & { __extensionContext: BrowserContext, __extensionId: string },
-  { seed, name = 'Test Account', password = 'h3llop0lkadot!' }: WalletAccount,
+  context: BrowserContext,
+  extensionId: string,
+  { seed, name = 'Test Account', password = DEFAULT_TEST_PASSWORD }: WalletAccount,
 ): Promise<void> {
-  const context = page.__extensionContext
-  const extensionId = page.__extensionId
-
   const extensionPopupUrl = `chrome-extension://${extensionId}/index.html`
   const extensionPage = await context.newPage()
 
@@ -83,12 +55,11 @@ export async function importPolkadotJSAccount(
     const understoodButton = extensionPage.getByRole('button', { name: 'Understood, let me continue' })
     if (await understoodButton.count() > 0) {
       await understoodButton.click()
-      await extensionPage.waitForTimeout(100)
     }
 
-    if (await extensionPage.getByRole('button', { name: 'I Understand' }).isVisible()) {
-      await extensionPage.getByRole('button', { name: 'I Understand' }).click()
-    }
+    // The "I Understand" disclaimer may follow; wait briefly for it to settle.
+    const iUnderstand = extensionPage.getByRole('button', { name: 'I Understand' })
+    await iUnderstand.click({ timeout: 1000 }).catch(() => {})
 
     // Navigate to import seed page
     await extensionPage.goto(`${extensionPopupUrl}#/account/import-seed`)
@@ -108,11 +79,9 @@ export async function importPolkadotJSAccount(
 
 // Polkadot-JS specific authorization implementation
 export async function authorizePolkadotJS(
-  page: Page & { __extensionContext: BrowserContext, __extensionId: string },
+  context: BrowserContext,
+  extensionId: string,
 ): Promise<void> {
-  const context = page.__extensionContext
-  const extensionId = page.__extensionId
-
   const extensionPopup = await findExtensionPopup(context, extensionId)
 
   if (await extensionPopup.getByRole('button', { name: 'I Understand' }).isVisible()) {
@@ -132,13 +101,11 @@ export async function authorizePolkadotJS(
 
 // Polkadot-JS specific transaction approval implementation
 export async function approvePolkadotJSTx(
-  page: Page & { __extensionContext: BrowserContext, __extensionId: string },
+  context: BrowserContext,
+  extensionId: string,
   options: { password?: string } = {},
 ): Promise<void> {
-  const { password = 'h3llop0lkadot!' } = options
-  const context = page.__extensionContext
-  const extensionId = page.__extensionId
-
+  const { password = DEFAULT_TEST_PASSWORD } = options
   const extensionPopup = await findExtensionPopup(context, extensionId)
   await extensionPopup.getByRole('textbox').fill(password)
   await extensionPopup.getByRole('button', { name: 'Sign the transaction' }).click()
@@ -146,11 +113,9 @@ export async function approvePolkadotJSTx(
 
 // Polkadot-JS specific transaction rejection implementation
 export async function rejectPolkadotJSTx(
-  page: Page & { __extensionContext: BrowserContext, __extensionId: string },
+  context: BrowserContext,
+  extensionId: string,
 ): Promise<void> {
-  const context = page.__extensionContext
-  const extensionId = page.__extensionId
-
   const extensionPopup = await findExtensionPopup(context, extensionId)
   await extensionPopup.getByRole('link', { name: 'Cancel' }).click()
 }

package/src/wallets/talisman.test.ts

@@ -13,11 +13,11 @@ vi.mock('node:fs', async () => {
     ...actual,
     default: {
       ...actual,
-      existsSync: vi.fn(),
-      readdirSync: vi.fn(),
+      promises: {
+        ...actual.promises,
+        readdir: vi.fn(),
+      },
     },
-    existsSync: vi.fn(),
-    readdirSync: vi.fn(),
   }
 })
 
@@ -43,21 +43,20 @@ describe('talisman wallet', () => {
   })
 
   describe('getTalismanExtensionPath', () => {
+    const mockReaddir = () => vi.mocked(fs.promises.readdir) as unknown as ReturnType<typeof vi.fn>
+
     it('should return extension path when extension exists', async () => {
-      const mockedFs = vi.mocked(fs)
-      mockedFs.existsSync.mockReturnValue(true)
-      mockedFs.readdirSync.mockReturnValue(['manifest.json'] as any)
+      mockReaddir().mockResolvedValueOnce(['manifest.json'])
 
       const result = await getTalismanExtensionPath()
 
       expect(result).toContain('.chroma')
       expect(result).toContain(TALISMAN_CONFIG.extensionName)
-      expect(mockedFs.existsSync).toHaveBeenCalled()
+      expect(fs.promises.readdir).toHaveBeenCalled()
     })
 
     it('should throw error when extension directory does not exist', async () => {
-      const mockedFs = vi.mocked(fs)
-      mockedFs.existsSync.mockReturnValue(false)
+      mockReaddir().mockRejectedValueOnce(Object.assign(new Error('ENOENT'), { code: 'ENOENT' }))
 
       await expect(getTalismanExtensionPath()).rejects.toThrow(
         'Talisman extension not found',
@@ -65,9 +64,7 @@ describe('talisman wallet', () => {
     })
 
     it('should throw error when extension directory is empty', async () => {
-      const mockedFs = vi.mocked(fs)
-      mockedFs.existsSync.mockReturnValue(true)
-      mockedFs.readdirSync.mockReturnValue([])
+      mockReaddir().mockResolvedValueOnce([])
 
       await expect(getTalismanExtensionPath()).rejects.toThrow(
         'Talisman extension not found',
@@ -75,8 +72,7 @@ describe('talisman wallet', () => {
     })
 
     it('should include download instructions in error message', async () => {
-      const mockedFs = vi.mocked(fs)
-      mockedFs.existsSync.mockReturnValue(false)
+      mockReaddir().mockRejectedValueOnce(Object.assign(new Error('ENOENT'), { code: 'ENOENT' }))
 
       await expect(getTalismanExtensionPath()).rejects.toThrow(
         'npx @avalix/chroma download-extensions',
@@ -84,9 +80,7 @@ describe('talisman wallet', () => {
     })
 
     it('should use correct path structure', async () => {
-      const mockedFs = vi.mocked(fs)
-      mockedFs.existsSync.mockReturnValue(true)
-      mockedFs.readdirSync.mockReturnValue(['manifest.json'] as any)
+      mockReaddir().mockResolvedValueOnce(['manifest.json'])
 
       const result = await getTalismanExtensionPath()