@pooflabs/web 0.0.28 → 0.0.29

package/dist/index.esm.js

@@ -10344,7 +10344,7 @@ class PhantomWalletProvider {
                         } : null,
                     };
                 }
-            }, [phantom, phantom === null || phantom === void 0 ? void 0 : phantom.isConnected, phantom === null || phantom === void 0 ? void 0 : phantom.addresses, phantom === null || phantom === void 0 ? void 0 : phantom.isLoading, connect, disconnect, isDisconnecting, modal, modal.isOpened, solana, connectError]);
+            }, [phantom, phantom === null || phantom === void 0 ? void 0 : phantom.isConnected, phantom === null || phantom === void 0 ? void 0 : phantom.addresses, phantom === null || phantom === void 0 ? void 0 : phantom.isLoading, connect, disconnect, isDisconnecting, modal, modal.isOpened, solana, solana === null || solana === void 0 ? void 0 : solana.isAvailable, connectError]);
             // Handle modal close without connection
             React$1.useEffect(() => {
                 // Detect when modal was open and is now closed
@@ -10371,52 +10371,55 @@ class PhantomWalletProvider {
             React$1.useEffect(() => {
                 const handleConnectionSuccess = async () => {
                     var _a;
-                    if ((phantom === null || phantom === void 0 ? void 0 : phantom.isConnected) && ((_a = phantom === null || phantom === void 0 ? void 0 : phantom.addresses) === null || _a === void 0 ? void 0 : _a.length) > 0 && that.pendingLogin && that.loginInProgress) {
-                        try {
-                            // Find Solana address
-                            const solAddress = phantom.addresses.find((addr) => addr.addressType === AddressType.solana);
-                            if (!solAddress) {
-                                that.pendingLogin.reject(new Error('No Solana address returned'));
-                                that.pendingLogin = null;
-                                that.loginInProgress = false;
-                                return;
-                            }
-                            const publicKey = solAddress.address;
-                            // Check if we already have a valid session
-                            const existingSession = await WebSessionManager.getSession();
-                            if (existingSession && existingSession.address === publicKey) {
-                                const user = { provider: that, address: publicKey };
-                                setCurrentUser(user);
-                                that.pendingLogin.resolve(user);
-                                that.pendingLogin = null;
-                                that.loginInProgress = false;
-                                return;
-                            }
-                            // Wait for solana methods to be available
-                            if (!solana || !solana.isAvailable) {
-                                // Solana not ready yet, wait a bit and retry
-                                setTimeout(() => handleConnectionSuccess(), 100);
-                                return;
-                            }
-                            // Create new session with signature
-                            const nonce = await genAuthNonce();
-                            const messageText = await genSolanaMessage(publicKey, nonce);
-                            // signMessage returns a string directly
-                            const signature = await solana.signMessage(messageText);
-                            const createSessionResult = await createSessionWithSignature(publicKey, messageText, signature);
-                            await WebSessionManager.storeSession(publicKey, createSessionResult.accessToken, createSessionResult.idToken, createSessionResult.refreshToken);
+                    // All conditions must be met for login to proceed
+                    if (!(phantom === null || phantom === void 0 ? void 0 : phantom.isConnected) || !((_a = phantom === null || phantom === void 0 ? void 0 : phantom.addresses) === null || _a === void 0 ? void 0 : _a.length) || !that.pendingLogin || !that.loginInProgress) {
+                        return;
+                    }
+                    // Solana must be available for signing
+                    // If not ready yet, just return - this effect will re-run when solana?.isAvailable changes
+                    if (!solana || !solana.isAvailable) {
+                        console.log('[Phantom] Waiting for Solana to be available...');
+                        return;
+                    }
+                    try {
+                        // Immediately set loginInProgress to false to prevent double execution
+                        // if the effect runs again before async operations complete
+                        that.loginInProgress = false;
+                        // Find Solana address
+                        const solAddress = phantom.addresses.find((addr) => addr.addressType === AddressType.solana);
+                        if (!solAddress) {
+                            that.pendingLogin.reject(new Error('No Solana address returned'));
+                            that.pendingLogin = null;
+                            return;
+                        }
+                        const publicKey = solAddress.address;
+                        // Check if we already have a valid session
+                        const existingSession = await WebSessionManager.getSession();
+                        if (existingSession && existingSession.address === publicKey) {
                             const user = { provider: that, address: publicKey };
                             setCurrentUser(user);
                             that.pendingLogin.resolve(user);
                             that.pendingLogin = null;
-                            that.loginInProgress = false;
+                            return;
                         }
-                        catch (error) {
-                            if (that.pendingLogin) {
-                                that.pendingLogin.reject(error);
-                                that.pendingLogin = null;
-                                that.loginInProgress = false;
-                            }
+                        console.log('[Phantom] Creating session with signature...');
+                        // Create new session with signature
+                        const nonce = await genAuthNonce();
+                        const messageText = await genSolanaMessage(publicKey, nonce);
+                        // signMessage returns a string directly - this should trigger the Phantom sign popup
+                        const signature = await solana.signMessage(messageText);
+                        const createSessionResult = await createSessionWithSignature(publicKey, messageText, signature);
+                        await WebSessionManager.storeSession(publicKey, createSessionResult.accessToken, createSessionResult.idToken, createSessionResult.refreshToken);
+                        const user = { provider: that, address: publicKey };
+                        setCurrentUser(user);
+                        that.pendingLogin.resolve(user);
+                        that.pendingLogin = null;
+                    }
+                    catch (error) {
+                        if (that.pendingLogin) {
+                            that.pendingLogin.reject(error);
+                            that.pendingLogin = null;
+                            that.loginInProgress = false;
                         }
                     }
                 };