fix: resolve merge conflicts, remove unused radix deps, fix type annotation

- Resolve merge conflicts with main in hooks/use-toast.ts, tsconfig.json,
  pnpm-lock.yaml, and components/ui/sheet.tsx
- Remove @radix-ui/react-separator, @radix-ui/react-toggle, and
  @radix-ui/react-tooltip from package.json (components using them were deleted)
- Use proper `boolean` type instead of `any` for onOpenChange callback
- Keep e2e and playwright.config.ts in tsconfig exclude entries from main
- Delete unused sheet.tsx component

Author: pragmaticAweds

.github/workflows/ci.yml

@@ -57,3 +57,10 @@ jobs:
 
       - name: Build
         run: pnpm build
+
+      - name: Lighthouse CI
+        uses: treosh/lighthouse-ci-action@v12
+        with:
+          configPath: './lighthouserc.json'
+          uploadArtifacts: true
+          temporaryPublicStorage: true

.github/workflows/e2e.yml

@@ -0,0 +1,39 @@
+name: E2E Tests
+
+on:
+  push:
+    branches: [main]
+  pull_request:
+    branches: [main]
+
+jobs:
+  e2e:
+    runs-on: ubuntu-latest
+    timeout-minutes: 15
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: 20
+          cache: npm
+
+      - name: Install dependencies
+        run: npm ci
+
+      - name: Install Playwright browsers
+        run: npx playwright install --with-deps chromium
+
+      - name: Run E2E tests
+        run: npm run test:e2e
+
+      - name: Upload test results
+        uses: actions/upload-artifact@v4
+        if: ${{ !cancelled() }}
+        with:
+          name: playwright-report
+          path: playwright-report/
+          retention-days: 14

.gitignore

@@ -2,4 +2,15 @@ node_modules
 .next
 .env
 .env.local
-*.tsbuildinfo
+*.tsbuildinfo
+
+# Lock files (pnpm only — no npm or yarn)
+package-lock.json
+yarn.lock
+
+# Playwright
+/test-results/
+/playwright-report/
+/blob-report/
+/playwright/.cache/
+

__tests__/components/waitlist-modal.test.tsx

@@ -0,0 +1,124 @@
+import { beforeEach, describe, expect, it, vi } from "vitest";
+import { render, screen, waitFor } from "@testing-library/react";
+
+import { WaitlistModal } from "@/components/organisms/waitlist-modal";
+import userEvent from "@testing-library/user-event";
+
+// ---- MOCKS ----
+
+// Mock useWaitlist
+vi.mock("@/components/providers/waitlist-provider", () => ({
+  useWaitlist: () => ({
+    isOpen: true, // FORCE MODAL OPEN
+    closeWaitlist: vi.fn(),
+  }),
+}));
+
+// Mock toast
+vi.mock("@/hooks/use-toast", () => ({
+  toast: vi.fn(),
+}));
+
+// Mock next env
+vi.stubEnv("NEXT_PUBLIC_WAITLIST_API_URL", "https://test.api");
+
+// ---- HELPERS ----
+
+const setup = () => {
+  return render(<WaitlistModal />);
+};
+
+// ---- TESTS ----
+
+describe("WaitlistModal", () => {
+  beforeEach(() => {
+    vi.clearAllMocks();
+  });
+
+  // Modal renders
+  it("renders when open", () => {
+    setup();
+
+    expect(screen.getByText(/join the waitlist/i)).toBeInTheDocument();
+  });
+
+  // Invalid email
+  it("shows error for invalid email", async () => {
+    setup();
+
+    const emailInput = screen.getByPlaceholderText(/jane@example.com/i);
+    const submitBtn = screen.getByRole("button", { name: /join waitlist/i });
+
+    await userEvent.type(emailInput, "invalid-email");
+    await userEvent.click(submitBtn);
+
+    expect(await screen.findByText(/please enter a valid email address/i)).toBeInTheDocument();
+  });
+
+  // Empty email
+  it("shows error for empty email", async () => {
+    setup();
+
+    const submitBtn = screen.getByRole("button", { name: /join waitlist/i });
+
+    await userEvent.click(submitBtn);
+
+    expect(await screen.findByText(/email is required/i)).toBeInTheDocument();
+  });
+
+  // Success flow
+  it("shows success state on successful submission", async () => {
+    vi.stubGlobal(
+      "fetch",
+      vi.fn(() =>
+        Promise.resolve({
+          ok: true,
+        } as Response)
+      )
+    );
+
+    setup();
+
+    const emailInput = screen.getByPlaceholderText(/jane@example.com/i);
+    const submitBtn = screen.getByRole("button", { name: /join waitlist/i });
+
+    await userEvent.type(emailInput, "test@example.com");
+    await userEvent.click(submitBtn);
+
+    expect(await screen.findByText(/you're on the list!/i)).toBeInTheDocument();
+  });
+
+  // API error
+  it("shows error message when API fails", async () => {
+    vi.stubGlobal(
+      "fetch",
+      vi.fn(() =>
+        Promise.resolve({
+          ok: false,
+        } as Response)
+      )
+    );
+
+    setup();
+
+    const emailInput = screen.getByPlaceholderText(/jane@example.com/i);
+    const submitBtn = screen.getByRole("button", { name: /join waitlist/i });
+
+    await userEvent.type(emailInput, "test@example.com");
+    await userEvent.click(submitBtn);
+
+    expect(await screen.findByText(/failed to join waitlist/i)).toBeInTheDocument();
+  });
+
+  // Accessibility
+  it("is accessible (aria + focus)", async () => {
+    setup();
+
+    const dialog = screen.getByRole("dialog");
+    expect(dialog).toBeInTheDocument();
+
+    // Focus should land on first input
+    const inputs = screen.getAllByRole("textbox");
+    await waitFor(() => expect(inputs[0]).toHaveFocus());
+  });
+});

__tests__/hooks/use-mobile.test.ts

@@ -0,0 +1,104 @@
+import { renderHook, act } from "@testing-library/react";
+import { describe, it, expect, vi, beforeEach, afterEach } from "vitest";
+
+import { useIsMobile } from "@/hooks/use-mobile";
+
+describe("useIsMobile", () => {
+  beforeEach(() => {
+    // Mock window.innerWidth
+    Object.defineProperty(window, "innerWidth", {
+      writable: true,
+      configurable: true,
+      value: 1024,
+    });
+
+    // Mock window.matchMedia
+    Object.defineProperty(window, "matchMedia", {
+      writable: true,
+      configurable: true,
+      value: vi.fn().mockImplementation((query) => ({
+        matches: false,
+        media: query,
+        onchange: null,
+        addListener: vi.fn(), // deprecated
+        removeListener: vi.fn(), // deprecated
+        addEventListener: vi.fn(),
+        removeEventListener: vi.fn(),
+        dispatchEvent: vi.fn(),
+      })),
+    });
+  });
+
+  afterEach(() => {
+    vi.clearAllMocks();
+  });
+
+  it("should return false when viewport width is >= 768px", () => {
+    Object.defineProperty(window, "innerWidth", { value: 1024 });
+    const { result } = renderHook(() => useIsMobile());
+    expect(result.current).toBe(false);
+  });
+
+  it("should return true when viewport width is < 768px", () => {
+    Object.defineProperty(window, "innerWidth", { value: 500 });
+    const { result } = renderHook(() => useIsMobile());
+    expect(result.current).toBe(true);
+  });
+
+  it("should return false when viewport width is exactly 768px (boundary condition)", () => {
+    Object.defineProperty(window, "innerWidth", { value: 768 });
+    const { result } = renderHook(() => useIsMobile());
+    expect(result.current).toBe(false);
+  });
+
+  it("should update when window is resized", () => {
+    Object.defineProperty(window, "innerWidth", { value: 1024, writable: true });
+
+    let changeCallback: () => void = () => {};
+
+    // Mock matchMedia to capture the change callback
+    (window.matchMedia as any).mockImplementation((query: string) => ({
+      matches: false,
+      media: query,
+      onchange: null,
+      addEventListener: vi.fn((event, cb) => {
+        if (event === "change") changeCallback = cb;
+      }),
+      removeEventListener: vi.fn(),
+    }));
+
+    const { result } = renderHook(() => useIsMobile());
+    expect(result.current).toBe(false);
+
+    // Simulate resize to mobile width
+    act(() => {
+      (window as any).innerWidth = 500;
+      changeCallback();
+    });
+    expect(result.current).toBe(true);
+
+    // Simulate resize back to desktop width
+    act(() => {
+      (window as any).innerWidth = 1024;
+      changeCallback();
+    });
+    expect(result.current).toBe(false);
+  });
+
+  it("should clean up event listener on unmount", () => {
+    const removeEventListenerMock = vi.fn();
+
+    (window.matchMedia as any).mockImplementation((query: string) => ({
+      matches: false,
+      media: query,
+      onchange: null,
+      addEventListener: vi.fn(),
+      removeEventListener: removeEventListenerMock,
+    }));
+
+    const { unmount } = renderHook(() => useIsMobile());
+    unmount();
+
+    expect(removeEventListenerMock).toHaveBeenCalledWith("change", expect.any(Function));
+  });
+});

app/api/csrf/route.ts

@@ -0,0 +1,7 @@
+import { NextResponse } from "next/server";
+import { generateCsrfToken } from "@/lib/csrf";
+
+export async function GET() {
+  const token = await generateCsrfToken();
+  return NextResponse.json({ token });
+}

app/api/waitlist/route.ts

@@ -0,0 +1,44 @@
+import type { NextRequest } from "next/server";
+import { NextResponse } from "next/server";
+import { validateCsrfToken } from "@/lib/csrf";
+
+export async function POST(request: NextRequest) {
+  // 1. Validate CSRF token
+  const isValid = await validateCsrfToken(request);
+  if (!isValid) {
+    return NextResponse.json({ error: "Invalid CSRF token" }, { status: 403 });
+  }
+
+  try {
+    const values = await request.json();
+
+    // 2. Process the waitlist (e.g., forward it to the real API)
+    const apiUrl = process.env.NEXT_PUBLIC_WAITLIST_API_URL;
+
+    if (apiUrl) {
+      const response = await fetch(apiUrl, {
+        method: "POST",
+        headers: {
+          "Content-Type": "application/json",
+        },
+        body: JSON.stringify(values),
+      });
+
+      if (!response.ok) {
+        throw new Error("Failed to forward waitlist entry to external API");
+      }
+
+      return NextResponse.json({ success: true });
+    } else {
+      // Demo mode/fallback
+      console.log("Local Waitlist Submission (Demo Mode):", values);
+      return NextResponse.json({
+        success: true,
+        message: "Demo mode: Submission received locally",
+      });
+    }
+  } catch (error) {
+    console.error("Waitlist submission error:", error);
+    return NextResponse.json({ error: "Failed to process waitlist" }, { status: 500 });
+  }
+}

app/layout.tsx

@@ -20,7 +20,7 @@ const inter = Inter({
 });
 
 export const metadata: Metadata = {
-  metadataBase: new URL(process.env.NEXT_PUBLIC_SITE_URL!),
+  metadataBase: new URL(process.env.NEXT_PUBLIC_SITE_URL || "https://intmoney.com"),
   title: "IntMoney - AI-Powered Cross-Border Payments",
   description:
     "The AI-powered mobile wallet for seamless cross-border payments using simple chat or voice commands. Built on Stellar.",
@@ -90,6 +90,9 @@ export default function RootLayout({
 }>) {
   return (
     <html lang="en" suppressHydrationWarning>
+      <head>
+        <link rel="preload" href="/icon.svg" as="image" />
+      </head>
       <body className={`${inter.variable} ${geist.variable} font-body antialiased`}>
         <SkipToContent />
         <ThemeProvider attribute="class" defaultTheme="dark" enableSystem disableTransitionOnChange>