@getpara/react-sdk-lite 2.0.0-alpha.67 → 2.0.0-alpha.68

package/dist/provider/hooks/mutations/useVerifyExternalWallet.d.ts

@@ -17,17 +17,13 @@ export declare const VERIFY_EXTERNAL_WALLET_KEY = "VERIFY_EXTERNAL_WALLET";
 export declare const useVerifyExternalWallet: () => {
     status: "idle" | "pending" | "error" | "success";
     error: Error | null;
-    data: Compute<import("@getpara/web-sdk").AuthStateSignup | import("@getpara/web-sdk").AuthStateLogin> | undefined;
+    data: Compute<import("@getpara/web-sdk").AuthStateSignup | import("@getpara/web-sdk").AuthStateLogin | import("@getpara/core-sdk/dist/types/types/methods.js").AuthStateDone> | undefined;
     isSuccess: boolean;
-    variables: {
-        portalTheme?: import("@getpara/web-sdk").Theme | undefined;
-        useShortUrls?: boolean | undefined;
-        externalWallet: import("@getpara/web-sdk").ExternalWalletInfo;
-        signedMessage: string;
-        cosmosPublicKeyHex?: string | undefined;
-        cosmosSigner?: string | undefined;
-        sessionLookupId?: string | undefined;
-    } | undefined;
+    variables: Compute<(import("@getpara/core-sdk/dist/types/types/methods.js").WithCustomTheme & import("@getpara/core-sdk/dist/types/types/methods.js").WithUseShortUrls & {
+        serverAuthState: import("@getpara/shared").ServerAuthStateSignup | import("@getpara/shared").ServerAuthStateLogin | import("@getpara/shared").ServerAuthStateDone;
+    }) | (import("@getpara/core-sdk/dist/types/types/methods.js").WithCustomTheme & import("@getpara/core-sdk/dist/types/types/methods.js").WithUseShortUrls & import("@getpara/web-sdk").VerifyExternalWalletParams & {
+        serverAuthState?: undefined;
+    })> | undefined;
     isError: boolean;
     isIdle: boolean;
     isPending: boolean;
@@ -37,22 +33,14 @@ export declare const useVerifyExternalWallet: () => {
     failureReason: Error | null;
     isPaused: boolean;
     submittedAt: number;
-    verifyExternalWallet: import("@tanstack/react-query").UseMutateFunction<Compute<import("@getpara/web-sdk").AuthStateSignup | import("@getpara/web-sdk").AuthStateLogin>, Error, {
-        portalTheme?: import("@getpara/web-sdk").Theme | undefined;
-        useShortUrls?: boolean | undefined;
-        externalWallet: import("@getpara/web-sdk").ExternalWalletInfo;
-        signedMessage: string;
-        cosmosPublicKeyHex?: string | undefined;
-        cosmosSigner?: string | undefined;
-        sessionLookupId?: string | undefined;
-    }, unknown>;
-    verifyExternalWalletAsync: import("@tanstack/react-query").UseMutateAsyncFunction<Compute<import("@getpara/web-sdk").AuthStateSignup | import("@getpara/web-sdk").AuthStateLogin>, Error, {
-        portalTheme?: import("@getpara/web-sdk").Theme | undefined;
-        useShortUrls?: boolean | undefined;
-        externalWallet: import("@getpara/web-sdk").ExternalWalletInfo;
-        signedMessage: string;
-        cosmosPublicKeyHex?: string | undefined;
-        cosmosSigner?: string | undefined;
-        sessionLookupId?: string | undefined;
-    }, unknown>;
+    verifyExternalWallet: import("@tanstack/react-query").UseMutateFunction<Compute<import("@getpara/web-sdk").AuthStateSignup | import("@getpara/web-sdk").AuthStateLogin | import("@getpara/core-sdk/dist/types/types/methods.js").AuthStateDone>, Error, Compute<(import("@getpara/core-sdk/dist/types/types/methods.js").WithCustomTheme & import("@getpara/core-sdk/dist/types/types/methods.js").WithUseShortUrls & {
+        serverAuthState: import("@getpara/shared").ServerAuthStateSignup | import("@getpara/shared").ServerAuthStateLogin | import("@getpara/shared").ServerAuthStateDone;
+    }) | (import("@getpara/core-sdk/dist/types/types/methods.js").WithCustomTheme & import("@getpara/core-sdk/dist/types/types/methods.js").WithUseShortUrls & import("@getpara/web-sdk").VerifyExternalWalletParams & {
+        serverAuthState?: undefined;
+    })>, unknown>;
+    verifyExternalWalletAsync: import("@tanstack/react-query").UseMutateAsyncFunction<Compute<import("@getpara/web-sdk").AuthStateSignup | import("@getpara/web-sdk").AuthStateLogin | import("@getpara/core-sdk/dist/types/types/methods.js").AuthStateDone>, Error, Compute<(import("@getpara/core-sdk/dist/types/types/methods.js").WithCustomTheme & import("@getpara/core-sdk/dist/types/types/methods.js").WithUseShortUrls & {
+        serverAuthState: import("@getpara/shared").ServerAuthStateSignup | import("@getpara/shared").ServerAuthStateLogin | import("@getpara/shared").ServerAuthStateDone;
+    }) | (import("@getpara/core-sdk/dist/types/types/methods.js").WithCustomTheme & import("@getpara/core-sdk/dist/types/types/methods.js").WithUseShortUrls & import("@getpara/web-sdk").VerifyExternalWalletParams & {
+        serverAuthState?: undefined;
+    })>, unknown>;
 };

package/dist/provider/hooks/utils/useEventListeners.js

@@ -123,6 +123,7 @@ const useEventListeners = ({
     });
   }, [queryClient, refs.balancesInvalidationTime]);
   useEffect(() => {
+    if (typeof window === "undefined") return;
     window.addEventListener(ParaEvent.LOGIN_EVENT, loginListener);
     window.addEventListener(ParaEvent.ACCOUNT_SETUP_EVENT, accountSetupListener);
     window.addEventListener(ParaEvent.ACCOUNT_CREATION_EVENT, accountCreationListener);
@@ -136,6 +137,7 @@ const useEventListeners = ({
     window.addEventListener(ParaEvent.GUEST_WALLETS_CREATED, guestWalletsCreatedListener);
     window.addEventListener(ParaEvent.ASSET_TRANSFERRED, assetTransferListener);
     return () => {
+      if (typeof window === "undefined") return;
       window.removeEventListener(ParaEvent.LOGIN_EVENT, loginListener);
       window.removeEventListener(ParaEvent.ACCOUNT_SETUP_EVENT, accountSetupListener);
       window.removeEventListener(ParaEvent.ACCOUNT_CREATION_EVENT, accountCreationListener);

package/dist/provider/providers/AuthProvider.js

@@ -5,8 +5,8 @@ import {
   __spreadValues
 } from "../../chunk-MMUBH76A.js";
 import { jsx } from "react/jsx-runtime";
-import { useUserAgent } from "@getpara/react-common";
-import { createContext, useCallback, useContext, useEffect, useMemo, useState } from "react";
+import { openMobileUrl, useUserAgent } from "@getpara/react-common";
+import { createContext, useCallback, useContext, useEffect, useMemo, useRef, useState } from "react";
 import { useModalStore } from "../../modal/stores/index.js";
 import { ModalStep } from "../../modal/utils/steps.js";
 import {
@@ -29,15 +29,15 @@ import { openPopup } from "../../modal/utils/openPopup.js";
 import {
   AuthMethod,
   entityToWallet,
-  getPortalBaseURL
+  isMobile
 } from "@getpara/web-sdk";
 import { useInternalClient } from "../../provider/hooks/utils/useInternalClient.js";
 import { useGoBack } from "../../modal/hooks/useGoBack.js";
 import { isExternalWallet } from "@getpara/user-management-client";
-import { routeMobileExternalWallet } from "../../modal/utils/routeMobileExternalWallet.js";
 import { useStore } from "../stores/useStore.js";
 import { useFormattedBiometricHints } from "../hooks/utils/useFormattedBiometricHints.js";
 import { useQueryClient } from "@tanstack/react-query";
+import { validatePortalOrigin } from "../../modal/utils/validatePortalOrigin.js";
 const AuthContext = createContext({
   signUpOrLogIn: () => {
   },
@@ -127,6 +127,7 @@ function AuthProvider({
   const { data: biometricHints } = useFormattedBiometricHints();
   const [switchWalletsUrl, setSwitchWalletsUrl] = useState(void 0);
   const [isSwitchWalletsPending, setIsSwitchWalletsPending] = useState(mutateIsSwitchWalletsPending);
+  const messageHandlerRef = useRef(null);
   const goBackIfPopupClosedOnSteps = (steps) => {
     var _a;
     if (((_a = refs.popupWindow.current) == null ? void 0 : _a.closed) && (!refs.currentStep.current || steps.includes(refs.currentStep.current))) {
@@ -139,11 +140,12 @@ function AuthProvider({
     return !!stepNow && !steps.includes(stepNow);
   };
   const setupListener = () => {
-    window.addEventListener("message", function handleMessage(event) {
+    if (messageHandlerRef.current) {
+      window.removeEventListener("message", messageHandlerRef.current);
+    }
+    const handleMessage = (event) => {
       var _a;
-      const portalBase = getPortalBaseURL(para.ctx);
-      const portalLocalBase = getPortalBaseURL(para.ctx, true);
-      if (!event.origin.startsWith(portalBase) && !event.origin.startsWith(portalLocalBase)) {
+      if (!validatePortalOrigin(event, para.ctx)) {
         return;
       }
       if (((_a = event.data) == null ? void 0 : _a.type) === "CLOSE_WINDOW") {
@@ -154,8 +156,11 @@ function AuthProvider({
           setStep(ModalStep.AWAITING_ACCOUNT);
         }
         window.removeEventListener("message", handleMessage);
+        messageHandlerRef.current = null;
       }
-    });
+    };
+    messageHandlerRef.current = handleMessage;
+    window.addEventListener("message", handleMessage);
   };
   const pollSignup = () => {
     if (typeof window !== "undefined") {
@@ -215,12 +220,14 @@ function AuthProvider({
           if (refs.currentStep.current !== ModalStep.AWAITING_BIOMETRIC_CREATION) {
             setStep(ModalStep.AWAITING_BIOMETRIC_CREATION);
           }
-          refs.popupWindow.current = openPopup({
-            url: authState.passkeyUrl,
-            target: "ParaPasskey",
-            type: "CREATE_PASSKEY",
-            current: refs.popupWindow.current
-          });
+          if (typeof window !== "undefined") {
+            refs.popupWindow.current = openPopup({
+              url: authState.passkeyUrl,
+              target: "ParaPasskey",
+              type: "CREATE_PASSKEY",
+              current: refs.popupWindow.current
+            });
+          }
           break;
         case AuthMethod.PASSWORD:
           setupListener();
@@ -264,13 +271,14 @@ function AuthProvider({
     [isIFrameReady]
   );
   const login = (authState) => {
-    if (authState.isWalletSelectionNeeded || authState.passkeyUrl) {
-      setStep(ModalStep.BIOMETRIC_LOGIN);
-    } else {
+    const hasPasskey = !!authState.passkeyUrl;
+    if (!hasPasskey) {
       setupListener();
       setIFrameUrl(authState.passwordUrl || authState.pinUrl);
       setIsIFrameReady(false);
       setStep(ModalStep.EMBEDDED_PASSWORD_LOGIN);
+    } else {
+      setStep(ModalStep.BIOMETRIC_LOGIN);
     }
     pollLogin();
   };
@@ -341,23 +349,49 @@ function AuthProvider({
         loginOverride();
         return;
       }
-      refs.popupWindow.current = openPopup({
-        url: isPIN ? authState.pinUrl : isPassword ? authState.passwordUrl : authState.passkeyUrl,
-        target: isPIN ? "ParaPIN" : isPassword ? "ParaPassword" : "ParaPasskey",
-        type: isPIN ? "LOGIN_PASSWORD" : isPassword ? "LOGIN_PASSWORD" : "LOGIN_PASSKEY",
-        current: refs.popupWindow.current
-      });
+      if (typeof window !== "undefined") {
+        refs.popupWindow.current = openPopup({
+          url: isPIN ? authState.pinUrl : isPassword ? authState.passwordUrl : authState.passkeyUrl,
+          target: isPIN ? "ParaPIN" : isPassword ? "ParaPassword" : "ParaPasskey",
+          type: isPIN ? "LOGIN_PASSWORD" : isPassword ? "LOGIN_PASSWORD" : "LOGIN_PASSKEY",
+          current: refs.popupWindow.current
+        });
+      }
       setStep(isPassword || isPIN ? ModalStep.AWAITING_PASSWORD_LOGIN : ModalStep.AWAITING_BIOMETRIC_LOGIN);
     },
     [loginState, biometricHints]
   );
   const onNewAuthState = (authState) => __async(this, null, function* () {
-    refs.popupWindow.current = null;
+    var _a, _b, _c;
     setAuthState(authState);
     switch (authState.stage) {
       case "verify":
-        if (isExternalWallet(authState.auth) && authState.signatureVerificationMessage) {
-          setStep(ModalStep.EXTERNAL_WALLET_VERIFICATION);
+        if (isExternalWallet(authState.auth)) {
+          if (authState.loginUrl && ((_a = authState.externalWallet) == null ? void 0 : _a.withFullParaAuth)) {
+            let isBasicLogin = false;
+            if (authState.nextStage === "login") {
+              isBasicLogin = authState.loginAuthMethods.includes(AuthMethod.BASIC_LOGIN);
+            } else {
+              isBasicLogin = authState.signupAuthMethods.includes(AuthMethod.BASIC_LOGIN);
+            }
+            if (authState.nextStage === "login") {
+              setFlow("login");
+              isBasicLogin && pollLogin();
+            } else {
+              setFlow("signup");
+              isBasicLogin && pollSignup();
+            }
+            if (!isMobile() && refs.popupWindow.current) {
+              refs.popupWindow.current.location.href = authState.loginUrl;
+              setStep(ModalStep.AWAITING_ACCOUNT);
+            } else {
+              setIFrameUrl(authState.loginUrl);
+              setStep(ModalStep.OTP);
+              setupListener();
+            }
+          } else {
+            setStep(ModalStep.EXTERNAL_WALLET_VERIFICATION);
+          }
         } else {
           if (authState.nextStage === "login") {
             setFlow("login");
@@ -398,12 +432,14 @@ function AuthProvider({
         }
         break;
       case "done":
-        if (authState.isNewUser) {
-          pollSignup();
-          setFlow("signup");
-        } else {
-          pollLogin();
-          setFlow("login");
+        if (!((_b = authState.externalWallet) == null ? void 0 : _b.withFullParaAuth) && !((_c = authState.externalWallet) == null ? void 0 : _c.withVerification)) {
+          if (authState.isNewUser) {
+            pollSignup();
+            setFlow("signup");
+          } else {
+            pollLogin();
+            setFlow("login");
+          }
         }
         if (!authState.isWalletSelectionNeeded) {
           setStep(ModalStep.AWAITING_ACCOUNT);
@@ -463,7 +499,7 @@ function AuthProvider({
         isCanceled: () => refs.currentStep.current !== ModalStep.FARCASTER_OAUTH,
         onConnectUri: (connectUri) => {
           setFarcasterConnectUri(connectUri);
-          routeMobileExternalWallet(connectUri);
+          openMobileUrl(connectUri);
         },
         useShortUrls: true,
         serverAuthState
@@ -722,6 +758,9 @@ function AuthProvider({
     return () => {
       var _a;
       window == null ? void 0 : window.clearTimeout((_a = refs.poll.current) == null ? void 0 : _a.timeout);
+      if (messageHandlerRef.current) {
+        window.removeEventListener("message", messageHandlerRef.current);
+      }
     };
   }, []);
   return /* @__PURE__ */ jsx(AuthContext.Provider, { value, children });

package/dist/provider/providers/ExternalWalletProvider.d.ts

@@ -51,7 +51,13 @@ type Value = Omit<ExternalWalletContextType<CosmosSignResult>, 'disconnect' | 'd
     };
     username?: string;
     avatar?: string;
-    connectExternalWallet: (wallet: CommonWallet, isMobile?: boolean, isManualWalletConnect?: boolean) => Promise<void>;
+    connectExternalWallet: (_: {
+        wallet: CommonWallet;
+        isMobile?: boolean;
+        isManualWalletConnect?: boolean;
+        isResetAfterManualWalletConnect?: boolean;
+        isRetryConnection?: boolean;
+    }) => Promise<void>;
     addAdditionalExternalWallet: (wallet: CommonWallet) => Promise<void>;
     disconnectExternalWallet: () => Promise<void>;
     setChainIdSwitchingTo: (chainId?: string) => void;

package/dist/provider/providers/ExternalWalletProvider.js

@@ -5,17 +5,22 @@ import {
   __spreadValues
 } from "../../chunk-MMUBH76A.js";
 import { jsx } from "react/jsx-runtime";
-import { createContext, useCallback, useContext, useEffect, useMemo, useState } from "react";
+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 } from "../../modal/index.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 {
+  openMobileUrl
+} 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 { useGoBack } from "../../modal/hooks/useGoBack.js";
+import { validatePortalOrigin } from "../../modal/utils/validatePortalOrigin.js";
 const useWalletDisplayHelpers = (wallet) => {
   const isUsingMobileConnector = useModalStore((state) => state.isUsingMobileConnector);
   return {
@@ -125,9 +130,11 @@ function ExternalWalletProvider({ children }) {
   const { onNewAuthState } = useAuthActions();
   const { verifyExternalWalletAsync } = useVerifyExternalWallet();
   const queryClient = useQueryClient();
+  const goBack = useGoBack();
   const [qrUri, setQrUri] = useState();
   const [chainIdSwitchingTo, setChainIdSwitchingTo] = useState();
   const [isSigningMessage, setIsSigningMessage] = useState(false);
+  const popupCloseIntervalRef = 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)
@@ -142,20 +149,25 @@ function ExternalWalletProvider({ children }) {
     () => wallets.find((w) => w.id === (selectedExternalWallet == null ? void 0 : selectedExternalWallet.id) && w.type === (selectedExternalWallet == null ? void 0 : selectedExternalWallet.type)),
     [wallets, selectedExternalWallet]
   );
-  const updateQrUri = () => __async(this, null, function* () {
-    var _a;
-    const uri = yield (_a = wallet == null ? void 0 : wallet.getQrUri) == null ? void 0 : _a.call(wallet);
-    setQrUri(uri);
-  });
-  useEffect(() => {
-    if (wallet) {
-      if (!qrUri) {
-        updateQrUri();
-      }
-    } else if (qrUri) {
-      setQrUri(void 0);
+  const [walletConnectCleanup, setWalletConnectCleanup] = useState(null);
+  const listenForWalletConnectUri = () => {
+    setQrUri(void 0);
+    if (walletConnectCleanup) {
+      walletConnectCleanup();
     }
-  }, [wallet]);
+    const callback = (event) => {
+      openMobileUrl(event.detail);
+      setQrUri(event.detail);
+      cleanup();
+      setWalletConnectCleanup(null);
+    };
+    const cleanup = () => {
+      window.removeEventListener("PARA_WALLETCONNECT_URI_READY", callback);
+    };
+    window.addEventListener("PARA_WALLETCONNECT_URI_READY", callback);
+    setWalletConnectCleanup(() => cleanup);
+    return cleanup;
+  };
   const isWithFullAuth = (wallet2) => {
     if (connectionOnly) {
       return false;
@@ -351,7 +363,10 @@ function ExternalWalletProvider({ children }) {
     return verifyExternalWalletParams;
   }), [cosmosSignVerificationMessage, evmSignVerificationMessage, solanaSignVerificationMessage, wallet]);
   const signMessage = useCallback(
-    (_0) => __async(this, [_0], function* ({ message, externalWallet: _externalWallet }) {
+    (_0) => __async(this, [_0], function* ({
+      message,
+      externalWallet: _externalWallet
+    }) {
       var _a;
       setExternalWalletError();
       setIsSigningMessage(true);
@@ -362,14 +377,16 @@ function ExternalWalletProvider({ children }) {
         switch (walletType) {
           case "COSMOS":
             {
-              const { address, signature, error, cosmosPublicKeyHex, cosmosSigner } = yield cosmosSignMessage({
-                message,
-                externalWallet
-              });
+              const { address, signature, error, cosmosPublicKeyHex, cosmosSigner, addressBech32 } = yield cosmosSignMessage(
+                {
+                  message,
+                  externalWallet
+                }
+              );
               if (error) {
                 throw new Error(error);
               } else if (signature && address) {
-                response = { address, signature, cosmosPublicKeyHex, cosmosSigner };
+                response = { address, signature, cosmosPublicKeyHex, cosmosSigner, addressBech32 };
               }
             }
             break;
@@ -407,6 +424,7 @@ function ExternalWalletProvider({ children }) {
   );
   const addAdditionalExternalWallet = useCallback(
     (wallet2) => __async(this, null, function* () {
+      setExternalWalletError();
       try {
         const walletInfo = yield requestInfo(wallet2.id, wallet2.type);
         const walletAddress = wallet2.type === "COSMOS" && walletInfo.addressBech32 ? walletInfo.addressBech32 : walletInfo.address;
@@ -470,8 +488,198 @@ function ExternalWalletProvider({ children }) {
     }),
     [para, connectionOnly, includeWalletVerification, setStep, 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 });
+            yield 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 handlePostMessage = (message) => {
+    var _a;
+    if (refs.popupWindow.current) {
+      refs.popupWindow.current.postMessage(message, "*");
+    } else if (refs.iFrame.current) {
+      (_a = refs.iFrame.current.contentWindow) == null ? void 0 : _a.postMessage(message, "*");
+    }
+  };
+  const handleTriggerSignMessage = (wallet2, message) => __async(this, null, function* () {
+    setupExternalWalletVerificationStatusListener(wallet2);
+    try {
+      const { address, signature, cosmosPublicKeyHex, cosmosSigner, addressBech32 } = yield signMessage({
+        message,
+        externalWallet: wallet2
+      });
+      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." });
+        return;
+      }
+      handlePostMessage({ type: "EW_SIGN_MESSAGE_SUCCESS", verifyExternalWalletParams });
+    } catch (error) {
+      handlePostMessage({ type: "EW_SIGN_MESSAGE_ERROR", error: error.message || "Error signing message" });
+    }
+  });
+  const setupExternalWalletVerificationTriggerListener = (wallet2) => {
+    if (!wallet2) {
+      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);
+        }
+      });
+    });
+  };
+  const setupPopupWindowCloseListener = () => {
+    const popup = refs.popupWindow.current;
+    if (!popup) return;
+    if (popupCloseIntervalRef.current) {
+      clearInterval(popupCloseIntervalRef.current);
+    }
+    popupCloseIntervalRef.current = setInterval(() => {
+      if (popup.closed) {
+        if (popupCloseIntervalRef.current) {
+          clearInterval(popupCloseIntervalRef.current);
+          popupCloseIntervalRef.current = null;
+        }
+        goBack();
+        disconnectExternalWallet();
+      }
+    }, 500);
+  };
+  const clearPopupWindowCloseListener = () => {
+    if (popupCloseIntervalRef.current) {
+      clearInterval(popupCloseIntervalRef.current);
+      popupCloseIntervalRef.current = null;
+    }
+  };
+  const handlePostConnectRetry = () => {
+    handlePostMessage({ type: "EW_CONNECT_RETRY" });
+  };
+  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 setupExternalWalletConnectionRetryListener = (wallet2) => {
+    typeof window !== "undefined" && window.addEventListener("message", handleConnectRetryMessage(wallet2));
+  };
+  const clearExternalWalletConnectionRetryListener = (wallet2) => {
+    window.removeEventListener("message", handleConnectRetryMessage(wallet2));
+  };
   const connectExternalWallet = useCallback(
-    (wallet2, isMobileConnect, isManualWalletConnect, isResetAfterManualWalletConnect) => __async(this, null, function* () {
+    (_0) => __async(this, [_0], function* ({
+      wallet: wallet2,
+      isManualWalletConnect,
+      isMobileConnect,
+      isResetAfterManualWalletConnect,
+      isRetryConnection
+    }) {
+      if (isRetryConnection) {
+        clearExternalWalletConnectionRetryListener(wallet2);
+        handlePostConnectRetry();
+      }
+      if (!isMobile() && isWithFullAuth(wallet2)) {
+        const popupUrl = yield para.constructPortalUrl("connectExternalWallet");
+        if (typeof window !== void 0) {
+          refs.popupWindow.current = openPopup({
+            url: popupUrl,
+            type: "LOGIN_EXTERNAL_WALLET",
+            target: "ParaExternalWallet"
+          });
+        }
+        setupPopupWindowCloseListener();
+      }
       if (isExternalWalletConnecting && isManualWalletConnect) {
         yield evmDisconnect();
         yield solanaDisconnect();
@@ -479,23 +687,27 @@ function ExternalWalletProvider({ children }) {
         setQrUri(void 0);
         setIsExternalWalletConnecting(false);
       }
-      if (isResetAfterManualWalletConnect || isManualWalletConnect || !isExternalWalletConnecting) {
+      if (isResetAfterManualWalletConnect || isManualWalletConnect || isMobileConnect || !isExternalWalletConnecting) {
         setExternalWalletError();
         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(wallet2, false, false, true);
-            yield updateQrUri();
+            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);
           }
@@ -521,7 +733,7 @@ function ExternalWalletProvider({ children }) {
             isConnectionOnly: true
           });
         } else {
-          yield connectExternalWallet(evmWallet, false, true);
+          yield connectExternalWallet({ wallet: evmWallet, isManualWalletConnect: true });
         }
       }
       if (solanaWallet && (solanaFarcasterStatus == null ? void 0 : solanaFarcasterStatus.isPresent)) {
@@ -535,7 +747,7 @@ function ExternalWalletProvider({ children }) {
             isConnectionOnly: true
           });
         } else {
-          yield connectExternalWallet(solanaWallet, false, true);
+          yield connectExternalWallet({ wallet: solanaWallet, isManualWalletConnect: true });
         }
       }
       if (loginWallets.length > 0) {
@@ -547,6 +759,7 @@ function ExternalWalletProvider({ children }) {
     }
   });
   const requestInfo = (providerId, type) => __async(this, null, function* () {
+    listenForWalletConnectUri();
     switch (type) {
       case "EVM": {
         const externalWallet = yield evmRequestInfo(providerId);