@getpara/react-sdk-lite 2.12.0 → 2.13.0

package/dist/provider/providers/ExternalWalletProvider.js

@@ -8,21 +8,23 @@ import { jsx } from "react/jsx-runtime";
 import { createContext, useCallback, useContext, useEffect, useMemo, useRef, useState } from "react";
 import { isMobile, truncateAddress } from "@getpara/web-sdk";
 import { useInternalClient } from "../hooks/utils/useInternalClient.js";
-import { useStore } from "../stores/useStore.js";
-import { ModalStep, openPopup } from "../../modal/index.js";
-import { useModalStore } from "../../modal/stores/index.js";
-import { useAccount, useModal, useParaStatus, useVerifyExternalWallet, useWalletState } from "../hooks/index.js";
+import { store, useStore } from "../stores/useStore.js";
+import { openPopup } from "../../modal/index.js";
+import { useAccount, useModal, useParaStatus, useWaitForWalletCreation, useWalletState } from "../hooks/index.js";
 import {
-  openMobileUrl
+  openMobileUrl,
+  useUserAgent
 } from "@getpara/react-common";
 import { ParaEvent, dispatchEvent } from "@getpara/web-sdk";
-import { useAuthActions } from "./AuthProvider.js";
-import { IS_FULLY_LOGGED_IN_BASE_KEY } from "../hooks/queries/useIsFullyLoggedIn.js";
-import { useQueryClient } from "@tanstack/react-query";
+import {
+  AuthMethod,
+  isExternalWallet
+} from "@getpara/user-management-client";
 import { useGoBack } from "../../modal/hooks/useGoBack.js";
 import { validatePortalOrigin } from "../../modal/utils/validatePortalOrigin.js";
+import { DEFAULTS } from "../../modal/constants/defaults.js";
 const useWalletDisplayHelpers = (wallet) => {
-  const isUsingMobileConnector = useModalStore((state) => state.isUsingMobileConnector);
+  const isUsingMobileConnector = useStore((state) => state.isUsingMobileConnector);
   return {
     // Show the extension screen if on web and the wallet is an extension and installed or the wallet isn't a mobile wallet
     // Also show the extension connection if on desktop for a solana wallet (no walletConnect)
@@ -49,17 +51,18 @@ const defaultExternalWallet = {
   setChainIdSwitchingTo: () => {
   },
   connectEmbeddedToExternalConnectors: () => Promise.resolve(),
-  verifyWalletSignature: () => Promise.resolve({}),
   signMessage: () => Promise.resolve({}),
   isSigningMessage: false,
   getWalletBalance: () => Promise.resolve(void 0),
   requestInfo: (_) => Promise.resolve({}),
   disconnectBase: (_, __, ___) => Promise.resolve(),
   connectFarcasterMiniApp: () => Promise.resolve(),
+  switchConnection: (_) => Promise.resolve(),
   verificationStage: void 0,
   evmDisconnectStatus: "idle",
   solanaDisconnectStatus: "idle",
-  cosmosDisconnectStatus: "idle"
+  cosmosDisconnectStatus: "idle",
+  retryVerification: () => Promise.resolve()
 };
 const ExternalWalletContext = createContext(defaultExternalWallet);
 function ExternalWalletProvider({ children }) {
@@ -83,8 +86,8 @@ function ExternalWalletProvider({ children }) {
     username: evmUsername,
     avatar: evmAvatar,
     connectParaEmbedded: evmConnectParaEmbedded,
+    switchConnection: evmSwitchConnection,
     signMessage: evmSignMessage,
-    signVerificationMessage: evmSignVerificationMessage,
     getWalletBalance: evmGetWalletBalance,
     requestInfo: evmRequestInfo,
     disconnectBase: evmDisconnectBase,
@@ -96,7 +99,6 @@ function ExternalWalletProvider({ children }) {
     wallets: solanaWallets,
     disconnect: solanaDisconnect,
     signMessage: solanaSignMessage,
-    signVerificationMessage: solanaSignVerificationMessage,
     requestInfo: solanaRequestInfo,
     disconnectBase: solanaDisconnectBase,
     farcasterStatus: solanaFarcasterStatus,
@@ -109,32 +111,37 @@ function ExternalWalletProvider({ children }) {
     chainId: cosmosChainId,
     switchChain: cosmosSwitchChain,
     connectParaEmbedded: cosmosConnectParaEmbedded,
+    switchConnection: cosmosSwitchConnection,
     signMessage: cosmosSignMessage,
-    signVerificationMessage: cosmosSignVerificationMessage,
     requestInfo: cosmosRequestInfo,
     disconnectBase: cosmosDisconnectBase,
     disconnectStatus: cosmosDisconnectStatus
   } = useContext(cosmosContext);
-  const onLoginRef = useStore((state) => state.onLoginRef);
-  const setStep = useModalStore((state) => state.setStep);
-  const setStepDirection = useModalStore((state) => state.setStepDirection);
-  const setIsExternalWalletConnecting = useModalStore((state) => state.setIsExternalWalletConnecting);
-  const isExternalWalletConnecting = useModalStore((state) => state.isExternalWalletConnecting);
-  const selectedExternalWallet = useModalStore((state) => state.selectedExternalWallet);
-  const setSelectedExternalWallet = useModalStore((state) => state.setSelectedExternalWallet);
-  const setExternalWalletError = useModalStore((state) => state.setExternalWalletError);
-  const setIsUsingMobileConnector = useModalStore((state) => state.setIsUsingMobileConnector);
-  const refs = useModalStore((state) => state.refs);
+  const setIsExternalWalletConnecting = useStore((state) => state.setIsExternalWalletConnecting);
+  const isExternalWalletConnecting = useStore((state) => state.isExternalWalletConnecting);
+  const selectedExternalWallet = useStore((state) => state.selectedExternalWallet);
+  const setSelectedExternalWallet = useStore((state) => state.setSelectedExternalWallet);
+  const setExternalWalletError = useStore((state) => state.setExternalWalletError);
+  const setIsUsingMobileConnector = useStore((state) => state.setIsUsingMobileConnector);
+  const refs = useStore((state) => state.refs);
   const para = useInternalClient();
-  const { setSelectedWallet } = useWalletState();
-  const { onNewAuthState } = useAuthActions();
-  const { verifyExternalWalletAsync } = useVerifyExternalWallet();
-  const queryClient = useQueryClient();
-  const goBack = useGoBack();
+  const { setSelectedWallet, selectedWallet } = useWalletState();
+  const setIFrameUrl = useStore((state) => state.setIFrameUrl);
+  const { goBack } = useGoBack();
+  const setAuthMethod = useStore((state) => state.setAuthMethod);
+  const setShowPostAuthFlow = useStore((state) => state.setShowPostAuthFlow);
+  const setAccountView = useStore((state) => state.setAccountView);
+  const userAgent = useUserAgent();
+  const { waitForWalletCreation } = useWaitForWalletCreation();
   const [qrUri, setQrUri] = useState();
   const [chainIdSwitchingTo, setChainIdSwitchingTo] = useState();
   const [isSigningMessage, setIsSigningMessage] = useState(false);
   const popupCloseIntervalRef = useRef(null);
+  const verificationMessage = useRef(null);
+  const externalWalletInfo = useRef(null);
+  const verificationStatusListenerRef = useRef(null);
+  const verificationTriggerListenerRef = useRef(null);
+  const connectionRetryListenerRef = useRef(null);
   const allWallets = [...evmWallets, ...solanaWallets, ...cosmosWallets];
   let wallets = allWallets.filter(
     (w) => (w.internalId !== "FARCASTER" || (para == null ? void 0 : para.isFarcasterMiniApp)) && externalWallets.includes(w.internalId)
@@ -150,6 +157,79 @@ function ExternalWalletProvider({ children }) {
     [wallets, selectedExternalWallet]
   );
   const [walletConnectCleanup, setWalletConnectCleanup] = useState(null);
+  const retryVerification = () => __async(this, null, function* () {
+    var _a;
+    if ((_a = externalWalletInfo.current) == null ? void 0 : _a.withFullParaAuth) {
+      yield handleRetrySignVerificationMessage();
+      return;
+    }
+    yield para.retryVerifyExternalWallet();
+  });
+  const poll = () => {
+    if (typeof window !== "undefined") {
+      refs.poll.current = {
+        action: "signup",
+        timeout: window == null ? void 0 : window.setTimeout(() => __async(this, null, function* () {
+          waitForWalletCreation(
+            {
+              onPoll: () => {
+                const isUsingIFrame = !!store.getState().iFrameUrl;
+                if (isUsingIFrame) {
+                  return;
+                }
+                const authMethod = store.getState().authMethod;
+                if ((!refs.popupWindow.current || refs.popupWindow.current.closed) && (authMethod !== null || authMethod !== AuthMethod.BASIC_LOGIN)) {
+                  setAuthMethod(null);
+                }
+              }
+            },
+            {
+              onSettled: () => {
+                var _a;
+                window == null ? void 0 : window.clearTimeout((_a = refs.poll.current) == null ? void 0 : _a.timeout);
+                refs.poll.current = null;
+                refs.popupWindow.current = null;
+              }
+            }
+          );
+        }), DEFAULTS.POLLING_INTERVAL_MS)
+      };
+    }
+  };
+  const onNewAuthState = (authState) => __async(this, null, function* () {
+    var _a, _b;
+    switch (authState.stage) {
+      case "verify":
+        if (isExternalWallet(authState.auth)) {
+          if (authState.loginUrl && ((_a = authState.externalWallet) == null ? void 0 : _a.withFullParaAuth)) {
+            if (!isMobile() && refs.popupWindow.current) {
+              refs.popupWindow.current.location.href = authState.loginUrl;
+            } else {
+              setIFrameUrl(authState.loginUrl);
+            }
+          }
+        }
+        break;
+      case "login":
+      case "signup":
+        const hasPassword = !!authState.passwordUrl;
+        const hasPin = !!authState.pinUrl;
+        const hasExactlyOnePasswordOrPin = hasPassword && !hasPin || !hasPassword && hasPin;
+        const shouldUseIFrame = !authState.passkeyUrl || (userAgent == null ? void 0 : userAgent.device.type) === "mobile" && !authState.isPasskeySupported && hasExactlyOnePasswordOrPin;
+        if (shouldUseIFrame) {
+          setIFrameUrl(hasPassword ? authState.passwordUrl : authState.pinUrl);
+        }
+        setAuthMethod(null);
+        poll();
+        break;
+      case "done":
+        setShowPostAuthFlow(true);
+        if ((_b = authState.externalWallet) == null ? void 0 : _b.withFullParaAuth) {
+          poll();
+        }
+        break;
+    }
+  });
   const listenForWalletConnectUri = () => {
     setQrUri(void 0);
     if (walletConnectCleanup) {
@@ -241,12 +321,12 @@ function ExternalWalletProvider({ children }) {
         setChainIdSwitchingTo(chainId2);
         switch (walletType) {
           case "COSMOS": {
-            setStep(ModalStep.CHAIN_SWITCH);
+            setAccountView("ACCOUNT_CHAIN_SWITCH");
             resp = yield cosmosSwitchChain(chainId2);
             break;
           }
           case "EVM": {
-            setStep(ModalStep.CHAIN_SWITCH);
+            setAccountView("ACCOUNT_CHAIN_SWITCH");
             resp = yield evmSwitchChain(parseInt(chainId2));
             break;
           }
@@ -259,109 +339,12 @@ function ExternalWalletProvider({ children }) {
           setExternalWalletError(resp.error);
         } else {
           setChainIdSwitchingTo(void 0);
-          setStepDirection(-1);
-          setStep(ModalStep.ACCOUNT_MAIN);
+          setAccountView("ACCOUNT_MAIN");
         }
       }
     }),
     [evmSwitchChain, cosmosSwitchChain]
   );
-  const verifyWalletSignature = useCallback(() => __async(this, null, function* () {
-    setExternalWalletError();
-    const wallet2 = Object.values(para.externalWallets)[0];
-    const walletType = wallet2 == null ? void 0 : wallet2.type;
-    let verifyExternalWalletParams;
-    const withVerification = includeWalletVerification;
-    const isConnectionOnly = connectionOnly;
-    const withFullParaAuth = (wallet2 == null ? void 0 : wallet2.name) ? isWithFullAuth(wallet2) : false;
-    const defaultWalletInfo = {
-      withVerification,
-      isConnectionOnly,
-      withFullParaAuth,
-      provider: wallet2.name,
-      providerId: wallet2.externalProviderId,
-      isExternal: true
-    };
-    switch (walletType) {
-      case "COSMOS":
-        {
-          const { address, signature, error, cosmosPublicKeyHex, cosmosSigner, addressBech32 } = yield cosmosSignVerificationMessage();
-          if (error) {
-            setExternalWalletError([error]);
-            return;
-          } else if (signature && address) {
-            verifyExternalWalletParams = {
-              externalWallet: __spreadValues({
-                partnerId: para.partnerId,
-                type: "COSMOS",
-                address,
-                addressBech32
-              }, defaultWalletInfo),
-              signedMessage: signature,
-              cosmosPublicKeyHex,
-              cosmosSigner
-            };
-          }
-        }
-        break;
-      case "EVM":
-        {
-          const { signature, error, address } = yield evmSignVerificationMessage();
-          if (error) {
-            setExternalWalletError([error]);
-            return;
-          } else if (signature && address) {
-            verifyExternalWalletParams = {
-              externalWallet: __spreadValues({
-                partnerId: para.partnerId,
-                type: "EVM",
-                address
-              }, defaultWalletInfo),
-              signedMessage: signature
-            };
-          }
-        }
-        break;
-      case "SOLANA":
-        {
-          const { signature, error, address } = yield solanaSignVerificationMessage();
-          if (error) {
-            setExternalWalletError([error]);
-            return;
-          } else if (signature && address) {
-            verifyExternalWalletParams = {
-              externalWallet: __spreadValues({
-                partnerId: para.partnerId,
-                type: "SOLANA",
-                address
-              }, defaultWalletInfo),
-              signedMessage: signature
-            };
-          }
-        }
-        break;
-      default:
-        break;
-    }
-    if (!(verifyExternalWalletParams == null ? void 0 : verifyExternalWalletParams.externalWallet) || !(verifyExternalWalletParams == null ? void 0 : verifyExternalWalletParams.signedMessage)) {
-      console.error("No signature or address found on the verifyWalletSignature response.");
-      setExternalWalletError(["Signature verification failed."]);
-      return;
-    }
-    try {
-      const d = yield verifyExternalWalletAsync(verifyExternalWalletParams);
-      yield queryClient.refetchQueries({ queryKey: [IS_FULLY_LOGGED_IN_BASE_KEY] });
-      if (wallet2 && isWithFullAuth(wallet2)) {
-        onNewAuthState(d);
-      } else {
-        setStep(ModalStep.LOGIN_DONE);
-      }
-    } catch (e) {
-      console.error("Error verifying signature:", e);
-      setExternalWalletError(["Signature verification failed."]);
-    }
-    return verifyExternalWalletParams;
-  }), [cosmosSignVerificationMessage, evmSignVerificationMessage, solanaSignVerificationMessage, wallet]);
   const signMessage = useCallback(
     (_0) => __async(this, [_0], function* ({
       message,
@@ -451,7 +434,7 @@ function ExternalWalletProvider({ children }) {
         });
         dispatchEvent(ParaEvent.EXTERNAL_WALLET_CHANGE_EVENT, null);
         try {
-          const externalWalletInfo = __spreadProps(__spreadValues({
+          const externalWalletInfo2 = __spreadProps(__spreadValues({
             partnerId: para.partnerId,
             address: walletInfo.address
           }, wallet2.type === "COSMOS" && walletInfo.addressBech32 && {
@@ -463,56 +446,70 @@ function ExternalWalletProvider({ children }) {
             providerId: walletInfo.providerId
             // Use the providerId from requestInfo
           });
-          const linkResult = yield para.linkAccount({ externalWallet: externalWalletInfo });
+          const linkResult = yield para.linkAccount({ externalWallet: externalWalletInfo2 });
           if (linkResult && linkResult.externalWallet && "signatureVerificationMessage" in linkResult.externalWallet) {
-            const verificationMessage = linkResult.externalWallet.signatureVerificationMessage;
+            const verificationMessage2 = linkResult.externalWallet.signatureVerificationMessage;
             const signResult = yield signMessage({
-              message: verificationMessage,
-              externalWallet: externalWalletInfo
+              message: verificationMessage2,
+              externalWallet: externalWalletInfo2
             });
             if (!signResult || !signResult.signature) {
               throw new Error(`Failed to sign ${wallet2.type} message: No signature returned`);
             }
             const { signature: signedMessage, cosmosPublicKeyHex, cosmosSigner } = signResult;
-            yield para.verifyExternalWalletLink({ signedMessage, cosmosPublicKeyHex, cosmosSigner });
+            yield para.verifyExternalWalletLink({
+              signedMessage,
+              cosmosPublicKeyHex,
+              cosmosSigner
+            });
           } else {
             throw new Error("Unknown error linking external wallet");
           }
         } catch (e) {
         }
         yield connectEmbeddedToExternalConnectors();
-        setStep(ModalStep.ACCOUNT_PROFILE);
+        setAccountView("ACCOUNT_PROFILE");
       } catch (e) {
         setExternalWalletError(["Failed to add wallet. Please try again."]);
       }
     }),
-    [para, connectionOnly, includeWalletVerification, setStep, setExternalWalletError]
+    [para, connectionOnly, includeWalletVerification, setAccountView, setExternalWalletError]
   );
-  const setupExternalWalletVerificationStatusListener = (wallet2) => {
-    typeof window !== "undefined" && window.addEventListener("message", function handleMessage(event) {
-      return __async(this, null, function* () {
-        var _a, _b, _c, _d;
-        if (!validatePortalOrigin(event, para.ctx)) {
-          return;
-        }
-        if (((_a = event.data) == null ? void 0 : _a.type) === "EW_VERIFY_SUCCESS") {
-          clearPopupWindowCloseListener();
-          const serverAuthState = (_b = event.data) == null ? void 0 : _b.serverAuthState;
-          if (serverAuthState && ((_c = serverAuthState.externalWallet) == null ? void 0 : _c.withFullParaAuth)) {
-            const authState = yield para.verifyExternalWallet({ serverAuthState });
-            onNewAuthState(authState);
-          } else {
-            setStep(ModalStep.LOGIN_DONE);
-          }
-          window.removeEventListener("message", handleMessage);
-        }
-        if (((_d = event.data) == null ? void 0 : _d.type) === "EW_VERIFY_RETRY") {
-          yield handleTriggerSignMessage(wallet2, event.data.message);
-          window.removeEventListener("message", handleMessage);
+  const clearVerificationStatusListener = () => {
+    if (verificationStatusListenerRef.current) {
+      window.removeEventListener("message", verificationStatusListenerRef.current);
+      verificationStatusListenerRef.current = null;
+    }
+  };
+  const setupExternalWalletVerificationStatusListener = () => {
+    clearVerificationStatusListener();
+    const handleMessage = (event) => __async(this, null, function* () {
+      var _a, _b, _c, _d;
+      if (!validatePortalOrigin(event, para.ctx)) {
+        return;
+      }
+      if (((_a = event.data) == null ? void 0 : _a.type) === "EW_VERIFY_SUCCESS") {
+        clearPopupWindowCloseListener();
+        const serverAuthState = (_b = event.data) == null ? void 0 : _b.serverAuthState;
+        if (serverAuthState && ((_c = serverAuthState.externalWallet) == null ? void 0 : _c.withFullParaAuth)) {
+          const authState = yield para.verifyExternalWallet({ serverAuthState });
+          yield onNewAuthState(authState);
         }
-      });
+        clearVerificationStatusListener();
+      }
+      if (((_d = event.data) == null ? void 0 : _d.type) === "EW_VERIFY_RETRY") {
+        verificationMessage.current = event.data.message;
+        yield handleRetrySignVerificationMessage();
+        clearVerificationStatusListener();
+      }
     });
+    verificationStatusListenerRef.current = handleMessage;
+    typeof window !== "undefined" && window.addEventListener("message", handleMessage);
   };
+  const handleRetrySignVerificationMessage = () => __async(this, null, function* () {
+    handlePostMessage({ type: "EW_VERIFY_RETRY" });
+    yield handleTriggerSignMessage();
+  });
   const handlePostMessage = (message) => {
     var _a;
     if (refs.popupWindow.current) {
@@ -521,70 +518,18 @@ function ExternalWalletProvider({ children }) {
       (_a = refs.iFrame.current.contentWindow) == null ? void 0 : _a.postMessage(message, "*");
     }
   };
-  const handleTriggerSignMessage = (wallet2, message) => __async(this, null, function* () {
-    setupExternalWalletVerificationStatusListener(wallet2);
+  const handleTriggerSignMessage = () => __async(this, null, function* () {
+    if (!verificationMessage.current || !externalWalletInfo.current) {
+      console.error("No verification message or external wallet info available for signing message.");
+      return;
+    }
+    setupExternalWalletVerificationStatusListener();
     try {
-      const { address, signature, cosmosPublicKeyHex, cosmosSigner, addressBech32 } = yield signMessage({
-        message,
-        externalWallet: wallet2
+      const verifyExternalWalletParams = yield para.signExternalWalletVerification({
+        type: externalWalletInfo.current.type,
+        message: verificationMessage.current,
+        address: externalWalletInfo.current.address
       });
-      const paraWallet = Object.values(para.externalWallets)[0];
-      const walletType = paraWallet == null ? void 0 : paraWallet.type;
-      let verifyExternalWalletParams;
-      const withVerification = includeWalletVerification;
-      const isConnectionOnly = connectionOnly;
-      const withFullParaAuth = (paraWallet == null ? void 0 : paraWallet.name) ? isWithFullAuth(paraWallet) : false;
-      const defaultWalletInfo = {
-        withVerification,
-        isConnectionOnly,
-        withFullParaAuth,
-        provider: paraWallet.name,
-        providerId: paraWallet.externalProviderId,
-        isExternal: true
-      };
-      switch (walletType) {
-        case "COSMOS":
-          {
-            verifyExternalWalletParams = {
-              externalWallet: __spreadValues({
-                partnerId: para.partnerId,
-                type: "COSMOS",
-                address,
-                addressBech32
-              }, defaultWalletInfo),
-              signedMessage: signature,
-              cosmosPublicKeyHex,
-              cosmosSigner
-            };
-          }
-          break;
-        case "EVM":
-          {
-            verifyExternalWalletParams = {
-              externalWallet: __spreadValues({
-                partnerId: para.partnerId,
-                type: "EVM",
-                address
-              }, defaultWalletInfo),
-              signedMessage: signature
-            };
-          }
-          break;
-        case "SOLANA":
-          {
-            verifyExternalWalletParams = {
-              externalWallet: __spreadValues({
-                partnerId: para.partnerId,
-                type: "SOLANA",
-                address
-              }, defaultWalletInfo),
-              signedMessage: signature
-            };
-          }
-          break;
-        default:
-          break;
-      }
       if (!(verifyExternalWalletParams == null ? void 0 : verifyExternalWalletParams.externalWallet) || !(verifyExternalWalletParams == null ? void 0 : verifyExternalWalletParams.signedMessage)) {
         console.error("No signature or address found on the verifyWalletSignature response.");
         handlePostMessage({ type: "EW_SIGN_MESSAGE_ERROR", error: "Signature verification failed." });
@@ -595,23 +540,44 @@ function ExternalWalletProvider({ children }) {
       handlePostMessage({ type: "EW_SIGN_MESSAGE_ERROR", error: error.message || "Error signing message" });
     }
   });
-  const setupExternalWalletVerificationTriggerListener = (wallet2) => {
-    if (!wallet2) {
+  const clearVerificationTriggerListener = () => {
+    if (verificationTriggerListenerRef.current) {
+      window.removeEventListener("message", verificationTriggerListenerRef.current);
+      verificationTriggerListenerRef.current = null;
+    }
+  };
+  const setupExternalWalletVerificationTriggerListener = () => {
+    if (!externalWalletInfo.current) {
+      console.error("No external wallet info available for signing message.");
       return;
     }
-    typeof window !== "undefined" && window.addEventListener("message", function handleMessage(event) {
-      return __async(this, null, function* () {
-        var _a;
-        if (!validatePortalOrigin(event, para.ctx)) {
-          return;
-        }
-        if (((_a = event.data) == null ? void 0 : _a.type) === "EW_TRIGGER_SIGN_MESSAGE") {
-          yield handleTriggerSignMessage(wallet2, event.data.message);
-          window.removeEventListener("message", handleMessage);
-        }
-      });
+    clearVerificationTriggerListener();
+    const handleMessage = (event) => __async(this, null, function* () {
+      var _a;
+      if (!validatePortalOrigin(event, para.ctx)) {
+        return;
+      }
+      if (((_a = event.data) == null ? void 0 : _a.type) === "EW_TRIGGER_SIGN_MESSAGE") {
+        verificationMessage.current = event.data.message;
+        yield handleTriggerSignMessage();
+        clearVerificationTriggerListener();
+      }
     });
+    verificationTriggerListenerRef.current = handleMessage;
+    typeof window !== "undefined" && window.addEventListener("message", handleMessage);
   };
+  const switchConnection = (_0) => __async(this, [_0], function* ({ type, id }) {
+    switch (type) {
+      case "EVM":
+        yield evmSwitchConnection == null ? void 0 : evmSwitchConnection(id);
+        break;
+      case "COSMOS":
+        yield cosmosSwitchConnection == null ? void 0 : cosmosSwitchConnection(id);
+        break;
+      default:
+        break;
+    }
+  });
   const setupPopupWindowCloseListener = () => {
     const popup = refs.popupWindow.current;
     if (!popup) return;
@@ -625,7 +591,6 @@ function ExternalWalletProvider({ children }) {
           popupCloseIntervalRef.current = null;
         }
         goBack();
-        disconnectExternalWallet();
       }
     }, 500);
   };
@@ -642,35 +607,40 @@ function ExternalWalletProvider({ children }) {
   const handlePostConnectError = (error) => {
     handlePostMessage({ type: "EW_CONNECT_ERROR", error });
   };
-  const handleConnectRetryMessage = (wallet2) => (event) => __async(this, null, function* () {
-    var _a;
-    if (!validatePortalOrigin(event, para.ctx)) {
-      return;
-    }
-    if (((_a = event.data) == null ? void 0 : _a.type) === "EW_CONNECT_RETRY") {
-      clearExternalWalletConnectionRetryListener(wallet2);
-      yield connectExternalWallet({ wallet: wallet2, isMobileConnect: wallet2.isMobile, isRetryConnection: true });
+  const clearExternalWalletConnectionRetryListener = () => {
+    if (connectionRetryListenerRef.current) {
+      window.removeEventListener("message", connectionRetryListenerRef.current);
+      connectionRetryListenerRef.current = null;
     }
-  });
-  const setupExternalWalletConnectionRetryListener = (wallet2) => {
-    typeof window !== "undefined" && window.addEventListener("message", handleConnectRetryMessage(wallet2));
   };
-  const clearExternalWalletConnectionRetryListener = (wallet2) => {
-    window.removeEventListener("message", handleConnectRetryMessage(wallet2));
+  const setupExternalWalletConnectionRetryListener = (wallet2) => {
+    clearExternalWalletConnectionRetryListener();
+    const handleMessage = (event) => __async(this, null, function* () {
+      var _a;
+      if (!validatePortalOrigin(event, para.ctx)) {
+        return;
+      }
+      if (((_a = event.data) == null ? void 0 : _a.type) === "EW_CONNECT_RETRY") {
+        clearExternalWalletConnectionRetryListener();
+        yield connectExternalWallet({ wallet: wallet2, isMobile: wallet2.isMobile, isRetryConnection: true });
+      }
+    });
+    connectionRetryListenerRef.current = handleMessage;
+    typeof window !== "undefined" && window.addEventListener("message", handleMessage);
   };
   const connectExternalWallet = useCallback(
     (_0) => __async(this, [_0], function* ({
       wallet: wallet2,
       isManualWalletConnect,
-      isMobileConnect,
+      isMobile: isMobileConnect,
       isResetAfterManualWalletConnect,
       isRetryConnection
     }) {
       if (isRetryConnection) {
-        clearExternalWalletConnectionRetryListener(wallet2);
+        clearExternalWalletConnectionRetryListener();
         handlePostConnectRetry();
       }
-      if (!isMobile() && isWithFullAuth(wallet2)) {
+      if (!isMobile() && isWithFullAuth(wallet2) && !isManualWalletConnect) {
         const popupUrl = yield para.constructPortalUrl("connectExternalWallet");
         if (typeof window !== void 0) {
           refs.popupWindow.current = openPopup({
@@ -682,6 +652,8 @@ function ExternalWalletProvider({ children }) {
         setupPopupWindowCloseListener();
       }
       if (isExternalWalletConnecting && isManualWalletConnect) {
+        clearPopupWindowCloseListener();
+        yield para.cancelAuthFlow();
         yield evmDisconnect();
         yield solanaDisconnect();
         yield cosmosDisconnect();
@@ -693,27 +665,31 @@ function ExternalWalletProvider({ children }) {
         setIsExternalWalletConnecting(true);
         setIsUsingMobileConnector(isMobileConnect);
         listenForWalletConnectUri();
-        const { address, error, authState } = yield isMobileConnect ? wallet2.connectMobile(isManualWalletConnect, connectionOnly) : wallet2.connect(connectionOnly);
-        if (error) {
-          setExternalWalletError([error]);
-          setIsUsingMobileConnector();
-          handlePostConnectError(error);
-          if (isManualWalletConnect && error === "Connection request rejected") {
-            setExternalWalletError();
-            yield connectExternalWallet({ wallet: wallet2, isResetAfterManualWalletConnect: true });
-            return;
-          }
-          setupExternalWalletConnectionRetryListener(wallet2);
-        } else if (address) {
-          if (!!authState && (isWithFullAuth(wallet2) || includeWalletVerification)) {
-            clearExternalWalletConnectionRetryListener(wallet2);
-            onNewAuthState(authState);
-            setupExternalWalletVerificationTriggerListener(authState.externalWallet);
-          } else {
-            setStep(ModalStep.LOGIN_DONE);
+        try {
+          const { address, error, authState } = yield isMobileConnect ? wallet2.connectMobile(isManualWalletConnect, connectionOnly) : wallet2.connect(connectionOnly);
+          if (error) {
+            setExternalWalletError([error]);
+            setIsUsingMobileConnector();
+            handlePostConnectError(error);
+            if (isManualWalletConnect && error === "Connection request rejected") {
+              setExternalWalletError();
+              yield connectExternalWallet({ wallet: wallet2, isResetAfterManualWalletConnect: true });
+              return;
+            }
+            setupExternalWalletConnectionRetryListener(wallet2);
+          } else if (address) {
+            if (!!authState && (isWithFullAuth(wallet2) || includeWalletVerification)) {
+              clearExternalWalletConnectionRetryListener();
+              yield onNewAuthState(authState);
+              externalWalletInfo.current = authState.externalWallet || null;
+              setupExternalWalletVerificationTriggerListener();
+            } else {
+              setShowPostAuthFlow(true);
+            }
           }
+        } finally {
+          setIsExternalWalletConnecting(false);
         }
-        setIsExternalWalletConnecting(false);
       }
     }),
     [isExternalWalletConnecting, externalWalletsWithFullAuth, connectionOnly, includeWalletVerification]
@@ -855,7 +831,7 @@ function ExternalWalletProvider({ children }) {
           console.warn("Failed to connect Para EVM wallet to Wagmi:", error);
         } else {
           if (evmWallet) {
-            setSelectedWallet({ id: evmWallet.id, type: "EVM" });
+            yield setSelectedWallet({ id: evmWallet.id, type: "EVM" });
           }
         }
       } catch (err) {
@@ -869,7 +845,7 @@ function ExternalWalletProvider({ children }) {
           console.warn("Failed to connect Para Cosmos wallet to Graz:", error);
         } else {
           if (cosmosWallet) {
-            setSelectedWallet({ id: cosmosWallet.id, type: "COSMOS" });
+            yield setSelectedWallet({ id: cosmosWallet.id, type: "COSMOS" });
           }
         }
       } catch (err) {
@@ -878,16 +854,41 @@ function ExternalWalletProvider({ children }) {
     }
   }), [evmConnectParaEmbedded, cosmosConnectParaEmbedded]);
   useEffect(() => {
-    onLoginRef.current = () => __async(this, null, function* () {
-      yield connectEmbeddedToExternalConnectors();
-    });
-  }, [connectEmbeddedToExternalConnectors]);
-  useEffect(() => {
-    if (isReady && isFarcasterMiniApp && !isConnected && !(farcasterMiniAppConfig == null ? void 0 : farcasterMiniAppConfig.disableAutoConnect) && !refs.wasSignedIn.current && !refs.initialFarcasterConnected.current && !!evmFarcasterStatus && !!solanaFarcasterStatus) {
+    if (isReady && isFarcasterMiniApp && !isConnected && !(farcasterMiniAppConfig == null ? void 0 : farcasterMiniAppConfig.disableAutoConnect) && !refs.initialFarcasterConnected.current && !!evmFarcasterStatus && !!solanaFarcasterStatus) {
       refs.initialFarcasterConnected.current = true;
       connectFarcasterMiniApp();
     }
   }, [isReady, isConnected, isFarcasterMiniApp, farcasterMiniAppConfig, evmFarcasterStatus, solanaFarcasterStatus]);
+  useEffect(() => {
+    return () => {
+      clearVerificationStatusListener();
+      clearVerificationTriggerListener();
+      clearExternalWalletConnectionRetryListener();
+      if (popupCloseIntervalRef.current) {
+        clearInterval(popupCloseIntervalRef.current);
+        popupCloseIntervalRef.current = null;
+      }
+    };
+  }, []);
+  useEffect(() => {
+    return () => {
+      walletConnectCleanup == null ? void 0 : walletConnectCleanup();
+    };
+  }, [walletConnectCleanup]);
+  useEffect(() => {
+    const setupWalletConnection = () => __async(this, null, function* () {
+      if (!isConnected) {
+        return;
+      }
+      if (selectedWallet) {
+        const wallet2 = para == null ? void 0 : para.findWallet(selectedWallet.id, selectedWallet.type);
+        if (wallet2) {
+          yield switchConnection({ type: wallet2.type, id: !!wallet2.isExternal ? wallet2.name : "Para" });
+        }
+      }
+    });
+    setupWalletConnection();
+  }, [isConnected]);
   return /* @__PURE__ */ jsx(
     ExternalWalletContext.Provider,
     {
@@ -910,15 +911,16 @@ function ExternalWalletProvider({ children }) {
           connectEmbeddedToExternalConnectors,
           signMessage,
           isSigningMessage,
-          verifyWalletSignature,
           getWalletBalance,
           requestInfo,
           disconnectBase,
           connectFarcasterMiniApp,
+          switchConnection,
           verificationStage,
           evmDisconnectStatus,
           solanaDisconnectStatus,
-          cosmosDisconnectStatus
+          cosmosDisconnectStatus,
+          retryVerification
         }),
         [
           wallets,
@@ -935,18 +937,18 @@ function ExternalWalletProvider({ children }) {
           addAdditionalExternalWallet,
           switchChain,
           setChainIdSwitchingTo,
-          connectEmbeddedToExternalConnectors,
           signMessage,
           isSigningMessage,
-          verifyWalletSignature,
           getWalletBalance,
           requestInfo,
           disconnectBase,
           connectFarcasterMiniApp,
+          switchConnection,
           verificationStage,
           evmDisconnectStatus,
           solanaDisconnectStatus,
-          cosmosDisconnectStatus
+          cosmosDisconnectStatus,
+          retryVerification
         ]
       ),
       children