@@ -4,6 +4,7 @@
 '@object-ui/components': patch
 '@object-ui/plugin-form': patch
 '@object-ui/plugin-grid': patch
+'@object-ui/plugin-list': patch
 '@object-ui/plugin-dashboard': patch
 '@object-ui/plugin-detail': patch
 '@object-ui/plugin-gantt': patch
@@ -18,7 +19,8 @@ Metadata-protocol: none
 An amount declaring `currencyConfig: { currencyMode: 'record', currencyField: 'currency_code' }` now renders in the currency its record's `currency_code` holds, on every face that holds the record:
 
 - **Cells and widgets.** `resolveFieldCurrency(field, tenantDefault, record)` takes the record in scope as an optional third argument. Under `record` mode it reads only that record's code field; no record, or a blank code, resolves to no currency, so the amount shows as a plain number and never in the tenant default. `dynamic` and `fixed` fields resolve exactly as before. The list cell, the form and inline amount box (symbol, decimals and spinner step follow the selected code), formula cells returning `currency`, the record page's summary chips, the dashboard table and record drawer, and Gantt tooltips all pass the record. `recordCurrencyField(field)` names the pointer.
-- **The code field.** A `text` field declaring `valueDomain: 'iso_4217_currency'` renders a searchable select instead of a free-text box, grouped "Available" (the organization currency, then rated currencies, then the code the record already holds) and "All currencies (ISO 4217)". It offers only codes the value domain accepts. The rated group is empty until the exchange-rate table ships.
+- **The code field.** A `text` field declaring `valueDomain: 'iso_4217_currency'` renders a searchable select instead of a free-text box, grouped "Available" (the organization currency, then rated currencies, then the codes the object's records already hold) and "All currencies (ISO 4217)". It offers only codes the value domain accepts. The form reads the used codes once per object, with one grouped query, and hands them to the field on its own metadata (`usedCurrencyCodes`); a data source without grouped queries offers home + the record's own code. The rated group is empty until the exchange-rate table ships. The picker itself is `CurrencyCodePicker` in `@object-ui/components`.
+- **Filters.** In the list's filter builder, a condition on a `record`-mode amount gains a required currency picker, defaulting to the organization currency, and the filter reads `amount op X AND code = C`: the code condition is a second row of the same group, so stored filters keep their shape. A group holding such a pair stays on AND (under OR the pair would split), and a stored OR group says so. Presence checks (`is null`, `is empty`, …) need no currency.
 - **Create forms.** A code field that a `record`-mode amount points at opens pre-filled with `localization.currency`, as a value the user submits; a declared `defaultValue` and the caller's record win, and nothing is seeded while the setting is unset.
 - **Totals.** The grid footer draws no sum, average, minimum or maximum for a `record`-mode amount (its rows are in different currencies); counts stand. A group header keeps those aggregates only when the grid is grouped by the amount's code field. Consolidated totals belong to the home field, a `dynamic` amount that totals as before.
 - **Studio.** A currency field (or a formula returning `currency`) gains a currency section: the mode (dynamic, fixed, record), the fixed code, and under `record` a `currencyField` picker listing the object's ISO 4217 code fields, with "Create currency field", which adds `currency_code` (`text`, `valueDomain: 'iso_4217_currency'`, required) and points the amount at it.
 
@@ -0,0 +1,195 @@
+/**
+ * ObjectUI
+ * Copyright (c) 2024-present ObjectStack Inc.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+/**
+ * objectstack#27188 — a filter on a `record`-mode amount compares within one
+ * currency (ADR-0144 D6): the row draws a required currency picker, defaulting
+ * to the organization currency, and the builder emits `amount op X AND
+ * code = C` as the amount row plus its companion code row.
+ */
+import { describe, it, expect, vi, afterEach } from 'vitest';
+import React from 'react';
+import { render, screen, fireEvent, cleanup } from '@testing-library/react';
+import '@testing-library/jest-dom';
+import { LocalizationProvider } from '@object-ui/i18n';
+import { FilterBuilder, type FilterBuilderRowGroup } from '../custom/filter-builder';
+import {
+  CURRENCY_COMPANION_SUFFIX,
+  syncRecordCurrencyRows,
+} from '../custom/filterRecordCurrency';
+
+afterEach(() => cleanup());
+
+const FIELDS = [
+  { value: 'amount', label: 'Amount', type: 'currency', currencyField: 'currency_code' },
+  { value: 'budget', label: 'Budget', type: 'currency' },
+  { value: 'stage', label: 'Stage', type: 'text' },
+];
+
+const comparesValue = (op: string) => !['is_null', 'is_not_null', 'is_empty', 'is_not_empty', 'exists', 'notExists'].includes(op);
+
+function group(conditions: FilterBuilderRowGroup['conditions'], logic: 'and' | 'or' = 'and'): FilterBuilderRowGroup {
+  return { id: 'root', logic, conditions };
+}
+
+describe('syncRecordCurrencyRows', () => {
+  it('follows a value-comparing amount row with its code row, on the home currency', () => {
+    const out = syncRecordCurrencyRows(
+      group([{ id: 'a', field: 'amount', operator: 'greater_than', value: 100 }]),
+      FIELDS,
+      'CNY',
+      comparesValue,
+    );
+    expect(out.conditions).toEqual([
+      { id: 'a', field: 'amount', operator: 'greater_than', value: 100 },
+      { id: `a${CURRENCY_COMPANION_SUFFIX}`, field: 'currency_code', operator: 'equals', value: 'CNY' },
+    ]);
+  });
+
+  it('keeps a code the row already holds', () => {
+    const out = syncRecordCurrencyRows(
+      group([
+        { id: 'a', field: 'amount', operator: 'greater_than', value: 100 },
+        { id: 'a::currency', field: 'currency_code', operator: 'equals', value: 'EUR' },
+      ]),
+      FIELDS,
+      'CNY',
+      comparesValue,
+    );
+    expect(out.conditions[1].value).toBe('EUR');
+  });
+
+  it('returns the same group when every pair is settled', () => {
+    const settled = group([
+      { id: 'a', field: 'amount', operator: 'greater_than', value: 100 },
+      { id: 'a::currency', field: 'currency_code', operator: 'equals', value: 'EUR' },
+    ]);
+    expect(syncRecordCurrencyRows(settled, FIELDS, 'CNY', comparesValue)).toBe(settled);
+  });
+
+  it('pairs nothing for a presence check, a fixed/dynamic amount, or another field', () => {
+    const out = syncRecordCurrencyRows(
+      group([
+        { id: 'a', field: 'amount', operator: 'is_null' },
+        { id: 'b', field: 'budget', operator: 'greater_than', value: 5 },
+        { id: 'c', field: 'stage', operator: 'equals', value: 'won' },
+      ]),
+      FIELDS,
+      'CNY',
+      comparesValue,
+    );
+    expect(out.conditions.map((c) => c.id)).toEqual(['a', 'b', 'c']);
+  });
+
+  it('drops a companion whose amount row is gone or no longer pairs', () => {
+    const out = syncRecordCurrencyRows(
+      group([
+        { id: 'x::currency', field: 'currency_code', operator: 'equals', value: 'USD' },
+        { id: 'a', field: 'budget', operator: 'greater_than', value: 1 },
+        { id: 'a::currency', field: 'currency_code', operator: 'equals', value: 'USD' },
+      ]),
+      FIELDS,
+      'CNY',
+      comparesValue,
+    );
+    expect(out.conditions.map((c) => c.id)).toEqual(['a']);
+  });
+
+  it('leaves the code blank when the organization currency is unset', () => {
+    const out = syncRecordCurrencyRows(
+      group([{ id: 'a', field: 'amount', operator: 'equals', value: 1 }]),
+      FIELDS,
+      undefined,
+      comparesValue,
+    );
+    expect(out.conditions[1].value).toBe('');
+  });
+});
+
+function renderBuilder(value: FilterBuilderRowGroup, currency = 'CNY') {
+  const onChange = vi.fn();
+  const utils = render(
+    <LocalizationProvider value={{ currency }}>
+      <FilterBuilder fields={FIELDS as any} value={value} onChange={onChange} />
+    </LocalizationProvider>,
+  );
+  return { ...utils, onChange };
+}
+
+describe('FilterBuilder — a record-mode amount row', () => {
+  it('draws one currency picker per paired row and no row for the companion', () => {
+    const value = group([
+      { id: 'a', field: 'amount', operator: 'greater_than', value: 100 },
+      { id: 'a::currency', field: 'currency_code', operator: 'equals', value: 'EUR' },
+    ]);
+    renderBuilder(value);
+    const pickers = screen.getAllByTestId('filter-currency-picker');
+    expect(pickers).toHaveLength(1);
+    expect(pickers[0]).toHaveTextContent('EUR');
+    // One visible row: one remove button.
+    expect(screen.getAllByText('Remove condition')).toHaveLength(1);
+  });
+
+  it('a new amount row emits its code condition on the organization currency', () => {
+    const value = group([]);
+    const { onChange } = renderBuilder(value);
+    fireEvent.click(screen.getByText('Add filter'));
+    const emitted: FilterBuilderRowGroup = onChange.mock.calls.at(-1)![0];
+    expect(emitted.logic).toBe('and');
+    expect(emitted.conditions).toHaveLength(2);
+    expect(emitted.conditions[0]).toMatchObject({ field: 'amount', operator: 'equals' });
+    expect(emitted.conditions[1]).toEqual({
+      id: `${emitted.conditions[0].id}${CURRENCY_COMPANION_SUFFIX}`,
+      field: 'currency_code',
+      operator: 'equals',
+      value: 'CNY',
+    });
+  });
+
+  it('removing the amount row removes its code condition', () => {
+    const value = group([
+      { id: 'a', field: 'amount', operator: 'greater_than', value: 100 },
+      { id: 'a::currency', field: 'currency_code', operator: 'equals', value: 'EUR' },
+      { id: 's', field: 'stage', operator: 'equals', value: 'won' },
+    ]);
+    const { onChange } = renderBuilder(value);
+    fireEvent.click(screen.getAllByText('Remove condition')[0].closest('button')!);
+    const emitted: FilterBuilderRowGroup = onChange.mock.calls.at(-1)![0];
+    expect(emitted.conditions.map((c) => c.id)).toEqual(['s']);
+  });
+
+  it('a stored amount row without a code shows a blank, invalid picker and emits nothing on read', () => {
+    const value = group([{ id: 'a', field: 'amount', operator: 'greater_than', value: 100 }]);
+    const { onChange } = renderBuilder(value);
+    const picker = screen.getByTestId('filter-currency-picker');
+    expect(picker).toHaveTextContent('Currency');
+    expect(picker).toHaveAttribute('aria-invalid', 'true');
+    expect(onChange).not.toHaveBeenCalled();
+  });
+
+  it('a paired group cannot switch to OR, and a stored OR group says why', () => {
+    const paired = group([
+      { id: 'a', field: 'amount', operator: 'greater_than', value: 100 },
+      { id: 'a::currency', field: 'currency_code', operator: 'equals', value: 'EUR' },
+      { id: 's', field: 'stage', operator: 'equals', value: 'won' },
+    ]);
+    const { unmount } = renderBuilder(paired);
+    expect(screen.getByTestId('filter-logic-toggle')).toBeDisabled();
+    expect(screen.queryByTestId('filter-currency-needs-and')).toBeNull();
+    unmount();
+
+    renderBuilder({ ...paired, logic: 'or' });
+    expect(screen.getByTestId('filter-logic-toggle')).not.toBeDisabled();
+    expect(screen.getByTestId('filter-currency-needs-and')).toBeInTheDocument();
+  });
+
+  it('draws no picker on a dynamic/fixed amount', () => {
+    renderBuilder(group([{ id: 'b', field: 'budget', operator: 'greater_than', value: 1 }]));
+    expect(screen.queryByTestId('filter-currency-picker')).toBeNull();
+  });
+});