From 128126e9539025922f7aedbb8972f79459caaf74 Mon Sep 17 00:00:00 2001
From: Gadflyxx <oncleweynom@gmail.com>
Date: Thu, 3 Sep 2026 14:01:34 +0000
Subject: [PATCH] fix:All issue

---
 src/app/solve/SolvePageClient.tsx  | 14 +++++-
 src/components/SwapCard.test.tsx   | 70 ++++++++++++++++++++++++++++++
 src/components/SwapCard.tsx        | 19 +++++++-
 src/hooks/useSolverRegistration.ts | 10 ++++-
 src/hooks/useSwapSubmission.ts     | 12 ++++-
 src/lib/i18n/messages/en.ts        |  2 +
 src/lib/i18n/messages/es.ts        |  1 +
 src/store/wallet.ts                |  2 +-
 8 files changed, 124 insertions(+), 6 deletions(-)

diff --git a/src/app/solve/SolvePageClient.tsx b/src/app/solve/SolvePageClient.tsx
index 8673fb5..cf89633 100644
--- a/src/app/solve/SolvePageClient.tsx
+++ b/src/app/solve/SolvePageClient.tsx
@@ -684,10 +684,20 @@ export default function SolvePageClient() {
                 </p>
               )}
 
+              {networkMismatch && (
+                <p role="alert" className="text-xs text-yellow-400">
+                  ⚠ Wrong network — switch Freighter to{" "}
+                  <span className="font-semibold">
+                    {process.env["NEXT_PUBLIC_NETWORK"] ?? "testnet"}
+                  </span>{" "}
+                  before registering.
+                </p>
+              )}
+
               <button
                 type="button"
                 onClick={handleRegisterSubmit}
-                disabled={(!canSubmit && regStatus !== "success") || isBusy}
+                disabled={(!canRegister && regStatus !== "success") || isBusy}
                 aria-busy={isBusy}
                 className="w-full py-2.5 bg-vx-sage-bg text-vx-sage text-xs font-semibold rounded-lg border border-vx-sage/30 hover:bg-vx-sage/15 disabled:opacity-50 disabled:cursor-not-allowed transition-all"
               >
@@ -695,6 +705,8 @@ export default function SolvePageClient() {
                   ? t(REGISTRATION_LABEL_KEY[registration.status]!)
                   : registration.status === "success"
                   ? t("solve.register.button.registered")
+                  : networkMismatch
+                  ? t("solve.register.button.wrongNetwork")
                   : t("solve.register.button.connect")}
               </button>
             </div>
diff --git a/src/components/SwapCard.test.tsx b/src/components/SwapCard.test.tsx
index 35f819c..044388b 100644
--- a/src/components/SwapCard.test.tsx
+++ b/src/components/SwapCard.test.tsx
@@ -289,4 +289,74 @@ describe("SwapCard", () => {
       }),
     );
   });
+
+  // ── Issue #248: networkMismatch submission guard ──────────────────────────
+
+  it("disables the swap button and shows an inline alert when connected to the wrong network", async () => {
+    useWalletStore.setState({
+      isConnected: true,
+      address: "GABC123",
+      network: "MAINNET",
+      networkMismatch: true,
+    });
+
+    const user = userEvent.setup();
+    renderSwapCard();
+
+    const input = screen.getByPlaceholderText("0");
+    await user.type(input, "500");
+
+    // Inline alert must be visible.
+    await waitFor(() => {
+      expect(screen.getAllByRole("alert").some((el) =>
+        el.textContent?.toLowerCase().includes("wrong network")
+      )).toBe(true);
+    });
+
+    // The swap button must be disabled.
+    const swapButton = screen.getAllByRole("button").find(
+      (btn) => btn.textContent?.toLowerCase().includes("wrong network")
+    );
+    expect(swapButton).toBeDefined();
+    expect(swapButton).toBeDisabled();
+
+    // Freighter must never be called.
+    expect(signTransactionMock).not.toHaveBeenCalled();
+  });
+
+  it("does not show the network-mismatch alert when networkMismatch is false", async () => {
+    useWalletStore.setState({
+      isConnected: true,
+      address: "GABC123",
+      network: "TESTNET",
+      networkMismatch: false,
+    });
+
+    renderSwapCard();
+
+    // No mismatch alert should be present.
+    const alerts = screen.queryAllByRole("alert");
+    const mismatchAlert = alerts.find((el) =>
+      el.textContent?.toLowerCase().includes("wrong network")
+    );
+    expect(mismatchAlert).toBeUndefined();
+  });
+
+  it("does not show the network-mismatch alert when wallet is not connected (networkMismatch defaults to false)", () => {
+    // networkMismatch defaults to false before any connection — the guard
+    // must not falsely block a pre-connection state.
+    useWalletStore.setState({
+      isConnected: false,
+      address: null,
+      networkMismatch: false,
+    });
+
+    renderSwapCard();
+
+    const alerts = screen.queryAllByRole("alert");
+    const mismatchAlert = alerts.find((el) =>
+      el.textContent?.toLowerCase().includes("wrong network")
+    );
+    expect(mismatchAlert).toBeUndefined();
+  });
 });
diff --git a/src/components/SwapCard.tsx b/src/components/SwapCard.tsx
index 6327935..0028a43 100644
--- a/src/components/SwapCard.tsx
+++ b/src/components/SwapCard.tsx
@@ -6,6 +6,7 @@ import { useQuote } from "@/hooks/useQuote";
 import { useSwapSubmission } from "@/hooks/useSwapSubmission";
 import { useRecentChains } from "@/hooks/useRecentChains";
 import { useToastStore } from "@/store/toast";
+import { useWalletStore } from "@/store/wallet";
 import { CHAINS, DST_TOKENS, SRC_TOKENS } from "@/lib/marketData";
 import { isValidStellarPublicKey } from "@/lib/stellarAddress";
 import { formatTokenAmount } from "@/lib/format";
@@ -214,12 +215,14 @@ export function SwapCard({ initialAmount = "", previewQuote, onPreviewSubmit }:
   // ── Submission ─────────────────────────────────────────────────────────────
   const submission = useSwapSubmission();
   const isSubmitting = submission.status in SUBMISSION_LABEL_KEY;
+  const networkMismatch = useWalletStore((s) => s.networkMismatch);
   const canSwap =
     Boolean(srcAmount) &&
     parseFloat(srcAmount) > 0 &&
     !quoting &&
     !isSubmitting &&
-    !dstAddressError;
+    !dstAddressError &&
+    !networkMismatch;
 
   function truncateToDecimals(value: string, decimals: number): string {
     const dotIndex = value.indexOf(".");
@@ -673,6 +676,16 @@ export function SwapCard({ initialAmount = "", previewQuote, onPreviewSubmit }:
           </p>
         )}
 
+        {networkMismatch && (
+          <p role="alert" className="text-center text-xs text-yellow-400 px-1">
+            ⚠ Wrong network — switch Freighter to{" "}
+            <span className="font-semibold">
+              {process.env["NEXT_PUBLIC_NETWORK"] ?? "testnet"}
+            </span>{" "}
+            before swapping.
+          </p>
+        )}
+
         <button
           type="button"
           className="btn-swap"
@@ -722,6 +735,8 @@ export function SwapCard({ initialAmount = "", previewQuote, onPreviewSubmit }:
               </svg>
               {t("swap.submit.findingRoute")}
             </span>
+          ) : networkMismatch ? (
+            t("swap.submit.wrongNetwork")
           ) : canSwap ? (
             t(submission.status === "error" ? "swap.submit.retryCta" : "swap.submit.cta", {
               amount: srcAmount,
@@ -797,6 +812,8 @@ export function SwapCard({ initialAmount = "", previewQuote, onPreviewSubmit }:
             </span>
           ) : quoteIsStale ? (
             t("swap.quote.expired")
+          ) : networkMismatch ? (
+            t("swap.submit.wrongNetwork")
           ) : canSwap ? (
             t(
               submission.status === "error"
diff --git a/src/hooks/useSolverRegistration.ts b/src/hooks/useSolverRegistration.ts
index a32345d..e99eb95 100644
--- a/src/hooks/useSolverRegistration.ts
+++ b/src/hooks/useSolverRegistration.ts
@@ -4,7 +4,7 @@ import { walletAdapter } from "@/lib/wallet";
 import { registerSolver, submitSolverRegistration } from "@/lib/api";
 import { ApiError } from "@/lib/api";
 import { verifySignedXdrMatches } from "@/lib/xdrReview";
-import { useWalletStore } from "@/store/wallet";
+import { useWalletStore, EXPECTED_NETWORK } from "@/store/wallet";
 import { useToastStore } from "@/store/toast";
 import { decodeXdr, validateRegistrationXdr, XdrMismatchError } from "@/lib/xdrReview";
 
@@ -86,6 +86,14 @@ export function useSolverRegistration() {
       // ──────────────────────────────────────────────────────────────────────
 
       setStatus("awaiting-signature");
+      // Defense-in-depth (#248): validate network against the expected
+      // passphrase immediately before calling Freighter — guards against
+      // stale-closure or UI-bypass scenarios.
+      if ((wallet.network ?? "").toUpperCase() !== EXPECTED_NETWORK) {
+        throw new Error(
+          `Network mismatch: Freighter is on "${wallet.network ?? "unknown"}" but this app requires "${EXPECTED_NETWORK}". Switch networks in Freighter and try again.`,
+        );
+      }
       const signedXdr = await walletAdapter.signTransaction(unsignedXdr, {
         network: wallet.network ?? undefined,
       });
diff --git a/src/hooks/useSwapSubmission.ts b/src/hooks/useSwapSubmission.ts
index d0e465f..60382a8 100644
--- a/src/hooks/useSwapSubmission.ts
+++ b/src/hooks/useSwapSubmission.ts
@@ -1,8 +1,8 @@
-import { useCallback, useState } from "react";
+import { useCallback, useRef, useState } from "react";
 import { walletAdapter } from "@/lib/wallet";
 import { createIntent, submitIntent } from "@/lib/api";
 import { verifySignedXdrMatches } from "@/lib/xdrReview";
-import { useWalletStore } from "@/store/wallet";
+import { useWalletStore, EXPECTED_NETWORK } from "@/store/wallet";
 import { useToastStore } from "@/store/toast";
 import { decodeXdr, validateSwapXdr, XdrMismatchError } from "@/lib/xdrReview";
 import type { QuoteRequest } from "@/lib/types";
@@ -137,6 +137,14 @@ export function useSwapSubmission() {
       // ──────────────────────────────────────────────────────────────────────
 
       setStatus("awaiting-signature");
+      // Defense-in-depth (#248): validate network against the expected
+      // passphrase immediately before calling Freighter — guards against
+      // stale-closure or UI-bypass scenarios.
+      if ((wallet.network ?? "").toUpperCase() !== EXPECTED_NETWORK) {
+        throw new Error(
+          `Network mismatch: Freighter is on "${wallet.network ?? "unknown"}" but this app requires "${EXPECTED_NETWORK}". Switch networks in Freighter and try again.`,
+        );
+      }
       const signedXdr = await walletAdapter.signTransaction(unsignedXdr, {
         network: wallet.network ?? undefined,
       });
diff --git a/src/lib/i18n/messages/en.ts b/src/lib/i18n/messages/en.ts
index bf3af6c..1b58647 100644
--- a/src/lib/i18n/messages/en.ts
+++ b/src/lib/i18n/messages/en.ts
@@ -76,6 +76,7 @@ export const en = {
   "swap.submit.enterAmount": "Enter an amount",
   "swap.submit.cta": "Swap {amount} {srcToken} → {dstToken}",
   "swap.submit.retryCta": "Retry: Swap {amount} {srcToken} → {dstToken}",
+  "swap.submit.wrongNetwork": "Wrong network — switch Freighter first",
 
   "swap.destination.label": "Destination address",
   "swap.destination.placeholder": "G...",
@@ -104,6 +105,7 @@ export const en = {
   "solve.register.info.withdraw": "Your solver bond earns you exclusive rights to solve intents.",
   "solve.register.button.registered": "Registered ✓",
   "solve.register.button.connect": "Connect to Register",
+  "solve.register.button.wrongNetwork": "Wrong network — switch Freighter first",
 
   "solve.leaderboard.title": "Active Solvers",
   "solve.leaderboard.error": "Failed to load leaderboard.",
diff --git a/src/lib/i18n/messages/es.ts b/src/lib/i18n/messages/es.ts
index 14deb59..1daaa3d 100644
--- a/src/lib/i18n/messages/es.ts
+++ b/src/lib/i18n/messages/es.ts
@@ -76,6 +76,7 @@ export const es = {
   "swap.submit.cta": "Intercambiar {amount} {srcToken} → {dstToken}",
   "swap.submit.retryCta":
     "Reintentar: Intercambiar {amount} {srcToken} → {dstToken}",
+  "swap.submit.wrongNetwork": "Red incorrecta — cambia Freighter primero",
 
   "swap.destination.label": "Dirección de destino",
   "swap.destination.placeholder": "G...",
diff --git a/src/store/wallet.ts b/src/store/wallet.ts
index dd7d0e5..59a4b11 100644
--- a/src/store/wallet.ts
+++ b/src/store/wallet.ts
@@ -16,7 +16,7 @@ export type PersistedWalletState = {
 export const PERSIST_KEY = "vortex-wallet";
 
 /** The network name the app expects, normalised to upper-case for comparison. */
-const EXPECTED_NETWORK = (
+export const EXPECTED_NETWORK = (
   process.env["NEXT_PUBLIC_NETWORK"] ?? "testnet"
 ).toUpperCase();