From 9f0f5988a5486cac9be1bc03464f10c7c949a300 Mon Sep 17 00:00:00 2001
From: Peng Ying <peng@lightspark.com>
Date: Fri, 27 Mar 2026 15:01:27 -0700
Subject: [PATCH 1/4] feat: multi-currency support, E2E tests for Kotlin sample
 app

- Fix SDK type mismatches (Config field names, QuoteSourceOneOf, AccountType enums)
- Add multi-currency external account support (MXN, BRL, INR, GBP, PHP, EUR)
- Add country selector dropdown and source currency dropdown (USD/USDC)
- Add "Start New Payment" button to restart from external account step
- Extract shared optText/requireText to JsonUtils, deduplicate across route files
- Extract BeneficiaryFields to reduce copy-paste across beneficiary builders
- Add Ktor server E2E tests (7 tests hitting Grid sandbox API)
- Add Playwright browser E2E tests (8 tests driving the full React UI)

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
---
 samples/frontend/e2e/payout-flow.spec.ts      | 153 ++++++++
 samples/frontend/package-lock.json            |  64 ++++
 samples/frontend/package.json                 |   5 +-
 samples/frontend/playwright.config.ts         |  15 +
 samples/frontend/src/App.tsx                  |  20 +-
 .../src/steps/CreateExternalAccount.tsx       | 214 +++++++++--
 samples/frontend/src/steps/CreateQuote.tsx    |  29 +-
 samples/kotlin/build.gradle.kts               |   6 +
 .../com/grid/sample/GridClientBuilder.kt      |   4 +-
 .../main/kotlin/com/grid/sample/JsonUtils.kt  |   7 +
 .../com/grid/sample/routes/Customers.kt       |   9 +-
 .../grid/sample/routes/ExternalAccounts.kt    | 269 ++++++++------
 .../kotlin/com/grid/sample/routes/Quotes.kt   |  16 +-
 .../kotlin/com/grid/sample/routes/Sandbox.kt  |   4 +-
 .../kotlin/com/grid/sample/routes/Webhooks.kt |   2 +-
 .../kotlin/com/grid/sample/EndToEndTest.kt    | 343 ++++++++++++++++++
 16 files changed, 990 insertions(+), 170 deletions(-)
 create mode 100644 samples/frontend/e2e/payout-flow.spec.ts
 create mode 100644 samples/frontend/playwright.config.ts
 create mode 100644 samples/kotlin/src/test/kotlin/com/grid/sample/EndToEndTest.kt

diff --git a/samples/frontend/e2e/payout-flow.spec.ts b/samples/frontend/e2e/payout-flow.spec.ts
new file mode 100644
index 00000000..94534933
--- /dev/null
+++ b/samples/frontend/e2e/payout-flow.spec.ts
@@ -0,0 +1,153 @@
+import { test, expect } from '@playwright/test'
+
+// These tests drive the full React UI against the running Kotlin backend + Grid sandbox API.
+// Prerequisites: `cd samples/kotlin && ./gradlew run` must be running on port 8080.
+
+test.describe('Payout Flow', () => {
+
+  test.beforeEach(async ({ page }) => {
+    await page.goto('/')
+    await expect(page.locator('h1')).toHaveText('Grid API Sample')
+  })
+
+  test('page loads with step 1 active', async ({ page }) => {
+    const step1 = page.locator('h3', { hasText: '1. Create Customer' })
+    await expect(step1).toBeVisible()
+
+    // Create Customer button should be enabled
+    await expect(page.getByRole('button', { name: 'Create Customer' })).toBeEnabled()
+  })
+
+  test('create customer advances to step 2', async ({ page }) => {
+    await page.getByRole('button', { name: 'Create Customer' }).click()
+
+    // Wait for step 2 to become active
+    await expect(page.getByRole('button', { name: 'Create External Account' })).toBeEnabled({ timeout: 15_000 })
+
+    // Step 1 should show a green checkmark summary with ID
+    const step1Summary = page.locator('span.text-green-400.font-mono')
+    await expect(step1Summary.first()).toContainText('ID:')
+
+    // Country dropdown should be visible
+    await expect(page.locator('#destination-country')).toBeVisible()
+  })
+
+  test('country dropdown changes the JSON body', async ({ page }) => {
+    await page.getByRole('button', { name: 'Create Customer' }).click()
+    await expect(page.getByRole('button', { name: 'Create External Account' })).toBeEnabled({ timeout: 15_000 })
+
+    // Default country (IN) should populate the textarea
+    const textarea = page.locator('textarea').nth(1)
+
+    // Switch to India
+    await page.locator('#destination-country').selectOption('IN')
+    await expect(textarea).toHaveValue(/INR_ACCOUNT/, { timeout: 3_000 })
+    await expect(textarea).toHaveValue(/vpa/)
+
+    // Switch to Brazil
+    await page.locator('#destination-country').selectOption('BR')
+    await expect(textarea).toHaveValue(/BRL_ACCOUNT/, { timeout: 3_000 })
+    await expect(textarea).toHaveValue(/pixKey/)
+  })
+
+  test('full flow: customer → external account → quote', async ({ page }) => {
+    // Step 1: Create Customer
+    await page.getByRole('button', { name: 'Create Customer' }).click()
+    await expect(page.getByRole('button', { name: 'Create External Account' })).toBeEnabled({ timeout: 15_000 })
+
+    // Step 2: Create External Account (default country)
+    await page.getByRole('button', { name: 'Create External Account' }).click()
+    await expect(page.getByRole('button', { name: 'Create Quote' })).toBeEnabled({ timeout: 15_000 })
+
+    // Step 2 summary should show ID
+    const summaries = page.locator('span.text-green-400.font-mono')
+    await expect(summaries.nth(1)).toContainText('ID:')
+
+    // Step 3: Source currency dropdown should be visible
+    await expect(page.locator('#source-currency')).toBeVisible()
+
+    // Verify quote JSON body has the right structure
+    const quoteTextarea = page.locator('textarea').last()
+    await expect(quoteTextarea).toHaveValue(/REALTIME_FUNDING/)
+    await expect(quoteTextarea).toHaveValue(/"currency": "USD"/)
+
+    // Create Quote
+    await page.getByRole('button', { name: 'Create Quote' }).click()
+    await expect(page.getByRole('button', { name: 'Send Sandbox Funds' })).toBeEnabled({ timeout: 15_000 })
+  })
+
+  test('full flow with India INR', async ({ page }) => {
+    // Step 1: Create Customer
+    await page.getByRole('button', { name: 'Create Customer' }).click()
+    await expect(page.getByRole('button', { name: 'Create External Account' })).toBeEnabled({ timeout: 15_000 })
+
+    // Step 2: Switch to India and create account
+    await page.locator('#destination-country').selectOption('IN')
+    await expect(page.locator('textarea').nth(1)).toHaveValue(/INR_ACCOUNT/, { timeout: 3_000 })
+    await page.getByRole('button', { name: 'Create External Account' }).click()
+    await expect(page.getByRole('button', { name: 'Create Quote' })).toBeEnabled({ timeout: 15_000 })
+
+    // Step 3: Create Quote
+    await page.getByRole('button', { name: 'Create Quote' }).click()
+    await expect(page.getByRole('button', { name: 'Send Sandbox Funds' })).toBeEnabled({ timeout: 15_000 })
+  })
+
+  test('source currency dropdown updates quote body', async ({ page }) => {
+    // Step 1 + 2: Get to quote step
+    await page.getByRole('button', { name: 'Create Customer' }).click()
+    await expect(page.getByRole('button', { name: 'Create External Account' })).toBeEnabled({ timeout: 15_000 })
+    await page.getByRole('button', { name: 'Create External Account' }).click()
+    await expect(page.getByRole('button', { name: 'Create Quote' })).toBeEnabled({ timeout: 15_000 })
+
+    // Default should be USD
+    const quoteTextarea = page.locator('textarea').last()
+    await expect(quoteTextarea).toHaveValue(/"currency": "USD"/)
+
+    // Switch to USDC
+    await page.locator('#source-currency').selectOption('USDC')
+    await expect(quoteTextarea).toHaveValue(/"currency": "USDC"/, { timeout: 3_000 })
+
+    // Description text should update
+    await expect(page.getByText('USDC →')).toBeVisible()
+  })
+
+  test('Start New Payment resets to step 2', async ({ page }) => {
+    // Step 1: Create Customer
+    await page.getByRole('button', { name: 'Create Customer' }).click()
+    await expect(page.getByRole('button', { name: 'Create External Account' })).toBeEnabled({ timeout: 15_000 })
+
+    // Step 2: Create External Account
+    await page.getByRole('button', { name: 'Create External Account' }).click()
+    await expect(page.getByRole('button', { name: 'Create Quote' })).toBeEnabled({ timeout: 15_000 })
+
+    // Click Start New Payment
+    await page.getByRole('button', { name: 'Start New Payment' }).click()
+
+    // Should be back at step 2 with external account button enabled
+    await expect(page.getByRole('button', { name: 'Create External Account' })).toBeEnabled()
+
+    // Step 3 should be future (dimmed), quote button should not be visible
+    await expect(page.getByRole('button', { name: 'Create Quote' })).not.toBeVisible()
+  })
+
+  test('full payout flow including sandbox funding', async ({ page }) => {
+    // Step 1: Create Customer
+    await page.getByRole('button', { name: 'Create Customer' }).click()
+    await expect(page.getByRole('button', { name: 'Create External Account' })).toBeEnabled({ timeout: 15_000 })
+
+    // Step 2: Create External Account (default country)
+    await page.getByRole('button', { name: 'Create External Account' }).click()
+    await expect(page.getByRole('button', { name: 'Create Quote' })).toBeEnabled({ timeout: 15_000 })
+
+    // Step 3: Create Quote
+    await page.getByRole('button', { name: 'Create Quote' }).click()
+    await expect(page.getByRole('button', { name: 'Send Sandbox Funds' })).toBeEnabled({ timeout: 15_000 })
+
+    // Step 4: Send Sandbox Funds
+    await page.getByRole('button', { name: 'Send Sandbox Funds' }).click()
+
+    // After funding, all 4 steps should be completed (4 green checkmarks)
+    const checkmarks = page.locator('text=✓')
+    await expect(checkmarks).toHaveCount(4, { timeout: 15_000 })
+  })
+})
diff --git a/samples/frontend/package-lock.json b/samples/frontend/package-lock.json
index c5895cd7..c89d0a4d 100644
--- a/samples/frontend/package-lock.json
+++ b/samples/frontend/package-lock.json
@@ -12,6 +12,7 @@
         "react-dom": "^18.3.1"
       },
       "devDependencies": {
+        "@playwright/test": "^1.58.2",
         "@tailwindcss/vite": "^4.1.10",
         "@types/react": "^18.3.12",
         "@types/react-dom": "^18.3.1",
@@ -795,6 +796,22 @@
         "@jridgewell/sourcemap-codec": "^1.4.14"
       }
     },
+    "node_modules/@playwright/test": {
+      "version": "1.58.2",
+      "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.58.2.tgz",
+      "integrity": "sha512-akea+6bHYBBfA9uQqSYmlJXn61cTa+jbO87xVLCWbTqbWadRVmhxlXATaOjOgcBaWU4ePo0wB41KMFv3o35IXA==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "playwright": "1.58.2"
+      },
+      "bin": {
+        "playwright": "cli.js"
+      },
+      "engines": {
+        "node": ">=18"
+      }
+    },
     "node_modules/@rolldown/pluginutils": {
       "version": "1.0.0-beta.27",
       "resolved": "https://registry.npmjs.org/@rolldown/pluginutils/-/pluginutils-1.0.0-beta.27.tgz",
@@ -2143,6 +2160,53 @@
         "url": "https://github.com/sponsors/jonschlinkert"
       }
     },
+    "node_modules/playwright": {
+      "version": "1.58.2",
+      "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.58.2.tgz",
+      "integrity": "sha512-vA30H8Nvkq/cPBnNw4Q8TWz1EJyqgpuinBcHET0YVJVFldr8JDNiU9LaWAE1KqSkRYazuaBhTpB5ZzShOezQ6A==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "playwright-core": "1.58.2"
+      },
+      "bin": {
+        "playwright": "cli.js"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "optionalDependencies": {
+        "fsevents": "2.3.2"
+      }
+    },
+    "node_modules/playwright-core": {
+      "version": "1.58.2",
+      "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.58.2.tgz",
+      "integrity": "sha512-yZkEtftgwS8CsfYo7nm0KE8jsvm6i/PTgVtB8DL726wNf6H2IMsDuxCpJj59KDaxCtSnrWan2AeDqM7JBaultg==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "bin": {
+        "playwright-core": "cli.js"
+      },
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/playwright/node_modules/fsevents": {
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
+      "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
+      "dev": true,
+      "hasInstallScript": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
+      }
+    },
     "node_modules/postcss": {
       "version": "8.5.6",
       "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.6.tgz",
diff --git a/samples/frontend/package.json b/samples/frontend/package.json
index d5348dc6..548475f0 100644
--- a/samples/frontend/package.json
+++ b/samples/frontend/package.json
@@ -6,13 +6,16 @@
   "scripts": {
     "dev": "vite",
     "build": "tsc -b && vite build",
-    "preview": "vite preview"
+    "preview": "vite preview",
+    "test:e2e": "playwright test",
+    "test:e2e:headed": "playwright test --headed"
   },
   "dependencies": {
     "react": "^18.3.1",
     "react-dom": "^18.3.1"
   },
   "devDependencies": {
+    "@playwright/test": "^1.58.2",
     "@tailwindcss/vite": "^4.1.10",
     "@types/react": "^18.3.12",
     "@types/react-dom": "^18.3.1",
diff --git a/samples/frontend/playwright.config.ts b/samples/frontend/playwright.config.ts
new file mode 100644
index 00000000..e7614a9b
--- /dev/null
+++ b/samples/frontend/playwright.config.ts
@@ -0,0 +1,15 @@
+import { defineConfig } from '@playwright/test'
+
+export default defineConfig({
+  testDir: './e2e',
+  timeout: 60_000,
+  expect: { timeout: 15_000 },
+  use: {
+    baseURL: 'http://localhost:8080',
+    trace: 'on-first-retry',
+  },
+  retries: 0,
+  projects: [
+    { name: 'chromium', use: { browserName: 'chromium' } },
+  ],
+})
diff --git a/samples/frontend/src/App.tsx b/samples/frontend/src/App.tsx
index db1d3836..aa3d707e 100644
--- a/samples/frontend/src/App.tsx
+++ b/samples/frontend/src/App.tsx
@@ -11,9 +11,16 @@ export default function App() {
   const [customerId, setCustomerId] = useState<string | null>(null)
   const [externalAccountId, setExternalAccountId] = useState<string | null>(null)
   const [quoteId, setQuoteId] = useState<string | null>(null)
+  const [selectedCountry, setSelectedCountry] = useState('MX')
 
   const advance = () => setActiveStep((s) => s + 1)
 
+  const restartFromExternalAccount = () => {
+    setExternalAccountId(null)
+    setQuoteId(null)
+    setActiveStep(1)
+  }
+
   const steps = [
     {
       title: '1. Create Customer',
@@ -35,6 +42,8 @@ export default function App() {
         <CreateExternalAccount
           customerId={customerId}
           disabled={activeStep !== 1}
+          selectedCountry={selectedCountry}
+          onCountryChange={setSelectedCountry}
           onComplete={(data) => {
             setExternalAccountId(data.id as string)
             advance()
@@ -49,6 +58,7 @@ export default function App() {
         <CreateQuote
           customerId={customerId}
           externalAccountId={externalAccountId}
+          selectedCountry={selectedCountry}
           disabled={activeStep !== 2}
           onComplete={(data) => {
             setQuoteId((data.quoteId ?? data.id) as string)
@@ -74,11 +84,19 @@ export default function App() {
     <div className="min-h-screen bg-gray-950 text-gray-100">
       <header className="border-b border-gray-800 px-6 py-4">
         <h1 className="text-xl font-bold">Grid API Sample</h1>
-        <p className="text-sm text-gray-400">Send a real time payment to a US bank account funded with USDC</p>
+        <p className="text-sm text-gray-400">Send a real time payment funded with USDC</p>
       </header>
       <div className="flex">
         <main className="w-3/5 p-6 border-r border-gray-800 min-h-[calc(100vh-73px)]">
           <StepWizard steps={steps} activeStep={activeStep} />
+          {activeStep >= 1 && (
+            <button
+              onClick={restartFromExternalAccount}
+              className="mt-6 px-4 py-2 bg-gray-700 hover:bg-gray-600 rounded text-sm font-medium text-gray-300"
+            >
+              Start New Payment
+            </button>
+          )}
         </main>
         <aside className="w-2/5 p-6 min-h-[calc(100vh-73px)]">
           <WebhookStream />
diff --git a/samples/frontend/src/steps/CreateExternalAccount.tsx b/samples/frontend/src/steps/CreateExternalAccount.tsx
index df9a99d9..2cf97481 100644
--- a/samples/frontend/src/steps/CreateExternalAccount.tsx
+++ b/samples/frontend/src/steps/CreateExternalAccount.tsx
@@ -7,42 +7,190 @@ interface Props {
   customerId: string | null
   onComplete: (response: Record<string, unknown>) => void
   disabled: boolean
+  selectedCountry: string
+  onCountryChange: (country: string) => void
 }
 
-export default function CreateExternalAccount({ customerId, onComplete, disabled }: Props) {
+const COUNTRY_CONFIGS: Record<string, {
+  label: string
+  currency: string
+  accountInfo: Record<string, unknown>
+  beneficiary: Record<string, unknown>
+  description: string
+}> = {
+  IN: {
+    label: "🇮🇳 India (INR)",
+    currency: "INR",
+    description: "INR account (UPI)",
+    accountInfo: {
+      accountType: "INR_ACCOUNT",
+      vpa: "test@upi",
+      paymentRails: ["UPI"]
+    },
+    beneficiary: {
+      beneficiaryType: "INDIVIDUAL",
+      fullName: "Priya Sharma",
+      birthDate: "1991-06-12",
+      nationality: "IN",
+      email: "priya.sharma@example.com",
+      phoneNumber: "+919876543210",
+      address: {
+        line1: "42 MG Road",
+        city: "Bangalore",
+        state: "Karnataka",
+        postalCode: "560001",
+        country: "IN"
+      }
+    }
+  },
+  MX: {
+    label: "🇲🇽 Mexico (MXN)",
+    currency: "MXN",
+    description: "MXN account (SPEI/CLABE)",
+    accountInfo: {
+      accountType: "MXN_ACCOUNT",
+      clabeNumber: "014027000005555601",
+      paymentRails: ["SPEI"]
+    },
+    beneficiary: {
+      beneficiaryType: "INDIVIDUAL",
+      fullName: "Carlos García",
+      birthDate: "1988-07-15",
+      nationality: "MX",
+      email: "carlos.garcia@example.com",
+      phoneNumber: "+5215512345678",
+      address: {
+        line1: "Av. Reforma 222",
+        city: "Mexico City",
+        state: "CDMX",
+        postalCode: "06600",
+        country: "MX"
+      }
+    }
+  },
+  BR: {
+    label: "🇧🇷 Brazil (BRL)",
+    currency: "BRL",
+    description: "BRL account (PIX)",
+    accountInfo: {
+      accountType: "BRL_ACCOUNT",
+      pixKey: "carlos@example.com",
+      pixKeyType: "EMAIL",
+      taxId: "12345678901",
+      paymentRails: ["PIX"]
+    },
+    beneficiary: {
+      beneficiaryType: "INDIVIDUAL",
+      fullName: "Ana Silva",
+      birthDate: "1990-11-20",
+      nationality: "BR",
+      email: "ana.silva@example.com",
+      phoneNumber: "+5511987654321",
+      address: {
+        line1: "Rua Augusta 1200",
+        city: "São Paulo",
+        state: "SP",
+        postalCode: "01304-001",
+        country: "BR"
+      }
+    }
+  },
+  PH: {
+    label: "🇵🇭 Philippines (PHP)",
+    currency: "PHP",
+    description: "PHP account (Bank Transfer)",
+    accountInfo: {
+      accountType: "PHP_ACCOUNT",
+      bankName: "BDO Unibank",
+      accountNumber: "001234567890",
+      paymentRails: ["BANK_TRANSFER"]
+    },
+    beneficiary: {
+      beneficiaryType: "INDIVIDUAL",
+      fullName: "Maria Santos",
+      birthDate: "1995-04-10",
+      nationality: "PH",
+      email: "maria.santos@example.com",
+      phoneNumber: "+639171234567",
+      address: {
+        line1: "123 Rizal Avenue",
+        city: "Manila",
+        state: "Metro Manila",
+        postalCode: "1000",
+        country: "PH"
+      }
+    }
+  },
+  GB: {
+    label: "🇬🇧 United Kingdom (GBP)",
+    currency: "GBP",
+    description: "GBP account (Faster Payments)",
+    accountInfo: {
+      accountType: "GBP_ACCOUNT",
+      sortCode: "123456",
+      accountNumber: "12345678",
+      paymentRails: ["FASTER_PAYMENTS"]
+    },
+    beneficiary: {
+      beneficiaryType: "INDIVIDUAL",
+      fullName: "James Smith",
+      birthDate: "1985-09-03",
+      nationality: "GB",
+      email: "james.smith@example.com",
+      phoneNumber: "+447911123456",
+      address: {
+        line1: "10 Downing Street",
+        city: "London",
+        postalCode: "SW1A 2AA",
+        country: "GB"
+      }
+    }
+  },
+  EU: {
+    label: "🇪🇺 Europe (EUR)",
+    currency: "EUR",
+    description: "EUR account (SEPA)",
+    accountInfo: {
+      accountType: "EUR_ACCOUNT",
+      iban: "DE89370400440532013000",
+      swiftCode: "DEUTDEFF",
+      paymentRails: ["SEPA"]
+    },
+    beneficiary: {
+      beneficiaryType: "INDIVIDUAL",
+      fullName: "Hans Müller",
+      birthDate: "1987-01-22",
+      nationality: "DE",
+      email: "hans.mueller@example.com",
+      phoneNumber: "+4917612345678",
+      address: {
+        line1: "Friedrichstraße 43",
+        city: "Berlin",
+        postalCode: "10117",
+        country: "DE"
+      }
+    }
+  }
+}
+
+export { COUNTRY_CONFIGS }
+
+export default function CreateExternalAccount({ customerId, onComplete, disabled, selectedCountry, onCountryChange }: Props) {
   const [body, setBody] = useState('')
   const [response, setResponse] = useState<string | null>(null)
   const [error, setError] = useState<string | null>(null)
   const [loading, setLoading] = useState(false)
 
   useEffect(() => {
+    const config = COUNTRY_CONFIGS[selectedCountry]
     setBody(JSON.stringify({
       customerId: customerId ?? "<customer-id>",
-      currency: "INR",
+      currency: config.currency,
       platformAccountId: `acct_${Math.random().toString(36).slice(2, 10)}`,
-      accountInfo: {
-        accountType: "INR_ACCOUNT",
-        vpa: "testuser@upi",
-        paymentRails: ["UPI"]
-      },
-      beneficiary: {
-        beneficiaryType: "INDIVIDUAL",
-        fullName: "Priya Sharma",
-        birthDate: "1992-03-25",
-        nationality: "IN",
-        email: "priya.sharma@example.com",
-        phoneNumber: "+919876543210",
-        address: {
-          line1: "42 MG Road",
-          line2: "Apt 3B",
-          city: "Mumbai",
-          state: "Maharashtra",
-          postalCode: "400001",
-          country: "IN"
-        }
-      }
+      accountInfo: config.accountInfo,
+      beneficiary: config.beneficiary
     }, null, 2))
-  }, [customerId])
+  }, [customerId, selectedCountry])
 
   const submit = async () => {
     if (!customerId) return
@@ -64,11 +212,27 @@ export default function CreateExternalAccount({ customerId, onComplete, disabled
     }
   }
 
+  const config = COUNTRY_CONFIGS[selectedCountry]
+
   return (
     <div>
       <p className="text-sm text-gray-400 mb-2">
-        Create an INR account (UPI) for customer <code className="text-blue-400">{customerId ?? '...'}</code>
+        Create a {config.description} for customer <code className="text-blue-400">{customerId ?? '...'}</code>
       </p>
+      <div className="mb-3">
+        <label htmlFor="destination-country" className="block text-sm font-medium text-gray-300 mb-1">Destination Country</label>
+        <select
+          id="destination-country"
+          value={selectedCountry}
+          onChange={(e) => onCountryChange(e.target.value)}
+          disabled={disabled || loading}
+          className="w-full px-3 py-2 bg-gray-800 border border-gray-700 rounded text-sm text-gray-100 focus:outline-none focus:border-blue-500"
+        >
+          {Object.entries(COUNTRY_CONFIGS).map(([code, cfg]) => (
+            <option key={code} value={code}>{cfg.label}</option>
+          ))}
+        </select>
+      </div>
       <JsonEditor value={body} onChange={setBody} disabled={disabled || loading} />
       <button
         onClick={submit}
diff --git a/samples/frontend/src/steps/CreateQuote.tsx b/samples/frontend/src/steps/CreateQuote.tsx
index 6865e9e5..a9905d2b 100644
--- a/samples/frontend/src/steps/CreateQuote.tsx
+++ b/samples/frontend/src/steps/CreateQuote.tsx
@@ -2,25 +2,32 @@ import { useState, useEffect } from 'react'
 import JsonEditor from '../components/JsonEditor'
 import ResponsePanel from '../components/ResponsePanel'
 import { apiPost } from '../lib/api'
+import { COUNTRY_CONFIGS } from './CreateExternalAccount'
 
 interface Props {
   customerId: string | null
   externalAccountId: string | null
+  selectedCountry: string
   onComplete: (response: Record<string, unknown>) => void
   disabled: boolean
 }
 
-export default function CreateQuote({ customerId, externalAccountId, onComplete, disabled }: Props) {
+const SOURCE_CURRENCIES = ['USD', 'USDC'] as const
+
+export default function CreateQuote({ customerId, externalAccountId, selectedCountry, onComplete, disabled }: Props) {
   const [body, setBody] = useState('')
   const [response, setResponse] = useState<string | null>(null)
   const [error, setError] = useState<string | null>(null)
   const [loading, setLoading] = useState(false)
+  const [sourceCurrency, setSourceCurrency] = useState<string>(SOURCE_CURRENCIES[0])
+
+  const destCurrency = COUNTRY_CONFIGS[selectedCountry]?.currency ?? 'USD'
 
   useEffect(() => {
     setBody(JSON.stringify({
       source: {
         sourceType: "REALTIME_FUNDING",
-        currency: "USDC",
+        currency: sourceCurrency,
         customerId: customerId ?? "<customer-id>"
       },
       destination: {
@@ -31,7 +38,7 @@ export default function CreateQuote({ customerId, externalAccountId, onComplete,
       lockedCurrencySide: "SENDING",
       purposeOfPayment: "GIFT"
     }, null, 2))
-  }, [customerId, externalAccountId])
+  }, [customerId, externalAccountId, sourceCurrency, selectedCountry])
 
   const submit = async () => {
     setLoading(true)
@@ -52,8 +59,22 @@ export default function CreateQuote({ customerId, externalAccountId, onComplete,
   return (
     <div>
       <p className="text-sm text-gray-400 mb-2">
-        Create a quote to send USDC &rarr; USD to external account <code className="text-blue-400">{externalAccountId ?? '...'}</code>
+        Create a quote to send {sourceCurrency} &rarr; {destCurrency} to external account <code className="text-blue-400">{externalAccountId ?? '...'}</code>
       </p>
+      <div className="mb-3">
+        <label htmlFor="source-currency" className="block text-sm font-medium text-gray-300 mb-1">Source Currency</label>
+        <select
+          id="source-currency"
+          value={sourceCurrency}
+          onChange={(e) => setSourceCurrency(e.target.value)}
+          disabled={disabled || loading}
+          className="w-full px-3 py-2 bg-gray-800 border border-gray-700 rounded text-sm text-gray-100 focus:outline-none focus:border-blue-500"
+        >
+          {SOURCE_CURRENCIES.map((c) => (
+            <option key={c} value={c}>{c}</option>
+          ))}
+        </select>
+      </div>
       <JsonEditor value={body} onChange={setBody} disabled={disabled || loading} />
       <button
         onClick={submit}
diff --git a/samples/kotlin/build.gradle.kts b/samples/kotlin/build.gradle.kts
index b21a6fe2..2a3ec345 100644
--- a/samples/kotlin/build.gradle.kts
+++ b/samples/kotlin/build.gradle.kts
@@ -59,4 +59,10 @@ dependencies {
 
     // Logging
     implementation("ch.qos.logback:logback-classic:1.5.6")
+
+    // Testing
+    testImplementation("io.ktor:ktor-server-test-host:3.1.3")
+    testImplementation("org.jetbrains.kotlin:kotlin-test:2.1.21")
+    testImplementation("io.ktor:ktor-client-content-negotiation:3.1.3")
+    testImplementation("io.ktor:ktor-serialization-jackson:3.1.3")
 }
diff --git a/samples/kotlin/src/main/kotlin/com/grid/sample/GridClientBuilder.kt b/samples/kotlin/src/main/kotlin/com/grid/sample/GridClientBuilder.kt
index 9243df3b..96b1e2ee 100644
--- a/samples/kotlin/src/main/kotlin/com/grid/sample/GridClientBuilder.kt
+++ b/samples/kotlin/src/main/kotlin/com/grid/sample/GridClientBuilder.kt
@@ -6,8 +6,8 @@ import com.lightspark.grid.client.okhttp.LightsparkGridOkHttpClient
 object GridClientBuilder {
     val client: LightsparkGridClient by lazy {
         LightsparkGridOkHttpClient.builder()
-            .username(Config.gridClientId)
-            .password(Config.gridClientSecret)
+            .username(Config.apiTokenId)
+            .password(Config.apiClientSecret)
             .build()
     }
 }
diff --git a/samples/kotlin/src/main/kotlin/com/grid/sample/JsonUtils.kt b/samples/kotlin/src/main/kotlin/com/grid/sample/JsonUtils.kt
index e2849934..5435dd03 100644
--- a/samples/kotlin/src/main/kotlin/com/grid/sample/JsonUtils.kt
+++ b/samples/kotlin/src/main/kotlin/com/grid/sample/JsonUtils.kt
@@ -1,10 +1,17 @@
 package com.grid.sample
 
+import com.fasterxml.jackson.databind.JsonNode
 import com.fasterxml.jackson.databind.ObjectMapper
 import com.fasterxml.jackson.databind.SerializationFeature
 import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule
 import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
 
+fun JsonNode.optText(field: String): String? =
+    get(field)?.takeIf { !it.isNull }?.asText()
+
+fun JsonNode.requireText(field: String): String =
+    optText(field) ?: throw IllegalArgumentException("$field is required")
+
 object JsonUtils {
     val mapper: ObjectMapper = jacksonObjectMapper().apply {
         registerModule(JavaTimeModule())
diff --git a/samples/kotlin/src/main/kotlin/com/grid/sample/routes/Customers.kt b/samples/kotlin/src/main/kotlin/com/grid/sample/routes/Customers.kt
index d6cf0c9b..b2827b2f 100644
--- a/samples/kotlin/src/main/kotlin/com/grid/sample/routes/Customers.kt
+++ b/samples/kotlin/src/main/kotlin/com/grid/sample/routes/Customers.kt
@@ -8,6 +8,8 @@ import com.lightspark.grid.models.customers.externalaccounts.Address
 import com.grid.sample.GridClientBuilder
 import com.grid.sample.JsonUtils
 import com.grid.sample.Log
+import com.grid.sample.optText
+import com.grid.sample.requireText
 import io.ktor.http.*
 import io.ktor.server.request.*
 import io.ktor.server.response.*
@@ -24,7 +26,7 @@ fun Route.customerRoutes() {
 
                 val individual = CreateCustomerRequest.Individual.builder()
                     .customerType(IndividualCustomerFields.CustomerType.INDIVIDUAL)
-                    .platformCustomerId(json.requiredText("platformCustomerId"))
+                    .platformCustomerId(json.requireText("platformCustomerId"))
                     .apply {
                         json.optText("fullName")?.let { fullName(it) }
                         json.optText("nationality")?.let { nationality(it) }
@@ -68,8 +70,3 @@ fun Route.customerRoutes() {
     }
 }
 
-private fun JsonNode.optText(field: String): String? =
-    if (has(field) && !get(field).isNull) get(field).asText() else null
-
-private fun JsonNode.requiredText(field: String): String =
-    optText(field) ?: throw IllegalArgumentException("$field is required")
diff --git a/samples/kotlin/src/main/kotlin/com/grid/sample/routes/ExternalAccounts.kt b/samples/kotlin/src/main/kotlin/com/grid/sample/routes/ExternalAccounts.kt
index 2dedbff6..fcfd9bf8 100644
--- a/samples/kotlin/src/main/kotlin/com/grid/sample/routes/ExternalAccounts.kt
+++ b/samples/kotlin/src/main/kotlin/com/grid/sample/routes/ExternalAccounts.kt
@@ -2,14 +2,33 @@ package com.grid.sample.routes
 
 import com.fasterxml.jackson.databind.JsonNode
 import com.lightspark.grid.models.customers.externalaccounts.Address
+import com.lightspark.grid.models.customers.externalaccounts.BrlBeneficiary
+import com.lightspark.grid.models.customers.externalaccounts.BrlExternalAccountInfo
 import com.lightspark.grid.models.customers.externalaccounts.ExternalAccountCreate
 import com.lightspark.grid.models.customers.externalaccounts.ExternalAccountCreateParams
+import com.lightspark.grid.models.customers.externalaccounts.ExternalAccountInfoOneOf
+import com.lightspark.grid.models.customers.externalaccounts.GbpBeneficiary
+import com.lightspark.grid.models.customers.externalaccounts.GbpExternalAccountInfo
 import com.lightspark.grid.models.customers.externalaccounts.InrBeneficiary
 import com.lightspark.grid.models.customers.externalaccounts.InrExternalAccountInfo
+import com.lightspark.grid.models.customers.externalaccounts.MxnBeneficiary
+import com.lightspark.grid.models.customers.externalaccounts.MxnExternalAccountInfo
+import com.lightspark.grid.models.customers.externalaccounts.PhpBeneficiary
+import com.lightspark.grid.models.customers.externalaccounts.PhpExternalAccountInfo
+import com.lightspark.grid.models.customers.externalaccounts.UsdBeneficiary
+import com.lightspark.grid.models.customers.externalaccounts.UsdExternalAccountInfo
+import com.lightspark.grid.models.platform.externalaccounts.BrlAccountInfo
+import com.lightspark.grid.models.platform.externalaccounts.EurAccountInfo
+import com.lightspark.grid.models.platform.externalaccounts.GbpAccountInfo
 import com.lightspark.grid.models.platform.externalaccounts.InrAccountInfo
+import com.lightspark.grid.models.platform.externalaccounts.MxnAccountInfo
+import com.lightspark.grid.models.platform.externalaccounts.PhpAccountInfo
+import com.lightspark.grid.models.platform.externalaccounts.UsdAccountInfo
 import com.grid.sample.GridClientBuilder
 import com.grid.sample.JsonUtils
 import com.grid.sample.Log
+import com.grid.sample.optText
+import com.grid.sample.requireText
 import io.ktor.http.*
 import io.ktor.server.request.*
 import io.ktor.server.response.*
@@ -29,53 +48,25 @@ fun Route.externalAccountRoutes() {
                 val body = call.receiveText()
                 val json = JsonUtils.mapper.readTree(body)
                 Log.incoming("POST", "/api/customers/$customerId/external-accounts", body)
-                val accountInfo = json.get("accountInfo")
+                val accountInfoNode = json.get("accountInfo")
+                    ?: return@post call.respondText(
+                        """{"error": "accountInfo is required"}""",
+                        ContentType.Application.Json,
+                        HttpStatusCode.BadRequest
+                    )
 
-                val beneficiaryNode = json.get("beneficiary")
-                val beneficiary = if (beneficiaryNode != null && !beneficiaryNode.isNull) {
-                    InrBeneficiary.builder()
-                        .beneficiaryType(InrBeneficiary.BeneficiaryType.INDIVIDUAL)
-                        .fullName(beneficiaryNode.optText("fullName") ?: "")
-                        .nationality(beneficiaryNode.optText("nationality") ?: "IN")
-                        .birthDate(beneficiaryNode.optText("birthDate") ?: "1990-01-01")
-                        .apply {
-                            beneficiaryNode.optText("email")?.let { email(it) }
-                            beneficiaryNode.optText("phoneNumber")?.let { phoneNumber(it) }
-                            beneficiaryNode.get("address")?.takeIf { !it.isNull }?.let { addrNode ->
-                                address(
-                                    Address.builder()
-                                        .country(addrNode.optText("country") ?: "IN")
-                                        .line1(addrNode.optText("line1") ?: "")
-                                        .postalCode(addrNode.optText("postalCode") ?: "")
-                                        .apply {
-                                            addrNode.optText("line2")?.let { line2(it) }
-                                            addrNode.optText("city")?.let { city(it) }
-                                            addrNode.optText("state")?.let { state(it) }
-                                        }
-                                        .build()
-                                )
-                            }
-                        }
-                        .build()
-                } else {
-                    InrBeneficiary.builder()
-                        .beneficiaryType(InrBeneficiary.BeneficiaryType.INDIVIDUAL)
-                        .fullName("Account Holder")
-                        .nationality("IN")
-                        .birthDate("1990-01-01")
-                        .build()
-                }
+                val accountType = accountInfoNode.optText("accountType")
+                    ?: return@post call.respondText(
+                        """{"error": "accountInfo.accountType is required"}""",
+                        ContentType.Application.Json,
+                        HttpStatusCode.BadRequest
+                    )
 
-                val inrAccountInfo = InrExternalAccountInfo.builder()
-                    .accountType(InrAccountInfo.AccountType.INR_ACCOUNT)
-                    .vpa(accountInfo.get("vpa").asText())
-                    .addPaymentRail(InrAccountInfo.PaymentRail.UPI)
-                    .beneficiary(beneficiary)
-                    .build()
+                val accountInfo = buildAccountInfo(accountType, accountInfoNode)
 
                 val externalAccountCreate = ExternalAccountCreate.builder()
-                    .accountInfo(inrAccountInfo)
-                    .currency(json.optText("currency") ?: "INR")
+                    .accountInfo(accountInfo)
+                    .currency(json.optText("currency") ?: "USD")
                     .apply {
                         customerId(customerId)
                         json.optText("platformAccountId")?.let { platformAccountId(it) }
@@ -111,57 +102,82 @@ private fun buildAccountInfo(accountType: String, accountInfo: JsonNode): Extern
         "USD_ACCOUNT" -> {
             val beneficiary = buildUsdBeneficiary(beneficiaryNode)
             val info = UsdExternalAccountInfo.builder()
-                .accountType(UsdExternalAccountInfo.AccountType.USD_ACCOUNT)
+                .accountType(UsdAccountInfo.AccountType.USD_ACCOUNT)
                 .accountNumber(accountInfo.requireText("accountNumber"))
                 .routingNumber(accountInfo.requireText("routingNumber"))
                 .beneficiary(beneficiary)
-                .paymentRails(buildPaymentRails(accountInfo) { UsdExternalAccountInfo.PaymentRail.of(it) })
+                .paymentRails(buildPaymentRails(accountInfo) { UsdAccountInfo.PaymentRail.of(it) })
                 .build()
             ExternalAccountInfoOneOf.ofUsdAccount(info)
         }
         "INR_ACCOUNT" -> {
             val beneficiary = buildInrBeneficiary(beneficiaryNode)
             val info = InrExternalAccountInfo.builder()
-                .accountType(InrExternalAccountInfo.AccountType.INR_ACCOUNT)
+                .accountType(InrAccountInfo.AccountType.INR_ACCOUNT)
                 .vpa(accountInfo.requireText("vpa"))
                 .beneficiary(beneficiary)
-                .paymentRails(buildPaymentRails(accountInfo) { InrExternalAccountInfo.PaymentRail.of(it) })
+                .paymentRails(buildPaymentRails(accountInfo) { InrAccountInfo.PaymentRail.of(it) })
                 .build()
             ExternalAccountInfoOneOf.ofInrAccount(info)
         }
         "BRL_ACCOUNT" -> {
             val beneficiary = buildBrlBeneficiary(beneficiaryNode)
             val info = BrlExternalAccountInfo.builder()
-                .accountType(BrlExternalAccountInfo.AccountType.BRL_ACCOUNT)
+                .accountType(BrlAccountInfo.AccountType.BRL_ACCOUNT)
                 .pixKey(accountInfo.requireText("pixKey"))
                 .pixKeyType(accountInfo.requireText("pixKeyType"))
                 .taxId(accountInfo.requireText("taxId"))
                 .beneficiary(beneficiary)
-                .paymentRails(buildPaymentRails(accountInfo) { BrlExternalAccountInfo.PaymentRail.of(it) })
+                .paymentRails(buildPaymentRails(accountInfo) { BrlAccountInfo.PaymentRail.of(it) })
                 .build()
             ExternalAccountInfoOneOf.ofBrlAccount(info)
         }
         "MXN_ACCOUNT" -> {
             val beneficiary = buildMxnBeneficiary(beneficiaryNode)
             val info = MxnExternalAccountInfo.builder()
-                .accountType(MxnExternalAccountInfo.AccountType.MXN_ACCOUNT)
+                .accountType(MxnAccountInfo.AccountType.MXN_ACCOUNT)
                 .clabeNumber(accountInfo.requireText("clabeNumber"))
                 .beneficiary(beneficiary)
-                .paymentRails(buildPaymentRails(accountInfo) { MxnExternalAccountInfo.PaymentRail.of(it) })
+                .paymentRails(buildPaymentRails(accountInfo) { MxnAccountInfo.PaymentRail.of(it) })
                 .build()
             ExternalAccountInfoOneOf.ofMxnAccount(info)
         }
         "GBP_ACCOUNT" -> {
             val beneficiary = buildGbpBeneficiary(beneficiaryNode)
             val info = GbpExternalAccountInfo.builder()
-                .accountType(GbpExternalAccountInfo.AccountType.GBP_ACCOUNT)
+                .accountType(GbpAccountInfo.AccountType.GBP_ACCOUNT)
                 .sortCode(accountInfo.requireText("sortCode"))
                 .accountNumber(accountInfo.requireText("accountNumber"))
                 .beneficiary(beneficiary)
-                .paymentRails(buildPaymentRails(accountInfo) { GbpExternalAccountInfo.PaymentRail.of(it) })
+                .paymentRails(buildPaymentRails(accountInfo) { GbpAccountInfo.PaymentRail.of(it) })
                 .build()
             ExternalAccountInfoOneOf.ofGbpAccount(info)
         }
+        "PHP_ACCOUNT" -> {
+            val beneficiary = buildPhpBeneficiary(beneficiaryNode)
+            val info = PhpExternalAccountInfo.builder()
+                .accountType(PhpAccountInfo.AccountType.PHP_ACCOUNT)
+                .bankName(accountInfo.requireText("bankName"))
+                .accountNumber(accountInfo.requireText("accountNumber"))
+                .beneficiary(beneficiary)
+                .paymentRails(buildPaymentRails(accountInfo) { PhpAccountInfo.PaymentRail.of(it) })
+                .build()
+            ExternalAccountInfoOneOf.ofPhpAccount(info)
+        }
+        "EUR_ACCOUNT" -> {
+            val beneficiary = buildEurBeneficiary(beneficiaryNode)
+            val swiftCode = accountInfo.optText("swiftCode") ?: ""
+            val info = ExternalAccountInfoOneOf.EurAccount.builder()
+                .accountType(EurAccountInfo.AccountType.EUR_ACCOUNT)
+                .iban(accountInfo.requireText("iban"))
+                .swiftBic(swiftCode)
+                .beneficiary(beneficiary)
+                .paymentRails(buildPaymentRails(accountInfo) { EurAccountInfo.PaymentRail.of(it) })
+                // Workaround: SDK serializes as "swiftBic" but the API expects "swiftCode"
+                .putAdditionalProperty("swiftCode", com.lightspark.grid.core.JsonValue.from(swiftCode))
+                .build()
+            ExternalAccountInfoOneOf.ofEurAccount(info)
+        }
         else -> throw IllegalArgumentException("Unsupported account type: $accountType")
     }
 }
@@ -180,104 +196,124 @@ private fun buildAddress(addrNode: JsonNode?): Address? {
         .build()
 }
 
+/** Parsed beneficiary fields shared across all currency types. */
+private data class BeneficiaryFields(
+    val fullName: String,
+    val nationality: String?,
+    val birthDate: String?,
+    val address: Address?,
+)
+
+private fun parseBeneficiaryFields(node: JsonNode?): BeneficiaryFields {
+    if (node == null || node.isNull) return BeneficiaryFields("Account Holder", null, null, null)
+    return BeneficiaryFields(
+        fullName = node.optText("fullName") ?: "",
+        nationality = node.optText("nationality"),
+        birthDate = node.optText("birthDate"),
+        address = buildAddress(node.get("address")),
+    )
+}
+
 private fun buildUsdBeneficiary(node: JsonNode?): UsdExternalAccountInfo.Beneficiary {
-    val b = if (node != null && !node.isNull) {
-        UsdBeneficiary.builder()
-            .beneficiaryType(UsdBeneficiary.BeneficiaryType.INDIVIDUAL)
-            .fullName(node.optText("fullName") ?: "")
-            .nationality(node.optText("nationality") ?: "US")
-            .birthDate(node.optText("birthDate") ?: "1990-01-01")
-            .apply { buildAddress(node.get("address"))?.let { address(it) } }
-            .build()
-    } else {
+    val f = parseBeneficiaryFields(node)
+    return UsdExternalAccountInfo.Beneficiary.ofIndividual(
         UsdBeneficiary.builder()
             .beneficiaryType(UsdBeneficiary.BeneficiaryType.INDIVIDUAL)
-            .fullName("Account Holder")
-            .nationality("US")
-            .birthDate("1990-01-01")
+            .fullName(f.fullName)
+            .nationality(f.nationality ?: "US")
+            .birthDate(f.birthDate ?: "1990-01-01")
+            .apply { f.address?.let { address(it) } }
             .build()
-    }
-    return UsdExternalAccountInfo.Beneficiary.ofIndividual(b)
+    )
 }
 
 private fun buildInrBeneficiary(node: JsonNode?): InrExternalAccountInfo.Beneficiary {
-    val b = if (node != null && !node.isNull) {
+    val f = parseBeneficiaryFields(node)
+    return InrExternalAccountInfo.Beneficiary.ofIndividual(
         InrBeneficiary.builder()
             .beneficiaryType(InrBeneficiary.BeneficiaryType.INDIVIDUAL)
-            .fullName(node.optText("fullName") ?: "")
+            .fullName(f.fullName)
             .apply {
-                node.optText("nationality")?.let { nationality(it) }
-                node.optText("birthDate")?.let { birthDate(it) }
-                buildAddress(node.get("address"))?.let { address(it) }
+                f.nationality?.let { nationality(it) }
+                f.birthDate?.let { birthDate(it) }
+                f.address?.let { address(it) }
             }
             .build()
-    } else {
-        InrBeneficiary.builder()
-            .beneficiaryType(InrBeneficiary.BeneficiaryType.INDIVIDUAL)
-            .fullName("Account Holder")
-            .build()
-    }
-    return InrExternalAccountInfo.Beneficiary.ofIndividual(b)
+    )
 }
 
 private fun buildBrlBeneficiary(node: JsonNode?): BrlExternalAccountInfo.Beneficiary {
-    val b = if (node != null && !node.isNull) {
+    val f = parseBeneficiaryFields(node)
+    return BrlExternalAccountInfo.Beneficiary.ofIndividual(
         BrlBeneficiary.builder()
             .beneficiaryType(BrlBeneficiary.BeneficiaryType.INDIVIDUAL)
-            .fullName(node.optText("fullName") ?: "")
+            .fullName(f.fullName)
             .apply {
-                node.optText("nationality")?.let { nationality(it) }
-                node.optText("birthDate")?.let { birthDate(it) }
-                buildAddress(node.get("address"))?.let { address(it) }
+                f.nationality?.let { nationality(it) }
+                f.birthDate?.let { birthDate(it) }
+                f.address?.let { address(it) }
             }
             .build()
-    } else {
-        BrlBeneficiary.builder()
-            .beneficiaryType(BrlBeneficiary.BeneficiaryType.INDIVIDUAL)
-            .fullName("Account Holder")
-            .build()
-    }
-    return BrlExternalAccountInfo.Beneficiary.ofIndividual(b)
+    )
 }
 
 private fun buildMxnBeneficiary(node: JsonNode?): MxnExternalAccountInfo.Beneficiary {
-    val b = if (node != null && !node.isNull) {
+    val f = parseBeneficiaryFields(node)
+    return MxnExternalAccountInfo.Beneficiary.ofIndividual(
         MxnBeneficiary.builder()
             .beneficiaryType(MxnBeneficiary.BeneficiaryType.INDIVIDUAL)
-            .fullName(node.optText("fullName") ?: "")
+            .fullName(f.fullName)
             .apply {
-                node.optText("nationality")?.let { nationality(it) }
-                node.optText("birthDate")?.let { birthDate(it) }
-                buildAddress(node.get("address"))?.let { address(it) }
+                f.nationality?.let { nationality(it) }
+                f.birthDate?.let { birthDate(it) }
+                f.address?.let { address(it) }
             }
             .build()
-    } else {
-        MxnBeneficiary.builder()
-            .beneficiaryType(MxnBeneficiary.BeneficiaryType.INDIVIDUAL)
-            .fullName("Account Holder")
-            .build()
-    }
-    return MxnExternalAccountInfo.Beneficiary.ofIndividual(b)
+    )
 }
 
 private fun buildGbpBeneficiary(node: JsonNode?): GbpExternalAccountInfo.Beneficiary {
-    val b = if (node != null && !node.isNull) {
+    val f = parseBeneficiaryFields(node)
+    return GbpExternalAccountInfo.Beneficiary.ofIndividual(
         GbpBeneficiary.builder()
             .beneficiaryType(GbpBeneficiary.BeneficiaryType.INDIVIDUAL)
-            .fullName(node.optText("fullName") ?: "")
+            .fullName(f.fullName)
             .apply {
-                node.optText("nationality")?.let { nationality(it) }
-                node.optText("birthDate")?.let { birthDate(it) }
-                buildAddress(node.get("address"))?.let { address(it) }
+                f.nationality?.let { nationality(it) }
+                f.birthDate?.let { birthDate(it) }
+                f.address?.let { address(it) }
             }
             .build()
-    } else {
-        GbpBeneficiary.builder()
-            .beneficiaryType(GbpBeneficiary.BeneficiaryType.INDIVIDUAL)
-            .fullName("Account Holder")
+    )
+}
+
+private fun buildPhpBeneficiary(node: JsonNode?): PhpExternalAccountInfo.Beneficiary {
+    val f = parseBeneficiaryFields(node)
+    return PhpExternalAccountInfo.Beneficiary.ofIndividual(
+        PhpBeneficiary.builder()
+            .beneficiaryType(PhpBeneficiary.BeneficiaryType.INDIVIDUAL)
+            .fullName(f.fullName)
+            .apply {
+                f.nationality?.let { nationality(it) }
+                f.birthDate?.let { birthDate(it) }
+                f.address?.let { address(it) }
+            }
             .build()
-    }
-    return GbpExternalAccountInfo.Beneficiary.ofIndividual(b)
+    )
+}
+
+private fun buildEurBeneficiary(node: JsonNode?): ExternalAccountInfoOneOf.EurAccount.Beneficiary {
+    val f = parseBeneficiaryFields(node)
+    return ExternalAccountInfoOneOf.EurAccount.Beneficiary.ofIndividual(
+        ExternalAccountInfoOneOf.EurAccount.Beneficiary.Individual.builder()
+            .fullName(f.fullName)
+            .apply {
+                f.nationality?.let { nationality(it) }
+                f.birthDate?.let { birthDate(it) }
+                f.address?.let { address(it) }
+            }
+            .build()
+    )
 }
 
 private fun <T> buildPaymentRails(accountInfo: JsonNode, parse: (String) -> T): List<T> {
@@ -286,8 +322,3 @@ private fun <T> buildPaymentRails(accountInfo: JsonNode, parse: (String) -> T):
     return railsNode.map { parse(it.asText()) }
 }
 
-private fun JsonNode.optText(field: String): String? =
-    if (has(field) && !get(field).isNull) get(field).asText() else null
-
-private fun JsonNode.requireText(field: String): String =
-    optText(field) ?: throw IllegalArgumentException("$field is required")
diff --git a/samples/kotlin/src/main/kotlin/com/grid/sample/routes/Quotes.kt b/samples/kotlin/src/main/kotlin/com/grid/sample/routes/Quotes.kt
index 249687f1..3089feb9 100644
--- a/samples/kotlin/src/main/kotlin/com/grid/sample/routes/Quotes.kt
+++ b/samples/kotlin/src/main/kotlin/com/grid/sample/routes/Quotes.kt
@@ -5,10 +5,13 @@ import com.lightspark.grid.models.quotes.QuoteCreateParams
 import com.lightspark.grid.models.quotes.QuoteCreateParams.LockedCurrencySide
 import com.lightspark.grid.models.quotes.QuoteCreateParams.PurposeOfPayment
 import com.lightspark.grid.models.quotes.QuoteSourceOneOf
+import com.lightspark.grid.models.quotes.QuoteSourceOneOf.AccountQuoteSource
+import com.lightspark.grid.models.quotes.QuoteSourceOneOf.RealtimeFundingQuoteSource
 import com.lightspark.grid.models.quotes.QuoteDestinationOneOf
 import com.grid.sample.GridClientBuilder
 import com.grid.sample.JsonUtils
 import com.grid.sample.Log
+import com.grid.sample.optText
 import io.ktor.http.*
 import io.ktor.server.request.*
 import io.ktor.server.response.*
@@ -90,26 +93,26 @@ fun Route.quoteRoutes() {
     }
 }
 
-private fun buildQuoteSource(sourceNode: JsonNode): QuoteCreateParams.Source {
+private fun buildQuoteSource(sourceNode: JsonNode): QuoteSourceOneOf {
     val sourceType = sourceNode.optText("sourceType")
 
     if (sourceType == "REALTIME_FUNDING" || sourceNode.has("currency")) {
-        val realtimeSource = QuoteCreateParams.Source.RealtimeFundingQuoteSource.builder()
+        val realtimeSource = RealtimeFundingQuoteSource.builder()
             .currency(sourceNode.get("currency").asText())
             .apply {
                 sourceNode.optText("customerId")?.let { customerId(it) }
             }
             .build()
-        return QuoteCreateParams.Source.ofRealtimeFundingQuote(realtimeSource)
+        return QuoteSourceOneOf.ofRealtimeFundingQuoteSource(realtimeSource)
     }
 
-    val accountSource = QuoteCreateParams.Source.AccountQuoteSource.builder()
+    val accountSource = AccountQuoteSource.builder()
         .accountId(sourceNode.get("accountId").asText())
         .apply {
             sourceNode.optText("customerId")?.let { customerId(it) }
         }
         .build()
-    return QuoteCreateParams.Source.ofAccountQuote(accountSource)
+    return QuoteSourceOneOf.ofAccountQuoteSource(accountSource)
 }
 
 private fun buildQuoteDestination(destNode: JsonNode): QuoteDestinationOneOf {
@@ -125,6 +128,3 @@ private fun buildQuoteDestination(destNode: JsonNode): QuoteDestinationOneOf {
         .build()
     return QuoteDestinationOneOf.ofAccountDestination(accountDest)
 }
-
-private fun JsonNode.optText(field: String): String? =
-    if (has(field) && !get(field).isNull) get(field).asText() else null
diff --git a/samples/kotlin/src/main/kotlin/com/grid/sample/routes/Sandbox.kt b/samples/kotlin/src/main/kotlin/com/grid/sample/routes/Sandbox.kt
index 0dd137f6..cadcd7ef 100644
--- a/samples/kotlin/src/main/kotlin/com/grid/sample/routes/Sandbox.kt
+++ b/samples/kotlin/src/main/kotlin/com/grid/sample/routes/Sandbox.kt
@@ -5,6 +5,7 @@ import com.lightspark.grid.models.sandbox.SandboxSendFundsParams
 import com.grid.sample.GridClientBuilder
 import com.grid.sample.JsonUtils
 import com.grid.sample.Log
+import com.grid.sample.optText
 import io.ktor.http.*
 import io.ktor.server.request.*
 import io.ktor.server.response.*
@@ -45,6 +46,3 @@ fun Route.sandboxRoutes() {
         }
     }
 }
-
-private fun JsonNode.optText(field: String): String? =
-    if (has(field) && !get(field).isNull) get(field).asText() else null
diff --git a/samples/kotlin/src/main/kotlin/com/grid/sample/routes/Webhooks.kt b/samples/kotlin/src/main/kotlin/com/grid/sample/routes/Webhooks.kt
index 8424bd40..9c445e20 100644
--- a/samples/kotlin/src/main/kotlin/com/grid/sample/routes/Webhooks.kt
+++ b/samples/kotlin/src/main/kotlin/com/grid/sample/routes/Webhooks.kt
@@ -15,7 +15,7 @@ private var publicKeyInitialized = false
 
 private fun ensurePublicKey() {
     if (!publicKeyInitialized) {
-        WebhookUtils.setPublicKey(Config.webhookPubkey)
+        WebhookUtils.setPublicKey(Config.webhookPublicKey)
         publicKeyInitialized = true
     }
 }
diff --git a/samples/kotlin/src/test/kotlin/com/grid/sample/EndToEndTest.kt b/samples/kotlin/src/test/kotlin/com/grid/sample/EndToEndTest.kt
new file mode 100644
index 00000000..ac7c9749
--- /dev/null
+++ b/samples/kotlin/src/test/kotlin/com/grid/sample/EndToEndTest.kt
@@ -0,0 +1,343 @@
+package com.grid.sample
+
+import com.fasterxml.jackson.databind.JsonNode
+import io.ktor.client.request.*
+import io.ktor.client.statement.*
+import io.ktor.http.*
+import io.ktor.server.testing.*
+import kotlin.test.*
+
+/**
+ * End-to-end tests that exercise the full payout flow against the Grid sandbox API.
+ * Requires GRID_CLIENT_ID, GRID_CLIENT_SECRET, and GRID_WEBHOOK_PUBKEY to be set.
+ */
+class EndToEndTest {
+
+    private fun parseJson(text: String): JsonNode = JsonUtils.mapper.readTree(text)
+
+    private fun ApplicationTestBuilder.configureApp() {
+        application { module() }
+    }
+
+    @Test
+    fun `create individual customer`() = testApplication {
+        configureApp()
+        val response = client.post("/api/customers") {
+            contentType(ContentType.Application.Json)
+            setBody("""
+                {
+                    "platformCustomerId": "test_${System.currentTimeMillis()}",
+                    "customerType": "INDIVIDUAL",
+                    "fullName": "Test User",
+                    "nationality": "US",
+                    "birthDate": "1990-01-01",
+                    "address": {
+                        "country": "US",
+                        "line1": "123 Test St",
+                        "postalCode": "10001",
+                        "city": "New York",
+                        "state": "NY"
+                    }
+                }
+            """)
+        }
+
+        assertEquals(HttpStatusCode.Created, response.status)
+        val json = parseJson(response.bodyAsText())
+        assertNotNull(json.get("id")?.asText(), "Customer should have an id")
+        assertEquals("INDIVIDUAL", json.get("customerType")?.asText())
+    }
+
+    @Test
+    fun `create MXN external account`() = testApplication {
+        configureApp()
+
+        // Step 1: Create customer
+        val customerResponse = client.post("/api/customers") {
+            contentType(ContentType.Application.Json)
+            setBody("""
+                {
+                    "platformCustomerId": "test_mxn_${System.currentTimeMillis()}",
+                    "customerType": "INDIVIDUAL",
+                    "fullName": "Carlos Test",
+                    "nationality": "MX",
+                    "birthDate": "1990-01-01"
+                }
+            """)
+        }
+        assertEquals(HttpStatusCode.Created, customerResponse.status)
+        val customerId = parseJson(customerResponse.bodyAsText()).get("id").asText()
+
+        // Step 2: Create MXN external account
+        val accountResponse = client.post("/api/customers/$customerId/external-accounts") {
+            contentType(ContentType.Application.Json)
+            setBody("""
+                {
+                    "customerId": "$customerId",
+                    "currency": "MXN",
+                    "platformAccountId": "acct_test_${System.currentTimeMillis()}",
+                    "accountInfo": {
+                        "accountType": "MXN_ACCOUNT",
+                        "clabeNumber": "014027000005555601",
+                        "paymentRails": ["SPEI"]
+                    },
+                    "beneficiary": {
+                        "beneficiaryType": "INDIVIDUAL",
+                        "fullName": "Carlos Test",
+                        "birthDate": "1990-01-01",
+                        "nationality": "MX"
+                    }
+                }
+            """)
+        }
+
+        assertEquals(HttpStatusCode.Created, accountResponse.status)
+        val accountJson = parseJson(accountResponse.bodyAsText())
+        assertNotNull(accountJson.get("id")?.asText(), "External account should have an id")
+    }
+
+    @Test
+    fun `create INR external account with UPI`() = testApplication {
+        configureApp()
+
+        val customerResponse = client.post("/api/customers") {
+            contentType(ContentType.Application.Json)
+            setBody("""
+                {
+                    "platformCustomerId": "test_inr_${System.currentTimeMillis()}",
+                    "customerType": "INDIVIDUAL",
+                    "fullName": "Priya Test",
+                    "nationality": "IN",
+                    "birthDate": "1991-06-12"
+                }
+            """)
+        }
+        assertEquals(HttpStatusCode.Created, customerResponse.status)
+        val customerId = parseJson(customerResponse.bodyAsText()).get("id").asText()
+
+        val accountResponse = client.post("/api/customers/$customerId/external-accounts") {
+            contentType(ContentType.Application.Json)
+            setBody("""
+                {
+                    "customerId": "$customerId",
+                    "currency": "INR",
+                    "platformAccountId": "acct_test_${System.currentTimeMillis()}",
+                    "accountInfo": {
+                        "accountType": "INR_ACCOUNT",
+                        "vpa": "test@upi",
+                        "paymentRails": ["UPI"]
+                    },
+                    "beneficiary": {
+                        "beneficiaryType": "INDIVIDUAL",
+                        "fullName": "Priya Test",
+                        "birthDate": "1991-06-12",
+                        "nationality": "IN"
+                    }
+                }
+            """)
+        }
+
+        assertEquals(HttpStatusCode.Created, accountResponse.status)
+        val accountJson = parseJson(accountResponse.bodyAsText())
+        assertNotNull(accountJson.get("id")?.asText(), "External account should have an id")
+    }
+
+    @Test
+    fun `create external account rejects missing accountType`() = testApplication {
+        configureApp()
+
+        val response = client.post("/api/customers/fake-id/external-accounts") {
+            contentType(ContentType.Application.Json)
+            setBody("""{"accountInfo": {}}""")
+        }
+
+        assertEquals(HttpStatusCode.BadRequest, response.status)
+        val json = parseJson(response.bodyAsText())
+        assertTrue(json.get("error").asText().contains("accountType"))
+    }
+
+    @Test
+    fun `create external account rejects missing accountInfo`() = testApplication {
+        configureApp()
+
+        val response = client.post("/api/customers/fake-id/external-accounts") {
+            contentType(ContentType.Application.Json)
+            setBody("""{}""")
+        }
+
+        assertEquals(HttpStatusCode.BadRequest, response.status)
+        val json = parseJson(response.bodyAsText())
+        assertTrue(json.get("error").asText().contains("accountInfo"))
+    }
+
+    @Test
+    fun `create quote with USD source`() = testApplication {
+        configureApp()
+
+        // Step 1: Create customer
+        val customerResponse = client.post("/api/customers") {
+            contentType(ContentType.Application.Json)
+            setBody("""
+                {
+                    "platformCustomerId": "test_quote_${System.currentTimeMillis()}",
+                    "customerType": "INDIVIDUAL",
+                    "fullName": "Quote Test",
+                    "nationality": "MX",
+                    "birthDate": "1990-01-01"
+                }
+            """)
+        }
+        assertEquals(HttpStatusCode.Created, customerResponse.status)
+        val customerId = parseJson(customerResponse.bodyAsText()).get("id").asText()
+
+        // Step 2: Create external account
+        val accountResponse = client.post("/api/customers/$customerId/external-accounts") {
+            contentType(ContentType.Application.Json)
+            setBody("""
+                {
+                    "customerId": "$customerId",
+                    "currency": "MXN",
+                    "platformAccountId": "acct_test_${System.currentTimeMillis()}",
+                    "accountInfo": {
+                        "accountType": "MXN_ACCOUNT",
+                        "clabeNumber": "014027000005555601",
+                        "paymentRails": ["SPEI"]
+                    },
+                    "beneficiary": {
+                        "beneficiaryType": "INDIVIDUAL",
+                        "fullName": "Quote Test",
+                        "birthDate": "1990-01-01",
+                        "nationality": "MX"
+                    }
+                }
+            """)
+        }
+        assertEquals(HttpStatusCode.Created, accountResponse.status)
+        val externalAccountId = parseJson(accountResponse.bodyAsText()).get("id").asText()
+
+        // Step 3: Create quote
+        val quoteResponse = client.post("/api/quotes") {
+            contentType(ContentType.Application.Json)
+            setBody("""
+                {
+                    "source": {
+                        "sourceType": "REALTIME_FUNDING",
+                        "currency": "USD",
+                        "customerId": "$customerId"
+                    },
+                    "destination": {
+                        "accountId": "$externalAccountId"
+                    },
+                    "lockedCurrencyAmount": 1000,
+                    "lockedCurrencySide": "SENDING",
+                    "purposeOfPayment": "GIFT"
+                }
+            """)
+        }
+
+        assertEquals(HttpStatusCode.Created, quoteResponse.status)
+        val quoteJson = parseJson(quoteResponse.bodyAsText())
+        assertNotNull(quoteJson.get("id")?.asText(), "Quote should have an id")
+    }
+
+    @Test
+    fun `full payout flow - create customer, account, quote, and fund`() = testApplication {
+        configureApp()
+
+        // Step 1: Create customer
+        val customerResponse = client.post("/api/customers") {
+            contentType(ContentType.Application.Json)
+            setBody("""
+                {
+                    "platformCustomerId": "test_e2e_${System.currentTimeMillis()}",
+                    "customerType": "INDIVIDUAL",
+                    "fullName": "E2E Test User",
+                    "nationality": "MX",
+                    "birthDate": "1988-07-15",
+                    "address": {
+                        "country": "MX",
+                        "line1": "Av. Reforma 222",
+                        "postalCode": "06600",
+                        "city": "Mexico City",
+                        "state": "CDMX"
+                    }
+                }
+            """)
+        }
+        assertEquals(HttpStatusCode.Created, customerResponse.status, "Customer creation failed: ${customerResponse.bodyAsText()}")
+        val customerJson = parseJson(customerResponse.bodyAsText())
+        val customerId = customerJson.get("id").asText()
+        assertNotNull(customerId)
+
+        // Step 2: Create MXN external account
+        val accountResponse = client.post("/api/customers/$customerId/external-accounts") {
+            contentType(ContentType.Application.Json)
+            setBody("""
+                {
+                    "customerId": "$customerId",
+                    "currency": "MXN",
+                    "platformAccountId": "acct_e2e_${System.currentTimeMillis()}",
+                    "accountInfo": {
+                        "accountType": "MXN_ACCOUNT",
+                        "clabeNumber": "014027000005555601",
+                        "paymentRails": ["SPEI"]
+                    },
+                    "beneficiary": {
+                        "beneficiaryType": "INDIVIDUAL",
+                        "fullName": "E2E Test User",
+                        "birthDate": "1988-07-15",
+                        "nationality": "MX",
+                        "address": {
+                            "line1": "Av. Reforma 222",
+                            "city": "Mexico City",
+                            "state": "CDMX",
+                            "postalCode": "06600",
+                            "country": "MX"
+                        }
+                    }
+                }
+            """)
+        }
+        assertEquals(HttpStatusCode.Created, accountResponse.status, "External account creation failed: ${accountResponse.bodyAsText()}")
+        val accountJson = parseJson(accountResponse.bodyAsText())
+        val externalAccountId = accountJson.get("id").asText()
+        assertNotNull(externalAccountId)
+
+        // Step 3: Create quote (USD -> MXN)
+        val quoteResponse = client.post("/api/quotes") {
+            contentType(ContentType.Application.Json)
+            setBody("""
+                {
+                    "source": {
+                        "sourceType": "REALTIME_FUNDING",
+                        "currency": "USD",
+                        "customerId": "$customerId"
+                    },
+                    "destination": {
+                        "accountId": "$externalAccountId"
+                    },
+                    "lockedCurrencyAmount": 1000,
+                    "lockedCurrencySide": "SENDING",
+                    "purposeOfPayment": "GIFT"
+                }
+            """)
+        }
+        assertEquals(HttpStatusCode.Created, quoteResponse.status, "Quote creation failed: ${quoteResponse.bodyAsText()}")
+        val quoteJson = parseJson(quoteResponse.bodyAsText())
+        val quoteId = quoteJson.get("id").asText()
+        assertNotNull(quoteId)
+
+        // Step 4: Sandbox fund (realtime-funded quotes skip the execute step)
+        val fundResponse = client.post("/api/sandbox/send-funds") {
+            contentType(ContentType.Application.Json)
+            setBody("""
+                {
+                    "quoteId": "$quoteId",
+                    "currencyCode": "USD",
+                    "currencyAmount": 1000
+                }
+            """)
+        }
+        assertEquals(HttpStatusCode.OK, fundResponse.status, "Sandbox funding failed: ${fundResponse.bodyAsText()}")
+    }
+}

From eae72def4667f448c61f37ff02a68daebc496e7a Mon Sep 17 00:00:00 2001
From: Peng Ying <peng@lightspark.com>
Date: Fri, 27 Mar 2026 15:14:18 -0700
Subject: [PATCH 2/4] docs: add test instructions to Kotlin sample README

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
---
 samples/kotlin/README.md | 41 ++++++++++++++++++++++++++++++++++++++--
 1 file changed, 39 insertions(+), 2 deletions(-)

diff --git a/samples/kotlin/README.md b/samples/kotlin/README.md
index a53140fd..c3a236e7 100644
--- a/samples/kotlin/README.md
+++ b/samples/kotlin/README.md
@@ -7,8 +7,8 @@ A sample application demonstrating the Grid API payout flow using the [Grid Kotl
 This sample walks through a complete payout:
 
 1. **Create Customer** — Register an individual customer on the platform
-2. **Create External Account** — Link a USD bank account to the customer
-3. **Create Quote** — Get a real-time quote for USDC to USD conversion
+2. **Create External Account** — Link a bank account (MXN, BRL, INR, GBP, PHP, EUR) to the customer
+3. **Create Quote** — Get a real-time quote for USD or USDC conversion
 4. **Sandbox Fund** — Simulate funding to complete the transaction
 
 Webhook events are streamed to the frontend in real time via Server-Sent Events (SSE).
@@ -109,3 +109,40 @@ Grid API calls are in `src/main/kotlin/com/grid/sample/routes/`:
 | [`Webhooks.kt`](src/main/kotlin/com/grid/sample/routes/Webhooks.kt) | Verify and parse incoming webhooks via `WebhookUtils.verifyWebhookSignature()` |
 
 Client initialization is in [`GridClientBuilder.kt`](src/main/kotlin/com/grid/sample/GridClientBuilder.kt).
+
+## Testing
+
+### Backend E2E tests (Ktor)
+
+These tests hit the Grid sandbox API directly via the Ktor route handlers. They require sandbox credentials in `.env`.
+
+```bash
+cd samples/kotlin
+./gradlew test
+```
+
+### Browser E2E tests (Playwright)
+
+These tests drive the full React UI in a real browser. The Kotlin backend must be running first.
+
+**Terminal 1 — Start the backend:**
+
+```bash
+cd samples/kotlin
+./gradlew run
+```
+
+**Terminal 2 — Run the tests:**
+
+```bash
+cd samples/frontend
+npm install
+npx playwright install chromium
+npm run test:e2e
+```
+
+To run tests with a visible browser window:
+
+```bash
+npm run test:e2e:headed
+```

From 269bab36ece960c0b1ba8baf8ee36e9baef9641b Mon Sep 17 00:00:00 2001
From: Peng Ying <peng@lightspark.com>
Date: Fri, 27 Mar 2026 15:31:51 -0700
Subject: [PATCH 3/4] fix: update external account fields to match per-country
 requirements

- India: name, UPI, countryOfResidence
- Mexico: name, CLABE, countryOfResidence
- Brazil: name, taxId, pixKeyType, pixKey, countryOfResidence
- Philippines: name, bankCode, accountNumber, countryOfResidence
- EU: name, IBAN, full address, countryOfResidence
- UK: name, sortCode, accountNumber, countryOfResidence

Removes extra fields (birthDate, email, phone, swiftCode) that are not
required per the spec. Makes swiftCode optional in the EUR backend handler.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
---
 .../src/steps/CreateExternalAccount.tsx       | 97 +++++--------------
 .../grid/sample/routes/ExternalAccounts.kt    | 14 ++-
 .../kotlin/com/grid/sample/EndToEndTest.kt    | 10 +-
 3 files changed, 32 insertions(+), 89 deletions(-)

diff --git a/samples/frontend/src/steps/CreateExternalAccount.tsx b/samples/frontend/src/steps/CreateExternalAccount.tsx
index 2cf97481..f6b3c986 100644
--- a/samples/frontend/src/steps/CreateExternalAccount.tsx
+++ b/samples/frontend/src/steps/CreateExternalAccount.tsx
@@ -30,17 +30,7 @@ const COUNTRY_CONFIGS: Record<string, {
     beneficiary: {
       beneficiaryType: "INDIVIDUAL",
       fullName: "Priya Sharma",
-      birthDate: "1991-06-12",
-      nationality: "IN",
-      email: "priya.sharma@example.com",
-      phoneNumber: "+919876543210",
-      address: {
-        line1: "42 MG Road",
-        city: "Bangalore",
-        state: "Karnataka",
-        postalCode: "560001",
-        country: "IN"
-      }
+      nationality: "IN"
     }
   },
   MX: {
@@ -55,17 +45,7 @@ const COUNTRY_CONFIGS: Record<string, {
     beneficiary: {
       beneficiaryType: "INDIVIDUAL",
       fullName: "Carlos García",
-      birthDate: "1988-07-15",
-      nationality: "MX",
-      email: "carlos.garcia@example.com",
-      phoneNumber: "+5215512345678",
-      address: {
-        line1: "Av. Reforma 222",
-        city: "Mexico City",
-        state: "CDMX",
-        postalCode: "06600",
-        country: "MX"
-      }
+      nationality: "MX"
     }
   },
   BR: {
@@ -74,25 +54,15 @@ const COUNTRY_CONFIGS: Record<string, {
     description: "BRL account (PIX)",
     accountInfo: {
       accountType: "BRL_ACCOUNT",
-      pixKey: "carlos@example.com",
       pixKeyType: "EMAIL",
+      pixKey: "ana.silva@example.com",
       taxId: "12345678901",
       paymentRails: ["PIX"]
     },
     beneficiary: {
       beneficiaryType: "INDIVIDUAL",
       fullName: "Ana Silva",
-      birthDate: "1990-11-20",
-      nationality: "BR",
-      email: "ana.silva@example.com",
-      phoneNumber: "+5511987654321",
-      address: {
-        line1: "Rua Augusta 1200",
-        city: "São Paulo",
-        state: "SP",
-        postalCode: "01304-001",
-        country: "BR"
-      }
+      nationality: "BR"
     }
   },
   PH: {
@@ -101,49 +71,14 @@ const COUNTRY_CONFIGS: Record<string, {
     description: "PHP account (Bank Transfer)",
     accountInfo: {
       accountType: "PHP_ACCOUNT",
-      bankName: "BDO Unibank",
+      bankCode: "BDO",
       accountNumber: "001234567890",
       paymentRails: ["BANK_TRANSFER"]
     },
     beneficiary: {
       beneficiaryType: "INDIVIDUAL",
       fullName: "Maria Santos",
-      birthDate: "1995-04-10",
-      nationality: "PH",
-      email: "maria.santos@example.com",
-      phoneNumber: "+639171234567",
-      address: {
-        line1: "123 Rizal Avenue",
-        city: "Manila",
-        state: "Metro Manila",
-        postalCode: "1000",
-        country: "PH"
-      }
-    }
-  },
-  GB: {
-    label: "🇬🇧 United Kingdom (GBP)",
-    currency: "GBP",
-    description: "GBP account (Faster Payments)",
-    accountInfo: {
-      accountType: "GBP_ACCOUNT",
-      sortCode: "123456",
-      accountNumber: "12345678",
-      paymentRails: ["FASTER_PAYMENTS"]
-    },
-    beneficiary: {
-      beneficiaryType: "INDIVIDUAL",
-      fullName: "James Smith",
-      birthDate: "1985-09-03",
-      nationality: "GB",
-      email: "james.smith@example.com",
-      phoneNumber: "+447911123456",
-      address: {
-        line1: "10 Downing Street",
-        city: "London",
-        postalCode: "SW1A 2AA",
-        country: "GB"
-      }
+      nationality: "PH"
     }
   },
   EU: {
@@ -153,16 +88,12 @@ const COUNTRY_CONFIGS: Record<string, {
     accountInfo: {
       accountType: "EUR_ACCOUNT",
       iban: "DE89370400440532013000",
-      swiftCode: "DEUTDEFF",
       paymentRails: ["SEPA"]
     },
     beneficiary: {
       beneficiaryType: "INDIVIDUAL",
       fullName: "Hans Müller",
-      birthDate: "1987-01-22",
       nationality: "DE",
-      email: "hans.mueller@example.com",
-      phoneNumber: "+4917612345678",
       address: {
         line1: "Friedrichstraße 43",
         city: "Berlin",
@@ -170,6 +101,22 @@ const COUNTRY_CONFIGS: Record<string, {
         country: "DE"
       }
     }
+  },
+  GB: {
+    label: "🇬🇧 United Kingdom (GBP)",
+    currency: "GBP",
+    description: "GBP account (Faster Payments)",
+    accountInfo: {
+      accountType: "GBP_ACCOUNT",
+      sortCode: "123456",
+      accountNumber: "12345678",
+      paymentRails: ["FASTER_PAYMENTS"]
+    },
+    beneficiary: {
+      beneficiaryType: "INDIVIDUAL",
+      fullName: "James Smith",
+      nationality: "GB"
+    }
   }
 }
 
diff --git a/samples/kotlin/src/main/kotlin/com/grid/sample/routes/ExternalAccounts.kt b/samples/kotlin/src/main/kotlin/com/grid/sample/routes/ExternalAccounts.kt
index fcfd9bf8..d0d753e8 100644
--- a/samples/kotlin/src/main/kotlin/com/grid/sample/routes/ExternalAccounts.kt
+++ b/samples/kotlin/src/main/kotlin/com/grid/sample/routes/ExternalAccounts.kt
@@ -157,7 +157,7 @@ private fun buildAccountInfo(accountType: String, accountInfo: JsonNode): Extern
             val beneficiary = buildPhpBeneficiary(beneficiaryNode)
             val info = PhpExternalAccountInfo.builder()
                 .accountType(PhpAccountInfo.AccountType.PHP_ACCOUNT)
-                .bankName(accountInfo.requireText("bankName"))
+                .bankName(accountInfo.optText("bankCode") ?: accountInfo.requireText("bankName"))
                 .accountNumber(accountInfo.requireText("accountNumber"))
                 .beneficiary(beneficiary)
                 .paymentRails(buildPaymentRails(accountInfo) { PhpAccountInfo.PaymentRail.of(it) })
@@ -166,15 +166,19 @@ private fun buildAccountInfo(accountType: String, accountInfo: JsonNode): Extern
         }
         "EUR_ACCOUNT" -> {
             val beneficiary = buildEurBeneficiary(beneficiaryNode)
-            val swiftCode = accountInfo.optText("swiftCode") ?: ""
             val info = ExternalAccountInfoOneOf.EurAccount.builder()
                 .accountType(EurAccountInfo.AccountType.EUR_ACCOUNT)
                 .iban(accountInfo.requireText("iban"))
-                .swiftBic(swiftCode)
                 .beneficiary(beneficiary)
                 .paymentRails(buildPaymentRails(accountInfo) { EurAccountInfo.PaymentRail.of(it) })
-                // Workaround: SDK serializes as "swiftBic" but the API expects "swiftCode"
-                .putAdditionalProperty("swiftCode", com.lightspark.grid.core.JsonValue.from(swiftCode))
+                .apply {
+                    val swiftCode = accountInfo.optText("swiftCode")
+                    if (swiftCode != null) {
+                        swiftBic(swiftCode)
+                        // Workaround: SDK serializes as "swiftBic" but the API expects "swiftCode"
+                        putAdditionalProperty("swiftCode", com.lightspark.grid.core.JsonValue.from(swiftCode))
+                    }
+                }
                 .build()
             ExternalAccountInfoOneOf.ofEurAccount(info)
         }
diff --git a/samples/kotlin/src/test/kotlin/com/grid/sample/EndToEndTest.kt b/samples/kotlin/src/test/kotlin/com/grid/sample/EndToEndTest.kt
index ac7c9749..44b4bac8 100644
--- a/samples/kotlin/src/test/kotlin/com/grid/sample/EndToEndTest.kt
+++ b/samples/kotlin/src/test/kotlin/com/grid/sample/EndToEndTest.kt
@@ -285,15 +285,7 @@ class EndToEndTest {
                     "beneficiary": {
                         "beneficiaryType": "INDIVIDUAL",
                         "fullName": "E2E Test User",
-                        "birthDate": "1988-07-15",
-                        "nationality": "MX",
-                        "address": {
-                            "line1": "Av. Reforma 222",
-                            "city": "Mexico City",
-                            "state": "CDMX",
-                            "postalCode": "06600",
-                            "country": "MX"
-                        }
+                        "nationality": "MX"
                     }
                 }
             """)

From b3383acf07bc8cc40135cb517ae4a1cdc6179bda Mon Sep 17 00:00:00 2001
From: Peng Ying <peng@lightspark.com>
Date: Fri, 27 Mar 2026 15:53:38 -0700
Subject: [PATCH 4/4] fix: use countryOfResidence instead of nationality for
 beneficiary

The API field is countryOfResidence, not nationality. Updated frontend
configs, backend parser (with fallback to nationality), and E2E tests.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
---
 samples/frontend/src/steps/CreateExternalAccount.tsx | 12 ++++++------
 .../com/grid/sample/routes/ExternalAccounts.kt       |  2 +-
 .../src/test/kotlin/com/grid/sample/EndToEndTest.kt  | 11 ++++-------
 3 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/samples/frontend/src/steps/CreateExternalAccount.tsx b/samples/frontend/src/steps/CreateExternalAccount.tsx
index f6b3c986..05305e1d 100644
--- a/samples/frontend/src/steps/CreateExternalAccount.tsx
+++ b/samples/frontend/src/steps/CreateExternalAccount.tsx
@@ -30,7 +30,7 @@ const COUNTRY_CONFIGS: Record<string, {
     beneficiary: {
       beneficiaryType: "INDIVIDUAL",
       fullName: "Priya Sharma",
-      nationality: "IN"
+      countryOfResidence: "IN"
     }
   },
   MX: {
@@ -45,7 +45,7 @@ const COUNTRY_CONFIGS: Record<string, {
     beneficiary: {
       beneficiaryType: "INDIVIDUAL",
       fullName: "Carlos García",
-      nationality: "MX"
+      countryOfResidence: "MX"
     }
   },
   BR: {
@@ -62,7 +62,7 @@ const COUNTRY_CONFIGS: Record<string, {
     beneficiary: {
       beneficiaryType: "INDIVIDUAL",
       fullName: "Ana Silva",
-      nationality: "BR"
+      countryOfResidence: "BR"
     }
   },
   PH: {
@@ -78,7 +78,7 @@ const COUNTRY_CONFIGS: Record<string, {
     beneficiary: {
       beneficiaryType: "INDIVIDUAL",
       fullName: "Maria Santos",
-      nationality: "PH"
+      countryOfResidence: "PH"
     }
   },
   EU: {
@@ -93,7 +93,7 @@ const COUNTRY_CONFIGS: Record<string, {
     beneficiary: {
       beneficiaryType: "INDIVIDUAL",
       fullName: "Hans Müller",
-      nationality: "DE",
+      countryOfResidence: "DE",
       address: {
         line1: "Friedrichstraße 43",
         city: "Berlin",
@@ -115,7 +115,7 @@ const COUNTRY_CONFIGS: Record<string, {
     beneficiary: {
       beneficiaryType: "INDIVIDUAL",
       fullName: "James Smith",
-      nationality: "GB"
+      countryOfResidence: "GB"
     }
   }
 }
diff --git a/samples/kotlin/src/main/kotlin/com/grid/sample/routes/ExternalAccounts.kt b/samples/kotlin/src/main/kotlin/com/grid/sample/routes/ExternalAccounts.kt
index d0d753e8..744f4b61 100644
--- a/samples/kotlin/src/main/kotlin/com/grid/sample/routes/ExternalAccounts.kt
+++ b/samples/kotlin/src/main/kotlin/com/grid/sample/routes/ExternalAccounts.kt
@@ -212,7 +212,7 @@ private fun parseBeneficiaryFields(node: JsonNode?): BeneficiaryFields {
     if (node == null || node.isNull) return BeneficiaryFields("Account Holder", null, null, null)
     return BeneficiaryFields(
         fullName = node.optText("fullName") ?: "",
-        nationality = node.optText("nationality"),
+        nationality = node.optText("countryOfResidence") ?: node.optText("nationality"),
         birthDate = node.optText("birthDate"),
         address = buildAddress(node.get("address")),
     )
diff --git a/samples/kotlin/src/test/kotlin/com/grid/sample/EndToEndTest.kt b/samples/kotlin/src/test/kotlin/com/grid/sample/EndToEndTest.kt
index 44b4bac8..9f89a310 100644
--- a/samples/kotlin/src/test/kotlin/com/grid/sample/EndToEndTest.kt
+++ b/samples/kotlin/src/test/kotlin/com/grid/sample/EndToEndTest.kt
@@ -84,8 +84,7 @@ class EndToEndTest {
                     "beneficiary": {
                         "beneficiaryType": "INDIVIDUAL",
                         "fullName": "Carlos Test",
-                        "birthDate": "1990-01-01",
-                        "nationality": "MX"
+                        "countryOfResidence": "MX"
                     }
                 }
             """)
@@ -130,8 +129,7 @@ class EndToEndTest {
                     "beneficiary": {
                         "beneficiaryType": "INDIVIDUAL",
                         "fullName": "Priya Test",
-                        "birthDate": "1991-06-12",
-                        "nationality": "IN"
+                        "countryOfResidence": "IN"
                     }
                 }
             """)
@@ -206,8 +204,7 @@ class EndToEndTest {
                     "beneficiary": {
                         "beneficiaryType": "INDIVIDUAL",
                         "fullName": "Quote Test",
-                        "birthDate": "1990-01-01",
-                        "nationality": "MX"
+                        "countryOfResidence": "MX"
                     }
                 }
             """)
@@ -285,7 +282,7 @@ class EndToEndTest {
                     "beneficiary": {
                         "beneficiaryType": "INDIVIDUAL",
                         "fullName": "E2E Test User",
-                        "nationality": "MX"
+                        "countryOfResidence": "MX"
                     }
                 }
             """)