Merge branch 'pr-161'

Author: mikewheeleer

README.md

@@ -3,6 +3,7 @@
 import { useState } from "react";
 import { useRouter } from "next/navigation";
 import { apiPost } from "@/lib/apiClient";
+import { assetsDiffer } from "@/lib/quote";
 
 export default function NewPairPage() {
   const router = useRouter();
@@ -14,7 +15,7 @@ export default function NewPairPage() {
   const onSubmit = async (e: React.FormEvent) => {
     e.preventDefault();
     setError(null);
-    if (source === destination) {
+    if (!assetsDiffer(source, destination)) {
       setError("Source and destination must differ.");
       return;
     }

src/app/pairs/new/page.tsx

@@ -1,14 +1,7 @@
 "use client";
 
 import { useState } from "react";
-
-type Quote = {
-  source_asset: string;
-  dest_asset: string;
-  amount: string;
-  estimated_rate: string;
-  route: string[];
-};
+import { assetsDiffer, isValidAmount, type Quote } from "@/lib/quote";
 
 const API_BASE =
   process.env.NEXT_PUBLIC_STABLEROUTE_API_BASE ?? "http://localhost:3001";
@@ -35,19 +28,11 @@ export default function QuoteClient() {
     setError(null);
     setQuote(null);
 
-    const normalizedSourceAsset = normalizeAssetCode(sourceAsset);
-    const normalizedDestAsset = normalizeAssetCode(destAsset);
-    const normalizedAmount = amount.trim();
-
-    if (!normalizedSourceAsset || !normalizedDestAsset) {
-      setError("Asset codes must be 1-12 letters or numbers.");
-      return;
-    }
-    if (normalizedSourceAsset === normalizedDestAsset) {
+    if (!assetsDiffer(sourceAsset, destAsset)) {
       setError("Source and destination assets must differ.");
       return;
     }
-    if (!/^[1-9][0-9]{0,38}$/.test(normalizedAmount)) {
+    if (!isValidAmount(amount)) {
       setError("Amount must be a positive integer (base units).");
       return;
     }

src/app/quote/Client.tsx

@@ -1,3 +1,5 @@
+"use client";
+
 import { Card } from "@/components/Card";
 import { ThemeToggle } from "@/components/ThemeToggle";
 import { readTheme, effectiveTheme, type Theme } from "@/lib/theme";

src/app/settings/Client.tsx

@@ -0,0 +1,35 @@
+import { assetsDiffer, isValidAmount, normalizeAsset } from "../quote";
+
+describe("quote validators", () => {
+  describe("isValidAmount", () => {
+    it("accepts positive integer base-unit amounts up to 39 digits", () => {
+      expect(isValidAmount("1")).toBe(true);
+      expect(isValidAmount("1000000")).toBe(true);
+      expect(isValidAmount("9".repeat(39))).toBe(true);
+    });
+
+    it("rejects empty, zero, leading zero, non-digit, and overflow values", () => {
+      expect(isValidAmount("")).toBe(false);
+      expect(isValidAmount("0")).toBe(false);
+      expect(isValidAmount("01")).toBe(false);
+      expect(isValidAmount("1.5")).toBe(false);
+      expect(isValidAmount("1_000")).toBe(false);
+      expect(isValidAmount("9".repeat(40))).toBe(false);
+    });
+  });
+
+  describe("assetsDiffer", () => {
+    it("rejects the same asset after normalization", () => {
+      expect(assetsDiffer("USDC", "USDC")).toBe(false);
+    });
+
+    it("accepts different assets after normalization", () => {
+      expect(assetsDiffer("USDC", "EURC")).toBe(true);
+    });
+
+    it("keeps current exact-string asset normalization behavior", () => {
+      expect(normalizeAsset(" usdc ")).toBe(" usdc ");
+      expect(assetsDiffer("USDC", "usdc")).toBe(true);
+    });
+  });
+});

src/lib/__tests__/quote.test.ts

@@ -0,0 +1,21 @@
+export type Quote = {
+  source_asset: string;
+  dest_asset: string;
+  amount: string;
+  estimated_rate: string;
+  route: string[];
+};
+
+const AMOUNT_PATTERN = /^[1-9][0-9]{0,38}$/;
+
+export function normalizeAsset(asset: string) {
+  return asset;
+}
+
+export function assetsDiffer(a: string, b: string) {
+  return normalizeAsset(a) !== normalizeAsset(b);
+}
+
+export function isValidAmount(value: string) {
+  return AMOUNT_PATTERN.test(value);
+}