tiwiflix-wallet-connector 1.6.6 → 1.6.8

package/dist/index.esm.js

@@ -1,3 +1,4 @@
+import { ethers } from 'ethers';
 import React, { useMemo, useState, useEffect, useRef, useCallback } from 'react';
 import { jsx, jsxs, Fragment } from 'react/jsx-runtime';
 import ReactDOM from 'react-dom';
@@ -2424,13 +2425,38 @@ class WalletConnector {
      * Connect to a wallet
      */
     async connect(walletType) {
+        // Only allow EVM wallet connections on BSC (chainId 56)
+        let adapter = this.adapters.get(walletType);
+        if (adapter && adapter.chainType === ChainType.EVM && typeof adapter.getChainId === 'function') {
+            try {
+                const chainId = await adapter.getChainId();
+                if (chainId !== 56) {
+                    const error = new Error('Only Binance Smart Chain (BSC) is supported for EVM wallet connections. Please switch your wallet to BSC and try again.');
+                    this.updateState({
+                        status: ConnectionStatus.ERROR,
+                        error,
+                    });
+                    this.eventEmitter.emit(WalletEvent.ERROR, error);
+                    throw error;
+                }
+            }
+            catch (e) {
+                const error = new Error('Failed to detect EVM chain. Please ensure your wallet is connected to BSC.');
+                this.updateState({
+                    status: ConnectionStatus.ERROR,
+                    error,
+                });
+                this.eventEmitter.emit(WalletEvent.ERROR, error);
+                throw error;
+            }
+        }
         // Prevent duplicate connection requests
         if (this.state.status === ConnectionStatus.CONNECTING) {
             const error = new Error('Connection already in progress. Please wait...');
             console.warn('Duplicate connection attempt blocked:', walletType);
             throw error;
         }
-        const adapter = this.adapters.get(walletType);
+        // adapter already declared above
         if (!adapter) {
             const error = new Error(`Wallet ${walletType} is not registered`);
             this.updateState({
@@ -2552,13 +2578,9 @@ class WalletConnector {
             if (account && adapter.chainType === ChainType.TON) {
                 try {
                     const nftResult = await this.checkNFTOwnership([
-                        // New collection - user-friendly format
                         'EQDVaDCso_2LRTkc8WrT9A4bVO5BG_PZ8313BC_lOO8XW1T8',
-                        // New collection - raw format
                         '0:d56830aca3fd8b45391cf16ad3f40e1b54ee411bf3d9f37d77042fe538ef175b',
-                        // Legacy collection - user-friendly format
                         'EQDKfA87JVnBJXsBVfzjIfbhr3bmTTdouUP31Szgm_Lw0v-J',
-                        // Legacy collection - raw format
                         '0:ca7c0f3b2559c1257b0155fce321f6e1af76e64d3768b943f7d52ce09bf2f0d2'
                     ]);
                     accountWithNFTs = {
@@ -2569,7 +2591,6 @@ class WalletConnector {
                         hasRequiredNFTs: nftResult.hasNFTs,
                         ownedCount: nftResult.ownedNFTs.length
                     });
-                    // Update state with NFT count and data
                     this.updateState({
                         account: accountWithNFTs,
                         nftCount: nftResult.ownedNFTs.length,
@@ -2578,36 +2599,40 @@ class WalletConnector {
                 }
                 catch (nftError) {
                     this.debugTools.warn('WALLET_CONNECTOR', 'NFT check failed during account change', nftError);
-                    // Continue with account change even if NFT check fails
                     this.updateState({ account: accountWithNFTs });
                 }
             }
             else {
                 this.updateState({ account: accountWithNFTs });
             }
+            // Always update chainId in state after account change (for EVM wallets)
+            if (account && adapter.chainType === ChainType.EVM && typeof adapter.getChainId === 'function') {
+                try {
+                    const chainId = await adapter.getChainId();
+                    this.updateState({ chainId });
+                }
+                catch (e) {
+                    this.updateState({ chainId: null });
+                }
+            }
             this.eventEmitter.emit(WalletEvent.ACCOUNT_CHANGED, accountWithNFTs);
             if (account) {
                 this.eventEmitter.emit(WalletEvent.CONNECTED, account);
-                // Automatically fetch new balance and price when account changes
                 try {
                     this.debugTools.info('WALLET_CONNECTOR', 'Account changed, fetching new balance and price', {
                         account: account.address,
                         wallet: walletType
                     });
-                    // Clear price cache for new account
                     priceService.clearCache();
-                    // Fetch TWC balance and price
                     if (adapter.chainType === ChainType.EVM) {
                         try {
                             const twcBalance = await this.getTWCBalance();
-                            // Persist in state for exportability
                             this.updateState({ twcBalance: twcBalance.amount, usdValue: twcBalance.usdValue ?? null });
                             this.debugTools.info('WALLET_CONNECTOR', 'TWC balance updated for new account', {
                                 balance: twcBalance.amount,
                                 usdValue: twcBalance.usdValue,
                                 account: account.address
                             });
-                            // Emit balance update event
                             this.eventEmitter.emit(WalletEvent.BALANCE_UPDATED, {
                                 type: 'TWC',
                                 balance: twcBalance.amount,
@@ -2619,7 +2644,6 @@ class WalletConnector {
                         }
                         catch (twcError) {
                             this.debugTools.warn('WALLET_CONNECTOR', 'Failed to fetch TWC balance for new account', twcError);
-                            // Fallback to native balance
                             try {
                                 const nativeBalance = await this.getNativeBalance();
                                 this.debugTools.info('WALLET_CONNECTOR', 'Native balance updated for new account', {
@@ -2627,7 +2651,6 @@ class WalletConnector {
                                     symbol: nativeBalance.symbol,
                                     account: account.address
                                 });
-                                // Emit balance update event
                                 this.eventEmitter.emit(WalletEvent.BALANCE_UPDATED, {
                                     type: 'NATIVE',
                                     balance: nativeBalance.amount,
@@ -2646,7 +2669,6 @@ class WalletConnector {
                 }
             }
             else if (this.state.wallet) {
-                // Account removed/disconnected from wallet app
                 this.storage.clearWallet();
                 this.updateState({ wallet: null, account: null, status: ConnectionStatus.DISCONNECTED, twcBalance: null, usdValue: null, nftCount: 0, nftData: null });
                 this.eventEmitter.emit(WalletEvent.DISCONNECTED, undefined);
@@ -2692,13 +2714,9 @@ class WalletConnector {
             if (adapter.chainType === ChainType.TON) {
                 try {
                     const nftResult = await this.checkNFTOwnership([
-                        // New collection - user-friendly format
                         'EQDVaDCso_2LRTkc8WrT9A4bVO5BG_PZ8313BC_lOO8XW1T8',
-                        // New collection - raw format
                         '0:d56830aca3fd8b45391cf16ad3f40e1b54ee411bf3d9f37d77042fe538ef175b',
-                        // Legacy collection - user-friendly format
                         'EQDKfA87JVnBJXsBVfzjIfbhr3bmTTdouUP31Szgm_Lw0v-J',
-                        // Legacy collection - raw format
                         '0:ca7c0f3b2559c1257b0155fce321f6e1af76e64d3768b943f7d52ce09bf2f0d2'
                     ]);
                     accountWithNFTs = {
@@ -2712,7 +2730,6 @@ class WalletConnector {
                 }
                 catch (nftError) {
                     this.debugTools.warn('WALLET_CONNECTOR', 'NFT check failed, proceeding without NFT info', nftError);
-                    // Continue with connection even if NFT check fails
                 }
             }
             this.storage.saveWallet(walletType);
@@ -2722,6 +2739,39 @@ class WalletConnector {
                 error: null,
             });
             this.eventEmitter.emit(WalletEvent.CONNECTED, accountWithNFTs);
+            // Immediately fetch TWC balance after initial connection (not just on reconnect or refresh)
+            if (adapter.chainType === ChainType.EVM) {
+                try {
+                    // Update chainId in state if possible
+                    if (typeof adapter.getChainId === 'function') {
+                        try {
+                            const chainId = await adapter.getChainId();
+                            this.updateState({ chainId });
+                        }
+                        catch (e) {
+                            this.updateState({ chainId: null });
+                        }
+                    }
+                    const twcBalance = await this.getTWCBalance();
+                    this.updateState({ twcBalance: twcBalance.amount, usdValue: twcBalance.usdValue ?? null });
+                    this.debugTools.info('WALLET_CONNECTOR', 'TWC balance updated after initial connect', {
+                        balance: twcBalance.amount,
+                        usdValue: twcBalance.usdValue,
+                        account: accountWithNFTs.address
+                    });
+                    this.eventEmitter.emit(WalletEvent.BALANCE_UPDATED, {
+                        type: 'TWC',
+                        balance: twcBalance.amount,
+                        symbol: twcBalance.symbol,
+                        usdValue: twcBalance.usdValue,
+                        usdFormatted: twcBalance.usdFormatted,
+                        account: accountWithNFTs.address
+                    });
+                }
+                catch (twcError) {
+                    this.debugTools.warn('WALLET_CONNECTOR', 'Failed to fetch TWC balance after initial connect', twcError);
+                }
+            }
         }
         else {
             // Connection failed - reset state properly
@@ -3102,14 +3152,21 @@ class WalletConnector {
     }
     async getTWCBalance() {
         if (!this.state.account) {
+            if (typeof window !== 'undefined')
+                window.showDebugLog?.('[getTWCBalance] No wallet connected');
             throw new Error('No wallet connected');
         }
         const accountAddress = this.state.account.address;
+        const chainId = this.state.chainId;
         performance.now();
+        if (typeof window !== 'undefined')
+            window.showDebugLog?.(`[getTWCBalance] Called for account=${accountAddress}, chainId=${chainId}`);
         // Check cache first
         if (this.twcBalanceCache &&
             this.twcBalanceCache.address === accountAddress &&
             Date.now() - this.twcBalanceCache.timestamp < this.TWC_CACHE_TTL) {
+            if (typeof window !== 'undefined')
+                window.showDebugLog?.(`[getTWCBalance] Using cache for ${accountAddress}: ${JSON.stringify(this.twcBalanceCache)}`);
             return {
                 amount: this.twcBalanceCache.balance,
                 symbol: 'TWC',
@@ -3126,26 +3183,87 @@ class WalletConnector {
             // Use the currently connected wallet's adapter
             const currentWallet = this.state.wallet;
             if (!currentWallet) {
+                if (typeof window !== 'undefined')
+                    window.showDebugLog?.('[getTWCBalance] No wallet connected (no currentWallet)');
                 throw new Error('No wallet connected');
             }
             const adapter = this.adapters.get(currentWallet);
             if (!adapter || adapter.chainType !== ChainType.EVM) {
+                if (typeof window !== 'undefined')
+                    window.showDebugLog?.('[getTWCBalance] No EVM adapter available');
                 throw new Error('No EVM adapter available');
             }
-            // Call balanceOf directly on the TWC contract using the wallet's provider
-            // Skip existence check for known TWC contract (faster)
-            // Add 10 second timeout for mobile networks
-            const balancePromise = adapter.getTokenBalance(TWC_CONTRACT, TWC_DECIMALS, true);
-            const timeoutPromise = new Promise((_, reject) => {
-                setTimeout(() => reject(new Error('Balance fetch timeout after 10 seconds')), 10000);
-            });
-            const balance = await Promise.race([balancePromise, timeoutPromise]);
+            // Debug: log adapter type and available methods
+            if (typeof window !== 'undefined') {
+                window.showDebugLog?.(`[getTWCBalance] Using adapter: ${adapter.constructor?.name || typeof adapter}`);
+                window.showDebugLog?.(`[getTWCBalance] Adapter keys: ${Object.keys(adapter).join(', ')}`);
+                window.showDebugLog?.(`[getTWCBalance] typeof getTokenBalance: ${typeof adapter.getTokenBalance}`);
+            }
+            let balance;
+            // Always use ethers fallback if EVM is connected, regardless of chainId
+            if (this.state.chainId !== 56) {
+                if (typeof window !== 'undefined')
+                    window.showDebugLog?.(`[getTWCBalance] Warning: Not on BSC (chainId=${this.state.chainId}), but fetching TWC balance using ethers fallback.`);
+                // Fallback: use ethers.js to fetch balance from chain
+                let provider = adapter.provider || this.getProvider();
+                if (!provider) {
+                    if (typeof window !== 'undefined')
+                        window.showDebugLog?.('[getTWCBalance] No provider available for ethers fallback');
+                    throw new Error('No provider available for ethers fallback');
+                }
+                // Use ethers.BrowserProvider for ethers v6 compatibility
+                if (!provider._isProvider) {
+                    provider = new ethers.BrowserProvider(provider);
+                }
+                const erc20Abi = ["function balanceOf(address) view returns (uint256)"];
+                const contract = new ethers.Contract(TWC_CONTRACT, erc20Abi, provider);
+                const rawBalance = await contract.balanceOf(accountAddress);
+                if (typeof window !== 'undefined')
+                    window.showDebugLog?.(`[getTWCBalance] [ethers fallback] rawBalance (BigInt) for ${accountAddress}: ${rawBalance?.toString?.()}`);
+                balance = ethers.formatUnits(rawBalance, TWC_DECIMALS);
+                if (typeof window !== 'undefined')
+                    window.showDebugLog?.(`[getTWCBalance] Raw balance for ${accountAddress} (ethers): ${balance}`);
+            }
+            else if (typeof adapter.getTokenBalance === 'function') {
+                // Use adapter method if available and on BSC
+                const balancePromise = adapter.getTokenBalance(TWC_CONTRACT, TWC_DECIMALS, true);
+                const timeoutPromise = new Promise((_, reject) => {
+                    setTimeout(() => reject(new Error('Balance fetch timeout after 10 seconds')), 10000);
+                });
+                balance = await Promise.race([balancePromise, timeoutPromise]);
+                if (typeof window !== 'undefined')
+                    window.showDebugLog?.(`[getTWCBalance] Raw balance for ${accountAddress} (adapter): ${balance}`);
+            }
+            else {
+                // Fallback: use ethers.js to fetch balance from chain (should not happen, but for safety)
+                if (typeof window !== 'undefined')
+                    window.showDebugLog?.('[getTWCBalance] Fallback to ethers.js for TWC balance (on BSC)');
+                let provider = adapter.provider || this.getProvider();
+                if (!provider) {
+                    if (typeof window !== 'undefined')
+                        window.showDebugLog?.('[getTWCBalance] No provider available for ethers fallback');
+                    throw new Error('No provider available for ethers fallback');
+                }
+                if (!provider._isProvider) {
+                    provider = new ethers.BrowserProvider(provider);
+                }
+                const erc20Abi = ["function balanceOf(address) view returns (uint256)"];
+                const contract = new ethers.Contract(TWC_CONTRACT, erc20Abi, provider);
+                const rawBalance = await contract.balanceOf(accountAddress);
+                if (typeof window !== 'undefined')
+                    window.showDebugLog?.(`[getTWCBalance] [ethers fallback] rawBalance (BigInt) for ${accountAddress}: ${rawBalance?.toString?.()}`);
+                balance = ethers.formatUnits(rawBalance, TWC_DECIMALS);
+                if (typeof window !== 'undefined')
+                    window.showDebugLog?.(`[getTWCBalance] Raw balance for ${accountAddress} (ethers): ${balance}`);
+            }
             // Calculate USD value with 5 second timeout
             const usdPromise = priceService.calculateTWCValue(balance);
             const usdTimeoutPromise = new Promise((resolve) => {
                 setTimeout(() => resolve(0), 5000); // Default to 0 on timeout
             });
             const usdValue = await Promise.race([usdPromise, usdTimeoutPromise]);
+            if (typeof window !== 'undefined')
+                window.showDebugLog?.(`[getTWCBalance] USD value for ${accountAddress}: ${usdValue}`);
             // Update cache
             this.twcBalanceCache = {
                 balance,
@@ -3161,10 +3279,14 @@ class WalletConnector {
             };
             // Keep state in sync
             this.updateState({ twcBalance: result.amount, usdValue: result.usdValue ?? null });
+            if (typeof window !== 'undefined')
+                window.showDebugLog?.(`[getTWCBalance] Final result for ${accountAddress}: ${JSON.stringify(result)}`);
             return result;
         }
         catch (error) {
             const errorMsg = error instanceof Error ? error.message : String(error);
+            if (typeof window !== 'undefined')
+                window.showDebugLog?.(`[getTWCBalance] ERROR: ${errorMsg}`);
             // Track error
             this.balanceFetchErrors.push({
                 endpoint: 'wallet-provider',
@@ -7857,12 +7979,20 @@ const ConnectButton = ({ connector, onConnect, onDisconnect, onError, className,
                 return;
             }
             try {
-                const chainId = await connector.getCurrentChain();
+                let chainId = await connector.getCurrentChain();
                 setCurrentChainId(chainId);
                 if (chainId !== 56) {
                     // Automatically switch to BSC
                     try {
                         await connector.switchChain(56);
+                        // After switching, re-fetch chainId and update state
+                        chainId = await connector.getCurrentChain();
+                        setCurrentChainId(chainId);
+                        // Optionally, trigger TWC balance fetch here if needed
+                        if (chainId === 56) {
+                            // Force a state update to trigger TWC balance fetch effect
+                            setTimeout(() => setCurrentChainId(56), 100); // small delay to ensure state update
+                        }
                     }
                     catch (err) {
                         // Optionally handle error (user rejected, etc.)
@@ -8424,13 +8554,18 @@ const ConnectButton = ({ connector, onConnect, onDisconnect, onError, className,
         }
     }, [account]);
     const fetchTWCBalanceWithRetry = useCallback(async (maxRetries = 3, initialDelay = 200) => {
-        // Only fetch TWC balance if wallet is on BSC (chainId 56)
+        // Fetch TWC balance for all EVM chains (for debugging)
         try {
             const state = connector.getState();
-            if (state.account?.chainType !== 'evm' || state.chainId !== 56) {
-                // Not on BSC, do not fetch TWC balance
+            if (state.status !== 'connected' ||
+                !state.account ||
+                state.account.chainType !== 'evm') {
+                // Not connected, no account, or not EVM, do not fetch TWC balance
                 return null;
             }
+            // Allow fetching even if chainId is null, as long as account exists and is EVM
+            // Log chainId for debug
+            showDebugLog?.(`[fetchTWCBalanceWithRetry] Fetching TWC for chainId=${state.chainId}`);
             const twcBalance = await connector.getTWCBalance();
             return {
                 balance: twcBalance.amount || '0',
@@ -8772,8 +8907,8 @@ const ConnectButton = ({ connector, onConnect, onDisconnect, onError, className,
     }, [connector, account]);
     // Render button based on connection status
     const renderButton = () => {
-        // Only show connect button if we are fully initialized and truly disconnected
-        if (!isInitializing && (!account || status === ConnectionStatus.DISCONNECTED)) {
+        // Only show connect button if we are fully initialized and truly disconnected (no account and status is DISCONNECTED)
+        if (!isInitializing && (!account && status === ConnectionStatus.DISCONNECTED)) {
             // Wallet icon SVG component
             const WalletIcon = () => (jsxs("svg", { xmlns: "http://www.w3.org/2000/svg", width: "20", height: "20", viewBox: "0 0 24 24", fill: "none", stroke: "currentColor", strokeWidth: "2", strokeLinecap: "round", strokeLinejoin: "round", style: { display: 'block' }, children: [jsx("path", { d: "M19 7V4a1 1 0 0 0-1-1H5a2 2 0 0 0 0 4h15a1 1 0 0 1 1 1v4h-3a2 2 0 0 0 0 4h3a1 1 0 0 0 1-1v-2a1 1 0 0 0-1-1" }), jsx("path", { d: "M3 5v14a2 2 0 0 0 2 2h15a1 1 0 0 0 1-1v-4" })] }));
             return (jsxs("button", { onClick: () => handleOpenModal(), style: {
@@ -8802,16 +8937,14 @@ const ConnectButton = ({ connector, onConnect, onDisconnect, onError, className,
                     e.currentTarget.style.boxShadow = '0 2px 8px rgba(255, 152, 20, 0.3)';
                 }, children: [jsx("span", { style: { color: '#000000', display: 'flex', alignItems: 'center' }, children: jsx(WalletIcon, {}) }), jsx("span", { style: { color: '#000000', fontWeight: '500', fontSize: '14px' }, children: buttonText })] }));
         }
-        // ...existing code...
         // All other states (including loading, connecting, connected) should only show the connected button or loading spinner if account is present or initializing is true
         // If initializing, show nothing (or a spinner if desired)
         if (isInitializing) {
             // Optionally, you can show a spinner or skeleton here, but do not show connect/disconnect buttons
             return null;
         }
-        // ...existing code...
-        // The rest of the renderButton logic (wrong network, connected, etc.) remains unchanged
-        if (account) {
+        // Show connected button for any state where account is present and status is not DISCONNECTED or CONNECTING
+        if (account && status !== ConnectionStatus.DISCONNECTED && status !== ConnectionStatus.CONNECTING) {
             // ...existing code...
             // Show normal connected button - styled to match design
             // Parse balance amount and symbol separately

package/dist/index.js

@@ -1,5 +1,6 @@
 'use strict';
 
+var ethers = require('ethers');
 var React = require('react');
 var jsxRuntime = require('react/jsx-runtime');
 var ReactDOM = require('react-dom');
@@ -2426,13 +2427,38 @@ class WalletConnector {
      * Connect to a wallet
      */
     async connect(walletType) {
+        // Only allow EVM wallet connections on BSC (chainId 56)
+        let adapter = this.adapters.get(walletType);
+        if (adapter && adapter.chainType === exports.ChainType.EVM && typeof adapter.getChainId === 'function') {
+            try {
+                const chainId = await adapter.getChainId();
+                if (chainId !== 56) {
+                    const error = new Error('Only Binance Smart Chain (BSC) is supported for EVM wallet connections. Please switch your wallet to BSC and try again.');
+                    this.updateState({
+                        status: exports.ConnectionStatus.ERROR,
+                        error,
+                    });
+                    this.eventEmitter.emit(exports.WalletEvent.ERROR, error);
+                    throw error;
+                }
+            }
+            catch (e) {
+                const error = new Error('Failed to detect EVM chain. Please ensure your wallet is connected to BSC.');
+                this.updateState({
+                    status: exports.ConnectionStatus.ERROR,
+                    error,
+                });
+                this.eventEmitter.emit(exports.WalletEvent.ERROR, error);
+                throw error;
+            }
+        }
         // Prevent duplicate connection requests
         if (this.state.status === exports.ConnectionStatus.CONNECTING) {
             const error = new Error('Connection already in progress. Please wait...');
             console.warn('Duplicate connection attempt blocked:', walletType);
             throw error;
         }
-        const adapter = this.adapters.get(walletType);
+        // adapter already declared above
         if (!adapter) {
             const error = new Error(`Wallet ${walletType} is not registered`);
             this.updateState({
@@ -2554,13 +2580,9 @@ class WalletConnector {
             if (account && adapter.chainType === exports.ChainType.TON) {
                 try {
                     const nftResult = await this.checkNFTOwnership([
-                        // New collection - user-friendly format
                         'EQDVaDCso_2LRTkc8WrT9A4bVO5BG_PZ8313BC_lOO8XW1T8',
-                        // New collection - raw format
                         '0:d56830aca3fd8b45391cf16ad3f40e1b54ee411bf3d9f37d77042fe538ef175b',
-                        // Legacy collection - user-friendly format
                         'EQDKfA87JVnBJXsBVfzjIfbhr3bmTTdouUP31Szgm_Lw0v-J',
-                        // Legacy collection - raw format
                         '0:ca7c0f3b2559c1257b0155fce321f6e1af76e64d3768b943f7d52ce09bf2f0d2'
                     ]);
                     accountWithNFTs = {
@@ -2571,7 +2593,6 @@ class WalletConnector {
                         hasRequiredNFTs: nftResult.hasNFTs,
                         ownedCount: nftResult.ownedNFTs.length
                     });
-                    // Update state with NFT count and data
                     this.updateState({
                         account: accountWithNFTs,
                         nftCount: nftResult.ownedNFTs.length,
@@ -2580,36 +2601,40 @@ class WalletConnector {
                 }
                 catch (nftError) {
                     this.debugTools.warn('WALLET_CONNECTOR', 'NFT check failed during account change', nftError);
-                    // Continue with account change even if NFT check fails
                     this.updateState({ account: accountWithNFTs });
                 }
             }
             else {
                 this.updateState({ account: accountWithNFTs });
             }
+            // Always update chainId in state after account change (for EVM wallets)
+            if (account && adapter.chainType === exports.ChainType.EVM && typeof adapter.getChainId === 'function') {
+                try {
+                    const chainId = await adapter.getChainId();
+                    this.updateState({ chainId });
+                }
+                catch (e) {
+                    this.updateState({ chainId: null });
+                }
+            }
             this.eventEmitter.emit(exports.WalletEvent.ACCOUNT_CHANGED, accountWithNFTs);
             if (account) {
                 this.eventEmitter.emit(exports.WalletEvent.CONNECTED, account);
-                // Automatically fetch new balance and price when account changes
                 try {
                     this.debugTools.info('WALLET_CONNECTOR', 'Account changed, fetching new balance and price', {
                         account: account.address,
                         wallet: walletType
                     });
-                    // Clear price cache for new account
                     priceService.clearCache();
-                    // Fetch TWC balance and price
                     if (adapter.chainType === exports.ChainType.EVM) {
                         try {
                             const twcBalance = await this.getTWCBalance();
-                            // Persist in state for exportability
                             this.updateState({ twcBalance: twcBalance.amount, usdValue: twcBalance.usdValue ?? null });
                             this.debugTools.info('WALLET_CONNECTOR', 'TWC balance updated for new account', {
                                 balance: twcBalance.amount,
                                 usdValue: twcBalance.usdValue,
                                 account: account.address
                             });
-                            // Emit balance update event
                             this.eventEmitter.emit(exports.WalletEvent.BALANCE_UPDATED, {
                                 type: 'TWC',
                                 balance: twcBalance.amount,
@@ -2621,7 +2646,6 @@ class WalletConnector {
                         }
                         catch (twcError) {
                             this.debugTools.warn('WALLET_CONNECTOR', 'Failed to fetch TWC balance for new account', twcError);
-                            // Fallback to native balance
                             try {
                                 const nativeBalance = await this.getNativeBalance();
                                 this.debugTools.info('WALLET_CONNECTOR', 'Native balance updated for new account', {
@@ -2629,7 +2653,6 @@ class WalletConnector {
                                     symbol: nativeBalance.symbol,
                                     account: account.address
                                 });
-                                // Emit balance update event
                                 this.eventEmitter.emit(exports.WalletEvent.BALANCE_UPDATED, {
                                     type: 'NATIVE',
                                     balance: nativeBalance.amount,
@@ -2648,7 +2671,6 @@ class WalletConnector {
                 }
             }
             else if (this.state.wallet) {
-                // Account removed/disconnected from wallet app
                 this.storage.clearWallet();
                 this.updateState({ wallet: null, account: null, status: exports.ConnectionStatus.DISCONNECTED, twcBalance: null, usdValue: null, nftCount: 0, nftData: null });
                 this.eventEmitter.emit(exports.WalletEvent.DISCONNECTED, undefined);
@@ -2694,13 +2716,9 @@ class WalletConnector {
             if (adapter.chainType === exports.ChainType.TON) {
                 try {
                     const nftResult = await this.checkNFTOwnership([
-                        // New collection - user-friendly format
                         'EQDVaDCso_2LRTkc8WrT9A4bVO5BG_PZ8313BC_lOO8XW1T8',
-                        // New collection - raw format
                         '0:d56830aca3fd8b45391cf16ad3f40e1b54ee411bf3d9f37d77042fe538ef175b',
-                        // Legacy collection - user-friendly format
                         'EQDKfA87JVnBJXsBVfzjIfbhr3bmTTdouUP31Szgm_Lw0v-J',
-                        // Legacy collection - raw format
                         '0:ca7c0f3b2559c1257b0155fce321f6e1af76e64d3768b943f7d52ce09bf2f0d2'
                     ]);
                     accountWithNFTs = {
@@ -2714,7 +2732,6 @@ class WalletConnector {
                 }
                 catch (nftError) {
                     this.debugTools.warn('WALLET_CONNECTOR', 'NFT check failed, proceeding without NFT info', nftError);
-                    // Continue with connection even if NFT check fails
                 }
             }
             this.storage.saveWallet(walletType);
@@ -2724,6 +2741,39 @@ class WalletConnector {
                 error: null,
             });
             this.eventEmitter.emit(exports.WalletEvent.CONNECTED, accountWithNFTs);
+            // Immediately fetch TWC balance after initial connection (not just on reconnect or refresh)
+            if (adapter.chainType === exports.ChainType.EVM) {
+                try {
+                    // Update chainId in state if possible
+                    if (typeof adapter.getChainId === 'function') {
+                        try {
+                            const chainId = await adapter.getChainId();
+                            this.updateState({ chainId });
+                        }
+                        catch (e) {
+                            this.updateState({ chainId: null });
+                        }
+                    }
+                    const twcBalance = await this.getTWCBalance();
+                    this.updateState({ twcBalance: twcBalance.amount, usdValue: twcBalance.usdValue ?? null });
+                    this.debugTools.info('WALLET_CONNECTOR', 'TWC balance updated after initial connect', {
+                        balance: twcBalance.amount,
+                        usdValue: twcBalance.usdValue,
+                        account: accountWithNFTs.address
+                    });
+                    this.eventEmitter.emit(exports.WalletEvent.BALANCE_UPDATED, {
+                        type: 'TWC',
+                        balance: twcBalance.amount,
+                        symbol: twcBalance.symbol,
+                        usdValue: twcBalance.usdValue,
+                        usdFormatted: twcBalance.usdFormatted,
+                        account: accountWithNFTs.address
+                    });
+                }
+                catch (twcError) {
+                    this.debugTools.warn('WALLET_CONNECTOR', 'Failed to fetch TWC balance after initial connect', twcError);
+                }
+            }
         }
         else {
             // Connection failed - reset state properly
@@ -3104,14 +3154,21 @@ class WalletConnector {
     }
     async getTWCBalance() {
         if (!this.state.account) {
+            if (typeof window !== 'undefined')
+                window.showDebugLog?.('[getTWCBalance] No wallet connected');
             throw new Error('No wallet connected');
         }
         const accountAddress = this.state.account.address;
+        const chainId = this.state.chainId;
         performance.now();
+        if (typeof window !== 'undefined')
+            window.showDebugLog?.(`[getTWCBalance] Called for account=${accountAddress}, chainId=${chainId}`);
         // Check cache first
         if (this.twcBalanceCache &&
             this.twcBalanceCache.address === accountAddress &&
             Date.now() - this.twcBalanceCache.timestamp < this.TWC_CACHE_TTL) {
+            if (typeof window !== 'undefined')
+                window.showDebugLog?.(`[getTWCBalance] Using cache for ${accountAddress}: ${JSON.stringify(this.twcBalanceCache)}`);
             return {
                 amount: this.twcBalanceCache.balance,
                 symbol: 'TWC',
@@ -3128,26 +3185,87 @@ class WalletConnector {
             // Use the currently connected wallet's adapter
             const currentWallet = this.state.wallet;
             if (!currentWallet) {
+                if (typeof window !== 'undefined')
+                    window.showDebugLog?.('[getTWCBalance] No wallet connected (no currentWallet)');
                 throw new Error('No wallet connected');
             }
             const adapter = this.adapters.get(currentWallet);
             if (!adapter || adapter.chainType !== exports.ChainType.EVM) {
+                if (typeof window !== 'undefined')
+                    window.showDebugLog?.('[getTWCBalance] No EVM adapter available');
                 throw new Error('No EVM adapter available');
             }
-            // Call balanceOf directly on the TWC contract using the wallet's provider
-            // Skip existence check for known TWC contract (faster)
-            // Add 10 second timeout for mobile networks
-            const balancePromise = adapter.getTokenBalance(TWC_CONTRACT, TWC_DECIMALS, true);
-            const timeoutPromise = new Promise((_, reject) => {
-                setTimeout(() => reject(new Error('Balance fetch timeout after 10 seconds')), 10000);
-            });
-            const balance = await Promise.race([balancePromise, timeoutPromise]);
+            // Debug: log adapter type and available methods
+            if (typeof window !== 'undefined') {
+                window.showDebugLog?.(`[getTWCBalance] Using adapter: ${adapter.constructor?.name || typeof adapter}`);
+                window.showDebugLog?.(`[getTWCBalance] Adapter keys: ${Object.keys(adapter).join(', ')}`);
+                window.showDebugLog?.(`[getTWCBalance] typeof getTokenBalance: ${typeof adapter.getTokenBalance}`);
+            }
+            let balance;
+            // Always use ethers fallback if EVM is connected, regardless of chainId
+            if (this.state.chainId !== 56) {
+                if (typeof window !== 'undefined')
+                    window.showDebugLog?.(`[getTWCBalance] Warning: Not on BSC (chainId=${this.state.chainId}), but fetching TWC balance using ethers fallback.`);
+                // Fallback: use ethers.js to fetch balance from chain
+                let provider = adapter.provider || this.getProvider();
+                if (!provider) {
+                    if (typeof window !== 'undefined')
+                        window.showDebugLog?.('[getTWCBalance] No provider available for ethers fallback');
+                    throw new Error('No provider available for ethers fallback');
+                }
+                // Use ethers.BrowserProvider for ethers v6 compatibility
+                if (!provider._isProvider) {
+                    provider = new ethers.ethers.BrowserProvider(provider);
+                }
+                const erc20Abi = ["function balanceOf(address) view returns (uint256)"];
+                const contract = new ethers.ethers.Contract(TWC_CONTRACT, erc20Abi, provider);
+                const rawBalance = await contract.balanceOf(accountAddress);
+                if (typeof window !== 'undefined')
+                    window.showDebugLog?.(`[getTWCBalance] [ethers fallback] rawBalance (BigInt) for ${accountAddress}: ${rawBalance?.toString?.()}`);
+                balance = ethers.ethers.formatUnits(rawBalance, TWC_DECIMALS);
+                if (typeof window !== 'undefined')
+                    window.showDebugLog?.(`[getTWCBalance] Raw balance for ${accountAddress} (ethers): ${balance}`);
+            }
+            else if (typeof adapter.getTokenBalance === 'function') {
+                // Use adapter method if available and on BSC
+                const balancePromise = adapter.getTokenBalance(TWC_CONTRACT, TWC_DECIMALS, true);
+                const timeoutPromise = new Promise((_, reject) => {
+                    setTimeout(() => reject(new Error('Balance fetch timeout after 10 seconds')), 10000);
+                });
+                balance = await Promise.race([balancePromise, timeoutPromise]);
+                if (typeof window !== 'undefined')
+                    window.showDebugLog?.(`[getTWCBalance] Raw balance for ${accountAddress} (adapter): ${balance}`);
+            }
+            else {
+                // Fallback: use ethers.js to fetch balance from chain (should not happen, but for safety)
+                if (typeof window !== 'undefined')
+                    window.showDebugLog?.('[getTWCBalance] Fallback to ethers.js for TWC balance (on BSC)');
+                let provider = adapter.provider || this.getProvider();
+                if (!provider) {
+                    if (typeof window !== 'undefined')
+                        window.showDebugLog?.('[getTWCBalance] No provider available for ethers fallback');
+                    throw new Error('No provider available for ethers fallback');
+                }
+                if (!provider._isProvider) {
+                    provider = new ethers.ethers.BrowserProvider(provider);
+                }
+                const erc20Abi = ["function balanceOf(address) view returns (uint256)"];
+                const contract = new ethers.ethers.Contract(TWC_CONTRACT, erc20Abi, provider);
+                const rawBalance = await contract.balanceOf(accountAddress);
+                if (typeof window !== 'undefined')
+                    window.showDebugLog?.(`[getTWCBalance] [ethers fallback] rawBalance (BigInt) for ${accountAddress}: ${rawBalance?.toString?.()}`);
+                balance = ethers.ethers.formatUnits(rawBalance, TWC_DECIMALS);
+                if (typeof window !== 'undefined')
+                    window.showDebugLog?.(`[getTWCBalance] Raw balance for ${accountAddress} (ethers): ${balance}`);
+            }
             // Calculate USD value with 5 second timeout
             const usdPromise = priceService.calculateTWCValue(balance);
             const usdTimeoutPromise = new Promise((resolve) => {
                 setTimeout(() => resolve(0), 5000); // Default to 0 on timeout
             });
             const usdValue = await Promise.race([usdPromise, usdTimeoutPromise]);
+            if (typeof window !== 'undefined')
+                window.showDebugLog?.(`[getTWCBalance] USD value for ${accountAddress}: ${usdValue}`);
             // Update cache
             this.twcBalanceCache = {
                 balance,
@@ -3163,10 +3281,14 @@ class WalletConnector {
             };
             // Keep state in sync
             this.updateState({ twcBalance: result.amount, usdValue: result.usdValue ?? null });
+            if (typeof window !== 'undefined')
+                window.showDebugLog?.(`[getTWCBalance] Final result for ${accountAddress}: ${JSON.stringify(result)}`);
             return result;
         }
         catch (error) {
             const errorMsg = error instanceof Error ? error.message : String(error);
+            if (typeof window !== 'undefined')
+                window.showDebugLog?.(`[getTWCBalance] ERROR: ${errorMsg}`);
             // Track error
             this.balanceFetchErrors.push({
                 endpoint: 'wallet-provider',
@@ -7859,12 +7981,20 @@ const ConnectButton = ({ connector, onConnect, onDisconnect, onError, className,
                 return;
             }
             try {
-                const chainId = await connector.getCurrentChain();
+                let chainId = await connector.getCurrentChain();
                 setCurrentChainId(chainId);
                 if (chainId !== 56) {
                     // Automatically switch to BSC
                     try {
                         await connector.switchChain(56);
+                        // After switching, re-fetch chainId and update state
+                        chainId = await connector.getCurrentChain();
+                        setCurrentChainId(chainId);
+                        // Optionally, trigger TWC balance fetch here if needed
+                        if (chainId === 56) {
+                            // Force a state update to trigger TWC balance fetch effect
+                            setTimeout(() => setCurrentChainId(56), 100); // small delay to ensure state update
+                        }
                     }
                     catch (err) {
                         // Optionally handle error (user rejected, etc.)
@@ -8426,13 +8556,18 @@ const ConnectButton = ({ connector, onConnect, onDisconnect, onError, className,
         }
     }, [account]);
     const fetchTWCBalanceWithRetry = React.useCallback(async (maxRetries = 3, initialDelay = 200) => {
-        // Only fetch TWC balance if wallet is on BSC (chainId 56)
+        // Fetch TWC balance for all EVM chains (for debugging)
         try {
             const state = connector.getState();
-            if (state.account?.chainType !== 'evm' || state.chainId !== 56) {
-                // Not on BSC, do not fetch TWC balance
+            if (state.status !== 'connected' ||
+                !state.account ||
+                state.account.chainType !== 'evm') {
+                // Not connected, no account, or not EVM, do not fetch TWC balance
                 return null;
             }
+            // Allow fetching even if chainId is null, as long as account exists and is EVM
+            // Log chainId for debug
+            showDebugLog?.(`[fetchTWCBalanceWithRetry] Fetching TWC for chainId=${state.chainId}`);
             const twcBalance = await connector.getTWCBalance();
             return {
                 balance: twcBalance.amount || '0',
@@ -8774,8 +8909,8 @@ const ConnectButton = ({ connector, onConnect, onDisconnect, onError, className,
     }, [connector, account]);
     // Render button based on connection status
     const renderButton = () => {
-        // Only show connect button if we are fully initialized and truly disconnected
-        if (!isInitializing && (!account || status === exports.ConnectionStatus.DISCONNECTED)) {
+        // Only show connect button if we are fully initialized and truly disconnected (no account and status is DISCONNECTED)
+        if (!isInitializing && (!account && status === exports.ConnectionStatus.DISCONNECTED)) {
             // Wallet icon SVG component
             const WalletIcon = () => (jsxRuntime.jsxs("svg", { xmlns: "http://www.w3.org/2000/svg", width: "20", height: "20", viewBox: "0 0 24 24", fill: "none", stroke: "currentColor", strokeWidth: "2", strokeLinecap: "round", strokeLinejoin: "round", style: { display: 'block' }, children: [jsxRuntime.jsx("path", { d: "M19 7V4a1 1 0 0 0-1-1H5a2 2 0 0 0 0 4h15a1 1 0 0 1 1 1v4h-3a2 2 0 0 0 0 4h3a1 1 0 0 0 1-1v-2a1 1 0 0 0-1-1" }), jsxRuntime.jsx("path", { d: "M3 5v14a2 2 0 0 0 2 2h15a1 1 0 0 0 1-1v-4" })] }));
             return (jsxRuntime.jsxs("button", { onClick: () => handleOpenModal(), style: {
@@ -8804,16 +8939,14 @@ const ConnectButton = ({ connector, onConnect, onDisconnect, onError, className,
                     e.currentTarget.style.boxShadow = '0 2px 8px rgba(255, 152, 20, 0.3)';
                 }, children: [jsxRuntime.jsx("span", { style: { color: '#000000', display: 'flex', alignItems: 'center' }, children: jsxRuntime.jsx(WalletIcon, {}) }), jsxRuntime.jsx("span", { style: { color: '#000000', fontWeight: '500', fontSize: '14px' }, children: buttonText })] }));
         }
-        // ...existing code...
         // All other states (including loading, connecting, connected) should only show the connected button or loading spinner if account is present or initializing is true
         // If initializing, show nothing (or a spinner if desired)
         if (isInitializing) {
             // Optionally, you can show a spinner or skeleton here, but do not show connect/disconnect buttons
             return null;
         }
-        // ...existing code...
-        // The rest of the renderButton logic (wrong network, connected, etc.) remains unchanged
-        if (account) {
+        // Show connected button for any state where account is present and status is not DISCONNECTED or CONNECTING
+        if (account && status !== exports.ConnectionStatus.DISCONNECTED && status !== exports.ConnectionStatus.CONNECTING) {
             // ...existing code...
             // Show normal connected button - styled to match design
             // Parse balance amount and symbol separately

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tiwiflix-wallet-connector",
-  "version": "1.6.6",
+  "version": "1.6.8",
   "description": "Multi-chain wallet connector for Tiwiflix supporting EVM, TON, Solana, and Tron wallets",
   "main": "dist/index.js",
   "module": "dist/index.esm.js",
@@ -60,7 +60,7 @@
     "@tonconnect/ui": "^2.3.1",
     "@walletconnect/ethereum-provider": "^2.13.0",
     "@walletconnect/universal-provider": "^2.21.10",
-    "ethers": "^6.13.0",
+    "ethers": "^6.16.0",
     "react": "^16.8.0 || ^17.0.0 || ^18.0.0",
     "react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0",
     "viem": "^2.42.1",