@avalix/chroma 0.0.8 → 0.0.10

package/dist/{index.js → index.mjs}

@@ -4,20 +4,28 @@ import path from "node:path";
 import process from "node:process";
 
 //#region src/wallets/polkadot-js.ts
+const VERSION$1 = "0.62.6";
 const POLKADOT_JS_CONFIG = {
-	downloadUrl: "https://github.com/polkadot-js/extension/releases/download/v0.61.7/master-chrome-build.zip",
-	extensionName: "polkadot-extension-0.61.7"
+	downloadUrl: `https://github.com/polkadot-js/extension/releases/download/v${VERSION$1}/master-chrome-build.zip`,
+	extensionName: `polkadot-extension-${VERSION$1}`
 };
 async function findExtensionPopup$1(context, extensionId) {
-	const pages = context.pages();
-	for (const p of pages) if (p.url().includes(`chrome-extension://${extensionId}/`)) return p;
+	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 (attempt < maxAttempts - 1) await new Promise((resolve) => setTimeout(resolve, retryDelay));
+	}
 	throw new Error(`Extension popup not found for ID: ${extensionId}`);
 }
 async function getPolkadotJSExtensionPath() {
 	const extensionsDir = path.resolve(process.cwd(), ".chroma");
 	const extensionDir = path.join(extensionsDir, POLKADOT_JS_CONFIG.extensionName);
-	if (!fs.existsSync(extensionDir) || fs.readdirSync(extensionDir).length === 0) throw new Error(`Polkadot-JS extension not found at: ${extensionDir}\n\nPlease download the extension first by running:\n  npx @avalix/chroma download-extensions\n\nOr if you're using this as a dependency:\n  npm run chroma:download\n`);
-	console.log(`✅ Found Polkadot-JS extension at: ${extensionDir}`);
+	if (!fs.existsSync(extensionDir) || fs.readdirSync(extensionDir).length === 0) throw new Error(`Polkadot-JS extension not found at: ${extensionDir}\n\nPlease download the extension first by running:\n  npx @avalix/chroma download-extensions\n`);
 	return extensionDir;
 }
 async function importPolkadotJSAccount(page, { seed, name = "Test Account", password = "h3llop0lkadot!" }) {
@@ -31,6 +39,7 @@ async function importPolkadotJSAccount(page, { seed, name = "Test Account", pass
 			await understoodButton.click();
 			await extensionPage.waitForTimeout(100);
 		}
+		if (await extensionPage.getByRole("button", { name: "I Understand" }).isVisible()) await extensionPage.getByRole("button", { name: "I Understand" }).click();
 		await extensionPage.goto(`${extensionPopupUrl}#/account/import-seed`);
 		await extensionPage.locator("textarea").fill(seed);
 		await extensionPage.locator("button:has-text(\"Next\")").click();
@@ -38,7 +47,6 @@ async function importPolkadotJSAccount(page, { seed, name = "Test Account", pass
 		await extensionPage.locator("input[type=\"password\"]").fill(password);
 		await extensionPage.locator("div").filter({ hasText: /^Repeat password for verification$/ }).getByRole("textbox").fill(password);
 		await extensionPage.getByRole("button", { name: "Add the account with the supplied seed" }).click();
-		console.log(`✅ Created Polkadot-JS wallet account: ${name}`);
 	} finally {
 		await extensionPage.close();
 	}
@@ -46,69 +54,76 @@ async function importPolkadotJSAccount(page, { seed, name = "Test Account", pass
 async function authorizePolkadotJS(page) {
 	const context = page.__extensionContext;
 	const extensionId = page.__extensionId;
-	await new Promise((resolve) => setTimeout(resolve, 1e3));
 	const extensionPopup = await findExtensionPopup$1(context, extensionId);
-	await extensionPopup.getByText("Select all").click();
+	if (await extensionPopup.getByRole("button", { name: "I Understand" }).isVisible()) await extensionPopup.getByRole("button", { name: "I Understand" }).click();
+	if (!await extensionPopup.getByText("Select all").locator("..").locator("input[type=\"checkbox\"]").isChecked().catch(() => false)) await extensionPopup.getByText("Select all").click();
 	await extensionPopup.getByRole("button", { name: /Connect \d+ account\(s\)/ }).click();
-	console.log("✅ Polkadot-JS wallet connected successfully");
 }
 async function approvePolkadotJSTx(page, options = {}) {
 	const { password = "h3llop0lkadot!" } = options;
 	const context = page.__extensionContext;
 	const extensionId = page.__extensionId;
-	await new Promise((resolve) => setTimeout(resolve, 1e3));
 	const extensionPopup = await findExtensionPopup$1(context, extensionId);
 	await extensionPopup.getByRole("textbox").fill(password);
 	await extensionPopup.getByRole("button", { name: "Sign the transaction" }).click();
-	console.log("✅ Polkadot-JS transaction signed successfully");
+}
+async function rejectPolkadotJSTx(page) {
+	const context = page.__extensionContext;
+	const extensionId = page.__extensionId;
+	await (await findExtensionPopup$1(context, extensionId)).getByRole("link", { name: "Cancel" }).click();
 }
 
 //#endregion
 //#region src/wallets/talisman.ts
+const VERSION = "3.1.13";
 const TALISMAN_CONFIG = {
-	downloadUrl: "https://github.com/avalix-labs/polkadot-wallets/raw/refs/heads/main/talisman/talisman-3.0.5.zip",
-	extensionName: "talisman-extension-3.0.5"
+	downloadUrl: `https://github.com/avalix-labs/polkadot-wallets/raw/refs/heads/main/talisman/talisman-${VERSION}.zip`,
+	extensionName: `talisman-extension-${VERSION}`
 };
 async function findExtensionPopup(context, extensionId) {
-	await new Promise((resolve) => setTimeout(resolve, 1e3));
-	const pages = context.pages();
-	for (const p of pages) if (p.url().includes(`chrome-extension://${extensionId}/`)) {
-		p.setViewportSize({
-			width: 400,
-			height: 600
-		});
-		p.waitForLoadState("domcontentloaded");
-		return p;
+	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.setViewportSize({
+				width: 400,
+				height: 600
+			});
+			await p.waitForLoadState("domcontentloaded");
+			return p;
+		}
+		if (attempt < maxAttempts - 1) await new Promise((resolve) => setTimeout(resolve, retryDelay));
 	}
 	throw new Error(`Extension popup not found for ID: ${extensionId}`);
 }
 async function getTalismanExtensionPath() {
 	const extensionsDir = path.resolve(process.cwd(), ".chroma");
 	const extensionDir = path.join(extensionsDir, TALISMAN_CONFIG.extensionName);
-	if (!fs.existsSync(extensionDir) || fs.readdirSync(extensionDir).length === 0) throw new Error(`Talisman extension not found at: ${extensionDir}\n\nPlease download the extension first by running:\n  npx @avalix/chroma download-extensions\n\nOr if you're using this as a dependency:\n  npm run chroma:download\n`);
-	console.log(`✅ Found Talisman extension at: ${extensionDir}`);
+	if (!fs.existsSync(extensionDir) || fs.readdirSync(extensionDir).length === 0) throw new Error(`Talisman extension not found at: ${extensionDir}\n\nPlease download the extension first by running:\n  npx @avalix/chroma download-extensions\n`);
 	return extensionDir;
 }
 async function importEthPrivateKey(page, { seed, name = "Test Account", password = "h3llop0lkadot!" }) {
 	const context = page.__extensionContext;
 	const extensionId = page.__extensionId;
-	await new Promise((resolve) => setTimeout(resolve, 2e3));
+	const maxAttempts = 20;
+	const retryDelay = 500;
 	let extensionPage = null;
-	const pages = context.pages();
-	for (const page$1 of pages) {
-		const url = page$1.url();
-		console.log(`📄 Found page: ${url}`);
-		if (url.includes("onboarding.html") || url.includes(`chrome-extension://${extensionId}/`)) {
-			extensionPage = page$1;
-			console.log(`✅ Found Talisman onboarding page: ${url}`);
-			break;
+	for (let attempt = 0; attempt < maxAttempts; attempt++) {
+		const pages = context.pages();
+		for (const p of pages) {
+			const url = p.url();
+			if (url.includes("onboarding.html") || url.includes(`chrome-extension://${extensionId}/`)) {
+				extensionPage = p;
+				break;
+			}
 		}
+		if (extensionPage) break;
+		if (attempt < maxAttempts - 1) await new Promise((resolve) => setTimeout(resolve, retryDelay));
 	}
-	if (!extensionPage) throw new Error(`Talisman onboarding page not found`);
+	if (!extensionPage) throw new Error(`Talisman onboarding page not found after ${maxAttempts} attempts`);
 	try {
 		await extensionPage.bringToFront();
-		console.log("🔄 Reloading onboarding page for fresh state...");
-		await extensionPage.reload();
 		await extensionPage.waitForLoadState("domcontentloaded");
 		await extensionPage.getByTestId("onboarding-get-started-button").click();
 		await extensionPage.getByRole("textbox", { name: "Enter password" }).fill(password);
@@ -125,7 +140,6 @@ async function importEthPrivateKey(page, { seed, name = "Test Account", password
 		await extensionPage.getByRole("textbox", { name: "Enter your private key" }).fill(seed);
 		await extensionPage.getByRole("button", { name: "Save" }).click();
 		await extensionPage.close();
-		console.log("✅ Talisman account import completed");
 	} catch (error) {
 		console.error("❌ Error during Talisman account import:", error);
 		throw error;
@@ -135,21 +149,28 @@ async function authorizeTalisman(page, options = {}) {
 	const { accountName = "Test Account" } = options;
 	const context = page.__extensionContext;
 	const extensionId = page.__extensionId;
-	await new Promise((resolve) => setTimeout(resolve, 1e3));
 	const extensionPopup = await findExtensionPopup(context, extensionId);
 	await extensionPopup.getByRole("button", { name: accountName }).click();
 	await extensionPopup.getByTestId("connection-connect-button").click();
 	try {
 		await (await findExtensionPopup(context, extensionId)).getByRole("button", { name: "Approve" }).click();
+	} catch {}
+}
+async function approveTalismanTx(page) {
+	const context = page.__extensionContext;
+	const extensionId = page.__extensionId;
+	const extensionPopup = await findExtensionPopup(context, extensionId);
+	try {
+		await extensionPopup.getByRole("button", { name: "Yes" }).click();
 	} catch {
 		console.log("No another popup found, skipping");
 	}
+	await extensionPopup.getByRole("button", { name: "Approve" }).click();
 }
-async function approveTalismanTx(page) {
+async function rejectTalismanTx(page) {
 	const context = page.__extensionContext;
 	const extensionId = page.__extensionId;
-	await new Promise((resolve) => setTimeout(resolve, 1e3));
-	await (await findExtensionPopup(context, extensionId)).getByRole("button", { name: "Approve" }).click();
+	await (await findExtensionPopup(context, extensionId)).getByTestId("connection-reject-button").click();
 }
 
 //#endregion
@@ -169,8 +190,7 @@ function createWalletInstance(walletType, extensionId, context) {
 	const baseInstance = {
 		extensionId,
 		importMnemonic: async (options) => {
-			const page = context.pages()[0] || await context.newPage();
-			const extPage = createExtendedPage(page, context, extensionId);
+			const extPage = createExtendedPage(context.pages()[0] || await context.newPage(), context, extensionId);
 			importedAccountName = options.name || "Test Account";
 			switch (walletType) {
 				case "polkadot-js":
@@ -181,8 +201,7 @@ function createWalletInstance(walletType, extensionId, context) {
 			}
 		},
 		authorize: async (options = {}) => {
-			const page = context.pages()[0] || await context.newPage();
-			const extPage = createExtendedPage(page, context, extensionId);
+			const extPage = createExtendedPage(context.pages()[0] || await context.newPage(), context, extensionId);
 			const accountName = options.accountName || importedAccountName;
 			switch (walletType) {
 				case "polkadot-js":
@@ -195,8 +214,7 @@ function createWalletInstance(walletType, extensionId, context) {
 			}
 		},
 		approveTx: async (options = {}) => {
-			const page = context.pages()[0] || await context.newPage();
-			const extPage = createExtendedPage(page, context, extensionId);
+			const extPage = createExtendedPage(context.pages()[0] || await context.newPage(), context, extensionId);
 			switch (walletType) {
 				case "polkadot-js":
 					await approvePolkadotJSTx(extPage, options);
@@ -206,6 +224,18 @@ function createWalletInstance(walletType, extensionId, context) {
 					break;
 				default: throw new Error(`Unsupported wallet type: ${walletType}`);
 			}
+		},
+		rejectTx: async () => {
+			const extPage = createExtendedPage(context.pages()[0] || await context.newPage(), context, extensionId);
+			switch (walletType) {
+				case "polkadot-js":
+					await rejectPolkadotJSTx(extPage);
+					break;
+				case "talisman":
+					await rejectTalismanTx(extPage);
+					break;
+				default: throw new Error(`Unsupported wallet type: ${walletType}`);
+			}
 		}
 	};
 	switch (walletType) {
@@ -217,8 +247,7 @@ function createWalletInstance(walletType, extensionId, context) {
 			...baseInstance,
 			type: "talisman",
 			importEthPrivateKey: async (options) => {
-				const page = context.pages()[0] || await context.newPage();
-				const extPage = createExtendedPage(page, context, extensionId);
+				const extPage = createExtendedPage(context.pages()[0] || await context.newPage(), context, extensionId);
 				importedAccountName = options.name || "Test Account";
 				await importEthPrivateKey(extPage, {
 					seed: options.privateKey,
@@ -266,7 +295,6 @@ function createWalletTest(options = {}) {
 				const extensionId = allServiceWorkers[i].url().split("/")[2];
 				const walletType = walletConfigs[i].type;
 				extensionIds.set(walletType, extensionId);
-				console.log(`✅ Loaded ${walletType} extension with ID: ${extensionId}`);
 			}
 			await use(extensionIds);
 		}, { scope: "worker" }],

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@avalix/chroma",
   "type": "module",
-  "version": "0.0.8",
+  "version": "0.0.10",
   "description": "End-to-end testing library for Polkadot wallet interactions",
   "author": "Avalix Labs",
   "license": "MIT",
@@ -24,12 +24,12 @@
     "blockchain"
   ],
   "exports": {
-    ".": "./dist/index.js",
+    ".": "./dist/index.mjs",
     "./package.json": "./package.json"
   },
-  "main": "./dist/index.js",
-  "module": "./dist/index.js",
-  "types": "./dist/index.d.ts",
+  "main": "./dist/index.mjs",
+  "module": "./dist/index.mjs",
+  "types": "./dist/index.d.mts",
   "bin": {
     "chroma": "./scripts/cli.js"
   },
@@ -43,22 +43,23 @@
     "dev": "tsdown --watch",
     "lint": "eslint --fix .",
     "prepublishOnly": "npm run build",
-    "download-extensions": "rm -rf .chroma && tsx scripts/download-extensions.ts"
+    "download-extensions": "rm -rf .chroma && tsx scripts/download-extensions.ts",
+    "test": "playwright test --ui"
   },
   "peerDependencies": {
-    "@playwright/test": "^1.55.0"
+    "@playwright/test": "^1.57.0"
   },
   "dependencies": {
-    "unzipper": "^0.12.3"
+    "adm-zip": "^0.5.16"
   },
   "devDependencies": {
-    "@antfu/eslint-config": "^5.3.0",
-    "@playwright/test": "^1.55.0",
-    "@types/node": "^24.3.3",
-    "@types/unzipper": "^0.10.10",
-    "eslint": "^9.35.0",
+    "@antfu/eslint-config": "^6.5.1",
+    "@playwright/test": "^1.57.0",
+    "@types/node": "^24.10.2",
+    "@types/unzipper": "^0.10.11",
+    "eslint": "^9.39.1",
     "tsdown": "latest",
-    "tsx": "^4.20.6"
+    "tsx": "^4.21.0"
   },
   "publishConfig": {
     "access": "public"

package/scripts/download-extensions.ts

@@ -1,13 +1,38 @@
 #!/usr/bin/env node
+import fs from 'node:fs'
+import path from 'node:path'
 import process from 'node:process'
+import { fileURLToPath } from 'node:url'
 import { downloadAndExtractExtension } from '../src/utils/download-extension.js'
 import { POLKADOT_JS_CONFIG } from '../src/wallets/polkadot-js.js'
 import { TALISMAN_CONFIG } from '../src/wallets/talisman.js'
 
+const __dirname = path.dirname(fileURLToPath(import.meta.url))
+
+async function getVersion(): Promise<string> {
+  const packageJsonPath = path.resolve(__dirname, '../package.json')
+  const packageJson = JSON.parse(await fs.promises.readFile(packageJsonPath, 'utf-8'))
+  return packageJson.version
+}
+
+async function clearChromaDir(): Promise<void> {
+  const chromaDir = path.resolve(process.cwd(), '.chroma')
+
+  if (fs.existsSync(chromaDir)) {
+    console.log('🗑️  Clearing existing .chroma directory...')
+    await fs.promises.rm(chromaDir, { recursive: true, force: true })
+  }
+}
+
 async function main() {
-  console.log('🚀 Downloading Chroma wallet extensions...\n')
+  const version = await getVersion()
+  console.log(`🎨 Chroma v${version}\n`)
+  console.log('🚀 Downloading wallet extensions...\n')
 
   try {
+    // Clear existing .chroma directory
+    await clearChromaDir()
+
     // Download Polkadot-JS extension
     await downloadAndExtractExtension({
       downloadUrl: POLKADOT_JS_CONFIG.downloadUrl,

package/src/context-playwright/index.ts

@@ -97,7 +97,6 @@ export function createWalletTest<const T extends readonly WalletConfig[]>(
         const extensionId = allServiceWorkers[i].url().split('/')[2]
         const walletType = walletConfigs[i].type
         extensionIds.set(walletType, extensionId)
-        console.log(`✅ Loaded ${walletType} extension with ID: ${extensionId}`)
       }
 
       await use(extensionIds)

package/src/context-playwright/types.ts

@@ -25,6 +25,7 @@ export interface BaseWalletInstance {
   importMnemonic: (options: WalletAccount) => Promise<void>
   authorize: (options?: { accountName?: string }) => Promise<void>
   approveTx: (options?: { password?: string }) => Promise<void>
+  rejectTx: () => Promise<void>
 }
 
 // Polkadot-JS specific wallet instance

package/src/context-playwright/wallet-factory.ts

@@ -10,11 +10,13 @@ import {
   approvePolkadotJSTx,
   authorizePolkadotJS,
   importPolkadotJSAccount,
+  rejectPolkadotJSTx,
 } from '../wallets/polkadot-js.js'
 import {
   approveTalismanTx,
   authorizeTalisman,
   importEthPrivateKey,
+  rejectTalismanTx,
 } from '../wallets/talisman.js'
 
 // Helper to create extended page with wallet context
@@ -87,6 +89,21 @@ export function createWalletInstance(
           throw new Error(`Unsupported wallet type: ${walletType}`)
       }
     },
+    rejectTx: async () => {
+      const page = context.pages()[0] || await context.newPage()
+      const extPage = createExtendedPage(page, context, extensionId)
+
+      switch (walletType) {
+        case 'polkadot-js':
+          await rejectPolkadotJSTx(extPage)
+          break
+        case 'talisman':
+          await rejectTalismanTx(extPage)
+          break
+        default:
+          throw new Error(`Unsupported wallet type: ${walletType}`)
+      }
+    },
   }
 
   // Return wallet-specific instance with type discriminator

package/src/utils/download-extension.ts

@@ -2,7 +2,7 @@ import fs, { createWriteStream } from 'node:fs'
 import path from 'node:path'
 import process from 'node:process'
 import { pipeline } from 'node:stream/promises'
-import { Extract } from 'unzipper'
+import AdmZip from 'adm-zip'
 
 export interface DownloadExtensionOptions {
   downloadUrl: string
@@ -10,6 +10,11 @@ export interface DownloadExtensionOptions {
   targetDir?: string
 }
 
+function unzipFile(zipPath: string, destDir: string): void {
+  const zip = new AdmZip(zipPath)
+  zip.extractAllTo(destDir, true)
+}
+
 export async function downloadAndExtractExtension(options: DownloadExtensionOptions): Promise<string> {
   const { downloadUrl, extensionName, targetDir } = options
 
@@ -17,6 +22,7 @@ export async function downloadAndExtractExtension(options: DownloadExtensionOpti
   const extensionsDir = targetDir || path.resolve(process.cwd(), '.chroma')
   const extensionDir = path.join(extensionsDir, extensionName)
   const zipPath = path.join(extensionsDir, `${extensionName}.zip`)
+  const tempExtractDir = path.join(extensionsDir, `${extensionName}-temp`)
 
   // Create extensions directory if it doesn't exist
   await fs.promises.mkdir(extensionsDir, { recursive: true })
@@ -42,11 +48,29 @@ export async function downloadAndExtractExtension(options: DownloadExtensionOpti
 
     console.log('📦 Extracting extension...')
 
-    // Standard zip extraction
-    await pipeline(
-      fs.createReadStream(zipPath),
-      Extract({ path: extensionDir }),
-    )
+    // Extract to temp directory first
+    await fs.promises.mkdir(tempExtractDir, { recursive: true })
+    unzipFile(zipPath, tempExtractDir)
+
+    // Check if it's a nested zip (contains another .zip file)
+    const files = await fs.promises.readdir(tempExtractDir)
+    const nestedZip = files.find(f => f.endsWith('.zip'))
+
+    if (nestedZip) {
+      console.log(`📦 Found nested zip: ${nestedZip}, extracting...`)
+      const nestedZipPath = path.join(tempExtractDir, nestedZip)
+
+      // Extract the nested zip to final location
+      await fs.promises.mkdir(extensionDir, { recursive: true })
+      unzipFile(nestedZipPath, extensionDir)
+
+      // Clean up temp directory
+      await fs.promises.rm(tempExtractDir, { recursive: true, force: true })
+    }
+    else {
+      // No nested zip, just rename temp to final
+      await fs.promises.rename(tempExtractDir, extensionDir)
+    }
 
     // Clean up ZIP file
     await fs.promises.unlink(zipPath)
@@ -62,6 +86,9 @@ export async function downloadAndExtractExtension(options: DownloadExtensionOpti
     if (fs.existsSync(extensionDir)) {
       await fs.promises.rm(extensionDir, { recursive: true, force: true }).catch(() => {})
     }
+    if (fs.existsSync(tempExtractDir)) {
+      await fs.promises.rm(tempExtractDir, { recursive: true, force: true }).catch(() => {})
+    }
 
     throw new Error(`Failed to download/extract ${extensionName}: ${error instanceof Error ? error.message : String(error)}`)
   }

package/src/wallets/polkadot-js.ts

@@ -5,19 +5,34 @@ import path from 'node:path'
 import process from 'node:process'
 
 // Polkadot-JS specific configuration
+// https://github.com/polkadot-js/extension/releases
+const VERSION = '0.62.6'
 export const POLKADOT_JS_CONFIG = {
-  downloadUrl: 'https://github.com/polkadot-js/extension/releases/download/v0.61.7/master-chrome-build.zip',
-  extensionName: 'polkadot-extension-0.61.7',
+  downloadUrl: `https://github.com/polkadot-js/extension/releases/download/v${VERSION}/master-chrome-build.zip`,
+  extensionName: `polkadot-extension-${VERSION}`,
 } as const
 
 // Helper function to find extension popup
 async function findExtensionPopup(context: BrowserContext, extensionId: string): Promise<Page> {
-  const pages = context.pages()
-  for (const p of pages) {
-    if (p.url().includes(`chrome-extension://${extensionId}/`)) {
-      return p
+  // 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}`)
 }
 
@@ -31,13 +46,10 @@ export async function getPolkadotJSExtensionPath(): Promise<string> {
     throw new Error(
       `Polkadot-JS extension not found at: ${extensionDir}\n\n`
       + `Please download the extension first by running:\n`
-      + `  npx @avalix/chroma download-extensions\n\n`
-      + `Or if you're using this as a dependency:\n`
-      + `  npm run chroma:download\n`,
+      + `  npx @avalix/chroma download-extensions\n`,
     )
   }
 
-  console.log(`✅ Found Polkadot-JS extension at: ${extensionDir}`)
   return extensionDir
 }
 
@@ -62,6 +74,10 @@ export async function importPolkadotJSAccount(
       await extensionPage.waitForTimeout(100)
     }
 
+    if (await extensionPage.getByRole('button', { name: 'I Understand' }).isVisible()) {
+      await extensionPage.getByRole('button', { name: 'I Understand' }).click()
+    }
+
     // Navigate to import seed page
     await extensionPage.goto(`${extensionPopupUrl}#/account/import-seed`)
 
@@ -72,8 +88,6 @@ export async function importPolkadotJSAccount(
     await extensionPage.locator('input[type="password"]').fill(password)
     await extensionPage.locator('div').filter({ hasText: /^Repeat password for verification$/ }).getByRole('textbox').fill(password)
     await extensionPage.getByRole('button', { name: 'Add the account with the supplied seed' }).click()
-
-    console.log(`✅ Created Polkadot-JS wallet account: ${name}`)
   }
   finally {
     await extensionPage.close()
@@ -86,13 +100,22 @@ export async function authorizePolkadotJS(
 ): Promise<void> {
   const context = page.__extensionContext
   const extensionId = page.__extensionId
-  await new Promise(resolve => setTimeout(resolve, 1000))
 
   const extensionPopup = await findExtensionPopup(context, extensionId)
-  await extensionPopup.getByText('Select all').click()
-  await extensionPopup.getByRole('button', { name: /Connect \d+ account\(s\)/ }).click()
 
-  console.log('✅ Polkadot-JS wallet connected successfully')
+  if (await extensionPopup.getByRole('button', { name: 'I Understand' }).isVisible()) {
+    await extensionPopup.getByRole('button', { name: 'I Understand' }).click()
+  }
+
+  // Check if "Select all" checkbox is already checked
+  const selectAllCheckbox = extensionPopup.getByText('Select all').locator('..').locator('input[type="checkbox"]')
+  const isChecked = await selectAllCheckbox.isChecked().catch(() => false)
+
+  if (!isChecked) {
+    await extensionPopup.getByText('Select all').click()
+  }
+
+  await extensionPopup.getByRole('button', { name: /Connect \d+ account\(s\)/ }).click()
 }
 
 // Polkadot-JS specific transaction approval implementation
@@ -104,11 +127,18 @@ export async function approvePolkadotJSTx(
   const context = page.__extensionContext
   const extensionId = page.__extensionId
 
-  await new Promise(resolve => setTimeout(resolve, 1000))
   const extensionPopup = await findExtensionPopup(context, extensionId)
-
   await extensionPopup.getByRole('textbox').fill(password)
   await extensionPopup.getByRole('button', { name: 'Sign the transaction' }).click()
+}
+
+// Polkadot-JS specific transaction rejection implementation
+export async function rejectPolkadotJSTx(
+  page: Page & { __extensionContext: BrowserContext, __extensionId: string },
+): Promise<void> {
+  const context = page.__extensionContext
+  const extensionId = page.__extensionId
 
-  console.log('✅ Polkadot-JS transaction signed successfully')
+  const extensionPopup = await findExtensionPopup(context, extensionId)
+  await extensionPopup.getByRole('link', { name: 'Cancel' }).click()
 }