thirdweb 5.98.1 → 5.98.2

package/src/react/web/ui/ConnectWallet/ConnectButton.tsx

@@ -297,6 +297,9 @@ export function ConnectButton(props: ConnectButtonProps) {
   );
   const localeQuery = useConnectLocale(props.locale || "en_US");
   const connectionManager = useConnectionManager();
+  const activeAccount = useActiveAccount();
+  const activeWallet = useActiveWallet();
+  const siweAuth = useSiweAuth(activeWallet, activeAccount, props.auth);
 
   usePreloadWalletProviders({
     wallets,
@@ -337,6 +340,7 @@ export function ConnectButton(props: ConnectButtonProps) {
       }
       accountAbstraction={props.accountAbstraction}
       onConnect={props.onConnect}
+      siweAuth={siweAuth}
     />
   );
 
@@ -362,7 +366,11 @@ export function ConnectButton(props: ConnectButtonProps) {
 
   return (
     <WalletUIStatesProvider theme={props.theme} isOpen={false}>
-      <ConnectButtonInner {...props} connectLocale={localeQuery.data} />
+      <ConnectButtonInner
+        {...props}
+        siweAuth={siweAuth}
+        connectLocale={localeQuery.data}
+      />
       <ConnectModal
         shouldSetActive={true}
         accountAbstraction={props.accountAbstraction}
@@ -396,11 +404,11 @@ export function ConnectButton(props: ConnectButtonProps) {
 function ConnectButtonInner(
   props: ConnectButtonProps & {
     connectLocale: ConnectLocale;
+    siweAuth: ReturnType<typeof useSiweAuth>;
   },
 ) {
-  const activeWallet = useActiveWallet();
+  const siweAuth = props.siweAuth;
   const activeAccount = useActiveAccount();
-  const siweAuth = useSiweAuth(activeWallet, activeAccount, props.auth);
   const [showSignatureModal, setShowSignatureModal] = useState(false);
 
   // if wallet gets disconnected suddently, close the signature modal if it's open

package/src/react/web/ui/ConnectWallet/Modal/ConnectEmbed.tsx

@@ -247,6 +247,7 @@ export function ConnectEmbed(props: ConnectEmbedProps) {
       chain={preferredChain}
       appMetadata={props.appMetadata}
       client={props.client}
+      siweAuth={siweAuth}
       wallets={wallets}
       accountAbstraction={props.accountAbstraction}
       timeout={

package/src/react/web/ui/ConnectWallet/screens/Buy/fiat/OnRampScreen.tsx

@@ -23,10 +23,7 @@ import { sendTransaction } from "../../../../../../../transaction/actions/send-t
 import type { WaitForReceiptOptions } from "../../../../../../../transaction/actions/wait-for-tx-receipt.js";
 import { waitForReceipt } from "../../../../../../../transaction/actions/wait-for-tx-receipt.js";
 import { formatNumber } from "../../../../../../../utils/formatNumber.js";
-import { isEcosystemWallet } from "../../../../../../../wallets/ecosystem/is-ecosystem-wallet.js";
-import { isInAppWallet } from "../../../../../../../wallets/in-app/core/wallet/index.js";
-import type { Wallet } from "../../../../../../../wallets/interfaces/wallet.js";
-import { isSmartWallet } from "../../../../../../../wallets/smart/is-smart-wallet.js";
+import { isInAppSigner } from "../../../../../../../wallets/in-app/core/wallet/is-in-app-signer.js";
 import { spacing } from "../../../../../../core/design-system/index.js";
 import { useChainName } from "../../../../../../core/hooks/others/useChainQuery.js";
 import { useBuyWithCryptoStatus } from "../../../../../../core/hooks/pay/useBuyWithCryptoStatus.js";
@@ -779,20 +776,3 @@ function useSwapMutation(props: {
     },
   });
 }
-
-function isInAppSigner(options: {
-  wallet: Wallet;
-  connectedWallets: Wallet[];
-}) {
-  const isInAppOrEcosystem = (w: Wallet) =>
-    isInAppWallet(w) || isEcosystemWallet(w);
-  const isSmartWalletWithAdmin =
-    isSmartWallet(options.wallet) &&
-    options.connectedWallets.some(
-      (w) =>
-        isInAppOrEcosystem(w) &&
-        w.getAccount()?.address?.toLowerCase() ===
-          options.wallet.getAdminAccount?.()?.address?.toLowerCase(),
-    );
-  return isInAppOrEcosystem(options.wallet) || isSmartWalletWithAdmin;
-}

package/src/react/web/ui/PayEmbed.tsx

@@ -9,13 +9,19 @@ import type { AppMetadata } from "../../../wallets/types.js";
 import type { WalletId } from "../../../wallets/wallet-types.js";
 import { CustomThemeProvider } from "../../core/design-system/CustomThemeProvider.js";
 import type { Theme } from "../../core/design-system/index.js";
-import type { SiweAuthOptions } from "../../core/hooks/auth/useSiweAuth.js";
+import {
+  type SiweAuthOptions,
+  useSiweAuth,
+} from "../../core/hooks/auth/useSiweAuth.js";
 import type {
   ConnectButton_connectModalOptions,
   PayUIOptions,
 } from "../../core/hooks/connection/ConnectButtonProps.js";
+import { useActiveAccount } from "../../core/hooks/wallets/useActiveAccount.js";
+import { useActiveWallet } from "../../core/hooks/wallets/useActiveWallet.js";
 import { useConnectionManager } from "../../core/providers/connection-manager.js";
 import type { SupportedTokens } from "../../core/utils/defaultTokens.js";
+import { AutoConnect } from "../../web/ui/AutoConnect/AutoConnect.js";
 import { EmbedContainer } from "./ConnectWallet/Modal/ConnectEmbed.js";
 import { useConnectLocale } from "./ConnectWallet/locale/getConnectLocale.js";
 import BuyScreen from "./ConnectWallet/screens/Buy/BuyScreen.js";
@@ -300,6 +306,13 @@ export function PayEmbed(props: PayEmbedProps) {
   const [screen, setScreen] = useState<"buy" | "execute-tx">("buy");
   const theme = props.theme || "dark";
   const connectionManager = useConnectionManager();
+  const activeAccount = useActiveAccount();
+  const activeWallet = useActiveWallet();
+  const siweAuth = useSiweAuth(
+    activeWallet,
+    activeAccount,
+    props.connectOptions?.auth,
+  );
 
   // Add props.chain and props.chains to defined chains store
   useEffect(() => {
@@ -342,6 +355,7 @@ export function PayEmbed(props: PayEmbedProps) {
   } else {
     content = (
       <>
+        <AutoConnect client={props.client} siweAuth={siweAuth} />
         {screen === "buy" && (
           <BuyScreen
             title={metadata?.name || "Buy"}

package/src/version.ts

@@ -1 +1 @@
-export const version = "5.98.1";
+export const version = "5.98.2";

package/src/wallets/connection/autoConnectCore.ts

@@ -8,6 +8,7 @@ import type {
   AuthArgsType,
   AuthStoredTokenWithCookieReturnType,
 } from "../in-app/core/authentication/types.js";
+import { isInAppSigner } from "../in-app/core/wallet/is-in-app-signer.js";
 import { getUrlToken } from "../in-app/web/lib/get-url-token.js";
 import type { Wallet } from "../interfaces/wallet.js";
 import {
@@ -82,11 +83,11 @@ const _autoConnectCore = async ({
     getStoredActiveWalletId(storage),
   ]);
 
-  const result = getUrlToken();
+  const urlToken = getUrlToken();
 
   // If an auth cookie is found and this site supports the wallet, we'll set the auth cookie in the client storage
-  const wallet = wallets.find((w) => w.id === result?.walletId);
-  if (result?.authCookie && wallet) {
+  const wallet = wallets.find((w) => w.id === urlToken?.walletId);
+  if (urlToken?.authCookie && wallet) {
     const clientStorage = new ClientScopedStorage({
       storage,
       clientId: props.client.clientId,
@@ -97,17 +98,17 @@ const _autoConnectCore = async ({
           }
         : undefined,
     });
-    await clientStorage.saveAuthCookie(result.authCookie);
+    await clientStorage.saveAuthCookie(urlToken.authCookie);
   }
-  if (result?.walletId) {
-    lastActiveWalletId = result.walletId;
-    lastConnectedWalletIds = lastConnectedWalletIds?.includes(result.walletId)
+  if (urlToken?.walletId) {
+    lastActiveWalletId = urlToken.walletId;
+    lastConnectedWalletIds = lastConnectedWalletIds?.includes(urlToken.walletId)
       ? lastConnectedWalletIds
-      : [result.walletId, ...(lastConnectedWalletIds || [])];
+      : [urlToken.walletId, ...(lastConnectedWalletIds || [])];
   }
 
-  if (result?.authProvider) {
-    await setLastAuthProvider?.(result.authProvider, storage);
+  if (urlToken?.authProvider) {
+    await setLastAuthProvider?.(urlToken.authProvider, storage);
   }
 
   // if no wallets were last connected or we didn't receive an auth token
@@ -132,7 +133,7 @@ const _autoConnectCore = async ({
         wallet: activeWallet,
         client: props.client,
         lastConnectedChain,
-        authResult: result?.authResult,
+        authResult: urlToken?.authResult,
       }),
       {
         ms: timeout,
@@ -183,13 +184,33 @@ const _autoConnectCore = async ({
         wallet,
         client: props.client,
         lastConnectedChain,
-        authResult: result?.authResult,
+        authResult: urlToken?.authResult,
       });
       manager.addConnectedWallet(wallet);
     } catch {
       // no-op
     }
   }
+
+  // Auto-login with SIWE
+  const isIAW =
+    activeWallet &&
+    isInAppSigner({
+      wallet: activeWallet,
+      connectedWallets: activeWallet
+        ? [activeWallet, ...otherWallets]
+        : otherWallets,
+    });
+  if (
+    isIAW &&
+    props.siweAuth?.requiresAuth &&
+    !props.siweAuth?.isLoggedIn &&
+    !props.siweAuth?.isLoggingIn
+  ) {
+    await props.siweAuth?.doLogin().catch((err) => {
+      console.warn("Error signing in with SIWE:", err.message);
+    });
+  }
   manager.isAutoConnecting.setValue(false);
   return autoConnected; // useQuery needs a return value
 };

package/src/wallets/connection/types.ts

@@ -118,4 +118,14 @@ export type AutoConnectProps = {
    * Callback to be called when the connection is timeout-ed
    */
   onTimeout?: () => void;
+
+  /**
+   * @hidden
+   */
+  siweAuth?: {
+    requiresAuth: boolean;
+    doLogin: () => Promise<void>;
+    isLoggedIn: boolean | undefined;
+    isLoggingIn: boolean | undefined;
+  };
 };

package/src/wallets/in-app/core/wallet/is-in-app-signer.ts

@@ -0,0 +1,21 @@
+import { isEcosystemWallet } from "../../../../wallets/ecosystem/is-ecosystem-wallet.js";
+import type { Wallet } from "../../../interfaces/wallet.js";
+import { isSmartWallet } from "../../../smart/index.js";
+import { isInAppWallet } from "./index.js";
+
+export function isInAppSigner(options: {
+  wallet: Wallet;
+  connectedWallets: Wallet[];
+}) {
+  const isInAppOrEcosystem = (w: Wallet) =>
+    isInAppWallet(w) || isEcosystemWallet(w);
+  const isSmartWalletWithAdmin =
+    isSmartWallet(options.wallet) &&
+    options.connectedWallets.some(
+      (w) =>
+        isInAppOrEcosystem(w) &&
+        w.getAccount()?.address?.toLowerCase() ===
+          options.wallet.getAdminAccount?.()?.address?.toLowerCase(),
+    );
+  return isInAppOrEcosystem(options.wallet) || isSmartWalletWithAdmin;
+}