tiwiflix-wallet-connector 1.5.3 → 1.5.5

package/dist/index.esm.js

@@ -2344,11 +2344,6 @@ class WalletConnector {
                 ...savedState,
                 error: null, // Don't restore errors
             };
-            // PATCH: Prevent invalid connected state
-            if (this.state.status === ConnectionStatus.CONNECTED && !this.state.account) {
-                this.state.status = ConnectionStatus.DISCONNECTED;
-                this.state.wallet = null;
-            }
         }
         this.eventEmitter = new EventEmitter$1();
         // Initialize advanced SDK management
@@ -2513,9 +2508,37 @@ class WalletConnector {
                                 });
                                 this.eventEmitter.emit(WalletEvent.CONNECTED, account);
                             }
+                            else {
+                                // No account found - user likely cancelled or connection failed
+                                this.debugTools.info('WALLET_CONNECTOR', 'No account found after visibility change - resetting state');
+                                clearTimeout(connectionTimeout);
+                                clearTimeout(safetyTimeout);
+                                document.removeEventListener('visibilitychange', handleVisibilityChange);
+                                this.updateState({
+                                    status: ConnectionStatus.DISCONNECTED,
+                                    wallet: null,
+                                    error: new Error('Connection cancelled or failed'),
+                                });
+                                this.eventEmitter.emit(WalletEvent.ERROR, new Error('Connection cancelled or failed'));
+                            }
                         }
                         catch (err) {
                             this.debugTools.warn('WALLET_CONNECTOR', 'Failed to check account on visibility change', err);
+                            // On error checking account, reset state after a longer delay
+                            setTimeout(() => {
+                                if (this.state.status === ConnectionStatus.CONNECTING) {
+                                    this.debugTools.info('WALLET_CONNECTOR', 'Still connecting after visibility check error - resetting state');
+                                    clearTimeout(connectionTimeout);
+                                    clearTimeout(safetyTimeout);
+                                    document.removeEventListener('visibilitychange', handleVisibilityChange);
+                                    this.updateState({
+                                        status: ConnectionStatus.DISCONNECTED,
+                                        wallet: null,
+                                        error: new Error('Connection timeout'),
+                                    });
+                                    this.eventEmitter.emit(WalletEvent.ERROR, new Error('Connection timeout'));
+                                }
+                            }, 3000); // Give it 3 more seconds
                         }
                     }
                 }, 1000);
@@ -7861,6 +7884,8 @@ const ConnectButton = ({ connector, onConnect, onDisconnect, onError, className,
         // Get initial state
         const initialState = connector.getState();
         setStatus(initialState.status);
+        // Safety: Clear isConnecting on mount (in case it was stuck from previous session)
+        setIsConnecting(false);
         // Only set wallets once to prevent re-renders
         if (!walletsRef.current) {
             walletsRef.current = connector.getAllWallets();
@@ -8064,10 +8089,10 @@ const ConnectButton = ({ connector, onConnect, onDisconnect, onError, className,
             });
         }
         // Subscribe to events
-        // Prevent repeated onConnect calls for the same account
-        const lastOnConnectAddress = React.useRef(null);
         const unsubscribeAccount = connector.on(WalletEvent.ACCOUNT_CHANGED, async (acc) => {
             setAccount(acc);
+            // Clear isConnecting when account changes (connection succeeded)
+            setIsConnecting(false);
             // Don't set isInitializing to false yet - wait for balance to load
             // Load cached balance for new account immediately
             if (acc?.address) {
@@ -8078,7 +8103,8 @@ const ConnectButton = ({ connector, onConnect, onDisconnect, onError, className,
                 }
             }
             if (acc && acc.chainType === 'ton') {
-                setTwcBalance('0');
+                // For TON: fetch both balance and NFTs
+                setTwcBalance('0'); // TON wallets don't have TWC
                 try {
                     await Promise.all([
                         fetchTONBalance(acc),
@@ -8102,15 +8128,18 @@ const ConnectButton = ({ connector, onConnect, onDisconnect, onError, className,
                 }
             }
             else if (acc) {
+                // No fetchBalance, check for TWC balance
                 const state = connector.getState();
                 if (state.twcBalance && state.twcBalance !== '0' && state.twcBalance !== '0.00') {
                     setTwcBalance(state.twcBalance);
                     setUsdValueStable(state.usdValue ?? null);
+                    // Save to cache
                     if (acc.address) {
                         saveTWCBalanceToCache(acc.address, state.twcBalance, state.usdValue ?? null);
                     }
                 }
                 else if (acc.address) {
+                    // Try to load from cache as fallback
                     const cached = loadTWCBalanceFromCache(acc.address);
                     if (cached?.balance) {
                         setTwcBalance(cached.balance);
@@ -8123,17 +8152,19 @@ const ConnectButton = ({ connector, onConnect, onDisconnect, onError, className,
                 setIsInitializing(false);
             }
             if (acc && onConnect) {
-                if (lastOnConnectAddress.current !== acc.address) {
-                    onConnect(acc);
-                    lastOnConnectAddress.current = acc.address;
-                }
+                onConnect(acc);
             }
         });
         const unsubscribeStatus = connector.on(WalletEvent.STATUS_CHANGED, (newStatus) => {
             setStatus(newStatus);
-            // If status changes to disconnected, stop initializing
+            // If status changes to disconnected, stop initializing and connecting
             if (newStatus === ConnectionStatus.DISCONNECTED) {
                 setIsInitializing(false);
+                setIsConnecting(false);
+            }
+            // If status changes to connected, clear connecting state
+            if (newStatus === ConnectionStatus.CONNECTED) {
+                setIsConnecting(false);
             }
         });
         const unsubscribeDisconnect = connector.on(WalletEvent.DISCONNECTED, () => {
@@ -8361,19 +8392,16 @@ const ConnectButton = ({ connector, onConnect, onDisconnect, onError, className,
     useEffect(() => {
         if (account && fetchBalance) {
             setBalanceLoading(true);
-            loadBalance().then((hasRealBalance) => {
-                setBalanceLoading(false);
-                // For TON wallets, always stop initializing after balance fetch completes (even if balance is 0)
-                // For other chains, only stop if we got a real balance
-                if (account.chainType === 'ton' || hasRealBalance) {
-                    setIsInitializing(false);
-                }
-            }).catch(() => {
+            loadBalance()
+                .then(() => {
+                // Always stop initializing once balance request completes
+            })
+                .catch(() => {
+                // Ignore errors, we still clear loading states
+            })
+                .finally(() => {
                 setBalanceLoading(false);
-                // Always stop initializing on error for TON
-                if (account.chainType === 'ton') {
-                    setIsInitializing(false);
-                }
+                setIsInitializing(false);
             });
         }
         else if (account && !fetchBalance) {
@@ -8487,6 +8515,11 @@ const ConnectButton = ({ connector, onConnect, onDisconnect, onError, className,
     const handleConnect = useCallback(async (walletType) => {
         setIsConnecting(true);
         setError(null);
+        // Safety timeout: ensure isConnecting is cleared after 75 seconds maximum
+        const safetyTimeout = setTimeout(() => {
+            setIsConnecting(false);
+            setIsInitializing(false);
+        }, 75000);
         // Close modal BEFORE connecting for TON wallets and WalletConnect
         // so external modals can show
         const isTonWallet = ['tonkeeper', 'tonhub', 'mytonwallet'].includes(walletType);
@@ -8500,27 +8533,20 @@ const ConnectButton = ({ connector, onConnect, onDisconnect, onError, className,
             setShowSendModal(false);
         }
         try {
-            const result = await connector.connect(walletType);
-            // Set account from connection result immediately
-            if (result?.account) {
-                setAccount(result.account);
-                setIsInitializing(false);
-            }
-            else {
-                // Fallback: get account after connection
-                const newAccount = await connector.getAccount();
-                if (newAccount) {
-                    setAccount(newAccount);
-                    setIsInitializing(false);
-                }
-            }
+            // connector.connect() returns void - state updates happen via events
+            await connector.connect(walletType);
+            // Connection succeeded - state is updated via ACCOUNT_CHANGED event
+            // which also clears isConnecting
             // Close modal after connection for non-TON/walletconnect wallets
             if (!isTonWallet && !isWalletConnect) {
                 setShowModal(false);
             }
-            setIsConnecting(false);
+            // Clear safety timeout on success
+            clearTimeout(safetyTimeout);
         }
         catch (err) {
+            // Clear safety timeout on error
+            clearTimeout(safetyTimeout);
             // Always clear connection state on error
             setAccount(null);
             setStatus(ConnectionStatus.DISCONNECTED);
@@ -8636,15 +8662,6 @@ const ConnectButton = ({ connector, onConnect, onDisconnect, onError, className,
             isBalanceResolved = !balanceLoading && !isInitializing;
         }
         const waitingForBalance = account && !isBalanceResolved;
-        // Patch: If account is null and status is disconnected, always stop initializing/loading
-        if (!account && status === ConnectionStatus.DISCONNECTED && (isInitializing || isConnecting || balanceLoading)) {
-            if (isInitializing)
-                setIsInitializing(false);
-            if (isConnecting)
-                setIsConnecting(false);
-            if (balanceLoading)
-                setBalanceLoading(false);
-        }
         const isCheckingConnection = isInitializing || waitingForBalance || ((status === ConnectionStatus.CONNECTING || isConnecting) && !account);
         const isActuallyConnecting = (status === ConnectionStatus.CONNECTING || isConnecting) && account && isBalanceResolved;
         // Check connection state

package/dist/index.js

@@ -2346,11 +2346,6 @@ class WalletConnector {
                 ...savedState,
                 error: null, // Don't restore errors
             };
-            // PATCH: Prevent invalid connected state
-            if (this.state.status === exports.ConnectionStatus.CONNECTED && !this.state.account) {
-                this.state.status = exports.ConnectionStatus.DISCONNECTED;
-                this.state.wallet = null;
-            }
         }
         this.eventEmitter = new EventEmitter$1();
         // Initialize advanced SDK management
@@ -2515,9 +2510,37 @@ class WalletConnector {
                                 });
                                 this.eventEmitter.emit(exports.WalletEvent.CONNECTED, account);
                             }
+                            else {
+                                // No account found - user likely cancelled or connection failed
+                                this.debugTools.info('WALLET_CONNECTOR', 'No account found after visibility change - resetting state');
+                                clearTimeout(connectionTimeout);
+                                clearTimeout(safetyTimeout);
+                                document.removeEventListener('visibilitychange', handleVisibilityChange);
+                                this.updateState({
+                                    status: exports.ConnectionStatus.DISCONNECTED,
+                                    wallet: null,
+                                    error: new Error('Connection cancelled or failed'),
+                                });
+                                this.eventEmitter.emit(exports.WalletEvent.ERROR, new Error('Connection cancelled or failed'));
+                            }
                         }
                         catch (err) {
                             this.debugTools.warn('WALLET_CONNECTOR', 'Failed to check account on visibility change', err);
+                            // On error checking account, reset state after a longer delay
+                            setTimeout(() => {
+                                if (this.state.status === exports.ConnectionStatus.CONNECTING) {
+                                    this.debugTools.info('WALLET_CONNECTOR', 'Still connecting after visibility check error - resetting state');
+                                    clearTimeout(connectionTimeout);
+                                    clearTimeout(safetyTimeout);
+                                    document.removeEventListener('visibilitychange', handleVisibilityChange);
+                                    this.updateState({
+                                        status: exports.ConnectionStatus.DISCONNECTED,
+                                        wallet: null,
+                                        error: new Error('Connection timeout'),
+                                    });
+                                    this.eventEmitter.emit(exports.WalletEvent.ERROR, new Error('Connection timeout'));
+                                }
+                            }, 3000); // Give it 3 more seconds
                         }
                     }
                 }, 1000);
@@ -7863,6 +7886,8 @@ const ConnectButton = ({ connector, onConnect, onDisconnect, onError, className,
         // Get initial state
         const initialState = connector.getState();
         setStatus(initialState.status);
+        // Safety: Clear isConnecting on mount (in case it was stuck from previous session)
+        setIsConnecting(false);
         // Only set wallets once to prevent re-renders
         if (!walletsRef.current) {
             walletsRef.current = connector.getAllWallets();
@@ -8066,10 +8091,10 @@ const ConnectButton = ({ connector, onConnect, onDisconnect, onError, className,
             });
         }
         // Subscribe to events
-        // Prevent repeated onConnect calls for the same account
-        const lastOnConnectAddress = React.useRef(null);
         const unsubscribeAccount = connector.on(exports.WalletEvent.ACCOUNT_CHANGED, async (acc) => {
             setAccount(acc);
+            // Clear isConnecting when account changes (connection succeeded)
+            setIsConnecting(false);
             // Don't set isInitializing to false yet - wait for balance to load
             // Load cached balance for new account immediately
             if (acc?.address) {
@@ -8080,7 +8105,8 @@ const ConnectButton = ({ connector, onConnect, onDisconnect, onError, className,
                 }
             }
             if (acc && acc.chainType === 'ton') {
-                setTwcBalance('0');
+                // For TON: fetch both balance and NFTs
+                setTwcBalance('0'); // TON wallets don't have TWC
                 try {
                     await Promise.all([
                         fetchTONBalance(acc),
@@ -8104,15 +8130,18 @@ const ConnectButton = ({ connector, onConnect, onDisconnect, onError, className,
                 }
             }
             else if (acc) {
+                // No fetchBalance, check for TWC balance
                 const state = connector.getState();
                 if (state.twcBalance && state.twcBalance !== '0' && state.twcBalance !== '0.00') {
                     setTwcBalance(state.twcBalance);
                     setUsdValueStable(state.usdValue ?? null);
+                    // Save to cache
                     if (acc.address) {
                         saveTWCBalanceToCache(acc.address, state.twcBalance, state.usdValue ?? null);
                     }
                 }
                 else if (acc.address) {
+                    // Try to load from cache as fallback
                     const cached = loadTWCBalanceFromCache(acc.address);
                     if (cached?.balance) {
                         setTwcBalance(cached.balance);
@@ -8125,17 +8154,19 @@ const ConnectButton = ({ connector, onConnect, onDisconnect, onError, className,
                 setIsInitializing(false);
             }
             if (acc && onConnect) {
-                if (lastOnConnectAddress.current !== acc.address) {
-                    onConnect(acc);
-                    lastOnConnectAddress.current = acc.address;
-                }
+                onConnect(acc);
             }
         });
         const unsubscribeStatus = connector.on(exports.WalletEvent.STATUS_CHANGED, (newStatus) => {
             setStatus(newStatus);
-            // If status changes to disconnected, stop initializing
+            // If status changes to disconnected, stop initializing and connecting
             if (newStatus === exports.ConnectionStatus.DISCONNECTED) {
                 setIsInitializing(false);
+                setIsConnecting(false);
+            }
+            // If status changes to connected, clear connecting state
+            if (newStatus === exports.ConnectionStatus.CONNECTED) {
+                setIsConnecting(false);
             }
         });
         const unsubscribeDisconnect = connector.on(exports.WalletEvent.DISCONNECTED, () => {
@@ -8363,19 +8394,16 @@ const ConnectButton = ({ connector, onConnect, onDisconnect, onError, className,
     React.useEffect(() => {
         if (account && fetchBalance) {
             setBalanceLoading(true);
-            loadBalance().then((hasRealBalance) => {
-                setBalanceLoading(false);
-                // For TON wallets, always stop initializing after balance fetch completes (even if balance is 0)
-                // For other chains, only stop if we got a real balance
-                if (account.chainType === 'ton' || hasRealBalance) {
-                    setIsInitializing(false);
-                }
-            }).catch(() => {
+            loadBalance()
+                .then(() => {
+                // Always stop initializing once balance request completes
+            })
+                .catch(() => {
+                // Ignore errors, we still clear loading states
+            })
+                .finally(() => {
                 setBalanceLoading(false);
-                // Always stop initializing on error for TON
-                if (account.chainType === 'ton') {
-                    setIsInitializing(false);
-                }
+                setIsInitializing(false);
             });
         }
         else if (account && !fetchBalance) {
@@ -8489,6 +8517,11 @@ const ConnectButton = ({ connector, onConnect, onDisconnect, onError, className,
     const handleConnect = React.useCallback(async (walletType) => {
         setIsConnecting(true);
         setError(null);
+        // Safety timeout: ensure isConnecting is cleared after 75 seconds maximum
+        const safetyTimeout = setTimeout(() => {
+            setIsConnecting(false);
+            setIsInitializing(false);
+        }, 75000);
         // Close modal BEFORE connecting for TON wallets and WalletConnect
         // so external modals can show
         const isTonWallet = ['tonkeeper', 'tonhub', 'mytonwallet'].includes(walletType);
@@ -8502,27 +8535,20 @@ const ConnectButton = ({ connector, onConnect, onDisconnect, onError, className,
             setShowSendModal(false);
         }
         try {
-            const result = await connector.connect(walletType);
-            // Set account from connection result immediately
-            if (result?.account) {
-                setAccount(result.account);
-                setIsInitializing(false);
-            }
-            else {
-                // Fallback: get account after connection
-                const newAccount = await connector.getAccount();
-                if (newAccount) {
-                    setAccount(newAccount);
-                    setIsInitializing(false);
-                }
-            }
+            // connector.connect() returns void - state updates happen via events
+            await connector.connect(walletType);
+            // Connection succeeded - state is updated via ACCOUNT_CHANGED event
+            // which also clears isConnecting
             // Close modal after connection for non-TON/walletconnect wallets
             if (!isTonWallet && !isWalletConnect) {
                 setShowModal(false);
             }
-            setIsConnecting(false);
+            // Clear safety timeout on success
+            clearTimeout(safetyTimeout);
         }
         catch (err) {
+            // Clear safety timeout on error
+            clearTimeout(safetyTimeout);
             // Always clear connection state on error
             setAccount(null);
             setStatus(exports.ConnectionStatus.DISCONNECTED);
@@ -8638,15 +8664,6 @@ const ConnectButton = ({ connector, onConnect, onDisconnect, onError, className,
             isBalanceResolved = !balanceLoading && !isInitializing;
         }
         const waitingForBalance = account && !isBalanceResolved;
-        // Patch: If account is null and status is disconnected, always stop initializing/loading
-        if (!account && status === exports.ConnectionStatus.DISCONNECTED && (isInitializing || isConnecting || balanceLoading)) {
-            if (isInitializing)
-                setIsInitializing(false);
-            if (isConnecting)
-                setIsConnecting(false);
-            if (balanceLoading)
-                setBalanceLoading(false);
-        }
         const isCheckingConnection = isInitializing || waitingForBalance || ((status === exports.ConnectionStatus.CONNECTING || isConnecting) && !account);
         const isActuallyConnecting = (status === exports.ConnectionStatus.CONNECTING || isConnecting) && account && isBalanceResolved;
         // Check connection state

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tiwiflix-wallet-connector",
-  "version": "1.5.3",
+  "version": "1.5.5",
   "description": "Multi-chain wallet connector for Tiwiflix supporting EVM, TON, Solana, and Tron wallets",
   "main": "dist/index.js",
   "module": "dist/index.esm.js",