tiwiflix-wallet-connector 1.4.7 → 1.5.0

package/dist/index.d.ts

@@ -855,6 +855,10 @@ declare abstract class TONBaseAdapter extends BaseWalletAdapter {
     private checkForTonWalletExtensions;
     connect(): Promise<ConnectionResult>;
     disconnect(): Promise<void>;
+    /**
+     * Clear all TON-related storage (localStorage and cookies)
+     */
+    private clearAllTONStorage;
     getAccount(): Promise<Account | null>;
     /**
      * Get TON balance with caching

package/dist/index.esm.js

@@ -5446,12 +5446,84 @@ class TONBaseAdapter extends BaseWalletAdapter {
                 this.performanceMetrics.lastError = error;
             }
         }
+        // Clear all TON-related storage (localStorage and cookies)
+        this.clearAllTONStorage();
         // Clear local state
         this.currentAccount = null;
         this.notifyStatusChanged(ConnectionStatus.DISCONNECTED);
         this.notifyAccountChanged(null);
         this.debugLog('TON wallet disconnected');
     }
+    /**
+     * Clear all TON-related storage (localStorage and cookies)
+     */
+    clearAllTONStorage() {
+        if (typeof window === 'undefined')
+            return;
+        try {
+            // Clear localStorage
+            if (window.localStorage) {
+                const keysToRemove = [];
+                // Find all TON-related keys
+                for (let i = 0; i < window.localStorage.length; i++) {
+                    const key = window.localStorage.key(i);
+                    if (key) {
+                        // Check for TON-related patterns
+                        if (key.includes('ton') ||
+                            key.includes('TON') ||
+                            key.includes('tonconnect') ||
+                            key.includes('TonConnect') ||
+                            key.includes('tonkeeper') ||
+                            key.includes('mytonwallet') ||
+                            key.includes('tonhub') ||
+                            key.toLowerCase().includes('wallet')) {
+                            keysToRemove.push(key);
+                        }
+                    }
+                }
+                // Remove found keys
+                keysToRemove.forEach(key => {
+                    try {
+                        window.localStorage.removeItem(key);
+                        this.debugLog(`Cleared localStorage key: ${key}`);
+                    }
+                    catch (error) {
+                        this.debugLog(`Failed to remove localStorage item: ${key}`, error);
+                    }
+                });
+            }
+            // Clear cookies
+            if (document && document.cookie) {
+                const cookies = document.cookie.split(';');
+                cookies.forEach(cookie => {
+                    const eqPos = cookie.indexOf('=');
+                    const name = eqPos > -1 ? cookie.substr(0, eqPos).trim() : cookie.trim();
+                    // Check if cookie is TON-related
+                    if (name.includes('ton') ||
+                        name.includes('TON') ||
+                        name.includes('tonconnect') ||
+                        name.includes('tonkeeper') ||
+                        name.includes('mytonwallet') ||
+                        name.includes('tonhub') ||
+                        name.toLowerCase().includes('wallet')) {
+                        // Clear cookie for current domain
+                        document.cookie = `${name}=; expires=Thu, 01 Jan 1970 00:00:00 UTC; path=/;`;
+                        // Also try to clear for parent domains
+                        const hostname = window.location.hostname;
+                        const parts = hostname.split('.');
+                        for (let i = 0; i < parts.length; i++) {
+                            const domain = parts.slice(i).join('.');
+                            document.cookie = `${name}=; expires=Thu, 01 Jan 1970 00:00:00 UTC; path=/; domain=.${domain};`;
+                        }
+                        this.debugLog(`Cleared cookie: ${name}`);
+                    }
+                });
+            }
+        }
+        catch (error) {
+            this.debugLog('Error clearing TON storage', error);
+        }
+    }
     async getAccount() {
         if (!this.currentAccount || !this.connector) {
             return null;
@@ -6392,6 +6464,10 @@ const AccountDetailsModal = ({ isOpen, onClose, account, onDisconnect, onCopyAdd
     // State for TWC price - hooks must be called before any conditional returns
     const [twcPrice, setTwcPrice] = useState(null);
     const [priceLoading, setPriceLoading] = useState(false);
+    // State for TP Points
+    const [tpPoints, setTpPoints] = useState(null);
+    const [tpLoading, setTpLoading] = useState(false);
+    const [tpError, setTpError] = useState(null);
     // Fetch TWC price when modal opens and twcBalance is available
     useEffect(() => {
         if (isOpen && twcBalance && twcBalance !== '0' && twcBalance !== '0.00') {
@@ -6408,6 +6484,32 @@ const AccountDetailsModal = ({ isOpen, onClose, account, onDisconnect, onCopyAdd
             });
         }
     }, [isOpen, twcBalance]);
+    // Fetch TP Points when modal opens
+    useEffect(() => {
+        if (isOpen && account?.address) {
+            setTpLoading(true);
+            setTpError(null);
+            fetch(`http://localhost:3090/api/v2/user/leaderboard/points/${account.address}`)
+                .then(response => {
+                if (!response.ok) {
+                    throw new Error(`HTTP error! status: ${response.status}`);
+                }
+                return response.json();
+            })
+                .then(responseData => {
+                // Handle nested response structure: { success, statusCode, data: { points, ... } }
+                const points = responseData.data?.points ?? responseData.points ?? responseData.data?.totalPoints ?? 0;
+                setTpPoints(points);
+                setTpLoading(false);
+            })
+                .catch(error => {
+                console.error('Failed to fetch TP points:', error);
+                setTpError('Failed to load');
+                setTpPoints(0);
+                setTpLoading(false);
+            });
+        }
+    }, [isOpen, account?.address]);
     // Early return AFTER hooks
     if (!isOpen || !account)
         return null;
@@ -6774,7 +6876,13 @@ const AccountDetailsModal = ({ isOpen, onClose, account, onDisconnect, onCopyAdd
                                                     fontFamily: 'Lexend, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, sans-serif',
                                                     fontSize: '12px',
                                                     letterSpacing: '-0.1px',
-                                                }, children: "0 TP" })] })] }) }), jsxs("div", { onClick: handleBuyTWC, style: {
+                                                }, children: tpLoading
+                                                    ? 'Loading...'
+                                                    : tpError
+                                                        ? tpError
+                                                        : tpPoints !== null
+                                                            ? `${tpPoints.toLocaleString()} TP`
+                                                            : '0 TP' })] })] }) }), jsxs("div", { onClick: handleBuyTWC, style: {
                                 background: 'rgb(29, 31, 35)',
                                 border: '1px solid rgba(113, 122, 140, 0.08)',
                                 borderRadius: '12px',
@@ -7746,6 +7854,11 @@ const ConnectButton = ({ connector, onConnect, onDisconnect, onError, className,
         if (initialState.status === ConnectionStatus.CONNECTED) {
             // Set isInitializing to true initially, will be set to false once balance loads
             setIsInitializing(true);
+            // Safety timeout - ensure we NEVER stay in loading state for more than 2 seconds
+            const safetyTimeout = setTimeout(() => {
+                setIsInitializing(false);
+                setBalanceLoading(false);
+            }, 2000);
             connector.getAccount().then(async (acc) => {
                 setAccount(acc);
                 // Load balance when account is available
@@ -7757,9 +7870,11 @@ const ConnectButton = ({ connector, onConnect, onDisconnect, onError, className,
                             fetchTONBalance(acc),
                             fetchTONNFTs(acc)
                         ]);
+                        clearTimeout(safetyTimeout);
                         setIsInitializing(false);
                     }
                     catch (err) {
+                        clearTimeout(safetyTimeout);
                         setIsInitializing(false);
                     }
                 }
@@ -7769,25 +7884,15 @@ const ConnectButton = ({ connector, onConnect, onDisconnect, onError, className,
                         const hasRealBalance = await loadBalance();
                         // Always stop loading state after balance fetch
                         setBalanceLoading(false);
-                        // Only stop initializing if we got a real (non-zero) balance
-                        if (hasRealBalance) {
-                            setIsInitializing(false);
-                        }
-                        else {
-                            // For TON and other non-EVM chains, stop initializing even if balance is 0
-                            // This allows the connected button to show with 0 balance
-                            if (acc.chainType !== 'evm') {
-                                setIsInitializing(false);
-                            }
-                            // Keep loading state if balance is 0 for EVM chains only
-                        }
+                        clearTimeout(safetyTimeout);
+                        // Always stop initializing after balance fetch completes, regardless of result
+                        setIsInitializing(false);
                     }
                     catch (err) {
                         setBalanceLoading(false);
-                        // On error, stop initializing for non-EVM chains
-                        if (acc && acc.chainType !== 'evm') {
-                            setIsInitializing(false);
-                        }
+                        clearTimeout(safetyTimeout);
+                        // Always stop initializing on error
+                        setIsInitializing(false);
                     }
                 }
                 else {
@@ -7801,6 +7906,7 @@ const ConnectButton = ({ connector, onConnect, onDisconnect, onError, className,
                         if (acc.address) {
                             saveTWCBalanceToCache(acc.address, stateTwcBalance, state.usdValue ?? null);
                         }
+                        clearTimeout(safetyTimeout);
                         setIsInitializing(false);
                     }
                     else if (acc) {
@@ -7809,6 +7915,7 @@ const ConnectButton = ({ connector, onConnect, onDisconnect, onError, className,
                         if (cached?.balance && cached.balance !== '0' && cached.balance !== '0.00') {
                             setTwcBalance(cached.balance);
                             setUsdValueStable(cached.usdValue);
+                            clearTimeout(safetyTimeout);
                             setIsInitializing(false);
                         }
                         else {
@@ -7821,16 +7928,19 @@ const ConnectButton = ({ connector, onConnect, onDisconnect, onError, className,
                                         if (acc.address) {
                                             saveTWCBalanceToCache(acc.address, result.balance, result.usdValue);
                                         }
+                                        clearTimeout(safetyTimeout);
                                         setIsInitializing(false);
                                     }
                                     else {
                                         // Fetch failed - show connected button with 0 balance
                                         setTwcBalance('0');
+                                        clearTimeout(safetyTimeout);
                                         setIsInitializing(false);
                                     }
                                 }).catch((error) => {
                                     // On error - show connected button with 0 balance
                                     setTwcBalance('0');
+                                    clearTimeout(safetyTimeout);
                                     setIsInitializing(false);
                                 });
                             }
@@ -7843,8 +7953,10 @@ const ConnectButton = ({ connector, onConnect, onDisconnect, onError, className,
                                         fetchTONBalance(acc),
                                         fetchTONNFTs(acc)
                                     ]).then(() => {
+                                        clearTimeout(safetyTimeout);
                                         setIsInitializing(false);
                                     }).catch((err) => {
+                                        clearTimeout(safetyTimeout);
                                         setIsInitializing(false);
                                     });
                                 }
@@ -7859,15 +7971,18 @@ const ConnectButton = ({ connector, onConnect, onDisconnect, onError, className,
                                             }
                                         }
                                         // Always stop initializing after attempting to fetch
+                                        clearTimeout(safetyTimeout);
                                         setIsInitializing(false);
                                     }).catch(() => {
                                         // Stop initializing even on error
+                                        clearTimeout(safetyTimeout);
                                         setIsInitializing(false);
                                     });
                                 }
                                 else {
                                     // No fetchBalance and no cached balance - stop initializing with 0 balance
                                     setTwcBalance('0');
+                                    clearTimeout(safetyTimeout);
                                     setIsInitializing(false);
                                 }
                             }
@@ -7875,6 +7990,7 @@ const ConnectButton = ({ connector, onConnect, onDisconnect, onError, className,
                     }
                 }
             }).catch((err) => {
+                clearTimeout(safetyTimeout);
                 setIsInitializing(false);
                 // If we can't get account even though status is connected, disconnect
                 setAccount(null);
@@ -7884,7 +8000,7 @@ const ConnectButton = ({ connector, onConnect, onDisconnect, onError, className,
         else {
             // Only set isInitializing if we're not already connected
             setIsInitializing(true);
-            // Set a timeout to prevent infinite loading (if connection can't be restored)
+            // Set a shorter timeout to prevent stuck loading state
             initTimeout = setTimeout(() => {
                 setIsInitializing(false);
                 // If still no account after timeout, ensure we show connect button
@@ -7903,7 +8019,7 @@ const ConnectButton = ({ connector, onConnect, onDisconnect, onError, className,
                     setAccount(null);
                     setStatus(ConnectionStatus.DISCONNECTED);
                 });
-            }, 3000); // 3 second timeout
+            }, 1500); // Reduced to 1.5 second timeout to prevent stuck loading
             connector.getAccount().then((acc) => {
                 if (initTimeout)
                     clearTimeout(initTimeout);
@@ -8006,6 +8122,8 @@ const ConnectButton = ({ connector, onConnect, onDisconnect, onError, className,
             const prevAccount = account;
             setAccount(null);
             setIsInitializing(false);
+            setIsConnecting(false);
+            setStatus(ConnectionStatus.DISCONNECTED);
             // Clear cached balance when disconnecting
             if (prevAccount?.address) {
                 clearTWCBalanceCache(prevAccount.address);
@@ -8014,6 +8132,39 @@ const ConnectButton = ({ connector, onConnect, onDisconnect, onError, className,
             balanceCache.current.clear();
             transactionsCache.current.clear();
             txDetailsCache.current.clear();
+            tonApiCache.clear();
+            // Reset all state
+            setTwcBalance(null);
+            setUsdValue(null);
+            setBalance({ amount: '', symbol: '' });
+            setTxs([]);
+            setNftCount(0);
+            nftCountRef.current = 0;
+            setTonBalance(null);
+            setTonUsdValue(null);
+            // Clear all localStorage items related to TWC balance cache
+            if (typeof window !== 'undefined' && window.localStorage) {
+                try {
+                    const keysToRemove = [];
+                    for (let i = 0; i < window.localStorage.length; i++) {
+                        const key = window.localStorage.key(i);
+                        if (key && key.includes(TWC_BALANCE_CACHE_KEY)) {
+                            keysToRemove.push(key);
+                        }
+                    }
+                    keysToRemove.forEach(key => {
+                        try {
+                            window.localStorage.removeItem(key);
+                        }
+                        catch (error) {
+                            // Ignore errors
+                        }
+                    });
+                }
+                catch (error) {
+                    // Ignore errors
+                }
+            }
             if (onDisconnect) {
                 onDisconnect();
             }
@@ -8381,12 +8532,51 @@ const ConnectButton = ({ connector, onConnect, onDisconnect, onError, className,
     }, [connector, fetchBalance, loadBalance]);
     const handleDisconnect = useCallback(async () => {
         try {
-            await connector.disconnect();
+            // Close all modals first
             setShowDetailsModal(false);
+            setShowModal(false);
+            setShowSwapModal(false);
+            setShowSendModal(false);
+            setShowActivityModal(false);
+            setShowTWCBalanceModal(false);
+            // Clear current account address before disconnect
+            const currentAddress = account?.address;
+            // Disconnect from connector
+            await connector.disconnect();
+            // Additional cleanup - clear all TWC balance cache entries
+            if (currentAddress) {
+                clearTWCBalanceCache(currentAddress);
+            }
+            // Clear all localStorage items related to TWC and wallets
+            if (typeof window !== 'undefined' && window.localStorage) {
+                try {
+                    const keysToRemove = [];
+                    for (let i = 0; i < window.localStorage.length; i++) {
+                        const key = window.localStorage.key(i);
+                        if (key && (key.includes(TWC_BALANCE_CACHE_KEY) || key.toLowerCase().includes('wallet'))) {
+                            keysToRemove.push(key);
+                        }
+                    }
+                    keysToRemove.forEach(key => {
+                        try {
+                            window.localStorage.removeItem(key);
+                        }
+                        catch (error) {
+                            // Ignore errors
+                        }
+                    });
+                }
+                catch (error) {
+                    // Ignore errors
+                }
+            }
         }
         catch (err) {
+            // Even on error, ensure modals are closed
+            setShowDetailsModal(false);
+            setShowModal(false);
         }
-    }, [connector]);
+    }, [connector, account?.address]);
     const handleCopyAddress = useCallback(() => {
         if (account?.address) {
             navigator.clipboard.writeText(account.address);

package/dist/index.js

@@ -5448,12 +5448,84 @@ class TONBaseAdapter extends BaseWalletAdapter {
                 this.performanceMetrics.lastError = error;
             }
         }
+        // Clear all TON-related storage (localStorage and cookies)
+        this.clearAllTONStorage();
         // Clear local state
         this.currentAccount = null;
         this.notifyStatusChanged(exports.ConnectionStatus.DISCONNECTED);
         this.notifyAccountChanged(null);
         this.debugLog('TON wallet disconnected');
     }
+    /**
+     * Clear all TON-related storage (localStorage and cookies)
+     */
+    clearAllTONStorage() {
+        if (typeof window === 'undefined')
+            return;
+        try {
+            // Clear localStorage
+            if (window.localStorage) {
+                const keysToRemove = [];
+                // Find all TON-related keys
+                for (let i = 0; i < window.localStorage.length; i++) {
+                    const key = window.localStorage.key(i);
+                    if (key) {
+                        // Check for TON-related patterns
+                        if (key.includes('ton') ||
+                            key.includes('TON') ||
+                            key.includes('tonconnect') ||
+                            key.includes('TonConnect') ||
+                            key.includes('tonkeeper') ||
+                            key.includes('mytonwallet') ||
+                            key.includes('tonhub') ||
+                            key.toLowerCase().includes('wallet')) {
+                            keysToRemove.push(key);
+                        }
+                    }
+                }
+                // Remove found keys
+                keysToRemove.forEach(key => {
+                    try {
+                        window.localStorage.removeItem(key);
+                        this.debugLog(`Cleared localStorage key: ${key}`);
+                    }
+                    catch (error) {
+                        this.debugLog(`Failed to remove localStorage item: ${key}`, error);
+                    }
+                });
+            }
+            // Clear cookies
+            if (document && document.cookie) {
+                const cookies = document.cookie.split(';');
+                cookies.forEach(cookie => {
+                    const eqPos = cookie.indexOf('=');
+                    const name = eqPos > -1 ? cookie.substr(0, eqPos).trim() : cookie.trim();
+                    // Check if cookie is TON-related
+                    if (name.includes('ton') ||
+                        name.includes('TON') ||
+                        name.includes('tonconnect') ||
+                        name.includes('tonkeeper') ||
+                        name.includes('mytonwallet') ||
+                        name.includes('tonhub') ||
+                        name.toLowerCase().includes('wallet')) {
+                        // Clear cookie for current domain
+                        document.cookie = `${name}=; expires=Thu, 01 Jan 1970 00:00:00 UTC; path=/;`;
+                        // Also try to clear for parent domains
+                        const hostname = window.location.hostname;
+                        const parts = hostname.split('.');
+                        for (let i = 0; i < parts.length; i++) {
+                            const domain = parts.slice(i).join('.');
+                            document.cookie = `${name}=; expires=Thu, 01 Jan 1970 00:00:00 UTC; path=/; domain=.${domain};`;
+                        }
+                        this.debugLog(`Cleared cookie: ${name}`);
+                    }
+                });
+            }
+        }
+        catch (error) {
+            this.debugLog('Error clearing TON storage', error);
+        }
+    }
     async getAccount() {
         if (!this.currentAccount || !this.connector) {
             return null;
@@ -6394,6 +6466,10 @@ const AccountDetailsModal = ({ isOpen, onClose, account, onDisconnect, onCopyAdd
     // State for TWC price - hooks must be called before any conditional returns
     const [twcPrice, setTwcPrice] = React.useState(null);
     const [priceLoading, setPriceLoading] = React.useState(false);
+    // State for TP Points
+    const [tpPoints, setTpPoints] = React.useState(null);
+    const [tpLoading, setTpLoading] = React.useState(false);
+    const [tpError, setTpError] = React.useState(null);
     // Fetch TWC price when modal opens and twcBalance is available
     React.useEffect(() => {
         if (isOpen && twcBalance && twcBalance !== '0' && twcBalance !== '0.00') {
@@ -6410,6 +6486,32 @@ const AccountDetailsModal = ({ isOpen, onClose, account, onDisconnect, onCopyAdd
             });
         }
     }, [isOpen, twcBalance]);
+    // Fetch TP Points when modal opens
+    React.useEffect(() => {
+        if (isOpen && account?.address) {
+            setTpLoading(true);
+            setTpError(null);
+            fetch(`http://localhost:3090/api/v2/user/leaderboard/points/${account.address}`)
+                .then(response => {
+                if (!response.ok) {
+                    throw new Error(`HTTP error! status: ${response.status}`);
+                }
+                return response.json();
+            })
+                .then(responseData => {
+                // Handle nested response structure: { success, statusCode, data: { points, ... } }
+                const points = responseData.data?.points ?? responseData.points ?? responseData.data?.totalPoints ?? 0;
+                setTpPoints(points);
+                setTpLoading(false);
+            })
+                .catch(error => {
+                console.error('Failed to fetch TP points:', error);
+                setTpError('Failed to load');
+                setTpPoints(0);
+                setTpLoading(false);
+            });
+        }
+    }, [isOpen, account?.address]);
     // Early return AFTER hooks
     if (!isOpen || !account)
         return null;
@@ -6776,7 +6878,13 @@ const AccountDetailsModal = ({ isOpen, onClose, account, onDisconnect, onCopyAdd
                                                     fontFamily: 'Lexend, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, sans-serif',
                                                     fontSize: '12px',
                                                     letterSpacing: '-0.1px',
-                                                }, children: "0 TP" })] })] }) }), jsxRuntime.jsxs("div", { onClick: handleBuyTWC, style: {
+                                                }, children: tpLoading
+                                                    ? 'Loading...'
+                                                    : tpError
+                                                        ? tpError
+                                                        : tpPoints !== null
+                                                            ? `${tpPoints.toLocaleString()} TP`
+                                                            : '0 TP' })] })] }) }), jsxRuntime.jsxs("div", { onClick: handleBuyTWC, style: {
                                 background: 'rgb(29, 31, 35)',
                                 border: '1px solid rgba(113, 122, 140, 0.08)',
                                 borderRadius: '12px',
@@ -7748,6 +7856,11 @@ const ConnectButton = ({ connector, onConnect, onDisconnect, onError, className,
         if (initialState.status === exports.ConnectionStatus.CONNECTED) {
             // Set isInitializing to true initially, will be set to false once balance loads
             setIsInitializing(true);
+            // Safety timeout - ensure we NEVER stay in loading state for more than 2 seconds
+            const safetyTimeout = setTimeout(() => {
+                setIsInitializing(false);
+                setBalanceLoading(false);
+            }, 2000);
             connector.getAccount().then(async (acc) => {
                 setAccount(acc);
                 // Load balance when account is available
@@ -7759,9 +7872,11 @@ const ConnectButton = ({ connector, onConnect, onDisconnect, onError, className,
                             fetchTONBalance(acc),
                             fetchTONNFTs(acc)
                         ]);
+                        clearTimeout(safetyTimeout);
                         setIsInitializing(false);
                     }
                     catch (err) {
+                        clearTimeout(safetyTimeout);
                         setIsInitializing(false);
                     }
                 }
@@ -7771,25 +7886,15 @@ const ConnectButton = ({ connector, onConnect, onDisconnect, onError, className,
                         const hasRealBalance = await loadBalance();
                         // Always stop loading state after balance fetch
                         setBalanceLoading(false);
-                        // Only stop initializing if we got a real (non-zero) balance
-                        if (hasRealBalance) {
-                            setIsInitializing(false);
-                        }
-                        else {
-                            // For TON and other non-EVM chains, stop initializing even if balance is 0
-                            // This allows the connected button to show with 0 balance
-                            if (acc.chainType !== 'evm') {
-                                setIsInitializing(false);
-                            }
-                            // Keep loading state if balance is 0 for EVM chains only
-                        }
+                        clearTimeout(safetyTimeout);
+                        // Always stop initializing after balance fetch completes, regardless of result
+                        setIsInitializing(false);
                     }
                     catch (err) {
                         setBalanceLoading(false);
-                        // On error, stop initializing for non-EVM chains
-                        if (acc && acc.chainType !== 'evm') {
-                            setIsInitializing(false);
-                        }
+                        clearTimeout(safetyTimeout);
+                        // Always stop initializing on error
+                        setIsInitializing(false);
                     }
                 }
                 else {
@@ -7803,6 +7908,7 @@ const ConnectButton = ({ connector, onConnect, onDisconnect, onError, className,
                         if (acc.address) {
                             saveTWCBalanceToCache(acc.address, stateTwcBalance, state.usdValue ?? null);
                         }
+                        clearTimeout(safetyTimeout);
                         setIsInitializing(false);
                     }
                     else if (acc) {
@@ -7811,6 +7917,7 @@ const ConnectButton = ({ connector, onConnect, onDisconnect, onError, className,
                         if (cached?.balance && cached.balance !== '0' && cached.balance !== '0.00') {
                             setTwcBalance(cached.balance);
                             setUsdValueStable(cached.usdValue);
+                            clearTimeout(safetyTimeout);
                             setIsInitializing(false);
                         }
                         else {
@@ -7823,16 +7930,19 @@ const ConnectButton = ({ connector, onConnect, onDisconnect, onError, className,
                                         if (acc.address) {
                                             saveTWCBalanceToCache(acc.address, result.balance, result.usdValue);
                                         }
+                                        clearTimeout(safetyTimeout);
                                         setIsInitializing(false);
                                     }
                                     else {
                                         // Fetch failed - show connected button with 0 balance
                                         setTwcBalance('0');
+                                        clearTimeout(safetyTimeout);
                                         setIsInitializing(false);
                                     }
                                 }).catch((error) => {
                                     // On error - show connected button with 0 balance
                                     setTwcBalance('0');
+                                    clearTimeout(safetyTimeout);
                                     setIsInitializing(false);
                                 });
                             }
@@ -7845,8 +7955,10 @@ const ConnectButton = ({ connector, onConnect, onDisconnect, onError, className,
                                         fetchTONBalance(acc),
                                         fetchTONNFTs(acc)
                                     ]).then(() => {
+                                        clearTimeout(safetyTimeout);
                                         setIsInitializing(false);
                                     }).catch((err) => {
+                                        clearTimeout(safetyTimeout);
                                         setIsInitializing(false);
                                     });
                                 }
@@ -7861,15 +7973,18 @@ const ConnectButton = ({ connector, onConnect, onDisconnect, onError, className,
                                             }
                                         }
                                         // Always stop initializing after attempting to fetch
+                                        clearTimeout(safetyTimeout);
                                         setIsInitializing(false);
                                     }).catch(() => {
                                         // Stop initializing even on error
+                                        clearTimeout(safetyTimeout);
                                         setIsInitializing(false);
                                     });
                                 }
                                 else {
                                     // No fetchBalance and no cached balance - stop initializing with 0 balance
                                     setTwcBalance('0');
+                                    clearTimeout(safetyTimeout);
                                     setIsInitializing(false);
                                 }
                             }
@@ -7877,6 +7992,7 @@ const ConnectButton = ({ connector, onConnect, onDisconnect, onError, className,
                     }
                 }
             }).catch((err) => {
+                clearTimeout(safetyTimeout);
                 setIsInitializing(false);
                 // If we can't get account even though status is connected, disconnect
                 setAccount(null);
@@ -7886,7 +8002,7 @@ const ConnectButton = ({ connector, onConnect, onDisconnect, onError, className,
         else {
             // Only set isInitializing if we're not already connected
             setIsInitializing(true);
-            // Set a timeout to prevent infinite loading (if connection can't be restored)
+            // Set a shorter timeout to prevent stuck loading state
             initTimeout = setTimeout(() => {
                 setIsInitializing(false);
                 // If still no account after timeout, ensure we show connect button
@@ -7905,7 +8021,7 @@ const ConnectButton = ({ connector, onConnect, onDisconnect, onError, className,
                     setAccount(null);
                     setStatus(exports.ConnectionStatus.DISCONNECTED);
                 });
-            }, 3000); // 3 second timeout
+            }, 1500); // Reduced to 1.5 second timeout to prevent stuck loading
             connector.getAccount().then((acc) => {
                 if (initTimeout)
                     clearTimeout(initTimeout);
@@ -8008,6 +8124,8 @@ const ConnectButton = ({ connector, onConnect, onDisconnect, onError, className,
             const prevAccount = account;
             setAccount(null);
             setIsInitializing(false);
+            setIsConnecting(false);
+            setStatus(exports.ConnectionStatus.DISCONNECTED);
             // Clear cached balance when disconnecting
             if (prevAccount?.address) {
                 clearTWCBalanceCache(prevAccount.address);
@@ -8016,6 +8134,39 @@ const ConnectButton = ({ connector, onConnect, onDisconnect, onError, className,
             balanceCache.current.clear();
             transactionsCache.current.clear();
             txDetailsCache.current.clear();
+            tonApiCache.clear();
+            // Reset all state
+            setTwcBalance(null);
+            setUsdValue(null);
+            setBalance({ amount: '', symbol: '' });
+            setTxs([]);
+            setNftCount(0);
+            nftCountRef.current = 0;
+            setTonBalance(null);
+            setTonUsdValue(null);
+            // Clear all localStorage items related to TWC balance cache
+            if (typeof window !== 'undefined' && window.localStorage) {
+                try {
+                    const keysToRemove = [];
+                    for (let i = 0; i < window.localStorage.length; i++) {
+                        const key = window.localStorage.key(i);
+                        if (key && key.includes(TWC_BALANCE_CACHE_KEY)) {
+                            keysToRemove.push(key);
+                        }
+                    }
+                    keysToRemove.forEach(key => {
+                        try {
+                            window.localStorage.removeItem(key);
+                        }
+                        catch (error) {
+                            // Ignore errors
+                        }
+                    });
+                }
+                catch (error) {
+                    // Ignore errors
+                }
+            }
             if (onDisconnect) {
                 onDisconnect();
             }
@@ -8383,12 +8534,51 @@ const ConnectButton = ({ connector, onConnect, onDisconnect, onError, className,
     }, [connector, fetchBalance, loadBalance]);
     const handleDisconnect = React.useCallback(async () => {
         try {
-            await connector.disconnect();
+            // Close all modals first
             setShowDetailsModal(false);
+            setShowModal(false);
+            setShowSwapModal(false);
+            setShowSendModal(false);
+            setShowActivityModal(false);
+            setShowTWCBalanceModal(false);
+            // Clear current account address before disconnect
+            const currentAddress = account?.address;
+            // Disconnect from connector
+            await connector.disconnect();
+            // Additional cleanup - clear all TWC balance cache entries
+            if (currentAddress) {
+                clearTWCBalanceCache(currentAddress);
+            }
+            // Clear all localStorage items related to TWC and wallets
+            if (typeof window !== 'undefined' && window.localStorage) {
+                try {
+                    const keysToRemove = [];
+                    for (let i = 0; i < window.localStorage.length; i++) {
+                        const key = window.localStorage.key(i);
+                        if (key && (key.includes(TWC_BALANCE_CACHE_KEY) || key.toLowerCase().includes('wallet'))) {
+                            keysToRemove.push(key);
+                        }
+                    }
+                    keysToRemove.forEach(key => {
+                        try {
+                            window.localStorage.removeItem(key);
+                        }
+                        catch (error) {
+                            // Ignore errors
+                        }
+                    });
+                }
+                catch (error) {
+                    // Ignore errors
+                }
+            }
         }
         catch (err) {
+            // Even on error, ensure modals are closed
+            setShowDetailsModal(false);
+            setShowModal(false);
         }
-    }, [connector]);
+    }, [connector, account?.address]);
     const handleCopyAddress = React.useCallback(() => {
         if (account?.address) {
             navigator.clipboard.writeText(account.address);

package/package.json

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