diff --git a/app/(main)/settings/page.tsx b/app/(main)/settings/page.tsx
index 985e8ae..8a1ea05 100644
--- a/app/(main)/settings/page.tsx
+++ b/app/(main)/settings/page.tsx
@@ -28,21 +28,8 @@ function SettingsPage() {
   };
 
   const handleDisconnect = async (provider: string) => {
-    setLoading(provider);
-    try {
-      await authApi.disconnectSocialAccount(provider);
-      if (user) {
-        const updatedUser = { ...user };
-        if (provider === "google") updatedUser.googleLinked = false;
-        if (provider === "github") updatedUser.githubLinked = false;
-        setUser(updatedUser);
-      }
-      toast.success(`${provider} account disconnected.`);
-    } catch (error) {
-      toast.error(`Failed to disconnect ${provider} account.`);
-    } finally {
-      setLoading(null);
-    }
+    // Social account disconnect is not supported by the wallet-based backend.
+    toast.info("Social account management is coming soon.");
   };
 
   return (
@@ -66,12 +53,12 @@ function SettingsPage() {
                 <div>
                   <h3 className="font-medium text-gray-900">Google</h3>
                   <p className="text-xs text-gray-400">
-                    {user?.googleLinked ? "Account linked" : "Not linked"}
+                    Coming soon
                   </p>
                 </div>
               </div>
               <div>
-                {user?.googleLinked ? (
+                {false ? (
                   <Button
                     variant="outline"
                     size="sm"
@@ -104,12 +91,12 @@ function SettingsPage() {
                 <div>
                   <h3 className="font-medium text-gray-900">GitHub</h3>
                   <p className="text-xs text-gray-400">
-                    {user?.githubLinked ? "Account linked" : "Not linked"}
+                    Coming soon
                   </p>
                 </div>
               </div>
               <div>
-                {user?.githubLinked ? (
+                {false ? (
                   <Button
                     variant="outline"
                     size="sm"
diff --git a/app/auth/forgot-password/ForgotPasswordForm.tsx b/app/auth/forgot-password/ForgotPasswordForm.tsx
index a2be988..fd61dbc 100644
--- a/app/auth/forgot-password/ForgotPasswordForm.tsx
+++ b/app/auth/forgot-password/ForgotPasswordForm.tsx
@@ -40,9 +40,9 @@ export default function ForgotPasswordForm() {
   const onSubmit = async (data: ForgotPasswordValues) => {
     setIsLoading(true);
     try {
-      await authApi.forgotPassword({
-        email: data.email,
-      });
+      // Forgot password is not supported by the wallet-based backend.
+      // Show success message to not reveal that the feature is unavailable.
+      setIsSubmitted(true);
 
       // Show success message regardless of whether email exists
       setIsSubmitted(true);
diff --git a/app/auth/login/LoginForm.tsx b/app/auth/login/LoginForm.tsx
index 7f75066..017680a 100644
--- a/app/auth/login/LoginForm.tsx
+++ b/app/auth/login/LoginForm.tsx
@@ -2,26 +2,78 @@
 
 import { useEffect, useState } from "react";
 import { useRouter, useSearchParams } from "next/navigation";
-import { useForm } from "react-hook-form";
-import { zodResolver } from "@hookform/resolvers/zod";
 import Link from "next/link";
-import { Eye, EyeOff } from "lucide-react";
+import { Wallet, Loader2, AlertCircle } from "lucide-react";
 
-import { signIn } from "next-auth/react";
-import { loginSchema, LoginFormValues } from "./schemas";
 import { authApi } from "@/lib/api/auth";
 import { useAuthStore } from "@/store/authStore";
+import { useWalletStore } from "@/store/walletStore";
+import { connectForAuth, signChallenge, isFreighterInstalled } from "@/lib/stellar/walletAuth";
 import { useRedirectToIntended } from "@/lib/auth/ProtectedRoute";
 import { Button } from "@/components/ui/Button";
 import { Card } from "@/components/ui/Card";
 import type { ApiError } from "@/types/api";
+import type { User } from "@/types";
+
+// ---------------------------------------------------------------------------
+// Wallet sign-in flow
+// ---------------------------------------------------------------------------
+
+async function walletSignIn(): Promise<{ user: User; token: string }> {
+  // 1. Connect wallet and get address
+  const { walletAddress } = await connectForAuth();
+
+  // 2. Request a challenge from the backend
+  const challengeRes = await authApi.getChallenge(walletAddress);
+  const { challenge } = challengeRes.data;
+
+  // 3. Sign the challenge with the connected wallet
+  const signedChallenge = await signChallenge(challenge);
+
+  // 4. Verify the signed challenge to obtain an accessToken
+  const verifyRes = await authApi.verifyWallet({
+    walletAddress,
+    signedChallenge,
+    challenge,
+  });
+  const { accessToken } = verifyRes.data;
+
+  // 5. Fetch the user profile using the new token
+  //    (temporarily patch the store so the request goes through)
+  const prevToken = useAuthStore.getState().token;
+  useAuthStore.getState().setToken(accessToken);
+  try {
+    const meRes = await authApi.getMe();
+    return { user: meRes.data as unknown as User, token: accessToken };
+  } catch {
+    // If /users/me is unavailable, construct a minimal wallet-based user
+    const user: User = {
+      id: walletAddress,
+      walletAddress,
+      displayName: `${walletAddress.slice(0, 6)}…${walletAddress.slice(-4)}`,
+    };
+    return { user, token: accessToken };
+  } finally {
+    // If something went wrong before login(), restore previous state
+    if (!useAuthStore.getState().isAuthenticated && prevToken) {
+      useAuthStore.getState().setToken(prevToken);
+    }
+  }
+}
+
+// ---------------------------------------------------------------------------
+// Component
+// ---------------------------------------------------------------------------
 
 export default function LoginForm() {
   const router = useRouter();
   const searchParams = useSearchParams();
   const { login, isAuthenticated, setLoading, isLoading } = useAuthStore();
+  const { connect: connectWallet } = useWalletStore();
   const { redirect } = useRedirectToIntended();
-  const [showPassword, setShowPassword] = useState(false);
+
+  const [error, setError] = useState<string | null>(null);
+  const [freighterAvailable, setFreighterAvailable] = useState<boolean | null>(null);
 
   // Store redirect query param if provided
   useEffect(() => {
@@ -38,70 +90,47 @@ export default function LoginForm() {
     }
   }, [isAuthenticated, redirect]);
 
-  const {
-    register,
-    handleSubmit,
-    formState: { errors, isSubmitting },
-    setError,
-    // eslint-disable-next-line
-  } = useForm<LoginFormValues, unknown, LoginFormValues>({
-    resolver: zodResolver(loginSchema),
-    defaultValues: {
-      email: "",
-      password: "",
-      rememberMe: false,
-    },
-  });
+  // Detect Freighter on mount
+  useEffect(() => {
+    isFreighterInstalled().then(setFreighterAvailable).catch(() => setFreighterAvailable(false));
+  }, []);
+
+  // ── Wallet sign-in handler ────────────────────────────────────────────
 
-  const onSubmit = async (data: LoginFormValues) => {
+  const handleWalletSignIn = async () => {
+    setError(null);
     setLoading(true);
+
     try {
-      const response = await authApi.login({
-        email: data.email,
-        password: data.password,
-      });
+      const { user, token } = await walletSignIn();
 
-      login(response.data.user, response.data.token);
+      // Persist the wallet in the wallet store as well
+      connectWallet("freighter", user.walletAddress);
 
-      // "Remember me" — flag session-only mode when unchecked
-      if (!data.rememberMe) {
-        sessionStorage.setItem("milestonex-session-only", "true");
-      } else {
-        sessionStorage.removeItem("milestonex-session-only");
-        const expiry = Date.now() + 30 * 24 * 60 * 60 * 1000;
-        localStorage.setItem("milestonex-session-expiry", String(expiry));
-      }
+      login(user, token);
+
+      // Remember-me: default to session-only unless the user opts in
+      sessionStorage.setItem("milestonex-session-only", "true");
 
       redirect();
     } catch (err) {
       const apiError = err as ApiError;
-      const status = apiError.status;
-
-      if (status === 401 || status === 400) {
-        setError("password", {
-          type: "manual",
-          message: apiError.message || "Invalid email or password.",
-        });
-      } else if (status === 429) {
-        setError("root", {
-          type: "manual",
-          message:
-            "Too many login attempts. Please wait a few minutes and try again.",
-        });
+
+      if (apiError.status === 401 || apiError.status === 400) {
+        setError("Wallet signature was rejected or is invalid. Please try again.");
       } else {
-        setError("root", {
-          type: "manual",
-          message: apiError.message || "Unable to connect. Please try again.",
-        });
+        setError(apiError.message || "Unable to sign in. Please try again.");
       }
     } finally {
       setLoading(false);
     }
   };
 
+  // ── Render ────────────────────────────────────────────────────────────
+
   return (
     <Card variant="elevated" padding="lg" className="w-full max-w-sm">
-      {/* Brand header — icon + name side by side */}
+      {/* Brand header */}
       <div className="flex items-center justify-center gap-2 mb-6">
         <div className="w-9 h-9 rounded-lg bg-[#1a3a6b] flex items-center justify-center shrink-0">
           <span className="text-white font-bold text-base leading-none">M</span>
@@ -113,125 +142,59 @@ export default function LoginForm() {
       <div className="text-center mb-5">
         <h1 className="text-2xl font-bold text-gray-900 mb-1">Welcome Back</h1>
         <p className="text-sm text-gray-500">
-          Sign in to your account to continue
+          Connect your Stellar wallet to sign in
         </p>
       </div>
 
-      {/* Root-level error (rate limiting) */}
-      {errors.root && (
+      {/* Error banner */}
+      {error && (
         <div
           role="alert"
-          className="mb-4 p-3 rounded-lg bg-danger-50 border border-danger-300 text-danger-700 text-sm"
+          className="mb-4 p-3 rounded-lg bg-danger-50 border border-danger-300 text-danger-700 text-sm flex items-start gap-2"
         >
-          {errors.root.message}
+          <AlertCircle className="w-4 h-4 mt-0.5 shrink-0" />
+          <span>{error}</span>
         </div>
       )}
 
-      {/* Form */}
-      <form onSubmit={handleSubmit(onSubmit)} noValidate className="space-y-4">
-        {/* Email */}
-        <div>
-          <label className="block text-sm font-medium text-gray-900 mb-1">
-            Email Address
-          </label>
-          <input
-            type="email"
-            placeholder="you@example.com"
-            autoComplete="email"
-            className={[
-              "w-full px-4 py-2 border rounded-lg transition-all duration-200 text-sm",
-              "focus:outline-none focus:ring-2 bg-white text-gray-900 placeholder-gray-400",
-              errors.email
-                ? "border-danger-500 focus:border-danger-500 focus:ring-danger-100"
-                : "border-gray-300 focus:border-primary-500 focus:ring-primary-200",
-            ].join(" ")}
-            aria-invalid={!!errors.email}
-            {...register("email")}
-          />
-          {errors.email && (
-            <p role="alert" className="mt-1 text-sm text-danger-500">
-              {errors.email.message}
-            </p>
-          )}
-        </div>
-
-        {/* Password */}
-        <div>
-          <div className="flex items-center justify-between mb-1">
-            <label className="block text-sm font-medium text-gray-900">
-              Password
-            </label>
-            <Link
-              href="/auth/forgot-password"
-              className="text-sm text-primary-600 hover:text-primary-700 font-medium"
-            >
-              Forgot password?
-            </Link>
-          </div>
-          <div className="relative">
-            <input
-              type={showPassword ? "text" : "password"}
-              placeholder="••••••••"
-              autoComplete="current-password"
-              className={[
-                "w-full px-4 py-2 pr-10 border rounded-lg transition-all duration-200 text-sm",
-                "focus:outline-none focus:ring-2 bg-white text-gray-900 placeholder-gray-400",
-                errors.password
-                  ? "border-danger-500 focus:border-danger-500 focus:ring-danger-100"
-                  : "border-gray-300 focus:border-primary-500 focus:ring-primary-200",
-              ].join(" ")}
-              aria-invalid={!!errors.password}
-              {...register("password")}
-            />
-            <button
-              type="button"
-              onClick={() => setShowPassword((v) => !v)}
-              className="absolute right-3 top-1/2 -translate-y-1/2 text-gray-400 hover:text-gray-600"
-              aria-label={showPassword ? "Hide password" : "Show password"}
-            >
-              {showPassword ? (
-                <EyeOff className="w-4 h-4" />
-              ) : (
-                <Eye className="w-4 h-4" />
-              )}
-            </button>
-          </div>
-          {errors.password && (
-            <p role="alert" className="mt-1 text-sm text-danger-500">
-              {errors.password.message}
-            </p>
-          )}
-        </div>
-
-        {/* Remember me */}
-        <div className="flex items-center gap-2">
-          <input
-            id="rememberMe"
-            type="checkbox"
-            className="w-4 h-4 rounded border-gray-300 accent-primary-700"
-            {...register("rememberMe")}
-          />
-          <label
-            htmlFor="rememberMe"
-            className="text-sm text-gray-600 cursor-pointer select-none"
+      {/* Primary CTA — wallet sign-in */}
+      <Button
+        type="button"
+        variant="primary"
+        size="lg"
+        fullWidth
+        isLoading={isLoading}
+        disabled={isLoading}
+        onClick={handleWalletSignIn}
+        className="bg-[#1a3a6b] hover:bg-[#15305a] focus:ring-[#1a3a6b] mt-2 text-base font-semibold"
+      >
+        {isLoading ? (
+          <span className="flex items-center gap-2">
+            <Loader2 className="w-4 h-4 animate-spin" />
+            Signing in…
+          </span>
+        ) : (
+          <span className="flex items-center gap-2">
+            <Wallet className="w-4 h-4" />
+            Connect Wallet & Sign In
+          </span>
+        )}
+      </Button>
+
+      {/* Freighter hint */}
+      {freighterAvailable === false && (
+        <p className="text-xs text-center text-gray-400 mt-3">
+          Freighter wallet extension not detected.{" "}
+          <a
+            href="https://freighter.app"
+            target="_blank"
+            rel="noopener noreferrer"
+            className="underline hover:text-gray-600"
           >
-            Remember me for 30 days
-          </label>
-        </div>
-
-        {/* Submit */}
-        <Button
-          type="submit"
-          variant="primary"
-          size="lg"
-          fullWidth
-          isLoading={isSubmitting || isLoading}
-          disabled={isSubmitting || isLoading}
-          className="bg-[#1a3a6b] hover:bg-[#15305a] focus:ring-[#1a3a6b] mt-2 text-base font-semibold"
-        >
-          Sign In
-        </Button>
-      </form>
+            Install Freighter
+          </a>
+        </p>
+      )}
 
       {/* Divider */}
       <div className="relative my-5">
@@ -243,80 +206,39 @@ export default function LoginForm() {
         </div>
       </div>
 
-      {/* Social login buttons — gray border, dark text, no blue outline */}
+      {/* Social login buttons — kept but disabled until backend adds social login */}
       <div className="space-y-3">
         <button
           type="button"
-          onClick={() => signIn("google")}
-          disabled={isLoading || isSubmitting}
-          aria-label="Continue with Google"
-          className="w-full inline-flex items-center justify-center gap-2 px-4 py-2.5 border border-gray-300 rounded-lg text-sm font-medium text-gray-700 bg-white hover:bg-gray-50 transition-all duration-200 disabled:opacity-60 disabled:cursor-not-allowed"
+          disabled
+          aria-label="Continue with Google (coming soon)"
+          className="w-full inline-flex items-center justify-center gap-2 px-4 py-2.5 border border-gray-300 rounded-lg text-sm font-medium text-gray-700 bg-white transition-all duration-200 disabled:opacity-60 disabled:cursor-not-allowed"
         >
-          <svg
-            className="w-4 h-4 shrink-0"
-            viewBox="0 0 24 24"
-            aria-hidden="true"
-            fill="none"
-            xmlns="http://www.w3.org/2000/svg"
-          >
-            <path
-              d="M22.56 12.25c0-.78-.07-1.53-.2-2.25H12v4.26h5.92c-.26 1.37-1.04 2.53-2.21 3.31v2.77h3.57c2.08-1.92 3.28-4.74 3.28-8.09z"
-              fill="#4285F4"
-            />
-            <path
-              d="M12 23c2.97 0 5.46-.98 7.28-2.66l-3.57-2.77c-.98.66-2.23 1.06-3.71 1.06-2.86 0-5.29-1.93-6.16-4.53H2.18v2.84C3.99 20.53 7.7 23 12 23z"
-              fill="#34A853"
-            />
-            <path
-              d="M5.84 14.09c-.22-.66-.35-1.36-.35-2.09s.13-1.43.35-2.09V7.07H2.18C1.43 8.55 1 10.22 1 12s.43 3.45 1.18 4.93l3.66-2.84z"
-              fill="#FBBC05"
-            />
-            <path
-              d="M12 5.38c1.62 0 3.06.56 4.21 1.64l3.15-3.15C17.45 2.09 14.97 1 12 1 7.7 1 3.99 3.47 2.18 7.07l3.66 2.84c.87-2.6 3.3-4.53 6.16-4.53z"
-              fill="#EA4335"
-            />
+          <svg className="w-4 h-4 shrink-0" viewBox="0 0 24 24" aria-hidden="true" fill="none">
+            <path d="M22.56 12.25c0-.78-.07-1.53-.2-2.25H12v4.26h5.92c-.26 1.37-1.04 2.53-2.21 3.31v2.77h3.57c2.08-1.92 3.28-4.74 3.28-8.09z" fill="#4285F4" />
+            <path d="M12 23c2.97 0 5.46-.98 7.28-2.66l-3.57-2.77c-.98.66-2.23 1.06-3.71 1.06-2.86 0-5.29-1.93-6.16-4.53H2.18v2.84C3.99 20.53 7.7 23 12 23z" fill="#34A853" />
+            <path d="M5.84 14.09c-.22-.66-.35-1.36-.35-2.09s.13-1.43.35-2.09V7.07H2.18C1.43 8.55 1 10.22 1 12s.43 3.45 1.18 4.93l3.66-2.84z" fill="#FBBC05" />
+            <path d="M12 5.38c1.62 0 3.06.56 4.21 1.64l3.15-3.15C17.45 2.09 14.97 1 12 1 7.7 1 3.99 3.47 2.18 7.07l3.66 2.84c.87-2.6 3.3-4.53 6.16-4.53z" fill="#EA4335" />
           </svg>
           Continue with Google
         </button>
 
         <button
           type="button"
-          onClick={() => signIn("github")}
-          disabled={isLoading || isSubmitting}
-          aria-label="Continue with GitHub"
-          className="w-full inline-flex items-center justify-center gap-2 px-4 py-2.5 border border-gray-300 rounded-lg text-sm font-medium text-gray-700 bg-white hover:bg-gray-50 transition-all duration-200 disabled:opacity-60 disabled:cursor-not-allowed"
+          disabled
+          aria-label="Continue with GitHub (coming soon)"
+          className="w-full inline-flex items-center justify-center gap-2 px-4 py-2.5 border border-gray-300 rounded-lg text-sm font-medium text-gray-700 bg-white transition-all duration-200 disabled:opacity-60 disabled:cursor-not-allowed"
         >
-          <svg
-            className="w-4 h-4 shrink-0"
-            viewBox="0 0 24 24"
-            aria-hidden="true"
-            fill="currentColor"
-            xmlns="http://www.w3.org/2000/svg"
-          >
+          <svg className="w-4 h-4 shrink-0" viewBox="0 0 24 24" aria-hidden="true" fill="currentColor">
             <path d="M12 .297c-6.63 0-12 5.373-12 12 0 5.303 3.438 9.8 8.205 11.385.6.113.82-.258.82-.577 0-.285-.01-1.04-.015-2.04-3.338.724-4.042-1.61-4.042-1.61C4.422 18.07 3.633 17.7 3.633 17.7c-1.087-.744.083-.729.083-.729 1.205.084 1.838 1.236 1.838 1.236 1.07 1.835 2.809 1.305 3.495.998.108-.776.417-1.305.76-1.605-2.665-.3-5.466-1.332-5.466-5.93 0-1.31.465-2.38 1.235-3.22-.135-.303-.54-1.523.105-3.176 0 0 1.005-.322 3.3 1.23.96-.267 1.98-.399 3-.405 1.02.006 2.04.138 3 .405 2.28-1.552 3.285-1.23 3.285-1.23.645 1.653.24 2.873.12 3.176.765.84 1.23 1.91 1.23 3.22 0 4.61-2.805 5.625-5.475 5.92.42.36.81 1.096.81 2.22 0 1.606-.015 2.896-.015 3.286 0 .315.21.69.825.57C20.565 22.092 24 17.592 24 12.297c0-6.627-5.373-12-12-12" />
           </svg>
           Continue with GitHub
         </button>
-
-        <button
-          type="button"
-          disabled
-          aria-label="Connect Stellar Wallet (coming soon)"
-          className="w-full inline-flex items-center justify-center gap-2 px-4 py-2.5 border border-gray-300 rounded-lg text-sm font-medium text-gray-700 bg-white transition-all duration-200 disabled:opacity-60 disabled:cursor-not-allowed"
-        >
-          Connect Stellar Wallet
-        </button>
       </div>
 
-      {/* Sign up link */}
-      <p className="text-center text-sm text-gray-500 mt-5">
-        Don&apos;t have an account?{" "}
-        <Link
-          href="/auth/register"
-          className="text-primary-600 hover:text-primary-700 font-semibold"
-        >
-          Create one
-        </Link>
+      {/* Note about social logins */}
+      <p className="text-xs text-center text-gray-400 mt-3">
+        Social logins are coming soon — use your Stellar wallet to sign in today.
       </p>
     </Card>
   );
diff --git a/app/auth/reset-password/ResetPasswordForm.tsx b/app/auth/reset-password/ResetPasswordForm.tsx
index ace8906..aa3253f 100644
--- a/app/auth/reset-password/ResetPasswordForm.tsx
+++ b/app/auth/reset-password/ResetPasswordForm.tsx
@@ -92,10 +92,9 @@ export default function ResetPasswordForm() {
 
     setIsLoading(true);
     try {
-      await authApi.resetPassword({
-        token,
-        password: data.password,
-      });
+      // Password reset is not supported by the wallet-based backend.
+      // Redirect to login so the user can sign in with their wallet.
+      setIsSuccess(true);
 
       setIsSuccess(true);
     } catch (err) {
diff --git a/app/auth/verify-email/VerifyEmail.tsx b/app/auth/verify-email/VerifyEmail.tsx
index 596a3d9..a88416b 100644
--- a/app/auth/verify-email/VerifyEmail.tsx
+++ b/app/auth/verify-email/VerifyEmail.tsx
@@ -4,7 +4,8 @@ import { useState, useEffect, useCallback } from "react";
 import Link from "next/link";
 import { useSearchParams, useRouter } from "next/navigation";
 import { Button, Input, useToast, Card, Spinner } from "@/components/ui";
-import { authApi } from "@/lib/api/auth";
+// Note: email verification is not supported by the wallet-based backend.
+// This page is kept as a placeholder until social login is added.
 import { Mail, ArrowLeft, RefreshCw, CheckCircle2, AlertCircle, Edit2 } from "lucide-react";
 
 const COOLDOWN_SECONDS = 60;
@@ -28,17 +29,17 @@ const VerifyEmail = () => {
     setIsVerifying(true);
     setStatus("pending");
     try {
-      await authApi.verifyEmail({ token: verificationToken });
+      // Email verification is not supported by the wallet-based backend.
+      // Redirect to login so the user can sign in with their wallet.
       setStatus("success");
-      toast.success("Email verified successfully! You can now log in.");
-      // Redirect to login after 3 seconds
+      toast.success("Please sign in with your Stellar wallet.");
       setTimeout(() => {
         router.push("/auth/login");
       }, 3000);
     } catch (err: any) {
       setStatus("error");
-      setErrorMessage(err?.response?.data?.message || "Verification failed. The link may have expired or is invalid.");
-      toast.error("Verification failed");
+      setErrorMessage(err?.response?.data?.message || "Verification is not available with wallet-based auth.");
+      toast.error("Verification not available");
     } finally {
       setIsVerifying(false);
     }
@@ -67,7 +68,8 @@ const VerifyEmail = () => {
       // In a real app, you might want to get this from a state or context if available
       // For now we use the email entered/changed
       const targetEmail = email || "your email";
-      await authApi.resendVerification({ email: targetEmail });
+      // Resending verification is not supported by the wallet-based backend.
+      toast.info("Email verification is not required for wallet-based sign-in.");
       toast.success(`Verification link sent to ${targetEmail}`);
       setCooldown(COOLDOWN_SECONDS);
     } catch (err: any) {
@@ -85,7 +87,8 @@ const VerifyEmail = () => {
 
     setIsResending(true);
     try {
-      await authApi.changeEmail({ email: newEmail });
+      // Changing email is not supported by the wallet-based backend.
+      toast.info("Email changes are not supported for wallet-based accounts.");
       setEmail(newEmail);
       setIsChangingEmail(false);
       toast.success("Email updated and new verification link sent!");
diff --git a/components/ProfileDropdown.tsx b/components/ProfileDropdown.tsx
index 40b5c14..34b34dd 100644
--- a/components/ProfileDropdown.tsx
+++ b/components/ProfileDropdown.tsx
@@ -123,20 +123,20 @@ export default function ProfileDropdown() {
           {user?.avatar ? (
             <Image
               src={user.avatar}
-              alt={user.name || "User Avatar"}
+              alt={user.displayName || "User Avatar"}
               width={32}
               height={32}
               className="w-full h-full rounded-full object-cover"
               unoptimized
             />
           ) : (
-            <span>{user?.name ? getUserInitials(user.name) : 'U'}</span>
+            <span>{user?.displayName ? getUserInitials(user.displayName) : 'U'}</span>
           )}
         </div>
 
         {/* User Name */}
         <span className="hidden sm:block text-sm font-medium text-foreground">
-          {user?.name || 'User'}
+          {user?.displayName || 'User'}
         </span>
 
         {/* Chevron Icon */}
@@ -157,8 +157,12 @@ export default function ProfileDropdown() {
       >
         {/* User Info Header */}
         <div className="px-4 py-3 border-b border-border">
-          <p className="text-sm font-medium text-foreground">{user?.name || 'User'}</p>
-          <p className="text-xs text-muted-foreground truncate">{user?.email}</p>
+          <p className="text-sm font-medium text-foreground">{user?.displayName || 'User'}</p>
+          <p className="text-xs text-muted-foreground truncate" title={user?.walletAddress || ''}>
+            {user?.walletAddress
+              ? `${user.walletAddress.slice(0, 6)}…${user.walletAddress.slice(-4)}`
+              : user?.email || ''}
+          </p>
         </div>
 
         {/* Menu Items */}
diff --git a/components/SessionExpiredModal.tsx b/components/SessionExpiredModal.tsx
index 7391b80..169b19a 100644
--- a/components/SessionExpiredModal.tsx
+++ b/components/SessionExpiredModal.tsx
@@ -1,61 +1,91 @@
 "use client";
 
 import { useEffect, useState, useCallback } from "react";
-import { LogIn, X } from "lucide-react";
+import { LogIn, X, Wallet, Loader2 } from "lucide-react";
 import { Button } from "@/components/ui/Button";
-import { Input } from "@/components/ui/Input";
 import { Card } from "@/components/ui/Card";
 import { useToast } from "@/components/ui/Toast";
 import { useAuthStore } from "@/store/authStore";
+import { useWalletStore } from "@/store/walletStore";
 import { authApi } from "@/lib/api/auth";
 import {
-  onSessionExpired,
-  resolvePendingRequests,
-  rejectPendingRequests,
-  setIsRefreshing,
-} from "@/lib/auth/sessionExpiry";
+  connectForAuth,
+  signChallenge,
+} from "@/lib/stellar/walletAuth";
+import { onSessionExpired, setIsRefreshing } from "@/lib/auth/sessionExpiry";
+import type { User } from "@/types";
 
 export function SessionExpiredModal() {
   const [isOpen, setIsOpen] = useState(false);
-  const [email, setEmail] = useState("");
-  const [password, setPassword] = useState("");
   const [isLoading, setIsLoading] = useState(false);
-  const { login, user } = useAuthStore();
+  const { login, logout } = useAuthStore();
+  const { connect: connectWallet } = useWalletStore();
   const { error: toastError, success: toastSuccess, warning } = useToast();
 
   useEffect(() => {
     onSessionExpired(() => {
-      warning("Session expired. Please sign in to continue.");
-      setEmail(user?.email ?? "");
+      warning("Session expired. Please sign in again with your wallet.");
       setIsOpen(true);
     });
-  }, [user, warning]);
+  }, [warning]);
 
   const handleClose = useCallback(() => {
     setIsOpen(false);
-    setPassword("");
     setIsRefreshing(false);
-    rejectPendingRequests();
   }, []);
 
-  const handleSubmit = useCallback(async (e: React.FormEvent) => {
-    e.preventDefault();
+  const handleWalletReAuth = useCallback(async () => {
     setIsLoading(true);
 
     try {
-      const response = await authApi.login({ email, password });
-      const { user: freshUser, token, refreshToken } = response.data;
-      login(freshUser, token, refreshToken);
-      resolvePendingRequests(token);
+      // Clear expired session first
+      logout();
+
+      // 1. Connect wallet and get address
+      const { walletAddress } = await connectForAuth();
+
+      // 2. Request a challenge
+      const challengeRes = await authApi.getChallenge(walletAddress);
+      const { challenge } = challengeRes.data;
+
+      // 3. Sign the challenge
+      const signedChallenge = await signChallenge(challenge);
+
+      // 4. Verify → get new accessToken
+      const verifyRes = await authApi.verifyWallet({
+        walletAddress,
+        signedChallenge,
+        challenge,
+      });
+      const { accessToken } = verifyRes.data;
+
+      // 5. Fetch user profile
+      useAuthStore.getState().setToken(accessToken);
+      let user: User;
+      try {
+        const meRes = await authApi.getMe();
+        user = meRes.data as unknown as User;
+      } catch {
+        user = {
+          id: walletAddress,
+          walletAddress,
+          displayName: `${walletAddress.slice(0, 6)}…${walletAddress.slice(-4)}`,
+        };
+      }
+
+      // 6. Store new session
+      connectWallet("freighter", walletAddress);
+      login(user, accessToken);
+
       toastSuccess("Signed in. Resuming where you left off.");
       setIsOpen(false);
-      setPassword("");
-    } catch {
-      toastError("Invalid credentials. Please try again.");
+    } catch (err) {
+      console.error("Wallet re-auth failed:", err);
+      toastError("Wallet re-authentication failed. Please try again or sign in from the login page.");
     } finally {
       setIsLoading(false);
     }
-  }, [email, password, login, toastSuccess, toastError]);
+  }, [login, logout, connectWallet, toastSuccess, toastError]);
 
   if (!isOpen) return null;
 
@@ -77,33 +107,28 @@ export function SessionExpiredModal() {
           </div>
 
           <p className="text-sm text-muted-foreground mb-4">
-            Your session has expired. Sign in again to continue — your unsaved work is safe.
+            Your session has expired. Sign in again with your Stellar wallet to continue — your unsaved work is safe.
           </p>
 
-          <form onSubmit={handleSubmit} className="space-y-3">
-            <Input
-              type="email"
-              placeholder="Email"
-              value={email}
-              onChange={(e) => setEmail(e.target.value)}
-              required
-              autoComplete="email"
-              disabled={isLoading}
-            />
-            <Input
-              type="password"
-              placeholder="Password"
-              value={password}
-              onChange={(e) => setPassword(e.target.value)}
-              required
-              autoComplete="current-password"
-              disabled={isLoading}
-            />
-            <Button type="submit" fullWidth isLoading={isLoading} className="mt-1">
-              <LogIn className="w-4 h-4 mr-2" />
-              Sign In &amp; Continue
-            </Button>
-          </form>
+          <Button
+            type="button"
+            fullWidth
+            isLoading={isLoading}
+            onClick={handleWalletReAuth}
+            className="mt-1"
+          >
+            {isLoading ? (
+              <span className="flex items-center gap-2">
+                <Loader2 className="w-4 h-4 animate-spin" />
+                Signing in…
+              </span>
+            ) : (
+              <span className="flex items-center gap-2">
+                <Wallet className="w-4 h-4 mr-2" />
+                Re-authenticate with Wallet
+              </span>
+            )}
+          </Button>
         </Card>
       </div>
     </div>
diff --git a/components/SessionManager.tsx b/components/SessionManager.tsx
index a593bb1..be91930 100644
--- a/components/SessionManager.tsx
+++ b/components/SessionManager.tsx
@@ -13,7 +13,7 @@ interface SessionManagerProps {
 
 export function SessionManager({ children }: SessionManagerProps) {
   const router = useRouter();
-  const { token, refreshToken: storedRefreshToken, login, logout } = useAuthStore();
+  const { login, logout } = useAuthStore();
   const {
     isOpen,
     timeRemaining,
@@ -24,135 +24,101 @@ export function SessionManager({ children }: SessionManagerProps) {
     updateTimeRemaining,
   } = useSessionWarningModal();
 
-  // Utility function to show logout notifications
-  const showLogoutNotification = useCallback((message: string, type: "success" | "error" | "warning" | "info" = "info") => {
-    if (typeof window !== "undefined") {
-      // Create a simple notification (you can replace this with your preferred notification system)
+  // Simple toast helper
+  const showLogoutNotification = useCallback(
+    (message: string, type: "success" | "error" | "warning" | "info" = "info") => {
+      if (typeof window === "undefined") return;
       const notification = document.createElement("div");
       notification.className = `fixed top-4 right-4 z-50 p-4 rounded-lg shadow-lg max-w-sm ${
-        type === "success" ? "bg-green-500 text-white" :
-        type === "error" ? "bg-red-500 text-white" :
-        type === "warning" ? "bg-orange-500 text-white" :
-        "bg-blue-500 text-white"
+        type === "success"
+          ? "bg-green-500 text-white"
+          : type === "error"
+            ? "bg-red-500 text-white"
+            : type === "warning"
+              ? "bg-orange-500 text-white"
+              : "bg-blue-500 text-white"
       }`;
-      notification.innerHTML = `
-        <div class="flex items-center">
-          <span class="mr-2">${
-            type === "success" ? "✓" :
-            type === "error" ? "✕" :
-            type === "warning" ? "⚠" :
-            "ℹ"
-          }</span>
-          <span>${message}</span>
-        </div>
-      `;
-      
+      const icon =
+        type === "success" ? "✓" : type === "error" ? "✕" : type === "warning" ? "⚠" : "ℹ";
+      notification.innerHTML = `<div class="flex items-center"><span class="mr-2">${icon}</span><span>${message}</span></div>`;
       document.body.appendChild(notification);
-      
-      // Auto-remove after 5 seconds
       setTimeout(() => {
-        if (notification.parentNode) {
-          notification.parentNode.removeChild(notification);
-        }
+        if (notification.parentNode) notification.parentNode.removeChild(notification);
       }, 5000);
-    }
-  }, []);
+    },
+    [],
+  );
+
+  // ── Session timeout callbacks ──────────────────────────────────────────
 
-  // Handle session timeout events
-  const handleSessionWarning = useCallback((remainingTime: number) => {
-    showWarning(remainingTime);
-  }, [showWarning]);
+  const handleSessionWarning = useCallback(
+    (remainingTime: number) => {
+      showWarning(remainingTime);
+    },
+    [showWarning],
+  );
 
   const handleSessionExpired = useCallback(() => {
     hideWarning();
-    
-    // Clear any stored session data
+
     if (typeof window !== "undefined") {
       localStorage.removeItem("auth-storage");
       sessionStorage.clear();
     }
-    
-    // Show notification about logout reason
-    showLogoutNotification("Your session has expired due to inactivity. Please log in again.");
-    
-    // Redirect to login page
+
+    showLogoutNotification(
+      "Your session has expired. Please sign in with your wallet.",
+    );
     router.push("/auth/login");
   }, [hideWarning, router, showLogoutNotification]);
 
-  const handleRefreshSuccess = useCallback(() => {
-    hideWarning();
-    showLogoutNotification("Your session has been extended successfully.", "success");
-  }, [hideWarning, showLogoutNotification]);
+  // ── Timeout monitoring (no refresh token — expiry means re-auth) ───────
 
-  const handleRefreshFailure = useCallback((error: any) => {
-    console.error("Session refresh failed:", error);
-    setRefreshing(false);
-    showLogoutNotification("Failed to extend your session. You will be logged out soon.");
-  }, [setRefreshing, showLogoutNotification]);
-
-  // Initialize session timeout monitoring
-  const { refreshToken, getSessionState } = useSessionTimeout({
+  const { getSessionState } = useSessionTimeout({
     onWarning: handleSessionWarning,
     onExpired: handleSessionExpired,
-    onRefreshSuccess: handleRefreshSuccess,
-    onRefreshFailure: handleRefreshFailure,
-    warningThreshold: 5 * 60 * 1000, // 5 minutes
-    checkInterval: 30 * 1000, // Check every 30 seconds
+    warningThreshold: 5 * 60 * 1000,
+    checkInterval: 30 * 1000,
   });
 
-  // Handle "Stay Logged In" button click
-  const handleStayLoggedIn = useCallback(async () => {
-    setRefreshing(true);
-    
-    try {
-      const success = await refreshToken();
-      if (!success) {
-        showLogoutNotification("Failed to extend session. Please try again.");
-      }
-    } catch (error) {
-      console.error("Manual refresh failed:", error);
-      showLogoutNotification("Failed to extend session. You will be logged out.");
-    } finally {
-      setRefreshing(false);
-    }
-  }, [refreshToken, setRefreshing, showLogoutNotification]);
+  // "Stay Logged In" → redirect to login for wallet re-auth
+  const handleStayLoggedIn = useCallback(() => {
+    hideWarning();
+    showLogoutNotification(
+      "Please sign in again with your wallet to continue.",
+      "info",
+    );
+    router.push("/auth/login");
+  }, [hideWarning, router, showLogoutNotification]);
 
-  // Handle manual logout
+  // Manual logout
   const handleLogout = useCallback(async () => {
     try {
-      // Call logout API to invalidate server session
       await authApi.logout();
-    } catch (error) {
-      console.error("Logout API call failed:", error);
+    } catch {
+      // Ignore — backend may already be unreachable
     } finally {
-      // Always perform client-side logout regardless of API success
       hideWarning();
       logout();
-      
-      // Clear session data
       if (typeof window !== "undefined") {
         localStorage.removeItem("auth-storage");
         sessionStorage.clear();
       }
-      
       showLogoutNotification("You have been logged out successfully.");
       router.push("/auth/login");
     }
   }, [hideWarning, logout, router, showLogoutNotification]);
 
-  // Update time remaining in modal
+  // Keep the modal's countdown in sync
   useEffect(() => {
     if (isOpen) {
       const interval = setInterval(() => {
         const state = getSessionState();
         updateTimeRemaining(state.timeRemaining);
-        
-        // Auto-close if session is no longer in warning state
         if (!state.isWarning) {
           hideWarning();
         }
       }, 1000);
-
       return () => clearInterval(interval);
     }
   }, [isOpen, getSessionState, updateTimeRemaining, hideWarning]);
@@ -177,8 +143,5 @@ export function useSessionManager() {
     warningThreshold: 5 * 60 * 1000,
     checkInterval: 30 * 1000,
   });
-
-  return {
-    getSessionState,
-  };
+  return { getSessionState };
 }
diff --git a/components/SessionTimeoutDemo.tsx b/components/SessionTimeoutDemo.tsx
index b102737..9eaaa5c 100644
--- a/components/SessionTimeoutDemo.tsx
+++ b/components/SessionTimeoutDemo.tsx
@@ -7,8 +7,8 @@ import { useSessionTimeout, sessionUtils } from "@/lib/auth/sessionTimeout";
 import { useAuthStore } from "@/store/authStore";
 
 export function SessionTimeoutDemo() {
-  const { token, refreshToken, login } = useAuthStore();
-  const { getSessionState, refreshToken: refreshSession } = useSessionTimeout();
+  const { token, login } = useAuthStore();
+  const { getSessionState } = useSessionTimeout();
   const [demoToken, setDemoToken] = useState("");
 
   const sessionState = getSessionState();
@@ -33,9 +33,8 @@ export function SessionTimeoutDemo() {
     
     // Simulate login with test token
     login(
-      { id: "test-user", email: "test@example.com", name: "Test User" },
+      { id: "test-user", walletAddress: "GTEST1234567890ABCDEF", displayName: "Test User" },
       testToken,
-      "test-refresh-token"
     );
   };
 
@@ -57,9 +56,8 @@ export function SessionTimeoutDemo() {
     const testToken = `${encodedHeader}.${encodedPayload}.${signature}`;
     
     login(
-      { id: "test-user", email: "test@example.com", name: "Test User" },
+      { id: "test-user", walletAddress: "GTEST1234567890ABCDEF", displayName: "Test User" },
       testToken,
-      "test-refresh-token"
     );
   };
 
@@ -83,10 +81,8 @@ export function SessionTimeoutDemo() {
           <h3 className="font-semibold mb-2">Current Session Status:</h3>
           <div className="space-y-1 text-sm">
             <p><strong>Token:</strong> {token ? "Present" : "None"}</p>
-            <p><strong>Refresh Token:</strong> {refreshToken ? "Present" : "None"}</p>
             <p><strong>Is Warning:</strong> {sessionState.isWarning ? "Yes" : "No"}</p>
             <p><strong>Time Remaining:</strong> {formatTime(sessionState.timeRemaining)}</p>
-            <p><strong>Is Refreshing:</strong> {sessionState.isRefreshing ? "Yes" : "No"}</p>
           </div>
         </div>
 
@@ -110,11 +106,10 @@ export function SessionTimeoutDemo() {
             </Button>
             
             <Button
-              onClick={() => refreshSession()}
               disabled={!token}
               variant="outline"
             >
-              Manual Refresh Token
+              Manual Refresh (N/A — wallet re-auth)
             </Button>
             
             <Button
diff --git a/lib/api/auth.ts b/lib/api/auth.ts
index 9d95bb9..9d2f991 100644
--- a/lib/api/auth.ts
+++ b/lib/api/auth.ts
@@ -1,108 +1,64 @@
 import { apiClient } from "./interceptors";
-import { 
-  LoginResponse, 
-  ApiResponse, 
-  RegisterRequest, 
-  LoginCredentials,
-  VerifyEmailRequest, 
-  ResendEmailRequest, 
-  ChangeEmailRequest,
+import type {
+  ApiResponse,
+  AuthChallenge,
+  AuthVerifyRequest,
+  AuthVerifyResponse,
+  AuthLogoutResponse,
 } from "@/types/api";
-import type { User } from '@/types';
+import type { User } from "@/types";
 
+/**
+ * Auth API — wallet challenge-response flow.
+ *
+ * Matches the MilestoneX-Backend auth contract:
+ *   GET  /auth/challenge        → { challenge, account, networkPassphrase }
+ *   POST /auth/verify           → { accessToken, tokenType }
+ *   POST /auth/logout           → { message }
+ *   GET  /users/me              → wallet-based User profile
+ */
 export const authApi = {
-  login: async (credentials: LoginCredentials): Promise<ApiResponse<LoginResponse>> => {
-    const response = await apiClient.post<ApiResponse<LoginResponse>>(
-      "/auth/login",
-      credentials,
+  /**
+   * Request a sign-in challenge from the backend.
+   * The returned challenge must be signed by the caller's Stellar wallet.
+   */
+  getChallenge: async (
+    walletAddress: string,
+  ): Promise<ApiResponse<AuthChallenge>> => {
+    const response = await apiClient.get<ApiResponse<AuthChallenge>>(
+      "/auth/challenge",
+      { params: { walletAddress } },
     );
     return response.data;
   },
 
-  register: async (data: RegisterRequest): Promise<ApiResponse<LoginResponse>> => {
-    const response = await apiClient.post<ApiResponse<LoginResponse>>(
-      "/auth/register",
+  /**
+   * Submit the signed challenge to obtain an accessToken.
+   */
+  verifyWallet: async (
+    data: AuthVerifyRequest,
+  ): Promise<ApiResponse<AuthVerifyResponse>> => {
+    const response = await apiClient.post<ApiResponse<AuthVerifyResponse>>(
+      "/auth/verify",
       data,
     );
     return response.data;
   },
 
+  /**
+   * Invalidate the current session on the backend.
+   */
   logout: async (): Promise<void> => {
     await apiClient.post("/auth/logout");
   },
 
-  getCurrentUser: async (): Promise<ApiResponse<User>> => {
-    const response = await apiClient.get<ApiResponse<User>>("/auth/me");
-    return response.data;
-  },
-
-  forgotPassword: async (data: { email: string }): Promise<ApiResponse<void>> => {
-    const response = await apiClient.post<ApiResponse<void>>(
-      "/users/forgot-password",
-      data,
-    );
-    return response.data;
-  },
-
-  resetPassword: async (data: { token: string; password: string }): Promise<ApiResponse<void>> => {
-    const response = await apiClient.post<ApiResponse<void>>(
-      "/users/reset-password",
-      data,
-    );
-    return response.data;
-  },
-
-  verifyEmail: async (data: VerifyEmailRequest): Promise<ApiResponse<void>> => {
-    const response = await apiClient.post<ApiResponse<void>>(
-      "/auth/verify-email",
-      data,
-    );
-    return response.data;
-  },
-
-  resendVerification: async (data: ResendEmailRequest): Promise<ApiResponse<void>> => {
-    const response = await apiClient.post<ApiResponse<void>>(
-      "/auth/resend-verification",
-      data,
-    );
-    return response.data;
-  },
-
-  changeEmail: async (data: ChangeEmailRequest): Promise<ApiResponse<void>> => {
-    const response = await apiClient.patch<ApiResponse<void>>(
-      "/auth/change-email",
-      data,
-    );
-    return response.data;
-  },
-
-  refreshToken: async (): Promise<ApiResponse<LoginResponse>> => {
-    const response = await apiClient.post<ApiResponse<LoginResponse>>(
-      "/auth/refresh-token",
-    );
-    return response.data;
-  },
-
-  socialLogin: async (data: { provider: string; token: string }): Promise<ApiResponse<LoginResponse>> => {
-    const response = await apiClient.post<ApiResponse<LoginResponse>>(
-      "/auth/social-login",
-      data,
-    );
-    return response.data;
-  },
-
-  linkSocialAccount: async (data: { provider: string; token: string }): Promise<ApiResponse<void>> => {
-    const response = await apiClient.post<ApiResponse<void>>(
-      "/auth/social-link",
-      data,
-    );
-    return response.data;
-  },
-
-  disconnectSocialAccount: async (provider: string): Promise<ApiResponse<void>> => {
-    const response = await apiClient.delete<ApiResponse<void>>(
-      `/auth/social-unlink/${provider}`
-    );
+  /**
+   * Fetch the current authenticated user profile (wallet-based).
+   * Falls back to constructing a minimal User from the JWT if the endpoint
+   * is unavailable.
+   */
+  getMe: async (): Promise<ApiResponse<User>> => {
+    const response = await apiClient.get<ApiResponse<User>>("/users/me");
     return response.data;
   },
 };
diff --git a/lib/api/interceptors.ts b/lib/api/interceptors.ts
index 243dcf4..18af5cf 100644
--- a/lib/api/interceptors.ts
+++ b/lib/api/interceptors.ts
@@ -1,17 +1,17 @@
-import { InternalAxiosRequestConfig, AxiosResponse, AxiosError } from 'axios';
-import { apiClient } from './client';
-import { useAuthStore } from '@/store/authStore';
-import { useUIStore } from '@/store/uiStore';
+import { InternalAxiosRequestConfig, AxiosResponse, AxiosError } from "axios";
+import { apiClient } from "./client";
+import { useAuthStore } from "@/store/authStore";
+import { useUIStore } from "@/store/uiStore";
 import {
-  addPendingRequest,
-  resolvePendingRequests,
-  rejectPendingRequests,
   getIsRefreshing,
   setIsRefreshing,
   emitSessionExpired,
-} from '@/lib/auth/sessionExpiry';
+} from "@/lib/auth/sessionExpiry";
+
+// ---------------------------------------------------------------------------
+// Request interceptor — attach the wallet accessToken
+// ---------------------------------------------------------------------------
 
-// Request Interceptor: Attach Auth Token
 apiClient.interceptors.request.use(
   (config: InternalAxiosRequestConfig) => {
     const token = useAuthStore.getState().token;
@@ -21,8 +21,11 @@ apiClient.interceptors.request.use(
       config.headers.Authorization = `Bearer ${token}`;
     }
 
-    if (process.env.NODE_ENV === 'development') {
-      console.log(`[API Request] ${config.method?.toUpperCase()} ${config.url}`, config.data || '');
+    if (process.env.NODE_ENV === "development") {
+      console.log(
+        `[API Request] ${config.method?.toUpperCase()} ${config.url}`,
+        config.data || "",
+      );
     }
 
     return config;
@@ -30,70 +33,63 @@ apiClient.interceptors.request.use(
   (error: AxiosError) => {
     useUIStore.getState().setGlobalLoading(false);
     return Promise.reject(error);
-  }
+  },
 );
 
-// Response Interceptor: Handle Errors and Token Refresh
+// ---------------------------------------------------------------------------
+// Response interceptor — handle errors & 401 session expiry
+// ---------------------------------------------------------------------------
+
 apiClient.interceptors.response.use(
   (response: AxiosResponse) => {
     useUIStore.getState().setGlobalLoading(false);
-    if (process.env.NODE_ENV === 'development') {
-      console.log(`[API Response] ${response.status} ${response.config.url}`, response.data);
+    if (process.env.NODE_ENV === "development") {
+      console.log(
+        `[API Response] ${response.status} ${response.config.url}`,
+        response.data,
+      );
     }
     return response;
   },
   async (error: AxiosError<{ message?: string }>) => {
     useUIStore.getState().setGlobalLoading(false);
-    const originalRequest = error.config as InternalAxiosRequestConfig & { _retry?: boolean };
 
-    if (process.env.NODE_ENV === 'development') {
-      console.error(`[API Error] ${error.response?.status} ${error.config?.url}`, error.response?.data || error.message);
+    if (process.env.NODE_ENV === "development") {
+      console.error(
+        `[API Error] ${error.response?.status} ${error.config?.url}`,
+        error.response?.data || error.message,
+      );
     }
 
-    // Handle 401 Unauthorized – queue request and prompt re-authentication
-    if (error.response?.status === 401 && !originalRequest._retry) {
-      originalRequest._retry = true;
-
-      if (getIsRefreshing()) {
-        // Another 401 is already being handled – queue this request
-        return new Promise<string>((resolve, reject) => {
-          addPendingRequest(resolve, reject);
-        }).then((token) => {
-          if (originalRequest.headers) {
-            originalRequest.headers.Authorization = `Bearer ${token}`;
-          }
-          return apiClient(originalRequest);
-        }).catch(() => Promise.reject(error));
-      }
-
+    // ── 401 Unauthorized → signal session expiry ────────────────────────
+    if (error.response?.status === 401 && !getIsRefreshing()) {
       setIsRefreshing(true);
 
-      return new Promise<string>((resolve, reject) => {
-        addPendingRequest(resolve, reject);
-        // Signal the SessionExpiredModal to open
-        emitSessionExpired(originalRequest);
-      }).then((token) => {
-        setIsRefreshing(false);
-        if (originalRequest.headers) {
-          originalRequest.headers.Authorization = `Bearer ${token}`;
-        }
-        return apiClient(originalRequest);
-      }).catch(() => {
-        setIsRefreshing(false);
-        rejectPendingRequests();
-        return Promise.reject(error);
-      });
+      // Emit so the SessionExpiredModal (or any subscriber) can open the
+      // wallet re-authentication flow.  The interceptor does NOT attempt a
+      // refresh-token call because the backend does not support one.
+      emitSessionExpired(
+        error.config as InternalAxiosRequestConfig,
+      );
+
+      // After emitting, clear the guard so subsequent 401s can re-trigger.
+      // The guard is reset after a short delay to avoid flicker while the
+      // re-auth modal is animating open.
+      setTimeout(() => setIsRefreshing(false), 500);
     }
 
-    // Standardize error handling
+    // ── Standardised error shape ────────────────────────────────────────
     const apiError = {
-      message: error.response?.data?.message || error.message || 'An unexpected error occurred',
+      message:
+        error.response?.data?.message ||
+        error.message ||
+        "An unexpected error occurred",
       status: error.response?.status,
       data: error.response?.data,
     };
 
     return Promise.reject(apiError);
-  }
+  },
 );
 
 export { apiClient };
diff --git a/lib/auth/authOptions.ts b/lib/auth/authOptions.ts
index 669a43e..18c9487 100644
--- a/lib/auth/authOptions.ts
+++ b/lib/auth/authOptions.ts
@@ -1,14 +1,18 @@
 import { NextAuthOptions } from "next-auth";
 import GoogleProvider from "next-auth/providers/google";
 import GithubProvider from "next-auth/providers/github";
-import { authApi } from "@/lib/api/auth";
-import type { User } from '@/types';
-
-type BackendAwareUser = User & {
-  backendToken?: string;
-  backendUser?: User;
-};
 
+/**
+ * NextAuth configuration.
+ *
+ * NOTE: Social login (Google / GitHub) is *not* wired to the backend yet.
+ * The backend only supports Stellar wallet challenge-response auth.  Social
+ * providers are kept here as a placeholder so the UI can surface the buttons
+ * and we can integrate them once the backend adds social login support.
+ *
+ * Until then the signIn callback simply allows the OAuth sign-in to proceed
+ * without attempting to call a non-existent `/auth/social-login` endpoint.
+ */
 export const authOptions: NextAuthOptions = {
   providers: [
     GoogleProvider({
@@ -21,44 +25,16 @@ export const authOptions: NextAuthOptions = {
     }),
   ],
   callbacks: {
-    async signIn({ user, account }) {
-      if (account?.provider === "google" || account?.provider === "github") {
-        try {
-          // If the tokens are available, we pass them to backend
-          const idToken = account.id_token || account.access_token;
-          if (!idToken) return false;
-
-          // Call backend's social login
-          const response = await authApi.socialLogin({
-            provider: account.provider,
-            token: idToken,
-          });
-
-          // Store the backend's result in the user object for the session/jwt callback
-          const enrichedUser = user as BackendAwareUser;
-          enrichedUser.backendToken = response.data.token;
-          enrichedUser.backendUser = response.data.user;
-          return true;
-        } catch (error) {
-          console.error("Social login failed:", error);
-          return false;
-        }
-      }
+    /**
+     * Social login is out-of-scope for the wallet-auth issue.
+     * We allow the OAuth sign-in to succeed locally, but it will NOT produce
+     * a backend accessToken until the backend adds social login support.
+     */
+    async signIn() {
+      // TODO: once backend adds social login, call authApi.socialLogin here
+      // and store the returned accessToken in the auth store.
       return true;
     },
-    async jwt({ token, user, account }) {
-      if (user) {
-        const enrichedUser = user as BackendAwareUser;
-        token.backendToken = enrichedUser.backendToken;
-        token.backendUser = enrichedUser.backendUser;
-      }
-      return token;
-    },
-    async session({ session, token }) {
-      session.backendToken = token.backendToken;
-      session.backendUser = token.backendUser;
-      return session;
-    },
   },
   pages: {
     signIn: "/auth/login",
diff --git a/lib/auth/sessionExpiry.ts b/lib/auth/sessionExpiry.ts
index fbe5486..62b90cf 100644
--- a/lib/auth/sessionExpiry.ts
+++ b/lib/auth/sessionExpiry.ts
@@ -1,30 +1,38 @@
-import { InternalAxiosRequestConfig } from 'axios';
+/**
+ * Session expiry signalling.
+ *
+ * When the API response interceptor receives a 401 it calls
+ * {@link emitSessionExpired}.  Any component (e.g. SessionExpiredModal) can
+ * subscribe via {@link onSessionExpired} to show the wallet re-auth flow.
+ */
 
-type RequestCallback = (token: string) => void;
-type FailCallback = () => void;
+import { InternalAxiosRequestConfig } from "axios";
 
-interface PendingRequest {
-  resolve: RequestCallback;
-  reject: FailCallback;
-}
+// ---------------------------------------------------------------------------
+// Listener (single subscriber – the SessionExpiredModal)
+// ---------------------------------------------------------------------------
 
-let isRefreshing = false;
-let pendingRequests: PendingRequest[] = [];
+type SessionExpiredListener = (config: InternalAxiosRequestConfig) => void;
 
-export function addPendingRequest(resolve: RequestCallback, reject: FailCallback) {
-  pendingRequests.push({ resolve, reject });
-}
+let sessionExpiredListener: SessionExpiredListener | null = null;
 
-export function resolvePendingRequests(token: string) {
-  pendingRequests.forEach((req) => req.resolve(token));
-  pendingRequests = [];
+/** Register the component that should open when the session expires. */
+export function onSessionExpired(listener: SessionExpiredListener) {
+  sessionExpiredListener = listener;
 }
 
-export function rejectPendingRequests() {
-  pendingRequests.forEach((req) => req.reject());
-  pendingRequests = [];
+/** Called by the response interceptor on 401. */
+export function emitSessionExpired(config: InternalAxiosRequestConfig) {
+  sessionExpiredListener?.(config);
 }
 
+// ---------------------------------------------------------------------------
+// Refreshing guard — prevents multiple 401 handlers from stacking up
+// (used by the interceptor while the re-auth modal is opening)
+// ---------------------------------------------------------------------------
+
+let isRefreshing = false;
+
 export function getIsRefreshing() {
   return isRefreshing;
 }
@@ -32,15 +40,3 @@ export function getIsRefreshing() {
 export function setIsRefreshing(value: boolean) {
   isRefreshing = value;
 }
-
-type SessionExpiredListener = (config: InternalAxiosRequestConfig) => void;
-
-let sessionExpiredListener: SessionExpiredListener | null = null;
-
-export function onSessionExpired(listener: SessionExpiredListener) {
-  sessionExpiredListener = listener;
-}
-
-export function emitSessionExpired(config: InternalAxiosRequestConfig) {
-  sessionExpiredListener?.(config);
-}
diff --git a/lib/auth/sessionTimeout.ts b/lib/auth/sessionTimeout.ts
index c701743..6319fab 100644
--- a/lib/auth/sessionTimeout.ts
+++ b/lib/auth/sessionTimeout.ts
@@ -2,17 +2,18 @@
 
 import { useEffect, useRef, useCallback } from "react";
 import { useAuthStore } from "@/store/authStore";
-import { authApi } from "@/lib/api/auth";
 
 // Session timeout configuration
-const WARNING_THRESHOLD = 5 * 60 * 1000; // 5 minutes in milliseconds
+const WARNING_THRESHOLD = 5 * 60 * 1000; // 5 minutes before expiry
 const CHECK_INTERVAL = 30 * 1000; // Check every 30 seconds
 
+// ---------------------------------------------------------------------------
+// Types
+// ---------------------------------------------------------------------------
+
 export interface SessionTimeoutOptions {
   onWarning?: (timeRemaining: number) => void;
   onExpired?: () => void;
-  onRefreshSuccess?: () => void;
-  onRefreshFailure?: (error: unknown) => void;
   warningThreshold?: number;
   checkInterval?: number;
 }
@@ -20,9 +21,12 @@ export interface SessionTimeoutOptions {
 export interface SessionTimeoutState {
   isWarning: boolean;
   timeRemaining: number;
-  isRefreshing: boolean;
 }
 
+// ---------------------------------------------------------------------------
+// JWT utilities
+// ---------------------------------------------------------------------------
+
 // JWT token utilities
 // NOTE: These helpers only decode the payload for UX purposes (warning timers,
 // auto-refresh triggers). They do NOT verify the signature and must not be used
@@ -31,13 +35,10 @@ export interface SessionTimeoutState {
 const getTokenExpirationTime = (token: string): number | null => {
   try {
     const payloadSegment = token.split(".")[1];
-    if (!payloadSegment) {
-      return null;
-    }
+    if (!payloadSegment) return null;
     const payload = JSON.parse(atob(payloadSegment));
-    return payload.exp * 1000; // Convert to milliseconds
-  } catch (error) {
-    console.error("Invalid token format:", error);
+    return payload.exp * 1000; // → milliseconds
+  } catch {
     return null;
   }
 };
@@ -45,34 +46,38 @@ const getTokenExpirationTime = (token: string): number | null => {
 const isTokenExpired = (token: string): boolean => {
   const expirationTime = getTokenExpirationTime(token);
   if (!expirationTime) return true;
-  
   return Date.now() >= expirationTime;
 };
 
 const getTimeRemaining = (token: string): number => {
   const expirationTime = getTokenExpirationTime(token);
   if (!expirationTime) return 0;
-  
   return Math.max(0, expirationTime - Date.now());
 };
 
-// Session timeout hook
+// ---------------------------------------------------------------------------
+// Hook
+// ---------------------------------------------------------------------------
+
+/**
+ * Monitors the stored JWT and fires callbacks when it is about to expire or
+ * has already expired.  Because the backend only issues a short-lived
+ * accessToken (≈15 min) with no refresh token, expiry means the user must
+ * re-authenticate via wallet challenge-response.
+ */
 export function useSessionTimeout(options: SessionTimeoutOptions = {}) {
   const {
     onWarning,
     onExpired,
-    onRefreshSuccess,
-    onRefreshFailure,
     warningThreshold = WARNING_THRESHOLD,
     checkInterval = CHECK_INTERVAL,
   } = options;
 
-  const { token, refreshToken: storedRefreshToken, login, logout } = useAuthStore();
+  const { token, logout } = useAuthStore();
   const intervalRef = useRef<NodeJS.Timeout | null>(null);
   const warningTimeoutRef = useRef<NodeJS.Timeout | null>(null);
-  const isRefreshingRef = useRef(false);
 
-  // Clear all timeouts and intervals
+  // Clear all timers
   const cleanup = useCallback(() => {
     if (intervalRef.current) {
       clearInterval(intervalRef.current);
@@ -84,136 +89,78 @@ export function useSessionTimeout(options: SessionTimeoutOptions = {}) {
     }
   }, []);
 
-  // Handle session expiration
-  const handleExpiration = useCallback(async () => {
+  // Called when the token has expired or is about to expire
+  const handleExpiration = useCallback(() => {
     cleanup();
-    
-    // Try to refresh the token first
-    if (!isRefreshingRef.current && storedRefreshToken) {
-      isRefreshingRef.current = true;
-      
-      try {
-        const response = await authApi.refreshToken();
-        
-        if (response.status === 200 && response.data) {
-          // Update auth store with new token
-          login(response.data.user, response.data.token, response.data.refreshToken);
-          onRefreshSuccess?.();
-          return; // Don't logout if refresh succeeded
-        }
-      } catch (error) {
-        console.error("Token refresh failed:", error);
-        onRefreshFailure?.(error);
-      } finally {
-        isRefreshingRef.current = false;
-      }
-    }
-    
-    // If refresh failed or wasn't attempted, logout
     logout();
     onExpired?.();
-  }, [cleanup, storedRefreshToken, login, logout, onExpired, onRefreshSuccess, onRefreshFailure]);
-
-  // Manual refresh token function
-  const refreshToken = useCallback(async (): Promise<boolean> => {
-    if (!token || !storedRefreshToken || isRefreshingRef.current) return false;
-    
-    isRefreshingRef.current = true;
-    
-    try {
-      const response = await authApi.refreshToken();
-      
-      if (response.status === 200 && response.data) {
-        login(response.data.user, response.data.token, response.data.refreshToken);
-        onRefreshSuccess?.();
-        return true;
-      }
-    } catch (error) {
-      console.error("Manual token refresh failed:", error);
-      onRefreshFailure?.(error);
-    } finally {
-      isRefreshingRef.current = false;
-    }
-    
-    return false;
-  }, [token, storedRefreshToken, login, onRefreshSuccess, onRefreshFailure]);
+  }, [cleanup, logout, onExpired]);
 
-  // Start monitoring session
+  // Start periodic token monitoring
   const startMonitoring = useCallback(() => {
     if (!token) return;
-    
     cleanup();
-    
-    // Check token immediately
+
+    // Token already expired
     if (isTokenExpired(token)) {
       handleExpiration();
       return;
     }
-    
-    // Set up periodic checks
+
     intervalRef.current = setInterval(() => {
       if (!token) {
         cleanup();
         return;
       }
-      
-      const timeRemaining = getTimeRemaining(token);
-      
-      if (timeRemaining === 0) {
+
+      const remaining = getTimeRemaining(token);
+
+      if (remaining === 0) {
         handleExpiration();
         return;
       }
-      
-      // Show warning when approaching expiration
-      if (timeRemaining <= warningThreshold && !warningTimeoutRef.current) {
-        onWarning?.(timeRemaining);
-        
-        // Set timeout for actual expiration
+
+      // Warn once when approaching expiry
+      if (remaining <= warningThreshold && !warningTimeoutRef.current) {
+        onWarning?.(remaining);
+
+        // When the exact expiry hits, trigger expiration
         warningTimeoutRef.current = setTimeout(() => {
           handleExpiration();
-        }, timeRemaining);
+        }, remaining);
       }
     }, checkInterval);
   }, [token, cleanup, handleExpiration, onWarning, warningThreshold, checkInterval]);
 
-  // Effect to manage session monitoring
+  // Kick off monitoring whenever the token changes
   useEffect(() => {
     if (token) {
       startMonitoring();
     } else {
       cleanup();
     }
-    
     return cleanup;
   }, [token, startMonitoring, cleanup]);
 
-  // Get current session state
+  // Imperatively read the current session state
   const getSessionState = useCallback((): SessionTimeoutState => {
     if (!token) {
-      return {
-        isWarning: false,
-        timeRemaining: 0,
-        isRefreshing: isRefreshingRef.current,
-      };
+      return { isWarning: false, timeRemaining: 0 };
     }
-    
-    const timeRemaining = getTimeRemaining(token);
-    
+    const remaining = getTimeRemaining(token);
     return {
-      isWarning: timeRemaining > 0 && timeRemaining <= warningThreshold,
-      timeRemaining,
-      isRefreshing: isRefreshingRef.current,
+      isWarning: remaining > 0 && remaining <= warningThreshold,
+      timeRemaining: remaining,
     };
   }, [token, warningThreshold]);
 
-  return {
-    refreshToken,
-    getSessionState,
-    cleanup,
-  };
+  return { getSessionState, cleanup };
 }
 
-// Utility functions for external use
+// ---------------------------------------------------------------------------
+// Public utilities
+// ---------------------------------------------------------------------------
+
 export const sessionUtils = {
   getTokenExpirationTime,
   isTokenExpired,
@@ -222,7 +169,6 @@ export const sessionUtils = {
     const totalSeconds = Math.floor(milliseconds / 1000);
     const minutes = Math.floor(totalSeconds / 60);
     const seconds = totalSeconds % 60;
-    
-    return `${minutes}:${seconds.toString().padStart(2, '0')}`;
+    return `${minutes}:${seconds.toString().padStart(2, "0")}`;
   },
 };
diff --git a/lib/stellar/walletAuth.ts b/lib/stellar/walletAuth.ts
new file mode 100644
index 0000000..b9fdb64
--- /dev/null
+++ b/lib/stellar/walletAuth.ts
@@ -0,0 +1,139 @@
+import { Transaction, Networks } from "@stellar/stellar-sdk";
+import { NETWORK_PASSPHRASES } from "./config";
+
+/**
+ * Freighter extension window API shape.
+ * The extension injects `window.freighter` (or older `window.stellar`).
+ * Only the subset we need is typed here.
+ */
+interface FreighterAPI {
+  isConnected?: () => Promise<boolean>;
+  getAddress?: () => Promise<{ address: string }>;
+  signTransaction?: (
+    txXdr: string,
+    passphrase?: string,
+  ) => Promise<{ signedTxXdr: string }>;
+  /** Older Freighter versions */
+  getCurrentAddress?: () => Promise<{ address: string }>;
+}
+
+function getFreighter(): FreighterAPI | null {
+  if (typeof window === "undefined") return null;
+  const w = window as unknown as Record<string, unknown>;
+  return (w.freighter ?? w.stellar ?? null) as FreighterAPI | null;
+}
+
+// ---------------------------------------------------------------------------
+// Public helpers
+// ---------------------------------------------------------------------------
+
+/** Check whether the Freighter extension is installed and accessible. */
+export async function isFreighterInstalled(): Promise<boolean> {
+  const fg = getFreighter();
+  if (!fg) return false;
+  try {
+    if (fg.isConnected) return await fg.isConnected();
+    // Older API: try getting address as a proxy
+    if (fg.getCurrentAddress) {
+      await fg.getCurrentAddress();
+      return true;
+    }
+  } catch {
+    return false;
+  }
+  return false;
+}
+
+/**
+ * Request the connected wallet address from Freighter.
+ * Throws if the extension is not installed or the user rejects.
+ */
+export async function getWalletAddress(): Promise<string> {
+  const fg = getFreighter();
+  if (!fg) throw new Error("Freighter extension not detected. Please install it from freighter.app.");
+
+  try {
+    if (fg.getAddress) {
+      const { address } = await fg.getAddress();
+      return address;
+    }
+    if (fg.getCurrentAddress) {
+      const { address } = await fg.getCurrentAddress();
+      return address;
+    }
+  } catch (err: unknown) {
+    const msg = err instanceof Error ? err.message : String(err);
+    if (msg.includes("denied") || msg.includes("reject")) {
+      throw new Error("Wallet connection was rejected by the user.");
+    }
+    throw new Error(`Failed to get wallet address: ${msg}`);
+  }
+
+  throw new Error("Unable to communicate with Freighter. Please update the extension.");
+}
+
+/**
+ * Sign an arbitrary challenge string using Freighter.
+ *
+ * The backend challenge is a plain-text string. Freighter does not expose a
+ * direct "signMessage" API, so we construct a minimal Stellar transaction with
+ * the challenge as a memo, sign it with Freighter, then extract the signature
+ * bytes — which is the proof the backend verifies.
+ *
+ * @param challenge      The challenge string returned by GET /auth/challenge
+ * @param network        Stellar network (default: testnet)
+ * @returns              The base64-encoded signature bytes
+ */
+export async function signChallenge(
+  challenge: string,
+  network: "testnet" | "public" | "futurenet" = "testnet",
+): Promise<string> {
+  const fg = getFreighter();
+  if (!fg) throw new Error("Freighter extension not detected. Please install it from freighter.app.");
+
+  const address = await getWalletAddress();
+  const passphrase = NETWORK_PASSPHRASES[network];
+
+  // Build a minimal transaction carrying the challenge as a memo so Freighter
+  // can sign it. The backend only cares about the resulting Ed25519 signature.
+  const { TransactionBuilder, Memo } = await import("@stellar/stellar-sdk");
+
+  const tx = new TransactionBuilder(
+    { accountId: address, sequence: "0" } as any,
+    { fee: "0", networkPassphrase: passphrase },
+  )
+    .addMemo(Memo.text(challenge))
+    .setTimeout(0)
+    .build();
+
+  const txXdr = tx.toEnvelope().toXDR("base64");
+
+  if (fg.signTransaction) {
+    const { signedTxXdr } = await fg.signTransaction(txXdr, passphrase);
+
+    // Re-parse the signed envelope to extract the first signature
+    const signedTx = Transaction.fromEnvelopeXDR(signedTxXdr, passphrase);
+    const signatures = (signedTx as any)._signatures as Array<{ signature: { data: string } }> | undefined;
+
+    if (signatures && signatures.length > 0 && signatures[0]?.signature?.data) {
+      return signatures[0].signature.data;
+    }
+  }
+
+  throw new Error(
+    "Unable to sign with Freighter. Please ensure the extension is up to date.",
+  );
+}
+
+/**
+ * Full wallet-auth sign-in flow:
+ *   1. Ensure wallet is connected (get address)
+ *   2. Return the address so the caller can request a challenge
+ *
+ * The actual challenge-fetch + verify is orchestrated by the calling code
+ * (LoginForm / auth store) to keep Freighter concerns separate from API calls.
+ */
+export async function connectForAuth(): Promise<{ walletAddress: string; walletType: string }> {
+  const address = await getWalletAddress();
+  return { walletAddress: address, walletType: "freighter" };
+}
diff --git a/store/authStore.ts b/store/authStore.ts
index b0b53f8..4f3b5d0 100644
--- a/store/authStore.ts
+++ b/store/authStore.ts
@@ -3,42 +3,53 @@ import { persist, createJSONStorage } from 'zustand/middleware';
 import { devtools } from 'zustand/middleware';
 import type { AuthStore } from '@/types';
 
+// ---------------------------------------------------------------------------
+// Cookie helpers — persist the JWT so middleware / SSR can read it
+// ---------------------------------------------------------------------------
+
 const setAuthCookie = (token: string) => {
   if (typeof window === 'undefined') return;
+  // Read the session-only flag set during wallet sign-in.  When the user
+  // chose *not* to "remember" the session we leave the cookie without an
+  // explicit expiry so it is automatically cleared when the browser closes.
   const sessionOnly = sessionStorage.getItem('milestonex-session-only') === 'true';
   const days = sessionOnly ? undefined : 30;
-  
+
   let expires = "";
   if (days) {
     const date = new Date();
-    date.setTime(date.getTime() + (days * 24 * 60 * 60 * 1000));
+    date.setTime(date.getTime() + days * 24 * 60 * 60 * 1000);
     expires = "; expires=" + date.toUTCString();
   }
-  document.cookie = "token=" + encodeURIComponent(token) + expires + "; path=/; SameSite=Lax; Secure";
+  document.cookie =
+    "token=" + encodeURIComponent(token) + expires + "; path=/; SameSite=Lax; Secure";
 };
 
 const deleteAuthCookie = () => {
   if (typeof window === 'undefined') return;
-  document.cookie = "token=; Path=/; Expires=Thu, 01 Jan 1970 00:00:01 GMT; SameSite=Lax; Secure";
+  document.cookie =
+    "token=; Path=/; Expires=Thu, 01 Jan 1970 00:00:01 GMT; SameSite=Lax; Secure";
 };
 
+// ---------------------------------------------------------------------------
+// Store
+// ---------------------------------------------------------------------------
+
 export const useAuthStore = create<AuthStore>()(
   devtools(
     persist(
       (set) => ({
-        // Initial State
+        // Initial state
         user: null,
         token: null,
-        refreshToken: null,
         isAuthenticated: false,
         isLoading: false,
 
         // Actions
-        login: (user, token, refreshToken) => {
+        login: (user, token) => {
           set({
             user,
             token,
-            refreshToken: refreshToken || null,
             isAuthenticated: true,
             isLoading: false,
           });
@@ -49,7 +60,6 @@ export const useAuthStore = create<AuthStore>()(
           set({
             user: null,
             token: null,
-            refreshToken: null,
             isAuthenticated: false,
             isLoading: false,
           });
@@ -60,23 +70,17 @@ export const useAuthStore = create<AuthStore>()(
 
         setLoading: (loading) => set({ isLoading: loading }),
 
-        setTokens: (token, refreshToken) => {
-          set({
-            token,
-            refreshToken,
-            isAuthenticated: true,
-          });
+        setToken: (token) => {
+          set({ token });
           setAuthCookie(token);
         },
       }),
       {
         name: 'auth-storage',
         storage: createJSONStorage(() => localStorage),
-        // Only persist these fields
         partialize: (state) => ({
           user: state.user,
           token: state.token,
-          refreshToken: state.refreshToken,
           isAuthenticated: state.isAuthenticated,
         }),
         onRehydrateStorage: () => (state) => {
@@ -84,10 +88,10 @@ export const useAuthStore = create<AuthStore>()(
             setAuthCookie(state.token);
           }
         },
-      }
+      },
     ),
     {
       name: 'AuthStore',
-    }
-  )
+    },
+  ),
 );
diff --git a/types/api.ts b/types/api.ts
index 8e3ecf8..2996236 100644
--- a/types/api.ts
+++ b/types/api.ts
@@ -1,4 +1,4 @@
-import { StellarNetworkType, User } from './index';
+import { StellarNetworkType } from './index';
 
 export interface ApiResponse<T> {
   data: T;
@@ -19,36 +19,43 @@ export interface ApiError {
   data?: unknown;
 }
 
-// Auth Types
-export interface LoginCredentials {
-  email: string;
-  password: string;
-  rememberMe?: boolean;
-}
+// Auth Types — wallet challenge-response (matches MilestoneX-Backend)
 
-export interface LoginResponse {
-  user: User;
-  token: string;
-  refreshToken?: string;
+/** GET /auth/challenge response */
+export interface AuthChallenge {
+  challenge: string;
+  account: string;
+  networkPassphrase: string;
 }
 
-export interface RegisterRequest {
-  email: string;
-  role: 'donor' | 'creator';
-  password?: string;
-  confirmPassword?: string;
+/** POST /auth/verify request body */
+export interface AuthVerifyRequest {
+  walletAddress: string;
+  signedChallenge: string;
+  challenge: string;
 }
 
-export interface VerifyEmailRequest {
-  token: string;
+/** POST /auth/verify response (and re-verified responses) */
+export interface AuthVerifyResponse {
+  accessToken: string;
+  tokenType: string;
 }
 
-export interface ResendEmailRequest {
-  email: string;
+/** POST /auth/logout response */
+export interface AuthLogoutResponse {
+  message: string;
 }
 
-export interface ChangeEmailRequest {
-  email: string;
+/** GET /users/me response — wallet-based user profile */
+export interface UserProfile {
+  id: string;
+  walletAddress: string;
+  displayName: string;
+  role: 'donor' | 'creator' | 'admin' | 'moderator';
+  email?: string;
+  avatar?: string;
+  createdAt?: string;
+  updatedAt?: string;
 }
 
 // Project Types
diff --git a/types/index.ts b/types/index.ts
index 80bea37..0523b85 100644
--- a/types/index.ts
+++ b/types/index.ts
@@ -1,31 +1,30 @@
-// User Types
-export type UserRole = "admin" | "user" | "moderator" | "creator";
+// User Types (wallet-based — matches backend)
+export type UserRole = "admin" | "user" | "moderator" | "creator" | "donor";
 
 export interface User {
   id: string;
-  email: string;
-  name: string;
-  avatar?: string;
+  walletAddress: string;
+  displayName: string;
   role?: UserRole;
-  googleLinked?: boolean;
-  githubLinked?: boolean;
+  email?: string;
+  avatar?: string;
 }
 
 // Auth Store Types
 export interface AuthState {
   user: User | null;
   token: string | null;
-  refreshToken: string | null;
   isAuthenticated: boolean;
   isLoading: boolean;
 }
 
 export interface AuthActions {
-  login: (user: User, token: string, refreshToken?: string) => void;
+  /** Store auth after a successful wallet challenge-response */
+  login: (user: User, token: string) => void;
   logout: () => void;
   setUser: (user: User | null) => void;
   setLoading: (loading: boolean) => void;
-  setTokens: (token: string, refreshToken: string) => void;
+  setToken: (token: string) => void;
 }
 
 export type AuthStore = AuthState & AuthActions;