@getpara/react-sdk-lite 2.20.0 → 2.22.0

package/dist/modal/ParaModal.js

@@ -99,7 +99,7 @@ const ParaModal = forwardRef((props, ref) => {
             onClose,
             defaultAuthIdentifier
           }), rest),
-          reactSdkVersion: "2.20.0"
+          reactSdkVersion: "2.22.0"
         });
       } catch (e) {
       }

package/dist/modal/components/shared/ConnectExternalWallet/ConnectExternalWallet.js

@@ -5,27 +5,14 @@ import {
 import { Fragment, jsx, jsxs } from "react/jsx-runtime";
 import { CpslButton, CpslIcon, CpslQrCode, CpslSpinner, CpslText } from "@getpara/react-components";
 import { CenteredText, HeroAccountTypeIcon, InnerStepContainer, QRContainer, StepContainer } from "../../common.js";
-import { useCallback, useMemo } from "react";
+import { useCallback, useEffect, useMemo, useState } from "react";
 import { HeroSpinner, openMobileUrl, safeStyled } from "@getpara/react-common";
 import { useCopyToClipboard } from "@getpara/react-common";
 import { isMobile, isTablet } from "@getpara/web-sdk";
-import { useExternalWallets } from "../../../../provider/providers/ExternalWalletProvider.js";
+import { isSolanaWalletInAppBrowser, useExternalWallets } from "../../../../provider/providers/ExternalWalletProvider.js";
 import { useStore } from "../../../../provider/stores/useStore.js";
-const isSolanaWalletInAppBrowser = (wallet) => {
-  var _a;
-  switch (wallet) {
-    case "PHANTOM":
-      return !!((_a = window == null ? void 0 : window.phantom) == null ? void 0 : _a.solana);
-    case "SOLFLARE":
-      return !!(window == null ? void 0 : window.solflare);
-    case "BACKPACK":
-      return !!(window == null ? void 0 : window.backpack);
-    case "GLOW":
-      return !!(window == null ? void 0 : window.glowSolana);
-    default:
-      break;
-  }
-};
+const IN_APP_BROWSER_POLL_INTERVAL = 200;
+const IN_APP_BROWSER_POLL_MAX_WAIT = 3e3;
 const ExternalWalletMobileConnect = ({
   wallet,
   onConnectWc,
@@ -37,6 +24,24 @@ const ExternalWalletMobileConnect = ({
   const appName = useStore((state) => state.appName);
   const isWalletConnect = wallet.id === "WalletConnect";
   const { qrUri } = useExternalWallets();
+  const [isInAppBrowser, setIsInAppBrowser] = useState(() => !!isSolanaWalletInAppBrowser(wallet.internalId));
+  useEffect(() => {
+    if (isSolanaWalletInAppBrowser(wallet.internalId)) {
+      setIsInAppBrowser(true);
+      return;
+    }
+    let elapsed = 0;
+    const timer = setInterval(() => {
+      elapsed += IN_APP_BROWSER_POLL_INTERVAL;
+      if (isSolanaWalletInAppBrowser(wallet.internalId)) {
+        setIsInAppBrowser(true);
+        clearInterval(timer);
+      } else if (elapsed >= IN_APP_BROWSER_POLL_MAX_WAIT) {
+        clearInterval(timer);
+      }
+    }, IN_APP_BROWSER_POLL_INTERVAL);
+    return () => clearInterval(timer);
+  }, [wallet.internalId]);
   const handleCopy = () => {
     if (qrUri) {
       copy(qrUri);
@@ -52,7 +57,7 @@ const ExternalWalletMobileConnect = ({
   });
   if (wallet.type === "SOLANA" || isMobile() && !isTablet()) {
     return /* @__PURE__ */ jsxs(Fragment, { children: [
-      wallet.type === "SOLANA" && !!qrUri && !isSolanaWalletInAppBrowser(wallet.internalId) && /* @__PURE__ */ jsx(InnerStepContainer, { children: /* @__PURE__ */ jsx(
+      wallet.type === "SOLANA" && !!qrUri && !isInAppBrowser && /* @__PURE__ */ jsx(InnerStepContainer, { children: /* @__PURE__ */ jsx(
         HeroSpinner,
         {
           icon: /* @__PURE__ */ jsx(HeroAccountTypeIcon, { accountType: wallet.internalId, src: wallet ? wallet.iconUrl : void 0 }),
@@ -66,12 +71,12 @@ const ExternalWalletMobileConnect = ({
           HeroSpinner,
           {
             icon: /* @__PURE__ */ jsx(HeroAccountTypeIcon, { accountType: wallet.internalId, src: wallet ? wallet.iconUrl : void 0 }),
-            status: wallet.type === "SOLANA" && !isSolanaWalletInAppBrowser(wallet.internalId) ? "idle" : isError ? "error" : "pending",
-            text: wallet.type === "SOLANA" && (!isSolanaWalletInAppBrowser(wallet.internalId) || wallet.hasIosSafariExtension) ? "" : isError ? externalWalletError[0] : `Confirm connection request in the ${wallet.name} app.`,
+            status: wallet.type === "SOLANA" && !isInAppBrowser ? "idle" : isError ? "error" : "pending",
+            text: wallet.type === "SOLANA" && (!isInAppBrowser || wallet.hasIosSafariExtension) ? "" : isError ? externalWalletError[0] : `Confirm connection request in the ${wallet.name} app.`,
             secondaryText: externalWalletError == null ? void 0 : externalWalletError[1]
           }
         ),
-        wallet.type === "SOLANA" && isSolanaWalletInAppBrowser(wallet.internalId) && !wallet.hasIosSafariExtension || wallet.type !== "SOLANA" ? /* @__PURE__ */ jsx(
+        wallet.type === "SOLANA" && isInAppBrowser && !wallet.hasIosSafariExtension || wallet.type !== "SOLANA" ? /* @__PURE__ */ jsx(
           CpslButton,
           {
             onClick: handleRetryClick,
@@ -80,7 +85,7 @@ const ExternalWalletMobileConnect = ({
             children: isError ? "Retry" : "Connect Wallet"
           }
         ) : /* @__PURE__ */ jsx(Text, { weight: "semiBold", children: wallet.hasIosSafariExtension ? `Please install and use the ${wallet.name} extension for iOS Safari.` : `Please navigate to ${appName} in the ${wallet.name} wallet.` }),
-        !wallet.hasIosSafariExtension && /* @__PURE__ */ jsx(Link, { href: (_a = wallet.downloadUrl) != null ? _a : "", target: "_blank", children: /* @__PURE__ */ jsxs(ExternalButton, { variant: "secondary", "data-testid": "para-wallet-get", children: [
+        !wallet.hasIosSafariExtension && !isInAppBrowser && /* @__PURE__ */ jsx(Link, { href: (_a = wallet.downloadUrl) != null ? _a : "", target: "_blank", children: /* @__PURE__ */ jsxs(ExternalButton, { variant: "secondary", "data-testid": "para-wallet-get", children: [
           `Get ${wallet.name}`,
           /* @__PURE__ */ jsx(ExternalIcon, { icon: "linkExternal" })
         ] }) })

package/dist/provider/ParaProviderMin.js

@@ -18,122 +18,129 @@ import { AccountLinkProvider } from "./providers/AccountLinkProvider.js";
 import { AssetsProvider } from "./providers/AssetsProvider.js";
 import { AuthProvider } from "./providers/AuthProvider/AuthProvider.js";
 const coreStoreRef = storeInstance;
-const ParaProviderMin = forwardRef(({ children, paraClientConfig, callbacks, config, externalWalletConfig, paraModalConfig }, ref) => {
-  var _a;
-  useEventListeners(callbacks);
-  useAutoSessionKeepAlive({ disabled: config.disableAutoSessionKeepAlive });
-  const setModalError = useStore((state) => state.setModalError);
-  const paraClient = useMemo(() => {
-    if (isParaWeb(paraClientConfig)) return paraClientConfig;
-    if (isConfigType(paraClientConfig)) {
-      return {
-        apiKey: paraClientConfig.apiKey,
-        env: paraClientConfig.env,
-        opts: paraClientConfig.opts,
-        createClient: (apiKey, env, opts) => env ? new ParaWeb(env, apiKey, opts) : new ParaWeb(apiKey, opts)
-      };
-    }
-    throw new Error("Invalid Para config");
-  }, [paraClientConfig]);
-  const configureClient = useCallback(
-    (client2) => {
-      client2.setModalError = setModalError;
-      if (typeof globalThis !== "undefined" && globalThis.__PARA_PORTAL_URL_OVERRIDE__) {
-        client2.ctx.portalUrlOverride = globalThis.__PARA_PORTAL_URL_OVERRIDE__;
+const ParaProviderMin = forwardRef(
+  ({ children, paraClientConfig, callbacks, config, externalWalletConfig, paraModalConfig, waitForReady, fallback }, ref) => {
+    var _a;
+    useEventListeners(callbacks);
+    useAutoSessionKeepAlive({ disabled: config.disableAutoSessionKeepAlive });
+    const setModalError = useStore((state) => state.setModalError);
+    const paraClient = useMemo(() => {
+      if (isParaWeb(paraClientConfig)) return paraClientConfig;
+      if (isConfigType(paraClientConfig)) {
+        return {
+          apiKey: paraClientConfig.apiKey,
+          env: paraClientConfig.env,
+          opts: paraClientConfig.opts,
+          createClient: (apiKey, env, opts) => env ? new ParaWeb(env, apiKey, opts) : new ParaWeb(apiKey, opts)
+        };
       }
-      client2.portalTheme = paraModalConfig == null ? void 0 : paraModalConfig.theme;
-    },
-    [setModalError, paraModalConfig == null ? void 0 : paraModalConfig.theme]
-  );
-  const client = useStore((state) => state.client);
-  useEffect(() => {
-    if (client) {
-      client.portalTheme = paraModalConfig == null ? void 0 : paraModalConfig.theme;
-    }
-  }, [paraModalConfig == null ? void 0 : paraModalConfig.theme, client]);
-  const setExternalWallets = useStore((state) => state.setExternalWallets);
-  const externalWallets = useStore((state) => state.externalWallets);
-  const setExternalWalletsWithFullAuth = useStore((state) => state.setExternalWalletsWithFullAuth);
-  const externalWalletsWithFullAuth = useStore((state) => state.externalWalletsWithFullAuth);
-  const setIncludeWalletVerification = useStore((state) => state.setIncludeWalletVerification);
-  const includeWalletVerification = useStore((state) => state.includeWalletVerification);
-  const setConnectionOnly = useStore((state) => state.setConnectionOnly);
-  const connectionOnly = useStore((state) => state.connectionOnly);
-  const setModalConfig = useStore((state) => state.setModalConfig);
-  const modalConfig = useStore((state) => state.modalConfig);
-  const setProviderProps = useStore((state) => state.setProviderProps);
-  const paraState = useStore((state) => state.paraState);
-  useEffect(() => {
-    setProviderProps(__spreadProps(__spreadValues(__spreadValues(__spreadValues({}, config), externalWalletConfig), paraModalConfig), {
-      walletConnect: void 0
-    }));
-  }, [config, externalWalletConfig, paraModalConfig]);
-  useEffect(() => {
-    if (modalConfig !== paraModalConfig) setModalConfig(paraModalConfig);
-  }, [paraModalConfig]);
-  useEffect(() => {
-    var _a2;
-    if (connectionOnly !== (externalWalletConfig == null ? void 0 : externalWalletConfig.connectionOnly)) {
-      setConnectionOnly((_a2 = externalWalletConfig == null ? void 0 : externalWalletConfig.connectionOnly) != null ? _a2 : false);
-    }
-  }, [externalWalletConfig == null ? void 0 : externalWalletConfig.connectionOnly]);
-  useEffect(() => {
-    var _a2, _b;
-    if (includeWalletVerification !== (externalWalletConfig == null ? void 0 : externalWalletConfig.includeWalletVerification)) {
-      if ((externalWalletConfig == null ? void 0 : externalWalletConfig.connectionOnly) || (isParaWeb(paraClientConfig) ? paraClientConfig.externalWalletConnectionOnly : (_a2 = paraClientConfig.opts) == null ? void 0 : _a2.externalWalletConnectionOnly)) {
-        console.warn("includeWalletVerification has no effect when using connection only external wallets");
-        setIncludeWalletVerification(false);
-      } else {
-        setIncludeWalletVerification((_b = externalWalletConfig == null ? void 0 : externalWalletConfig.includeWalletVerification) != null ? _b : false);
+      throw new Error("Invalid Para config");
+    }, [paraClientConfig]);
+    const configureClient = useCallback(
+      (client2) => {
+        client2.setModalError = setModalError;
+        if (typeof globalThis !== "undefined" && globalThis.__PARA_PORTAL_URL_OVERRIDE__) {
+          client2.ctx.portalUrlOverride = globalThis.__PARA_PORTAL_URL_OVERRIDE__;
+        }
+        client2.portalTheme = paraModalConfig == null ? void 0 : paraModalConfig.theme;
+      },
+      [setModalError, paraModalConfig == null ? void 0 : paraModalConfig.theme]
+    );
+    const client = useStore((state) => state.client);
+    useEffect(() => {
+      if (client) {
+        client.portalTheme = paraModalConfig == null ? void 0 : paraModalConfig.theme;
+      }
+    }, [paraModalConfig == null ? void 0 : paraModalConfig.theme, client]);
+    const setExternalWallets = useStore((state) => state.setExternalWallets);
+    const externalWallets = useStore((state) => state.externalWallets);
+    const setExternalWalletsWithFullAuth = useStore((state) => state.setExternalWalletsWithFullAuth);
+    const externalWalletsWithFullAuth = useStore((state) => state.externalWalletsWithFullAuth);
+    const setIncludeWalletVerification = useStore((state) => state.setIncludeWalletVerification);
+    const includeWalletVerification = useStore((state) => state.includeWalletVerification);
+    const setConnectionOnly = useStore((state) => state.setConnectionOnly);
+    const connectionOnly = useStore((state) => state.connectionOnly);
+    const setModalConfig = useStore((state) => state.setModalConfig);
+    const modalConfig = useStore((state) => state.modalConfig);
+    const setProviderProps = useStore((state) => state.setProviderProps);
+    const paraState = useStore((state) => state.paraState);
+    useEffect(() => {
+      setProviderProps(__spreadProps(__spreadValues(__spreadValues(__spreadValues({}, config), externalWalletConfig), paraModalConfig), {
+        walletConnect: void 0
+      }));
+    }, [config, externalWalletConfig, paraModalConfig]);
+    useEffect(() => {
+      if (modalConfig !== paraModalConfig) setModalConfig(paraModalConfig);
+    }, [paraModalConfig]);
+    useEffect(() => {
+      var _a2;
+      if (connectionOnly !== (externalWalletConfig == null ? void 0 : externalWalletConfig.connectionOnly)) {
+        setConnectionOnly((_a2 = externalWalletConfig == null ? void 0 : externalWalletConfig.connectionOnly) != null ? _a2 : false);
+      }
+    }, [externalWalletConfig == null ? void 0 : externalWalletConfig.connectionOnly]);
+    useEffect(() => {
+      var _a2, _b;
+      if (includeWalletVerification !== (externalWalletConfig == null ? void 0 : externalWalletConfig.includeWalletVerification)) {
+        if ((externalWalletConfig == null ? void 0 : externalWalletConfig.connectionOnly) || (isParaWeb(paraClientConfig) ? paraClientConfig.externalWalletConnectionOnly : (_a2 = paraClientConfig.opts) == null ? void 0 : _a2.externalWalletConnectionOnly)) {
+          console.warn("includeWalletVerification has no effect when using connection only external wallets");
+          setIncludeWalletVerification(false);
+        } else {
+          setIncludeWalletVerification((_b = externalWalletConfig == null ? void 0 : externalWalletConfig.includeWalletVerification) != null ? _b : false);
+        }
       }
-    }
-  }, [externalWalletConfig == null ? void 0 : externalWalletConfig.includeWalletVerification]);
-  useEffect(() => {
-    var _a2;
-    if (externalWallets !== (externalWalletConfig == null ? void 0 : externalWalletConfig.wallets)) {
-      setExternalWallets((_a2 = externalWalletConfig == null ? void 0 : externalWalletConfig.wallets) != null ? _a2 : [...EXTERNAL_WALLET_TYPES]);
-    }
-  }, [externalWalletConfig == null ? void 0 : externalWalletConfig.wallets]);
-  useEffect(() => {
-    var _a2, _b;
-    if (externalWalletsWithFullAuth !== (externalWalletConfig == null ? void 0 : externalWalletConfig.createLinkedEmbeddedForExternalWallets)) {
-      if ((externalWalletConfig == null ? void 0 : externalWalletConfig.connectionOnly) || (isParaWeb(paraClientConfig) ? paraClientConfig.externalWalletConnectionOnly : (_a2 = paraClientConfig.opts) == null ? void 0 : _a2.externalWalletConnectionOnly)) {
-        console.warn("createLinkedEmbeddedForExternalWallets has no effect when using connection only external wallets");
-        setExternalWalletsWithFullAuth([]);
-      } else {
-        setExternalWalletsWithFullAuth((_b = externalWalletConfig == null ? void 0 : externalWalletConfig.createLinkedEmbeddedForExternalWallets) != null ? _b : []);
+    }, [externalWalletConfig == null ? void 0 : externalWalletConfig.includeWalletVerification]);
+    useEffect(() => {
+      var _a2;
+      if (externalWallets !== (externalWalletConfig == null ? void 0 : externalWalletConfig.wallets)) {
+        setExternalWallets((_a2 = externalWalletConfig == null ? void 0 : externalWalletConfig.wallets) != null ? _a2 : [...EXTERNAL_WALLET_TYPES]);
       }
-    }
-  }, [externalWalletConfig == null ? void 0 : externalWalletConfig.createLinkedEmbeddedForExternalWallets]);
-  const isReady = (_a = paraState == null ? void 0 : paraState.isReady) != null ? _a : false;
-  const ChildrenComponents = useMemo(() => {
-    if (!isReady) {
-      return null;
-    }
-    return /* @__PURE__ */ jsxs(Fragment, { children: [
-      children,
-      !config.disableEmbeddedModal && /* @__PURE__ */ jsx(ParaModal, { ref })
-    ] });
-  }, [isReady, children, config.disableEmbeddedModal, ref]);
-  return /* @__PURE__ */ jsx(
-    ParaProviderCore,
-    {
-      paraClientConfig: paraClient,
-      config,
-      configureClient,
-      store: coreStoreRef,
-      waitForReady: false,
-      children: /* @__PURE__ */ jsx(
-        AuthProvider,
-        {
-          isTwoFactorAuthEnabled: paraModalConfig == null ? void 0 : paraModalConfig.twoFactorAuthEnabled,
-          defaultAuthIdentifier: paraModalConfig == null ? void 0 : paraModalConfig.defaultAuthIdentifier,
-          children: /* @__PURE__ */ jsx(AssetsProvider, { children: /* @__PURE__ */ jsx(ExternalWalletWrapper, { config: externalWalletConfig, children: /* @__PURE__ */ jsx(AccountLinkProvider, { children: ChildrenComponents }) }) })
+    }, [externalWalletConfig == null ? void 0 : externalWalletConfig.wallets]);
+    useEffect(() => {
+      var _a2, _b;
+      if (externalWalletsWithFullAuth !== (externalWalletConfig == null ? void 0 : externalWalletConfig.createLinkedEmbeddedForExternalWallets)) {
+        if ((externalWalletConfig == null ? void 0 : externalWalletConfig.connectionOnly) || (isParaWeb(paraClientConfig) ? paraClientConfig.externalWalletConnectionOnly : (_a2 = paraClientConfig.opts) == null ? void 0 : _a2.externalWalletConnectionOnly)) {
+          console.warn("createLinkedEmbeddedForExternalWallets has no effect when using connection only external wallets");
+          setExternalWalletsWithFullAuth([]);
+        } else {
+          setExternalWalletsWithFullAuth((_b = externalWalletConfig == null ? void 0 : externalWalletConfig.createLinkedEmbeddedForExternalWallets) != null ? _b : []);
         }
-      )
-    }
-  );
-});
+      }
+    }, [externalWalletConfig == null ? void 0 : externalWalletConfig.createLinkedEmbeddedForExternalWallets]);
+    const isReady = (_a = paraState == null ? void 0 : paraState.isReady) != null ? _a : false;
+    const shouldWait = waitForReady !== false;
+    const ChildrenComponents = useMemo(() => {
+      if (shouldWait && !isReady) {
+        if (!!(paraState == null ? void 0 : paraState.error)) {
+          return children || null;
+        }
+        return fallback != null ? fallback : null;
+      }
+      return /* @__PURE__ */ jsxs(Fragment, { children: [
+        children,
+        !config.disableEmbeddedModal && isReady && /* @__PURE__ */ jsx(ParaModal, { ref })
+      ] });
+    }, [shouldWait, isReady, paraState == null ? void 0 : paraState.error, fallback, children, config.disableEmbeddedModal, ref]);
+    return /* @__PURE__ */ jsx(
+      ParaProviderCore,
+      {
+        paraClientConfig: paraClient,
+        config,
+        configureClient,
+        store: coreStoreRef,
+        waitForReady: false,
+        fallback,
+        children: /* @__PURE__ */ jsx(
+          AuthProvider,
+          {
+            isTwoFactorAuthEnabled: paraModalConfig == null ? void 0 : paraModalConfig.twoFactorAuthEnabled,
+            defaultAuthIdentifier: paraModalConfig == null ? void 0 : paraModalConfig.defaultAuthIdentifier,
+            children: /* @__PURE__ */ jsx(AssetsProvider, { children: /* @__PURE__ */ jsx(ExternalWalletWrapper, { config: externalWalletConfig, children: /* @__PURE__ */ jsx(AccountLinkProvider, { children: ChildrenComponents }) }) })
+          }
+        )
+      }
+    );
+  }
+);
 export {
   ParaProviderMin
 };

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

@@ -18,10 +18,10 @@ export declare const ADD_CREDENTIAL_KEY = "ADD_CREDENTIAL";
 export declare const useAddAuthMethod: ({ openPopup }?: {
     openPopup: boolean;
 }) => {
-    error: Error | null;
     isSuccess: boolean;
     data: string | undefined;
     variables: void | AddCredentialParams | undefined;
+    error: Error | null;
     isError: boolean;
     isIdle: boolean;
     isPending: boolean;

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

@@ -11,10 +11,10 @@ export declare const EXPORT_PRIVATE_KEY_KEY = "EXPORT_PRIVATE_KEY";
  * await exportPrivateKeyAsync({ walletId: '...' });
  */
 export declare const useExportPrivateKey: () => {
-    error: Error | null;
     isSuccess: boolean;
     data: ExportPrivateKeyResponse | undefined;
     variables: ExportPrivateKeyParams;
+    error: Error | null;
     isError: boolean;
     isIdle: boolean;
     isPending: boolean;

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

@@ -15,10 +15,10 @@ export declare const SWITCH_WALLETS_KEY = "SWITCH_WALLETS";
  * await switchWalletsAsync({ authMethod: 'PASSKEY' });
  */
 export declare const useSwitchWallets: () => {
-    error: Error | null;
     isSuccess: boolean;
     data: WaitForLoginResponse | undefined;
     variables: void | WaitForLoginParams | undefined;
+    error: Error | null;
     isError: boolean;
     isIdle: boolean;
     isPending: boolean;

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

@@ -15,10 +15,10 @@ export declare const VERIFY_NEW_ACCOUNT_KEY = "VERIFY_NEW_ACCOUNT";
  * await verifyNewAccountAsync({ ...params });
  */
 export declare const useVerifyNewAccount: () => {
-    error: Error | null;
     isSuccess: boolean;
     data: import("@getpara/web-sdk").AuthStateSignup | undefined;
     variables: VerifyNewAccountParams | undefined;
+    error: Error | null;
     isError: boolean;
     isIdle: boolean;
     isPending: boolean;

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

@@ -3,6 +3,7 @@ import { TWalletType } from '@getpara/web-sdk';
 import { BalanceManagement, ChainManagement, CommonWallet, DisconnectBaseOptions, ExternalWalletContextType, MutationStatus } from '@getpara/react-common';
 import { ExternalWalletInfo } from '@getpara/web-sdk';
 import { CosmosSignResult } from '@getpara/cosmos-wallet-connectors';
+export declare const isSolanaWalletInAppBrowser: (walletId: string) => boolean;
 export declare const useWalletDisplayHelpers: (wallet: CommonWallet | undefined) => {
     showExtension: boolean;
     showMobile: boolean;

package/dist/provider/providers/ExternalWalletProvider.js

@@ -23,6 +23,23 @@ import {
 import { useGoBack } from "../../modal/hooks/useGoBack.js";
 import { validatePortalOrigin } from "../../modal/utils/validatePortalOrigin.js";
 import { DEFAULTS } from "../../modal/constants/defaults.js";
+const isSolanaWalletInAppBrowser = (walletId) => {
+  var _a;
+  if (typeof window === "undefined") return false;
+  const w = window;
+  switch (walletId) {
+    case "PHANTOM":
+      return !!((_a = w == null ? void 0 : w.phantom) == null ? void 0 : _a.solana);
+    case "SOLFLARE":
+      return !!(w == null ? void 0 : w.solflare);
+    case "BACKPACK":
+      return !!(w == null ? void 0 : w.backpack);
+    case "GLOW":
+      return !!(w == null ? void 0 : w.glowSolana);
+    default:
+      return false;
+  }
+};
 const useWalletDisplayHelpers = (wallet) => {
   const isUsingMobileConnector = useStore((state) => state.isUsingMobileConnector);
   return {
@@ -642,9 +659,10 @@ function ExternalWalletProvider({ children }) {
         clearExternalWalletConnectionRetryListener();
         handlePostConnectRetry();
       }
-      if (!isMobile() && isWithFullAuth(wallet2) && !isManualWalletConnect) {
+      const isInDappBrowser = isSolanaWalletInAppBrowser(wallet2.internalId);
+      if (!(isMobile() || isInDappBrowser) && isWithFullAuth(wallet2) && !isManualWalletConnect) {
         const popupUrl = yield para.constructPortalUrl("connectExternalWallet");
-        if (typeof window !== void 0) {
+        if (typeof window !== "undefined") {
           refs.popupWindow.current = openPopup({
             url: popupUrl,
             type: "LOGIN_EXTERNAL_WALLET",
@@ -962,6 +980,7 @@ export {
   ExternalWalletContext,
   ExternalWalletProvider,
   defaultExternalWallet,
+  isSolanaWalletInAppBrowser,
   useExternalWallets,
   useWalletDisplayHelpers
 };

package/dist/provider/types/provider.d.ts

@@ -1,47 +1,26 @@
 import { ParaWagmiProviderProps } from '@getpara/evm-wallet-connectors';
-import ParaWeb, { AccountCreationEvent, AccountSetupEvent, ConstructorOpts, Environment, ExternalWalletChangeEvent, LoginEvent, LogoutEvent, PregenWalletClaimedEvent, SignMessageEvent, SignTransactionEvent, WalletCreatedEvent, WalletsChangeEvent, GuestWalletsCreatedEvent } from '@getpara/web-sdk';
-import { PropsWithChildren } from 'react';
+import ParaWeb, { ExternalWalletChangeEvent, PregenWalletClaimedEvent, GuestWalletsCreatedEvent } from '@getpara/web-sdk';
 import { Chain, Transport } from 'viem';
 import { ParaModalProps } from '../../modal/index.js';
 import { ParaGrazProviderProps } from '@getpara/cosmos-wallet-connectors';
 import { ParaCosmosProviderConfigNoWallets, ParaEvmProviderConfigNoWallets, ParaSolanaProviderConfigNoWallets } from './externalWalletProviders.js';
 import { type TExternalWallet } from '@getpara/react-common';
-import { FarcasterMiniAppConfig } from '../stores/types.js';
-export type Callbacks = {
-    onLogout?: (event: LogoutEvent) => void;
-    onLogin?: (event: LoginEvent) => void;
-    onAccountSetup?: (event: AccountSetupEvent) => void;
-    onAccountCreation?: (event: AccountCreationEvent) => void;
-    onSignMessage?: (event: SignMessageEvent) => void;
-    onSignTransaction?: (event: SignTransactionEvent) => void;
+import type { ParaProviderBaseProps, CoreProviderConfig, CoreCallbacks } from '@getpara/react-core/internal';
+export interface Callbacks extends CoreCallbacks {
     onExternalWalletChange?: (event: ExternalWalletChangeEvent) => void;
-    onWalletsChange?: (event: WalletsChangeEvent) => void;
-    onWalletCreated?: (event: WalletCreatedEvent) => void;
     onPregenWalletClaimed?: (event: PregenWalletClaimedEvent) => void;
     onGuestWalletsCreated?: (event: GuestWalletsCreatedEvent) => void;
-};
-export type ParaProviderConfig = {
-    /**
-     * The name of your app, used throughout the modal and any configured external wallets.
-     */
-    appName: string;
+}
+export interface ParaProviderConfig extends CoreProviderConfig {
     /**
      * Disables the automatic session keep alive that's provided by ParaProvider.
      */
     disableAutoSessionKeepAlive?: boolean;
     /**
-     * Disables the ParaModal that's provided by ParaProvider. Use this is you're providing a separate modal in another location in your app.
+     * Disables the ParaModal that's provided by ParaProvider. Use this if you're providing a separate modal in another location in your app.
      */
     disableEmbeddedModal?: boolean;
-    /**
-     * RPC url to use for retrieving the embedded wallet balance
-     */
-    rpcUrl?: string;
-    /**
-     * Configuration options for Farcaster mini-apps.
-     */
-    farcasterMiniAppConfig?: FarcasterMiniAppConfig;
-};
+}
 export type ExternalWalletConfig<chains extends readonly [Chain, ...Chain[]], transports extends Record<chains[number]['id'], Transport>> = {
     /**
      * A description of your app, displayed in some external wallets.
@@ -130,35 +109,11 @@ export type ExternalWalletConfig<chains extends readonly [Chain, ...Chain[]], tr
      */
     connectionOnly?: boolean;
 };
-export interface ParaProviderProps<chains extends readonly [Chain, ...Chain[]], transports extends Record<chains[number]['id'], Transport>> extends PropsWithChildren {
-    /**
-     * Arguments to setup a new Para instance, or a Para instance you have already instantiated.
-     */
-    paraClientConfig: {
-        /**
-         * Environment for your Para instance.
-         */
-        env?: Environment;
-        /**
-         * API key for you Para instance.
-         *
-         * NOTE: Be sure this key matches the environment.
-         */
-        apiKey: string;
-        opts?: ConstructorOpts;
-    } | ParaWeb;
+export interface ParaProviderProps<chains extends readonly [Chain, ...Chain[]], transports extends Record<chains[number]['id'], Transport>> extends ParaProviderBaseProps<ParaWeb, ParaProviderConfig, Callbacks> {
     /**
      * Configuration used for the Para modal.
      */
     paraModalConfig?: ParaModalProps;
-    /**
-     * Callbacks fired for events from the Para instance.
-     */
-    callbacks?: Callbacks;
-    /**
-     * Config for the ParaProvider.
-     */
-    config: ParaProviderConfig;
     /**
      * Config for any external wallets.
      */