diff --git a/README.md b/README.md
index 7644eed..7de85ea 100644
--- a/README.md
+++ b/README.md
@@ -67,6 +67,23 @@ In practical terms:
 - Stellar asset issuance, account flows, payout tracking, and Soroban contracts are the next chain layer
 - README language, roadmap, and contribution guidance below are written for the Stellar path
 
+### Wallet modes
+
+Wallet and chain assumptions live in `lib/wallet/config.ts`; UI-facing wallet shapes live in
+`lib/wallet/types.ts`.
+
+- **Current mode — Privy embedded wallet:** Privy remains the authentication and embedded-wallet
+  provider. New users receive an EVM wallet on Lisk Sepolia, preserving the existing signup,
+  provider, and funding flows.
+- **Planned mode — Stellar account:** a linked `stellarPublicKey` is displayed as a Stellar Testnet
+  account in wallet/profile surfaces. This display path is separate from authentication and does
+  not replace Privy.
+- **No linked wallet:** public wallet display helpers return a neutral “Not linked” state instead
+  of leaking chain-specific fallback assumptions into components.
+
+When Stellar signing is introduced, add it behind the planned mode rather than changing Privy
+authentication or scattering network constants through UI components.
+
 ## Tech Stack
 
 - Next.js 16 with the App Router
diff --git a/app/Providers.tsx b/app/Providers.tsx
index 0e4a331..bf8d82e 100644
--- a/app/Providers.tsx
+++ b/app/Providers.tsx
@@ -1,46 +1,26 @@
-"use client"
-
-import type { FC, ReactNode } from "react"
-import { liskSepolia } from "viem/chains"
-
-import { PrivyProvider } from "@/lib/privy/react-auth"
-import { WalletProvider } from "@/contexts/wallet-context"
-import { getStellarConfig } from "@/lib/stellar/config"
-import type { WalletNetwork } from "@/types/wallet"
-
-const privyAppId = process.env.NEXT_PUBLIC_PRIVY_APP_ID
-
-function getDefaultNetwork(): WalletNetwork {
-  const stellarConfig = getStellarConfig()
-  return stellarConfig.network.toLowerCase() === "mainnet" ? "stellar-mainnet" : "stellar-testnet"
-}
-
-export const Providers: FC<{ children: ReactNode }> = ({ children }) => {
-  const defaultNetwork = getDefaultNetwork()
-
-  return (
-    <PrivyProvider
-      appId={privyAppId || ""}
-      config={{
-        loginMethods: ["email", "sms"],
-        supportedChains: [liskSepolia],
-        defaultChain: liskSepolia,
-        embeddedWallets: {
-          ethereum: {
-            createOnLogin: "all-users",
-          },
-          showWalletUIs: true,
-        },
-        appearance: {
-          theme: "light",
-          accentColor: "#F2780E",
-          logo: "/images/chainmovelogo.png",
-        },
-      }}
-    >
-      <WalletProvider defaultNetwork={defaultNetwork}>
-        {children}
-      </WalletProvider>
-    </PrivyProvider>
-  )
-}
+"use client"
+
+import type { FC, ReactNode } from "react"
+
+import { PrivyProvider } from "@/lib/privy/react-auth"
+import { embeddedWalletProviderConfig } from "@/lib/wallet/config"
+
+const privyAppId = process.env.NEXT_PUBLIC_PRIVY_APP_ID
+
+function getDefaultNetwork(): WalletNetwork {
+  const stellarConfig = getStellarConfig()
+  return stellarConfig.network.toLowerCase() === "mainnet" ? "stellar-mainnet" : "stellar-testnet"
+}
+
+export const Providers: FC<{ children: ReactNode }> = ({ children }) => {
+  const defaultNetwork = getDefaultNetwork()
+
+  return (
+    <PrivyProvider
+      appId={privyAppId || ""}
+      config={embeddedWalletProviderConfig}
+    >
+      {children}
+    </PrivyProvider>
+  )
+}
diff --git a/app/dashboard/investor/page.tsx b/app/dashboard/investor/page.tsx
index a2e9c72..ad6ed55 100644
--- a/app/dashboard/investor/page.tsx
+++ b/app/dashboard/investor/page.tsx
@@ -4,7 +4,6 @@ import { useCallback, useEffect, useMemo, useState } from "react"
 import { useRouter } from "next/navigation"
 import { CalendarDays, ChevronDown, PlusCircle } from "lucide-react"
 import { formatEther } from "viem"
-import { liskSepolia } from "viem/chains"
 
 import { DashboardShell } from "@/components/dashboard/dashboard-shell"
 import { DashboardHeader } from "@/components/dashboard/investor-overview/dashboard-header"
@@ -24,6 +23,7 @@ import { formatNaira } from "@/lib/currency"
 import { isMockStellar } from "@/lib/mock-stellar/mockConfig"
 import { mockAccount } from "@/lib/mock-stellar/mockAccount"
 import { mockActivity } from "@/lib/mock-stellar/mockActivity"
+import { CURRENT_EMBEDDED_WALLET } from "@/lib/wallet/config"
 
 type PoolPreview = {
   id: string
@@ -48,14 +48,16 @@ function truncateAddress(address: string) {
 }
 
 function formatEthForUi(balanceEth: number | null) {
-  if (!Number.isFinite(balanceEth) || balanceEth === null) return "0 ETH"
-  if (balanceEth < 0.01) return "0 ETH"
-  if (balanceEth < 1) return `${balanceEth.toFixed(2)} ETH`
-  return `${balanceEth.toFixed(1)} ETH`
+  const asset = CURRENT_EMBEDDED_WALLET.network.nativeAsset
+  if (!Number.isFinite(balanceEth) || balanceEth === null) return `0 ${asset}`
+  if (balanceEth < 0.01) return `0 ${asset}`
+  if (balanceEth < 1) return `${balanceEth.toFixed(2)} ${asset}`
+  return `${balanceEth.toFixed(1)} ${asset}`
 }
 
 async function resolveOnchainBalanceEth(address: string) {
-  const rpcUrl = liskSepolia.rpcUrls.default.http[0]
+  const rpcUrl = CURRENT_EMBEDDED_WALLET.network.rpcUrl
+  if (!rpcUrl) return null
   const response = await fetch(rpcUrl, {
     method: "POST",
     headers: { "Content-Type": "application/json" },
diff --git a/components/dashboard/account-settings-form.tsx b/components/dashboard/account-settings-form.tsx
index 8580be8..68bdb1f 100644
--- a/components/dashboard/account-settings-form.tsx
+++ b/components/dashboard/account-settings-form.tsx
@@ -12,7 +12,7 @@ import { Input } from "@/components/ui/input"
 import { Label } from "@/components/ui/label"
 import { Textarea } from "@/components/ui/textarea"
 import { formatNaira } from "@/lib/currency"
-import { StellarLinkForm } from "@/components/dashboard/stellar-link-form"
+import { getWalletDisplay } from "@/lib/wallet/config"
 
 interface AccountSettingsFormProps {
   roleLabel: "Driver" | "Investor"
@@ -38,6 +38,7 @@ interface AccountProfileResponse {
   bio: string | null
   role: string
   walletAddress: string | null
+  stellarPublicKey: string | null
   availableBalance: number
   totalInvested: number
   totalReturns: number
@@ -86,6 +87,7 @@ export function AccountSettingsForm({ roleLabel, kycHref }: AccountSettingsFormP
         bio: authUser.bio || null,
         role: authUser.role || roleLabel.toLowerCase(),
         walletAddress: authUser.walletAddress || null,
+        stellarPublicKey: authUser.stellarPublicKey || null,
         availableBalance: Number(authUser.availableBalance || 0),
         totalInvested: Number(authUser.totalInvested || 0),
         totalReturns: Number(authUser.totalReturns || 0),
@@ -126,6 +128,10 @@ export function AccountSettingsForm({ roleLabel, kycHref }: AccountSettingsFormP
   }, [authUser?.id, loadProfile])
 
   const isEmailManagedExternally = Boolean(profile?.privyUserId || authUser?.privyUserId)
+  const walletDisplay = getWalletDisplay({
+    embeddedWalletAddress: profile?.walletAddress || authUser?.walletAddress,
+    stellarPublicKey: profile?.stellarPublicKey || authUser?.stellarPublicKey,
+  })
 
   const handleSave = async () => {
     if (!form.fullName.trim()) {
@@ -272,7 +278,8 @@ export function AccountSettingsForm({ roleLabel, kycHref }: AccountSettingsFormP
           <CardContent className="space-y-3 text-sm text-muted-foreground">
             <div className="rounded-lg border border-border/70 p-3">
               <p><span className="text-foreground">Role:</span> {profile?.role || authUser?.role || roleLabel.toLowerCase()}</p>
-              <p className="mt-1 break-all"><span className="text-foreground">Wallet:</span> {profile?.walletAddress || authUser?.walletAddress || "Not linked"}</p>
+              <p className="mt-1 break-all"><span className="text-foreground">{walletDisplay.addressLabel}:</span> {walletDisplay.address || "Not linked"}</p>
+              <p className="mt-1"><span className="text-foreground">Network:</span> {walletDisplay.networkLabel}</p>
             </div>
             <div className="rounded-lg border border-border/70 p-3">
               <p><span className="text-foreground">Internal balance:</span> {formatNaira(Number(profile?.availableBalance || authUser?.availableBalance || 0))}</p>
diff --git a/components/dashboard/investor-wallet-panel.tsx b/components/dashboard/investor-wallet-panel.tsx
index 1fa229a..c629778 100644
--- a/components/dashboard/investor-wallet-panel.tsx
+++ b/components/dashboard/investor-wallet-panel.tsx
@@ -3,7 +3,6 @@
 import { useCallback, useEffect, useMemo, useState } from "react"
 import { usePathname, useRouter, useSearchParams } from "next/navigation"
 import { formatEther } from "viem"
-import { liskSepolia } from "viem/chains"
 import {
   ArrowRight,
   CheckCircle2,
@@ -31,6 +30,7 @@ import { Card, CardContent, CardDescription, CardHeader, CardTitle } from "@/com
 import { Input } from "@/components/ui/input"
 import { Label } from "@/components/ui/label"
 import { Skeleton } from "@/components/ui/skeleton"
+import { CURRENT_EMBEDDED_WALLET, getWalletDisplay, shortenWalletAddress } from "@/lib/wallet/config"
 import {
   Table,
   TableBody,
@@ -66,11 +66,6 @@ interface InvestorWalletPanelProps {
   showTitle?: boolean
 }
 
-function truncateAddress(address: string) {
-  if (address.length < 10) return address
-  return `${address.slice(0, 6)}...${address.slice(-4)}`
-}
-
 function toPaystackAmount(value: string) {
   const parsed = Number.parseFloat(value)
   if (!Number.isFinite(parsed)) return null
@@ -87,7 +82,8 @@ function isValidEmail(value: string) {
 }
 
 async function resolveOnchainBalance(address: string) {
-  const rpcUrl = liskSepolia.rpcUrls.default.http[0]
+  const rpcUrl = CURRENT_EMBEDDED_WALLET.network.rpcUrl
+  if (!rpcUrl) return null
   const response = await fetch(rpcUrl, {
     method: "POST",
     headers: { "Content-Type": "application/json" },
@@ -104,7 +100,7 @@ async function resolveOnchainBalance(address: string) {
 
   const balance = Number.parseFloat(formatEther(BigInt(payload.result)))
   if (!Number.isFinite(balance)) return null
-  return `${balance.toFixed(4)} ETH`
+  return `${balance.toFixed(4)} ${CURRENT_EMBEDDED_WALLET.network.nativeAsset}`
 }
 
 export function InvestorWalletPanel({ sectionId = "wallet", className, showTitle = true }: InvestorWalletPanelProps) {
@@ -133,6 +129,10 @@ export function InvestorWalletPanel({ sectionId = "wallet", className, showTitle
   )
 
   const walletAddress = isMockStellar ? mockAccount.publicKey : (walletSummary?.wallet.walletAddress || embeddedWallet?.address || authUser?.walletAddress || "")
+  const walletDisplay = getWalletDisplay({
+    embeddedWalletAddress: walletAddress,
+    stellarPublicKey: isMockStellar ? mockAccount.publicKey : authUser?.stellarPublicKey,
+  })
   const internalBalance = walletSummary?.wallet.internalBalanceNgn || 0
 
   const fundingTransactions = useMemo(() => {
@@ -224,12 +224,12 @@ export function InvestorWalletPanel({ sectionId = "wallet", className, showTitle
   )
 
   const openWalletExplorer = () => {
-    if (!walletAddress) return
-    window.open(`https://sepolia-blockscout.lisk.com/address/${walletAddress}`, "_blank", "noopener,noreferrer")
+    if (!walletDisplay.explorerUrl) return
+    window.open(walletDisplay.explorerUrl, "_blank", "noopener,noreferrer")
   }
 
   const handleOpenWalletView = () => {
-    if (!walletAddress) {
+    if (!walletDisplay.explorerUrl) {
       toast({
         title: "Wallet unavailable",
         description: "Your embedded wallet address is not ready yet. Please sign out and sign in again.",
@@ -362,8 +362,8 @@ export function InvestorWalletPanel({ sectionId = "wallet", className, showTitle
   }
 
   const handleCopyAddress = async () => {
-    if (!walletAddress) return
-    await navigator.clipboard.writeText(walletAddress)
+    if (!walletDisplay.address) return
+    await navigator.clipboard.writeText(walletDisplay.address)
     toast({
       title: "Address copied",
       description: "Wallet address copied to clipboard.",
@@ -510,14 +510,15 @@ export function InvestorWalletPanel({ sectionId = "wallet", className, showTitle
           </div>
 
           <div className="rounded-xl border bg-muted/20 p-4">
-            <p className="text-xs uppercase tracking-wide text-muted-foreground">Wallet address</p>
-            <p className="mt-2 break-all font-mono text-sm">{walletAddress ? truncateAddress(walletAddress) : "Not available"}</p>
+            <p className="text-xs uppercase tracking-wide text-muted-foreground">{walletDisplay.addressLabel}</p>
+            <p className="mt-2 break-all font-mono text-sm">{walletDisplay.address ? shortenWalletAddress(walletDisplay.address) : "Not available"}</p>
+            <p className="mt-1 text-xs text-muted-foreground">{walletDisplay.networkLabel}</p>
             <div className="mt-2 flex flex-wrap gap-2">
-              <Button variant="outline" size="sm" className="flex-1 sm:flex-none" onClick={handleCopyAddress} disabled={!walletAddress}>
+              <Button variant="outline" size="sm" className="flex-1 sm:flex-none" onClick={handleCopyAddress} disabled={!walletDisplay.address}>
                 <Copy className="mr-1.5 h-3.5 w-3.5" />
                 Copy
               </Button>
-              <Button variant="outline" size="sm" className="flex-1 sm:flex-none" onClick={handleOpenWalletView} disabled={!walletAddress}>
+              <Button variant="outline" size="sm" className="flex-1 sm:flex-none" onClick={handleOpenWalletView} disabled={!walletDisplay.explorerUrl}>
                 <ExternalLink className="mr-1.5 h-3.5 w-3.5" />
                 Open wallet
               </Button>
@@ -539,7 +540,7 @@ export function InvestorWalletPanel({ sectionId = "wallet", className, showTitle
               <p className="mt-2 text-xl font-semibold">{onchainLoading ? "Loading..." : onchainBalance || "Unavailable"}</p>
             )}
             <p className="mt-1 text-xs text-muted-foreground">
-              {isMockStellar ? "Stellar Mock Assets" : "Lisk Sepolia embedded wallet"}
+              {isMockStellar ? "Stellar Mock Assets" : `${CURRENT_EMBEDDED_WALLET.network.label} embedded wallet`}
             </p>
           </div>
         </div>
diff --git a/components/dashboard/wallet-menu.tsx b/components/dashboard/wallet-menu.tsx
index d899274..0edc0c2 100644
--- a/components/dashboard/wallet-menu.tsx
+++ b/components/dashboard/wallet-menu.tsx
@@ -4,7 +4,6 @@ import { useEffect, useMemo, useState } from "react"
 import Link from "next/link"
 import { ChevronRight, Copy, ExternalLink, Loader2, Wallet } from "lucide-react"
 import { formatEther } from "viem"
-import { liskSepolia } from "viem/chains"
 
 import { Button } from "@/components/ui/button"
 import {
@@ -20,14 +19,11 @@ import { useAuth } from "@/hooks/use-auth"
 import { getPrivyFundingErrorMessage, startPrivyFunding } from "@/lib/auth/privy-funding"
 import { useToast } from "@/components/ui/use-toast"
 import { useFundWallet, useWallets } from "@/lib/privy/react-auth"
-
-function truncateAddress(address: string) {
-  if (address.length < 10) return address
-  return `${address.slice(0, 6)}...${address.slice(-4)}`
-}
-
-async function resolveOnchainBalance(address: string) {
-  const rpcUrl = liskSepolia.rpcUrls.default.http[0]
+import { CURRENT_EMBEDDED_WALLET, getWalletDisplay } from "@/lib/wallet/config"
+
+async function resolveOnchainBalance(address: string) {
+  const rpcUrl = CURRENT_EMBEDDED_WALLET.network.rpcUrl
+  if (!rpcUrl) return null
   const response = await fetch(rpcUrl, {
     method: "POST",
     headers: { "Content-Type": "application/json" },
@@ -46,7 +42,7 @@ async function resolveOnchainBalance(address: string) {
   const balance = formatEther(BigInt(balanceHex))
   const parsed = Number.parseFloat(balance)
   if (!Number.isFinite(parsed)) return null
-  return `${parsed.toFixed(4)} ETH`
+  return `${parsed.toFixed(4)} ${CURRENT_EMBEDDED_WALLET.network.nativeAsset}`
 }
 
 export function WalletMenu() {
@@ -65,7 +61,11 @@ export function WalletMenu() {
     return wallets.find((wallet) => wallet.walletClientType === "privy" || wallet.walletClientType === "privy-v2")
   }, [wallets])
 
-  const walletAddress = embeddedWallet?.address || authUser?.walletAddress || ""
+  const walletAddress = embeddedWallet?.address || authUser?.walletAddress || ""
+  const walletDisplay = getWalletDisplay({
+    embeddedWalletAddress: walletAddress,
+    stellarPublicKey: authUser?.stellarPublicKey,
+  })
   const internalBalance = authUser?.availableBalance || 0
   const isBalanceLoading = Boolean(walletAddress) && onchainBalance.address !== walletAddress
 
@@ -93,17 +93,17 @@ export function WalletMenu() {
     }
   }, [walletAddress])
 
-  const copyAddress = async () => {
-    if (!walletAddress) return
-    await navigator.clipboard.writeText(walletAddress)
-    toast({
-      title: "Address copied",
-      description: "Wallet address copied to clipboard.",
+  const copyAddress = async () => {
+    if (!walletDisplay.address) return
+    await navigator.clipboard.writeText(walletDisplay.address)
+    toast({
+      title: "Address copied",
+      description: `${walletDisplay.addressLabel} copied to clipboard.`,
     })
   }
 
   const handleOpenWalletView = () => {
-    if (!walletAddress) {
+    if (!walletDisplay.explorerUrl) {
       toast({
         title: "No wallet address",
         description: "Sign in again to initialize your embedded wallet.",
@@ -112,7 +112,7 @@ export function WalletMenu() {
       return
     }
 
-    window.open(`https://sepolia-blockscout.lisk.com/address/${walletAddress}`, "_blank", "noopener,noreferrer")
+    window.open(walletDisplay.explorerUrl, "_blank", "noopener,noreferrer")
     toast({
       title: "Wallet address ready",
       description: "Use your address to receive funds, or continue with Paystack for NGN wallet funding.",
@@ -157,12 +157,15 @@ export function WalletMenu() {
     <DropdownMenu>
       <DropdownMenuTrigger asChild>
         <Button variant="outline" size="sm" className="h-9">
-          <Wallet className="mr-2 h-4 w-4" />
-          {walletAddress ? truncateAddress(walletAddress) : "Wallet"}
+          <Wallet className="mr-2 h-4 w-4" />
+          {walletDisplay.shortAddress || "Wallet"}
         </Button>
       </DropdownMenuTrigger>
       <DropdownMenuContent align="end" className="w-80">
-        <DropdownMenuLabel>Wallet</DropdownMenuLabel>
+        <DropdownMenuLabel>
+          {walletDisplay.label}
+          <span className="ml-2 font-normal text-muted-foreground">{walletDisplay.networkLabel}</span>
+        </DropdownMenuLabel>
         <DropdownMenuSeparator />
 
         <div className="space-y-2 px-2 py-1.5 text-xs">
@@ -171,7 +174,7 @@ export function WalletMenu() {
             <p className="text-sm font-semibold">{formatNaira(internalBalance)}</p>
           </div>
           <div className="rounded-md border bg-muted/30 p-2">
-            <p className="text-muted-foreground">Onchain balance</p>
+            <p className="text-muted-foreground">{CURRENT_EMBEDDED_WALLET.network.label} balance</p>
             <p className="text-sm font-semibold">
               {!walletAddress ? "Unavailable" : isBalanceLoading ? "Loading..." : onchainBalance.value || "Unavailable"}
             </p>
@@ -180,8 +183,8 @@ export function WalletMenu() {
 
         <DropdownMenuItem onSelect={(event) => event.preventDefault()} className="cursor-default">
           <div className="flex w-full items-center justify-between gap-2">
-            <span className="max-w-[180px] truncate text-xs">{walletAddress || "No wallet address"}</span>
-            <Button size="icon" variant="ghost" className="h-7 w-7" onClick={copyAddress} disabled={!walletAddress}>
+            <span className="max-w-[180px] truncate text-xs">{walletDisplay.address || "No wallet linked"}</span>
+            <Button size="icon" variant="ghost" className="h-7 w-7" onClick={copyAddress} disabled={!walletDisplay.address}>
               <Copy className="h-3.5 w-3.5" />
             </Button>
           </div>
@@ -202,7 +205,7 @@ export function WalletMenu() {
         <DropdownMenuItem onSelect={(event) => event.preventDefault()} className="cursor-default">
           <Button
             onClick={handleOpenWalletView}
-            disabled={!walletAddress}
+            disabled={!walletDisplay.explorerUrl}
             variant="outline"
             className="h-8 w-full"
           >
diff --git a/evidence/app-loading-after.png b/evidence/app-loading-after.png
new file mode 100644
index 0000000..a20b822
Binary files /dev/null and b/evidence/app-loading-after.png differ
diff --git a/evidence/tests-passing.png b/evidence/tests-passing.png
new file mode 100644
index 0000000..6730dd6
Binary files /dev/null and b/evidence/tests-passing.png differ
diff --git a/evidence/wallet-profile-after.png b/evidence/wallet-profile-after.png
new file mode 100644
index 0000000..ac21184
Binary files /dev/null and b/evidence/wallet-profile-after.png differ
diff --git a/evidence/wallet-profile-before.png b/evidence/wallet-profile-before.png
new file mode 100644
index 0000000..f6abda3
Binary files /dev/null and b/evidence/wallet-profile-before.png differ
diff --git a/hooks/use-auth.ts b/hooks/use-auth.ts
index fdf75aa..de7c88e 100644
--- a/hooks/use-auth.ts
+++ b/hooks/use-auth.ts
@@ -21,7 +21,7 @@ export interface AuthUser {
   bio?: string | null
   role?: string
   walletAddress?: string
-  stellarPublicKey?: string | null
+  stellarPublicKey?: string
   availableBalance?: number
   totalInvested?: number
   totalReturns?: number
diff --git a/lib/stellar/config.test.ts b/lib/stellar/config.test.ts
index 5ac1a36..55dfe47 100644
--- a/lib/stellar/config.test.ts
+++ b/lib/stellar/config.test.ts
@@ -15,6 +15,9 @@ describe("getStellarConfig", () => {
       "STELLAR_ISSUER_PUBLIC_KEY",
       "STELLAR_DISTRIBUTION_PUBLIC_KEY",
       "STELLAR_CONTRACT_ID",
+      "STELLAR_EXPLORER_BASE_URL",
+      "NEXT_PUBLIC_STELLAR_DEMO_PUBLIC_KEY",
+      "STELLAR_DEMO_PUBLIC_KEY",
       "CHAINMOVE_CA",
       "ENABLE_MOCK_STELLAR",
     ]
@@ -39,7 +42,9 @@ describe("getStellarConfig", () => {
       issuerPublicKey: "",
       distributionPublicKey: "",
       contractId: "",
+      explorerBaseUrl: "https://stellar.expert/explorer/testnet",
       mock: false,
+      demoPublicKey: "GABCDMOCKSTELLARPUBLICKEYTESTNET000000000000000000000000000000",
     })
   })
 
@@ -62,7 +67,9 @@ describe("getStellarConfig", () => {
       issuerPublicKey: "GD123...",
       distributionPublicKey: "GD456...",
       contractId: "C123...",
+      explorerBaseUrl: "https://stellar.expert/explorer/public",
       mock: false,
+      demoPublicKey: "GABCDMOCKSTELLARPUBLICKEYTESTNET000000000000000000000000000000",
     })
   })
 
diff --git a/lib/stellar/config.ts b/lib/stellar/config.ts
index dc9b15a..bea1b4f 100644
--- a/lib/stellar/config.ts
+++ b/lib/stellar/config.ts
@@ -21,7 +21,7 @@ function getDefaultExplorerBaseUrl(network: string) {
 
 export function getStellarConfig(): StellarConfig {
   const network = process.env.STELLAR_NETWORK || "testnet"
-  const mock = process.env.ENABLE_MOCK_STELLAR ? process.env.ENABLE_MOCK_STELLAR === "true" : process.env.NODE_ENV !== "production"
+  const mock = process.env.ENABLE_MOCK_STELLAR === "true"
 
   return {
     network,
diff --git a/lib/wallet/config.test.ts b/lib/wallet/config.test.ts
new file mode 100644
index 0000000..b4c59ac
--- /dev/null
+++ b/lib/wallet/config.test.ts
@@ -0,0 +1,75 @@
+import { describe, expect, it } from "vitest"
+
+import {
+  CURRENT_EMBEDDED_WALLET,
+  embeddedWalletProviderConfig,
+  getWalletDisplay,
+  PLANNED_STELLAR_WALLET,
+} from "./config"
+
+describe("wallet configuration", () => {
+  it("keeps the current Privy embedded wallet on Lisk Sepolia", () => {
+    const embeddedWalletAddress = "0x1234567890abcdef1234567890abcdef12345678"
+
+    expect(CURRENT_EMBEDDED_WALLET).toMatchObject({
+      mode: "embedded-evm",
+      provider: "privy",
+      status: "current",
+      network: {
+        id: "lisk-sepolia",
+        label: "Lisk Sepolia",
+        family: "evm",
+        nativeAsset: "ETH",
+      },
+    })
+    expect(embeddedWalletProviderConfig.loginMethods).toEqual(["email", "sms"])
+    expect(embeddedWalletProviderConfig.defaultChain?.id).toBe(4202)
+    expect(embeddedWalletProviderConfig.embeddedWallets).toMatchObject({
+      ethereum: { createOnLogin: "all-users" },
+      showWalletUIs: true,
+    })
+
+    expect(getWalletDisplay({ embeddedWalletAddress })).toMatchObject({
+      mode: "embedded-evm",
+      label: "Privy embedded wallet",
+      addressLabel: "Wallet",
+      address: embeddedWalletAddress,
+      shortAddress: "0x1234...5678",
+      networkLabel: "Lisk Sepolia",
+      linked: true,
+    })
+  })
+
+  it("uses the Stellar account display when a Stellar public key is linked", () => {
+    const stellarPublicKey = "GBRPYHIL2CI3FNQ4BXLFMNDLFJUNPU2HY3ZMFSHONUCEOASW7QC7OX2H"
+    const display = getWalletDisplay({
+      embeddedWalletAddress: "0x1234567890abcdef",
+      stellarPublicKey,
+    })
+
+    expect(PLANNED_STELLAR_WALLET.status).toBe("planned")
+    expect(display).toMatchObject({
+      mode: "stellar-account",
+      label: "Stellar account",
+      addressLabel: "Stellar account",
+      address: stellarPublicKey,
+      shortAddress: "GBRPYH...OX2H",
+      networkLabel: "Stellar Testnet",
+      linked: true,
+    })
+    expect(display.explorerUrl).toContain(`/account/${stellarPublicKey}`)
+  })
+
+  it("returns a safe fallback when no wallet is linked", () => {
+    expect(getWalletDisplay({})).toEqual({
+      mode: null,
+      label: "Wallet",
+      addressLabel: "Wallet",
+      address: null,
+      shortAddress: null,
+      networkLabel: "No network",
+      explorerUrl: null,
+      linked: false,
+    })
+  })
+})
diff --git a/lib/wallet/config.ts b/lib/wallet/config.ts
new file mode 100644
index 0000000..69b2e14
--- /dev/null
+++ b/lib/wallet/config.ts
@@ -0,0 +1,98 @@
+import { liskSepolia } from "viem/chains"
+
+import type {
+  EmbeddedWalletProviderConfig,
+  PublicWalletDisplay,
+  WalletDisplayInput,
+  WalletModeConfig,
+} from "./types"
+
+export const CURRENT_EMBEDDED_WALLET: WalletModeConfig = {
+  mode: "embedded-evm",
+  label: "Privy embedded wallet",
+  addressLabel: "Wallet",
+  provider: "privy",
+  status: "current",
+  network: {
+    id: "lisk-sepolia",
+    label: "Lisk Sepolia",
+    family: "evm",
+    nativeAsset: "ETH",
+    rpcUrl: liskSepolia.rpcUrls.default.http[0],
+    explorerAddressBaseUrl: "https://sepolia-blockscout.lisk.com/address",
+  },
+}
+
+export const PLANNED_STELLAR_WALLET: WalletModeConfig = {
+  mode: "stellar-account",
+  label: "Stellar account",
+  addressLabel: "Stellar account",
+  provider: "stellar",
+  status: "planned",
+  network: {
+    id: "stellar-testnet",
+    label: "Stellar Testnet",
+    family: "stellar",
+    nativeAsset: "XLM",
+    explorerAddressBaseUrl: "https://stellar.expert/explorer/testnet/account",
+  },
+}
+
+export const embeddedWalletProviderConfig: EmbeddedWalletProviderConfig = {
+  loginMethods: ["email", "sms"],
+  supportedChains: [liskSepolia],
+  defaultChain: liskSepolia,
+  embeddedWallets: {
+    ethereum: {
+      createOnLogin: "all-users",
+    },
+    showWalletUIs: true,
+  },
+  appearance: {
+    theme: "light",
+    accentColor: "#F2780E",
+    logo: "/images/chainmovelogo.png",
+  },
+}
+
+export function shortenWalletAddress(address: string) {
+  if (address.length < 13) return address
+  return `${address.slice(0, 6)}...${address.slice(-4)}`
+}
+
+function buildDisplay(config: WalletModeConfig, address: string): PublicWalletDisplay {
+  const normalizedAddress = address.trim()
+  const explorerBaseUrl = config.network.explorerAddressBaseUrl.replace(/\/$/, "")
+
+  return {
+    mode: config.mode,
+    label: config.label,
+    addressLabel: config.addressLabel,
+    address: normalizedAddress,
+    shortAddress: shortenWalletAddress(normalizedAddress),
+    networkLabel: config.network.label,
+    explorerUrl: `${explorerBaseUrl}/${encodeURIComponent(normalizedAddress)}`,
+    linked: true,
+  }
+}
+
+export function getWalletDisplay(input: WalletDisplayInput): PublicWalletDisplay {
+  if (input.stellarPublicKey?.trim()) {
+    return buildDisplay(PLANNED_STELLAR_WALLET, input.stellarPublicKey)
+  }
+
+  if (input.embeddedWalletAddress?.trim()) {
+    return buildDisplay(CURRENT_EMBEDDED_WALLET, input.embeddedWalletAddress)
+  }
+
+  return {
+    mode: null,
+    label: "Wallet",
+    addressLabel: "Wallet",
+    address: null,
+    shortAddress: null,
+    networkLabel: "No network",
+    explorerUrl: null,
+    linked: false,
+  }
+}
diff --git a/lib/wallet/types.ts b/lib/wallet/types.ts
new file mode 100644
index 0000000..5806e54
--- /dev/null
+++ b/lib/wallet/types.ts
@@ -0,0 +1,40 @@
+import type { PrivyClientConfig } from "@privy-io/react-auth"
+
+export type WalletMode = "embedded-evm" | "stellar-account"
+export type WalletChainFamily = "evm" | "stellar"
+
+export interface WalletNetworkConfig {
+  id: string
+  label: string
+  family: WalletChainFamily
+  nativeAsset: string
+  explorerAddressBaseUrl: string
+  rpcUrl?: string
+}
+
+export interface WalletModeConfig {
+  mode: WalletMode
+  label: string
+  addressLabel: string
+  network: WalletNetworkConfig
+  provider: "privy" | "stellar"
+  status: "current" | "planned"
+}
+
+export interface WalletDisplayInput {
+  embeddedWalletAddress?: string | null
+  stellarPublicKey?: string | null
+}
+
+export interface PublicWalletDisplay {
+  mode: WalletMode | null
+  label: string
+  addressLabel: string
+  address: string | null
+  shortAddress: string | null
+  networkLabel: string
+  explorerUrl: string | null
+  linked: boolean
+}
+
+export type EmbeddedWalletProviderConfig = PrivyClientConfig