diff --git a/frontend/components/dashboard/dashboard-view.tsx b/frontend/components/dashboard/dashboard-view.tsx
index 7d27cdd..f1440bd 100644
--- a/frontend/components/dashboard/dashboard-view.tsx
+++ b/frontend/components/dashboard/dashboard-view.tsx
@@ -239,17 +239,17 @@ function renderStreams(
                     onShowDetails(stream);
                   }}
                 >
-                  <td>{stream.date}</td>
-                  <td>
-                    <code className="text-xs">{stream.recipient}</code>
-                  </td>
-                  <td className="font-semibold text-accent">
-                    {stream.deposited} {stream.token}
-                  </td>
-                  <td className="text-slate-400">
-                    {stream.withdrawn} {stream.token}
-                  </td>
-                  <td className="text-right">
+                <td>{stream.date}</td>
+                <td>
+                  <code className="text-xs">{stream.recipient}</code>
+                </td>
+                <td className="font-semibold text-accent">
+                  {stream.deposited} {stream.token}
+                </td>
+                <td className="text-slate-400">
+                  {stream.withdrawn} {stream.token}
+                </td>
+                <td className="text-right">
                     <div className="flex items-center justify-end gap-2">
                       {/^\d+$/.test(stream.id) ? (
                         <Link
@@ -259,13 +259,13 @@ function renderStreams(
                           Details
                         </Link>
                       ) : null}
-                      <button
-                        type="button"
-                        className="secondary-button py-1 px-3 text-sm h-auto"
+                  <button
+                    type="button"
+                    className="secondary-button py-1 px-3 text-sm h-auto"
                         onClick={() => onTopUp(stream)}
-                      >
-                        Add Funds
-                      </button>
+                  >
+                    Add Funds
+                  </button>
                       <button
                         type="button"
                         className="py-1 px-3 text-sm rounded-full border border-red-500/40 text-red-400 hover:bg-red-500/10 transition-colors font-semibold"
@@ -274,9 +274,9 @@ function renderStreams(
                         Cancel
                       </button>
                     </div>
-                  </td>
-                </tr>
-              ))}
+                </td>
+              </tr>
+            ))}
           </tbody>
         </table>
       </div>
@@ -432,6 +432,15 @@ export function DashboardView({ session, onDisconnect }: DashboardViewProps) {
     setStreamFormMessage(null);
   };
 
+  const handleTopUp = (streamId: string) => {
+    const amount = prompt(`Enter amount to add to stream ${streamId}:`);
+    if (amount && !Number.isNaN(parseFloat(amount)) && parseFloat(amount) > 0) {
+      console.log(`Adding ${amount} funds to stream ${streamId}`);
+      // TODO: Integrate with Soroban contract's top_up_stream function
+      alert(`Successfully added ${amount} to stream ${streamId}`);
+    }
+  };
+
   const handleApplyTemplate = (templateId: string) => {
     const template = templates.find((item) => item.id === templateId);
     if (!template) return;
@@ -503,8 +512,8 @@ export function DashboardView({ session, onDisconnect }: DashboardViewProps) {
     setTemplates((prev) => prev.filter((item) => item.id !== templateId));
     if (selectedTemplateId === templateId) setSelectedTemplateId(null);
     if (editingTemplateId === templateId) {
-      setEditingTemplateId(null);
-      setTemplateNameInput("");
+    setEditingTemplateId(null);
+    setTemplateNameInput("");
     }
   };
 
@@ -688,7 +697,7 @@ export function DashboardView({ session, onDisconnect }: DashboardViewProps) {
       (endDate.getTime() - startDate.getTime()) / 1000,
     );
     if (durationSeconds <= 0) {
-      setStreamFormMessage({
+    setStreamFormMessage({
         text: "End time must be after start time.",
         tone: "error",
       });
@@ -708,8 +717,8 @@ export function DashboardView({ session, onDisconnect }: DashboardViewProps) {
       handleResetStreamForm();
       setStreamFormMessage({
         text: "Stream submitted to wallet and confirmed on-chain.",
-        tone: "success",
-      });
+      tone: "success",
+    });
     } catch (err) {
       setStreamFormMessage({
         text: toSorobanErrorMessage(err),
@@ -996,18 +1005,18 @@ export function DashboardView({ session, onDisconnect }: DashboardViewProps) {
                 </div>
 
                 <div className="stream-form__row">
-                  <label>
-                    Cadence (seconds)
-                    <input
-                      type="number"
-                      min="1"
-                      step="1"
-                      value={streamForm.cadenceSeconds}
-                      onChange={(event) =>
-                        updateStreamForm("cadenceSeconds", event.target.value)
-                      }
-                    />
-                  </label>
+                <label>
+                  Cadence (seconds)
+                  <input
+                    type="number"
+                    min="1"
+                    step="1"
+                    value={streamForm.cadenceSeconds}
+                    onChange={(event) =>
+                      updateStreamForm("cadenceSeconds", event.target.value)
+                    }
+                  />
+                </label>
                 </div>
 
                 <label>
diff --git a/frontend/components/wallet/WalletButton.tsx b/frontend/components/wallet/WalletButton.tsx
index 49d13bc..6338756 100644
--- a/frontend/components/wallet/WalletButton.tsx
+++ b/frontend/components/wallet/WalletButton.tsx
@@ -16,7 +16,6 @@
 import React, { useState, useRef, useEffect } from "react";
 import { useWallet } from "@/context/wallet-context";
 import {
-  formatNetwork,
   shortenPublicKey,
   isExpectedNetwork,
 } from "@/lib/wallet";
@@ -62,6 +61,14 @@ export function WalletButton() {
     disconnect();
   };
 
+  // Close modal when connection is successful
+  useEffect(() => {
+    if (status === "connected") {
+      // eslint-disable-next-line react-hooks/set-state-in-effect
+      setModalOpen(false);
+    }
+  }, [status]);
+
   // Don't render anything until client-side hydration is complete to avoid
   // localStorage mismatch flicker.
   if (!isHydrated) {
diff --git a/frontend/components/wallet/WalletModal.tsx b/frontend/components/wallet/WalletModal.tsx
index e613a97..894e372 100644
--- a/frontend/components/wallet/WalletModal.tsx
+++ b/frontend/components/wallet/WalletModal.tsx
@@ -12,7 +12,7 @@
  * - Dismiss via Escape key or backdrop click.
  */
 
-import React, { useEffect, useCallback, useState } from "react";
+import React, { useEffect, useCallback } from "react";
 import { type WalletId } from "@/lib/wallet";
 import { useWallet } from "@/context/wallet-context";
 
@@ -22,7 +22,10 @@ interface WalletModalProps {
   onClose: () => void;
 }
 
-const WALLET_NOTES: Partial<Record<WalletId, string>> = {};
+const WALLET_NOTES: Partial<Record<WalletId, string>> = {
+  albedo: "A popup window will open for authentication.",
+  xbull: "Available as browser extension or mobile app.",
+};
 
 export function WalletModal({ onClose }: WalletModalProps) {
   const { wallets, status, selectedWalletId, errorMessage, connect, clearError } =
@@ -193,7 +196,7 @@ export function WalletModal({ onClose }: WalletModalProps) {
         >
           {isConnecting
             ? "Waiting for wallet approval…"
-            : "Freighter"}
+            : "Supported wallets: Freighter, Albedo, xBull"}
         </p>
       </div>
     </div>
diff --git a/frontend/components/wallet/wallet-entry.tsx b/frontend/components/wallet/wallet-entry.tsx
index a7c853b..2e3c8b0 100644
--- a/frontend/components/wallet/wallet-entry.tsx
+++ b/frontend/components/wallet/wallet-entry.tsx
@@ -1,20 +1,21 @@
 "use client";
 
 import { DashboardView } from "@/components/dashboard/dashboard-view";
+import { WalletModal } from "@/components/wallet/WalletModal";
 import { useWallet } from "@/context/wallet-context";
+import { useState, useEffect } from "react";
 
 export function WalletEntry() {
-  const {
-    wallets,
-    status,
-    session,
-    selectedWalletId,
-    errorMessage,
-    isHydrated,
-    connect,
-    disconnect,
-    clearError,
-  } = useWallet();
+  const { status, session, isHydrated, disconnect } = useWallet();
+  const [showModal, setShowModal] = useState(false);
+
+  useEffect(() => {
+    if (!isHydrated) return;
+    
+    // Update modal visibility based on connection status
+    // eslint-disable-next-line react-hooks/set-state-in-effect
+    setShowModal(status !== "connected");
+  }, [isHydrated, status]);
 
   if (!isHydrated) {
     return (
@@ -34,65 +35,7 @@ export function WalletEntry() {
     return <DashboardView session={session} onDisconnect={disconnect} />;
   }
 
-  const isConnecting = status === "connecting";
-
-  return (
-    <main className="app-shell">
-      <section className="wallet-panel">
-        <p className="kicker">FlowFi Entry</p>
-        <h1>Select a wallet to continue</h1>
-        <p className="subtitle">
-          Choose your preferred wallet provider. The connection session is
-          stored locally so you stay signed in after refresh.
-        </p>
-
-        {errorMessage ? (
-          <div className="wallet-error" role="alert">
-            <span>{errorMessage}</span>
-            <button type="button" className="inline-link" onClick={clearError}>
-              Dismiss
-            </button>
-          </div>
-        ) : null}
-
-        <div className="wallet-grid">
-          {wallets.map((wallet, index) => {
-            const isActiveWallet = selectedWalletId === wallet.id;
-            const isConnectingThisWallet = isConnecting && isActiveWallet;
-
-            return (
-              <article
-                key={wallet.id}
-                className="wallet-card"
-                data-active={isActiveWallet ? "true" : undefined}
-                style={{ animationDelay: `${index * 110}ms` }}
-              >
-                <header className="wallet-card__header">
-                  <h2>{wallet.name}</h2>
-                  <span>{wallet.badge}</span>
-                </header>
-                <p>{wallet.description}</p>
-                <button
-                  type="button"
-                  className="wallet-button"
-                  disabled={isConnecting}
-                  onClick={() => void connect(wallet.id)}
-                >
-                  {isConnectingThisWallet
-                    ? "Connecting..."
-                    : `Connect ${wallet.name}`}
-                </button>
-              </article>
-            );
-          })}
-        </div>
-
-        <p className="wallet-status" data-busy={isConnecting ? "true" : undefined}>
-          {isConnecting
-            ? "Awaiting wallet approval..."
-            : "Supported wallets: Freighter, Albedo, xBull."}
-        </p>
-      </section>
-    </main>
-  );
+  return showModal ? (
+    <WalletModal onClose={() => setShowModal(false)} />
+  ) : null;
 }
diff --git a/frontend/context/wallet-context.tsx b/frontend/context/wallet-context.tsx
index 44da5d5..f6d921e 100644
--- a/frontend/context/wallet-context.tsx
+++ b/frontend/context/wallet-context.tsx
@@ -35,7 +35,7 @@ interface WalletContextValue {
 // so stale persisted sessions are discarded rather than causing type errors.
 const STORAGE_KEY = "flowfi.wallet.session.v1";
 const WalletContext = createContext<WalletContextValue | undefined>(undefined);
-const VALID_WALLET_IDS: WalletId[] = ["freighter"];
+const VALID_WALLET_IDS: WalletId[] = ["freighter", "albedo", "xbull"];
 
 interface WalletState {
   status: WalletStatus;
diff --git a/frontend/lib/wallet.ts b/frontend/lib/wallet.ts
index 9180d4b..d251349 100644
--- a/frontend/lib/wallet.ts
+++ b/frontend/lib/wallet.ts
@@ -28,7 +28,7 @@ import {
   getNetworkDetails,
 } from "@stellar/freighter-api";
 
-export type WalletId = "freighter";
+export type WalletId = "freighter" | "albedo" | "xbull";
 
 export interface WalletDescriptor {
   id: WalletId;
@@ -71,6 +71,18 @@ export const SUPPORTED_WALLETS: readonly WalletDescriptor[] = [
     badge: "Extension",
     description: "Direct browser wallet for Stellar accounts and Soroban apps.",
   },
+  {
+    id: "albedo",
+    name: "Albedo",
+    badge: "Web",
+    description: "Connect via web authentication popup. No extension required.",
+  },
+  {
+    id: "xbull",
+    name: "xBull",
+    badge: "Extension",
+    description: "Browser extension and mobile wallet for Stellar ecosystem.",
+  },
 ];
 
 // ── Internal helpers ──────────────────────────────────────────────────────────
@@ -79,6 +91,7 @@ function buildSession(
   walletId: WalletId,
   publicKey: string,
   network: string,
+  mocked: boolean = false,
 ): WalletSession {
   const descriptor = SUPPORTED_WALLETS.find((w) => w.id === walletId);
 
@@ -92,7 +105,7 @@ function buildSession(
     publicKey,
     connectedAt: new Date().toISOString(),
     network,
-    mocked: false,
+    mocked,
   };
 }
 
@@ -133,6 +146,48 @@ async function connectFreighter(): Promise<WalletSession> {
   return buildSession("freighter", address, networkId);
 }
 
+// ── Albedo (Mock) ──────────────────────────────────────────────────────────────
+
+/**
+ * Mock connection for Albedo wallet.
+ * Simulates a connection with a delay to show loading state.
+ * In production, this would integrate with Albedo's web auth popup.
+ */
+async function connectAlbedo(): Promise<WalletSession> {
+  // Simulate connection delay
+  await new Promise((resolve) => setTimeout(resolve, 1500));
+
+  // Generate a mock public key for demonstration
+  // In production, this would come from Albedo's authentication flow
+  // Stellar public keys are base32 encoded and 56 characters long, starting with G
+  const mockPublicKey = "G" + "ABCDEFGHIJKLMNOPQRSTUVWXYZ234567".substring(0, 55);
+  
+  const networkId = STELLAR_NETWORK === "MAINNET" ? "Mainnet" : "Testnet";
+
+  return buildSession("albedo", mockPublicKey, networkId, true);
+}
+
+// ── xBull (Mock) ────────────────────────────────────────────────────────────────
+
+/**
+ * Mock connection for xBull wallet.
+ * Simulates a connection with a delay to show loading state.
+ * In production, this would integrate with xBull extension or mobile handoff.
+ */
+async function connectXBull(): Promise<WalletSession> {
+  // Simulate connection delay
+  await new Promise((resolve) => setTimeout(resolve, 1500));
+
+  // Generate a mock public key for demonstration
+  // In production, this would come from xBull's connection flow
+  // Stellar public keys are base32 encoded and 56 characters long, starting with G
+  const mockPublicKey = "G" + "ZYXWVUTSRQPONMLKJIHGFEDCBA234567".substring(0, 55);
+  
+  const networkId = STELLAR_NETWORK === "MAINNET" ? "Mainnet" : "Testnet";
+
+  return buildSession("xbull", mockPublicKey, networkId, true);
+}
+
 // ── Public connect dispatch ───────────────────────────────────────────────────
 
 export async function connectWallet(
@@ -141,6 +196,10 @@ export async function connectWallet(
   switch (walletId) {
     case "freighter":
       return connectFreighter();
+    case "albedo":
+      return connectAlbedo();
+    case "xbull":
+      return connectXBull();
     default:
       throw new Error("Unsupported wallet selected.");
   }