Fixes #940 Fixes #941 Fixes #942

.env.example

@@ -14,6 +14,8 @@ VAPID_SUBJECT=mailto:support@example.com
 # from /api/settings/branding/logo/... with CDN-style immutable cache headers
 # (fine for local dev and CI).
 BLOB_READ_WRITE_TOKEN=
+<<<<<<< HEAD
+=======
 
 # ---------------------------------------------------------------------------
 # Error tracking & crash reporting (Sentry)
@@ -33,4 +35,5 @@ SENTRY_PROJECT=
 # SENTRY_AUTH_TOKEN: server-only token with `project:releases` scope for
 # sourcemap uploads. Never expose this to the client. Leave empty to skip
 # sourcemap upload (builds still succeed, traces will be minified).
-SENTRY_AUTH_TOKEN=
+SENTRY_AUTH_TOKEN=
+>>>>>>> upstream/main

.eslintrc.json

@@ -1,9 +1,13 @@
 {
   "extends": "next/core-web-vitals",
   "rules": {
+<<<<<<< HEAD
+    "react-hooks/exhaustive-deps": "off"
+=======
     "react-hooks/exhaustive-deps": "off",
     "no-unexpected-multiline": "off",
     "@next/next/no-img-element": "off",
     "jsx-a11y/alt-text": "off"
+>>>>>>> upstream/main
   }
 }

.github/workflows/accessibility.yml

@@ -9,11 +9,14 @@ on:
 jobs:
   a11y:
     runs-on: ubuntu-latest
+<<<<<<< HEAD
+=======
     env:
       NEXT_PUBLIC_STELLAR_NETWORK: ${{ secrets.NEXT_PUBLIC_STELLAR_NETWORK }}
       NEXT_PUBLIC_CONTRACT_ID: ${{ secrets.NEXT_PUBLIC_CONTRACT_ID }}
       NEXT_PUBLIC_RPC_URL: ${{ secrets.NEXT_PUBLIC_RPC_URL }}
       NEXT_PUBLIC_USDC_ADDRESS: ${{ secrets.NEXT_PUBLIC_USDC_ADDRESS }}
+>>>>>>> upstream/main
     steps:
       - uses: actions/checkout@v4
 
@@ -26,7 +29,11 @@ jobs:
         run: npm ci
 
       - name: Install Playwright browsers
+<<<<<<< HEAD
+        run: npx playwright install --with-deps chromium firefox webkit
+=======
         run: npx playwright install chromium
+>>>>>>> upstream/main
 
       - name: Run accessibility tests (WCAG 2.1 AA gate)
         run: npx playwright test --grep @a11y

.github/workflows/deploy.yml

@@ -30,3 +30,12 @@ jobs:
           NEXT_PUBLIC_STELLAR_NETWORK: ${{ vars.NEXT_PUBLIC_STELLAR_NETWORK }}
           NEXT_PUBLIC_CONTRACT_ID: ${{ vars.NEXT_PUBLIC_CONTRACT_ID }}
           NEXT_PUBLIC_RPC_URL: ${{ vars.NEXT_PUBLIC_RPC_URL }}
+<<<<<<< HEAD
+
+      - name: Deploy to Vercel
+        run: npx vercel@latest --prod --token=${{ secrets.VERCEL_TOKEN }} --yes
+        env:
+          VERCEL_ORG_ID: ${{ secrets.VERCEL_ORG_ID }}
+          VERCEL_PROJECT_ID: ${{ secrets.VERCEL_PROJECT_ID }}
+=======
+>>>>>>> upstream/main

.gitignore

@@ -29,6 +29,19 @@ junit.xml
 # ── OS files ──────────────────────────────────────────────────────────────
 .DS_Store
 Thumbs.db
+<<<<<<< HEAD
+
+# ── Editor / IDE ──────────────────────────────────────────────────────────
+.vscode/
+.idea/
+*.swp
+*.swo
+*.suo
+*.ntvs*
+*.njsproj
+*.sln
+*.sw?
+=======
 *.DS_Store
 
 # Test artifacts
@@ -39,12 +52,26 @@ playwright-report/
 test-results/
 junit.xml
 *.lcov
+>>>>>>> upstream/main
 
 # ── Logs ──────────────────────────────────────────────────────────────────
 *.log
 npm-debug.log*
 yarn-debug.log*
 yarn-error.log*
+<<<<<<< HEAD
+pnpm-debug.log*
+
+# ── Misc ──────────────────────────────────────────────────────────────────
+.vercel/
+.turbo/
+.cache/
+.eslintcache
+*.tgz
+branch_structure.json
+temp_auto_push.bat
+temp_interactive_push.bat
+=======
 
 # Editor
 .vscode/
@@ -58,3 +85,4 @@ yarn-error.log*
 .cache/
 *.tgz
 dist/
+>>>>>>> upstream/main

docs/ACCESSIBILITY.md

@@ -53,6 +53,8 @@ The initial audit surfaced the following categories of critical/serious violatio
 - **Browser coverage locally vs. CI.** A fresh dev sandbox may only have the Chromium Playwright browser installed. CI installs Chromium, Firefox, and WebKit via `npx playwright install --with-deps`, so the merge gate is multi-engine even when a local run (`npx playwright test --grep @a11y`) only exercises Chromium.
 - **Moderate/minor axe findings are not gated on.** Only `critical`/`serious` impact violations fail the build, per the acceptance criteria. Any moderate/minor findings surfaced by axe during a run are not currently tracked separately.
 
+<<<<<<< HEAD
+=======
 ## Component-level automated testing
 
 In addition to the page-level Playwright + `@axe-core/playwright` gate
@@ -95,6 +97,7 @@ release cycle and whenever a new page/flow is added to the audit scope:
    "Known limitations" section until fixed. Once fixed, add a short note to
    the "What was fixed" section above so the audit trail stays complete.
 
+>>>>>>> upstream/main
 ## Extending the audit
 
 To add a new page to the gate, add an entry to the `PAGES` array in `e2e/a11y.spec.ts` — the shared `runAxe()` helper and assertion are reused automatically. For flows that require user interaction (opening a modal, completing a multi-step form), follow the pattern in the two targeted tests at the bottom of that file: drive the interaction with Playwright, then call `runAxe(page)` and assert on `critical`/`serious` violations.

e2e/a11y.spec.ts

@@ -14,7 +14,13 @@ const PAGES: Array<{ path: string; name: string }> = [
   { path: '/', name: 'Home' },
   { path: '/dashboard', name: 'Dashboard' },
   { path: '/invoice/new', name: 'New Invoice' },
+<<<<<<< HEAD
+  { path: '/invoice/1', name: 'Invoice Detail' },
+  { path: '/verify/1', name: 'Verify Invoice' },
+  { path: '/analytics', name: 'Analytics' },
+=======
   { path: '/settings', name: 'Settings' },
+>>>>>>> upstream/main
 ];
 
 async function runAxe(page: Page) {

e2e/create-invoice.spec.ts

@@ -21,6 +21,8 @@ test.describe('Create invoice flow', () => {
     await expect(createPage.totalAmountInput).toHaveValue('200');
   });
 
+<<<<<<< HEAD
+=======
   test('back button returns to previous step without losing entered data', async ({ page }) => {
     const createPage = new CreateInvoicePage(page);
     await createPage.goto();
@@ -38,6 +40,7 @@ test.describe('Create invoice flow', () => {
     await expect(createPage.amountInput).toHaveValue('150');
   });
 
+>>>>>>> upstream/main
   test('fill form and submit redirects', async ({ page }) => {
     const createPage = new CreateInvoicePage(page);
     await createPage.goto();

e2e/dashboard.spec.ts

@@ -19,6 +19,8 @@ test.describe('Dashboard', () => {
     const hasEmpty = await dashboard.emptyState.isVisible().catch(() => false);
     expect(hasCards > 0 || hasEmpty).toBe(true);
   });
+<<<<<<< HEAD
+=======
 
   test('analytics dashboard updates in real-time', async ({ page }) => {
     const dashboard = new DashboardPage(page);
@@ -70,4 +72,5 @@ test.describe('Dashboard', () => {
     await expect(liveMetric).toBeVisible();
     await expect(liveMetric).not.toHaveText('');
   });
+>>>>>>> upstream/main
 });

e2e/pages/DashboardPage.ts

@@ -6,26 +6,34 @@ export class DashboardPage {
   readonly invoiceCards: Locator;
   readonly emptyState: Locator;
   readonly payMultipleButton: Locator;
+<<<<<<< HEAD
+=======
   readonly analyticsDashboard: Locator;
   readonly liveMetrics: Locator;
   readonly autoRefreshToggle: Locator;
   readonly connectionStatus: Locator;
+>>>>>>> upstream/main
 
   constructor(page: Page) {
     this.page = page;
     this.heading = page.getByRole('heading', { name: /Dashboard/i });
     this.invoiceCards = page.locator('a[aria-label*="View Invoice"]');
     this.emptyState = page.locator('text=/No invoices found/i');
     this.payMultipleButton = page.locator('button:has-text("Pay Multiple")');
+<<<<<<< HEAD
+=======
     this.analyticsDashboard = page.locator('[data-testid="analytics-dashboard"]');
     this.liveMetrics = page.locator('[data-testid="live-metric"]');
     this.autoRefreshToggle = page.locator('[data-testid="auto-refresh-toggle"]');
     this.connectionStatus = page.locator('[data-testid="connection-status"]');
+>>>>>>> upstream/main
   }
 
   async goto() {
     await this.page.goto('/dashboard');
   }
+<<<<<<< HEAD
+=======
 
   async waitForLiveUpdate() {
     await this.connectionStatus.filter({ hasText: /connected/i }).waitFor();
@@ -34,4 +42,5 @@ export class DashboardPage {
   async toggleAutoRefresh() {
     await this.autoRefreshToggle.click();
   }
+>>>>>>> upstream/main
 }

instrumentation-client.ts

@@ -1,5 +1,8 @@
 import * as Sentry from "@sentry/nextjs";
+<<<<<<< HEAD
+=======
 import { initPerformanceMonitoring, onPerformanceMetric, isRegression } from "./src/lib/performanceMonitoring";
+>>>>>>> upstream/main
 
 const dsn = process.env.NEXT_PUBLIC_SENTRY_DSN;
 
@@ -13,6 +16,9 @@ if (dsn) {
   });
 }
 
+<<<<<<< HEAD
+export const onRouterTransitionStart = Sentry.captureRouterTransitionStart;
+=======
 // Core Web Vitals collection + budget-regression reporting (see
 // src/lib/performanceMonitoring.ts and docs/PERFORMANCE.md).
 onPerformanceMetric((metric) => {
@@ -205,4 +211,5 @@ function attachFlushHandler(): void {
 if (typeof window !== "undefined") {
   attachFlushHandler();
   initAnalytics();
-}
+}
+>>>>>>> upstream/main

instrumentation.ts

@@ -1,4 +1,27 @@
 import * as Sentry from "@sentry/nextjs";
+<<<<<<< HEAD
+
+export async function register() {
+  const dsn = process.env.NEXT_PUBLIC_SENTRY_DSN;
+  if (!dsn) return;
+
+  if (process.env.NEXT_RUNTIME === "nodejs") {
+    Sentry.init({
+      dsn,
+      tracesSampleRate: 0.1,
+      debug: false,
+    });
+  }
+
+  if (process.env.NEXT_RUNTIME === "edge") {
+    Sentry.init({
+      dsn,
+      tracesSampleRate: 0.1,
+      debug: false,
+    });
+  }
+}
+=======
 import { initAnalytics } from "./lib/analytics/server";
 import { registerBackupScheduler } from "./lib/backup/scheduler";
 
@@ -73,4 +96,5 @@ export async function register() {
       );
     }
   }
-}
+}
+>>>>>>> upstream/main

jest.config.js

@@ -9,6 +9,15 @@ const config = {
   moduleNameMapper: {
     "^@/(.*)$": "<rootDir>/src/$1",
   },
+<<<<<<< HEAD
+  testMatch: ["**/__tests__/**/*.(test|spec).(ts|tsx)"],
+  testPathIgnorePatterns: ["/node_modules/", "/src/app/search/__tests__/"],
+  collectCoverageFrom: ["src/components/**/*.{ts,tsx}", "!src/components/**/*.d.ts"],
+  coverageThreshold: { global: { branches: 80, functions: 80, lines: 80, statements: 80 } },
+};
+
+module.exports = createJestConfig(config);
+=======
   testMatch: [
     "**/__tests__/**/*.(test|spec).(ts|tsx)",
     "**/__tests__/**/*.(test|spec).(js|jsx)",
@@ -36,4 +45,5 @@ const config = {
   restoreMocks: true,
 };
 
-module.exports = createJestConfig(config);
+module.exports = createJestConfig(config);
+>>>>>>> upstream/main

jest.setup.ts

@@ -1,4 +1,6 @@
 import "@testing-library/jest-dom";
+<<<<<<< HEAD
+=======
 
 /**
  * Global Jest setup.
@@ -359,4 +361,5 @@ beforeEach(() => {
 
 afterEach(() => {
   jest.clearAllMocks();
-});
+});
+>>>>>>> upstream/main