diff --git a/client/src/components/Budget/CostsCurrencyPicker.tsx b/client/src/components/Budget/CostsCurrencyPicker.tsx
new file mode 100644
index 000000000..820d2c8c3
--- /dev/null
+++ b/client/src/components/Budget/CostsCurrencyPicker.tsx
@@ -0,0 +1,36 @@
+import { useTranslation } from '../../i18n';
+import CustomSelect from '../shared/CustomSelect';
+import { Tooltip } from '../shared/Tooltip';
+
+/**
+ * Which currency Costs shows the trip in (#1683): a compact select with the
+ * usual currency and the trip's own on top. Desktop bar, narrow window and phone
+ * tab alike; the pick itself lives in useCostsCurrency.
+ */
+export function CostsCurrencyPicker({
+ value,
+ options,
+ onChange,
+}: {
+ value: string;
+ options: { value: string; label: string }[];
+ onChange: (currency: string) => void;
+}) {
+ const { t } = useTranslation();
+ return (
+
+
+ onChange(String(v))}
+ options={options}
+ size="sm"
+ searchable
+ menuFit="content"
+ style={{ width: '100%' }}
+ />
+
+
+ );
+}
diff --git a/client/src/components/Budget/CostsPanel.test.tsx b/client/src/components/Budget/CostsPanel.test.tsx
index 155d23528..4967e250e 100644
--- a/client/src/components/Budget/CostsPanel.test.tsx
+++ b/client/src/components/Budget/CostsPanel.test.tsx
@@ -741,7 +741,7 @@ describe('CostsPanel — settlements in the ledger', () => {
await user.click(await screen.findByRole('button', { name: 'Add payment' }))
await user.type(await screen.findByPlaceholderText('0,00'), '25')
// Bob paid me back in dollars — the server freezes the USD rate on write.
- await user.click(screen.getByText(/^EUR/))
+ await user.click(within(screen.getByRole('dialog')).getByText(/^EUR/))
await user.click(await screen.findByText(/^USD/))
const addButtons = screen.getAllByRole('button', { name: 'Add payment' })
await user.click(addButtons[addButtons.length - 1])
@@ -1451,7 +1451,7 @@ describe('CostsPanel — expense modal', () => {
await user.type(screen.getByPlaceholderText('e.g. Dinner, souvenirs, gas…'), 'Diner')
await user.type(screen.getAllByPlaceholderText('0,00')[0], '100')
- await user.click(screen.getByText(/^EUR/))
+ await user.click(within(screen.getByRole('dialog')).getByText(/^EUR/))
await user.click(await screen.findByText(/^USD/))
expect(screen.getByText('live rate', { exact: false })).toBeInTheDocument()
@@ -2493,7 +2493,7 @@ describe('CostsPanel: a bill entered in the display currency (#2525)', () => {
// Seeding the display currency here would label 100 euro as 100 dollars, and a
// plain save would then store it that way.
expect(screen.getByText(/^EUR/)).toBeInTheDocument()
- expect(screen.queryByText(/^USD/)).toBeNull()
+ expect(within(screen.getByRole('dialog')).queryByText(/^USD/)).toBeNull()
// Saving without touching anything keeps the 100 euro.
await user.click(screen.getByRole('button', { name: 'Save' }))
diff --git a/client/src/components/Budget/CostsPanel.tsx b/client/src/components/Budget/CostsPanel.tsx
index 641272d3f..3d463041d 100644
--- a/client/src/components/Budget/CostsPanel.tsx
+++ b/client/src/components/Budget/CostsPanel.tsx
@@ -32,6 +32,7 @@ import { FlowPills } from './FlowPills'
import { CostsSplitChips } from './CostsSplitChips'
import { CostsModeCard } from './CostsModeCard'
import { CostsCategoryBreakdown } from './CostsCategoryBreakdown'
+import { CostsCurrencyPicker } from './CostsCurrencyPicker'
import type { BudgetParticipantFinal, ReceiptLine } from '@trek/shared'
import type { BudgetItem, BudgetItemReceipt } from '../../types'
import type { TripMember } from './BudgetPanelMemberChips'
@@ -76,7 +77,7 @@ export default function CostsPanel({ tripId, tripMembers = [] }: CostsPanelProps
me, base, tripCurrency, ctx, settlement, settlementError, loadSettlement, knownNames, splitting,
search, setSearch, segment: filter, setSegment: setFilter, catFilter, setCatFilter, dayFilter, setDayFilter,
totals, filtered, filteredSettlements, catBreakdown, leftOutLabel, toggleLeftOutCat, countAllCats, exportCsv: handleExportCsv,
- deleteExpense: handleDelete, undoSettlement, settleFlow, settleAll,
+ deleteExpense: handleDelete, undoSettlement, settleFlow, settleAll, setBase, baseOptions,
} = useCostsLedger({
tripId, trip, budgetItems, memberCount: tripMembers.length, actions: { loadBudgetItems, deleteBudgetItem }, canEdit, t, toast,
settlementOnTripChange: true, skipUnfinishedShares: true, csvCurrencyAsStored: true,
@@ -273,7 +274,7 @@ export default function CostsPanel({ tripId, tripMembers = [] }: CostsPanelProps
canEdit={canEdit} canSettle={(settlement?.flows || []).length > 0}
onSettleAll={settleAll} onAddExpense={() => { setEditing(null); setModalOpen(true) }}
onScanReceipt={receiptScan.offered ? receiptScan.open : undefined}
- view={view} onView={setView}
+ view={view} onView={setView} currency={{ value: base, options: baseOptions, onChange: setBase }}
filters={{
query: search, onQuery: setSearch,
owner: filter, onOwner: setFilter,
@@ -557,7 +558,8 @@ export default function CostsPanel({ tripId, tripMembers = [] }: CostsPanelProps
{/* Expenses */}
-
{t('costs.expenses')}
+
{t('costs.expenses')}
+