diff --git a/PR_DESCRIPTION.md b/PR_DESCRIPTION.md
index 349a339a..26a1ef2c 100644
--- a/PR_DESCRIPTION.md
+++ b/PR_DESCRIPTION.md
@@ -1,89 +1,91 @@
 ## Summary
 
-This PR resolves three independently implementable issues across UI Kit components, Core SDK documentation and runnable examples, and cross-package testing fixtures.
+This PR resolves four independently implementable issues across relayer tests, indexer persistence, extension security, and the Stellar SDK.
 
-- **UI Kit Button Loading State (#630)**: Added `loading` prop, Loader2 spinner, `aria-busy` attribute, and click prevention to the UI Kit `Button` component, alongside exhaustive tests and stories.
-- **Core SDK Documentation & CI Verification (#587)**: Expanded `packages/core-sdk/README.md` to accurately document all `AncoreClient` methods and standalone exports, added a fully runnable session key lifecycle example, and wrote a CI script to enforce documentation compliance.
-- **Canonical Cross-Package Relay Payload Test (#687)**: Scaffolded a shared `@ancore/test-fixtures` package with a JSON payload schema, linked it to the workspace, and integrated cross-package unit tests in both `services/relayer` and `packages/account-abstraction` to assert structure alignment.
-
----
+- Adds missing `/relay/validate` auth integration coverage with supertest
+- Replaces the in-memory ingest checkpoint stub with a durable Postgres-backed repository
+- Throttles failed wallet unlock attempts in the extension service worker using session-scoped exponential backoff
+- Introduces a multi-network `createStellarClient` factory with `futurenet` support
 
 ## Purpose / Motivation
 
-- **#630**: Interactive elements should prevent double-submissions, visually reflect pending operations via animations, and remain fully accessible (`aria-busy`).
-- **#587**: Prevent API drifts in `core-sdk` by explicitly documenting its modular exports and providing realistic developer-facing integration examples.
-- **#687**: Establish type and contract alignment between relayer execution payloads and smart account-abstraction parsing via shared testing fixtures.
-
----
+Relayer validation lacked parity with execute-route auth testing, ingest cursors were lost on restart, the extension allowed unlimited password guessing, and Stellar client creation required manual network configuration. These changes close those gaps while keeping each fix scoped to its own module.
 
 ## Changes Made
 
-### #630 — UI Kit Button Loading State
+### #654 — Relayer integration tests
 
-- Modified `packages/ui-kit/src/components/ui/button.tsx` to accept a `loading` prop.
-- Added a spinning `Loader2` icon from `lucide-react` when loading is active, applied `aria-busy` for screen readers, and disabled event emission to prevent duplicate form submissions or actions.
-- Added comprehensive unit tests in `packages/ui-kit/src/components/ui/button.test.tsx` verifying spinner rendering, disabled attribute application, and click event suppression.
-- Added new stories (`Loading`, `DestructiveLoading`) in `packages/ui-kit/src/components/ui/button.stories.tsx` for manual UI verification.
+- Extended `relay.test.ts` with a missing-auth `401` case for `POST /relay/validate`
+- Existing invalid-body `400` coverage and CI relayer test job remain unchanged
 
-### #587 — Core SDK Documentation & CI Verification
+### #670 — Postgres checkpoint repository
 
-- Updated `packages/core-sdk/README.md` with accurate mappings of `AncoreClient` methods and all 100+ modular package exports (wallet helpers, payments, storage managers, etc.).
-- Created a fully executable developer integration walkthrough in `packages/core-sdk/examples/01-session-key-lifecycle.ts` using `@stellar/stellar-sdk` and `@ancore/core-sdk`.
-- Fixed a contract-derivation bug in `deriveContractId` that constructed invalid 58-character contract IDs, changing it to use `StrKey` encoding to produce valid 56-character Stellar/Soroban contract addresses.
-- Created `scripts/verify-readme-exports.ts` to automatically scan `index.ts` exports and fail the build if any export is not fully cataloged in the README.
+- Added `CheckpointStore` trait with `PostgresCheckpointStore` and async `MemoryCheckpointStore`
+- Genericized `IngestWorker` to accept any checkpoint store implementation
+- Wired checkpoint loading into indexer startup in `main.rs`
+- Added ignored Postgres integration tests and documented `ingest_checkpoints` schema in README
 
-### #687 — Canonical Cross-Package Relay Payload Test
+### #678 — Unlock rate limiting
 
-- Scaffolded `@ancore/test-fixtures` package in `packages/test-fixtures/` with a standard `relay-payload-v1.json` schema.
-- Added the package to the root workspace and declared it as a dependency in both `packages/account-abstraction` and `services/relayer`.
-- Added unit tests in `packages/account-abstraction/src/__tests__/relay-payload.test.ts` and `services/relayer/tests/unit/relay-payload.test.ts` importing the shared JSON fixture and validating schema parity.
+- Added `unlock-rate-limit.ts` with session-scoped failure tracking and exponential backoff
+- Updated `UNLOCK_WALLET` handler to return `retryAfterMs` and a user-visible `message` during lockout
+- Added fake-timer unit tests for rate-limit logic and service-worker behavior
 
----
+### #681 — Stellar client factory
+
+- Added `futurenet` to shared `Network` type and Stellar network config
+- Exported `createStellarClient(network)` and `NetworkId` from `@ancore/stellar`
+- Invalid networks now throw `NetworkError` at construction time
 
 ## How to Test
 
-### UI Kit Button (#630)
+### Relayer (#654)
 
 ```bash
-npx pnpm --filter @ancore/ui-kit test
+cd services/relayer
+pnpm test tests/integration/relay.test.ts
 ```
 
-Expected: All 146 tests pass successfully, including all loading-state assertions.
+Expected: validate-route tests pass, including `401 when Authorization header is missing`.
 
-### Core SDK & Verification (#587)
+### Indexer (#670)
 
 ```bash
-# Run unit tests
-npx pnpm --filter @ancore/core-sdk test
+cd services/indexer
+cargo test --lib
+# Optional with Postgres:
+TEST_DATABASE_URL=postgresql://postgres:postgres@localhost:5432/ancore_test cargo test postgres_checkpoint -- --ignored
+```
+
+Expected: unit tests pass; ignored integration tests persist and reload checkpoints across restart.
 
-# Run runnable lifecycle example
-npx tsx packages/core-sdk/examples/01-session-key-lifecycle.ts
+### Extension wallet (#678)
 
-# Run README compliance check
-npx tsx scripts/verify-readme-exports.ts
+```bash
+cd apps/extension-wallet
+pnpm test src/background/__tests__/unlock-rate-limit.test.ts
+pnpm test src/background/__tests__/service-worker.test.ts
 ```
 
-Expected: All tests pass, lifecycle example completes successfully, and verify-readme-exports confirms 100% API coverage.
+Expected: lockout after repeated failures, success resets counter, expired lockout allows retry.
 
-### Cross-Package Relay Payload (#687)
+### Stellar SDK (#681)
 
 ```bash
-# Run account abstraction tests
-npx pnpm --filter @ancore/account-abstraction test
-
-# Run relayer tests
-npx pnpm --filter @ancore/relayer test
+cd packages/stellar
+pnpm test src/__tests__/client.test.ts
 ```
 
-Expected: All tests pass, ensuring complete canonical payload parity between relayer ingestion and core execution layers.
+Expected: factory tests pass for testnet/mainnet/futurenet; invalid network throws.
 
 ---
 
 ## Related Issues
 
-- Closes ancore-org/ancore#630
-- Closes ancore-org/ancore#587
-- Closes ancore-org/ancore#687
+- Closes ancore-org/ancore#654
+- Closes ancore-org/ancore#670
+- Closes ancore-org/ancore#678
+- Closes ancore-org/ancore#681
 
 ---
 
diff --git a/README.md b/README.md
index 4463db02..99c06c42 100644
--- a/README.md
+++ b/README.md
@@ -129,15 +129,15 @@ pnpm contracts:test
 
 ### Updating WASM Size Budgets
 
-WASM contract sizes are monitored in CI to prevent regression. The budget for each contract is defined in `contracts/budgets/wasm-budgets.json`. 
+WASM contract sizes are monitored in CI to prevent regression. The budget for each contract is defined in `contracts/budgets/wasm-budgets.json`.
 
 If your changes intentionally increase the contract size beyond the current budget:
+
 1. Ensure your contract builds locally: `pnpm contracts:build`
 2. Check the new size of the optimized `.wasm` files in `contracts/target/wasm32-unknown-unknown/release/`.
 3. You can run the local size check with: `node scripts/check-wasm-size.js`
 4. Update `contracts/budgets/wasm-budgets.json` with the new size budget, and commit the changes.
 
-
 ## Contributing
 
 We welcome contributions! Please see our [Contributing Guide](CONTRIBUTING.md) for details.
diff --git a/apps/extension-wallet/src/background/__tests__/service-worker.test.ts b/apps/extension-wallet/src/background/__tests__/service-worker.test.ts
index 23096a4a..d221a7be 100644
--- a/apps/extension-wallet/src/background/__tests__/service-worker.test.ts
+++ b/apps/extension-wallet/src/background/__tests__/service-worker.test.ts
@@ -123,10 +123,7 @@ function makeAuthState(overrides: Partial<AuthState> = {}): AuthState {
   };
 }
 
-async function loadServiceWorker(
-  authState: AuthState,
-  options: { unlockReturns?: boolean } = {}
-) {
+async function loadServiceWorker(authState: AuthState, options: { unlockReturns?: boolean } = {}) {
   vi.doMock('@/router/AuthGuard', () => ({
     readAuthState: vi.fn(() => authState),
     DEFAULT_AUTH_STATE: makeAuthState(),
@@ -462,15 +459,16 @@ describe('UNLOCK_WALLET', () => {
       }
 
       unlockResult = true;
-      const successResp = await dispatch(chromeMock, 'UNLOCK_WALLET', { password: 'correct-password' });
+      const successResp = await dispatch(chromeMock, 'UNLOCK_WALLET', {
+        password: 'correct-password',
+      });
       expect((successResp.payload as any).success).toBe(true);
 
       unlockResult = false;
       for (let i = 0; i < 4; i += 1) {
-        await dispatch(chromeMock, 'UNLOCK_WALLET', { password: 'wrong-password' });
+        const resp = await dispatch(chromeMock, 'UNLOCK_WALLET', { password: 'wrong-password' });
+        expect((resp.payload as any).retryAfterMs).toBeUndefined();
       }
-      const resp = await dispatch(chromeMock, 'UNLOCK_WALLET', { password: 'wrong-password' });
-      expect((resp.payload as any).retryAfterMs).toBeUndefined();
       _resetHandlers();
     });
 
diff --git a/apps/extension-wallet/src/components/TransferNoteInput.tsx b/apps/extension-wallet/src/components/TransferNoteInput.tsx
index ad5a14d9..7c9068ec 100644
--- a/apps/extension-wallet/src/components/TransferNoteInput.tsx
+++ b/apps/extension-wallet/src/components/TransferNoteInput.tsx
@@ -1,15 +1,13 @@
 import React from 'react';
-import {
-  validateTransferNote,
-  getRemainingCharacters,
-  MAX_NOTE_LENGTH,
-} from '@/utils/note-validation';
+import { getRemainingCharacters, MAX_NOTE_LENGTH } from '@/utils/note-validation';
+import { Field } from '@ancore/ui-kit';
 
 interface TransferNoteInputProps {
   value: string;
   onChange: (value: string) => void;
   error?: string;
   className?: string;
+  label?: string;
   placeholder?: string;
   disabled?: boolean;
   required?: boolean;
@@ -29,6 +27,7 @@ export function TransferNoteInput({
   onChange,
   error,
   className = '',
+  label = 'Note',
   placeholder = 'Add a note (optional)',
   disabled = false,
   required = false,
@@ -52,17 +51,40 @@ export function TransferNoteInput({
     }
   };
 
+  const warning = isOverLimit && !error && (
+    <div className="flex items-center gap-2 text-amber-400 text-[10px] font-medium">
+      <svg
+        xmlns="http://www.w3.org/2000/svg"
+        className="w-3 h-3"
+        fill="none"
+        viewBox="0 0 24 24"
+        stroke="currentColor"
+      >
+        <path
+          strokeLinecap="round"
+          strokeLinejoin="round"
+          strokeWidth={2}
+          d="M12 9v2m0 4h.01m-6.938 4h13.856c1.54 0 2.502-1.667 1.732-2.5L13.732 4c-.77-.833-1.964-.833-2.732 0L3.732 16.5c-.77.833.192 2.5 1.732 2.5z"
+        />
+      </svg>
+      Note exceeds character limit and will be truncated
+    </div>
+  );
+
   return (
-    <div className={`space-y-2 ${className}`}>
-      <div className="relative">
-        <textarea
-          value={value}
-          onChange={handleChange}
-          onBlur={handleBlur}
-          placeholder={placeholder}
-          disabled={disabled}
-          required={required}
-          className={`
+    <Field label={label} error={error} required={required} className={className}>
+      {({ controlProps }) => (
+        <>
+          <div className="relative">
+            <textarea
+              {...controlProps}
+              value={value}
+              onChange={handleChange}
+              onBlur={handleBlur}
+              placeholder={placeholder}
+              disabled={disabled}
+              required={required}
+              className={`
             w-full bg-white/5 border border-white/10 rounded-2xl px-5 py-4 
             text-white placeholder:text-slate-600 resize-none
             focus:border-cyan-400 focus:outline-none transition-all
@@ -70,65 +92,27 @@ export function TransferNoteInput({
             ${error ? 'border-red-400 focus:border-red-400' : ''}
             ${isOverLimit ? 'border-red-400 focus:border-red-400' : ''}
           `}
-          rows={3}
-          maxLength={MAX_NOTE_LENGTH + 10} // Allow slight over-typing for better UX
-        />
+              rows={3}
+              maxLength={MAX_NOTE_LENGTH + 10} // Allow slight over-typing for better UX
+            />
 
-        {/* Character counter */}
-        <div className="absolute bottom-3 right-3 flex items-center gap-1">
-          <span
-            className={`
+            {/* Character counter */}
+            <div className="absolute bottom-3 right-3 flex items-center gap-1">
+              <span
+                className={`
               text-[10px] font-mono font-medium transition-colors
               ${isOverLimit ? 'text-red-400' : isNearLimit ? 'text-amber-400' : 'text-slate-600'}
             `}
-          >
-            {Math.abs(remainingChars)}
-          </span>
-          <span className="text-[8px] text-slate-600 font-medium">/{MAX_NOTE_LENGTH}</span>
-        </div>
-      </div>
+              >
+                {Math.abs(remainingChars)}
+              </span>
+              <span className="text-[8px] text-slate-600 font-medium">/{MAX_NOTE_LENGTH}</span>
+            </div>
+          </div>
 
-      {/* Error message */}
-      {error && (
-        <div className="flex items-center gap-2 text-red-400 text-[10px] font-medium">
-          <svg
-            xmlns="http://www.w3.org/2000/svg"
-            className="w-3 h-3"
-            fill="none"
-            viewBox="0 0 24 24"
-            stroke="currentColor"
-          >
-            <path
-              strokeLinecap="round"
-              strokeLinejoin="round"
-              strokeWidth={2}
-              d="M12 8v4m0 4h.01M21 12a9 9 0 11-18 0 9 9 0 0118 0z"
-            />
-          </svg>
-          {error}
-        </div>
+          {warning}
+        </>
       )}
-
-      {/* Character limit warning */}
-      {isOverLimit && !error && (
-        <div className="flex items-center gap-2 text-amber-400 text-[10px] font-medium">
-          <svg
-            xmlns="http://www.w3.org/2000/svg"
-            className="w-3 h-3"
-            fill="none"
-            viewBox="0 0 24 24"
-            stroke="currentColor"
-          >
-            <path
-              strokeLinecap="round"
-              strokeLinejoin="round"
-              strokeWidth={2}
-              d="M12 9v2m0 4h.01m-6.938 4h13.856c1.54 0 2.502-1.667 1.732-2.5L13.732 4c-.77-.833-1.964-.833-2.732 0L3.732 16.5c-.77.833.192 2.5 1.732 2.5z"
-            />
-          </svg>
-          Note exceeds character limit and will be truncated
-        </div>
-      )}
-    </div>
+    </Field>
   );
 }
diff --git a/apps/extension-wallet/src/config/__tests__/urls.test.ts b/apps/extension-wallet/src/config/__tests__/urls.test.ts
index 141b1c02..9d02d5ba 100644
--- a/apps/extension-wallet/src/config/__tests__/urls.test.ts
+++ b/apps/extension-wallet/src/config/__tests__/urls.test.ts
@@ -168,10 +168,7 @@ describe('probeServiceHealth', () => {
     vi.mocked(fetch).mockResolvedValueOnce(new Response('{}', { status: 200 }));
 
     await probeServiceHealth('https://relayer.ancore.io/', 'relayer');
-    expect(fetch).toHaveBeenCalledWith(
-      'https://relayer.ancore.io/health',
-      expect.anything()
-    );
+    expect(fetch).toHaveBeenCalledWith('https://relayer.ancore.io/health', expect.anything());
   });
 });
 
diff --git a/apps/extension-wallet/src/config/urls.ts b/apps/extension-wallet/src/config/urls.ts
index a56edb21..4051902d 100644
--- a/apps/extension-wallet/src/config/urls.ts
+++ b/apps/extension-wallet/src/config/urls.ts
@@ -43,9 +43,10 @@ export interface ConfigError {
 // ---------------------------------------------------------------------------
 
 const RELAYER_URLS: Record<string, string> = {
-  production: typeof import.meta !== 'undefined' && import.meta.env?.VITE_RELAYER_URL
-    ? import.meta.env.VITE_RELAYER_URL
-    : 'https://relayer.ancore.io',
+  production:
+    typeof import.meta !== 'undefined' && import.meta.env?.VITE_RELAYER_URL
+      ? import.meta.env.VITE_RELAYER_URL
+      : 'https://relayer.ancore.io',
   staging: 'https://relayer-staging.ancore.io',
   local: 'http://localhost:3000',
 };
diff --git a/apps/extension-wallet/src/hooks/__tests__/useSendTransaction.schedule.test.ts b/apps/extension-wallet/src/hooks/__tests__/useSendTransaction.schedule.test.ts
index ac540ce7..a2ed6c82 100644
--- a/apps/extension-wallet/src/hooks/__tests__/useSendTransaction.schedule.test.ts
+++ b/apps/extension-wallet/src/hooks/__tests__/useSendTransaction.schedule.test.ts
@@ -13,7 +13,11 @@ describe('validateSchedule', () => {
   });
 
   it('accepts a valid schedule', () => {
-    const startAt = new Date(Date.now() + 2 * 60 * 60 * 1000).toISOString().slice(0, 16);
+    const future = new Date(Date.now() + 2 * 60 * 60 * 1000);
+    // datetime-local expects local time without a timezone suffix; toISOString() emits UTC.
+    const offsetMs = future.getTimezoneOffset() * 60 * 1000;
+    const startAt = new Date(future.getTime() - offsetMs).toISOString().slice(0, 16);
+
     expect(
       validateSchedule({
         frequency: 'weekly',
diff --git a/apps/mobile-wallet/src/components/TransactionHistoryList.tsx b/apps/mobile-wallet/src/components/TransactionHistoryList.tsx
index a9817f3c..bede3e1f 100644
--- a/apps/mobile-wallet/src/components/TransactionHistoryList.tsx
+++ b/apps/mobile-wallet/src/components/TransactionHistoryList.tsx
@@ -14,8 +14,12 @@ type Props = {
   onRefresh: () => void;
   onLoadMore: () => void;
   onUnknownStatus?: (status: unknown) => void;
+  formatTimestamp?: (timestamp: string) => string;
 };
 
+const defaultFormatTimestamp = (timestamp: string): string =>
+  new Date(timestamp).toLocaleString('en-US');
+
 export const TransactionHistoryList = ({
   transactions,
   isLoadingInitial,
@@ -27,9 +31,10 @@ export const TransactionHistoryList = ({
   onRefresh,
   onLoadMore,
   onUnknownStatus,
+  formatTimestamp = defaultFormatTimestamp,
 }: Props) => {
   if (isLoadingInitial) {
-    return <p aria-live="polite">Loading transactions…</p>;
+    return <p aria-live="polite">Loading transactions...</p>;
   }
 
   if (error && transactions.length === 0) {
@@ -56,7 +61,7 @@ export const TransactionHistoryList = ({
   return (
     <section>
       <button onClick={onRefresh} disabled={isRefreshing}>
-        {isRefreshing ? 'Refreshing…' : 'Refresh'}
+        {isRefreshing ? 'Refreshing...' : 'Refresh'}
       </button>
 
       {error ? (
@@ -75,7 +80,7 @@ export const TransactionHistoryList = ({
             <TransactionStatusIcon status={tx.status} onUnknownStatus={onUnknownStatus} />
             <div className="flex-1">
               <strong>{tx.direction === 'in' ? 'Received' : 'Sent'}</strong> {tx.amount}
-              {tx.asset ? ` ${tx.asset}` : ''} · {new Date(tx.timestamp).toLocaleString('en-US')}
+              {tx.asset ? ` ${tx.asset}` : ''} &middot; {formatTimestamp(tx.timestamp)}
             </div>
           </li>
         ))}
@@ -83,7 +88,7 @@ export const TransactionHistoryList = ({
 
       {hasMore ? (
         <button onClick={onLoadMore} disabled={isLoadingMore}>
-          {isLoadingMore ? 'Loading more…' : 'Load more'}
+          {isLoadingMore ? 'Loading more...' : 'Load more'}
         </button>
       ) : (
         <p>End of transaction history</p>
diff --git a/apps/mobile-wallet/src/config/__tests__/environment.test.ts b/apps/mobile-wallet/src/config/__tests__/environment.test.ts
index 849cd7ac..f8c21d15 100644
--- a/apps/mobile-wallet/src/config/__tests__/environment.test.ts
+++ b/apps/mobile-wallet/src/config/__tests__/environment.test.ts
@@ -21,11 +21,24 @@ describe('loadMobileWalletEnvironment', () => {
     expect(() => loadMobileWalletEnvironment({})).toThrow('ANCORE_ACCOUNT_CONTRACT_ID is required');
   });
 
+  it('loads futurenet defaults when requested', () => {
+    const environment = loadMobileWalletEnvironment({
+      ANCORE_ACCOUNT_CONTRACT_ID: 'CAAQCAIBAEAQCAIBAEAQCAIBAEAQCAIBAEAQCAIBAEAQCAIBAEAQC526',
+      ANCORE_MOBILE_NETWORK: 'futurenet',
+    });
+
+    expect(environment).toMatchObject({
+      network: 'futurenet',
+      rpcUrl: 'https://rpc-futurenet.stellar.org',
+      networkPassphrase: 'Test SDF Future Network ; October 2022',
+    });
+  });
+
   it('throws when the requested network is unsupported', () => {
     expect(() =>
       loadMobileWalletEnvironment({
         ANCORE_ACCOUNT_CONTRACT_ID: 'CAAQCAIBAEAQCAIBAEAQCAIBAEAQCAIBAEAQCAIBAEAQCAIBAEAQC526',
-        ANCORE_MOBILE_NETWORK: 'futurenet',
+        ANCORE_MOBILE_NETWORK: 'devnet',
       })
     ).toThrow('Unsupported ANCORE_MOBILE_NETWORK');
   });
diff --git a/apps/mobile-wallet/src/config/environment.ts b/apps/mobile-wallet/src/config/environment.ts
index f0e6941f..9d3c7f72 100644
--- a/apps/mobile-wallet/src/config/environment.ts
+++ b/apps/mobile-wallet/src/config/environment.ts
@@ -4,6 +4,8 @@ const DEFAULT_TESTNET_RPC_URL = 'https://soroban-testnet.stellar.org';
 const DEFAULT_TESTNET_PASSPHRASE = 'Test SDF Network ; September 2015';
 const DEFAULT_MAINNET_RPC_URL = 'https://soroban-rpc.mainnet.stellar.gateway.fm';
 const DEFAULT_MAINNET_PASSPHRASE = 'Public Global Stellar Network ; September 2015';
+const DEFAULT_FUTURENET_RPC_URL = 'https://rpc-futurenet.stellar.org';
+const DEFAULT_FUTURENET_PASSPHRASE = 'Test SDF Future Network ; October 2022';
 
 export interface MobileWalletEnvironment extends NetworkConfig {
   accountContractId: string;
@@ -22,7 +24,9 @@ export class MobileWalletEnvironmentError extends Error {
 }
 
 const isNetwork = (network: string): network is Network => {
-  return network === 'testnet' || network === 'mainnet' || network === 'futurenet' || network === 'local';
+  return (
+    network === 'testnet' || network === 'mainnet' || network === 'futurenet' || network === 'local'
+  );
 };
 
 const defaultRpcUrlFor = (network: Network): string | undefined => {
@@ -34,6 +38,10 @@ const defaultRpcUrlFor = (network: Network): string | undefined => {
     return DEFAULT_MAINNET_RPC_URL;
   }
 
+  if (network === 'futurenet') {
+    return DEFAULT_FUTURENET_RPC_URL;
+  }
+
   return undefined;
 };
 
@@ -46,6 +54,10 @@ const defaultPassphraseFor = (network: Network): string | undefined => {
     return DEFAULT_MAINNET_PASSPHRASE;
   }
 
+  if (network === 'futurenet') {
+    return DEFAULT_FUTURENET_PASSPHRASE;
+  }
+
   return undefined;
 };
 
@@ -56,7 +68,7 @@ export const loadMobileWalletEnvironment = (
 
   if (!isNetwork(rawNetwork)) {
     throw new MobileWalletEnvironmentError(
-      `Unsupported ANCORE_MOBILE_NETWORK "${rawNetwork}". Expected testnet, mainnet, or local.`
+      `Unsupported ANCORE_MOBILE_NETWORK "${rawNetwork}". Expected testnet, mainnet, futurenet, or local.`
     );
   }
 
diff --git a/apps/mobile-wallet/src/index.ts b/apps/mobile-wallet/src/index.ts
index f5d5b938..ebb08e82 100644
--- a/apps/mobile-wallet/src/index.ts
+++ b/apps/mobile-wallet/src/index.ts
@@ -1,6 +1,7 @@
 export * from './accounts';
 export * from './app';
 export * from './config/environment';
+export * from './linking';
 export * from './navigation';
 export * from './sdk';
 
diff --git a/apps/mobile-wallet/src/linking/__tests__/paymentUri.test.ts b/apps/mobile-wallet/src/linking/__tests__/paymentUri.test.ts
new file mode 100644
index 00000000..2b2f4f8c
--- /dev/null
+++ b/apps/mobile-wallet/src/linking/__tests__/paymentUri.test.ts
@@ -0,0 +1,31 @@
+import { parsePaymentUri } from '../paymentUri';
+
+const DESTINATION = 'GDQP2KPQGKIHYJGXNUIYOMHARUARCA7DJT5FO2FFOOKY3B2WSQHG4W37';
+
+describe('parsePaymentUri', () => {
+  it('parses stellar pay URIs with destination and amount', () => {
+    expect(parsePaymentUri(`stellar:pay?destination=${DESTINATION}&amount=12.5`)).toEqual({
+      dest: DESTINATION,
+      amount: '12.5',
+    });
+  });
+
+  it('parses web+stellar pay URIs without an amount', () => {
+    expect(parsePaymentUri(`web+stellar:pay?destination=${DESTINATION}`)).toEqual({
+      dest: DESTINATION,
+    });
+  });
+
+  it('returns null for unsupported actions, missing destination, and invalid amounts', () => {
+    expect(parsePaymentUri(`stellar:tx?destination=${DESTINATION}`)).toBeNull();
+    expect(parsePaymentUri('stellar:pay?amount=1')).toBeNull();
+    expect(parsePaymentUri(`stellar:pay?destination=${DESTINATION}&amount=0`)).toBeNull();
+    expect(parsePaymentUri(`stellar:pay?destination=${DESTINATION}&amount=1.123456789`)).toBeNull();
+    expect(
+      parsePaymentUri(
+        'stellar:pay?destination=GDQP2KPQGKIHYJGXNUIYOMHARUARCA7DJT5FO2FFOOKY3B2WSQHG4W39'
+      )
+    ).toBeNull();
+    expect(parsePaymentUri('not a uri')).toBeNull();
+  });
+});
diff --git a/apps/mobile-wallet/src/linking/index.ts b/apps/mobile-wallet/src/linking/index.ts
new file mode 100644
index 00000000..976111af
--- /dev/null
+++ b/apps/mobile-wallet/src/linking/index.ts
@@ -0,0 +1,2 @@
+export { parsePaymentUri } from './paymentUri';
+export type { ParsedPaymentUri } from './paymentUri';
diff --git a/apps/mobile-wallet/src/linking/paymentUri.ts b/apps/mobile-wallet/src/linking/paymentUri.ts
new file mode 100644
index 00000000..8fbf8456
--- /dev/null
+++ b/apps/mobile-wallet/src/linking/paymentUri.ts
@@ -0,0 +1,53 @@
+export interface ParsedPaymentUri {
+  dest: string;
+  amount?: string;
+}
+
+const SUPPORTED_SCHEMES = new Set(['stellar', 'web+stellar']);
+const DESTINATION_RE = /^G[A-Z2-7]{55}$/;
+
+function isValidAmount(amount: string): boolean {
+  if (!/^(?:0|[1-9]\d*)(?:\.\d{1,7})?$/.test(amount)) {
+    return false;
+  }
+
+  return Number(amount) > 0;
+}
+
+export function parsePaymentUri(uri: string): ParsedPaymentUri | null {
+  const trimmed = uri.trim();
+  const schemeSeparator = trimmed.indexOf(':');
+
+  if (schemeSeparator <= 0) {
+    return null;
+  }
+
+  const scheme = trimmed.slice(0, schemeSeparator).toLowerCase();
+  if (!SUPPORTED_SCHEMES.has(scheme)) {
+    return null;
+  }
+
+  const payload = trimmed.slice(schemeSeparator + 1);
+  const querySeparator = payload.indexOf('?');
+  const action = (querySeparator >= 0 ? payload.slice(0, querySeparator) : payload)
+    .replace(/^\/+/, '')
+    .toLowerCase();
+
+  if (action !== 'pay' || querySeparator < 0) {
+    return null;
+  }
+
+  const params = new URLSearchParams(payload.slice(querySeparator + 1));
+  const dest = params.get('destination') ?? params.get('dest');
+
+  if (!dest || !DESTINATION_RE.test(dest)) {
+    return null;
+  }
+
+  const amount = params.get('amount') ?? undefined;
+  if (amount !== undefined && !isValidAmount(amount)) {
+    return null;
+  }
+
+  return amount ? { dest, amount } : { dest };
+}
diff --git a/apps/mobile-wallet/src/navigation/__tests__/onboarding.test.tsx b/apps/mobile-wallet/src/navigation/__tests__/onboarding.test.tsx
index 2791dfaa..797c2da9 100644
--- a/apps/mobile-wallet/src/navigation/__tests__/onboarding.test.tsx
+++ b/apps/mobile-wallet/src/navigation/__tests__/onboarding.test.tsx
@@ -1,7 +1,6 @@
-import '@testing-library/jest-dom/vitest';
+import '@testing-library/jest-dom';
 
 import { fireEvent, render, screen } from '@testing-library/react';
-import { describe, expect, it } from 'vitest';
 
 import { OnboardingNavigatorTestHarness } from '..';
 
diff --git a/apps/mobile-wallet/src/screens/history/__tests__/TransactionHistoryList.test.tsx b/apps/mobile-wallet/src/screens/history/__tests__/TransactionHistoryList.test.tsx
index 263923f0..d90f2b44 100644
--- a/apps/mobile-wallet/src/screens/history/__tests__/TransactionHistoryList.test.tsx
+++ b/apps/mobile-wallet/src/screens/history/__tests__/TransactionHistoryList.test.tsx
@@ -3,6 +3,8 @@ import { render, screen } from '@testing-library/react';
 import { TransactionHistoryList } from '../../../components/TransactionHistoryList';
 import type { Transaction } from '../types';
 
+const formatSnapshotTimestamp = () => '5/29/2026, 11:00:00 AM';
+
 const mockTransaction = (overrides?: Partial<Transaction>): Transaction => ({
   id: 'tx-1',
   amount: '100.00',
@@ -29,6 +31,7 @@ describe('TransactionHistoryList', () => {
           onRetry={jest.fn()}
           onRefresh={jest.fn()}
           onLoadMore={jest.fn()}
+          formatTimestamp={formatSnapshotTimestamp}
         />
       );
 
@@ -51,6 +54,7 @@ describe('TransactionHistoryList', () => {
           onRetry={jest.fn()}
           onRefresh={jest.fn()}
           onLoadMore={jest.fn()}
+          formatTimestamp={formatSnapshotTimestamp}
         />
       );
 
@@ -72,6 +76,7 @@ describe('TransactionHistoryList', () => {
           onRetry={jest.fn()}
           onRefresh={jest.fn()}
           onLoadMore={jest.fn()}
+          formatTimestamp={formatSnapshotTimestamp}
         />
       );
 
@@ -92,6 +97,7 @@ describe('TransactionHistoryList', () => {
           onRetry={jest.fn()}
           onRefresh={jest.fn()}
           onLoadMore={jest.fn()}
+          formatTimestamp={formatSnapshotTimestamp}
         />
       );
 
@@ -174,6 +180,7 @@ describe('TransactionHistoryList', () => {
           onRetry={jest.fn()}
           onRefresh={jest.fn()}
           onLoadMore={jest.fn()}
+          formatTimestamp={formatSnapshotTimestamp}
         />
       );
 
@@ -194,6 +201,7 @@ describe('TransactionHistoryList', () => {
           onRetry={jest.fn()}
           onRefresh={jest.fn()}
           onLoadMore={jest.fn()}
+          formatTimestamp={formatSnapshotTimestamp}
         />
       );
 
@@ -214,6 +222,7 @@ describe('TransactionHistoryList', () => {
           onRetry={jest.fn()}
           onRefresh={jest.fn()}
           onLoadMore={jest.fn()}
+          formatTimestamp={formatSnapshotTimestamp}
         />
       );
 
@@ -238,6 +247,7 @@ describe('TransactionHistoryList', () => {
           onRetry={jest.fn()}
           onRefresh={jest.fn()}
           onLoadMore={jest.fn()}
+          formatTimestamp={formatSnapshotTimestamp}
         />
       );
 
diff --git a/apps/mobile-wallet/src/screens/history/usePaginatedTransactionHistory.ts b/apps/mobile-wallet/src/screens/history/usePaginatedTransactionHistory.ts
index 9cd1cb41..bda58fa1 100644
--- a/apps/mobile-wallet/src/screens/history/usePaginatedTransactionHistory.ts
+++ b/apps/mobile-wallet/src/screens/history/usePaginatedTransactionHistory.ts
@@ -160,11 +160,12 @@ export const usePaginatedTransactionHistory = ({
     return fetchPage({ mode, cursor });
   }, [fetchPage, state.items.length, state.nextCursor]);
 
-  // Cleanup backoff timeout on unmount
   useEffect(() => {
+    const backoffTimeout = backoffTimeoutRef.current;
+
     return () => {
-      if (backoffTimeoutRef.current) {
-        clearTimeout(backoffTimeoutRef.current);
+      if (backoffTimeout) {
+        clearTimeout(backoffTimeout);
       }
     };
   }, []);
diff --git a/apps/mobile-wallet/src/security/hooks/useBiometricUnlock.ts b/apps/mobile-wallet/src/security/hooks/useBiometricUnlock.ts
index c1cb5ecf..16295831 100644
--- a/apps/mobile-wallet/src/security/hooks/useBiometricUnlock.ts
+++ b/apps/mobile-wallet/src/security/hooks/useBiometricUnlock.ts
@@ -218,7 +218,14 @@ export function useBiometricUnlock({
       isLoading: false,
       feedbackMessage: buildFeedbackMessage(reason, newLockout, 0),
     }));
-  }, [biometricService, lockoutManager, onSuccess, onPermanentLockout, promptMessage]);
+  }, [
+    biometricService,
+    lockoutManager,
+    onPermanentLockout,
+    onSuccess,
+    promptMessage,
+    startCountdown,
+  ]);
 
   // Password fallback
   const switchToPasswordFallback = useCallback(() => {
@@ -263,7 +270,7 @@ export function useBiometricUnlock({
         }));
       }
     },
-    [lockoutManager, onSuccess, passwordService]
+    [lockoutManager, onSuccess, passwordService, stopCountdown]
   );
 
   const backToBiometric = useCallback(() => {
diff --git a/apps/web-dashboard/src/components/__tests__/formatDate.test.ts b/apps/web-dashboard/src/components/__tests__/formatDate.test.ts
index 8389ffa2..3e2595e9 100644
--- a/apps/web-dashboard/src/components/__tests__/formatDate.test.ts
+++ b/apps/web-dashboard/src/components/__tests__/formatDate.test.ts
@@ -72,11 +72,11 @@ describe('formatRelative', () => {
     expect(result).toBeTruthy();
   });
 
-  it('uses Intl.RelativeTimeFormat — result contains recognisable relative words', () => {
+  it('uses Intl.RelativeTimeFormat for day-sized offsets', () => {
     const yesterday = new Date(Date.now() - 25 * 60 * 60 * 1000).toISOString();
     const result = formatRelative(yesterday);
-    // Should contain "yesterday", "day", "ago", or a number depending on locale.
-    expect(result).toMatch(/yesterday|day|ago|\d+/i);
+    const expected = new Intl.RelativeTimeFormat(undefined, { numeric: 'auto' }).format(-1, 'day');
+    expect(result).toBe(expected);
   });
 
   it('throws RangeError for an invalid date string', () => {
diff --git a/apps/web-dashboard/src/hooks/useAccountState.ts b/apps/web-dashboard/src/hooks/useAccountState.ts
index 26d121a5..f3a3f729 100644
--- a/apps/web-dashboard/src/hooks/useAccountState.ts
+++ b/apps/web-dashboard/src/hooks/useAccountState.ts
@@ -1,4 +1,4 @@
-import { useState, useEffect, useCallback } from 'react';
+import { useState, useEffect, useCallback, useRef } from 'react';
 import type { AccountData } from '../types/dashboard';
 
 const STORAGE_KEY = 'ancore-dashboard-selected-account';
@@ -44,6 +44,7 @@ export function useAccountState(): UseAccountStateReturn {
   const [currentAccount, setCurrentAccountState] = useState<AccountData | null>(null);
   const [loading, setLoading] = useState(true);
   const [error, setError] = useState<Error | null>(null);
+  const mountedRef = useRef(true);
 
   const getStoredAccount = useCallback((): AccountData | null => {
     try {
@@ -82,11 +83,19 @@ export function useAccountState(): UseAccountStateReturn {
   }, []);
 
   const fetchAccounts = useCallback(async () => {
+    if (!mountedRef.current) {
+      return;
+    }
+
     setLoading(true);
     setError(null);
     try {
       // Simulate API call
       await new Promise((resolve) => setTimeout(resolve, 300));
+      if (!mountedRef.current) {
+        return;
+      }
+
       setAccounts(MOCK_ACCOUNTS);
 
       // Set current account from storage or default to first account
@@ -102,9 +111,13 @@ export function useAccountState(): UseAccountStateReturn {
         setCurrentAccountState(MOCK_ACCOUNTS[0]);
       }
     } catch (err) {
-      setError(err instanceof Error ? err : new Error('Failed to fetch accounts'));
+      if (mountedRef.current) {
+        setError(err instanceof Error ? err : new Error('Failed to fetch accounts'));
+      }
     } finally {
-      setLoading(false);
+      if (mountedRef.current) {
+        setLoading(false);
+      }
     }
   }, [getStoredAccount]);
 
@@ -121,7 +134,12 @@ export function useAccountState(): UseAccountStateReturn {
   }, [fetchAccounts]);
 
   useEffect(() => {
+    mountedRef.current = true;
     fetchAccounts();
+
+    return () => {
+      mountedRef.current = false;
+    };
   }, [fetchAccounts]);
 
   return {
diff --git a/apps/web-dashboard/src/hooks/useSplitBill.ts b/apps/web-dashboard/src/hooks/useSplitBill.ts
index b163fe79..0252c5aa 100644
--- a/apps/web-dashboard/src/hooks/useSplitBill.ts
+++ b/apps/web-dashboard/src/hooks/useSplitBill.ts
@@ -13,7 +13,12 @@ export interface UseSplitBillReturn {
   bills: SplitBill[];
   isLoading: boolean;
   createBill: (input: CreateSplitBillInput) => SplitBill;
-  updateParticipant: (billId: string, participantId: string, status: ParticipantStatus, extra?: { failedReason?: string }) => void;
+  updateParticipant: (
+    billId: string,
+    participantId: string,
+    status: ParticipantStatus,
+    extra?: { failedReason?: string }
+  ) => void;
   cancelBill: (billId: string) => void;
   getBill: (billId: string) => SplitBill | undefined;
 }
@@ -37,8 +42,19 @@ export function useSplitBill(): UseSplitBillReturn {
   }, []);
 
   const updateParticipant = useCallback(
-    (billId: string, participantId: string, status: ParticipantStatus, extra?: { failedReason?: string }) => {
-      const updated = storageUpdateParticipant(loadSplitBills(), billId, participantId, status, extra);
+    (
+      billId: string,
+      participantId: string,
+      status: ParticipantStatus,
+      extra?: { failedReason?: string }
+    ) => {
+      const updated = storageUpdateParticipant(
+        loadSplitBills(),
+        billId,
+        participantId,
+        status,
+        extra
+      );
       saveSplitBills(updated);
       setBills(updated);
     },
@@ -51,10 +67,7 @@ export function useSplitBill(): UseSplitBillReturn {
     setBills(updated);
   }, []);
 
-  const getBill = useCallback(
-    (billId: string) => bills.find((b) => b.id === billId),
-    [bills]
-  );
+  const getBill = useCallback((billId: string) => bills.find((b) => b.id === billId), [bills]);
 
   return { bills, isLoading, createBill, updateParticipant, cancelBill, getBill };
 }
diff --git a/apps/web-dashboard/src/pages/SplitBill.tsx b/apps/web-dashboard/src/pages/SplitBill.tsx
index 8084e743..7e2b9370 100644
--- a/apps/web-dashboard/src/pages/SplitBill.tsx
+++ b/apps/web-dashboard/src/pages/SplitBill.tsx
@@ -182,13 +182,16 @@ function CreateBillForm({ onCreated }: { onCreated: (id: string) => void }) {
 
 // ── Bill list ─────────────────────────────────────────────────────────────────
 
-const BILL_STATUS_CONFIG: Record<
-  SplitBillStatus,
-  { icon: ReactNode; className: string }
-> = {
+const BILL_STATUS_CONFIG: Record<SplitBillStatus, { icon: ReactNode; className: string }> = {
   open: { icon: <Clock className="w-3.5 h-3.5" />, className: 'text-blue-600 bg-blue-50' },
-  completed: { icon: <CheckCircle className="w-3.5 h-3.5" />, className: 'text-green-600 bg-green-50' },
-  expired: { icon: <AlertCircle className="w-3.5 h-3.5" />, className: 'text-slate-500 bg-slate-100' },
+  completed: {
+    icon: <CheckCircle className="w-3.5 h-3.5" />,
+    className: 'text-green-600 bg-green-50',
+  },
+  expired: {
+    icon: <AlertCircle className="w-3.5 h-3.5" />,
+    className: 'text-slate-500 bg-slate-100',
+  },
   cancelled: { icon: <XCircle className="w-3.5 h-3.5" />, className: 'text-red-600 bg-red-50' },
 };
 
@@ -224,9 +227,7 @@ function BillCard({ bill, onClick }: { bill: SplitBill; onClick: () => void }) {
         <span>
           {paidCount}/{total} paid
         </span>
-        <span className="ml-auto">
-          Expires {new Date(bill.expiresAt).toLocaleDateString()}
-        </span>
+        <span className="ml-auto">Expires {new Date(bill.expiresAt).toLocaleDateString()}</span>
       </div>
 
       {/* Mini progress bar */}
diff --git a/apps/web-dashboard/src/services/__tests__/bulk-payouts.test.ts b/apps/web-dashboard/src/services/__tests__/bulk-payouts.test.ts
index ad1789be..60e237f8 100644
--- a/apps/web-dashboard/src/services/__tests__/bulk-payouts.test.ts
+++ b/apps/web-dashboard/src/services/__tests__/bulk-payouts.test.ts
@@ -86,14 +86,15 @@ describe('bulk payout execution queue', () => {
   });
 
   it('submits payouts to the relayer with idempotency and surfaces relay failures', async () => {
-    const fetchImpl = vi.fn(async () =>
-      new Response(
-        JSON.stringify({
-          success: false,
-          error: { message: 'Missing required parameter: signedTransactionXdr' },
-        }),
-        { status: 422, headers: { 'Content-Type': 'application/json' } }
-      )
+    const fetchImpl = vi.fn(
+      async () =>
+        new Response(
+          JSON.stringify({
+            success: false,
+            error: { message: 'Missing required parameter: signedTransactionXdr' },
+          }),
+          { status: 422, headers: { 'Content-Type': 'application/json' } }
+        )
     );
     const submitPayout = createRelayerPayoutSubmitter({
       baseUrl: 'https://relayer.test/',
diff --git a/apps/web-dashboard/src/services/bulk-payouts.ts b/apps/web-dashboard/src/services/bulk-payouts.ts
index 2b51ab97..c2fd179f 100644
--- a/apps/web-dashboard/src/services/bulk-payouts.ts
+++ b/apps/web-dashboard/src/services/bulk-payouts.ts
@@ -100,13 +100,7 @@ export function parseBulkPayoutCsv(csv: string): BulkPayoutParseResult {
     const signedTransactionXdr =
       signedTransactionXdrIndex === -1 ? undefined : record[signedTransactionXdrIndex]?.trim();
     accumulator.push(
-      createRow(
-        lineNumber,
-        recipient,
-        amount,
-        signedTransactionXdr,
-        validateRow(recipient, amount)
-      )
+      createRow(lineNumber, recipient, amount, signedTransactionXdr, validateRow(recipient, amount))
     );
     return accumulator;
   }, []);
@@ -271,7 +265,10 @@ function validateRow(recipient: string, amount: string): string[] {
 }
 
 function normalizeHeader(value: string): string {
-  return value.trim().toLowerCase().replace(/[\s_-]+/g, '');
+  return value
+    .trim()
+    .toLowerCase()
+    .replace(/[\s_-]+/g, '');
 }
 
 function normalizeAmount(value: string): string {
diff --git a/apps/web-dashboard/src/test/setup.ts b/apps/web-dashboard/src/test/setup.ts
index bb02c60c..5e79cbc9 100644
--- a/apps/web-dashboard/src/test/setup.ts
+++ b/apps/web-dashboard/src/test/setup.ts
@@ -1 +1,5 @@
-import '@testing-library/jest-dom/vitest';
+/**
+ * Web dashboard test setup.
+ * Delegates to the shared Vitest setup (jest-dom, cleanup, localStorage shim).
+ */
+export * from '../../../../packages/vitest.setup';
diff --git a/contracts/account/README.md b/contracts/account/README.md
index ca22c14f..a70c8117 100644
--- a/contracts/account/README.md
+++ b/contracts/account/README.md
@@ -109,11 +109,11 @@ Manage session keys for the account.
 
 Session key permissions are stored on-chain as `Vec<u32>`. Each value is a permission index; SDK/UI code may combine selections into a bitmask using `1 << index`.
 
-| Index | Bit flag | Name | Description |
-| ----- | -------- | ---- | ----------- |
-| `0` | `1 << 0` (`0b001`) | `SEND_PAYMENT` | Authorize payment operations |
-| `1` | `1 << 1` (`0b010`) | `MANAGE_DATA` | Authorize manage-data operations |
-| `2` | `1 << 2` (`0b100`) | `INVOKE_CONTRACT` | Authorize arbitrary contract invocations |
+| Index | Bit flag           | Name              | Description                              |
+| ----- | ------------------ | ----------------- | ---------------------------------------- |
+| `0`   | `1 << 0` (`0b001`) | `SEND_PAYMENT`    | Authorize payment operations             |
+| `1`   | `1 << 1` (`0b010`) | `MANAGE_DATA`     | Authorize manage-data operations         |
+| `2`   | `1 << 2` (`0b100`) | `INVOKE_CONTRACT` | Authorize arbitrary contract invocations |
 
 > **Important:** `execute()` requires the session key `Vec<u32>` to contain the internal `PERMISSION_EXECUTE` constant (`1`). This is separate from the SDK bitmask representation above. Always include `1` in the permissions vector for session keys that need to call `execute()`, regardless of other permission indices selected.
 
diff --git a/contracts/validation-modules/README.md b/contracts/validation-modules/README.md
index 299342e8..b254ee1e 100644
--- a/contracts/validation-modules/README.md
+++ b/contracts/validation-modules/README.md
@@ -13,14 +13,14 @@ fn validate(env: Env, context: ValidationContext) -> Result<(), ValidationModule
 
 `ValidationContext` is the account-to-module boundary:
 
-| Field | Meaning |
-| --- | --- |
-| `account` | Account contract requesting validation |
+| Field        | Meaning                                                  |
+| ------------ | -------------------------------------------------------- |
+| `account`    | Account contract requesting validation                   |
 | `authorizer` | Owner or session-key authority represented as an address |
-| `target` | Contract address the account wants to invoke |
-| `function` | Function symbol the account wants to invoke |
-| `args_hash` | Fixed-size digest of the execution arguments |
-| `nonce` | Account nonce bound to the execution |
+| `target`     | Contract address the account wants to invoke             |
+| `function`   | Function symbol the account wants to invoke              |
+| `args_hash`  | Fixed-size digest of the execution arguments             |
+| `nonce`      | Account nonce bound to the execution                     |
 
 The interface keeps validation bounded by passing a fixed-size context instead
 of an unbounded argument vector. Modules that need argument-aware rules should
@@ -53,13 +53,13 @@ Policy semantics:
 
 Let `n` be the number of allowlisted targets.
 
-| Operation | Time | Space |
-| --- | --- | --- |
-| `initialize` | O(1) | O(1) |
-| `set_enabled` | O(1) | O(1) |
+| Operation            | Time | Space           |
+| -------------------- | ---- | --------------- |
+| `initialize`         | O(1) | O(1)            |
+| `set_enabled`        | O(1) | O(1)            |
 | `set_allowed_target` | O(1) | O(1) per target |
-| `is_allowed_target` | O(1) | O(1) |
-| `validate` | O(1) | O(1) |
+| `is_allowed_target`  | O(1) | O(1)            |
+| `validate`           | O(1) | O(1)            |
 
 Total module storage is O(n).
 
diff --git a/packages/account-abstraction/src/__tests__/permissions.test.ts b/packages/account-abstraction/src/__tests__/permissions.test.ts
index 4f7f8736..7281cf3a 100644
--- a/packages/account-abstraction/src/__tests__/permissions.test.ts
+++ b/packages/account-abstraction/src/__tests__/permissions.test.ts
@@ -40,8 +40,7 @@ export const CONTRACT_PERMISSION_VECTORS = [
     name: 'send payment and invoke contract',
     permissions: [SessionPermission.SEND_PAYMENT, SessionPermission.INVOKE_CONTRACT],
     bitmask:
-      PERM_BITS[SessionPermission.SEND_PAYMENT] |
-      PERM_BITS[SessionPermission.INVOKE_CONTRACT],
+      PERM_BITS[SessionPermission.SEND_PAYMENT] | PERM_BITS[SessionPermission.INVOKE_CONTRACT],
     contractVec: [0, 2],
   },
   {
diff --git a/packages/account-abstraction/src/add-session-key.ts b/packages/account-abstraction/src/add-session-key.ts
index 0480d3b7..5aa15ed1 100644
--- a/packages/account-abstraction/src/add-session-key.ts
+++ b/packages/account-abstraction/src/add-session-key.ts
@@ -14,9 +14,7 @@ function getContract(contract: AccountContract | string): AccountContract {
   return typeof contract === 'string' ? new AccountContract(contract) : contract;
 }
 
-function resolveSessionKeyPermissions(
-  permissions: SessionPermission[] | number[]
-): number[] {
+function resolveSessionKeyPermissions(permissions: SessionPermission[] | number[]): number[] {
   return permissionsToContractVec(permissions as SessionPermission[]);
 }
 
@@ -44,11 +42,7 @@ export function addSessionKey(
 
   if (options) {
     const resolvedContract = getContract(contract);
-    const invocation = resolvedContract.addSessionKey(
-      publicKey,
-      contractPermissions,
-      expiresAt
-    );
+    const invocation = resolvedContract.addSessionKey(publicKey, contractPermissions, expiresAt);
     return Promise.resolve({
       invocation,
       operation: resolvedContract.buildInvokeOperation(invocation),
diff --git a/packages/account-abstraction/src/permissions.ts b/packages/account-abstraction/src/permissions.ts
index 9ac0a6e7..31e2c506 100644
--- a/packages/account-abstraction/src/permissions.ts
+++ b/packages/account-abstraction/src/permissions.ts
@@ -38,9 +38,7 @@ export function permissionsToBitmask(perms: SessionPermission[]): number {
  * Expand a permission bitmask back into session permission enum values.
  */
 export function bitmaskToPermissions(bitmask: number): SessionPermission[] {
-  return ALL_SESSION_PERMISSIONS.filter(
-    (permission) => (bitmask & PERM_BITS[permission]) !== 0
-  );
+  return ALL_SESSION_PERMISSIONS.filter((permission) => (bitmask & PERM_BITS[permission]) !== 0);
 }
 
 /**
@@ -58,9 +56,7 @@ export function permissionsToContractVec(perms: SessionPermission[]): number[] {
  * Unknown values are omitted.
  */
 export function contractVecToPermissions(vec: number[]): SessionPermission[] {
-  return vec.filter((value): value is SessionPermission =>
-    SESSION_PERMISSION_VALUES.has(value)
-  );
+  return vec.filter((value): value is SessionPermission => SESSION_PERMISSION_VALUES.has(value));
 }
 
 /**
diff --git a/packages/core-sdk/src/fiat-formatter.ts b/packages/core-sdk/src/fiat-formatter.ts
index fe742086..dc4a8d1b 100644
--- a/packages/core-sdk/src/fiat-formatter.ts
+++ b/packages/core-sdk/src/fiat-formatter.ts
@@ -11,7 +11,7 @@ export interface FiatFormatOptions {
   /**
    * Locale string for formatting
    * Fallback behavior: If the provided locale is invalid or unsupported,
-   * it falls back to the system default locale, and ultimately to 'en-US'.
+   * it falls back directly to 'en-US'.
    * @default 'en-US'
    */
   locale?: string | string[];
@@ -32,6 +32,21 @@ export interface FiatFormatOptions {
   maximumFractionDigits?: number;
 }
 
+function resolveSupportedLocale(locale: string | string[]): string | string[] {
+  try {
+    const requestedLocales = Array.isArray(locale) ? locale : [locale];
+    const supportedLocales = Intl.NumberFormat.supportedLocalesOf(requestedLocales);
+
+    if (supportedLocales.length > 0) {
+      return Array.isArray(locale) ? supportedLocales : supportedLocales[0];
+    }
+  } catch {
+    // Fall through to the stable fallback below.
+  }
+
+  return 'en-US';
+}
+
 /**
  * Formats a numeric amount as a fiat currency string.
  *
@@ -39,7 +54,7 @@ export interface FiatFormatOptions {
  * Uses standard Intl.NumberFormat rounding (half-expand).
  *
  * Fallback behavior:
- * - If locale is invalid, falls back to standard Intl fallback ('en-US' usually)
+ * - If locale is invalid or unsupported, falls back to 'en-US'
  * - If Intl is not available or parameters are severely malformed, falls back to basic string formatting
  *
  * @param amount The numerical amount to format
@@ -55,7 +70,7 @@ export function formatFiatAmount(amount: number, options: FiatFormatOptions = {}
   } = options;
 
   try {
-    return new Intl.NumberFormat(locale, {
+    return new Intl.NumberFormat(resolveSupportedLocale(locale), {
       style: 'currency',
       currency,
       minimumFractionDigits,
diff --git a/packages/stellar/src/__tests__/client.test.ts b/packages/stellar/src/__tests__/client.test.ts
index 1d9b6bc1..6411b315 100644
--- a/packages/stellar/src/__tests__/client.test.ts
+++ b/packages/stellar/src/__tests__/client.test.ts
@@ -37,6 +37,7 @@ const mockHorizonServerConstructor = jest.fn(() => ({
   loadAccount: jest.fn(),
   submitTransaction: jest.fn(),
 }));
+const mockTransactionFromXDR = jest.fn();
 
 jest.mock('@stellar/stellar-sdk', () => ({
   rpc: {
@@ -45,6 +46,11 @@ jest.mock('@stellar/stellar-sdk', () => ({
   Horizon: {
     Server: jest.fn(() => mockHorizonServerConstructor()),
   },
+  TransactionBuilder: {
+    fromXDR: jest.fn((xdr: string, networkPassphrase: string) =>
+      mockTransactionFromXDR(xdr, networkPassphrase)
+    ),
+  },
 }));
 
 const mockAccountResponse: Horizon.AccountResponse = {
@@ -112,6 +118,7 @@ describe('StellarClient', () => {
     mockRpcServers.clear();
     mockRpcServerConstructor.mockClear();
     mockHorizonServerConstructor.mockClear();
+    mockTransactionFromXDR.mockReset();
   });
 
   afterEach(() => {
@@ -265,9 +272,9 @@ describe('StellarClient', () => {
     });
 
     it('should throw for unsupported network values', () => {
-      expect(() => new StellarClient({ network: 'invalid' as unknown as 'testnet' })).toThrow(
-        NetworkError
-      );
+      const invalidNetwork = 'invalid' as never;
+
+      expect(() => new StellarClient({ network: invalidNetwork })).toThrow(NetworkError);
     });
   });
 
@@ -293,7 +300,9 @@ describe('StellarClient', () => {
     });
 
     it('should throw for invalid network', () => {
-      expect(() => createStellarClient('invalid' as unknown as 'testnet')).toThrow(NetworkError);
+      const invalidNetwork = 'invalid' as never;
+
+      expect(() => createStellarClient(invalidNetwork)).toThrow(NetworkError);
     });
   });
 
@@ -532,6 +541,29 @@ describe('StellarClient', () => {
 
       await expect(client.getAccount('GABC123')).rejects.toBe(exhausted);
     });
+
+    it('should retry Horizon 429 responses and preserve retry exhaustion context', async () => {
+      const client = new StellarClient({
+        network: 'testnet',
+        retryOptions: { maxRetries: 2, baseDelayMs: 0 },
+      });
+      const horizon = getHorizonMock(client);
+      horizon.loadAccount.mockRejectedValue(
+        Object.assign(new Error('rate limited'), {
+          response: { status: 429 },
+        })
+      );
+
+      await expect(client.getAccount('GABC123')).rejects.toMatchObject({
+        name: 'RetryExhaustedError',
+        attempts: 3,
+        lastError: expect.objectContaining({
+          name: 'NetworkError',
+          statusCode: 429,
+        }),
+      });
+      expect(horizon.loadAccount).toHaveBeenCalledTimes(3);
+    });
   });
 
   describe('submitTransaction', () => {
@@ -552,6 +584,38 @@ describe('StellarClient', () => {
       expect(horizon.submitTransaction).toHaveBeenCalledWith(mockTransaction);
     });
 
+    it('should decode signed transaction XDR before submission', async () => {
+      const client = new StellarClient({ network: 'testnet', retryOptions: fastRetryOptions });
+      const horizon = getHorizonMock(client);
+      mockTransactionFromXDR.mockReturnValue(mockTransaction);
+      horizon.submitTransaction.mockResolvedValue(mockSubmitResponse);
+
+      await expect(
+        client.submitTransaction('signed-xdr' as unknown as Transaction)
+      ).resolves.toEqual(mockSubmitResponse);
+      expect(mockTransactionFromXDR).toHaveBeenCalledWith(
+        'signed-xdr',
+        'Test SDF Network ; September 2015'
+      );
+      expect(horizon.submitTransaction).toHaveBeenCalledWith(mockTransaction);
+    });
+
+    it('should normalize XDR decode errors before submission', async () => {
+      const client = new StellarClient({ network: 'testnet', retryOptions: fastRetryOptions });
+      const horizon = getHorizonMock(client);
+      const malformed = new Error('malformed XDR');
+      mockTransactionFromXDR.mockImplementationOnce(() => {
+        throw malformed;
+      });
+
+      await expect(client.submitTransaction('bad-xdr')).rejects.toMatchObject({
+        name: 'NetworkError',
+        message: 'Invalid signed transaction XDR',
+        cause: malformed,
+      });
+      expect(horizon.submitTransaction).not.toHaveBeenCalled();
+    });
+
     it('should throw TransactionError when Horizon returns result codes', async () => {
       const client = new StellarClient({ network: 'testnet', retryOptions: fastRetryOptions });
       const horizon = getHorizonMock(client);
@@ -570,6 +634,55 @@ describe('StellarClient', () => {
       await expect(client.submitTransaction(mockTransaction)).rejects.toThrow(TransactionError);
     });
 
+    it('should not retry permanent Horizon transaction errors', async () => {
+      const client = new StellarClient({
+        network: 'testnet',
+        retryOptions: { maxRetries: 2, baseDelayMs: 0 },
+      });
+      const horizon = getHorizonMock(client);
+      horizon.submitTransaction.mockRejectedValue({
+        response: {
+          data: {
+            extras: {
+              result_codes: {
+                transaction: 'tx_bad_seq',
+              },
+            },
+          },
+        },
+      });
+
+      await expect(client.submitTransaction(mockTransaction)).rejects.toThrow(TransactionError);
+      expect(horizon.submitTransaction).toHaveBeenCalledTimes(1);
+    });
+
+    it('should preserve Horizon transaction result details on TransactionError', async () => {
+      const client = new StellarClient({ network: 'testnet', retryOptions: fastRetryOptions });
+      const horizon = getHorizonMock(client);
+      horizon.submitTransaction.mockRejectedValue({
+        response: {
+          status: 400,
+          data: {
+            extras: {
+              result_codes: {
+                transaction: 'tx_failed',
+                operations: ['op_underfunded', 'op_no_destination'],
+              },
+              result_xdr: 'result-xdr',
+            },
+          },
+        },
+      });
+
+      await expect(client.submitTransaction(mockTransaction)).rejects.toMatchObject({
+        name: 'TransactionError',
+        resultCode: 'tx_failed',
+        operationResultCodes: ['op_underfunded', 'op_no_destination'],
+        resultXdr: 'result-xdr',
+        statusCode: 400,
+      });
+    });
+
     it('should wrap unexpected submission failures as NetworkError', async () => {
       const client = new StellarClient({ network: 'testnet', retryOptions: fastRetryOptions });
       const horizon = getHorizonMock(client);
diff --git a/packages/stellar/src/client.ts b/packages/stellar/src/client.ts
index b3e9c6e6..d59c7057 100644
--- a/packages/stellar/src/client.ts
+++ b/packages/stellar/src/client.ts
@@ -2,7 +2,7 @@
  * StellarClient - Network client for Stellar blockchain interactions
  */
 
-import { rpc as StellarRpc, Horizon } from '@stellar/stellar-sdk';
+import { rpc as StellarRpc, Horizon, TransactionBuilder } from '@stellar/stellar-sdk';
 import type { Transaction } from '@stellar/stellar-sdk';
 import type { Network, NetworkConfig } from '@ancore/types';
 import {
@@ -188,27 +188,19 @@ export class StellarClient {
       return error.statusCode;
     }
 
-    if (
-      error &&
-      typeof error === 'object' &&
-      'statusCode' in error &&
-      typeof error.statusCode === 'number'
-    ) {
+    if (!error || typeof error !== 'object') {
+      return undefined;
+    }
+
+    if ('statusCode' in error && typeof error.statusCode === 'number') {
       return error.statusCode;
     }
 
-    if (
-      error &&
-      typeof error === 'object' &&
-      'status' in error &&
-      typeof error.status === 'number'
-    ) {
+    if ('status' in error && typeof error.status === 'number') {
       return error.status;
     }
 
     if (
-      error &&
-      typeof error === 'object' &&
       'response' in error &&
       error.response &&
       typeof error.response === 'object' &&
@@ -263,41 +255,6 @@ export class StellarClient {
     return this.isRetryableNetworkError(error);
   }
 
-  private getHorizonResponseData(error: unknown): unknown {
-    if (
-      error &&
-      typeof error === 'object' &&
-      'response' in error &&
-      error.response &&
-      typeof error.response === 'object' &&
-      'data' in error.response
-    ) {
-      return error.response.data;
-    }
-
-    return undefined;
-  }
-
-  private getTransactionResultCode(error: unknown): string | undefined {
-    const data = this.getHorizonResponseData(error);
-
-    if (!data || typeof data !== 'object' || !('extras' in data)) {
-      return undefined;
-    }
-
-    const { extras } = data;
-    if (!extras || typeof extras !== 'object' || !('result_codes' in extras)) {
-      return undefined;
-    }
-
-    const { result_codes: resultCodes } = extras;
-    if (!resultCodes || typeof resultCodes !== 'object' || !('transaction' in resultCodes)) {
-      return undefined;
-    }
-
-    return typeof resultCodes.transaction === 'string' ? resultCodes.transaction : undefined;
-  }
-
   private isRetryableRpcError(error: Error): boolean {
     if (error instanceof StellarError && !(error instanceof NetworkError)) {
       return false;
@@ -400,7 +357,7 @@ export class StellarClient {
         }
         if (
           error.lastError instanceof AccountNotFoundError ||
-          error.lastError instanceof NetworkError
+          (error.lastError instanceof NetworkError && error.lastError.statusCode !== 429)
         ) {
           throw error.lastError;
         }
@@ -554,29 +511,47 @@ export class StellarClient {
    * @throws NetworkError if the network request fails
    */
   async submitTransaction(
-    transaction: Transaction
+    transaction: Transaction | string
   ): Promise<Horizon.HorizonApi.SubmitTransactionResponse> {
+    let signedTransaction: Transaction;
     try {
-      return await withRetry(
-        async () => {
-          try {
-            const response = await this.horizonServer.submitTransaction(transaction);
-            return response;
-          } catch (error) {
-            const resultCode = this.getTransactionResultCode(error);
-            if (resultCode) {
-              throw new TransactionError('Transaction submission failed', {
-                resultCode,
-              });
-            }
-            throw this.createHorizonNetworkError('Failed to submit transaction', error);
+      signedTransaction = this.resolveSignedTransaction(transaction);
+    } catch (error) {
+      throw new NetworkError('Invalid signed transaction XDR', {
+        cause: error instanceof Error ? error : undefined,
+      });
+    }
+
+    const callerIsRetryable = this.retryOptions.isRetryable;
+    const retryOptions: RetryOptions = {
+      ...this.retryOptions,
+      isRetryable: (error) => {
+        if (error instanceof TransactionError) {
+          return false;
+        }
+
+        if (callerIsRetryable) {
+          return callerIsRetryable(error);
+        }
+
+        const statusCode = this.getErrorStatusCode(error);
+        return statusCode === undefined || statusCode === 429 || statusCode >= 500;
+      },
+    };
+
+    try {
+      return await withRetry(async () => {
+        try {
+          const response = await this.horizonServer.submitTransaction(signedTransaction);
+          return response;
+        } catch (error) {
+          const transactionError = TransactionError.fromHorizonError(error);
+          if (transactionError) {
+            throw transactionError;
           }
-        },
-        {
-          ...this.retryOptions,
-          isRetryable: (error) => this.isRetryableHorizonError(error),
+          throw this.createHorizonNetworkError('Failed to submit transaction', error);
         }
-      );
+      }, retryOptions);
     } catch (error: unknown) {
       if (error instanceof RetryExhaustedError && error.lastError) {
         if (this.isRateLimitedNetworkError(error.lastError)) {
@@ -593,6 +568,14 @@ export class StellarClient {
     }
   }
 
+  private resolveSignedTransaction(transaction: Transaction | string): Transaction {
+    if (typeof transaction !== 'string') {
+      return transaction;
+    }
+
+    return TransactionBuilder.fromXDR(transaction, this.networkPassphrase) as Transaction;
+  }
+
   /**
    * Fund an account using Friendbot (testnet only)
    *
diff --git a/packages/stellar/src/errors.ts b/packages/stellar/src/errors.ts
index 947d4add..fedd3c38 100644
--- a/packages/stellar/src/errors.ts
+++ b/packages/stellar/src/errors.ts
@@ -49,15 +49,70 @@ export class AccountNotFoundError extends StellarError {
 /**
  * Error thrown when a transaction submission fails
  */
+type HorizonErrorPayload = {
+  response?: {
+    status?: number;
+    data?: {
+      message?: string;
+      extras?: {
+        result_codes?: {
+          transaction?: string;
+          operations?: unknown;
+        };
+        result_xdr?: string;
+      };
+      result_xdr?: string;
+    };
+  };
+};
+
+export interface TransactionErrorOptions {
+  resultCode?: string;
+  resultXdr?: string;
+  operationResultCodes?: string[];
+  statusCode?: number;
+}
+
 export class TransactionError extends StellarError {
   public readonly resultCode?: string;
   public readonly resultXdr?: string;
+  public readonly operationResultCodes?: string[];
+  public readonly statusCode?: number;
 
-  constructor(message: string, options?: { resultCode?: string; resultXdr?: string }) {
+  constructor(message: string, options?: TransactionErrorOptions) {
     super(message);
     this.name = 'TransactionError';
     this.resultCode = options?.resultCode;
     this.resultXdr = options?.resultXdr;
+    this.operationResultCodes = options?.operationResultCodes;
+    this.statusCode = options?.statusCode;
+  }
+
+  static fromHorizonError(error: unknown): TransactionError | null {
+    if (!error || typeof error !== 'object') {
+      return null;
+    }
+
+    const payload = error as HorizonErrorPayload;
+    const data = payload.response?.data;
+    const extras = data?.extras;
+    const resultCodes = extras?.result_codes;
+    const resultCode = resultCodes?.transaction;
+    const operationResultCodes = Array.isArray(resultCodes?.operations)
+      ? resultCodes.operations.filter((code): code is string => typeof code === 'string')
+      : undefined;
+    const resultXdr = extras?.result_xdr ?? data?.result_xdr;
+
+    if (!resultCode && !operationResultCodes?.length && !resultXdr) {
+      return null;
+    }
+
+    return new TransactionError(data?.message ?? 'Transaction submission failed', {
+      resultCode,
+      operationResultCodes,
+      resultXdr,
+      statusCode: payload.response?.status,
+    });
   }
 }
 
diff --git a/packages/ui-kit/package.json b/packages/ui-kit/package.json
index 75dd0f12..24d2d1cd 100644
--- a/packages/ui-kit/package.json
+++ b/packages/ui-kit/package.json
@@ -68,6 +68,7 @@
     "@typescript-eslint/parser": "^8.0.0",
     "@vitejs/plugin-react": "^4.2.0",
     "autoprefixer": "^10.4.0",
+    "axe-core": "^4.11.4",
     "eslint": "^9.0.0",
     "eslint-plugin-react": "^7.37.0",
     "eslint-plugin-react-hooks": "^5.0.0",
diff --git a/packages/ui-kit/src/__tests__/Form/Field.test.tsx b/packages/ui-kit/src/__tests__/Form/Field.test.tsx
new file mode 100644
index 00000000..312bc687
--- /dev/null
+++ b/packages/ui-kit/src/__tests__/Form/Field.test.tsx
@@ -0,0 +1,69 @@
+import { render, screen } from '@testing-library/react';
+import { describe, expect, it } from 'vitest';
+import { Field } from '@/components/Form/Field';
+import { Input } from '@/components/ui/input';
+
+describe('Field', () => {
+  it('links the label, description, and error to the wrapped control', () => {
+    render(
+      <Field label="Amount" description="Enter the transfer amount." error="Amount is required">
+        <Input />
+      </Field>
+    );
+
+    const input = screen.getByLabelText('Amount');
+
+    expect(input).toHaveAttribute('aria-invalid', 'true');
+    expect(input.getAttribute('aria-describedby')).toContain(
+      screen.getByText('Enter the transfer amount.').id
+    );
+    expect(input.getAttribute('aria-describedby')).toContain(
+      screen.getByText('Amount is required').id
+    );
+  });
+
+  it('uses the child id when one is provided', () => {
+    render(
+      <Field label="Recipient">
+        <Input id="recipient-address" />
+      </Field>
+    );
+
+    expect(screen.getByLabelText('Recipient')).toHaveAttribute('id', 'recipient-address');
+  });
+
+  it('forwards required state to native controls', () => {
+    render(
+      <Field label="Destination" required>
+        <Input />
+      </Field>
+    );
+
+    const input = screen.getByLabelText(/Destination/);
+
+    expect(input).toBeRequired();
+    expect(input).toHaveAttribute('aria-required', 'true');
+  });
+
+  it('supports render-prop controls with custom markup', () => {
+    render(
+      <Field label="Note" description="Visible only to you." required>
+        {({ controlProps }) => (
+          <div>
+            <textarea {...controlProps} />
+            <span>140</span>
+          </div>
+        )}
+      </Field>
+    );
+
+    const textarea = screen.getByLabelText(/Note/);
+
+    expect(textarea).toHaveAttribute(
+      'aria-describedby',
+      screen.getByText('Visible only to you.').id
+    );
+    expect(textarea).toHaveAttribute('aria-required', 'true');
+    expect(screen.getByText('140')).toBeInTheDocument();
+  });
+});
diff --git a/packages/ui-kit/src/__tests__/test-utils/a11y.ts b/packages/ui-kit/src/__tests__/test-utils/a11y.ts
new file mode 100644
index 00000000..dc2977ea
--- /dev/null
+++ b/packages/ui-kit/src/__tests__/test-utils/a11y.ts
@@ -0,0 +1,42 @@
+import axe from 'axe-core';
+import type { AxeResults, RunOptions } from 'axe-core';
+import { expect } from 'vitest';
+
+const defaultOptions: RunOptions = {
+  rules: {
+    'color-contrast': { enabled: false },
+  },
+};
+
+function mergeOptions(options?: RunOptions): RunOptions {
+  return {
+    ...defaultOptions,
+    ...options,
+    rules: {
+      ...defaultOptions.rules,
+      ...options?.rules,
+    },
+  };
+}
+
+export async function runA11yCheck(
+  container: Element | Document = document,
+  options?: RunOptions
+): Promise<AxeResults> {
+  return axe.run(container, mergeOptions(options));
+}
+
+export async function expectNoA11yViolations(
+  container: Element | Document = document,
+  options?: RunOptions
+): Promise<void> {
+  const results = await runA11yCheck(container, options);
+  const violations = results.violations.map((violation) => ({
+    id: violation.id,
+    impact: violation.impact,
+    help: violation.help,
+    nodes: violation.nodes.map((node) => node.target),
+  }));
+
+  expect(violations).toEqual([]);
+}
diff --git a/packages/ui-kit/src/components/Form/Field.stories.tsx b/packages/ui-kit/src/components/Form/Field.stories.tsx
new file mode 100644
index 00000000..3e4309f8
--- /dev/null
+++ b/packages/ui-kit/src/components/Form/Field.stories.tsx
@@ -0,0 +1,35 @@
+import type { Meta, StoryObj } from '@storybook/react';
+import { Field } from './Field';
+import { Input } from '@/components/ui/input';
+
+const meta = {
+  title: 'Form/Field',
+  component: Field,
+  parameters: {
+    layout: 'centered',
+  },
+  tags: ['autodocs'],
+} satisfies Meta<typeof Field>;
+
+export default meta;
+type Story = StoryObj<typeof meta>;
+
+export const Default: Story = {
+  render: () => (
+    <div className="w-[350px]">
+      <Field label="Amount" description="Enter the amount to send.">
+        <Input placeholder="0.00" />
+      </Field>
+    </div>
+  ),
+};
+
+export const WithError: Story = {
+  render: () => (
+    <div className="w-[350px]">
+      <Field label="Recipient" error="Recipient address is required" required>
+        <Input placeholder="G..." />
+      </Field>
+    </div>
+  ),
+};
diff --git a/packages/ui-kit/src/components/Form/Field.tsx b/packages/ui-kit/src/components/Form/Field.tsx
new file mode 100644
index 00000000..01b8bb16
--- /dev/null
+++ b/packages/ui-kit/src/components/Form/Field.tsx
@@ -0,0 +1,85 @@
+import * as React from 'react';
+import { cn } from '@/lib/utils';
+
+type FieldControlProps = {
+  id?: string;
+  'aria-describedby'?: string;
+  'aria-invalid'?: boolean | 'true' | 'false';
+  'aria-required'?: boolean | 'true' | 'false';
+  required?: boolean;
+};
+
+type FieldRenderProps = {
+  id: string;
+  describedBy?: string;
+  invalid: boolean;
+  controlProps: FieldControlProps & { id: string };
+};
+
+export interface FieldProps extends Omit<React.HTMLAttributes<HTMLDivElement>, 'children'> {
+  label: React.ReactNode;
+  children: React.ReactElement<FieldControlProps> | ((props: FieldRenderProps) => React.ReactNode);
+  description?: React.ReactNode;
+  error?: React.ReactNode;
+  required?: boolean;
+}
+
+function mergeIds(...ids: Array<string | undefined>): string | undefined {
+  const merged = ids.filter(Boolean).join(' ');
+  return merged || undefined;
+}
+
+const Field = React.forwardRef<HTMLDivElement, FieldProps>(
+  ({ label, children, description, error, required = false, className, ...props }, ref) => {
+    const generatedId = React.useId();
+    const childProps = typeof children === 'function' ? undefined : children.props;
+    const inputId = childProps?.id ?? generatedId;
+    const descriptionId = description ? `${inputId}-description` : undefined;
+    const errorId = error ? `${inputId}-error` : undefined;
+    const describedBy = mergeIds(childProps?.['aria-describedby'], descriptionId, errorId);
+
+    const controlProps: FieldControlProps & { id: string } = {
+      id: inputId,
+      'aria-describedby': describedBy,
+      'aria-invalid': error ? true : childProps?.['aria-invalid'],
+      'aria-required': required ? true : childProps?.['aria-required'],
+      ...(required ? { required: true } : {}),
+    };
+
+    const control =
+      typeof children === 'function'
+        ? children({
+            id: inputId,
+            describedBy,
+            invalid: Boolean(error),
+            controlProps,
+          })
+        : React.cloneElement(children, controlProps);
+
+    return (
+      <div ref={ref} className={cn('space-y-2', className)} {...props}>
+        <label
+          htmlFor={inputId}
+          className="text-sm font-medium leading-none peer-disabled:cursor-not-allowed peer-disabled:opacity-70"
+        >
+          {label}
+          {required && <span aria-hidden="true"> *</span>}
+        </label>
+        {control}
+        {description && (
+          <p id={descriptionId} className="text-sm text-muted-foreground">
+            {description}
+          </p>
+        )}
+        {error && (
+          <p id={errorId} role="alert" className="text-sm font-medium text-destructive">
+            {error}
+          </p>
+        )}
+      </div>
+    );
+  }
+);
+Field.displayName = 'Field';
+
+export { Field };
diff --git a/packages/ui-kit/src/components/Form/index.ts b/packages/ui-kit/src/components/Form/index.ts
index 317f6866..99188026 100644
--- a/packages/ui-kit/src/components/Form/index.ts
+++ b/packages/ui-kit/src/components/Form/index.ts
@@ -1,6 +1,9 @@
 export { Form, FormSubmit, FormError } from './Form';
 export type { FormProps, FormSubmitProps, FormErrorProps } from './Form';
 
+export { Field } from './Field';
+export type { FieldProps } from './Field';
+
 export { AddressInput, AddressInputBase } from './AddressInput';
 export type { AddressInputProps, AddressInputBaseProps } from './AddressInput';
 
diff --git a/packages/ui-kit/src/components/Toast/NotificationProvider.tsx b/packages/ui-kit/src/components/Toast/NotificationProvider.tsx
index d43cb61c..6866529e 100644
--- a/packages/ui-kit/src/components/Toast/NotificationProvider.tsx
+++ b/packages/ui-kit/src/components/Toast/NotificationProvider.tsx
@@ -10,6 +10,8 @@ export interface Toast {
   variant: ToastVariant;
 }
 
+export type ToastItem = Toast;
+
 interface NotificationContextValue {
   toast: (message: string, variant?: ToastVariant, duration?: number) => void;
 }
diff --git a/packages/ui-kit/src/components/TransactionItem.tsx b/packages/ui-kit/src/components/TransactionItem.tsx
index f094a506..94e730ce 100644
--- a/packages/ui-kit/src/components/TransactionItem.tsx
+++ b/packages/ui-kit/src/components/TransactionItem.tsx
@@ -67,7 +67,7 @@ export function TransactionItem({
           <div className="min-w-0">
             <p className="text-sm font-medium capitalize text-slate-900">{transaction.type}</p>
             <p className="text-xs text-slate-500">
-              {formatAddress(transaction.from)} → {formatAddress(transaction.to)}
+              {formatAddress(transaction.from)} &rarr; {formatAddress(transaction.to)}
             </p>
           </div>
         </div>
diff --git a/packages/ui-kit/src/components/address-display.tsx b/packages/ui-kit/src/components/address-display.tsx
index 562b6211..2a281379 100644
--- a/packages/ui-kit/src/components/address-display.tsx
+++ b/packages/ui-kit/src/components/address-display.tsx
@@ -35,7 +35,16 @@ export interface AddressDisplayProps extends React.HTMLAttributes<HTMLDivElement
  */
 const AddressDisplay = React.forwardRef<HTMLDivElement, AddressDisplayProps>(
   (
-    { address, copyable = true, truncate = 6, label, onCopy, copied: copiedProp, className, ...props },
+    {
+      address,
+      copyable = true,
+      truncate = 6,
+      label,
+      onCopy,
+      copied: copiedProp,
+      className,
+      ...props
+    },
     ref
   ) => {
     const [internalCopied, setInternalCopied] = React.useState(false);
diff --git a/packages/ui-kit/src/components/ui/button.test.tsx b/packages/ui-kit/src/components/ui/button.test.tsx
index f50df38a..dddba62a 100644
--- a/packages/ui-kit/src/components/ui/button.test.tsx
+++ b/packages/ui-kit/src/components/ui/button.test.tsx
@@ -1,6 +1,7 @@
 import { render, screen } from '@testing-library/react';
 import { describe, it, expect } from 'vitest';
 import { Button } from './button';
+import { expectNoA11yViolations } from '../../__tests__/test-utils/a11y';
 
 describe('Button', () => {
   it('renders with children text', () => {
@@ -40,6 +41,12 @@ describe('Button', () => {
     expect(screen.getByText('Large')).toHaveClass('h-11');
   });
 
+  it('has no axe violations in the default state', async () => {
+    const { container } = render(<Button>Accessible action</Button>);
+
+    await expectNoA11yViolations(container);
+  });
+
   it('renders loading spinner and sets aria-busy', () => {
     render(<Button loading>Submit</Button>);
     const button = screen.getByRole('button', { name: /submit/i });
diff --git a/packages/ui-kit/src/components/ui/input.test.tsx b/packages/ui-kit/src/components/ui/input.test.tsx
index 9322581c..c2a9d2a2 100644
--- a/packages/ui-kit/src/components/ui/input.test.tsx
+++ b/packages/ui-kit/src/components/ui/input.test.tsx
@@ -2,6 +2,7 @@ import { render, screen } from '@testing-library/react';
 import { describe, it, expect } from 'vitest';
 import userEvent from '@testing-library/user-event';
 import { Input } from './input';
+import { expectNoA11yViolations } from '../../__tests__/test-utils/a11y';
 
 describe('Input', () => {
   it('renders with placeholder', () => {
@@ -36,4 +37,15 @@ describe('Input', () => {
     rerender(<Input type="password" placeholder="Password" />);
     expect(screen.getByPlaceholderText('Password')).toHaveAttribute('type', 'password');
   });
+
+  it('has no axe violations when labelled', async () => {
+    const { container } = render(
+      <label>
+        Email
+        <Input type="email" />
+      </label>
+    );
+
+    await expectNoA11yViolations(container);
+  });
 });
diff --git a/packages/ui-kit/src/index.ts b/packages/ui-kit/src/index.ts
index 80b22543..b383906c 100644
--- a/packages/ui-kit/src/index.ts
+++ b/packages/ui-kit/src/index.ts
@@ -55,6 +55,9 @@ export type { MerchantBadgeProps, MerchantBadgeStatus } from './components/Merch
 export { Form, FormSubmit, FormError } from './components/Form/Form';
 export type { FormProps, FormSubmitProps, FormErrorProps } from './components/Form/Form';
 
+export { Field } from './components/Form/Field';
+export type { FieldProps } from './components/Form/Field';
+
 export { AddressInput, AddressInputBase } from './components/Form/AddressInput';
 export type { AddressInputProps, AddressInputBaseProps } from './components/Form/AddressInput';
 
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index e4eddc0e..3835a3c9 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -650,6 +650,9 @@ importers:
       autoprefixer:
         specifier: ^10.4.0
         version: 10.5.0(postcss@8.5.15)
+      axe-core:
+        specifier: ^4.11.4
+        version: 4.11.4
       eslint:
         specifier: ^9.0.0
         version: 9.39.4(jiti@1.21.7)
@@ -3375,6 +3378,10 @@ packages:
     resolution: {integrity: sha512-wvUjBtSGN7+7SjNpq/9M2Tg350UZD3q62IFZLbRAR1bSMlCo1ZaeW+BJ+D090e4hIIZLBcTDWe4Mh4jvUDajzQ==}
     engines: {node: '>= 0.4'}
 
+  axe-core@4.11.4:
+    resolution: {integrity: sha512-KunSNx+TVpkAw/6ULfhnx+HWRecjqZGTOyquAoWHYLRSdK1tB5Ihce1ZW+UY3fj33bYAFWPu7W/GRSmmrCGuxA==}
+    engines: {node: '>=4'}
+
   axios@1.16.1:
     resolution: {integrity: sha512-caYkukvroVPO8KrzuJEb50Hm07KwfBZPEC3VeFHTsqWHvKTsy54hjJz9BS/cdaypROE2rH6xvm9mHX4fgWkr3A==}
 
@@ -10439,6 +10446,8 @@ snapshots:
     dependencies:
       possible-typed-array-names: 1.1.0
 
+  axe-core@4.11.4: {}
+
   axios@1.16.1:
     dependencies:
       follow-redirects: 1.16.0
diff --git a/scripts/check-wasm-size.js b/scripts/check-wasm-size.js
index 6ccfbc39..dbeba752 100644
--- a/scripts/check-wasm-size.js
+++ b/scripts/check-wasm-size.js
@@ -25,7 +25,7 @@ async function main() {
     const size = fs.statSync(wasmArg).size;
     const name = path.basename(wasmArg);
     report[name] = { actual: size, budget: budgetArg, delta: size - budgetArg };
-    
+
     if (size > budgetArg) {
       console.error(`❌ ${name} exceeded budget! (${size} > ${budgetArg})`);
       hasError = true;
@@ -38,23 +38,23 @@ async function main() {
       console.error(`Budget file not found at ${BUDGET_FILE}`);
       process.exit(1);
     }
-    
+
     const budgets = JSON.parse(fs.readFileSync(BUDGET_FILE, 'utf8'));
     for (const [contractName, budget] of Object.entries(budgets)) {
       // Find the wasm file
       // assuming target dir is contracts/target/wasm32-unknown-unknown/release
       const targetDir = path.join(__dirname, '../contracts/target/wasm32-unknown-unknown/release');
-      
+
       let wasmPath = path.join(targetDir, `${contractName}.optimized.wasm`);
       if (!fs.existsSync(wasmPath)) {
         wasmPath = path.join(targetDir, `${contractName}.wasm`);
       }
-      
+
       if (!fs.existsSync(wasmPath)) {
         console.warn(`⚠️ Wasm file for ${contractName} not found at ${wasmPath}`);
         continue;
       }
-      
+
       const size = fs.statSync(wasmPath).size;
       report[contractName] = { actual: size, budget, delta: size - budget };
       if (size > budget) {
@@ -72,17 +72,18 @@ async function main() {
   console.log(`\nReport written to ${reportPath}`);
 
   // Also write a markdown summary for GitHub step summary
-  let md = '## WASM Size Report\n\n| Contract | Actual Size | Budget | Status |\n|---|---|---|---|\n';
+  let md =
+    '## WASM Size Report\n\n| Contract | Actual Size | Budget | Status |\n|---|---|---|---|\n';
   for (const [name, stats] of Object.entries(report)) {
     const status = stats.actual <= stats.budget ? '✅ Pass' : '❌ Fail';
     md += `| ${name} | ${stats.actual} bytes | ${stats.budget} bytes | ${status} |\n`;
   }
-  
+
   const summaryPath = process.env.GITHUB_STEP_SUMMARY;
   if (summaryPath) {
     fs.appendFileSync(summaryPath, md + '\n');
   }
-  
+
   const mdReportPath = path.join(__dirname, '../wasm-size-report.md');
   fs.writeFileSync(mdReportPath, md);
 
@@ -91,7 +92,7 @@ async function main() {
   }
 }
 
-main().catch(err => {
+main().catch((err) => {
   console.error(err);
   process.exit(1);
 });
diff --git a/scripts/generate-openapi-types.ts b/scripts/generate-openapi-types.ts
index 7f316e71..8d44dbfa 100644
--- a/scripts/generate-openapi-types.ts
+++ b/scripts/generate-openapi-types.ts
@@ -2,19 +2,19 @@
 
 /**
  * Generate TypeScript types from OpenAPI specification
- * 
+ *
  * This script generates TypeScript types from the OpenAPI spec for the relayer service.
  * The generated types can be used by external integrators (e.g., wallet teams) to ensure
  * type safety when calling the relayer API.
- * 
+ *
  * Usage:
  *   npm run generate:openapi-types
  *   yarn generate:openapi-types
  *   pnpm generate:openapi-types
- * 
+ *
  * Requirements:
  *   - openapi-typescript: npm package for generating TypeScript types from OpenAPI specs
- * 
+ *
  * Install dependencies if needed:
  *   npm install -D openapi-typescript
  */
@@ -38,9 +38,9 @@ async function generateTypes() {
   try {
     // Dynamic import to avoid requiring openapi-typescript at build time if not present
     const { default: openapiTS } = await import('openapi-typescript');
-    
+
     console.log(`Generating TypeScript types from ${OPENAPI_SPEC_PATH}...`);
-    
+
     const schema = await openapiTS(OPENAPI_SPEC_PATH, {
       // Use the version from the OpenAPI spec
       version: '3.1',
@@ -49,18 +49,17 @@ async function generateTypes() {
       // Add a comment at the top of the generated file
       commentHeader: `/**
  * Auto-generated TypeScript types from OpenAPI specification
- * 
+ *
  * This file is automatically generated from services/relayer/openapi.yaml
  * Regenerate by running: npm run generate:openapi-types
- * 
+ *
  * DO NOT EDIT THIS FILE MANUALLY - your changes will be overwritten
  */
 `,
     });
-    
+
     writeFileSync(OUTPUT_PATH, schema);
     console.log(`✓ Successfully generated types to ${OUTPUT_PATH}`);
-    
   } catch (error) {
     if ((error as any).code === 'MODULE_NOT_FOUND') {
       console.error('Error: openapi-typescript is not installed.');
@@ -73,7 +72,7 @@ async function generateTypes() {
 }
 
 // Run the generator
-generateTypes().catch(error => {
+generateTypes().catch((error) => {
   console.error('Fatal error:', error);
   process.exit(1);
 });
diff --git a/services/ai-agent/src/server.test.ts b/services/ai-agent/src/server.test.ts
index f023edfc..bc2272f1 100644
--- a/services/ai-agent/src/server.test.ts
+++ b/services/ai-agent/src/server.test.ts
@@ -1,64 +1,71 @@
 import request from 'supertest';
-import { createApp } from './server';
 import { enforceNoAutonomousExecution } from './guardrail';
+import { createApp } from './server';
 import type { DraftIntentResponse } from './types';
 
 const app = createApp();
 
-// ── /health ───────────────────────────────────────────────────────────────────
-
 describe('GET /health', () => {
-  it('returns 200 with status ok', async () => {
+  it('returns the service health payload', async () => {
     const res = await request(app).get('/health');
+
     expect(res.status).toBe(200);
-    expect(res.body).toMatchObject({ status: 'ok', service: 'ai-agent' });
+    expect(res.body).toMatchObject({
+      status: 'ok',
+      service: 'ai-agent',
+      version: '0.1.0',
+    });
+    expect(typeof res.body.uptime).toBe('number');
+    expect(Date.parse(res.body.timestamp)).not.toBeNaN();
   });
 });
 
-// ── /agent/draft-intent ───────────────────────────────────────────────────────
+describe('POST /v1/intents/validate', () => {
+  it('accepts a valid payment intent', async () => {
+    const intent = {
+      type: 'payment',
+      destination: 'GABC123',
+      amount: '10.5',
+      asset: 'XLM',
+    };
 
-describe('POST /agent/draft-intent', () => {
-  const validBody = { prompt: 'Send 10 XLM to Alice', accountId: 'GABC123' };
+    const res = await request(app).post('/v1/intents/validate').send(intent);
 
-  it('returns 200 with a draft payment intent', async () => {
-    const res = await request(app).post('/agent/draft-intent').send(validBody);
     expect(res.status).toBe(200);
-    expect(res.body.status).toBe('draft');
-    expect(res.body.requiresConfirmation).toBe(true);
-    expect(res.body.intent.type).toBe('payment');
-    expect(res.body.summary).toBeDefined();
+    expect(res.body).toEqual({ valid: true, intent });
   });
 
-  it('returns 200 with a draft invoice intent when prompt contains "invoice"', async () => {
+  it('rejects requests with missing payment fields', async () => {
     const res = await request(app)
-      .post('/agent/draft-intent')
-      .send({ prompt: 'Create an invoice for 50 XLM', accountId: 'GABC123' });
-    expect(res.status).toBe(200);
-    expect(res.body.status).toBe('draft');
-    expect(res.body.requiresConfirmation).toBe(true);
-    expect(res.body.intent.type).toBe('invoice');
-  });
+      .post('/v1/intents/validate')
+      .send({ type: 'payment', destination: 'GABC123', asset: 'XLM' });
 
-  it('returns 400 when prompt is missing', async () => {
-    const res = await request(app).post('/agent/draft-intent').send({ accountId: 'GABC123' });
     expect(res.status).toBe(400);
-    expect(res.body.error).toBe('Invalid request');
+    expect(res.body.errors.fieldErrors).toHaveProperty('amount');
   });
 
-  it('returns 400 when accountId is missing', async () => {
-    const res = await request(app).post('/agent/draft-intent').send({ prompt: 'Send 10 XLM' });
+  it('rejects unsupported intent types', async () => {
+    const res = await request(app).post('/v1/intents/validate').send({
+      type: 'invoice',
+      destination: 'GABC123',
+      amount: '10',
+      asset: 'XLM',
+    });
+
     expect(res.status).toBe(400);
-    expect(res.body.error).toBe('Invalid request');
+    expect(res.body.errors.fieldErrors.type).toEqual(
+      expect.arrayContaining([expect.stringContaining('Invalid discriminator value')])
+    );
   });
 
-  it('returns 400 when body is empty', async () => {
-    const res = await request(app).post('/agent/draft-intent').send({});
+  it('rejects empty request bodies', async () => {
+    const res = await request(app).post('/v1/intents/validate').send({});
+
     expect(res.status).toBe(400);
+    expect(res.body.errors).toBeDefined();
   });
 });
 
-// ── guardrail ─────────────────────────────────────────────────────────────────
-
 describe('enforceNoAutonomousExecution', () => {
   const validDraft: DraftIntentResponse = {
     status: 'draft',
diff --git a/services/relayer/README.md b/services/relayer/README.md
index 3b118de6..2869ec61 100644
--- a/services/relayer/README.md
+++ b/services/relayer/README.md
@@ -33,6 +33,7 @@ The service publishes an OpenAPI 3.1 specification that documents all endpoints,
 **Specification file:** `services/relayer/openapi.yaml`
 
 **View the spec:**
+
 ```bash
 # View raw specification
 cat services/relayer/openapi.yaml
@@ -46,6 +47,7 @@ npx @redocly/cli preview-docs services/relayer/openapi.yaml
 The OpenAPI specification can be used to generate TypeScript types for use in external integrations (e.g., wallet teams). This ensures type safety when calling the relayer API.
 
 **Regenerate types:**
+
 ```bash
 # From repository root
 pnpm install -D openapi-typescript
@@ -58,23 +60,27 @@ npx ts-node scripts/generate-openapi-types.ts
 **Generated file:** `services/relayer/src/api/openapi-types.ts`
 
 The generated types include:
+
 - Request schemas (`RelayExecuteRequest`, `RelayValidateRequest`)
 - Response schemas (`RelayExecuteResponse`, `ValidationResult`, `HealthResponse`)
 - Error schemas (`RelayError`, `ValidationErrorResponse`)
 
 **Usage in external projects:**
+
 ```typescript
 import type {
   RelayExecuteRequest,
   RelayExecuteResponse,
-  ValidationErrorResponse
+  ValidationErrorResponse,
 } from '@ancore/relayer/src/api/openapi-types';
 
 // Type-safe request construction
 const request: RelayExecuteRequest = {
   sessionKey: 'a'.repeat(64),
   operation: 'relay_execute',
-  parameters: { /* ... */ },
+  parameters: {
+    /* ... */
+  },
   signature: 'b'.repeat(128),
   nonce: 1,
 };
@@ -85,11 +91,13 @@ const request: RelayExecuteRequest = {
 The service includes contract tests that verify the actual API implementation matches the OpenAPI specification. These tests boot the real Express app and assert that routes, status codes, and response schemas align with the documented specification.
 
 **Run contract tests:**
+
 ```bash
 pnpm --filter @ancore/relayer test -- tests/contract
 ```
 
 If contract tests fail, it indicates either:
+
 1. The implementation has changed and the spec needs updating
 2. The spec has changed and the implementation needs updating
 
@@ -317,6 +325,7 @@ Dependent services should:
 ## Example cURL Commands
 
 **Execute a relay transaction:**
+
 ```bash
 curl -X POST http://localhost:3000/relay/execute \
   -H "Authorization: Bearer YOUR_TOKEN" \
@@ -337,6 +346,7 @@ curl -X POST http://localhost:3000/relay/execute \
 ```
 
 **Validate a relay transaction:**
+
 ```bash
 curl -X POST http://localhost:3000/relay/validate \
   -H "Authorization: Bearer YOUR_TOKEN" \
diff --git a/services/relayer/src/handlers/executeRelay.ts b/services/relayer/src/handlers/executeRelay.ts
index 82bffa97..3a835feb 100644
--- a/services/relayer/src/handlers/executeRelay.ts
+++ b/services/relayer/src/handlers/executeRelay.ts
@@ -1,7 +1,16 @@
 import { Request, Response } from 'express';
 import type { RelayServiceContract } from '../types';
 import type { RelayExecuteRequest } from '../types';
-import { redactSessionKey } from '../logging';
+import { redactSessionKey, type Logger } from '../logging';
+import type { LoggedRequest } from '../middleware/requestLogger';
+
+const noopLogger: Logger = {
+  debug: () => undefined,
+  info: () => undefined,
+  warn: () => undefined,
+  error: () => undefined,
+  child: () => noopLogger,
+};
 
 /**
  * Factory that returns the POST /relay/execute handler bound to a service instance.
@@ -11,15 +20,17 @@ import { redactSessionKey } from '../logging';
  */
 export function createExecuteRelayHandler(relayService: RelayServiceContract) {
   return async (req: Request, res: Response): Promise<void> => {
+    const loggedReq = req as Partial<LoggedRequest>;
     const request = req.body as RelayExecuteRequest;
 
-    const log = req.log?.child({
-      route: 'POST /relay/execute',
-      sessionKey: redactSessionKey(request.sessionKey),
-      operation: request.operation,
-    }) ?? { info: () => {}, warn: () => {}, error: () => {}, debug: () => {}, child: () => ({} as any) };
+    const log =
+      loggedReq.log?.child({
+        route: 'POST /relay/execute',
+        sessionKey: redactSessionKey(request.sessionKey),
+        operation: request.operation,
+      }) ?? noopLogger;
 
-    const start = req.startTime ?? Date.now();
+    const start = loggedReq.startTime ?? Date.now();
 
     const response = await relayService.executeRelay(request);
     const durationMs = Date.now() - start;
diff --git a/services/relayer/src/handlers/validateRelay.ts b/services/relayer/src/handlers/validateRelay.ts
index 15f98e58..22752b99 100644
--- a/services/relayer/src/handlers/validateRelay.ts
+++ b/services/relayer/src/handlers/validateRelay.ts
@@ -1,7 +1,16 @@
 import { Request, Response } from 'express';
 import type { RelayServiceContract } from '../types';
 import type { RelayValidateRequest } from '../types';
-import { redactSessionKey } from '../logging';
+import { redactSessionKey, type Logger } from '../logging';
+import type { LoggedRequest } from '../middleware/requestLogger';
+
+const noopLogger: Logger = {
+  debug: () => undefined,
+  info: () => undefined,
+  warn: () => undefined,
+  error: () => undefined,
+  child: () => noopLogger,
+};
 
 /**
  * Factory that returns the POST /relay/validate handler bound to a service instance.
@@ -11,15 +20,17 @@ import { redactSessionKey } from '../logging';
  */
 export function createValidateRelayHandler(relayService: RelayServiceContract) {
   return async (req: Request, res: Response): Promise<void> => {
+    const loggedReq = req as Partial<LoggedRequest>;
     const request = req.body as RelayValidateRequest;
 
-    const log = req.log?.child({
-      route: 'POST /relay/validate',
-      sessionKey: redactSessionKey(request.sessionKey),
-      operation: request.operation,
-    }) ?? { info: () => {}, warn: () => {}, error: () => {}, debug: () => {}, child: () => ({} as any) };
+    const log =
+      loggedReq.log?.child({
+        route: 'POST /relay/validate',
+        sessionKey: redactSessionKey(request.sessionKey),
+        operation: request.operation,
+      }) ?? noopLogger;
 
-    const start = req.startTime ?? Date.now();
+    const start = loggedReq.startTime ?? Date.now();
 
     const result = await relayService.validateRelay(request);
     const durationMs = Date.now() - start;
diff --git a/services/relayer/src/logging/__tests__/logger.test.ts b/services/relayer/src/logging/__tests__/logger.test.ts
index 3bbb9290..1fd875a0 100644
--- a/services/relayer/src/logging/__tests__/logger.test.ts
+++ b/services/relayer/src/logging/__tests__/logger.test.ts
@@ -5,12 +5,7 @@
  * Issue #474
  */
 
-import {
-  rootLogger,
-  createRequestLogger,
-  redactAccountId,
-  redactSessionKey,
-} from '../logger';
+import { rootLogger, createRequestLogger, redactAccountId, redactSessionKey } from '../logger';
 
 // ---------------------------------------------------------------------------
 // Helpers
@@ -39,7 +34,7 @@ describe('redactAccountId', () => {
   });
 
   it('truncates to first 8 chars + ellipsis for longer values', () => {
-    expect(redactAccountId('GBXXX123YYYY')).toBe('GBXXX123…');
+    expect(redactAccountId('GBXXX123YYYY')).toBe('GBXXX123\u2026');
   });
 });
 
@@ -59,7 +54,7 @@ describe('redactSessionKey', () => {
 
   it('truncates to first 8 chars + ellipsis for longer values', () => {
     const key = 'a'.repeat(64);
-    expect(redactSessionKey(key)).toBe('aaaaaaaa…');
+    expect(redactSessionKey(key)).toBe('aaaaaaaa\u2026');
   });
 });
 
@@ -199,7 +194,7 @@ describe('createRequestLogger', () => {
       log.info({}, 'test');
     }) as Record<string, unknown>;
 
-    expect(entry['accountId']).toBe('GBXXX123…');
+    expect(entry['accountId']).toBe('GBXXX123\u2026');
   });
 
   it('redacts sessionKey to first 8 chars', () => {
@@ -212,7 +207,7 @@ describe('createRequestLogger', () => {
       log.info({}, 'test');
     }) as Record<string, unknown>;
 
-    expect(entry['sessionKey']).toBe('abcdef12…');
+    expect(entry['sessionKey']).toBe('abcdef12\u2026');
   });
 
   it('omits accountId when not provided', () => {
diff --git a/services/relayer/src/logging/index.ts b/services/relayer/src/logging/index.ts
index 77f1e069..ac72a4fa 100644
--- a/services/relayer/src/logging/index.ts
+++ b/services/relayer/src/logging/index.ts
@@ -1,4 +1,5 @@
 export {
+  rootLogger as logger,
   rootLogger,
   createRequestLogger,
   redactAccountId,
diff --git a/services/relayer/src/logging/logger.ts b/services/relayer/src/logging/logger.ts
index 58d56118..4733655c 100644
--- a/services/relayer/src/logging/logger.ts
+++ b/services/relayer/src/logging/logger.ts
@@ -11,10 +11,10 @@
  *  service     — always "relayer"
  *  requestId   — UUID propagated from X-Request-Id header (#572)
  *  route       — "METHOD /path" string
- *  accountId   — caller identity, redacted to first 8 chars + "…"
+ *  accountId   — caller identity, redacted to first 8 chars + "\u2026"
  *  durationMs  — elapsed time from request start to log emission
  *  outcome     — "success" | "error" | "validation_failed"
- *  sessionKey  — first 8 chars of the hex session key + "…" (never full)
+ *  sessionKey  — first 8 chars of the hex session key + "\u2026" (never full)
  *  operation   — relay operation type
  *  statusCode  — HTTP response status
  *
@@ -69,6 +69,7 @@ const SENSITIVE_KEYS = new Set([
   'signedXdr',
   'signed_xdr',
 ]);
+const TRUNCATION_MARKER = '\u2026';
 
 /**
  * Redacts known sensitive keys from a log fields object.
@@ -87,23 +88,23 @@ function redactFields(fields: LogFields): LogFields {
 }
 
 /**
- * Redacts an accountId to the first 8 characters followed by "…".
+ * Redacts an accountId to the first 8 characters followed by "\u2026".
  * Returns undefined if the input is falsy.
  */
 export function redactAccountId(accountId: string | undefined): string | undefined {
   if (!accountId) return undefined;
   if (accountId.length <= 8) return accountId;
-  return `${accountId.slice(0, 8)}…`;
+  return `${accountId.slice(0, 8)}${TRUNCATION_MARKER}`;
 }
 
 /**
- * Redacts a session key to the first 8 hex chars followed by "…".
+ * Redacts a session key to the first 8 hex chars followed by "\u2026".
  * Returns undefined if the input is falsy.
  */
 export function redactSessionKey(sessionKey: string | undefined): string | undefined {
   if (!sessionKey) return undefined;
   if (sessionKey.length <= 8) return sessionKey;
-  return `${sessionKey.slice(0, 8)}…`;
+  return `${sessionKey.slice(0, 8)}${TRUNCATION_MARKER}`;
 }
 
 // ---------------------------------------------------------------------------
diff --git a/services/relayer/src/middleware/__tests__/requestLogger.test.ts b/services/relayer/src/middleware/__tests__/requestLogger.test.ts
index 1139a06b..77cad9d1 100644
--- a/services/relayer/src/middleware/__tests__/requestLogger.test.ts
+++ b/services/relayer/src/middleware/__tests__/requestLogger.test.ts
@@ -6,7 +6,7 @@
  */
 
 import { Request, Response, NextFunction } from 'express';
-import { createRequestLoggerMiddleware } from '../requestLogger';
+import { createRequestLoggerMiddleware, type LoggedRequest } from '../requestLogger';
 
 // ---------------------------------------------------------------------------
 // Helpers
@@ -80,9 +80,10 @@ describe('createRequestLoggerMiddleware', () => {
 
     middleware(req, res as unknown as Response, next);
 
-    expect(req.log).toBeDefined();
-    expect(typeof req.log.info).toBe('function');
-    expect(typeof req.log.child).toBe('function');
+    const loggedReq = req as LoggedRequest;
+    expect(loggedReq.log).toBeDefined();
+    expect(typeof loggedReq.log.info).toBe('function');
+    expect(typeof loggedReq.log.child).toBe('function');
   });
 
   it('emits request_start log on entry', () => {
diff --git a/services/relayer/src/middleware/requestLogger.ts b/services/relayer/src/middleware/requestLogger.ts
index baf94646..6a662bae 100644
--- a/services/relayer/src/middleware/requestLogger.ts
+++ b/services/relayer/src/middleware/requestLogger.ts
@@ -20,16 +20,11 @@
 import { Request, Response, NextFunction, RequestHandler } from 'express';
 import { createRequestLogger, redactAccountId, type Logger } from '../logging';
 
-// Augment Express Request to carry a typed logger
-declare global {
-  namespace Express {
-    interface Request {
-      log: Logger;
-      /** ISO timestamp when the request was received */
-      startTime: number;
-    }
-  }
-}
+export type LoggedRequest = Request & {
+  log: Logger;
+  /** Epoch milliseconds when the request was received */
+  startTime: number;
+};
 
 /**
  * Creates the request logger middleware.
@@ -42,35 +37,31 @@ declare global {
  */
 export function createRequestLoggerMiddleware(): RequestHandler {
   return (req: Request, res: Response, next: NextFunction): void => {
-    const requestId =
-      (req.headers['x-request-id'] as string | undefined) ??
-      generateRequestId();
+    const loggedReq = req as LoggedRequest;
+    const requestId = (req.headers['x-request-id'] as string | undefined) ?? generateRequestId();
 
-    req.startTime = Date.now();
+    loggedReq.startTime = Date.now();
 
     const route = `${req.method} ${req.path}`;
 
     // Attach logger — accountId not yet available (set by auth middleware later)
-    req.log = createRequestLogger({ requestId, route });
+    loggedReq.log = createRequestLogger({ requestId, route });
 
-    req.log.info({ requestId }, 'request_start');
+    loggedReq.log.info({ requestId }, 'request_start');
 
     // Emit completion log when the response finishes
     res.on('finish', () => {
-      const durationMs = Date.now() - req.startTime;
+      const durationMs = Date.now() - loggedReq.startTime;
       const statusCode = res.statusCode;
       const outcome = statusCode < 400 ? 'success' : 'error';
 
       // Re-create logger with callerId if auth middleware populated it
       const callerId = res.locals['callerId'] as string | undefined;
       const completionLog = callerId
-        ? req.log.child({ accountId: redactAccountId(callerId) })
-        : req.log;
+        ? loggedReq.log.child({ accountId: redactAccountId(callerId) })
+        : loggedReq.log;
 
-      completionLog.info(
-        { durationMs, statusCode, outcome },
-        'request_complete'
-      );
+      completionLog.info({ durationMs, statusCode, outcome }, 'request_complete');
     });
 
     next();
diff --git a/services/relayer/tests/contract/openapi-contract.test.ts b/services/relayer/tests/contract/openapi-contract.test.ts
index b4979c90..34dc1cbb 100644
--- a/services/relayer/tests/contract/openapi-contract.test.ts
+++ b/services/relayer/tests/contract/openapi-contract.test.ts
@@ -1,10 +1,10 @@
 /**
  * Contract tests for OpenAPI specification
- * 
+ *
  * These tests verify that the actual API implementation matches the OpenAPI spec.
  * They boot the real Express app and assert that routes, status codes, and response
  * schemas align with the documented specification.
- * 
+ *
  * If any test fails, it indicates either:
  * 1. The implementation has changed and the spec needs updating
  * 2. The spec has changed and the implementation needs updating
@@ -96,9 +96,7 @@ describe('OpenAPI Contract Tests', () => {
       });
 
       it('returns 401 on missing authorization', async () => {
-        const res = await request(makeApp())
-          .post('/relay/execute')
-          .send(validBody);
+        const res = await request(makeApp()).post('/relay/execute').send(validBody);
 
         expect(res.status).toBe(401);
       });
@@ -133,9 +131,7 @@ describe('OpenAPI Contract Tests', () => {
       });
 
       it('returns 401 on missing authorization', async () => {
-        const res = await request(makeApp())
-          .post('/relay/validate')
-          .send(validBody);
+        const res = await request(makeApp()).post('/relay/validate').send(validBody);
 
         expect(res.status).toBe(401);
       });
@@ -272,9 +268,7 @@ describe('OpenAPI Contract Tests', () => {
     });
 
     it('requires Authorization header for protected routes', async () => {
-      const res = await request(makeApp())
-        .post('/relay/execute')
-        .send(validBody);
+      const res = await request(makeApp()).post('/relay/execute').send(validBody);
 
       expect(res.status).toBe(401);
     });
diff --git a/services/relayer/tests/unit/stellarSubmitter.test.ts b/services/relayer/tests/unit/stellarSubmitter.test.ts
index c179f476..a999fa9b 100644
--- a/services/relayer/tests/unit/stellarSubmitter.test.ts
+++ b/services/relayer/tests/unit/stellarSubmitter.test.ts
@@ -7,7 +7,10 @@ import {
   Account,
 } from '@stellar/stellar-sdk';
 import { StellarClient, NetworkError } from '@ancore/stellar';
-import { StellarTransactionSubmitter } from '../../src/services/stellarSubmitter';
+import {
+  StellarTransactionSubmitter,
+  resolveStellarNetwork,
+} from '../../src/services/stellarSubmitter';
 
 jest.mock('@ancore/stellar', () => {
   const actual = jest.requireActual('@ancore/stellar');
@@ -87,4 +90,26 @@ describe('StellarTransactionSubmitter', () => {
     expect(result.healthy).toBe(true);
     expect(typeof result.latencyMs).toBe('number');
   });
+
+  it('uses the Futurenet passphrase when constructing the Stellar client', () => {
+    MockStellarClient.mockImplementation(
+      () =>
+        ({
+          submitTransaction: jest.fn(),
+          isHealthy: jest.fn(),
+        }) as unknown as StellarClient
+    );
+
+    new StellarTransactionSubmitter({ network: 'futurenet' });
+
+    expect(MockStellarClient).toHaveBeenCalledWith({
+      network: 'futurenet',
+      networkPassphrase: 'Test SDF Future Network ; October 2022',
+    });
+  });
+
+  it('resolves futurenet from environment input', () => {
+    expect(resolveStellarNetwork('futurenet')).toBe('futurenet');
+    expect(resolveStellarNetwork('unknown')).toBe('testnet');
+  });
 });