diff --git a/app/api/v1/wallets/deprecate/route.ts b/app/api/v1/wallets/deprecate/route.ts
new file mode 100644
index 00000000..ad1d55b2
--- /dev/null
+++ b/app/api/v1/wallets/deprecate/route.ts
@@ -0,0 +1,176 @@
+import { NextRequest, NextResponse } from "next/server";
+import { supabaseAdmin } from "@/app/lib/supabase";
+import { withRateLimit } from "@/app/lib/rate-limit";
+import { trackApiRequest, trackApiResponse, trackApiError } from "@/app/lib/server-analytics";
+import { verifyJWT } from "@/app/lib/jwt";
+import { DEFAULT_PRIVY_CONFIG } from "@/app/lib/config";
+
+export const POST = withRateLimit(async (request: NextRequest) => {
+  const startTime = Date.now();
+
+  try {
+    // Step 1: Verify authentication token
+    const authHeader = request.headers.get("Authorization");
+    const token = authHeader?.replace("Bearer ", "");
+
+    if (!token) {
+      trackApiError(request, "/api/v1/wallets/deprecate", "POST", new Error("Unauthorized"), 401);
+      return NextResponse.json(
+        { success: false, error: "Unauthorized" },
+        { status: 401 }
+      );
+    }
+
+    let authenticatedUserId: string;
+    try {
+      const jwtResult = await verifyJWT(token, DEFAULT_PRIVY_CONFIG);
+      authenticatedUserId = jwtResult.payload.sub;
+
+      if (!authenticatedUserId) {
+        trackApiError(request, "/api/v1/wallets/deprecate", "POST", new Error("Invalid token"), 401);
+        return NextResponse.json(
+          { success: false, error: "Invalid token" },
+          { status: 401 }
+        );
+      }
+    } catch (jwtError) {
+      trackApiError(request, "/api/v1/wallets/deprecate", "POST", jwtError as Error, 401);
+      return NextResponse.json(
+        { success: false, error: "Invalid or expired token" },
+        { status: 401 }
+      );
+    }
+
+    const walletAddress = request.headers.get("x-wallet-address")?.toLowerCase();
+    const body = await request.json();
+    const { oldAddress, newAddress, txHash, userId } = body;
+
+    if (!walletAddress || !oldAddress || !newAddress || !userId) {
+      trackApiError(request, "/api/v1/wallets/deprecate", "POST", new Error("Missing required fields"), 400);
+      return NextResponse.json(
+        { success: false, error: "Missing required fields" },
+        { status: 400 }
+      );
+    }
+
+    // Step 2: Verify userId matches authenticated user (CRITICAL SECURITY FIX)
+    if (userId !== authenticatedUserId) {
+      trackApiError(request, "/api/v1/wallets/deprecate", "POST", new Error("Unauthorized: userId mismatch"), 403);
+      return NextResponse.json(
+        { success: false, error: "Unauthorized" },
+        { status: 403 }
+      );
+    }
+
+    // Step 3: Verify wallet addresses match
+    if (newAddress.toLowerCase() !== walletAddress) {
+      trackApiError(request, "/api/v1/wallets/deprecate", "POST", new Error("Wallet address mismatch"), 403);
+      return NextResponse.json(
+        { success: false, error: "Wallet address mismatch" },
+        { status: 403 }
+      );
+    }
+
+    trackApiRequest(request, "/api/v1/wallets/deprecate", "POST", {
+      wallet_address: walletAddress,
+      old_address: oldAddress,
+      new_address: newAddress,
+    });
+
+    // Step 4: Atomic database operations with rollback on failure
+    // Ensure old (SCW) wallet exists and mark as deprecated (upsert so we insert if never saved to DB)
+    const now = new Date().toISOString();
+    const { error: deprecateError } = await supabaseAdmin
+      .from("wallets")
+      .upsert(
+        {
+          address: oldAddress.toLowerCase(),
+          user_id: userId,
+          wallet_type: "smart_contract",
+          status: "deprecated",
+          deprecated_at: now,
+          migration_completed: true,
+          migration_tx_hash: txHash,
+          updated_at: now,
+        },
+        { onConflict: "address,user_id" }
+      );
+
+    if (deprecateError) {
+      trackApiError(request, "/api/v1/wallets/deprecate", "POST", deprecateError, 500);
+      throw deprecateError;
+    }
+
+    // Create or update new EOA wallet record
+    const { error: upsertError } = await supabaseAdmin
+      .from("wallets")
+      .upsert({
+        address: newAddress.toLowerCase(),
+        user_id: userId,
+        wallet_type: "eoa",
+        status: "active",
+        created_at: new Date().toISOString(),
+      });
+
+    if (upsertError) {
+      // Rollback: Restore old wallet status
+      await supabaseAdmin
+        .from("wallets")
+        .update({
+          status: "active",
+          deprecated_at: null,
+          migration_completed: false,
+          migration_tx_hash: null,
+        })
+        .eq("address", oldAddress.toLowerCase())
+        .eq("user_id", userId);
+
+      trackApiError(request, "/api/v1/wallets/deprecate", "POST", upsertError, 500);
+      throw upsertError;
+    }
+
+    // Migrate KYC data
+    const { error: kycError } = await supabaseAdmin
+      .from("kyc_data")
+      .update({ wallet_address: newAddress.toLowerCase() })
+      .eq("wallet_address", oldAddress.toLowerCase())
+      .eq("user_id", userId);
+
+    if (kycError) {
+      console.error("KYC migration error:", kycError);
+      // Return partial success - wallet migrated but KYC migration failed
+      // This is better than rolling back the entire migration
+      const responseTime = Date.now() - startTime;
+      trackApiResponse("/api/v1/wallets/deprecate", "POST", 200, responseTime, {
+        wallet_address: walletAddress,
+        migration_successful: true,
+        kyc_migration_failed: true,
+      });
+
+      return NextResponse.json({
+        success: true,
+        message: "Wallet migrated but KYC migration failed",
+        kycMigrationFailed: true,
+      });
+    }
+
+    const responseTime = Date.now() - startTime;
+    trackApiResponse("/api/v1/wallets/deprecate", "POST", 200, responseTime, {
+      wallet_address: walletAddress,
+      migration_successful: true,
+    });
+
+    return NextResponse.json({ success: true, message: "Wallet migrated successfully" });
+  } catch (error) {
+    console.error("Error deprecating wallet:", error);
+    const responseTime = Date.now() - startTime;
+    trackApiError(request, "/api/v1/wallets/deprecate", "POST", error as Error, 500, {
+      response_time_ms: responseTime,
+    });
+
+    return NextResponse.json(
+      { success: false, error: "Internal server error" },
+      { status: 500 }
+    );
+  }
+});
\ No newline at end of file
diff --git a/app/api/v1/wallets/migration-status/route.ts b/app/api/v1/wallets/migration-status/route.ts
new file mode 100644
index 00000000..8ccee84b
--- /dev/null
+++ b/app/api/v1/wallets/migration-status/route.ts
@@ -0,0 +1,85 @@
+import { NextRequest, NextResponse } from "next/server";
+import { supabaseAdmin } from "@/app/lib/supabase";
+
+export async function GET(request: NextRequest) {
+    try {
+        const { searchParams } = new URL(request.url);
+        const userId = searchParams.get("userId");
+
+        if (!userId) {
+            return NextResponse.json({ error: "User ID required" }, { status: 400 });
+        }
+
+        // Check if user has completed migration
+        const { data, error } = await supabaseAdmin
+            .from("wallets")
+            .select("migration_completed, status, wallet_type")
+            .eq("user_id", userId)
+            .eq("wallet_type", "smart_contract")
+            .single();
+
+        // Handle specific error codes
+        if (error) {
+            // PGRST116 = no rows found (user has no smart wallet) - this is OK
+            if (error.code === "PGRST116") {
+                return NextResponse.json({
+                    migrationCompleted: false,
+                    status: "unknown",
+                    hasSmartWallet: false
+                });
+            }
+
+            // PGRST205 = table not found in schema cache (migration not run yet)
+            if (error.code === "PGRST205") {
+                console.warn("⚠️ Wallets table not found in schema cache. Migration may not be applied yet.");
+                return NextResponse.json({
+                    migrationCompleted: false,
+                    status: "unknown",
+                    hasSmartWallet: true, // Assume true to show banner
+                    error: "Database schema not ready"
+                }, { status: 200 }); // Return 200 so frontend doesn't break
+            }
+
+            // For other errors, log and return safe fallback
+            console.error("Database query error:", error);
+            return NextResponse.json({
+                migrationCompleted: false,
+                status: "unknown",
+                hasSmartWallet: true, // Assume true to show banner on error
+                error: error.message
+            }, { status: 200 }); // Return 200 so frontend doesn't break
+        }
+
+        return NextResponse.json({
+            migrationCompleted: data?.migration_completed ?? false,
+            status: data?.status ?? "unknown",
+            hasSmartWallet: !!data
+        });
+    } catch (error: any) {
+        // Handle connection errors (DNS, network, etc.)
+        const errorMessage = error?.message || String(error);
+        const isConnectionError =
+            errorMessage.includes("ENOTFOUND") ||
+            errorMessage.includes("fetch failed") ||
+            errorMessage.includes("ECONNREFUSED") ||
+            errorMessage.includes("ETIMEDOUT");
+
+        if (isConnectionError) {
+            console.warn("⚠️ Database connection error, returning fallback response:", errorMessage);
+            return NextResponse.json({
+                migrationCompleted: false,
+                status: "unknown",
+                hasSmartWallet: true, // Assume true to show banner if DB is down
+                error: "Database temporarily unavailable"
+            }, { status: 200 }); // Return 200 so frontend doesn't break
+        }
+
+        console.error("Error checking migration status:", error);
+        return NextResponse.json({
+            error: error instanceof Error ? error.message : "Internal server error",
+            migrationCompleted: false,
+            status: "error",
+            hasSmartWallet: true // Assume true to show banner on error
+        }, { status: 200 }); // Return 200 so frontend doesn't break
+    }
+}
\ No newline at end of file
diff --git a/app/components/AppLayout.tsx b/app/components/AppLayout.tsx
index cbe2c33c..ddbbf615 100644
--- a/app/components/AppLayout.tsx
+++ b/app/components/AppLayout.tsx
@@ -1,3 +1,4 @@
+"use client";
 import React from "react";
 import Script from "next/script";
 import config from "../lib/config";
@@ -11,8 +12,10 @@ import {
   PWAInstall,
   NoticeBanner,
 } from "./index";
+import { MigrationBannerWrapper } from "../context";
 
 export default function AppLayout({ children }: { children: React.ReactNode }) {
+
   return (
     <Providers>
       <div className="min-h-full min-w-full bg-white transition-colors dark:bg-neutral-900">
@@ -21,6 +24,7 @@ export default function AppLayout({ children }: { children: React.ReactNode }) {
           {config.noticeBannerText && (
             <NoticeBanner textLines={config.noticeBannerText.split("|")} />
           )}
+          <MigrationBannerWrapper />
         </div>
         <LayoutWrapper footer={<Footer />}>
           <MainContent>{children}</MainContent>
@@ -35,11 +39,10 @@ export default function AppLayout({ children }: { children: React.ReactNode }) {
             {`window.BrevoConversationsID=${JSON.stringify(config.brevoConversationsId)};
             window.BrevoConversations=window.BrevoConversations||function(){
             (window.BrevoConversations.q=window.BrevoConversations.q||[]).push(arguments)};
-            window.BrevoConversationsSetup=${
-              config.brevoConversationsGroupId 
-                ? `{groupId:${JSON.stringify(config.brevoConversationsGroupId)}}` 
+            window.BrevoConversationsSetup=${config.brevoConversationsGroupId
+                ? `{groupId:${JSON.stringify(config.brevoConversationsGroupId)}}`
                 : '{}'
-            };
+              };
             `}
           </Script>
           <Script
diff --git a/app/components/MigrationZeroBalanceModal.tsx b/app/components/MigrationZeroBalanceModal.tsx
new file mode 100644
index 00000000..6dd8694e
--- /dev/null
+++ b/app/components/MigrationZeroBalanceModal.tsx
@@ -0,0 +1,145 @@
+"use client";
+
+import React, { useState, useEffect } from "react";
+import { motion, AnimatePresence } from "framer-motion";
+import { Dialog, DialogPanel } from "@headlessui/react";
+import { Cancel01Icon } from "hugeicons-react";
+import { usePrivy } from "@privy-io/react-auth";
+
+const STORAGE_KEY_PREFIX = "hasDismissedZeroBalanceMigration-";
+
+interface MigrationZeroBalanceModalProps {
+    showZeroBalanceMessage: boolean;
+}
+
+export const MigrationZeroBalanceModal: React.FC<MigrationZeroBalanceModalProps> = ({
+    showZeroBalanceMessage,
+}) => {
+    const { user } = usePrivy();
+    const [dismissed, setDismissed] = useState(false);
+    const [hasCheckedStorage, setHasCheckedStorage] = useState(false);
+
+    const userId = user?.wallet?.address ?? user?.id;
+    const storageKey = userId ? `${STORAGE_KEY_PREFIX}${userId}` : null;
+
+    useEffect(() => {
+        if (!hasCheckedStorage && storageKey) {
+            const alreadyDismissed = localStorage.getItem(storageKey);
+            if (alreadyDismissed === "true") {
+                setDismissed(true);
+            }
+            setHasCheckedStorage(true);
+        }
+    }, [hasCheckedStorage, storageKey]);
+
+    const handleClose = () => {
+        if (storageKey) {
+            localStorage.setItem(storageKey, "true");
+        }
+        setDismissed(true);
+    };
+
+    const isOpen = showZeroBalanceMessage && !dismissed && hasCheckedStorage;
+
+    if (!hasCheckedStorage) return null;
+
+    return (
+        <AnimatePresence>
+            {isOpen && (
+                <Dialog
+                    open={isOpen}
+                    onClose={handleClose}
+                    className="relative z-50"
+                >
+                    <motion.div
+                        initial={{ opacity: 0 }}
+                        animate={{ opacity: 1 }}
+                        exit={{ opacity: 0 }}
+                        transition={{ duration: 0.3 }}
+                        className="fixed inset-0 bg-black/25 backdrop-blur-sm dark:bg-black/40"
+                    />
+
+                    <div className="fixed inset-0 flex w-screen items-end sm:items-center sm:justify-center sm:p-4">
+                        <motion.div
+                            initial={{ y: "100%", opacity: 0 }}
+                            animate={{ y: 0, opacity: 1 }}
+                            exit={{ y: "100%", opacity: 0 }}
+                            transition={{ type: "spring", stiffness: 300, damping: 30 }}
+                            className="w-full"
+                        >
+                            <DialogPanel className="relative mx-auto w-full max-w-md sm:max-w-[28rem]">
+                                <motion.div
+                                    layout
+                                    initial={false}
+                                    className="relative overflow-hidden rounded-t-[30px] bg-white sm:rounded-3xl dark:bg-[#2C2C2C]"
+                                >
+                                    {/* Gradient header */}
+                                    <div
+                                        className="relative h-20 w-full"
+                                        style={{
+                                            background:
+                                                "linear-gradient(to right,rgb(116, 112, 13),rgb(22, 77, 129),rgb(54, 30, 100))",
+                                        }}
+                                    >
+                                        <button
+                                            onClick={handleClose}
+                                            className="absolute right-4 top-2 z-10 flex h-8 w-8 items-center justify-center rounded-full text-white transition-colors hover:bg-white/20"
+                                            aria-label="Close modal"
+                                        >
+                                            <Cancel01Icon className="h-5 w-5" />
+                                        </button>
+                                    </div>
+
+                                    {/* Content */}
+                                    <div className="relative -mt-6 w-full overflow-y-auto rounded-t-[24px] bg-white p-5 pt-8 text-text-body sm:max-h-[90vh] dark:bg-[#2C2C2C] dark:text-white">
+                                        <h2
+                                            className="mb-6 text-xl font-semibold"
+                                            style={{
+                                                background:
+                                                    "linear-gradient(107.4deg, #04FF44 9.42%, #EAAB12 36.67%, rgba(255, 107, 144, 0.6) 73.59%, #FF0087 92.55%, #5189F9 133.3%)",
+                                                WebkitBackgroundClip: "text",
+                                                WebkitTextFillColor: "transparent",
+                                                backgroundClip: "text",
+                                            }}
+                                        >
+                                            Your wallet is now exportable
+                                        </h2>
+
+                                        <div className="mb-4 space-y-4">
+                                            <div className="rounded-[20px] bg-accent-gray p-4 dark:border dark:border-white/10 dark:bg-white/5">
+                                                <p
+                                                    className="font-[Inter] text-sm font-normal leading-5 tracking-normal text-text-body dark:text-[#FFFFFFCC]"
+                                                    style={{ fontStyle: "normal", verticalAlign: "middle" }}
+                                                >
+                                                    Your address has been updated. This means you can now export your
+                                                    wallet and use it across different platforms like MetaMask.
+                                                </p>
+                                            </div>
+                                            <div className="rounded-[20px] bg-accent-gray p-4 dark:border dark:border-white/10 dark:bg-white/5">
+                                                <p
+                                                    className="font-[Inter] text-sm font-normal leading-5 tracking-normal text-text-body dark:text-[#FFFFFFCC]"
+                                                    style={{ fontStyle: "normal", verticalAlign: "middle" }}
+                                                >
+                                                    Note: If you&apos;ve saved or shared your wallet address elsewhere,
+                                                    make sure to update it to your new wallet address.
+                                                </p>
+                                            </div>
+                                        </div>
+
+                                        <button
+                                            type="button"
+                                            onClick={handleClose}
+                                            className="w-full rounded-xl bg-lavender-500 px-6 py-3.5 text-sm font-semibold text-white transition-all hover:opacity-90 focus:outline-none focus:ring-2 focus:ring-purple-500 focus:ring-offset-2 focus:ring-offset-white active:opacity-80 dark:focus:ring-offset-neutral-900"
+                                        >
+                                            I understand
+                                        </button>
+                                    </div>
+                                </motion.div>
+                            </DialogPanel>
+                        </motion.div>
+                    </div>
+                </Dialog>
+            )}
+        </AnimatePresence>
+    );
+};
diff --git a/app/components/MobileDropdown.tsx b/app/components/MobileDropdown.tsx
index 4a958b08..7875cd32 100644
--- a/app/components/MobileDropdown.tsx
+++ b/app/components/MobileDropdown.tsx
@@ -2,7 +2,7 @@
 import { Dialog, DialogPanel } from "@headlessui/react";
 import { AnimatePresence, motion } from "framer-motion";
 import { useState, useEffect } from "react";
-import { usePrivy, useMfaEnrollment } from "@privy-io/react-auth";
+import { usePrivy, useMfaEnrollment, useWallets } from "@privy-io/react-auth";
 import { useNetwork } from "../context/NetworksContext";
 import { useBalance, useTokens } from "../context";
 import { handleNetworkSwitch, detectWalletProvider } from "../utils";
@@ -22,6 +22,7 @@ import { WalletView, HistoryView, SettingsView } from "./wallet-mobile-modal";
 import { slideUpAnimation } from "./AnimatedComponents";
 import { FundWalletForm, TransferForm } from "./index";
 import { CopyAddressWarningModal } from "./CopyAddressWarningModal";
+import { useShouldUseEOA } from "../hooks/useEIP7702Account";
 
 export const MobileDropdown = ({
   isOpen,
@@ -39,6 +40,7 @@ export const MobileDropdown = ({
 
   const { selectedNetwork, setSelectedNetwork } = useNetwork();
   const { user, linkEmail, updateEmail } = usePrivy();
+  const { wallets } = useWallets();
   const { allBalances, isLoading, refreshBalance } = useBalance();
   const { allTokens } = useTokens();
   const { logout } = useLogout({
@@ -47,16 +49,29 @@ export const MobileDropdown = ({
     },
   });
   const { isInjectedWallet, injectedAddress } = useInjectedWallet();
+  const shouldUseEOA = useShouldUseEOA();
 
+  // Get embedded wallet (EOA) and smart wallet (SCW)
+  const embeddedWallet = wallets.find(
+    (wallet) => wallet.walletClientType === "privy"
+  );
+  const smartWallet = user?.linkedAccounts.find(
+    (account) => account.type === "smart_wallet"
+  );
+
+  // Determine active wallet based on migration status
+  // After migration: show EOA (new wallet with funds)
+  // Before migration: show SCW (old wallet)
   const activeWallet = isInjectedWallet
     ? { address: injectedAddress, type: "injected_wallet" }
-    : user?.linkedAccounts.find((account) => account.type === "smart_wallet");
+    : shouldUseEOA && embeddedWallet
+      ? { address: embeddedWallet.address, type: "eoa" }
+      : smartWallet;
 
   const { handleFundWallet } = useFundWalletHandler("Mobile menu");
 
-  const smartWallet = isInjectedWallet
-    ? { address: injectedAddress }
-    : user?.linkedAccounts.find((account) => account.type === "smart_wallet");
+  // Use activeWallet for consistency
+  const walletForCopy = activeWallet;
 
   const { currentStep } = useStep();
 
@@ -65,7 +80,7 @@ export const MobileDropdown = ({
   const { showMfaEnrollmentModal } = useMfaEnrollment();
 
   const handleCopyAddress = () => {
-    navigator.clipboard.writeText(smartWallet?.address ?? "");
+    navigator.clipboard.writeText(walletForCopy?.address ?? "");
     toast.success("Address copied to clipboard");
     setIsWarningModalOpen(true);
   };
@@ -90,16 +105,19 @@ export const MobileDropdown = ({
     onComplete?: (success: boolean) => void,
   ) => {
     await handleFundWallet(
-      smartWallet?.address ?? "",
+      walletForCopy?.address ?? "",
       amount,
       tokenAddress,
       onComplete,
     );
   };
 
+  // Get appropriate balance based on migration status
   const activeBalance = isInjectedWallet
     ? allBalances.injectedWallet
-    : allBalances.smartWallet;
+    : shouldUseEOA
+      ? allBalances.externalWallet
+      : allBalances.smartWallet;
 
   const handleNetworkSwitchWrapper = (network: Network) => {
     if (currentStep !== STEPS.FORM) {
@@ -140,14 +158,14 @@ export const MobileDropdown = ({
       body: JSON.stringify(payload),
       signal: controller.signal
     })
-    .catch(error => {
-      if (error.name !== 'AbortError') {
-        console.warn('Logout tracking failed:', error);
-      }
-    })
-    .finally(() => {
-      clearTimeout(timeoutId);
-    });
+      .catch(error => {
+        if (error.name !== 'AbortError') {
+          console.warn('Logout tracking failed:', error);
+        }
+      })
+      .finally(() => {
+        clearTimeout(timeoutId);
+      });
   };
 
   const handleLogout = async () => {
@@ -220,7 +238,7 @@ export const MobileDropdown = ({
                               getTokenImageUrl={getTokenImageUrl}
                               onTransfer={() => setCurrentView("transfer")}
                               onFund={() => setCurrentView("fund")}
-                              smartWallet={smartWallet}
+                              smartWallet={walletForCopy}
                               handleCopyAddress={handleCopyAddress}
                               isNetworkListOpen={isNetworkListOpen}
                               setIsNetworkListOpen={setIsNetworkListOpen}
@@ -289,10 +307,10 @@ export const MobileDropdown = ({
         )}
       </AnimatePresence>
 
-      <CopyAddressWarningModal 
+      <CopyAddressWarningModal
         isOpen={isWarningModalOpen}
         onClose={() => setIsWarningModalOpen(false)}
-        address={smartWallet?.address ?? ""}
+        address={walletForCopy?.address ?? ""}
       />
     </>
   );
diff --git a/app/components/Navbar.tsx b/app/components/Navbar.tsx
index c5fbc468..6a18926e 100644
--- a/app/components/Navbar.tsx
+++ b/app/components/Navbar.tsx
@@ -27,6 +27,8 @@ import Image from "next/image";
 import { useNetwork } from "../context/NetworksContext";
 import { useInjectedWallet } from "../context";
 import { useActualTheme } from "../hooks/useActualTheme";
+import { useWallets } from "@privy-io/react-auth";
+import { useShouldUseEOA } from "../hooks/useEIP7702Account";
 
 export const Navbar = () => {
   const [mounted, setMounted] = useState(false);
@@ -39,10 +41,25 @@ export const Navbar = () => {
   const isDark = useActualTheme();
 
   const { ready, authenticated, user } = usePrivy();
+  const { wallets } = useWallets();
+  const shouldUseEOA = useShouldUseEOA();
 
+  // Get embedded wallet (EOA) and smart wallet (SCW)
+  const embeddedWallet = wallets.find(
+    (wallet) => wallet.walletClientType === "privy"
+  );
+  const smartWallet = user?.linkedAccounts.find(
+    (account) => account.type === "smart_wallet"
+  );
+
+  // Determine active wallet based on migration status
+  // After migration: show EOA (new wallet with funds)
+  // Before migration: show SCW (old wallet)
   const activeWallet = isInjectedWallet
     ? { address: injectedAddress, type: "injected_wallet" }
-    : user?.linkedAccounts.find((account) => account.type === "smart_wallet");
+    : shouldUseEOA && embeddedWallet
+      ? { address: embeddedWallet.address, type: "eoa" }
+      : smartWallet;
 
   const { login } = useLogin({
     onComplete: async ({ user, isNewUser, loginMethod }) => {
@@ -223,9 +240,8 @@ export const Navbar = () => {
               <div className="hidden items-center sm:flex">
                 <Link
                   href="/"
-                  className={`${
-                    IS_MAIN_PRODUCTION_DOMAIN ? "" : "-mt-[3px]"
-                  } text-sm font-medium text-gray-700 transition-colors hover:text-gray-900 dark:text-white/80 dark:hover:text-white`}
+                  className={`${IS_MAIN_PRODUCTION_DOMAIN ? "" : "-mt-[3px]"
+                    } text-sm font-medium text-gray-700 transition-colors hover:text-gray-900 dark:text-white/80 dark:hover:text-white`}
                 >
                   Swap
                 </Link>
diff --git a/app/components/SettingsDropdown.tsx b/app/components/SettingsDropdown.tsx
index 3813b232..6a7ca7c6 100644
--- a/app/components/SettingsDropdown.tsx
+++ b/app/components/SettingsDropdown.tsx
@@ -19,17 +19,23 @@ import {
   Setting07Icon,
   Wallet01Icon,
   Key01Icon,
+  Download01Icon,
+  AccessIcon,
 } from "hugeicons-react";
 import { toast } from "sonner";
 import { useInjectedWallet } from "../context";
 import { useWalletDisconnect } from "../hooks/useWalletDisconnect";
 import { CopyAddressWarningModal } from "./CopyAddressWarningModal";
+import { useWallets } from "@privy-io/react-auth";
+import { useShouldUseEOA } from "../hooks/useEIP7702Account";
 
 export const SettingsDropdown = () => {
-  const { user, updateEmail } = usePrivy();
+  const { user, updateEmail, exportWallet } = usePrivy();
+  const { wallets } = useWallets();
   const { showMfaEnrollmentModal } = useMfaEnrollment();
   const [isLoggingOut, setIsLoggingOut] = useState(false);
   const { isInjectedWallet, injectedAddress } = useInjectedWallet();
+  const shouldUseEOA = useShouldUseEOA();
 
   const [isOpen, setIsOpen] = useState<boolean>(false);
   const [isAddressCopied, setIsAddressCopied] = useState(false);
@@ -41,10 +47,22 @@ export const SettingsDropdown = () => {
     handler: () => setIsOpen(false),
   });
 
+  // Get embedded wallet (EOA) and smart wallet (SCW)
+  const embeddedWallet = wallets.find(
+    (wallet) => wallet.walletClientType === "privy"
+  );
+  const smartWallet = user?.linkedAccounts.find(
+    (account) => account.type === "smart_wallet"
+  );
+
+  // Determine active wallet based on migration status
+  // After migration: show EOA (new wallet with funds)
+  // Before migration: show SCW (old wallet)
   const walletAddress = isInjectedWallet
     ? injectedAddress
-    : user?.linkedAccounts.find((account) => account.type === "smart_wallet")
-        ?.address;
+    : shouldUseEOA && embeddedWallet
+      ? embeddedWallet.address
+      : smartWallet?.address;
 
   const handleCopyAddress = () => {
     navigator.clipboard.writeText(walletAddress ?? "");
@@ -257,7 +275,7 @@ export const SettingsDropdown = () => {
                     </button>
                   </li>
                 ))}
-              {/* {!isInjectedWallet && (
+              {!isInjectedWallet && (
                 <li
                   role="menuitem"
                   className="flex cursor-pointer items-center gap-2.5 rounded-lg transition-all duration-300 hover:bg-accent-gray dark:hover:bg-neutral-700"
@@ -266,7 +284,7 @@ export const SettingsDropdown = () => {
                   <AccessIcon className="size-5 text-icon-outline-secondary dark:text-white/50" />
                   <p>Export wallet</p>
                 </li>
-              )} */}
+              )}
               {!isInjectedWallet && (
                 <li
                   role="menuitem"
diff --git a/app/components/TransferForm.tsx b/app/components/TransferForm.tsx
index aace4fe5..d3a4d013 100644
--- a/app/components/TransferForm.tsx
+++ b/app/components/TransferForm.tsx
@@ -1,8 +1,9 @@
 "use client";
 import React, { useEffect, useState, useRef } from "react";
 import { useForm } from "react-hook-form";
-import { usePrivy } from "@privy-io/react-auth";
+import { usePrivy, useWallets } from "@privy-io/react-auth";
 import { useSmartWallets } from "@privy-io/react-auth/smart-wallets";
+import { useShouldUseEOA, useWalletMigrationStatus } from "../hooks/useEIP7702Account";
 import { useNetwork } from "../context/NetworksContext";
 import { useBalance, useTokens } from "../context";
 import {
@@ -44,6 +45,9 @@ export const TransferForm: React.FC<{
   const { selectedNetwork } = useNetwork();
   const { client } = useSmartWallets();
   const { user, getAccessToken } = usePrivy();
+  const { wallets } = useWallets();
+  const shouldUseEOA = useShouldUseEOA();
+  const { isChecking: isMigrationChecking } = useWalletMigrationStatus();
   const { refreshBalance } = useBalance();
   const { allTokens } = useTokens();
   const useInjectedWallet = shouldUseInjectedWallet(searchParams);
@@ -112,10 +116,11 @@ export const TransferForm: React.FC<{
     error,
   } = useSmartWalletTransfer({
     client: client ?? null,
-    selectedNetwork: transferNetwork,  // Use the recipient's network, not global
+    selectedNetwork: transferNetwork,
     user,
     supportedTokens: fetchedTokens,
     getAccessToken,
+    refreshBalance,
   });
 
   useEffect(() => {
@@ -140,14 +145,31 @@ export const TransferForm: React.FC<{
   }, [isTransferSuccess, onSuccess]);
 
   // Fetch balance for the selected transfer network
+  // After migration: use EOA; before: use SCW. Wait for migration status so we don't show SCW (0) while loading.
   useEffect(() => {
     const fetchBalance = async () => {
       const smartWalletAccount = user?.linkedAccounts.find(
         (account) => account.type === "smart_wallet",
       );
+      const embeddedWallet = wallets.find(
+        (w) => w.walletClientType === "privy",
+      );
+
+      if (isMigrationChecking) {
+        setIsBalanceLoading(true);
+        return;
+      }
+      if (shouldUseEOA && !embeddedWallet) {
+        setIsBalanceLoading(true);
+        return;
+      }
+
+      const activeAddress =
+        shouldUseEOA && embeddedWallet
+          ? embeddedWallet.address
+          : smartWalletAccount?.address;
 
-      // No smart wallet account - set empty balance state (not loading, not error)
-      if (!smartWalletAccount?.address) {
+      if (!activeAddress) {
         setTransferNetworkBalance({ total: 0, balances: {} });
         setIsBalanceLoading(false);
         setBalanceError(null);
@@ -161,7 +183,7 @@ export const TransferForm: React.FC<{
       try {
         const balance = await fetchBalanceForNetwork(
           transferNetwork,
-          smartWalletAccount.address,
+          activeAddress,
         );
         setTransferNetworkBalance(balance);
         setBalanceError(null);
@@ -177,7 +199,7 @@ export const TransferForm: React.FC<{
     };
 
     fetchBalance();
-  }, [transferNetwork, user?.linkedAccounts]);
+  }, [transferNetwork, user?.linkedAccounts, wallets, shouldUseEOA, isMigrationChecking]);
 
   // Close dropdown when clicking outside or pressing Escape
   useEffect(() => {
@@ -406,11 +428,10 @@ export const TransferForm: React.FC<{
             aria-controls="recipient-network-listbox"
           >
             <span
-              className={`flex items-center gap-3 ${
-                recipientNetwork
+              className={`flex items-center gap-3 ${recipientNetwork
                   ? "text-neutral-900 dark:text-white"
                   : "text-gray-400 dark:text-white/30"
-              }`}
+                }`}
             >
               <img
                 src={recipientNetworkImageUrl}
@@ -420,9 +441,8 @@ export const TransferForm: React.FC<{
               {recipientNetwork || "Select network"}
             </span>
             <ArrowDown01Icon
-              className={`absolute right-3 top-1/2 size-4 -translate-y-1/2 text-outline-gray transition-transform dark:text-white/50 ${
-                isNetworkDropdownOpen ? "rotate-180" : ""
-              }`}
+              className={`absolute right-3 top-1/2 size-4 -translate-y-1/2 text-outline-gray transition-transform dark:text-white/50 ${isNetworkDropdownOpen ? "rotate-180" : ""
+                }`}
             />
           </button>
 
@@ -529,11 +549,10 @@ export const TransferForm: React.FC<{
                   message: "Invalid amount",
                 },
               })}
-              className={`w-full bg-transparent text-3xl font-medium outline-none transition-all placeholder:text-gray-400 focus:outline-none disabled:cursor-not-allowed dark:placeholder:text-white/30 ${
-                errors.amount
+              className={`w-full bg-transparent text-3xl font-medium outline-none transition-all placeholder:text-gray-400 focus:outline-none disabled:cursor-not-allowed dark:placeholder:text-white/30 ${errors.amount
                   ? "text-red-500 dark:text-red-500"
                   : "text-neutral-900 dark:text-white"
-              }`}
+                }`}
               placeholder="0"
               title="Enter amount to send"
             />
diff --git a/app/components/WalletDetails.tsx b/app/components/WalletDetails.tsx
index 5c012ec1..ab1ded46 100644
--- a/app/components/WalletDetails.tsx
+++ b/app/components/WalletDetails.tsx
@@ -7,8 +7,9 @@ import {
   shortenAddress,
 } from "../utils";
 import { useBalance } from "../context/BalanceContext";
-import { usePrivy } from "@privy-io/react-auth";
+import { usePrivy, useWallets } from "@privy-io/react-auth";
 import { useNetwork } from "../context/NetworksContext";
+import { useShouldUseEOA } from "../hooks/useEIP7702Account";
 import {
   ArrowRight03Icon,
   Copy01Icon,
@@ -55,7 +56,9 @@ export const WalletDetails = () => {
   const { allBalances, isLoading, refreshBalance } = useBalance();
   const { isInjectedWallet, injectedAddress } = useInjectedWallet();
   const { user } = usePrivy();
+  const { wallets } = useWallets();
   const isDark = useActualTheme();
+  const shouldUseEOA = useShouldUseEOA();
 
   // Custom hook for handling wallet funding
   const { handleFundWallet } = useFundWalletHandler("Wallet details");
@@ -70,15 +73,29 @@ export const WalletDetails = () => {
     dependencies: [selectedNetwork],
   });
 
-  // Determine active wallet based on wallet type
+  // Get embedded wallet (EOA) and smart wallet (SCW)
+  const embeddedWallet = wallets.find(
+    (wallet) => wallet.walletClientType === "privy"
+  );
+  const smartWallet = user?.linkedAccounts.find(
+    (account) => account.type === "smart_wallet"
+  );
+
+  // Determine active wallet based on migration status
+  // After migration: show EOA (new wallet with funds)
+  // Before migration: show SCW (old wallet)
   const activeWallet = isInjectedWallet
     ? { address: injectedAddress }
-    : user?.linkedAccounts.find((account) => account.type === "smart_wallet");
+    : shouldUseEOA && embeddedWallet
+      ? { address: embeddedWallet.address }
+      : smartWallet;
 
-  // Get appropriate balance based on wallet type
+  // Balance: EOA when shouldUseEOA (migrated or 0-balance SCW), else SCW
   const activeBalance = isInjectedWallet
     ? allBalances.injectedWallet
-    : allBalances.smartWallet;
+    : shouldUseEOA
+      ? allBalances.externalWallet
+      : allBalances.smartWallet;
 
   // Handler for funding wallet with specified amount and token
   const handleFundWalletClick = async (
diff --git a/app/components/WalletMigrationBanner.tsx b/app/components/WalletMigrationBanner.tsx
new file mode 100644
index 00000000..30ecf187
--- /dev/null
+++ b/app/components/WalletMigrationBanner.tsx
@@ -0,0 +1,110 @@
+"use client";
+import Image from "next/image";
+import React, { useState } from "react";
+import { motion } from "framer-motion";
+import WalletMigrationModal from "./WalletMigrationModal";
+
+export const WalletMigrationBanner = () => {
+    const [isModalOpen, setIsModalOpen] = useState(false);
+
+    const handleStartMigration = () => {
+        setIsModalOpen(true);
+    };
+
+    const handleCloseModal = () => {
+        setIsModalOpen(false);
+    };
+
+    return (
+        <>
+            <motion.div
+                className="fixed left-0 right-0 top-16 z-10 mt-1 hidden h-16 w-full items-center bg-[#2D77E2] sm:flex"
+                initial={{ opacity: 0, y: -20 }}
+                animate={{ opacity: 1, y: 0 }}
+                transition={{ duration: 0.5, ease: "easeOut" }}
+            >
+                <div className="mx-auto flex w-full max-w-screen-2xl items-center justify-between px-4 py-4 lg:px-8">
+                    <div className="flex items-center gap-3">
+                        <div className="flex-shrink-0">
+                            <Image
+                                src="/images/desktop-eip-migration.png"
+                                alt="Migration Illustration"
+                                width={120}
+                                height={80}
+                                priority
+                                className="h-auto w-auto"
+                            />
+                        </div>
+
+                        <div className="flex flex-col items-start justify-center gap-1 text-left text-sm font-medium leading-tight text-white/80">
+                            <span className="block text-base font-bold leading-6 text-white/80">
+                                Your wallet address has been updated.
+                            </span>
+                            <span className="block text-sm font-medium leading-[21px] text-white/80">
+                                You can now export your wallet and use it with MetaMask or other platforms. Migration will be mandatory after{" "}
+                                <span className="font-semibold text-white">
+                                    28th February 2026.
+                                </span>{" "}
+                                Start migration to transfer your funds.
+                            </span>
+                        </div>
+                    </div>
+
+                    <div className="flex-shrink-0">
+                        <button
+                            onClick={handleStartMigration}
+                            className="whitespace-nowrap rounded-xl bg-white px-6 py-2.5 text-sm font-semibold text-neutral-900 transition-all hover:bg-white/90 focus:outline-none focus:ring-2 focus:ring-white/50 focus:ring-offset-2 focus:ring-offset-[#2D77E2] active:bg-white/80"
+                        >
+                            Start migration
+                        </button>
+                    </div>
+                </div>
+            </motion.div>
+
+            <motion.div
+                className="fixed left-0 right-0 top-16 z-10 mt-1 flex w-full flex-col bg-[#2D77E2] px-5 py-4 sm:hidden"
+                initial={{ opacity: 0, y: -20 }}
+                animate={{ opacity: 1, y: 0 }}
+                transition={{ duration: 0.5, ease: "easeOut" }}
+            >
+                <div className="absolute left-0 top-0 z-0 h-full">
+                    <Image
+                        src="/images/mobile-eip-migration.png"
+                        alt="Migration Illustration Mobile"
+                        width={80}
+                        height={100}
+                        priority
+                        className="h-40 w-auto object-contain"
+                    />
+                </div>
+
+                <div className="relative z-10 mb-6 pl-4 pr-10">
+                    <span className="block text-base font-bold leading-6 text-white/80">
+                        Your wallet address has been updated.
+                    </span>
+                    <span className="block text-sm font-medium leading-[21px] text-white/80">
+                        You can now export your wallet and use it with MetaMask or other platforms. Migration will be mandatory after{" "}
+                        <span className="font-semibold text-white">
+                            28th February 2026.
+                        </span>{" "}
+                        Start migration to transfer your funds.
+                    </span>
+                </div>
+
+                <div className="relative z-10 pl-4">
+                    <button
+                        onClick={handleStartMigration}
+                        className="rounded-xl bg-white px-8 py-3 text-base font-semibold text-neutral-900 transition-all hover:bg-white/90 active:bg-white/80"
+                    >
+                        Start migration
+                    </button>
+                </div>
+            </motion.div>
+
+            <WalletMigrationModal
+                isOpen={isModalOpen}
+                onClose={handleCloseModal}
+            />
+        </>
+    );
+};
\ No newline at end of file
diff --git a/app/components/WalletMigrationModal.tsx b/app/components/WalletMigrationModal.tsx
new file mode 100644
index 00000000..c7bca35a
--- /dev/null
+++ b/app/components/WalletMigrationModal.tsx
@@ -0,0 +1,216 @@
+"use client";
+import React, { useState } from "react";
+import Image from "next/image";
+import { AnimatePresence, motion } from "framer-motion";
+import { Dialog, DialogPanel } from "@headlessui/react";
+import { Cancel01Icon } from "hugeicons-react";
+import WalletTransferApprovalModal from "./WalletTransferApprovalModal";
+
+interface WalletMigrationModalProps {
+    isOpen: boolean;
+    onClose: () => void;
+}
+
+const WalletMigrationModal: React.FC<WalletMigrationModalProps> = ({
+    isOpen,
+    onClose,
+}) => {
+    const [showTransferModal, setShowTransferModal] = useState(false);
+
+    const handleApproveMigration = () => {
+        onClose();
+        setTimeout(() => {
+            setShowTransferModal(true);
+        }, 300);
+    };
+
+    const handleCloseTransferModal = () => {
+        setShowTransferModal(false);
+    };
+
+    return (
+        <>
+            <AnimatePresence>
+                {isOpen && (
+                    <Dialog
+                        key="wallet-migration-modal"
+                        open={isOpen}
+                        onClose={onClose}
+                        className="relative z-50"
+                    >
+                        <motion.div
+                            initial={{ opacity: 0 }}
+                            animate={{ opacity: 1 }}
+                            exit={{ opacity: 0 }}
+                            transition={{ duration: 0.3 }}
+                            className="fixed inset-0 bg-black/25 backdrop-blur-sm dark:bg-black/40"
+                        />
+
+                        <div className="fixed inset-0 flex w-screen items-end sm:items-center sm:justify-center sm:p-4">
+                            <motion.div
+                                initial={{ y: "100%", opacity: 0 }}
+                                animate={{ y: 0, opacity: 1 }}
+                                exit={{ y: "100%", opacity: 0 }}
+                                transition={{
+                                    type: "spring",
+                                    stiffness: 300,
+                                    damping: 30,
+                                }}
+                                className="w-full"
+                            >
+                                <DialogPanel
+                                    className="relative mx-auto w-full max-w-md sm:max-w-[28rem]"
+                                >
+                                    <motion.div
+                                        layout
+                                        initial={false}
+                                        className="relative overflow-hidden rounded-t-[30px] bg-white sm:rounded-3xl dark:bg-neutral-900"
+                                    >
+                                        <div
+                                            className="relative h-20 w-full"
+                                            style={{
+                                                background:
+                                                    "linear-gradient(to right,rgb(116, 112, 13),rgb(22, 77, 129),rgb(54, 30, 100))",
+                                            }}
+                                        >
+                                            <button
+                                                onClick={onClose}
+                                                className="absolute right-4 top-2 z-10 flex h-8 w-8 items-center justify-center rounded-full text-white transition-colors hover:bg-white/20"
+                                                aria-label="Close modal"
+                                            >
+                                                <Cancel01Icon className="h-5 w-5" />
+                                            </button>
+                                        </div>
+
+                                        {/* Content */}
+                                        <div className="relative -mt-6 w-full rounded-t-[24px] overflow-y-auto bg-white p-5 pt-8 text-lg text-text-body sm:max-h-[90vh] dark:bg-[#2C2C2C] dark:text-white">
+                                            <h2
+                                                className="mb-3 text-xl font-semibold"
+                                                style={{
+                                                    background: "linear-gradient(107.4deg, #04FF44 9.42%, #EAAB12 36.67%, rgba(255, 107, 144, 0.6) 73.59%, #FF0087 92.55%, #5189F9 133.3%)",
+                                                    WebkitBackgroundClip: "text",
+                                                    WebkitTextFillColor: "transparent",
+                                                    backgroundClip: "text",
+                                                }}
+                                            >
+                                                Complete your wallet upgrade
+                                            </h2>
+
+                                            {/* <div className="mb-3 text-sm font-medium text-text-secondary dark:text-white/50">
+                                                Chibie
+                                            </div>
+
+                                            <div className="mb-6 flex items-start gap-3 ">
+                                                <div className="flex-shrink-0">
+                                                    <div className="h-8 w-8 overflow-hidden">
+                                                        <Image
+                                                            src="/images/chibie-avatar.png"
+                                                            alt="Chibie"
+                                                            width={40}
+                                                            height={40}
+                                                            className="h-full w-full object-cover "
+                                                        />
+                                                    </div>
+                                                </div>
+                                                <div className="flex-1">
+                                                    <div className="w-[60%] sm:w-[52%] rounded-2xl rounded-bl-sm bg-accent-gray px-4 py-2 text-sm font-normal text-text-body dark:bg-neutral-700 dark:text-white/90">
+                                                        Hello, we are migrating!
+                                                    </div>
+                                                </div>
+                                            </div> */}
+
+                                            {/* Migration Overview */}
+                                            <div className="rounded-[20px] bg-accent-gray p-4 mb-6 dark:bg-[#373636]">
+                                                <p
+                                                    className="font-[Inter] text-sm font-normal leading-5 tracking-normal text-text-body px-2 pb-4 align-middle dark:text-[#FFFFFFCC]"
+                                                    style={{ fontStyle: "normal", verticalAlign: "middle" }}
+                                                >
+                                                    Your wallet address has been updated to give you more flexibility. After this migration, you&apos;ll be able to export your wallet and view your balance in MetaMask or any other wallet app.
+                                                </p>
+                                                <p
+                                                    className="font-[Inter] text-sm font-normal leading-5 tracking-normal text-text-body px-2 pb-4 align-middle dark:text-[#FFFFFFCC]"
+                                                    style={{ fontStyle: "normal", verticalAlign: "middle" }}
+                                                >
+                                                    We&apos;ll transfer your funds from your previous address to your new address. This is a one-time process.
+                                                </p>
+
+                                                <p className="text-sm font-bold leading-5 tracking-normal text-text-body px-2 mb-3 align-middle dark:text-[#FFFFFFCC]">
+                                                    What you&apos;re getting:
+                                                </p>
+                                                <div className="rounded-[20px] bg-white px-4 py-3 mb-4 dark:bg-[#3d3d3d] space-y-3">
+                                                    <div className="flex items-center gap-3">
+                                                        <div className="flex h-10 w-10 flex-shrink-0 items-center justify-center">
+                                                            <Image
+                                                                src="/images/sent.png"
+                                                                alt="Export wallet"
+                                                                width={32}
+                                                                height={32}
+                                                                className="h-8 w-8 object-contain"
+                                                            />
+                                                        </div>
+                                                        <p className="text-sm font-normal leading-5 tracking-normal text-text-body min-w-0 dark:text-white/90">
+                                                            Ability to export your wallet
+                                                        </p>
+                                                    </div>
+                                                    <div className="flex items-center gap-3">
+                                                        <div className="flex h-10 w-10 flex-shrink-0 items-center justify-center">
+                                                            <Image
+                                                                src="/images/wallet.png"
+                                                                alt="Use balance in MetaMask or other platforms"
+                                                                width={32}
+                                                                height={32}
+                                                                className="h-8 w-8 object-contain"
+                                                            />
+                                                        </div>
+                                                        <p className="text-sm font-normal leading-5 tracking-normal text-text-body min-w-0 dark:text-white/90">
+                                                            Use your balance in MetaMask or other platforms
+                                                        </p>
+                                                    </div>
+                                                    <div className="flex items-center gap-3">
+                                                        <div className="flex h-10 w-10 flex-shrink-0 items-center justify-center">
+                                                            <Image
+                                                                src="/images/locked.png"
+                                                                alt="Same security, more control"
+                                                                width={32}
+                                                                height={32}
+                                                                className="h-8 w-8 object-contain"
+                                                            />
+                                                        </div>
+                                                        <p className="text-sm font-normal leading-5 tracking-normal text-text-body min-w-0 dark:text-white/90">
+                                                            Same security, more control
+                                                        </p>
+                                                    </div>
+                                                </div>
+
+                                                {/* Call to Action Explanation */}
+                                                <p className="text-sm font-normal leading-5 tracking-normal text-text-body align-middle dark:text-[#FFFFFFCC]">
+                                                    All you have to do is approve both actions and we will do all the heavy liftings for you
+                                                </p>
+                                            </div>
+
+                                            {/* Approve Migration Button */}
+                                            <button
+                                                onClick={handleApproveMigration}
+                                                className="w-full rounded-xl bg-lavender-500 px-6 py-3.5 text-sm font-semibold text-white transition-all hover:opacity-90 focus:outline-none focus:ring-2 focus:ring-purple-500 focus:ring-offset-2 focus:ring-offset-white active:opacity-80 dark:focus:ring-offset-neutral-900"
+                                            >
+                                                Approve Transfer
+                                            </button>
+                                        </div>
+                                    </motion.div>
+                                </DialogPanel>
+                            </motion.div>
+                        </div>
+                    </Dialog>
+                )}
+            </AnimatePresence>
+
+            <WalletTransferApprovalModal
+                isOpen={showTransferModal}
+                onClose={handleCloseTransferModal}
+            />
+        </>
+    );
+};
+
+export default WalletMigrationModal;
+
diff --git a/app/components/WalletMigrationSuccessModal.tsx b/app/components/WalletMigrationSuccessModal.tsx
new file mode 100644
index 00000000..f8fbd5e3
--- /dev/null
+++ b/app/components/WalletMigrationSuccessModal.tsx
@@ -0,0 +1,100 @@
+"use client";
+import React from "react";
+import { AnimatePresence, motion } from "framer-motion";
+import { Dialog, DialogPanel } from "@headlessui/react";
+import { Cancel01Icon, CheckmarkCircle01Icon } from "hugeicons-react";
+
+interface WalletMigrationSuccessModalProps {
+    isOpen: boolean;
+    onClose: () => void;
+}
+
+const WalletMigrationSuccessModal: React.FC<WalletMigrationSuccessModalProps> = ({
+    isOpen,
+    onClose,
+}) => {
+
+    const handleContinue = () => {
+        onClose();
+    };
+
+    return (
+        <AnimatePresence>
+            {isOpen && (
+                <Dialog
+                    key="wallet-migration-success-modal"
+                    open={isOpen}
+                    onClose={onClose}
+                    className="relative z-50"
+                >
+                    <motion.div
+                        initial={{ opacity: 0 }}
+                        animate={{ opacity: 1 }}
+                        exit={{ opacity: 0 }}
+                        transition={{ duration: 0.3 }}
+                        className="fixed inset-0 bg-black/25 backdrop-blur-sm dark:bg-black/40"
+                    />
+
+                    <div className="fixed inset-0 flex w-screen items-end sm:items-center sm:justify-center sm:p-4">
+                        <motion.div
+                            initial={{ y: "100%", opacity: 0 }}
+                            animate={{ y: 0, opacity: 1 }}
+                            exit={{ y: "100%", opacity: 0 }}
+                            transition={{
+                                type: "spring",
+                                stiffness: 300,
+                                damping: 30,
+                            }}
+                            className="w-full"
+                        >
+                            <DialogPanel className="relative mx-auto w-full max-w-md sm:max-w-[28rem]">
+                                <motion.div
+                                    layout
+                                    initial={false}
+                                    className="relative overflow-hidden rounded-t-[30px] bg-white sm:rounded-3xl dark:bg-neutral-900"
+                                >
+                                    <div
+                                        className="relative h-20 w-full"
+                                        style={{
+                                            background:
+                                                "linear-gradient(to right,rgb(116, 112, 13),rgb(22, 77, 129),rgb(54, 30, 100))",
+                                        }}
+                                    >
+                                        <button
+                                            onClick={onClose}
+                                            className="absolute right-4 top-2 z-10 flex h-8 w-8 items-center justify-center rounded-full text-white transition-colors hover:bg-white/20"
+                                            aria-label="Close modal"
+                                        >
+                                            <Cancel01Icon className="h-5 w-5" />
+                                        </button>
+                                    </div>
+
+                                    <div className="relative -mt-6 w-full rounded-t-[24px] overflow-y-auto bg-white p-5 pt-8 text-lg text-text-body sm:max-h-[90vh] dark:bg-[#2C2C2C] dark:text-white">
+                                        <div className=" flex items-center justify-center mb-6">
+                                            <CheckmarkCircle01Icon className="w-24 h-24 text-[#39C65D]" strokeWidth={1} />
+                                        </div>
+
+                                        <h2 className="mb-4 text-center text-xl font-semibold text-text-body dark:text-white">
+                                            Migration successful
+                                        </h2>
+                                        <p className="mb-8 text-center text-sm font-normal leading-relaxed text-text-body/90 dark:text-white/90">
+                                            You can now continue converting your stablecoins to fiats at zero fees on noblocks
+                                        </p>
+                                        <button
+                                            onClick={handleContinue}
+                                            className="w-full rounded-xl bg-lavender-500 px-6 py-3.5 text-sm font-medium text-white transition-all hover:opacity-90 focus:outline-none focus:ring-2 focus:ring-purple-500 focus:ring-offset-2 focus:ring-offset-white active:opacity-80 dark:focus:ring-offset-neutral-900"
+                                        >
+                                            Let's go!
+                                        </button>
+                                    </div>
+                                </motion.div>
+                            </DialogPanel>
+                        </motion.div>
+                    </div>
+                </Dialog>
+            )}
+        </AnimatePresence>
+    );
+};
+
+export default WalletMigrationSuccessModal;
diff --git a/app/components/WalletTransferApprovalModal.tsx b/app/components/WalletTransferApprovalModal.tsx
new file mode 100644
index 00000000..37c6770b
--- /dev/null
+++ b/app/components/WalletTransferApprovalModal.tsx
@@ -0,0 +1,549 @@
+"use client";
+import React, { useState, useMemo, useEffect } from "react";
+import { AnimatePresence, motion } from "framer-motion";
+import { Dialog, DialogPanel } from "@headlessui/react";
+import { Cancel01Icon, Wallet01Icon, InformationCircleIcon, InformationSquareIcon } from "hugeicons-react";
+import Image from "next/image";
+import { useBalance } from "../context/BalanceContext";
+import { useTokens } from "../context";
+import { useNetwork } from "../context/NetworksContext";
+import { usePrivy, useWallets } from "@privy-io/react-auth";
+import { useSmartWallets } from "@privy-io/react-auth/smart-wallets";
+import { formatCurrency, shortenAddress, getNetworkImageUrl, fetchWalletBalance } from "../utils";
+import { useActualTheme } from "../hooks/useActualTheme";
+import { getCNGNRateForNetwork } from "../hooks/useCNGNRate";
+import WalletMigrationSuccessModal from "./WalletMigrationSuccessModal";
+import { type Address, encodeFunctionData, parseAbi, createPublicClient, http, parseUnits } from "viem";
+import { toast } from "sonner";
+import { networks } from "../mocks";
+
+// Map network names to viem chains
+const CHAIN_MAP = Object.fromEntries(
+    networks.map(n => [n.chain.name, n.chain])
+);
+
+interface WalletTransferApprovalModalProps {
+    isOpen: boolean;
+    onClose: () => void;
+}
+
+const WalletTransferApprovalModal: React.FC<WalletTransferApprovalModalProps> = ({
+    isOpen,
+    onClose,
+}) => {
+    const [showSuccessModal, setShowSuccessModal] = useState(false);
+    const [isProcessing, setIsProcessing] = useState(false);
+    const [error, setError] = useState<string | null>(null);
+    const [progress, setProgress] = useState<string>("");
+    const [allChainBalances, setAllChainBalances] = useState<Record<string, Record<string, number>>>({});
+    const [isFetchingBalances, setIsFetchingBalances] = useState(false);
+    const [chainRates, setChainRates] = useState<Record<string, number | null>>({});
+
+    const { allBalances, isLoading } = useBalance();
+    const { allTokens } = useTokens();
+    const { selectedNetwork } = useNetwork();
+    const { user, getAccessToken } = usePrivy();
+    const { wallets } = useWallets();
+    const { client: smartWalletClient } = useSmartWallets();
+    const isDark = useActualTheme();
+
+    // Get wallet addresses
+    const smartWallet = user?.linkedAccounts.find(a => a.type === "smart_wallet");
+    const embeddedWallet = wallets.find(w => w.walletClientType === "privy");
+
+    const oldAddress = smartWallet?.address; // SCW
+    const newAddress = embeddedWallet?.address; // EOA
+
+    // -------------------- Fetch balances from all networks --------------------
+    useEffect(() => {
+        if (!isOpen || !oldAddress) return;
+
+        const fetchAllChainBalances = async () => {
+            setIsFetchingBalances(true);
+            const balancesByChain: Record<string, Record<string, number>> = {};
+
+            // Fetch balances for each supported network
+            for (const network of networks) {
+                try {
+                    const publicClient = createPublicClient({
+                        chain: network.chain,
+                        transport: http(),
+                    });
+
+                    const result = await fetchWalletBalance(
+                        publicClient,
+                        oldAddress
+                    );
+
+                    // Only include chains with non-zero balances
+                    const hasBalance = Object.values(result.balances).some(b => b > 0);
+                    if (hasBalance) {
+                        balancesByChain[network.chain.name] = result.balances;
+                    }
+                } catch (error) {
+                    console.error(`Error fetching balances for ${network.chain.name}:`, error);
+                }
+            }
+
+            setAllChainBalances(balancesByChain);
+            setIsFetchingBalances(false);
+        };
+
+        fetchAllChainBalances();
+    }, [isOpen, oldAddress]);
+
+    // -------------------- Fetch CNGN rates for each chain --------------------
+    useEffect(() => {
+        if (!isOpen || Object.keys(allChainBalances).length === 0) return;
+
+        const fetchChainRates = async () => {
+            const rates: Record<string, number | null> = {};
+
+            // Fetch rates for chains that have CNGN tokens
+            for (const [chainName, balances] of Object.entries(allChainBalances)) {
+                if (balances.CNGN || balances.cNGN) {
+                    try {
+                        const rate = await getCNGNRateForNetwork(chainName);
+                        rates[chainName] = rate;
+                    } catch (error) {
+                        console.error(`Error fetching CNGN rate for ${chainName}:`, error);
+                        rates[chainName] = null;
+                    }
+                }
+            }
+
+            setChainRates(rates);
+        };
+
+        fetchChainRates();
+    }, [isOpen, allChainBalances]);
+
+    // -------------------- Group tokens by chain from all networks --------------------
+    const tokensByChain = useMemo(() => {
+        const grouped: Record<string, any[]> = {};
+
+        // Process balances from all chains
+        for (const [chainName, balances] of Object.entries(allChainBalances)) {
+            const fetchedTokens = allTokens[chainName] || [];
+
+            for (const [symbol, balance] of Object.entries(balances)) {
+                const balanceNum = balance as number;
+                if (balanceNum <= 0) continue;
+
+                const tokenMeta = fetchedTokens.find(t =>
+                    t.symbol.toUpperCase() === symbol.toUpperCase()
+                );
+
+                if (tokenMeta?.address) {
+                    // Get CNGN rate for this specific chain if needed
+                    const isCNGN = symbol.toUpperCase() === "CNGN";
+                    const chainRate = isCNGN ? chainRates[chainName] : undefined;
+                    let usdValue = balanceNum;
+                    if (isCNGN && chainRate) {
+                        usdValue = balanceNum / chainRate;
+                    }
+
+                    const token = {
+                        id: `${chainName}-${symbol}`,
+                        chain: chainName,
+                        name: tokenMeta.name || symbol,
+                        symbol,
+                        amount: balanceNum,
+                        displayAmount: balanceNum.toFixed(2),
+                        value: `${usdValue.toFixed(2)}`,
+                        icon: `/logos/${symbol.toLowerCase()}-logo.svg`,
+                        address: tokenMeta.address,
+                        decimals: tokenMeta.decimals || 18,
+                    };
+
+                    if (!grouped[chainName]) {
+                        grouped[chainName] = [];
+                    }
+
+                    grouped[chainName].push(token);
+                } else {
+                    console.warn(`⚠️ No metadata found for ${symbol} on ${chainName}`);
+                }
+            }
+        }
+
+        return grouped;
+    }, [allChainBalances, allTokens, chainRates]);
+
+    // Flatten for display
+    const tokens = useMemo(() => {
+        return Object.values(tokensByChain).flat();
+    }, [tokensByChain]);
+
+    const totalBalance = useMemo(() => {
+        const sum = tokens.reduce((acc, t) => acc + parseFloat(t.value || "0"), 0);
+        return formatCurrency(sum, "USD", "en-US");
+    }, [tokens]);
+
+    // Helper to get network config for a chain name
+    const getNetworkConfig = (chainName: string) => {
+        return networks.find(n => n.chain.name === chainName);
+    };
+
+    const handleCloseSuccessModal = () => {
+        setShowSuccessModal(false);
+        window.location.reload();
+    };
+
+    // Handle approve transfer
+    const handleApproveTransfer = async () => {
+        if (!user || !oldAddress || !newAddress || !embeddedWallet) {
+            setError("Wallet not ready");
+            return;
+        }
+
+        // ✅ Allow migration even with zero balance - need to deprecate old SCW
+        const hasTokens = tokens.length > 0;
+
+        if (!hasTokens) {
+            // No tokens to transfer, but still need to deprecate old wallet
+            setProgress("No tokens to migrate, but deprecating old wallet...");
+        }
+
+        setIsProcessing(true);
+        setError(null);
+        setProgress(hasTokens ? "Initializing migration..." : "Deprecating old wallet...");
+
+        try {
+            const accessToken = await getAccessToken();
+            if (!accessToken) throw new Error("Failed to get access token");
+
+            const allTxHashes: string[] = [];
+            const chains = Object.keys(tokensByChain);
+            let totalTokensMigrated = 0;
+
+            // ✅ If tokens exist, process transfers
+            if (hasTokens) {
+                // ✅ Check if smart wallet client is available
+                if (!smartWalletClient) {
+                    throw new Error("Smart wallet client not available. Please ensure you have a smart wallet linked.");
+                }
+
+                for (let i = 0; i < chains.length; i++) {
+                    const chainName = chains[i];
+                    const chainTokens = tokensByChain[chainName];
+                    const chain = CHAIN_MAP[chainName];
+
+                    if (!chain) {
+                        console.warn(`Chain ${chainName} not supported, skipping...`);
+                        continue;
+                    }
+
+                    setProgress(`Processing ${chainName} (${i + 1}/${chains.length})...`);
+
+                    try {
+                        // ✅ Switch to the correct chain using smart wallet client
+                        await smartWalletClient.switchChain({
+                            id: chain.id,
+                        });
+
+                        // ✅ Create public client for waiting for receipts
+                        const publicClient = createPublicClient({
+                            chain,
+                            transport: http(),
+                        });
+
+                        // ✅ Batch all token transfers into a single transaction for gasless execution
+                        // This uses Privy's smart wallet batch capability with Biconomy paymaster
+                        const calls = chainTokens.map((token) => {
+                            // Use parseUnits for precise decimal handling (avoids floating-point precision loss)
+                            const amountInWei = parseUnits(
+                                token.amount.toString(),
+                                token.decimals
+                            );
+
+                            // ✅ Encode the transfer function call
+                            const transferData = encodeFunctionData({
+                                abi: parseAbi(["function transfer(address to, uint256 amount) returns (bool)"]),
+                                functionName: "transfer",
+                                args: [newAddress as Address, amountInWei],
+                            });
+
+                            return {
+                                to: token.address as `0x${string}`,
+                                data: transferData as `0x${string}`,
+                                value: BigInt(0),
+                            };
+                        });
+
+                        if (calls.length === 0) {
+                            console.warn(`No tokens to migrate on ${chainName}`);
+                            continue;
+                        }
+
+                        setProgress(`Transferring ${calls.length} token(s) on ${chainName} (gasless)...`);
+
+                        // ✅ Send batched transaction from SCW
+                        const txHash = (await smartWalletClient.sendTransaction({
+                            calls,
+                        })) as `0x${string}`;
+
+                        allTxHashes.push(txHash);
+
+                        // ✅ Wait for transaction confirmation
+                        setProgress(`Confirming ${chainName} migration...`);
+
+                        const receipt = await publicClient.waitForTransactionReceipt({
+                            hash: txHash as `0x${string}`,
+                            confirmations: 1,
+                        });
+
+                        if (receipt.status === 'success') {
+                            totalTokensMigrated += calls.length;
+                            toast.success(`${chainName} migration complete!`, {
+                                description: `${calls.length} token(s) transferred to your EOA (gasless)`
+                            });
+                        } else {
+                            throw new Error(`Transaction failed for ${chainName}`);
+                        }
+
+                    } catch (chainError) {
+                        const errorMsg = chainError instanceof Error ? chainError.message : 'Unknown error';
+                        toast.error(`Failed to migrate ${chainName}`, {
+                            description: errorMsg
+                        });
+                    }
+                }
+            } // End of hasTokens block
+
+            // ✅ Update Backend - Deprecate old wallet
+            // This happens regardless of whether tokens were transferred
+            // (even if zero balance, we need to deprecate the old SCW)
+            setProgress("Finalizing migration...");
+
+            const response = await fetch("/api/v1/wallets/deprecate", {
+                method: "POST",
+                headers: {
+                    Authorization: `Bearer ${accessToken}`,
+                    "x-wallet-address": newAddress,
+                    "Content-Type": "application/json",
+                },
+                body: JSON.stringify({
+                    oldAddress,
+                    newAddress,
+                    txHash: allTxHashes.length > 0 ? allTxHashes[0] : null, // null if no transactions
+                    userId: user.id
+                }),
+            });
+
+            if (!response.ok) {
+                throw new Error("Failed to update backend");
+            }
+
+            toast.success("🎉 Migration Complete!", {
+                description: hasTokens
+                    ? `${totalTokensMigrated} token(s) successfully migrated to your EOA`
+                    : "Old wallet deprecated successfully",
+                duration: 5000,
+            });
+
+            onClose();
+            setTimeout(() => setShowSuccessModal(true), 300);
+
+        } catch (err) {
+            const errorMessage = err instanceof Error ? err.message : "Migration failed";
+            setError(errorMessage);
+            toast.error("Migration failed", {
+                description: errorMessage,
+            });
+        } finally {
+            setIsProcessing(false);
+            setProgress("");
+        }
+    };
+
+    // -------------------- UI --------------------
+    const displayOldAddress = shortenAddress(oldAddress ?? "", 6);
+    const displayNewAddress = shortenAddress(newAddress ?? "", 6);
+
+    return (
+        <>
+            <AnimatePresence>
+                {isOpen && (
+                    <Dialog
+                        open={isOpen}
+                        onClose={isProcessing ? () => { } : () => onClose()}
+                        className="relative z-50"
+                    >
+                        <motion.div
+                            initial={{ opacity: 0 }}
+                            animate={{ opacity: 1 }}
+                            exit={{ opacity: 0 }}
+                            transition={{ duration: 0.3 }}
+                            className="fixed inset-0 bg-black/25 backdrop-blur-sm dark:bg-black/40"
+                        />
+
+                        <div className="fixed inset-0 flex w-screen items-end sm:items-center sm:justify-center sm:p-4">
+                            <motion.div
+                                initial={{ y: "100%", opacity: 0 }}
+                                animate={{ y: 0, opacity: 1 }}
+                                exit={{ y: "100%", opacity: 0 }}
+                                transition={{ type: "spring", stiffness: 300, damping: 30 }}
+                                className="w-full"
+                            >
+                                <DialogPanel className="relative mx-auto w-full max-w-md sm:max-w-[28rem]">
+                                    <motion.div
+                                        layout
+                                        initial={false}
+                                        className="relative overflow-hidden rounded-t-[30px] bg-white sm:rounded-3xl dark:bg-neutral-900"
+                                    >
+                                        <div
+                                            className="relative h-20 w-full"
+                                            style={{ background: "linear-gradient(90deg, #746F0D 0%, #164D81 50%, #361E64 100%)" }}
+                                        >
+                                            <button
+                                                onClick={onClose}
+                                                className="absolute right-4 top-4 z-10 flex h-8 w-8 items-center justify-center rounded-full text-white/80 hover:bg-white/10 hover:text-white"
+                                                disabled={isProcessing}
+                                            >
+                                                <Cancel01Icon className="h-5 w-5" strokeWidth={2} />
+                                            </button>
+                                        </div>
+
+                                        <div className="relative -mt-6 w-full overflow-y-auto rounded-t-[24px] bg-white p-5 text-text-body sm:max-h-[90vh] dark:bg-[#363636] dark:text-white">
+                                            <div className="flex items-center justify-between">
+                                                <div>
+                                                    <span className="text-xl font-semibold">Wallet</span>
+                                                    <div className="flex items-center gap-2 pt-2">
+                                                        <Wallet01Icon className="h-5 w-5 text-text-secondary dark:text-white/60" strokeWidth={2} />
+                                                        <span
+                                                            className="font-[Inter] text-sm font-medium leading-5 tracking-normal text-text-body align-middle dark:text-[#FFFFFF]"
+                                                        >
+                                                            {displayOldAddress}
+                                                        </span>
+                                                    </div>
+                                                </div>
+
+                                                {/* Old Wallet Balance Card */}
+                                                <div className="space-y-3  p-4 dark:border-white/10 text-right">
+                                                    <span
+                                                        className="font-[Inter] text-sm font-normal leading-5 tracking-normal text-text-secondary dark:text-[#FFFFFF80]"
+                                                    >
+                                                        Total wallet balance
+                                                    </span>
+                                                    <div
+                                                        className="font-[Inter] text-2xl font-medium leading-9 tracking-tight text-text-body align-middle dark:text-[#FFFFFF]"
+
+                                                    >
+                                                        {isLoading ? "..." : totalBalance}
+                                                    </div>
+                                                </div>
+                                            </div>
+
+                                            {/* Progress indicator */}
+                                            {progress && (
+                                                <div className="mb-4 rounded-xl bg-blue-50 p-4 text-sm text-blue-600 dark:bg-blue-900/20 dark:text-blue-400">
+                                                    <div className="flex items-center gap-2">
+                                                        <div className="h-4 w-4 animate-spin rounded-full border-2 border-blue-600 border-t-transparent dark:border-blue-400 dark:border-t-transparent" />
+                                                        {progress}
+                                                    </div>
+                                                </div>
+                                            )}
+
+                                            {/* Token List - Each Network gets its own card */}
+                                            <div className="mb-4 space-y-3">
+                                                {isFetchingBalances || isLoading ? (
+                                                    <div className="text-sm text-text-secondary dark:text-white/50">Loading balances from all networks...</div>
+                                                ) : Object.keys(tokensByChain).length === 0 ? (
+                                                    <div className="text-sm text-text-secondary dark:text-white/50">No tokens found</div>
+                                                ) : (
+                                                    Object.entries(tokensByChain).map(([chainName, chainTokens]) => (
+                                                        <div key={chainName} className="rounded-3xl bg-background-neutral p-4 dark:bg-[#2C2C2C]">
+                                                            {/* Network Title */}
+                                                            <div className="mb-3">
+                                                                <h3 className="text-sm font-medium text-text-body dark:text-[#FFFFFFCC] capitalize">
+                                                                    {chainName}
+                                                                </h3>
+                                                            </div>
+
+                                                            {/* Network Tokens */}
+                                                            <div className="space-y-2">
+                                                                {chainTokens.map((token) => (
+                                                                    <div key={token.id} className="flex items-center gap-3 py-1">
+                                                                        <div className="relative flex-shrink-0">
+                                                                            <Image
+                                                                                src={token.icon}
+                                                                                alt={token.name}
+                                                                                width={24}
+                                                                                height={24}
+                                                                                className="size-6 rounded-full"
+                                                                                onError={(e) => {
+                                                                                    (e.target as HTMLImageElement).style.display = 'none';
+                                                                                }}
+                                                                            />
+                                                                            {(() => {
+                                                                                const networkConfig = getNetworkConfig(token.chain);
+                                                                                if (!networkConfig) return null;
+                                                                                const imageUrl = typeof networkConfig.imageUrl === 'string'
+                                                                                    ? networkConfig.imageUrl
+                                                                                    : (isDark ? networkConfig.imageUrl.dark : networkConfig.imageUrl.light);
+                                                                                return (
+                                                                                    <Image
+                                                                                        src={imageUrl}
+                                                                                        alt={token.chain}
+                                                                                        width={8}
+                                                                                        height={8}
+                                                                                        className="absolute -bottom-1 -right-1 size-3 rounded-full border border-white dark:border-gray-800"
+                                                                                    />
+                                                                                );
+                                                                            })()}
+                                                                        </div>
+                                                                        <span className="font-[Inter] text-sm font-medium text-text-body dark:text-white/90">
+                                                                            {token.displayAmount} {token.symbol}
+                                                                        </span>
+                                                                    </div>
+                                                                ))}
+                                                            </div>
+                                                        </div>
+                                                    ))
+                                                )}
+                                            </div>
+
+                                            {/* Info Banner */}
+                                            <div className="mb-6 flex items-start gap-2.5 rounded-2xl border border-border-light bg-accent-gray p-4 dark:border-white/10 dark:bg-[#3c3a38]">
+                                                {/* <InformationCircleIcon */}
+                                                <InformationSquareIcon
+                                                    className="mt-0.5 h-5 w-5 flex-shrink-0 text-text-secondary dark:text-white/60"
+                                                    strokeWidth={2}
+                                                />
+                                                <p className="text-sm font-normal leading-5 tracking-normal text-text-secondary dark:text-white/50">
+                                                    Your funds are safe, they are being transferred to your new secured wallet address{" "}
+                                                    <span className="font-semibold text-text-body dark:text-white/80">{displayNewAddress}</span>
+                                                </p>
+                                            </div>
+
+                                            {/* Error */}
+                                            {error && (
+                                                <div className="mb-4 rounded-xl bg-red-50 p-4 text-sm text-red-600 dark:bg-red-900/20 dark:text-red-400">
+                                                    {error}
+                                                </div>
+                                            )}
+
+                                            {/* Approve Transfer Button - enabled even with 0 balance (deprecate-only migration) */}
+                                            <button
+                                                onClick={handleApproveTransfer}
+                                                disabled={isProcessing || isLoading || isFetchingBalances}
+                                                className="w-full rounded-xl bg-lavender-500 px-6 py-3.5 text-base font-semibold text-white hover:opacity-90 disabled:opacity-50 disabled:cursor-not-allowed transition-opacity"
+                                            >
+                                                {isProcessing ? progress || "Processing migration..." : isFetchingBalances ? "Loading balances..." : tokens.length === 0 ? "Complete migration" : "Approve transfer"}
+                                            </button>
+                                        </div>
+                                    </motion.div>
+                                </DialogPanel>
+                            </motion.div>
+                        </div>
+                    </Dialog>
+                )}
+            </AnimatePresence>
+
+            <WalletMigrationSuccessModal isOpen={showSuccessModal} onClose={handleCloseSuccessModal} />
+        </>
+    );
+};
+
+export default WalletTransferApprovalModal;
\ No newline at end of file
diff --git a/app/components/index.ts b/app/components/index.ts
index fcb264eb..e84f5786 100644
--- a/app/components/index.ts
+++ b/app/components/index.ts
@@ -54,4 +54,5 @@ export { FundWalletForm } from "./FundWalletForm";
 export { TransferForm } from "./TransferForm";
 
 export { default as NoticeBanner } from "./NoticeBanner";
+export { WalletMigrationBanner } from "./WalletMigrationBanner";
 export { default as AppLayout } from "./AppLayout";
diff --git a/app/context/BalanceContext.tsx b/app/context/BalanceContext.tsx
index 76b6ffea..06ea046d 100644
--- a/app/context/BalanceContext.tsx
+++ b/app/context/BalanceContext.tsx
@@ -13,6 +13,7 @@ import {
   calculateCorrectedTotalBalance,
 } from "../utils";
 import { useCNGNRate } from "../hooks/useCNGNRate";
+import { useMigrationStatus } from "../hooks/useEIP7702Account";
 import { usePrivy, useWallets } from "@privy-io/react-auth";
 import { useNetwork } from "./NetworksContext";
 import { useSmartWallets } from "@privy-io/react-auth/smart-wallets";
@@ -64,6 +65,9 @@ export const BalanceProvider: FC<{ children: ReactNode }> = ({ children }) => {
     dependencies: [selectedNetwork],
   });
 
+  // Cannot use useShouldUseEOA here (it uses useBalance and would create a circular dependency)
+  const { isMigrationComplete } = useMigrationStatus();
+
   const fetchBalances = async () => {
     setIsLoading(true);
 
@@ -72,33 +76,56 @@ export const BalanceProvider: FC<{ children: ReactNode }> = ({ children }) => {
         const smartWalletAccount = user?.linkedAccounts.find(
           (account) => account.type === "smart_wallet",
         );
+        const embeddedWalletAccount = wallets.find(
+          (wallet) => wallet.walletClientType === "privy"
+        );
         const externalWalletAccount = wallets.find(
           (account) => account.connectorType === "injected",
         );
 
         if (client) {
-          await client.switchChain({
-            id: selectedNetwork.chain.id,
-          });
+          try {
+            await client.switchChain({
+              id: selectedNetwork.chain.id,
+            });
+          } catch (error) {
+            console.warn("Error switching smart wallet chain:", error);
+          }
         }
 
-        await externalWalletAccount?.switchChain(selectedNetwork.chain.id);
-
         const publicClient = createPublicClient({
           chain: selectedNetwork.chain,
           transport: http(
             selectedNetwork.chain.id === bsc.id
               ? "https://bsc-dataseed.bnbchain.org/"
-              : undefined,
+              : getRpcUrl(selectedNetwork.chain.name),
           ),
         });
 
-        if (smartWalletAccount) {
+        let primaryIsEOA = false;
+
+        if (isMigrationComplete && embeddedWalletAccount) {
+          // Migrated in DB: use EOA balance
+          primaryIsEOA = true;
+          const result = await fetchWalletBalance(
+            publicClient,
+            embeddedWalletAccount.address,
+          );
+          const correctedTotal = calculateCorrectedTotalBalance(
+            result,
+            cngnRate,
+          );
+          setExternalWalletBalance({
+            ...result,
+            total: correctedTotal,
+          });
+          setSmartWalletBalance(null);
+        } else if (smartWalletAccount) {
+          // Not migrated: fetch SCW balance first
           const result = await fetchWalletBalance(
             publicClient,
             smartWalletAccount.address,
           );
-          // Apply cNGN conversion correction
           const correctedTotal = calculateCorrectedTotalBalance(
             result,
             cngnRate,
@@ -107,16 +134,38 @@ export const BalanceProvider: FC<{ children: ReactNode }> = ({ children }) => {
             ...result,
             total: correctedTotal,
           });
+          // If SCW balance is 0, also fetch EOA so 0-balance users see EOA in nav (useShouldUseEOA is true elsewhere)
+          if (correctedTotal === 0 && embeddedWalletAccount) {
+            primaryIsEOA = true;
+            const eoaResult = await fetchWalletBalance(
+              publicClient,
+              embeddedWalletAccount.address,
+            );
+            const eoaCorrected = calculateCorrectedTotalBalance(
+              eoaResult,
+              cngnRate,
+            );
+            setExternalWalletBalance({
+              ...eoaResult,
+              total: eoaCorrected,
+            });
+          } else {
+            setExternalWalletBalance(null);
+          }
         } else {
           setSmartWalletBalance(null);
+          setExternalWalletBalance(null);
         }
 
-        if (externalWalletAccount) {
+        // Handle external injected wallets (separate from embedded wallet) – don't overwrite EOA balance for 0-balance users
+        if (externalWalletAccount &&
+          externalWalletAccount.address !== embeddedWalletAccount?.address &&
+          !isMigrationComplete &&
+          !primaryIsEOA) {
           const result = await fetchWalletBalance(
             publicClient,
             externalWalletAccount.address,
           );
-          // Apply cNGN conversion correction
           const correctedTotal = calculateCorrectedTotalBalance(
             result,
             cngnRate,
@@ -125,8 +174,6 @@ export const BalanceProvider: FC<{ children: ReactNode }> = ({ children }) => {
             ...result,
             total: correctedTotal,
           });
-        } else {
-          setExternalWalletBalance(null);
         }
 
         setInjectedWalletBalance(null);
@@ -179,11 +226,13 @@ export const BalanceProvider: FC<{ children: ReactNode }> = ({ children }) => {
   }, [
     ready,
     user,
+    wallets,
     selectedNetwork,
     isInjectedWallet,
     injectedReady,
     injectedAddress,
     cngnRate,
+    isMigrationComplete,
   ]);
 
   const allBalances = {
diff --git a/app/context/MigrationContext.tsx b/app/context/MigrationContext.tsx
new file mode 100644
index 00000000..b7da3952
--- /dev/null
+++ b/app/context/MigrationContext.tsx
@@ -0,0 +1,13 @@
+"use client";
+import { useWalletMigrationStatus } from "../hooks/useEIP7702Account";
+import { WalletMigrationBanner } from "../components";
+import { MigrationZeroBalanceModal } from "../components/MigrationZeroBalanceModal";
+
+export const MigrationBannerWrapper = () => {
+    const { needsMigration, isChecking, showZeroBalanceMessage } = useWalletMigrationStatus();
+
+    if (isChecking) return null;
+    if (needsMigration) return <WalletMigrationBanner />;
+    if (showZeroBalanceMessage) return <MigrationZeroBalanceModal showZeroBalanceMessage={showZeroBalanceMessage} />;
+    return null;
+};
\ No newline at end of file
diff --git a/app/context/index.ts b/app/context/index.ts
index e82de079..c584ef89 100644
--- a/app/context/index.ts
+++ b/app/context/index.ts
@@ -12,3 +12,4 @@ export {
   BlockFestModalProvider,
   useBlockFestModal,
 } from "./BlockFestModalContext";
+export { MigrationBannerWrapper } from "./MigrationContext";
\ No newline at end of file
diff --git a/app/hooks/useEIP7702Account.ts b/app/hooks/useEIP7702Account.ts
new file mode 100644
index 00000000..453514e9
--- /dev/null
+++ b/app/hooks/useEIP7702Account.ts
@@ -0,0 +1,261 @@
+"use client";
+import { usePrivy, useWallets, useSign7702Authorization } from "@privy-io/react-auth";
+import { useCallback, useEffect, useRef, useState } from "react";
+import {
+    type Address,
+    type Chain,
+    type PublicClient,
+    SignedAuthorization,
+    createPublicClient,
+    http,
+} from "viem";
+import { useBalance } from "../context/BalanceContext";
+
+// ################################################
+// ########## EIP-7702 LIB HELPERS ################
+// ################################################
+
+/** EIP-7702 magic prefix: authorized EOA bytecode starts with this. */
+export const EIP7702_MAGIC_PREFIX = "0xef0100";
+
+/**
+ * Parse the authorized implementation address from EOA bytecode (eth_getCode).
+ * Under EIP-7702, authorized EOAs expose bytecode starting with 0xef0100 followed by the 20-byte implementation address.
+ */
+export function parseEip7702AuthorizedAddress(
+    code: string | null | undefined
+): Address | null {
+    if (!code || code === "0x" || code === "0x0") return null;
+    const normalized = code.toLowerCase();
+    const idx = normalized.indexOf(EIP7702_MAGIC_PREFIX);
+    if (idx === -1) return null;
+    return `0x${normalized.slice(idx + EIP7702_MAGIC_PREFIX.length, idx + EIP7702_MAGIC_PREFIX.length + 40)}` as Address;
+}
+
+/**
+ * Detect whether an EOA is delegated via EIP-7702 and return the implementation address.
+ */
+export async function get7702ImplementationAddress(
+    publicClient: PublicClient,
+    address: Address
+): Promise<Address | null> {
+    const code = await publicClient.getCode({ address });
+    return parseEip7702AuthorizedAddress(code ?? undefined);
+}
+
+/**
+ * Get the EIP-7702 authorized implementation address for an EOA on a given chain.
+ * Creates a public client and runs getCode + parse. Use when you don't have a PublicClient.
+ */
+export async function get7702AuthorizedImplementationForAddress(
+    chain: Chain,
+    rpcUrl: string,
+    address: Address
+): Promise<Address | null> {
+    const publicClient = createPublicClient({
+        chain,
+        transport: http(rpcUrl),
+    });
+    return get7702ImplementationAddress(publicClient, address);
+}
+
+// ################################################
+// ########## MIGRATION STATUS HOOK ###############
+// ################################################
+
+interface MigrationStatus {
+    isMigrationComplete: boolean;
+    isLoading: boolean;
+}
+
+/**
+ * Hook to check if wallet migration is complete
+ * Returns the migration completion status from the API
+ */
+export function useMigrationStatus(): MigrationStatus {
+    const { user } = usePrivy();
+    const [isMigrationComplete, setIsMigrationComplete] = useState(false);
+    const [isLoading, setIsLoading] = useState(true);
+
+    useEffect(() => {
+        async function checkMigration() {
+            if (!user?.id) {
+                setIsLoading(false);
+                return;
+            }
+
+            try {
+                const response = await fetch(`/api/v1/wallets/migration-status?userId=${user.id}`);
+                if (response.ok) {
+                    const data = await response.json();
+                    setIsMigrationComplete(data.migrationCompleted ?? false);
+                }
+            } catch (error) {
+                console.error("Error checking migration status:", error);
+            } finally {
+                setIsLoading(false);
+            }
+        }
+
+        checkMigration();
+    }, [user?.id]);
+
+    return { isMigrationComplete, isLoading };
+}
+
+// ################################################
+// ########## SHOULD USE EOA (NAV + ACTIONS) ######
+// ################################################
+
+/**
+ * True when the app should use the embedded wallet (EOA) for nav, balance, createOrder, transfer.
+ * True if: migrated in DB, OR has smart wallet with 0 balance (treat as EOA without DB migration).
+ * During balance load we return the last known value so 0-balance users don't see SCW address flicker.
+ */
+export function useShouldUseEOA(): boolean {
+    const { user } = usePrivy();
+    const { isMigrationComplete } = useMigrationStatus();
+    const { allBalances, isLoading: isBalanceLoading } = useBalance();
+    const lastValueRef = useRef<boolean | null>(null);
+
+    const hasSmartWallet = !!user?.linkedAccounts?.find((a) => a.type === "smart_wallet");
+    const smartWalletBalance = allBalances.smartWallet?.total ?? 0;
+
+    if (isMigrationComplete) {
+        lastValueRef.current = true;
+        return true;
+    }
+    if (!hasSmartWallet) {
+        lastValueRef.current = false;
+        return false;
+    }
+    // During load, keep last value to avoid SCW→EOA flicker on refresh; first load prefer EOA if they have smart wallet
+    if (isBalanceLoading) return lastValueRef.current ?? hasSmartWallet;
+    const value = smartWalletBalance === 0;
+    lastValueRef.current = value;
+    return value;
+}
+
+// ################################################
+// ########## WALLET MIGRATION STATUS #############
+// ################################################
+
+interface WalletMigrationStatus {
+    needsMigration: boolean;
+    isChecking: boolean;
+    showZeroBalanceMessage: boolean;
+}
+
+/**
+ * Hook to check if wallet migration is needed
+ * - needsMigration: show full "Start migration" banner (has funds in SCW, not migrated)
+ * - showZeroBalanceMessage: show short text only (0 balance SCW; nav/actions use EOA)
+ */
+export function useWalletMigrationStatus(): WalletMigrationStatus {
+    const { user, authenticated } = usePrivy();
+    const { allBalances, isLoading: isBalanceLoading } = useBalance();
+    const [needsMigration, setNeedsMigration] = useState(false);
+    const [showZeroBalanceMessage, setShowZeroBalanceMessage] = useState(false);
+    const [isChecking, setIsChecking] = useState(true);
+
+    useEffect(() => {
+        async function checkMigrationStatus() {
+            if (!authenticated || !user) {
+                setNeedsMigration(false);
+                setShowZeroBalanceMessage(false);
+                setIsChecking(false);
+                return;
+            }
+
+            const smartWallet = user.linkedAccounts.find(
+                (account) => account.type === "smart_wallet"
+            );
+
+            if (!smartWallet) {
+                setNeedsMigration(false);
+                setShowZeroBalanceMessage(false);
+                setIsChecking(false);
+                return;
+            }
+
+            if (isBalanceLoading) return;
+
+            const smartWalletBalance = allBalances.smartWallet?.total ?? 0;
+
+            try {
+                const response = await fetch(`/api/v1/wallets/migration-status?userId=${user.id}`);
+
+                if (response.ok) {
+                    const data = await response.json();
+                    const alreadyMigrated = data.migrationCompleted ?? false;
+
+                    if (alreadyMigrated) {
+                        setNeedsMigration(false);
+                        setShowZeroBalanceMessage(false);
+                        setIsChecking(false);
+                        return;
+                    }
+
+                    // Not migrated: show banner only if has funds; else show short text only
+                    const hasBalance = smartWalletBalance > 0;
+                    setNeedsMigration(hasBalance);
+                    setShowZeroBalanceMessage(!hasBalance);
+                    setIsChecking(false);
+                    return;
+                }
+
+                const hasBalance = smartWalletBalance > 0;
+                setNeedsMigration(hasBalance);
+                setShowZeroBalanceMessage(!hasBalance);
+            } catch (error) {
+                const hasBalance = smartWalletBalance > 0;
+                setNeedsMigration(hasBalance);
+                setShowZeroBalanceMessage(!hasBalance);
+            }
+
+            setIsChecking(false);
+        }
+
+        checkMigrationStatus();
+    }, [authenticated, user?.id, allBalances.smartWallet?.total, isBalanceLoading]);
+
+    return { needsMigration, isChecking, showZeroBalanceMessage };
+}
+
+/** Biconomy Nexus 1.2.0 implementation address for EIP-7702 delegation. */
+export const BICONOMY_NEXUS_V120 = "0x000000004F43C49e93C970E84001853a70923B03" as const;
+
+/**
+ * Hook to sign EIP-7702 authorizations for Biconomy Nexus (MEE).
+ * Sign with the execution chainId so MEE has authorization for that chain (e.g. 8453 for Base).
+ *
+ * @see https://docs.biconomy.io/new/integration-guides/wallets-and-signers/privy
+ *
+ * @example
+ * const { signBiconomyAuthorization } = useBiconomy7702Auth();
+ * const authorization = await signBiconomyAuthorization(chain.id);
+ */
+export function useBiconomy7702Auth() {
+    const { signAuthorization } = useSign7702Authorization();
+    const { wallets } = useWallets();
+    const embeddedWallet = wallets.find((w) => w.walletClientType === "privy");
+
+    const signBiconomyAuthorization = useCallback(
+        async (chainId: number): Promise<SignedAuthorization> => {
+            if (!embeddedWallet?.address) {
+                throw new Error("Embedded wallet not ready for EIP-7702 signing");
+            }
+            const signed = await signAuthorization(
+                {
+                    contractAddress: BICONOMY_NEXUS_V120,
+                    chainId,
+                },
+                { address: embeddedWallet.address as Address }
+            );
+            return signed as SignedAuthorization;
+        },
+        [signAuthorization, embeddedWallet?.address]
+    );
+
+    return { signBiconomyAuthorization };
+}
\ No newline at end of file
diff --git a/app/hooks/useSmartWalletTransfer.ts b/app/hooks/useSmartWalletTransfer.ts
index fd36d6ec..dfde71de 100644
--- a/app/hooks/useSmartWalletTransfer.ts
+++ b/app/hooks/useSmartWalletTransfer.ts
@@ -1,11 +1,19 @@
 import { useState, useCallback } from "react";
-import { encodeFunctionData, erc20Abi, parseUnits } from "viem";
+import { encodeFunctionData, erc20Abi, parseUnits, http } from "viem";
 import { toast } from "sonner";
-import { getExplorerLink } from "../utils";
+import { getExplorerLink, getRpcUrl } from "../utils";
 import { saveTransaction } from "../api/aggregator";
 import { trackEvent } from "./analytics/useMixpanel";
 import type { Token, Network } from "../types";
 import type { User } from "@privy-io/react-auth";
+import { useShouldUseEOA, useBiconomy7702Auth } from "./useEIP7702Account";
+import { useWallets } from "@privy-io/react-auth";
+import {
+  createMeeClient,
+  toMultichainNexusAccount,
+  getMEEVersion,
+  MEEVersion,
+} from "@biconomy/abstractjs";
 
 interface SmartWalletClient {
   sendTransaction: (args: {
@@ -58,6 +66,11 @@ export function useSmartWalletTransfer({
   getAccessToken,
   refreshBalance,
 }: UseSmartWalletTransferParams): UseSmartWalletTransferReturn {
+  const shouldUseEOA = useShouldUseEOA();
+  const { wallets } = useWallets();
+  const { signBiconomyAuthorization } = useBiconomy7702Auth();
+  const embeddedWallet = wallets.find((w) => w.walletClientType === "privy");
+
   const [isLoading, setIsLoading] = useState(false);
   const [isSuccess, setIsSuccess] = useState(false);
   const [error, setError] = useState("");
@@ -65,7 +78,7 @@ export function useSmartWalletTransfer({
   const [transferAmount, setTransferAmount] = useState("");
   const [transferToken, setTransferToken] = useState("");
 
-  // Helper to get the embedded wallet address (with address)
+  // Helper to get the embedded wallet address (with address) for tx history
   const getEmbeddedWalletAddress = (): `0x${string}` | undefined => {
     if (!user?.linkedAccounts) return undefined;
     // Find the embedded wallet account with an address
@@ -80,13 +93,13 @@ export function useSmartWalletTransfer({
 
   const transfer = useCallback(
     async ({ amount, token, recipientAddress, resetForm }: TransferArgs) => {
-      // Track transfer attempt
+      const walletType = shouldUseEOA && embeddedWallet ? "EIP-7702 (MEE)" : "Smart wallet";
       trackEvent("Transfer started", {
         Amount: amount,
         "Send token": token,
         "Recipient address": recipientAddress,
         Network: selectedNetwork.chain.name,
-        "Wallet type": "Smart wallet",
+        "Wallet type": walletType,
         "Transfer date": new Date().toISOString(),
       });
 
@@ -99,7 +112,6 @@ export function useSmartWalletTransfer({
 
       try {
         const availableTokens: Token[] = supportedTokens;
-        await client?.switchChain({ id: selectedNetwork.chain.id });
         const searchToken = token.toUpperCase();
         const tokenData = availableTokens.find(
           (t) => t.symbol.toUpperCase() === searchToken,
@@ -121,19 +133,77 @@ export function useSmartWalletTransfer({
             `Token data not found for ${token}. Available tokens: ${availableTokens.map((t) => t.symbol).join(", ")}`,
           );
         }
-        // Send transaction and get hash
-        const hash = (await client?.sendTransaction({
-          to: tokenAddress,
-          data: encodeFunctionData({
-            abi: erc20Abi,
-            functionName: "transfer",
-            args: [
-              recipientAddress as `0x${string}`,
-              parseUnits(amount.toString(), tokenDecimals),
+
+        let hash: `0x${string}`;
+
+        if (shouldUseEOA && embeddedWallet) {
+          // EIP-7702 + Biconomy MEE path (migrated EOA or 0-balance SCW)
+          const chain = selectedNetwork.chain;
+          const chainId = chain.id;
+          await embeddedWallet.switchChain(chainId);
+          const provider = await embeddedWallet.getEthereumProvider();
+          const authorization = await signBiconomyAuthorization(chainId);
+          const nexusAccount = await toMultichainNexusAccount({
+            chainConfigurations: [
+              {
+                chain,
+                transport: http(getRpcUrl(selectedNetwork.chain.name)),
+                version: getMEEVersion(MEEVersion.V2_1_0),
+                accountAddress: embeddedWallet.address as `0x${string}`,
+              },
             ],
-          }) as `0x${string}`,
-          value: BigInt(0),
-        })) as `0x${string}`;
+            signer: provider,
+          });
+          const meeClient = await createMeeClient({
+            account: nexusAccount,
+            apiKey: process.env.NEXT_PUBLIC_BICONOMY_PAYMASTER_KEY ?? "",
+          });
+          const transferInstruction = await nexusAccount.buildComposable({
+            type: "default",
+            data: {
+              abi: erc20Abi,
+              chainId,
+              to: tokenAddress,
+              functionName: "transfer",
+              args: [
+                recipientAddress as `0x${string}`,
+                parseUnits(amount.toString(), tokenDecimals),
+              ],
+            },
+          });
+          const result = await meeClient.execute({
+            authorizations: [authorization],
+            delegate: true,
+            sponsorship: true,
+            instructions: [transferInstruction],
+          });
+          const receipt = await meeClient.waitForSupertransactionReceipt({
+            hash: result.hash,
+            waitForReceipts: true,
+          });
+          const onChainTxHash =
+            (receipt.receipts?.[0] as { transactionHash?: `0x${string}` } | undefined)
+              ?.transactionHash ??
+            (receipt.userOps?.[0] as { executionData?: `0x${string}` } | undefined)
+              ?.executionData;
+          hash = (onChainTxHash ?? result.hash) as `0x${string}`;
+        } else {
+          // Smart wallet path (pre-migration)
+          if (!client) throw new Error("Wallet not ready");
+          await client.switchChain({ id: selectedNetwork.chain.id });
+          hash = (await client.sendTransaction({
+            to: tokenAddress,
+            data: encodeFunctionData({
+              abi: erc20Abi,
+              functionName: "transfer",
+              args: [
+                recipientAddress as `0x${string}`,
+                parseUnits(amount.toString(), tokenDecimals),
+              ],
+            }) as `0x${string}`,
+            value: BigInt(0),
+          })) as `0x${string}`;
+        }
 
         if (!hash) throw new Error("No transaction hash returned");
         setTxHash(hash);
@@ -143,7 +213,7 @@ export function useSmartWalletTransfer({
         setIsSuccess(true);
         setIsLoading(false);
         toast.success(`${amount.toString()} ${token} successfully transferred`);
-        
+
         // Track successful transfer
         trackEvent("Transfer completed", {
           Amount: amount,
@@ -153,7 +223,7 @@ export function useSmartWalletTransfer({
           "Transaction hash": hash,
           "Transfer date": new Date().toISOString(),
         });
-        
+
         // Save to transaction history
         await saveTransferTransaction({
           txHash: hash,
@@ -167,7 +237,7 @@ export function useSmartWalletTransfer({
         const errorMessage = (e as { shortMessage?: string; message?: string }).shortMessage ||
           (e as { message?: string }).message ||
           "Transfer failed";
-        
+
         setError(errorMessage);
         setIsLoading(false);
         setIsSuccess(false);
@@ -180,9 +250,9 @@ export function useSmartWalletTransfer({
           Network: selectedNetwork.chain.name,
           "Reason for failure": errorMessage,
           "Transfer date": new Date().toISOString(),
-          "Error type": errorMessage.includes("429") ? "RPC Rate Limited" : 
-                       errorMessage.includes("HTTP") ? "RPC Connection Error" : 
-                       "Transaction Error",
+          "Error type": errorMessage.includes("429") ? "RPC Rate Limited" :
+            errorMessage.includes("HTTP") ? "RPC Connection Error" :
+              "Transaction Error",
         });
       }
     },
@@ -194,6 +264,9 @@ export function useSmartWalletTransfer({
       supportedTokens,
       getAccessToken,
       refreshBalance,
+      shouldUseEOA,
+      embeddedWallet,
+      signBiconomyAuthorization,
     ],
   );
 
diff --git a/app/lib/privy-config.ts b/app/lib/privy-config.ts
index 7be1a66d..e12215f1 100644
--- a/app/lib/privy-config.ts
+++ b/app/lib/privy-config.ts
@@ -1,4 +1,4 @@
-import { arbitrum, base, bsc, polygon, lisk, mainnet} from "viem/chains";
+import { arbitrum, base, bsc, polygon, lisk, mainnet } from "viem/chains";
 import {
   addRpcUrlOverrideToChain,
   type PrivyClientConfig,
diff --git a/app/pages/TransactionForm.tsx b/app/pages/TransactionForm.tsx
index 2f7117a0..a573624b 100644
--- a/app/pages/TransactionForm.tsx
+++ b/app/pages/TransactionForm.tsx
@@ -32,6 +32,7 @@ import { useSwapButton } from "../hooks/useSwapButton";
 import { fetchKYCStatus } from "../api/aggregator";
 import { useCNGNRate } from "../hooks/useCNGNRate";
 import { useFundWalletHandler } from "../hooks/useFundWalletHandler";
+import { useShouldUseEOA } from "../hooks/useEIP7702Account";
 import {
   useBalance,
   useInjectedWallet,
@@ -64,7 +65,8 @@ export const TransactionForm = ({
   const { authenticated, ready, login, user } = usePrivy();
   const { wallets } = useWallets();
   const { selectedNetwork } = useNetwork();
-  const { smartWalletBalance, injectedWalletBalance, isLoading } = useBalance();
+  const { smartWalletBalance, externalWalletBalance, injectedWalletBalance, isLoading } = useBalance();
+  const shouldUseEOA = useShouldUseEOA();
   const { isInjectedWallet, injectedAddress } = useInjectedWallet();
   const { allTokens } = useTokens();
 
@@ -110,13 +112,28 @@ export const TransactionForm = ({
     dependencies: [selectedNetwork],
   });
 
+  // Determine active wallet based on migration status
+  // After migration: use EOA (new wallet with funds)
+  // Before migration: use SCW (old wallet)
+  const embeddedWallet = wallets.find(
+    (wallet) => wallet.walletClientType === "privy"
+  );
+  const smartWallet = user?.linkedAccounts.find(
+    (account) => account.type === "smart_wallet"
+  );
+
   const activeWallet = isInjectedWallet
     ? { address: injectedAddress }
-    : user?.linkedAccounts.find((account) => account.type === "smart_wallet");
+    : shouldUseEOA && embeddedWallet
+      ? { address: embeddedWallet.address }
+      : smartWallet;
 
+  // Balance: EOA when shouldUseEOA (migrated or 0-balance SCW), else SCW
   const activeBalance = isInjectedWallet
     ? injectedWalletBalance
-    : smartWalletBalance;
+    : shouldUseEOA
+      ? externalWalletBalance
+      : smartWalletBalance;
 
   const balance = activeBalance?.balances[token] ?? 0;
 
@@ -670,11 +687,10 @@ export const TransactionForm = ({
                   }
                 }}
                 value={formattedSentAmount}
-                className={`w-full rounded-xl border-b border-transparent bg-transparent py-2 text-2xl outline-none transition-all placeholder:text-gray-400 focus:outline-none disabled:cursor-not-allowed dark:placeholder:text-white/30 ${
-                  authenticated && (amountSent > balance || errors.amountSent)
-                    ? "text-red-500 dark:text-red-500"
-                    : "text-neutral-900 dark:text-white/80"
-                }`}
+                className={`w-full rounded-xl border-b border-transparent bg-transparent py-2 text-2xl outline-none transition-all placeholder:text-gray-400 focus:outline-none disabled:cursor-not-allowed dark:placeholder:text-white/30 ${authenticated && (amountSent > balance || errors.amountSent)
+                  ? "text-red-500 dark:text-red-500"
+                  : "text-neutral-900 dark:text-white/80"
+                  }`}
                 placeholder="0"
                 title="Enter amount to send"
               />
@@ -692,16 +708,16 @@ export const TransactionForm = ({
             </div>
             {(errors.amountSent ||
               (authenticated && totalRequired > balance)) && (
-              <AnimatedComponent
-                variant={slideInOut}
-                className="!mt-0 text-xs text-red-500"
-              >
-                {errors.amountSent?.message ||
-                  (authenticated && totalRequired > balance
-                    ? `Insufficient balance${senderFeeAmount > 0 ? ` (includes ${formatNumberWithCommas(senderFeeAmount)} ${token} fee)` : ""}`
-                    : null)}
-              </AnimatedComponent>
-            )}
+                <AnimatedComponent
+                  variant={slideInOut}
+                  className="!mt-0 text-xs text-red-500"
+                >
+                  {errors.amountSent?.message ||
+                    (authenticated && totalRequired > balance
+                      ? `Insufficient balance${senderFeeAmount > 0 ? ` (includes ${formatNumberWithCommas(senderFeeAmount)} ${token} fee)` : ""}`
+                      : null)}
+                </AnimatedComponent>
+              )}
 
             {/* Arrow showing swap direction */}
             <div className="absolute -bottom-5 left-1/2 z-10 w-fit -translate-x-1/2 rounded-xl border-4 border-background-neutral bg-background-neutral dark:border-white/5 dark:bg-surface-canvas">
@@ -756,11 +772,10 @@ export const TransactionForm = ({
                   }
                 }}
                 value={formattedReceivedAmount}
-                className={`w-full rounded-xl border-b border-transparent bg-transparent py-2 text-2xl outline-none transition-all placeholder:text-gray-400 focus:outline-none disabled:cursor-not-allowed dark:placeholder:text-white/30 ${
-                  errors.amountReceived
-                    ? "text-red-500 dark:text-red-500"
-                    : "text-neutral-900 dark:text-white/80"
-                }`}
+                className={`w-full rounded-xl border-b border-transparent bg-transparent py-2 text-2xl outline-none transition-all placeholder:text-gray-400 focus:outline-none disabled:cursor-not-allowed dark:placeholder:text-white/30 ${errors.amountReceived
+                  ? "text-red-500 dark:text-red-500"
+                  : "text-neutral-900 dark:text-white/80"
+                  }`}
                 placeholder="0"
                 title="Enter amount to receive"
               />
@@ -809,11 +824,10 @@ export const TransactionForm = ({
                       formMethods.setValue("memo", e.target.value);
                     }}
                     value={formMethods.watch("memo")}
-                    className={`min-h-11 w-full rounded-xl border border-gray-300 bg-transparent py-2 pl-9 pr-4 text-sm transition-all placeholder:text-text-placeholder focus-within:border-gray-400 focus:outline-none disabled:cursor-not-allowed dark:border-white/20 dark:bg-input-focus dark:placeholder:text-white/30 dark:focus-within:border-white/40 ${
-                      errors.memo
-                        ? "text-red-500 dark:text-red-500"
-                        : "text-text-body dark:text-white/80"
-                    }`}
+                    className={`min-h-11 w-full rounded-xl border border-gray-300 bg-transparent py-2 pl-9 pr-4 text-sm transition-all placeholder:text-text-placeholder focus-within:border-gray-400 focus:outline-none disabled:cursor-not-allowed dark:border-white/20 dark:bg-input-focus dark:placeholder:text-white/30 dark:focus-within:border-white/40 ${errors.memo
+                      ? "text-red-500 dark:text-red-500"
+                      : "text-text-body dark:text-white/80"
+                      }`}
                     placeholder="Add description (optional)"
                     maxLength={25}
                   />
diff --git a/app/pages/TransactionPreview.tsx b/app/pages/TransactionPreview.tsx
index 19cadd77..a080b200 100644
--- a/app/pages/TransactionPreview.tsx
+++ b/app/pages/TransactionPreview.tsx
@@ -24,7 +24,7 @@ import type {
 } from "../types";
 import { primaryBtnClasses, secondaryBtnClasses } from "../components";
 import { gatewayAbi } from "../api/abi";
-import { usePrivy } from "@privy-io/react-auth";
+import { usePrivy, useWallets } from "@privy-io/react-auth";
 import { useSmartWallets } from "@privy-io/react-auth/smart-wallets";
 import {
   type BaseError,
@@ -37,6 +37,17 @@ import {
   http,
 } from "viem";
 import { useBalance, useInjectedWallet, useStep } from "../context";
+import {
+  useShouldUseEOA,
+  useBiconomy7702Auth,
+  useMigrationStatus,
+} from "../hooks/useEIP7702Account";
+import {
+  createMeeClient,
+  toMultichainNexusAccount,
+  getMEEVersion,
+  MEEVersion,
+} from "@biconomy/abstractjs";
 
 import { fetchAggregatorPublicKey, saveTransaction } from "../api/aggregator";
 import { trackEvent } from "../hooks/analytics/client";
@@ -59,14 +70,19 @@ export const TransactionPreview = ({
 }: TransactionPreviewProps) => {
   const isDark = useActualTheme();
   const { user, getAccessToken } = usePrivy();
+  const { wallets } = useWallets();
   const { client } = useSmartWallets();
   const { isInjectedWallet, injectedAddress, injectedProvider, injectedReady } =
     useInjectedWallet();
+  const shouldUseEOA = useShouldUseEOA();
+  const { isLoading: isMigrationLoading } = useMigrationStatus();
+  const { signBiconomyAuthorization } = useBiconomy7702Auth();
+
 
   const { selectedNetwork } = useNetwork();
   const { allTokens } = useTokens();
   const { currentStep, setCurrentStep } = useStep();
-  const { refreshBalance, smartWalletBalance, injectedWalletBalance } =
+  const { refreshBalance, smartWalletBalance, externalWalletBalance, injectedWalletBalance } =
     useBalance();
 
   const {
@@ -101,11 +117,6 @@ export const TransactionPreview = ({
 
   const searchParams = useSearchParams();
 
-  const embeddedWallet = user?.linkedAccounts.find(
-    (account) =>
-      account.type === "wallet" && account.connectorType === "embedded",
-  ) as { address: string } | undefined;
-
   const fetchedTokens: Token[] = allTokens[selectedNetwork.chain.name] || [];
 
   const tokenAddress = fetchedTokens.find(
@@ -120,15 +131,30 @@ export const TransactionPreview = ({
     ? { address: injectedAddress, type: "injected_wallet" }
     : null;
 
+  // Determine active wallet based on migration status
+  // After migration: use EOA (new wallet with funds)
+  // Before migration: use SCW (old wallet)
+  const embeddedWallet = wallets.find(
+    (wallet) => wallet.walletClientType === "privy"
+  );
   const smartWallet = isInjectedWallet
     ? null
     : user?.linkedAccounts.find((account) => account.type === "smart_wallet");
 
-  const activeWallet = injectedWallet || smartWallet;
+  const activeWallet = injectedWallet ||
+    (shouldUseEOA && embeddedWallet
+      ? { address: embeddedWallet.address, type: "eoa" }
+      : smartWallet);
 
+  // Get appropriate balance based on migration status
+  // After migration: use externalWalletBalance (EOA balance)
+  // Before migration: use smartWalletBalance (SCW balance)
+  // Wait for migration status to load before making decision
   const balance = injectedWallet
     ? injectedWalletBalance?.balances[token] || 0
-    : smartWalletBalance?.balances[token] || 0;
+    : !isMigrationLoading && shouldUseEOA
+      ? externalWalletBalance?.balances[token] || 0
+      : smartWalletBalance?.balances[token] || 0;
 
   // Calculate sender fee for display and balance check
   const {
@@ -272,8 +298,91 @@ export const TransactionPreview = ({
           "Entry point": "Transaction preview",
           "Wallet type": "Injected wallet",
         });
+      } else if (shouldUseEOA && embeddedWallet) {
+        // EIP-7702 + Biconomy MEE path (migrated EOA or 0-balance SCW)
+        const chain = selectedNetwork?.chain;
+        if (!chain) throw new Error("Network not ready");
+        const chainId = chain.id;
+        const gatewayAddress = getGatewayContractAddress(
+          selectedNetwork.chain.name,
+        ) as `0x${string}`;
+
+        await embeddedWallet.switchChain(chainId);
+
+        const provider = await embeddedWallet.getEthereumProvider();
+        const authorization = await signBiconomyAuthorization(chainId);
+
+        // Match Biconomy example: signer is EIP-1193 provider so SDK uses eth_requestAccounts (no getAddresses)
+        const nexusAccount = await toMultichainNexusAccount({
+          chainConfigurations: [
+            {
+              chain,
+              transport: http(getRpcUrl(selectedNetwork.chain.name)),
+              version: getMEEVersion(MEEVersion.V2_1_0),
+              accountAddress: embeddedWallet.address as `0x${string}`,
+            },
+          ],
+          signer: provider,
+        });
+
+        const meeClient = await createMeeClient({
+          account: nexusAccount,
+          apiKey: process.env.NEXT_PUBLIC_BICONOMY_PAYMASTER_KEY ?? "",
+        });
+
+        const params = await prepareCreateOrderParams();
+        setCreatedAt(new Date().toISOString());
+
+        const totalAmountToApprove = params.amount + params.senderFee;
+
+        const approveInstruction = await nexusAccount.buildComposable({
+          type: "default",
+          data: {
+            abi: erc20Abi,
+            chainId,
+            to: tokenAddress,
+            functionName: "approve",
+            args: [gatewayAddress, totalAmountToApprove],
+          },
+        });
+
+        const createOrderInstruction = await nexusAccount.buildComposable({
+          type: "default",
+          data: {
+            abi: gatewayAbi,
+            chainId,
+            to: gatewayAddress,
+            functionName: "createOrder",
+            args: [
+              params.token,
+              params.amount,
+              params.rate,
+              params.senderFeeRecipient,
+              params.senderFee,
+              params.refundAddress ?? "",
+              params.messageHash,
+            ],
+          },
+        });
+
+        // Use your project's sponsorship (apiKey above must match dashboard project)
+        const { hash } = await meeClient.execute({
+          authorizations: [authorization],
+          delegate: true,
+          sponsorship: true,
+          instructions: [approveInstruction, createOrderInstruction],
+        });
+        setIsGatewayApproved(true);
+        setIsOrderCreated(true);
+
+        await meeClient.waitForSupertransactionReceipt({ hash });
+
+        trackEvent("Swap started", {
+          "Entry point": "Transaction preview",
+          "Wallet type": "EIP-7702 (MEE)",
+        });
       } else {
-        // Smart wallet
+        // Smart wallet (pre-migration)
         if (!client) {
           throw new Error("Smart wallet not found");
         }
@@ -363,6 +472,7 @@ export const TransactionPreview = ({
   const handlePaymentConfirmation = async () => {
     // Check balance including sender fee
     const totalRequired = amountSent + senderFeeAmount;
+
     if (totalRequired > balance) {
       toast.warning("Low balance. Fund your wallet.", {
         description: `Insufficient funds. You need ${formatNumberWithCommas(totalRequired)} ${token} (${formatNumberWithCommas(amountSent)} ${token} + ${formatNumberWithCommas(senderFeeAmount)} ${token} fee).`,
@@ -388,7 +498,7 @@ export const TransactionPreview = ({
     orderId: string;
     txHash: `0x${string}`;
   }) => {
-    if (!embeddedWallet?.address || isSavingTransaction) return;
+    if (!activeWallet?.address || isSavingTransaction) return;
     setIsSavingTransaction(true);
 
     try {
@@ -398,7 +508,7 @@ export const TransactionPreview = ({
       }
 
       const transaction: TransactionCreateInput = {
-        walletAddress: embeddedWallet.address,
+        walletAddress: activeWallet.address,
         transactionType: "swap",
         fromCurrency: token,
         toCurrency: currency,
@@ -610,9 +720,8 @@ export const TransactionPreview = ({
                   <PiCheckCircleFill className="text-lg text-green-700 dark:text-green-500" />
                 ) : (
                   <TbCircleDashed
-                    className={`text-lg ${
-                      isGatewayApproved ? "animate-spin" : ""
-                    }`}
+                    className={`text-lg ${isGatewayApproved ? "animate-spin" : ""
+                      }`}
                   />
                 )}
                 <p className="pr-1">Create Order</p>
diff --git a/app/utils.ts b/app/utils.ts
index c106aa7f..a75161ab 100644
--- a/app/utils.ts
+++ b/app/utils.ts
@@ -344,28 +344,28 @@ export const FALLBACK_TOKENS: { [key: string]: Token[] } = {
     },
   ],
   Ethereum: [
-  {
-    name: "USD Coin",
-    symbol: "USDC",
-    decimals: 6,
-    address: "0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48",
-    imageUrl: "/logos/usdc-logo.svg",
-  },
-  {
-    name: "Tether USD", 
-    symbol: "USDT",
-    decimals: 6,
-    address: "0xdAC17F958D2ee523a2206206994597C13D831ec7",
-    imageUrl: "/logos/usdt-logo.svg",
-  },
-      {
+    {
+      name: "USD Coin",
+      symbol: "USDC",
+      decimals: 6,
+      address: "0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48",
+      imageUrl: "/logos/usdc-logo.svg",
+    },
+    {
+      name: "Tether USD",
+      symbol: "USDT",
+      decimals: 6,
+      address: "0xdAC17F958D2ee523a2206206994597C13D831ec7",
+      imageUrl: "/logos/usdt-logo.svg",
+    },
+    {
       name: "cNGN",
       symbol: "cNGN",
       decimals: 6,
       address: "0x17CDB2a01e7a34CbB3DD4b83260B05d0274C8dab",
       imageUrl: "/logos/cngn-logo.svg",
     },
-],
+  ],
 };
 
 /**
diff --git a/next.config.mjs b/next.config.mjs
index 16952e07..6b39ac73 100644
--- a/next.config.mjs
+++ b/next.config.mjs
@@ -71,7 +71,7 @@ const nextConfig = {
       path: false,
       os: false,
     };
-    
+
     // Handle Mixpanel on server-side only
     if (isServer) {
       config.externals = config.externals || [];
@@ -79,7 +79,7 @@ const nextConfig = {
         'mixpanel': 'commonjs mixpanel'
       });
     }
-    
+
     return config;
   },
   compiler: {
@@ -105,12 +105,12 @@ const nextConfig = {
       },
       ...(process.env.NODE_ENV !== "production"
         ? [
-            {
-              protocol: "https",
-              hostname: "picsum.photos",
-              pathname: "/**",
-            },
-          ]
+          {
+            protocol: "https",
+            hostname: "picsum.photos",
+            pathname: "/**",
+          },
+        ]
         : []),
     ],
   },
diff --git a/package.json b/package.json
index 67144177..ca010f6c 100644
--- a/package.json
+++ b/package.json
@@ -30,6 +30,7 @@
     "sanity:undeploy": "sanity undeploy"
   },
   "dependencies": {
+    "@biconomy/abstractjs": "^1.1.21",
     "@headlessui/react": "^2.2.4",
     "@hotjar/browser": "^1.0.9",
     "@portabletext/react": "^3.2.1",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 0a63b3fe..191b7280 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -14,6 +14,9 @@ importers:
 
   .:
     dependencies:
+      '@biconomy/abstractjs':
+        specifier: ^1.1.21
+        version: 1.1.21(@metamask/delegation-toolkit@0.11.0(viem@2.31.0(bufferutil@4.0.9)(typescript@5.8.3)(utf-8-validate@5.0.10)(zod@3.25.24)))(@rhinestone/module-sdk@0.4.0(viem@2.31.0(bufferutil@4.0.9)(typescript@5.8.3)(utf-8-validate@5.0.10)(zod@3.25.24)))(@safe-global/types-kit@3.0.0(typescript@5.8.3)(zod@3.25.24))(typescript@5.8.3)(viem@2.31.0(bufferutil@4.0.9)(typescript@5.8.3)(utf-8-validate@5.0.10)(zod@3.25.24))
       '@headlessui/react':
         specifier: ^2.2.4
         version: 2.2.4(react-dom@19.2.1(react@19.2.1))(react@19.2.1)
@@ -1029,6 +1032,15 @@ packages:
   '@bcoe/v8-coverage@0.2.3':
     resolution: {integrity: sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==}
 
+  '@biconomy/abstractjs@1.1.21':
+    resolution: {integrity: sha512-JYmQE4jnOB1rIpE/7UWQK2eTYY2nw+eM5oUxP9BtZ3slAVsk/TB6vcq9fmQr4SI0i7eCKZ0QKkdaREQmSJboIg==}
+    peerDependencies:
+      '@metamask/delegation-toolkit': ^0.11.0
+      '@rhinestone/module-sdk': 0.4.0
+      '@safe-global/types-kit': 3.0.0
+      typescript: ^5.8.2
+      viem: ^2.26.2
+
   '@blocto/sdk@0.10.2':
     resolution: {integrity: sha512-9gCIUKA7/7/hMHaa5n94+OYU/3tHd6vmBgTgv4o2h3z9SFueQXAJMO4aBggH9+EldgHQDI6wHsnvytEt9AWb6g==}
     deprecated: Package no longer supported. Contact Support at https://www.npmjs.com/support for more info.
@@ -2451,6 +2463,27 @@ packages:
   '@maverick-js/signals@5.11.5':
     resolution: {integrity: sha512-/GO94awrwN9ROYZDMTeByordjvbhcm3CMvB/2aL/sEUy9Va8nM/2GmNgOOe+rrooTGnz8/DzO73xomuBRrnYWw==}
 
+  '@metamask/delegation-abis@0.11.0':
+    resolution: {integrity: sha512-tnNGFDLQ5jfgPhHJaT5JwvF759nja1iGAG00REbk1Ufir+TxjxTmF8L9MbJifZmUh4fnyqV4Ik6NAOYVNBPVBg==}
+    engines: {node: ^18.18 || >=20}
+
+  '@metamask/delegation-deployments@0.11.0':
+    resolution: {integrity: sha512-RfeMr1Ct0givG7oOy1unwdb5lGttq9pape4OGz2mk8quG0KDqDi7cw3fzYc7wz9xFDZ2YrFanYRacaLTlqWS8g==}
+    engines: {node: ^18.18 || >=20}
+
+  '@metamask/delegation-toolkit@0.11.0':
+    resolution: {integrity: sha512-KQybftUahuPPjN842ejmVaJWg2rzHpSpvd+b6qtiOBypzJs7cgw1/f8QalHLugS1eyicEYLXwvRxjjufiG4wbg==}
+    engines: {node: ^18.18 || >=20}
+    deprecated: Renamed to @metamask/smart-accounts-kit
+    peerDependencies:
+      viem: '>=2.18.2 <3.0.0'
+
+  '@metamask/delegation-utils@0.11.0':
+    resolution: {integrity: sha512-eg8icyDtbzwER/G3VvaiVUNiNr9GXxJXQMcFRbhm9tTMqWXpphYXk9edSungRF+QqYmXIytRiR2ChSHp0uNtew==}
+    engines: {node: ^18.18 || >=20}
+    peerDependencies:
+      viem: '>=2.18.2 <3.0.0'
+
   '@metamask/eth-json-rpc-provider@1.0.1':
     resolution: {integrity: sha512-whiUMPlAOrVGmX8aKYVPvlKyG4CpQXiNNyt74vE1xb5sPvmx5oA7B/kOi/JdBvhGQq97U1/AVdXEdk2zkP8qyA==}
     engines: {node: '>=14.0.0'}
@@ -3565,6 +3598,12 @@ packages:
       react: ^19.0.1
       react-dom: ^19.0.1
 
+  '@rhinestone/module-sdk@0.4.0':
+    resolution: {integrity: sha512-MezAYnw+D7tWCVyUMYiA6YutsQT/dL2XPoVhJcfHUh+xccxadubBhU+IKA0MkAyibOWLWZ0yplbgPUKq7MPkFg==}
+    deprecated: This SDK is no longer supported. Please switch to '@rhinestone/sdk' to continue getting updates.
+    peerDependencies:
+      viem: ^2.0.0
+
   '@rolldown/pluginutils@1.0.0-beta.27':
     resolution: {integrity: sha512-+d0F4MKMCbeVUJwG96uQ4SgAznZNSq93I3V+9NHA4OpvqG8mRCpGdKmK8l/dl02h2CCDHwW2FqilnTyDcAnqjA==}
 
@@ -3707,6 +3746,9 @@ packages:
     resolution: {integrity: sha512-WhzcmNun0s0VxeVQKRqaapV0vEpdm76zZBR2Du+S+58u1r57OjZkOSL2Gru0tdwkt3FIZZtE3OhDu09M70pVkA==}
     deprecated: 'WARNING: This package is now bundled in @safe-global/protocol-kit. Please, follow the migration guide https://docs.safe.global/safe-core-aa-sdk/protocol-kit/reference/v1'
 
+  '@safe-global/types-kit@3.0.0':
+    resolution: {integrity: sha512-AZWIlR5MguDPdGiOj7BB4JQPY2afqmWQww1mu8m8Oi16HHBW99G01kFOu4NEHBwEU1cgwWOMY19hsI5KyL4W2w==}
+
   '@sanity/asset-utils@2.2.1':
     resolution: {integrity: sha512-dBsZWH5X6ANcvclFRnQT9Y+NNvoWTJZIMKR5HT6hzoRpRb48p7+vWn+wi1V1wPvqgZg2ScsOQQcGXWXskbPbQQ==}
     engines: {node: '>=18'}
@@ -10157,6 +10199,9 @@ packages:
   solady@0.0.180:
     resolution: {integrity: sha512-9QVCyMph+wk78Aq/GxtDAQg7dvNoVWx2dS2Zwf11XlwFKDZ+YJG2lrQsK9NEIth9NOebwjBXAYk4itdwOOE4aw==}
 
+  solady@0.0.235:
+    resolution: {integrity: sha512-JUEXLDG7ag3HmqUnrDG7ilhafH6R9bFPpwV63O2kH4UbnS2+gRGEOqqy4k01O7tHjo3MWkDD0cpG+UY9pjy/fQ==}
+
   sonic-boom@2.8.0:
     resolution: {integrity: sha512-kuonw1YOYYNOve5iHdSahXPOK49GqwA+LZhI6Wz/l0rP57iKyXXIHaRagOBHAPmGwJC6od2Z9zgvZ5loSgMlVg==}
 
@@ -10482,6 +10527,7 @@ packages:
   tar@6.2.1:
     resolution: {integrity: sha512-DZ4yORTwrbTj/7MZYq2w+/ZFdI6OZ/f9SFHR+71gIVUZhOQPHzVCLpvRnPgyaMpfWxxk/4ONva3GQSyNIKRv6A==}
     engines: {node: '>=10'}
+    deprecated: Old versions of tar are not supported, and contain widely publicized security vulnerabilities, which have been fixed in the current version. Please update. Support for old versions may be purchased (at exorbitant rates) by contacting i@izs.me
 
   tar@7.4.3:
     resolution: {integrity: sha512-5S7Va8hKfV7W5U6g3aYxXmlPoZVAwUMy9AOKyF2fVuZa2UD3qZjg578OrLRt8PcNN1PleVaL/5/yYATNL0ICUw==}
@@ -11459,6 +11505,9 @@ packages:
     resolution: {integrity: sha512-quTtTeQJHYSxAwIBOCGEcQtqdVcFWX6mCFNoqnp+mRbq+Hxbs8CGgO/6oqfBx4OvxIOfCpgJWYVHswRXnbEu9Q==}
     engines: {node: '>=8.0.0'}
 
+  webauthn-p256@0.0.5:
+    resolution: {integrity: sha512-drMGNWKdaixZNobeORVIqq7k5DsRC9FnG201K2QjeOoQLmtSDaSsVZdkg6n5jUALJKcAG++zBPJXmv6hy0nWFg==}
+
   webidl-conversions@3.0.1:
     resolution: {integrity: sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==}
 
@@ -13499,6 +13548,14 @@ snapshots:
 
   '@bcoe/v8-coverage@0.2.3': {}
 
+  '@biconomy/abstractjs@1.1.21(@metamask/delegation-toolkit@0.11.0(viem@2.31.0(bufferutil@4.0.9)(typescript@5.8.3)(utf-8-validate@5.0.10)(zod@3.25.24)))(@rhinestone/module-sdk@0.4.0(viem@2.31.0(bufferutil@4.0.9)(typescript@5.8.3)(utf-8-validate@5.0.10)(zod@3.25.24)))(@safe-global/types-kit@3.0.0(typescript@5.8.3)(zod@3.25.24))(typescript@5.8.3)(viem@2.31.0(bufferutil@4.0.9)(typescript@5.8.3)(utf-8-validate@5.0.10)(zod@3.25.24))':
+    dependencies:
+      '@metamask/delegation-toolkit': 0.11.0(viem@2.31.0(bufferutil@4.0.9)(typescript@5.8.3)(utf-8-validate@5.0.10)(zod@3.25.24))
+      '@rhinestone/module-sdk': 0.4.0(viem@2.31.0(bufferutil@4.0.9)(typescript@5.8.3)(utf-8-validate@5.0.10)(zod@3.25.24))
+      '@safe-global/types-kit': 3.0.0(typescript@5.8.3)(zod@3.25.24)
+      typescript: 5.8.3
+      viem: 2.31.0(bufferutil@4.0.9)(typescript@5.8.3)(utf-8-validate@5.0.10)(zod@3.25.24)
+
   '@blocto/sdk@0.10.2(bufferutil@4.0.9)(utf-8-validate@5.0.10)':
     dependencies:
       buffer: 6.0.3
@@ -15378,6 +15435,23 @@ snapshots:
 
   '@maverick-js/signals@5.11.5': {}
 
+  '@metamask/delegation-abis@0.11.0': {}
+
+  '@metamask/delegation-deployments@0.11.0': {}
+
+  '@metamask/delegation-toolkit@0.11.0(viem@2.31.0(bufferutil@4.0.9)(typescript@5.8.3)(utf-8-validate@5.0.10)(zod@3.25.24))':
+    dependencies:
+      '@metamask/delegation-utils': 0.11.0(viem@2.31.0(bufferutil@4.0.9)(typescript@5.8.3)(utf-8-validate@5.0.10)(zod@3.25.24))
+      viem: 2.31.0(bufferutil@4.0.9)(typescript@5.8.3)(utf-8-validate@5.0.10)(zod@3.25.24)
+      webauthn-p256: 0.0.5
+
+  '@metamask/delegation-utils@0.11.0(viem@2.31.0(bufferutil@4.0.9)(typescript@5.8.3)(utf-8-validate@5.0.10)(zod@3.25.24))':
+    dependencies:
+      '@metamask/delegation-abis': 0.11.0
+      '@metamask/delegation-deployments': 0.11.0
+      buffer: 6.0.3
+      viem: 2.31.0(bufferutil@4.0.9)(typescript@5.8.3)(utf-8-validate@5.0.10)(zod@3.25.24)
+
   '@metamask/eth-json-rpc-provider@1.0.1':
     dependencies:
       '@metamask/json-rpc-engine': 7.3.3
@@ -17106,6 +17180,12 @@ snapshots:
       react: 19.2.1
       react-dom: 19.2.1(react@19.2.1)
 
+  '@rhinestone/module-sdk@0.4.0(viem@2.31.0(bufferutil@4.0.9)(typescript@5.8.3)(utf-8-validate@5.0.10)(zod@3.25.24))':
+    dependencies:
+      solady: 0.0.235
+      tslib: 2.8.1
+      viem: 2.31.0(bufferutil@4.0.9)(typescript@5.8.3)(utf-8-validate@5.0.10)(zod@3.25.24)
+
   '@rolldown/pluginutils@1.0.0-beta.27': {}
 
   '@rollup/rollup-android-arm-eabi@4.46.2':
@@ -17242,6 +17322,13 @@ snapshots:
       - supports-color
       - utf-8-validate
 
+  '@safe-global/types-kit@3.0.0(typescript@5.8.3)(zod@3.25.24)':
+    dependencies:
+      abitype: 1.1.0(typescript@5.8.3)(zod@3.25.24)
+    transitivePeerDependencies:
+      - typescript
+      - zod
+
   '@sanity/asset-utils@2.2.1': {}
 
   '@sanity/bifur-client@0.4.1':
@@ -27242,6 +27329,8 @@ snapshots:
 
   solady@0.0.180: {}
 
+  solady@0.0.235: {}
+
   sonic-boom@2.8.0:
     dependencies:
       atomic-sleep: 1.0.0
@@ -28749,6 +28838,11 @@ snapshots:
       randombytes: 2.1.0
       utf8: 3.0.0
 
+  webauthn-p256@0.0.5:
+    dependencies:
+      '@noble/curves': 1.9.2
+      '@noble/hashes': 1.8.0
+
   webidl-conversions@3.0.1: {}
 
   webidl-conversions@7.0.0: {}
diff --git a/public/images/checkmark-circle.svg b/public/images/checkmark-circle.svg
new file mode 100644
index 00000000..b4e88ff0
--- /dev/null
+++ b/public/images/checkmark-circle.svg
@@ -0,0 +1,4 @@
+<svg width="36" height="36" viewBox="0 0 36 36" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M34.3333 17.6663C34.3333 8.46159 26.8714 0.999673 17.6667 0.999673C8.46192 0.999673 1 8.46159 1 17.6663C1 26.8711 8.46192 34.333 17.6667 34.333C26.8714 34.333 34.3333 26.8711 34.3333 17.6663Z" stroke="#39C65D" stroke-width="2"/>
+<path d="M11 18.9167C11 18.9167 13.6667 20.4375 15 22.6667C15 22.6667 19 13.9167 24.3333 11" stroke="#39C65D" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/public/images/desktop-eip-migration.png b/public/images/desktop-eip-migration.png
new file mode 100644
index 00000000..5d4b0f98
Binary files /dev/null and b/public/images/desktop-eip-migration.png differ
diff --git a/public/images/locked.png b/public/images/locked.png
new file mode 100644
index 00000000..8c564578
Binary files /dev/null and b/public/images/locked.png differ
diff --git a/public/images/mobile-eip-migration.png b/public/images/mobile-eip-migration.png
new file mode 100644
index 00000000..e370d472
Binary files /dev/null and b/public/images/mobile-eip-migration.png differ
diff --git a/public/images/sent.png b/public/images/sent.png
new file mode 100644
index 00000000..b381a784
Binary files /dev/null and b/public/images/sent.png differ
diff --git a/public/images/wallet.png b/public/images/wallet.png
new file mode 100644
index 00000000..75d59ed0
Binary files /dev/null and b/public/images/wallet.png differ
diff --git a/supabase/migrations/create_wallet_migrations.sql b/supabase/migrations/create_wallet_migrations.sql
new file mode 100644
index 00000000..813a9e48
--- /dev/null
+++ b/supabase/migrations/create_wallet_migrations.sql
@@ -0,0 +1,70 @@
+-- Create table to track wallet migrations from old SCW to EIP-7702 EOA
+create table if not exists public.wallet_migrations (
+  id uuid default gen_random_uuid() primary key,
+  privy_user_id text not null,
+  old_scw_address text not null check (old_scw_address ~* '^0x[0-9a-f]{40}$'),
+  new_eoa_address text check (new_eoa_address ~* '^0x[0-9a-f]{40}$'),
+  status text not null check (status in ('pending', 'in_progress', 'completed', 'failed')),
+  migration_tx_hash text,
+  total_balance_usd numeric(20, 8),
+  migrated_at timestamptz,
+  created_at timestamptz not null default now(),
+  updated_at timestamptz not null default now(),
+  deprecated boolean not null default false
+);
+
+-- Unique constraint to prevent duplicate migrations per user
+alter table public.wallet_migrations 
+add constraint unique_user_migration 
+unique (privy_user_id);
+
+-- Indexes for efficient lookups
+create index if not exists idx_wallet_migrations_user_id 
+  on public.wallet_migrations(privy_user_id);
+
+create index if not exists idx_wallet_migrations_old_scw 
+  on public.wallet_migrations(old_scw_address);
+
+create index if not exists idx_wallet_migrations_status 
+  on public.wallet_migrations(status);
+
+create index if not exists idx_wallet_migrations_created_at 
+  on public.wallet_migrations(created_at desc);
+
+-- Function to auto-update updated_at timestamp
+create or replace function public.update_wallet_migrations_updated_at()
+returns trigger language plpgsql as $$
+begin
+  new.updated_at = now();
+  return new;
+end;
+$$;
+
+-- Trigger to automatically update updated_at
+create trigger wallet_migrations_update_updated_at
+before update on public.wallet_migrations
+for each row execute function public.update_wallet_migrations_updated_at();
+
+-- Enable Row Level Security (RLS)
+alter table public.wallet_migrations enable row level security;
+
+-- Drop existing policies if they exist
+drop policy if exists "Service role can manage migrations" on public.wallet_migrations;
+drop policy if exists "Users can read their own migrations" on public.wallet_migrations;
+
+-- Service role can do everything (for API operations)
+create policy "Service role can manage migrations"
+on public.wallet_migrations for all
+to service_role
+using (true)
+with check (true);
+
+-- Users can read their own migration status (if needed for future client-side queries)
+-- Note: This verifies that privy_user_id matches the JWT sub claim
+create policy "Users can read their own migrations"
+on public.wallet_migrations for select
+to authenticated
+using (
+  privy_user_id = current_setting('request.jwt.claims', true)::json->>'sub'
+);
+