Merge pull request #875 from chainsmt/feat/issue-800

feat(wallet): persist connection across browser sessions

Author: anumukul

frontend/__tests__/wallet-context.test.tsx

@@ -58,11 +58,14 @@ function WalletErrorProbe() {
 describe("WalletProvider", () => {
   beforeEach(() => {
     vi.clearAllMocks();
+    localStorage.clear();
+    sessionStorage.clear();
     mockGetWalletNetwork.mockResolvedValue("testnet");
     mockWatchWalletNetworkChanges.mockReturnValue(() => undefined);
   });
 
-  it("propagates provider state to consumers", async () => {
+  it("propagates provider state to consumers when auto-reconnect is enabled", async () => {
+    localStorage.setItem("stellarwork:wallet-auto-reconnect", "true");
     mockGetPublicKey.mockResolvedValue("GINITIALWALLET");
 
     render(
@@ -77,6 +80,48 @@ describe("WalletProvider", () => {
     await waitFor(() =>
       expect(screen.getByTestId("wallet-network")).toHaveTextContent("testnet"),
     );
+    expect(localStorage.getItem("stellarwork:last-connected-account")).toBe(
+      "GINITIALWALLET",
+    );
+  });
+
+  it("skips auto-reconnect after an explicit disconnect", async () => {
+    localStorage.setItem("stellarwork:wallet-auto-reconnect", "false");
+    mockGetPublicKey.mockResolvedValue("GSHOULDNOTCONNECT");
+
+    render(
+      <WalletProvider>
+        <WalletProbe />
+      </WalletProvider>,
+    );
+
+    await waitFor(() =>
+      expect(screen.getByTestId("wallet")).toHaveTextContent("none"),
+    );
+    expect(mockGetPublicKey).not.toHaveBeenCalled();
+  });
+
+  it("clears stale persistence when Freighter no longer allows access", async () => {
+    localStorage.setItem("stellarwork:wallet-auto-reconnect", "true");
+    localStorage.setItem(
+      "stellarwork:last-connected-account",
+      "GSTALEWALLET",
+    );
+    mockGetPublicKey.mockResolvedValue(null);
+
+    render(
+      <WalletProvider>
+        <WalletProbe />
+      </WalletProvider>,
+    );
+
+    await waitFor(() =>
+      expect(screen.getByTestId("wallet")).toHaveTextContent("none"),
+    );
+    expect(localStorage.getItem("stellarwork:last-connected-account")).toBeNull();
+    expect(localStorage.getItem("stellarwork:wallet-auto-reconnect")).toBe(
+      "false",
+    );
   });
 
   it("handles connect and disconnect behavior", async () => {
@@ -95,13 +140,20 @@ describe("WalletProvider", () => {
     await waitFor(() =>
       expect(screen.getByTestId("wallet")).toHaveTextContent("GCONNECTEDWALLET"),
     );
+    expect(localStorage.getItem("stellarwork:wallet-auto-reconnect")).toBe(
+      "true",
+    );
     await waitFor(() =>
       expect(screen.getByTestId("wallet-network")).toHaveTextContent("testnet"),
     );
 
     fireEvent.click(screen.getByRole("button", { name: "disconnect" }));
     expect(screen.getByTestId("wallet")).toHaveTextContent("none");
     expect(screen.getByTestId("wallet-network")).toHaveTextContent("none");
+    expect(localStorage.getItem("stellarwork:wallet-auto-reconnect")).toBe(
+      "false",
+    );
+    expect(localStorage.getItem("stellarwork:last-connected-account")).toBeNull();
   });
 
   it("surfaces connect errors to consumer callers", async () => {

frontend/lib/wallet-context.tsx

@@ -17,6 +17,7 @@ import {
   watchWalletNetworkChanges,
 } from "@/lib/stellar";
 import type { StellarNetwork } from "@/lib/network-config";
+import LegalConsentModal, { hasAcceptedLegal } from "@/components/LegalConsentModal";
 import LegalConsentModal, { hasAcceptedLegal, acceptLegal } from "@/components/LegalConsentModal";
 import ConfirmDialog from "@/components/ConfirmDialog";
 import { CONFIRM_KEYS } from "@/lib/confirm-prefs";
@@ -25,6 +26,7 @@ import { checkConnectionRateLimit, recordConnectionSuccess, recordConnectionFail
 
 // Storage keys
 const LAST_ACCOUNT_KEY = "stellarwork:last-connected-account";
+const WALLET_AUTO_RECONNECT_KEY = "stellarwork:wallet-auto-reconnect";
 const JOB_CACHE_PREFIX = "job-desc:";
 
 interface WalletContextType {
@@ -95,6 +97,30 @@ function persistLastAccount(address: string | null) {
   }
 }
 
+function getLastConnectedAccount(): string | null {
+  if (typeof window === "undefined") return null;
+  return localStorage.getItem(LAST_ACCOUNT_KEY);
+}
+
+function getAutoReconnectPreference(): boolean {
+  if (typeof window === "undefined") return false;
+  const stored = localStorage.getItem(WALLET_AUTO_RECONNECT_KEY);
+  if (stored === "true") return true;
+  if (stored === "false") return false;
+  // Migrate existing sessions that stored an address before the flag existed.
+  return getLastConnectedAccount() !== null;
+}
+
+function setAutoReconnectPreference(connected: boolean) {
+  if (typeof window === "undefined") return;
+  localStorage.setItem(WALLET_AUTO_RECONNECT_KEY, connected ? "true" : "false");
+}
+
+function clearPersistedWalletSession() {
+  persistLastAccount(null);
+  setAutoReconnectPreference(false);
+}
+
 export function WalletProvider({ children }: { children: ReactNode }) {
   const [wallet, setWallet] = useState<string | null>(null);
   const [walletNetwork, setWalletNetwork] = useState<StellarNetwork | null>(null);
@@ -107,14 +133,22 @@ export function WalletProvider({ children }: { children: ReactNode }) {
     setWalletNetwork(nextNetwork);
   }, []);
 
-  // On mount: restore last session via Freighter if still allowed.
+  // On mount: restore last session when the user opted in to auto-reconnect.
   useEffect(() => {
+    if (!getAutoReconnectPreference()) {
+      return;
+    }
+
     getPublicKey().then(async (key) => {
       if (key) {
         setWallet(key);
         persistLastAccount(key);
         await refreshWalletNetwork();
+        return;
       }
+
+      // Freighter permission was revoked or the extension is unavailable.
+      clearPersistedWalletSession();
     });
   }, [refreshWalletNetwork]);
 
@@ -208,14 +242,15 @@ export function WalletProvider({ children }: { children: ReactNode }) {
     const key = await connectPromiseRef.current;
     setWallet(key);
     persistLastAccount(key);
+    setAutoReconnectPreference(true);
     await refreshWalletNetwork();
   }, [wallet, refreshWalletNetwork]);
 
   const disconnectWallet = useCallback(() => {
     clearWalletData();
     setWallet(null);
     setWalletNetwork(null);
-    persistLastAccount(null);
+    clearPersistedWalletSession();
     // Clear session display preference
     if (typeof window !== "undefined") {
       sessionStorage.removeItem("wallet-display-mode");
@@ -242,6 +277,7 @@ export function WalletProvider({ children }: { children: ReactNode }) {
         clearWalletData();
         setWallet(newKey);
         persistLastAccount(newKey);
+        setAutoReconnectPreference(true);
       }
       await refreshWalletNetwork();
     } catch (err) {