From 56f276af1b9258d6ad866b950aabb091236b6567 Mon Sep 17 00:00:00 2001
From: Kurdistan Tech Ministry <info@pezkuwichain.io>
Date: Tue, 5 May 2026 13:12:36 +0300
Subject: [PATCH] fix(wallet): add 20s timeout to web3Enable to prevent
 indefinite hang

- Wrap web3Enable() with Promise.race against a 20-second timeout
- On timeout: show descriptive error explaining the popup may be blocked
- Surface actual error messages (incl. timeout) instead of generic 'Failed to connect wallet'
- Both auto-restore and manual connect button now fail fast instead of hanging
---
 web/src/contexts/PezkuwiContext.tsx | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/web/src/contexts/PezkuwiContext.tsx b/web/src/contexts/PezkuwiContext.tsx
index dd05bf0d..a70b99d4 100644
--- a/web/src/contexts/PezkuwiContext.tsx
+++ b/web/src/contexts/PezkuwiContext.tsx
@@ -22,6 +22,14 @@ if (typeof window !== 'undefined' && !import.meta.env.DEV) {
 import React, { createContext, useContext, useEffect, useState, useRef, ReactNode } from 'react';
 import { ApiPromise, WsProvider } from '@pezkuwi/api';
 import { web3Accounts, web3Enable } from '@pezkuwi/extension-dapp';
+
+const web3EnableWithTimeout = (origin: string, timeoutMs = 20_000): Promise<Awaited<ReturnType<typeof web3Enable>>> =>
+  Promise.race([
+    web3Enable(origin),
+    new Promise<never>((_, reject) =>
+      setTimeout(() => reject(new Error('Extension connection timed out. Please check if the extension popup is blocked by your browser, then click Authorize and try again.')), timeoutMs)
+    )
+  ]);
 import type { InjectedAccountWithMeta } from '@pezkuwi/extension-inject/types';
 import { DEFAULT_ENDPOINT } from '../../../shared/blockchain/pezkuwi';
 import { getCurrentNetworkConfig } from '../../../shared/blockchain/endpoints';
@@ -371,7 +379,7 @@ export const PezkuwiProvider: React.FC<PezkuwiProviderProps> = ({
 
       try {
         // Enable extension (works for both desktop extension and pezWallet DApps browser)
-        const extensions = await web3Enable('PezkuwiChain');
+        const extensions = await web3EnableWithTimeout('PezkuwiChain');
         if (extensions.length === 0) return;
 
         // Get accounts
@@ -449,7 +457,7 @@ export const PezkuwiProvider: React.FC<PezkuwiProviderProps> = ({
       // Desktop / pezWallet DApps browser: Try extension (injected provider)
       const hasExtension = !!(window as unknown as { injectedWeb3?: Record<string, unknown> }).injectedWeb3;
 
-      const extensions = await web3Enable('PezkuwiChain');
+      const extensions = await web3EnableWithTimeout('PezkuwiChain');
 
       if (extensions.length === 0) {
         if (hasExtension) {
@@ -490,7 +498,7 @@ export const PezkuwiProvider: React.FC<PezkuwiProviderProps> = ({
       if (import.meta.env.DEV) {
         console.error('❌ Wallet connection failed:', err);
       }
-      setError('Failed to connect wallet');
+      setError(err instanceof Error ? err.message : 'Failed to connect wallet');
     }
   };