@abstraxn/signer-react 2.0.1 → 2.0.2

package/dist/src/components/AbstraxnProvider/AbstraxnProviderInner.js

@@ -16,7 +16,7 @@ function WagmiConnectionEffectSync({ onDisconnect, }) {
     useConnectionEffect({ onDisconnect });
     return null;
 }
-export function AbstraxnProviderInner({ config, children, base, wagmi, }) {
+export function AbstraxnProviderInner({ config, children, base, wagmi, solana, }) {
     const { isInitialized, setIsInitialized, isConnected, setIsConnected, address, setAddress, user, setUser, whoami, setWhoami, chainId, setChainId, error, setError, loading, setLoading, resending, setResending, walletBalance, setWalletBalance, onboardingRef, otpIdRef, walletRef, googleCallbackHandledRef, twitterCallbackHandledRef, discordCallbackHandledRef, } = base;
     const externalWalletsEnabled = config.externalWallets?.enabled ?? false;
     // Keep a ref to avoid re-creating callbacks when toggling config (prevents flicker)
@@ -47,6 +47,99 @@ export function AbstraxnProviderInner({ config, children, base, wagmi, }) {
     useEffect(() => {
         isExternalWalletConnectedRef.current = isExternalWalletConnected;
     }, [isExternalWalletConnected]);
+    // Track Solana state changes
+    useEffect(() => {
+        if (solana?.wallet?.connected && solana?.wallet?.publicKey) {
+            // For wallets that support both (like MetaMask via snaps), if we explicitly chose "solana", force it
+            // The wallet adapter usually handles this, but we want our internal state to reflect the Solana connection
+            const pubKey = solana.wallet.publicKey.toBase58();
+            setIsExternalWalletConnected(true);
+            setExternalWalletAddress(pubKey);
+            setIsConnected(true);
+            setAddress(pubKey);
+            // Use a real Solana chainId so `currentChain` resolves from SOLANA_CHAINS.
+            const cluster = String(config?.solanaConfig?.cluster || '').toLowerCase();
+            const chainIdForSolana = cluster === 'devnet'
+                ? SOLANA_CHAINS.solanaDevnet.id
+                : SOLANA_CHAINS.solana.id;
+            setExternalWalletChainId(chainIdForSolana);
+            setChainId(chainIdForSolana);
+            const walletName = solana.wallet.wallet?.adapter.name?.toLowerCase() || 'solana';
+            setConnectionType(walletName);
+            localStorage.setItem("abstraxn_connection_type", walletName);
+            localStorage.setItem("abstraxn_chain_type", "solana");
+            explicitConnectionRef.current = true;
+            autoDisconnectHandledRef.current = false;
+            // Close the onboarding modal after successful connection
+            if (onboardingRef.current) {
+                const onboardingAny = onboardingRef.current;
+                if (onboardingAny.modalOverlay) {
+                    setTimeout(() => {
+                        if (onboardingAny.modalOverlay) {
+                            onboardingAny.modalOverlay.classList.remove("onboarding-modal-open");
+                            onboardingAny.modalOverlay.classList.add("onboarding-modal-closing");
+                            setTimeout(() => {
+                                if (onboardingAny.modalOverlay) {
+                                    onboardingAny.modalOverlay.style.display = "none";
+                                }
+                            }, 200);
+                            document.body.style.overflow = "";
+                        }
+                    }, 100);
+                }
+            }
+        }
+        else if (solana?.wallet && !solana.wallet.connected) {
+            // If the user disconnected from the Solana wallet (e.g. Phantom UI), ensure our state resets.
+            // Without this, the UI can stay "connected" and block reconnects until refresh.
+            if (disconnectingRef.current)
+                return;
+            const chainTypePref = typeof window !== "undefined"
+                ? localStorage.getItem("abstraxn_chain_type")
+                : null;
+            const ct = (connectionType || "").toLowerCase();
+            const looksLikeSolana = chainTypePref === "solana" ||
+                ct === "phantom" ||
+                ct === "solflare" ||
+                ct === "solana";
+            if (looksLikeSolana && (isExternalWalletConnectedRef.current || externalWalletAddress)) {
+                setIsExternalWalletConnected(false);
+                setExternalWalletAddress(null);
+                setExternalWalletChainId(null);
+                setConnectionType(null);
+                // Only clear main state if Abstraxn embedded wallet isn't connected
+                if (!walletRef.current?.isConnected) {
+                    setIsConnected(false);
+                    setAddress(null);
+                    setChainId(null);
+                }
+                explicitConnectionRef.current = false;
+                lastConnectionTimeRef.current = 0;
+                lastAddressRef.current = null;
+                lastChainIdRef.current = null;
+                try {
+                    localStorage.removeItem("abstraxn_connection_type");
+                    localStorage.removeItem("abstraxn_chain_type");
+                    localStorage.removeItem("walletName"); // wallet-adapter-react selection key
+                }
+                catch (e) {
+                    // Ignore
+                }
+                // Clear selection so a subsequent connect starts cleanly
+                try {
+                    solana.wallet.select?.(null);
+                }
+                catch (e) {
+                    // Ignore
+                }
+            }
+        }
+    }, [
+        solana?.wallet?.connected,
+        solana?.wallet?.publicKey?.toBase58(),
+        connectionType,
+        externalWalletAddress,
+    ]);
     // Track when we last connected to prevent premature reset
     const lastConnectionTimeRef = useRef(0);
     // Refs to track previous values and prevent unnecessary updates
@@ -99,6 +192,11 @@ export function AbstraxnProviderInner({ config, children, base, wagmi, }) {
         // Check if wagmi has already restored a connection from localStorage
         // This happens automatically with wagmi's persistence when storage is configured
         const checkAndRestore = () => {
+            // If we explicitly connected to Solana, do not restore Wagmi EVM state
+            const chainTypePref = typeof window !== 'undefined' ? localStorage.getItem("abstraxn_chain_type") : null;
+            if (chainTypePref === "solana") {
+                return false;
+            }
             if (wagmiAccount.isConnected &&
                 wagmiAccount.address &&
                 !isExternalWalletConnected) {
@@ -345,6 +443,8 @@ export function AbstraxnProviderInner({ config, children, base, wagmi, }) {
             // Clear from localStorage
             try {
                 localStorage.removeItem("abstraxn_connection_type");
+                localStorage.removeItem("abstraxn_chain_type");
+                localStorage.removeItem("walletName"); // Clear wallet adapter state
             }
             catch (e) {
                 // Ignore localStorage errors
@@ -1321,8 +1421,34 @@ export function AbstraxnProviderInner({ config, children, base, wagmi, }) {
             // If external wallet is connected, disconnect it first
             if (wasExternalWalletConnected &&
                 externalWalletsEnabled &&
-                wagmiDisconnect) {
-                try {
+                (wagmiDisconnect || solana?.wallet)) {
+                // Disconnect Solana adapter first (Phantom/Solflare), otherwise reconnect can get stuck until refresh.
+                const chainTypePref = typeof window !== "undefined"
+                    ? localStorage.getItem("abstraxn_chain_type")
+                    : null;
+                const ct = (connectionType || "").toLowerCase();
+                const looksLikeSolana = chainTypePref === "solana" ||
+                    ct === "phantom" ||
+                    ct === "solflare" ||
+                    ct === "solana";
+                if (solana?.wallet && (solana.wallet.connected || looksLikeSolana)) {
+                    try {
+                        if (solana.wallet.connected) {
+                            await solana.wallet.disconnect();
+                        }
+                    }
+                    catch (e) {
+                        // Ignore
+                    }
+                    try {
+                        solana.wallet.select?.(null);
+                    }
+                    catch (e) {
+                        // Ignore
+                    }
+                }
+                // Disconnect wagmi connector only if it's actually connected (avoid no-op errors for Solana-only connections)
+                if (wagmiDisconnect && wagmiAccount?.isConnected) {
                     // For WalletConnect: disconnect provider first so session is fully torn down on first click
                     const connector = wagmiAccount?.connector;
                     const isWalletConnect = connector &&
@@ -1339,36 +1465,40 @@ export function AbstraxnProviderInner({ config, children, base, wagmi, }) {
                             // Ignore - wagmi disconnect will still run
                         }
                     }
-                    await wagmiDisconnect.disconnect();
-                    // Wait for wagmi state to update (WalletConnect can be slow)
-                    await new Promise((resolve) => setTimeout(resolve, 200));
-                    // Reset external wallet state immediately
-                    setIsExternalWalletConnected(false);
-                    setExternalWalletAddress(null);
-                    setExternalWalletChainId(null);
-                    setConnectionType(null);
-                    // Clear refs so useEffect doesn't think we're still connected (fixes "disconnect twice")
-                    lastAddressRef.current = null;
-                    lastChainIdRef.current = null;
-                    // Clear from localStorage
                     try {
-                        localStorage.removeItem("abstraxn_connection_type");
+                        await wagmiDisconnect.disconnect();
+                        // Wait for wagmi state to update (WalletConnect can be slow)
+                        await new Promise((resolve) => setTimeout(resolve, 200));
                     }
                     catch (e) {
-                        // Ignore localStorage errors
+                        // Ignore wagmi disconnect failures; we still reset our state below.
                     }
-                    explicitConnectionRef.current = false;
-                    lastConnectionTimeRef.current = 0;
-                    // Always reset main isConnected when disconnecting external wallet
-                    // Since the context value is computed as isExternalWalletConnected || isConnected,
-                    // we need to set isConnected to false so the overall isConnected becomes false
-                    setIsConnected(false);
-                    setAddress(null);
-                    setChainId(null);
                 }
-                catch (err) {
-                    throw err;
+                // Reset external wallet state immediately
+                setIsExternalWalletConnected(false);
+                setExternalWalletAddress(null);
+                setExternalWalletChainId(null);
+                setConnectionType(null);
+                // Clear refs so useEffect doesn't think we're still connected (fixes "disconnect twice")
+                lastAddressRef.current = null;
+                lastChainIdRef.current = null;
+                // Clear from localStorage
+                try {
+                    localStorage.removeItem("abstraxn_connection_type");
+                    localStorage.removeItem("abstraxn_chain_type");
+                    localStorage.removeItem("walletName");
+                }
+                catch (e) {
+                    // Ignore localStorage errors
                 }
+                explicitConnectionRef.current = false;
+                lastConnectionTimeRef.current = 0;
+                // Always reset main isConnected when disconnecting external wallet
+                // Since the context value is computed as isExternalWalletConnected || isConnected,
+                // we need to set isConnected to false so the overall isConnected becomes false
+                setIsConnected(false);
+                setAddress(null);
+                setChainId(null);
             }
             // Disconnect Abstraxn wallet if it's connected
             if (wasAbstraxnWalletConnected && walletRef.current) {
@@ -1384,6 +1514,7 @@ export function AbstraxnProviderInner({ config, children, base, wagmi, }) {
                     // Clear from localStorage
                     try {
                         localStorage.removeItem("abstraxn_connection_type");
+                        localStorage.removeItem("walletName");
                     }
                     catch (e) {
                         // Ignore localStorage errors
@@ -1971,6 +2102,12 @@ export function AbstraxnProviderInner({ config, children, base, wagmi, }) {
         if (!externalWalletsEnabled || !wagmiAccount) {
             return;
         }
+        // Check if we explicitly connected to a Solana wallet and it is currently connected.
+        // If so, we should ignore Wagmi's connection state to prevent EVM from overriding Solana.
+        const chainTypePref = typeof window !== 'undefined' ? localStorage.getItem("abstraxn_chain_type") : null;
+        if (chainTypePref === "solana" && solana?.wallet?.connected) {
+            return;
+        }
         // Prevent auto-connect (but allow restoration from persistence)
         // Only auto-disconnect if:
         // 1. wagmiAccount is connected
@@ -2333,6 +2470,7 @@ export function AbstraxnProviderInner({ config, children, base, wagmi, }) {
                     setConnectionType(connectionTypeValue);
                     try {
                         localStorage.setItem("abstraxn_connection_type", connectionTypeValue);
+                        localStorage.setItem("abstraxn_chain_type", "evm");
                     }
                     catch (e) { }
                     // Update refs
@@ -2466,6 +2604,19 @@ export function AbstraxnProviderInner({ config, children, base, wagmi, }) {
                 }
             }
             // Await the disconnect to ensure it completes
+            if (solana?.wallet?.connected) {
+                try {
+                    await solana?.wallet?.disconnect();
+                }
+                catch (e) { }
+            }
+            // Clear Solana wallet selection so reconnect starts cleanly
+            if (solana?.wallet) {
+                try {
+                    solana.wallet.select?.(null);
+                }
+                catch (e) { }
+            }
             await wagmiDisconnect.disconnect();
             // Wait for wagmi state to update (WalletConnect can be slow)
             await new Promise((resolve) => setTimeout(resolve, 200));
@@ -2477,6 +2628,8 @@ export function AbstraxnProviderInner({ config, children, base, wagmi, }) {
             // Clear from localStorage
             try {
                 localStorage.removeItem("abstraxn_connection_type");
+                localStorage.removeItem("abstraxn_chain_type");
+                localStorage.removeItem("walletName");
             }
             catch (e) {
                 // Ignore localStorage errors
@@ -2508,7 +2661,7 @@ export function AbstraxnProviderInner({ config, children, base, wagmi, }) {
             }, 200);
             setLoading(false);
         }
-    }, [externalWalletsEnabled, wagmiDisconnect, wagmiAccount?.connector]);
+    }, [externalWalletsEnabled, wagmiDisconnect, wagmiAccount?.connector, solana?.wallet]);
     // When wagmi reports disconnect (e.g. user disconnected in extension), clear external wallet state immediately
     const handleWagmiDisconnect = useCallback(() => {
         if (!externalWalletsEnabledRef.current)
@@ -2519,6 +2672,7 @@ export function AbstraxnProviderInner({ config, children, base, wagmi, }) {
         setConnectionType(null);
         try {
             localStorage.removeItem("abstraxn_connection_type");
+            localStorage.removeItem("abstraxn_chain_type");
         }
         catch (e) {
             // Ignore
@@ -2862,6 +3016,8 @@ export function AbstraxnProviderInner({ config, children, base, wagmi, }) {
         loading,
         resending: resending ?? false,
         disconnecting: disconnecting ?? false,
+        solanaWallet: solana?.wallet,
+        solanaConnection: solana?.connection,
         init,
         connect,
         disconnect,