@b3dotfun/sdk 0.1.69-alpha.8 → 0.1.69-test.0

package/src/global-account/react/components/Send/Send.tsx

@@ -9,6 +9,7 @@ import {
   useSimBalance,
   useUnifiedChainSwitchAndExecute,
 } from "@b3dotfun/sdk/global-account/react";
+import { validateImageUrl } from "@b3dotfun/sdk/global-account/react/utils/profileDisplay";
 import { formatDisplayNumber, formatTokenAmount } from "@b3dotfun/sdk/shared/utils/number";
 import invariant from "invariant";
 import { CircleHelp, Clock, Loader2, Send as SendIcon, Wallet } from "lucide-react";
@@ -32,6 +33,7 @@ type SendStep = "recipient" | "token" | "amount" | "confirm" | "success";
 // Component for displaying a recent address with profile data
 function RecentAddressItem({ address, onClick }: { address: string; onClick: () => void }) {
   const { data: profileData } = useProfile({ address });
+  const validatedAvatar = validateImageUrl(profileData?.avatar);
 
   return (
     <button
@@ -39,8 +41,8 @@ function RecentAddressItem({ address, onClick }: { address: string; onClick: ()
       className="flex items-center gap-2 rounded-xl px-3 py-2 transition-colors hover:bg-[#fafafa]"
     >
       {/* Avatar */}
-      {profileData?.avatar ? (
-        <img src={profileData.avatar} alt={profileData.name || address} className="h-10 w-10 rounded-full" />
+      {validatedAvatar ? (
+        <img src={validatedAvatar} alt={profileData?.name || address} className="h-10 w-10 rounded-full" />
       ) : (
         <div className="flex h-10 w-10 items-center justify-center rounded-full border border-[#e4e4e7] bg-[#f4f4f5]">
           <Wallet className="h-5 w-5 text-[#a0a0ab]" />
@@ -84,6 +86,7 @@ export function Send({ recipientAddress: initialRecipient, onSuccess }: SendModa
   const { data: validatedProfileData } = useProfile({
     address: showValidatedResult && recipientAddress && isAddress(recipientAddress) ? recipientAddress : undefined,
   });
+  const validatedRecipientAvatar = validateImageUrl(validatedProfileData?.avatar);
 
   // Address validation
   const handleRecipientAddressChange = (value: string) => {
@@ -290,10 +293,10 @@ export function Send({ recipientAddress: initialRecipient, onSuccess }: SendModa
                   className="dark:bg-b3-background dark:border-b3-line flex items-center gap-2 rounded-xl bg-[#f4f4f5] px-3 py-2 transition-colors hover:bg-[#e4e4e7]"
                 >
                   {/* Avatar */}
-                  {validatedProfileData?.avatar ? (
+                  {validatedRecipientAvatar ? (
                     <img
-                      src={validatedProfileData.avatar}
-                      alt={validatedProfileData.name || recipientAddress}
+                      src={validatedRecipientAvatar}
+                      alt={validatedProfileData?.name || recipientAddress}
                       className="h-10 w-10 rounded-full"
                     />
                   ) : (

package/src/global-account/react/components/SignInWithB3/BetterAuthResetPassword.tsx

@@ -0,0 +1,146 @@
+import { Button, Input } from "@b3dotfun/sdk/global-account/react";
+import { debugB3React } from "@b3dotfun/sdk/shared/utils/debug";
+import { useState } from "react";
+import { useBetterAuth } from "../../hooks/useBetterAuth";
+
+const debug = debugB3React("BetterAuthResetPassword");
+
+export interface BetterAuthResetPasswordProps {
+  /** The reset token from the URL query param */
+  token: string;
+  /** Called after password is successfully reset */
+  onSuccess?: () => void;
+  /** Called on error */
+  onError?: (error: Error) => void;
+  /** Optional class name */
+  className?: string;
+}
+
+/**
+ * Standalone reset password form. Render this on your reset password page.
+ * Reads the token from props (extract it from the URL query string).
+ *
+ * Usage:
+ * ```tsx
+ * const token = new URLSearchParams(window.location.search).get("token");
+ * <BetterAuthResetPassword token={token} onSuccess={() => navigate("/login")} />
+ * ```
+ */
+export function BetterAuthResetPassword({ token, onSuccess, onError, className }: BetterAuthResetPasswordProps) {
+  const { resetPassword } = useBetterAuth();
+
+  const [password, setPassword] = useState("");
+  const [confirmPassword, setConfirmPassword] = useState("");
+  const [isLoading, setIsLoading] = useState(false);
+  const [error, setError] = useState<string | null>(null);
+  const [success, setSuccess] = useState(false);
+
+  const handleSubmit = async () => {
+    if (!password) {
+      setError("Please enter a new password");
+      return;
+    }
+
+    if (password.length < 8) {
+      setError("Password must be at least 8 characters");
+      return;
+    }
+
+    if (password !== confirmPassword) {
+      setError("Passwords do not match");
+      return;
+    }
+
+    try {
+      setIsLoading(true);
+      setError(null);
+      await resetPassword(password, token);
+      setSuccess(true);
+      debug("Password reset successful");
+      onSuccess?.();
+    } catch (err) {
+      const message = err instanceof Error ? err.message : "Password reset failed";
+      setError(message);
+      debug("Password reset failed", err);
+      onError?.(err as Error);
+    } finally {
+      setPassword("");
+      setConfirmPassword("");
+      setIsLoading(false);
+    }
+  };
+
+  if (!token) {
+    return (
+      <div className={`w-full max-w-[400px] px-6 text-center ${className || ""}`}>
+        <p className="text-sm text-red-500">Invalid or missing reset token.</p>
+      </div>
+    );
+  }
+
+  return (
+    <div className={`w-full max-w-[400px] px-6 ${className || ""}`}>
+      <div className="mb-10 text-center">
+        <h1 className="text-[28px] font-semibold tracking-tight text-gray-900 dark:text-gray-100">
+          {success ? "Password reset" : "Set new password"}
+        </h1>
+        <p className="mt-3 text-[15px] text-gray-500 dark:text-gray-400">
+          {success ? "Your password has been updated." : "Enter your new password below."}
+        </p>
+      </div>
+
+      {success ? (
+        <div className="space-y-4 text-center">
+          <div className="mx-auto flex h-12 w-12 items-center justify-center rounded-full bg-green-100">
+            <svg className="h-6 w-6 text-green-600" fill="none" viewBox="0 0 24 24" stroke="currentColor">
+              <path strokeLinecap="round" strokeLinejoin="round" strokeWidth={2} d="M5 13l4 4L19 7" />
+            </svg>
+          </div>
+        </div>
+      ) : (
+        <div className="space-y-5">
+          <div>
+            <label className="mb-2 block text-xs font-medium uppercase tracking-wide text-gray-700 dark:text-gray-300">
+              New password
+            </label>
+            <Input
+              type="password"
+              placeholder="At least 8 characters"
+              value={password}
+              onChange={e => setPassword(e.target.value)}
+              disabled={isLoading}
+              className="h-11 px-4 text-[15px]"
+            />
+          </div>
+
+          <div>
+            <label className="mb-2 block text-xs font-medium uppercase tracking-wide text-gray-700 dark:text-gray-300">
+              Confirm password
+            </label>
+            <Input
+              type="password"
+              placeholder="Repeat your password"
+              value={confirmPassword}
+              onChange={e => setConfirmPassword(e.target.value)}
+              disabled={isLoading}
+              onKeyDown={e => {
+                if (e.key === "Enter") handleSubmit();
+              }}
+              className="h-11 px-4 text-[15px]"
+            />
+          </div>
+
+          {error && <p className="text-sm text-red-500">{error}</p>}
+
+          <Button
+            onClick={handleSubmit}
+            disabled={isLoading}
+            className="h-11 w-full bg-gray-900 text-[15px] font-medium text-white hover:bg-gray-800 dark:bg-white dark:text-gray-900 dark:hover:bg-gray-100"
+          >
+            {isLoading ? "Resetting..." : "Reset password"}
+          </Button>
+        </div>
+      )}
+    </div>
+  );
+}

package/src/global-account/react/components/SignInWithB3/BetterAuthSignIn.tsx

@@ -0,0 +1,426 @@
+import { Button, Input, useAuthStore } from "@b3dotfun/sdk/global-account/react";
+import { debugB3React } from "@b3dotfun/sdk/shared/utils/debug";
+import { useState } from "react";
+import {
+  EmailVerificationRequiredError,
+  type BetterAuthSocialProvider,
+  useBetterAuth,
+} from "../../hooks/useBetterAuth";
+import { strategyIcons, strategyLabels } from "./utils/signInUtils";
+
+const debug = debugB3React("BetterAuthSignIn");
+const EMAIL_REGEX = /^[^\s@]+@[^\s@]+\.[^\s@]+$/;
+
+type SocialProviderConfig = { id: BetterAuthSocialProvider; label: string };
+
+const DEFAULT_SOCIAL_PROVIDERS: SocialProviderConfig[] = [
+  { id: "google", label: "Google" },
+  { id: "github", label: "GitHub" },
+  { id: "discord", label: "Discord" },
+  { id: "microsoft", label: "Microsoft" },
+  { id: "slack", label: "Slack" },
+];
+
+export interface BetterAuthSignInProps {
+  /** Title displayed above the form. Default: "Welcome back" for sign-in, "Create an account" for sign-up */
+  title?: string;
+  /** Subtitle displayed below the title */
+  subtitle?: string;
+  /** Which social providers to show. Defaults to all. Pass empty array to hide. */
+  socialProviders?: BetterAuthSocialProvider[];
+  /** Show email/password form. Default: true */
+  showEmail?: boolean;
+  /** URL to redirect to after password reset link is clicked. Token is appended as ?token=... */
+  passwordResetRedirectTo?: string;
+  /** Called after successful authentication */
+  onSuccess?: () => void;
+  /** Called on authentication error */
+  onError?: (error: Error) => void;
+  /** Optional class name for the root container */
+  className?: string;
+}
+
+/**
+ * Standalone inline sign-in component for Better Auth.
+ *
+ * Renders directly — no modal, no button wrapper. Designed for full-page
+ * sign-in layouts (e.g., B3OS web with branding on the left, form on the right).
+ *
+ * Usage:
+ * ```tsx
+ * <BetterAuthSignIn
+ *   socialProviders={["google", "github"]}
+ *   onSuccess={() => router.push("/dashboard")}
+ * />
+ * ```
+ */
+export function BetterAuthSignIn({
+  title,
+  subtitle = "Enter your credentials to access your account",
+  socialProviders = DEFAULT_SOCIAL_PROVIDERS.map(p => p.id),
+  showEmail = true,
+  passwordResetRedirectTo,
+  onSuccess,
+  onError,
+  className,
+}: BetterAuthSignInProps) {
+  const { signInWithEmail, signUpWithEmail, signInWithSocial, requestPasswordReset } = useBetterAuth();
+  const isAuthenticated = useAuthStore(state => state.isAuthenticated);
+
+  const [mode, setMode] = useState<"sign-in" | "sign-up" | "forgot-password">("sign-in");
+  const [email, setEmail] = useState("");
+  const [password, setPassword] = useState("");
+  const [name, setName] = useState("");
+  const [isLoading, setIsLoading] = useState(false);
+  const [loadingProvider, setLoadingProvider] = useState<string | null>(null);
+  const [error, setError] = useState<string | null>(null);
+  const [resetEmailSent, setResetEmailSent] = useState(false);
+  const [verificationSent, setVerificationSent] = useState(false);
+
+  const resolvedTitle =
+    title ||
+    (mode === "forgot-password" ? "Reset password" : mode === "sign-in" ? "Welcome back" : "Create an account");
+
+  const resolvedSubtitle =
+    mode === "forgot-password"
+      ? "Enter your email and we'll send you a reset link"
+      : subtitle || "Enter your credentials to access your account";
+
+  const handleForgotPassword = async () => {
+    const normalizedEmail = email.trim().toLowerCase();
+
+    if (!EMAIL_REGEX.test(normalizedEmail)) {
+      setError("Please enter a valid email address");
+      return;
+    }
+
+    try {
+      setIsLoading(true);
+      setError(null);
+      await requestPasswordReset(normalizedEmail, passwordResetRedirectTo);
+      setResetEmailSent(true);
+    } catch (err) {
+      const message = err instanceof Error ? err.message : "Failed to send reset email";
+      setError(message);
+    } finally {
+      setIsLoading(false);
+    }
+  };
+
+  const providers: SocialProviderConfig[] = socialProviders
+    .map(id => DEFAULT_SOCIAL_PROVIDERS.find(p => p.id === id))
+    .filter((p): p is SocialProviderConfig => !!p);
+
+  if (isAuthenticated) {
+    return null;
+  }
+
+  const handleEmailSubmit = async () => {
+    const normalizedEmail = email.trim().toLowerCase();
+
+    if (!EMAIL_REGEX.test(normalizedEmail)) {
+      setError("Please enter a valid email address");
+      return;
+    }
+
+    if (!password) {
+      setError("Please enter a password");
+      return;
+    }
+
+    if (mode === "sign-up" && !name.trim()) {
+      setError("Please enter your name");
+      return;
+    }
+
+    try {
+      setIsLoading(true);
+      setError(null);
+
+      if (mode === "sign-up") {
+        await signUpWithEmail(normalizedEmail, password, name.trim());
+      } else {
+        await signInWithEmail(normalizedEmail, password);
+      }
+
+      debug("Auth successful");
+      onSuccess?.();
+    } catch (err) {
+      if (err instanceof EmailVerificationRequiredError) {
+        setVerificationSent(true);
+        setError(null);
+      } else {
+        const message = err instanceof Error ? err.message : "Authentication failed";
+        setError(message);
+        onError?.(err as Error);
+      }
+      debug("Auth failed", err);
+    } finally {
+      setPassword("");
+      setIsLoading(false);
+    }
+  };
+
+  const handleSocialSignIn = async (provider: BetterAuthSocialProvider) => {
+    try {
+      setIsLoading(true);
+      setLoadingProvider(provider);
+      setError(null);
+      await signInWithSocial(provider);
+    } catch (err) {
+      const message = err instanceof Error ? err.message : `Sign in failed`;
+      setError(message);
+      onError?.(err as Error);
+      setIsLoading(false);
+      setLoadingProvider(null);
+    }
+  };
+
+  if (verificationSent) {
+    return (
+      <div className={`w-full max-w-[400px] px-6 ${className || ""}`}>
+        <div className="flex flex-col items-center gap-6 text-center">
+          <div className="flex h-14 w-14 shrink-0 items-center justify-center rounded-full bg-green-100">
+            <svg
+              className="h-7 w-7 shrink-0 text-green-600"
+              fill="none"
+              viewBox="0 0 24 24"
+              stroke="currentColor"
+              width={28}
+              height={28}
+            >
+              <path
+                strokeLinecap="round"
+                strokeLinejoin="round"
+                strokeWidth={2}
+                d="M3 8l7.89 5.26a2 2 0 002.22 0L21 8M5 19h14a2 2 0 002-2V7a2 2 0 00-2-2H5a2 2 0 00-2 2v10a2 2 0 002 2z"
+              />
+            </svg>
+          </div>
+          <h2 className="text-[22px] font-semibold text-gray-900 dark:text-gray-100">Check your email</h2>
+          <p className="text-[15px] text-gray-500 dark:text-gray-400">
+            We sent a verification link to <span className="font-medium text-gray-700 dark:text-gray-200">{email}</span>
+            . Click the link to verify your account, then come back and sign in.
+          </p>
+          <button
+            onClick={() => {
+              setVerificationSent(false);
+              setMode("sign-in");
+              setPassword("");
+            }}
+            className="text-[14px] font-medium text-blue-600 hover:text-blue-500 dark:text-blue-400"
+          >
+            Back to sign in
+          </button>
+        </div>
+      </div>
+    );
+  }
+
+  return (
+    <div className={`w-full max-w-[400px] px-6 ${className || ""}`}>
+      {/* Header */}
+      <div className="mb-10 text-center">
+        <h1 className="text-[28px] font-semibold tracking-tight text-gray-900 dark:text-gray-100">{resolvedTitle}</h1>
+        <p className="mt-3 text-[15px] text-gray-500 dark:text-gray-400">{resolvedSubtitle}</p>
+      </div>
+
+      {/* Forgot password view */}
+      {mode === "forgot-password" && (
+        <div className="space-y-5">
+          {resetEmailSent ? (
+            <div className="space-y-4 text-center">
+              <div className="mx-auto flex h-12 w-12 items-center justify-center rounded-full bg-green-100">
+                <svg className="h-6 w-6 text-green-600" fill="none" viewBox="0 0 24 24" stroke="currentColor">
+                  <path strokeLinecap="round" strokeLinejoin="round" strokeWidth={2} d="M5 13l4 4L19 7" />
+                </svg>
+              </div>
+              <p className="text-[15px] text-gray-600 dark:text-gray-300">Check your email for a reset link.</p>
+            </div>
+          ) : (
+            <>
+              <div>
+                <label className="mb-2 block text-xs font-medium uppercase tracking-wide text-gray-700 dark:text-gray-300">
+                  Email
+                </label>
+                <Input
+                  type="email"
+                  placeholder="name@company.com"
+                  value={email}
+                  onChange={e => setEmail(e.target.value)}
+                  disabled={isLoading}
+                  onKeyDown={e => {
+                    if (e.key === "Enter") handleForgotPassword();
+                  }}
+                  className="h-11 px-4 text-[15px]"
+                />
+              </div>
+
+              {error && <p className="text-sm text-red-500">{error}</p>}
+
+              <Button
+                onClick={handleForgotPassword}
+                disabled={isLoading}
+                className="h-11 w-full bg-gray-900 text-[15px] font-medium text-white hover:bg-gray-800 dark:bg-white dark:text-gray-900 dark:hover:bg-gray-100"
+              >
+                {isLoading ? "Sending..." : "Send reset link"}
+              </Button>
+            </>
+          )}
+
+          <p className="mt-8 text-center text-[14px] text-gray-500 dark:text-gray-400">
+            <button
+              onClick={() => {
+                setMode("sign-in");
+                setError(null);
+                setResetEmailSent(false);
+              }}
+              className="font-medium text-blue-600 hover:text-blue-500 dark:text-blue-400"
+            >
+              Back to sign in
+            </button>
+          </p>
+        </div>
+      )}
+
+      {/* Email/Password form */}
+      {showEmail && mode !== "forgot-password" && (
+        <div className="space-y-5">
+          {mode === "sign-up" && (
+            <div>
+              <label className="mb-2 block text-xs font-medium uppercase tracking-wide text-gray-700 dark:text-gray-300">
+                Name
+              </label>
+              <Input
+                type="text"
+                placeholder="Your name"
+                value={name}
+                onChange={e => setName(e.target.value)}
+                disabled={isLoading}
+                className="h-11 px-4 text-[15px]"
+              />
+            </div>
+          )}
+
+          <div>
+            <label className="mb-2 block text-xs font-medium uppercase tracking-wide text-gray-700 dark:text-gray-300">
+              Email
+            </label>
+            <Input
+              type="email"
+              placeholder="name@company.com"
+              value={email}
+              onChange={e => setEmail(e.target.value)}
+              disabled={isLoading}
+              className="h-11 px-4 text-[15px]"
+            />
+          </div>
+
+          <div>
+            <div className="mb-2 flex items-center justify-between">
+              <label className="block text-xs font-medium uppercase tracking-wide text-gray-700 dark:text-gray-300">
+                Password
+              </label>
+              {mode === "sign-in" && (
+                <button
+                  type="button"
+                  onClick={() => {
+                    setMode("forgot-password");
+                    setError(null);
+                  }}
+                  className="text-xs font-medium text-blue-600 hover:text-blue-500 dark:text-blue-400"
+                >
+                  Forgot password?
+                </button>
+              )}
+            </div>
+            <Input
+              type="password"
+              placeholder="Password"
+              value={password}
+              onChange={e => setPassword(e.target.value)}
+              disabled={isLoading}
+              onKeyDown={e => {
+                if (e.key === "Enter") handleEmailSubmit();
+              }}
+              className="h-11 px-4 text-[15px]"
+            />
+          </div>
+
+          {error && <p className="text-sm text-red-500">{error}</p>}
+
+          <Button
+            onClick={handleEmailSubmit}
+            disabled={isLoading}
+            className="h-11 w-full bg-gray-900 text-[15px] font-medium text-white hover:bg-gray-800 dark:bg-white dark:text-gray-900 dark:hover:bg-gray-100"
+          >
+            {isLoading ? "Loading..." : mode === "sign-in" ? "Sign in" : "Sign up"}
+          </Button>
+        </div>
+      )}
+
+      {/* Social providers */}
+      {providers.length > 0 && mode !== "forgot-password" && (
+        <>
+          {showEmail && (
+            <div className="my-8 flex items-center gap-4">
+              <div className="h-px flex-1 bg-gray-200 dark:bg-gray-700" />
+              <span className="text-xs text-gray-400">Or continue with</span>
+              <div className="h-px flex-1 bg-gray-200 dark:bg-gray-700" />
+            </div>
+          )}
+
+          <div className="space-y-4">
+            {providers.map(provider => {
+              const icon = strategyIcons[provider.id];
+              const label = strategyLabels[provider.id] || provider.label;
+
+              const isProviderLoading = loadingProvider === provider.id;
+
+              return (
+                <button
+                  key={provider.id}
+                  onClick={() => handleSocialSignIn(provider.id)}
+                  disabled={isLoading}
+                  style={{ paddingTop: "12px", paddingBottom: "12px" }}
+                  className="flex w-full items-center justify-center gap-3 rounded-lg border border-gray-200 bg-white px-4 text-[14px] font-medium text-gray-700 transition-colors hover:bg-gray-50 disabled:opacity-50 dark:border-gray-700 dark:bg-gray-800 dark:text-gray-200 dark:hover:bg-gray-700"
+                >
+                  {isProviderLoading ? (
+                    <svg className="h-5 w-5 animate-spin text-gray-400" viewBox="0 0 24 24" fill="none">
+                      <circle className="opacity-25" cx="12" cy="12" r="10" stroke="currentColor" strokeWidth="4" />
+                      <path
+                        className="opacity-75"
+                        fill="currentColor"
+                        d="M4 12a8 8 0 018-8V0C5.373 0 0 5.373 0 12h4z"
+                      />
+                    </svg>
+                  ) : (
+                    icon && <img src={icon} alt="" className="h-5 w-5" />
+                  )}
+                  <span>{isProviderLoading ? "Redirecting..." : label}</span>
+                </button>
+              );
+            })}
+          </div>
+        </>
+      )}
+
+      {/* Toggle sign-in / sign-up */}
+      {showEmail && mode !== "forgot-password" && (
+        <p className="mt-8 text-center text-[14px] text-gray-500 dark:text-gray-400">
+          {mode === "sign-in" ? "Don't have an account? " : "Already have an account? "}
+          <button
+            onClick={() => {
+              setMode(mode === "sign-in" ? "sign-up" : "sign-in");
+              setError(null);
+            }}
+            disabled={isLoading}
+            className="font-medium text-blue-600 hover:text-blue-500 dark:text-blue-400"
+          >
+            {mode === "sign-in" ? "Sign up" : "Sign in"}
+          </button>
+        </p>
+      )}
+    </div>
+  );
+}

package/src/global-account/react/components/SignInWithB3/SignInWithB3Flow.tsx

@@ -7,6 +7,7 @@ import {
   useGetAllTWSigners,
   useModalStore,
 } from "@b3dotfun/sdk/global-account/react";
+import { LoginStepBetterAuth } from "./steps/LoginStepBetterAuth";
 import { debugB3React } from "@b3dotfun/sdk/shared/utils/debug";
 import { useCallback, useEffect, useRef, useState } from "react";
 import { useActiveAccount } from "thirdweb/react";
@@ -34,7 +35,7 @@ export function SignInWithB3Flow({
   source = "signInWithB3Button",
   signersEnabled = false,
 }: SignInWithB3ModalProps) {
-  const { automaticallySetFirstEoa } = useB3Config();
+  const { automaticallySetFirstEoa, authStrategy } = useB3Config();
   // skipAutoConnect: this component intentionally logs out on mount to show a fresh login screen.
   // AuthenticationProvider is the sole owner of useAutoConnect to avoid competing auth cycles.
   const { user, logout } = useAuthentication(partnerId, { skipAutoConnect: true });
@@ -42,10 +43,13 @@ export function SignInWithB3Flow({
   // Tracks whether the pre-login logout has finished.
   // We must not render ConnectEmbed until logout (wallet disconnect) completes,
   // otherwise the wallet state disrupts ConnectEmbed causing a blank modal.
-  const [readyToShowLogin, setReadyToShowLogin] = useState(source === "requestPermissions");
+  const [readyToShowLogin, setReadyToShowLogin] = useState(
+    source === "requestPermissions" || authStrategy === "better-auth",
+  );
   const hasLoggedOutRef = useRef(false);
   useEffect(() => {
     if (hasLoggedOutRef.current) return;
+    if (authStrategy === "better-auth") return;
     if (source !== "requestPermissions") {
       debug("Logging out before login");
       hasLoggedOutRef.current = true;
@@ -53,7 +57,7 @@ export function SignInWithB3Flow({
         setReadyToShowLogin(true);
       });
     }
-  }, [source, logout]);
+  }, [source, logout, authStrategy]);
 
   const [step, setStep] = useState<"login" | "permissions" | null>(source === "requestPermissions" ? null : "login");
   const [sessionKeyAdded, setSessionKeyAdded] = useState(source === "requestPermissions" ? true : false);
@@ -284,7 +288,12 @@ export function SignInWithB3Flow({
   } else if (step === "login") {
     // Show loading spinner while: authenticating, waiting for pre-login logout to finish,
     // or fetching signers.
-    if (!readyToShowLogin || isAuthenticating || isFetchingSigners) {
+    if (authStrategy === "better-auth") {
+      // Better Auth manages its own loading/verification states internally.
+      // Don't gate on isAuthenticating — it would unmount the component
+      // and lose verification state when setIsAuthenticating(false) fires.
+      content = <LoginStepBetterAuth onSuccess={() => handleLoginSuccess({} as Account)} onError={onError} />;
+    } else if (!readyToShowLogin || isAuthenticating || isFetchingSigners) {
       content = (
         <LoginStepContainer partnerId={partnerId}>
           <div className="my-8 flex min-h-[350px] items-center justify-center">