feat(finance): add settlement currency and cycle fx rates

2026-03-31 14:04:04 +00:00 · 2026-03-10 16:46:59 +04:00
parent 4c0508f618
commit fb85219409
38 changed files with 3546 additions and 114 deletions
--- a/apps/bot/src/anonymous-feedback.test.ts
+++ b/apps/bot/src/anonymous-feedback.test.ts
@@ -198,6 +198,7 @@ function createHouseholdConfigurationRepository(): HouseholdConfigurationReposit
    }),
    getHouseholdBillingSettings: async (householdId) => ({
      householdId,
+      settlementCurrency: 'GEL',
      rentAmountMinor: null,
      rentCurrency: 'USD',
      rentDueDay: 20,
@@ -208,6 +209,7 @@ function createHouseholdConfigurationRepository(): HouseholdConfigurationReposit
    }),
    updateHouseholdBillingSettings: async (input) => ({
      householdId: input.householdId,
+      settlementCurrency: 'GEL',
      rentAmountMinor: input.rentAmountMinor ?? null,
      rentCurrency: input.rentCurrency ?? 'USD',
      rentDueDay: input.rentDueDay ?? 20,
--- a/apps/bot/src/index.ts
+++ b/apps/bot/src/index.ts
@@ -51,6 +51,7 @@ import {
  createMiniAppRentUpdateHandler
 } from './miniapp-billing'
 import { createMiniAppLocalePreferenceHandler } from './miniapp-locale'
+import { createNbgExchangeRateProvider } from './nbg-exchange-rates'

 const runtime = getBotRuntimeConfig()
 configureLogger({
@@ -71,6 +72,9 @@ const bot = createTelegramBot(
 const webhookHandler = webhookCallback(bot, 'std/http')
 const financeRepositoryClients = new Map<string, ReturnType<typeof createDbFinanceRepository>>()
 const financeServices = new Map<string, ReturnType<typeof createFinanceCommandService>>()
+const exchangeRateProvider = createNbgExchangeRateProvider({
+  logger: getLogger('fx')
+})
 const householdOnboardingService = householdConfigurationRepositoryClient
  ? createHouseholdOnboardingService({
      repository: householdConfigurationRepositoryClient.repository
@@ -105,7 +109,12 @@ function financeServiceForHousehold(householdId: string) {
  financeRepositoryClients.set(householdId, repositoryClient)
  shutdownTasks.push(repositoryClient.close)

-  const service = createFinanceCommandService(repositoryClient.repository)
+  const service = createFinanceCommandService({
+    householdId,
+    repository: repositoryClient.repository,
+    householdConfigurationRepository: householdConfigurationRepositoryClient!.repository,
+    exchangeRateProvider
+  })
  financeServices.set(householdId, service)
  return service
 }
--- a/apps/bot/src/miniapp-admin.test.ts
+++ b/apps/bot/src/miniapp-admin.test.ts
@@ -118,6 +118,7 @@ function onboardingRepository(): HouseholdConfigurationRepository {
        : null,
    getHouseholdBillingSettings: async (householdId) => ({
      householdId,
+      settlementCurrency: 'GEL',
      rentAmountMinor: 70000n,
      rentCurrency: 'USD',
      rentDueDay: 20,
@@ -128,6 +129,7 @@ function onboardingRepository(): HouseholdConfigurationRepository {
    }),
    updateHouseholdBillingSettings: async (input) => ({
      householdId: input.householdId,
+      settlementCurrency: 'GEL',
      rentAmountMinor: input.rentAmountMinor ?? 70000n,
      rentCurrency: input.rentCurrency ?? 'USD',
      rentDueDay: input.rentDueDay ?? 20,
@@ -370,6 +372,7 @@ describe('createMiniAppSettingsHandler', () => {
      authorized: true,
      settings: {
        householdId: 'household-1',
+        settlementCurrency: 'GEL',
        rentAmountMinor: '70000',
        rentCurrency: 'USD',
        rentDueDay: 20,
@@ -452,6 +455,7 @@ describe('createMiniAppUpdateSettingsHandler', () => {
      authorized: true,
      settings: {
        householdId: 'household-1',
+        settlementCurrency: 'GEL',
        rentAmountMinor: '75000',
        rentCurrency: 'USD',
        rentDueDay: 22,
--- a/apps/bot/src/miniapp-admin.ts
+++ b/apps/bot/src/miniapp-admin.ts
@@ -42,6 +42,7 @@ async function readApprovalPayload(request: Request): Promise<{

 async function readSettingsUpdatePayload(request: Request): Promise<{
  initData: string
+  settlementCurrency?: string
  rentAmountMajor?: string
  rentCurrency?: string
  rentDueDay: number
@@ -58,6 +59,7 @@ async function readSettingsUpdatePayload(request: Request): Promise<{

  const text = await clonedRequest.text()
  let parsed: {
+    settlementCurrency?: string
    rentAmountMajor?: string
    rentCurrency?: string
    rentDueDay?: number
@@ -89,6 +91,11 @@ async function readSettingsUpdatePayload(request: Request): Promise<{
          rentAmountMajor: parsed.rentAmountMajor
        }
      : {}),
+    ...(typeof parsed.settlementCurrency === 'string'
+      ? {
+          settlementCurrency: parsed.settlementCurrency
+        }
+      : {}),
    ...(typeof parsed.rentCurrency === 'string'
      ? {
          rentCurrency: parsed.rentCurrency
@@ -212,6 +219,7 @@ async function readRentWeightPayload(request: Request): Promise<{
 function serializeBillingSettings(settings: HouseholdBillingSettingsRecord) {
  return {
    householdId: settings.householdId,
+    settlementCurrency: settings.settlementCurrency,
    rentAmountMinor: settings.rentAmountMinor?.toString() ?? null,
    rentCurrency: settings.rentCurrency,
    rentDueDay: settings.rentDueDay,
--- a/apps/bot/src/miniapp-auth.test.ts
+++ b/apps/bot/src/miniapp-auth.test.ts
@@ -155,6 +155,7 @@ function onboardingRepository(): HouseholdConfigurationRepository {
    },
    getHouseholdBillingSettings: async (householdId) => ({
      householdId,
+      settlementCurrency: 'GEL',
      rentAmountMinor: null,
      rentCurrency: 'USD',
      rentDueDay: 20,
@@ -165,6 +166,7 @@ function onboardingRepository(): HouseholdConfigurationRepository {
    }),
    updateHouseholdBillingSettings: async (input) => ({
      householdId: input.householdId,
+      settlementCurrency: 'GEL',
      rentAmountMinor: input.rentAmountMinor ?? null,
      rentCurrency: input.rentCurrency ?? 'USD',
      rentDueDay: input.rentDueDay ?? 20,
--- a/apps/bot/src/miniapp-billing.test.ts
+++ b/apps/bot/src/miniapp-billing.test.ts
@@ -77,6 +77,7 @@ function onboardingRepository(): HouseholdConfigurationRepository {
    listHouseholdMembers: async () => [],
    getHouseholdBillingSettings: async (householdId) => ({
      householdId,
+      settlementCurrency: 'GEL',
      rentAmountMinor: 70000n,
      rentCurrency: 'USD',
      rentDueDay: 20,
@@ -87,6 +88,7 @@ function onboardingRepository(): HouseholdConfigurationRepository {
    }),
    updateHouseholdBillingSettings: async (input) => ({
      householdId: input.householdId,
+      settlementCurrency: 'GEL',
      rentAmountMinor: input.rentAmountMinor ?? 70000n,
      rentCurrency: input.rentCurrency ?? 'USD',
      rentDueDay: input.rentDueDay ?? 20,
--- a/apps/bot/src/miniapp-dashboard.test.ts
+++ b/apps/bot/src/miniapp-dashboard.test.ts
@@ -6,6 +6,7 @@ import {
 } from '@household/application'
 import { instantFromIso } from '@household/domain'
 import type {
+  ExchangeRateProvider,
  FinanceRepository,
  HouseholdConfigurationRepository,
  HouseholdTopicBindingRecord
@@ -31,17 +32,19 @@ function repository(
    getOpenCycle: async () => ({
      id: 'cycle-1',
      period: '2026-03',
-      currency: 'USD'
+      currency: 'GEL'
    }),
    getCycleByPeriod: async () => null,
    getLatestCycle: async () => ({
      id: 'cycle-1',
      period: '2026-03',
-      currency: 'USD'
+      currency: 'GEL'
    }),
    openCycle: async () => {},
    closeCycle: async () => {},
    saveRentRule: async () => {},
+    getCycleExchangeRate: async () => null,
+    saveCycleExchangeRate: async (input) => input,
    addUtilityBill: async () => {},
    getRentRuleForPeriod: async () => ({
      amountMinor: 70000n,
@@ -53,7 +56,7 @@ function repository(
        id: 'utility-1',
        billName: 'Electricity',
        amountMinor: 12000n,
-        currency: 'USD',
+        currency: 'GEL',
        createdByMemberId: member?.id ?? 'member-1',
        createdAt: instantFromIso('2026-03-12T12:00:00.000Z')
      }
@@ -72,6 +75,28 @@ function repository(
  }
 }

+const exchangeRateProvider: ExchangeRateProvider = {
+  async getRate(input) {
+    if (input.baseCurrency === input.quoteCurrency) {
+      return {
+        baseCurrency: input.baseCurrency,
+        quoteCurrency: input.quoteCurrency,
+        rateMicros: 1_000_000n,
+        effectiveDate: input.effectiveDate,
+        source: 'nbg'
+      }
+    }
+
+    return {
+      baseCurrency: input.baseCurrency,
+      quoteCurrency: input.quoteCurrency,
+      rateMicros: 2_700_000n,
+      effectiveDate: input.effectiveDate,
+      source: 'nbg'
+    }
+  }
+}
+
 function onboardingRepository(): HouseholdConfigurationRepository {
  const household = {
    householdId: 'household-1',
@@ -141,6 +166,7 @@ function onboardingRepository(): HouseholdConfigurationRepository {
    updateMemberPreferredLocale: async () => null,
    getHouseholdBillingSettings: async (householdId) => ({
      householdId,
+      settlementCurrency: 'GEL',
      rentAmountMinor: null,
      rentCurrency: 'USD',
      rentDueDay: 20,
@@ -151,6 +177,7 @@ function onboardingRepository(): HouseholdConfigurationRepository {
    }),
    updateHouseholdBillingSettings: async (input) => ({
      householdId: input.householdId,
+      settlementCurrency: input.settlementCurrency ?? 'GEL',
      rentAmountMinor: input.rentAmountMinor ?? null,
      rentCurrency: input.rentCurrency ?? 'USD',
      rentDueDay: input.rentDueDay ?? 20,
@@ -176,16 +203,20 @@ function onboardingRepository(): HouseholdConfigurationRepository {
 describe('createMiniAppDashboardHandler', () => {
  test('returns a dashboard for an authenticated household member', async () => {
    const authDate = Math.floor(Date.now() / 1000)
-    const financeService = createFinanceCommandService(
-      repository({
+    const householdRepository = onboardingRepository()
+    const financeService = createFinanceCommandService({
+      householdId: 'household-1',
+      repository: repository({
        id: 'member-1',
        telegramUserId: '123456',
        displayName: 'Stan',
        rentShareWeight: 1,
        isAdmin: true
-      })
-    )
-    const householdRepository = onboardingRepository()
+      }),
+      householdConfigurationRepository: householdRepository,
+      exchangeRateProvider
+    })
+
    householdRepository.listHouseholdMembersByTelegramUserId = async () => [
      {
        id: 'member-1',
@@ -232,13 +263,16 @@ describe('createMiniAppDashboardHandler', () => {
      authorized: true,
      dashboard: {
        period: '2026-03',
-        currency: 'USD',
-        totalDueMajor: '820.00',
+        currency: 'GEL',
+        totalDueMajor: '2010.00',
+        rentSourceAmountMajor: '700.00',
+        rentSourceCurrency: 'USD',
+        rentDisplayAmountMajor: '1890.00',
        members: [
          {
            displayName: 'Stan',
-            netDueMajor: '820.00',
-            rentShareMajor: '700.00',
+            netDueMajor: '2010.00',
+            rentShareMajor: '1890.00',
            utilityShareMajor: '120.00',
            purchaseOffsetMajor: '0.00'
          }
@@ -246,11 +280,13 @@ describe('createMiniAppDashboardHandler', () => {
        ledger: [
          {
            title: 'Soap',
-            currency: 'GEL'
+            currency: 'GEL',
+            displayCurrency: 'GEL'
          },
          {
            title: 'Electricity',
-            currency: 'USD'
+            currency: 'GEL',
+            displayCurrency: 'GEL'
          }
        ]
      }
@@ -258,16 +294,20 @@ describe('createMiniAppDashboardHandler', () => {
  })

  test('returns 400 for malformed JSON bodies', async () => {
-    const financeService = createFinanceCommandService(
-      repository({
+    const householdRepository = onboardingRepository()
+    const financeService = createFinanceCommandService({
+      householdId: 'household-1',
+      repository: repository({
        id: 'member-1',
        telegramUserId: '123456',
        displayName: 'Stan',
        rentShareWeight: 1,
        isAdmin: true
-      })
-    )
-    const householdRepository = onboardingRepository()
+      }),
+      householdConfigurationRepository: householdRepository,
+      exchangeRateProvider
+    })
+
    householdRepository.listHouseholdMembersByTelegramUserId = async () => [
      {
        id: 'member-1',
--- a/apps/bot/src/miniapp-dashboard.ts
+++ b/apps/bot/src/miniapp-dashboard.ts
@@ -89,6 +89,11 @@ export function createMiniAppDashboardHandler(options: {
              period: dashboard.period,
              currency: dashboard.currency,
              totalDueMajor: dashboard.totalDue.toMajorString(),
+              rentSourceAmountMajor: dashboard.rentSourceAmount.toMajorString(),
+              rentSourceCurrency: dashboard.rentSourceAmount.currency,
+              rentDisplayAmountMajor: dashboard.rentDisplayAmount.toMajorString(),
+              rentFxRateMicros: dashboard.rentFxRateMicros?.toString() ?? null,
+              rentFxEffectiveDate: dashboard.rentFxEffectiveDate,
              members: dashboard.members.map((line) => ({
                memberId: line.memberId,
                displayName: line.displayName,
@@ -104,6 +109,10 @@ export function createMiniAppDashboardHandler(options: {
                title: entry.title,
                amountMajor: entry.amount.toMajorString(),
                currency: entry.currency,
+                displayAmountMajor: entry.displayAmount.toMajorString(),
+                displayCurrency: entry.displayCurrency,
+                fxRateMicros: entry.fxRateMicros?.toString() ?? null,
+                fxEffectiveDate: entry.fxEffectiveDate,
                actorDisplayName: entry.actorDisplayName,
                occurredAt: entry.occurredAt
              }))
--- a/apps/bot/src/miniapp-locale.test.ts
+++ b/apps/bot/src/miniapp-locale.test.ts
@@ -130,6 +130,7 @@ function repository(): HouseholdConfigurationRepository {
    },
    getHouseholdBillingSettings: async (householdId) => ({
      householdId,
+      settlementCurrency: 'GEL',
      rentAmountMinor: null,
      rentCurrency: 'USD',
      rentDueDay: 20,
@@ -140,6 +141,7 @@ function repository(): HouseholdConfigurationRepository {
    }),
    updateHouseholdBillingSettings: async (input) => ({
      householdId: input.householdId,
+      settlementCurrency: 'GEL',
      rentAmountMinor: input.rentAmountMinor ?? null,
      rentCurrency: input.rentCurrency ?? 'USD',
      rentDueDay: input.rentDueDay ?? 20,
--- a/apps/bot/src/nbg-exchange-rates.ts
+++ b/apps/bot/src/nbg-exchange-rates.ts
@@ -0,0 +1,157 @@
+import { FX_RATE_SCALE_MICROS, type CurrencyCode } from '@household/domain'
+import type { ExchangeRateProvider } from '@household/ports'
+import type { Logger } from '@household/observability'
+
+interface NbgCurrencyPayload {
+  code: string
+  quantity: number
+  rateFormated?: string
+  rate?: number
+  validFromDate?: string
+}
+
+interface NbgDayPayload {
+  date?: string
+  currencies?: NbgCurrencyPayload[]
+}
+
+function parseScaledDecimal(value: string, scale: number): bigint {
+  const trimmed = value.trim()
+  const match = /^([+-]?)(\d+)(?:\.(\d+))?$/.exec(trimmed)
+  if (!match) {
+    throw new Error(`Invalid decimal value: ${value}`)
+  }
+
+  const [, sign, whole, fraction = ''] = match
+  const normalizedFraction = fraction.padEnd(scale, '0').slice(0, scale)
+  const digits = `${whole}${normalizedFraction}`
+  const parsed = BigInt(digits)
+
+  return sign === '-' ? -parsed : parsed
+}
+
+function divideRoundedHalfUp(dividend: bigint, divisor: bigint): bigint {
+  if (divisor === 0n) {
+    throw new Error('Division by zero')
+  }
+
+  const quotient = dividend / divisor
+  const remainder = dividend % divisor
+  if (remainder * 2n >= divisor) {
+    return quotient + 1n
+  }
+
+  return quotient
+}
+
+export function createNbgExchangeRateProvider(
+  options: {
+    fetchImpl?: typeof fetch
+    logger?: Logger
+  } = {}
+): ExchangeRateProvider {
+  const fetchImpl = options.fetchImpl ?? fetch
+  const cache = new Map<string, Promise<{ gelRateMicros: bigint; effectiveDate: string }>>()
+
+  async function getGelRate(currency: CurrencyCode, effectiveDate: string) {
+    if (currency === 'GEL') {
+      return {
+        gelRateMicros: FX_RATE_SCALE_MICROS,
+        effectiveDate
+      }
+    }
+
+    const cacheKey = `${currency}:${effectiveDate}`
+    const existing = cache.get(cacheKey)
+    if (existing) {
+      return existing
+    }
+
+    const request = (async () => {
+      const url = new URL('https://nbg.gov.ge/gw/api/ct/monetarypolicy/currencies/en/json/')
+      url.searchParams.set('currencies', currency)
+      url.searchParams.set('date', effectiveDate)
+
+      const response = await fetchImpl(url)
+      if (!response.ok) {
+        throw new Error(`NBG request failed: ${response.status}`)
+      }
+
+      const payload = (await response.json()) as NbgDayPayload[]
+      const day = payload[0]
+      const currencyPayload = day?.currencies?.find((entry) => entry.code === currency)
+      if (!currencyPayload) {
+        throw new Error(`NBG rate missing for ${currency} on ${effectiveDate}`)
+      }
+
+      const quantity = Number(currencyPayload.quantity)
+      if (!Number.isFinite(quantity) || quantity <= 0) {
+        throw new Error(`Invalid NBG quantity for ${currency}: ${currencyPayload.quantity}`)
+      }
+
+      const rateString =
+        currencyPayload.rateFormated ??
+        (typeof currencyPayload.rate === 'number' ? currencyPayload.rate.toFixed(6) : null)
+      if (!rateString) {
+        throw new Error(`Invalid NBG rate for ${currency} on ${effectiveDate}`)
+      }
+
+      const effective =
+        currencyPayload.validFromDate?.slice(0, 10) ?? day?.date?.slice(0, 10) ?? effectiveDate
+      const gelRateMicros = divideRoundedHalfUp(parseScaledDecimal(rateString, 6), BigInt(quantity))
+
+      options.logger?.debug(
+        {
+          event: 'fx.nbg_fetched',
+          currency,
+          requestedDate: effectiveDate,
+          effectiveDate: effective,
+          gelRateMicros: gelRateMicros.toString()
+        },
+        'Fetched NBG exchange rate'
+      )
+
+      return {
+        gelRateMicros,
+        effectiveDate: effective
+      }
+    })()
+
+    cache.set(cacheKey, request)
+    return request
+  }
+
+  return {
+    async getRate(input) {
+      if (input.baseCurrency === input.quoteCurrency) {
+        return {
+          baseCurrency: input.baseCurrency,
+          quoteCurrency: input.quoteCurrency,
+          rateMicros: FX_RATE_SCALE_MICROS,
+          effectiveDate: input.effectiveDate,
+          source: 'nbg'
+        }
+      }
+
+      const [base, quote] = await Promise.all([
+        getGelRate(input.baseCurrency, input.effectiveDate),
+        getGelRate(input.quoteCurrency, input.effectiveDate)
+      ])
+
+      const rateMicros = divideRoundedHalfUp(
+        base.gelRateMicros * FX_RATE_SCALE_MICROS,
+        quote.gelRateMicros
+      )
+      const effectiveDate =
+        base.effectiveDate > quote.effectiveDate ? base.effectiveDate : quote.effectiveDate
+
+      return {
+        baseCurrency: input.baseCurrency,
+        quoteCurrency: input.quoteCurrency,
+        rateMicros,
+        effectiveDate,
+        source: 'nbg'
+      }
+    }
+  }
+}
--- a/apps/bot/src/purchase-topic-ingestion.ts
+++ b/apps/bot/src/purchase-topic-ingestion.ts
@@ -51,7 +51,8 @@ export type PurchaseMessageIngestionResult =
 export interface PurchaseMessageIngestionRepository {
  save(
    record: PurchaseTopicRecord,
-    llmFallback?: PurchaseParserLlmFallback
+    llmFallback?: PurchaseParserLlmFallback,
+    defaultCurrency?: 'GEL' | 'USD'
  ): Promise<PurchaseMessageIngestionResult>
 }

@@ -121,7 +122,7 @@ export function createPurchaseMessageRepository(databaseUrl: string): {
  })

  const repository: PurchaseMessageIngestionRepository = {
-    async save(record, llmFallback) {
+    async save(record, llmFallback, defaultCurrency) {
      const matchedMember = await db
        .select({ id: schema.members.id })
        .from(schema.members)
@@ -140,11 +141,18 @@ export function createPurchaseMessageRepository(databaseUrl: string): {
        {
          rawText: record.rawText
        },
-        llmFallback
-          ? {
-              llmFallback
-            }
-          : {}
+        {
+          ...(llmFallback
+            ? {
+                llmFallback
+              }
+            : {}),
+          ...(defaultCurrency
+            ? {
+                defaultCurrency
+              }
+            : {})
+        }
      ).catch((error) => {
        parserError = error instanceof Error ? error.message : 'Unknown parser error'
        return null
@@ -324,7 +332,7 @@ export function registerPurchaseTopicIngestion(
    }

    try {
-      const status = await repository.save(record, options.llmFallback)
+      const status = await repository.save(record, options.llmFallback, 'GEL')
      const acknowledgement = buildPurchaseAcknowledgement(status, 'en')

      if (status.status === 'created') {
@@ -394,7 +402,14 @@ export function registerConfiguredPurchaseTopicIngestion(
    }

    try {
-      const status = await repository.save(record, options.llmFallback)
+      const billingSettings = await householdConfigurationRepository.getHouseholdBillingSettings(
+        record.householdId
+      )
+      const status = await repository.save(
+        record,
+        options.llmFallback,
+        billingSettings.settlementCurrency
+      )
      const householdChat = await householdConfigurationRepository.getHouseholdChatByHouseholdId(
        record.householdId
      )
--- a/apps/miniapp/src/App.tsx
+++ b/apps/miniapp/src/App.tsx
@@ -1,4 +1,4 @@
-import { Match, Switch, createMemo, createSignal, onMount, type JSX } from 'solid-js'
+import { Match, Show, Switch, createMemo, createSignal, onMount, type JSX } from 'solid-js'

 import { dictionary, type Locale } from './i18n'
 import {
@@ -160,6 +160,18 @@ function memberBaseDueMajor(member: MiniAppDashboard['members'][number]): string
  )
 }

+function ledgerPrimaryAmount(entry: MiniAppDashboard['ledger'][number]): string {
+  return `${entry.displayAmountMajor} ${entry.displayCurrency}`
+}
+
+function ledgerSecondaryAmount(entry: MiniAppDashboard['ledger'][number]): string | null {
+  if (entry.currency === entry.displayCurrency && entry.amountMajor === entry.displayAmountMajor) {
+    return null
+  }
+
+  return `${entry.amountMajor} ${entry.currency}`
+}
+
 function App() {
  const [locale, setLocale] = createSignal<Locale>('en')
  const [session, setSession] = createSignal<SessionState>({
@@ -184,6 +196,7 @@ function App() {
  const [savingCycleRent, setSavingCycleRent] = createSignal(false)
  const [savingUtilityBill, setSavingUtilityBill] = createSignal(false)
  const [billingForm, setBillingForm] = createSignal({
+    settlementCurrency: 'GEL' as 'USD' | 'GEL',
    rentAmountMajor: '',
    rentCurrency: 'USD' as 'USD' | 'GEL',
    rentDueDay: 20,
@@ -195,7 +208,7 @@ function App() {
  const [newCategoryName, setNewCategoryName] = createSignal('')
  const [cycleForm, setCycleForm] = createSignal({
    period: defaultCyclePeriod(),
-    currency: 'USD' as 'USD' | 'GEL',
+    currency: 'GEL' as 'USD' | 'GEL',
    rentAmountMajor: '',
    utilityCategorySlug: '',
    utilityAmountMajor: ''
@@ -267,12 +280,14 @@ function App() {
      )
      setCycleForm((current) => ({
        ...current,
+        currency: current.currency || payload.settings.settlementCurrency,
        utilityCategorySlug:
          current.utilityCategorySlug ||
          payload.categories.find((category) => category.isActive)?.slug ||
          ''
      }))
      setBillingForm({
+        settlementCurrency: payload.settings.settlementCurrency,
        rentAmountMajor: payload.settings.rentAmountMinor
          ? (Number(payload.settings.rentAmountMinor) / 100).toFixed(2)
          : '',
@@ -299,7 +314,10 @@ function App() {
      setCycleForm((current) => ({
        ...current,
        period: payload.cycle?.period ?? current.period,
-        currency: payload.cycle?.currency ?? payload.rentRule?.currency ?? current.currency,
+        currency:
+          payload.cycle?.currency ??
+          adminSettings()?.settings.settlementCurrency ??
+          current.currency,
        rentAmountMajor: payload.rentRule
          ? (Number(payload.rentRule.amountMinor) / 100).toFixed(2)
          : '',
@@ -385,25 +403,30 @@ function App() {
        setSession(demoSession)
        setDashboard({
          period: '2026-03',
-          currency: 'USD',
-          totalDueMajor: '414.00',
+          currency: 'GEL',
+          totalDueMajor: '1030.00',
+          rentSourceAmountMajor: '700.00',
+          rentSourceCurrency: 'USD',
+          rentDisplayAmountMajor: '1932.00',
+          rentFxRateMicros: '2760000',
+          rentFxEffectiveDate: '2026-03-17',
          members: [
            {
              memberId: 'demo-member',
              displayName: 'Demo Resident',
-              rentShareMajor: '175.00',
+              rentShareMajor: '483.00',
              utilityShareMajor: '32.00',
              purchaseOffsetMajor: '-14.00',
-              netDueMajor: '193.00',
+              netDueMajor: '501.00',
              explanations: ['Equal utility split', 'Shared purchase offset']
            },
            {
              memberId: 'member-2',
              displayName: 'Alice',
-              rentShareMajor: '175.00',
+              rentShareMajor: '483.00',
              utilityShareMajor: '32.00',
              purchaseOffsetMajor: '14.00',
-              netDueMajor: '221.00',
+              netDueMajor: '529.00',
              explanations: ['Equal utility split']
            }
          ],
@@ -414,6 +437,10 @@ function App() {
              title: 'Soap',
              amountMajor: '30.00',
              currency: 'GEL',
+              displayAmountMajor: '30.00',
+              displayCurrency: 'GEL',
+              fxRateMicros: null,
+              fxEffectiveDate: null,
              actorDisplayName: 'Alice',
              occurredAt: '2026-03-12T11:00:00.000Z'
            },
@@ -423,6 +450,10 @@ function App() {
              title: 'Electricity',
              amountMajor: '120.00',
              currency: 'GEL',
+              displayAmountMajor: '120.00',
+              displayCurrency: 'GEL',
+              fxRateMicros: null,
+              fxEffectiveDate: null,
              actorDisplayName: 'Alice',
              occurredAt: '2026-03-12T12:00:00.000Z'
            }
@@ -612,6 +643,10 @@ function App() {
            }
          : current
      )
+      setCycleForm((current) => ({
+        ...current,
+        currency: cycleState()?.cycle?.currency ?? settings.settlementCurrency
+      }))
    } finally {
      setSavingBillingSettings(false)
    }
@@ -914,10 +949,11 @@ function App() {
                          <article class="ledger-item">
                            <header>
                              <strong>{entry.title}</strong>
-                              <span>
-                                {entry.amountMajor} {entry.currency}
-                              </span>
+                              <span>{ledgerPrimaryAmount(entry)}</span>
                            </header>
+                            <Show when={ledgerSecondaryAmount(entry)}>
+                              {(secondary) => <p>{secondary()}</p>}
+                            </Show>
                            <p>{entry.actorDisplayName ?? copy().ledgerActorFallback}</p>
                          </article>
                        ))}
@@ -936,10 +972,11 @@ function App() {
                          <article class="ledger-item">
                            <header>
                              <strong>{entry.title}</strong>
-                              <span>
-                                {entry.amountMajor} {entry.currency}
-                              </span>
+                              <span>{ledgerPrimaryAmount(entry)}</span>
                            </header>
+                            <Show when={ledgerSecondaryAmount(entry)}>
+                              {(secondary) => <p>{secondary()}</p>}
+                            </Show>
                            <p>{entry.actorDisplayName ?? copy().ledgerActorFallback}</p>
                          </article>
                        ))}
@@ -973,6 +1010,17 @@ function App() {
                      cycleState()?.cycle?.currency ?? cycleForm().currency
                    )}
                  </p>
+                  <Show when={dashboard()}>
+                    {(data) => (
+                      <p>
+                        {copy().shareRent}: {data().rentSourceAmountMajor}{' '}
+                        {data().rentSourceCurrency}
+                        {data().rentSourceCurrency !== data().currency
+                          ? ` -> ${data().rentDisplayAmountMajor} ${data().currency}`
+                          : ''}
+                      </p>
+                    )}
+                  </Show>
                  <div class="settings-grid">
                    <label class="settings-field">
                      <span>{copy().rentAmount}</span>
@@ -1099,7 +1147,7 @@ function App() {
                      />
                    </label>
                    <label class="settings-field">
-                      <span>{copy().shareRent}</span>
+                      <span>{copy().settlementCurrency}</span>
                      <select
                        value={cycleForm().currency}
                        onChange={(event) =>
@@ -1130,6 +1178,21 @@ function App() {
                <strong>{copy().billingSettingsTitle}</strong>
              </header>
              <div class="settings-grid">
+                <label class="settings-field">
+                  <span>{copy().settlementCurrency}</span>
+                  <select
+                    value={billingForm().settlementCurrency}
+                    onChange={(event) =>
+                      setBillingForm((current) => ({
+                        ...current,
+                        settlementCurrency: event.currentTarget.value as 'USD' | 'GEL'
+                      }))
+                    }
+                  >
+                    <option value="GEL">GEL</option>
+                    <option value="USD">USD</option>
+                  </select>
+                </label>
                <label class="settings-field">
                  <span>{copy().rentAmount}</span>
                  <input
@@ -1519,6 +1582,18 @@ function App() {
                  </span>
                </header>
                <p>{copy().yourBalanceBody}</p>
+                <ShowDashboard
+                  dashboard={dashboard()}
+                  fallback={null}
+                  render={(data) => (
+                    <p>
+                      {copy().shareRent}: {data.rentSourceAmountMajor} {data.rentSourceCurrency}
+                      {data.rentSourceCurrency !== data.currency
+                        ? ` -> ${data.rentDisplayAmountMajor} ${data.currency}`
+                        : ''}
+                    </p>
+                  )}
+                />
                <div class="balance-breakdown">
                  <div class="stat-card">
                    <span>{copy().baseDue}</span>
@@ -1565,10 +1640,11 @@ function App() {
                        <article class="ledger-item">
                          <header>
                            <strong>{entry.title}</strong>
-                            <span>
-                              {entry.amountMajor} {entry.currency}
-                            </span>
+                            <span>{ledgerPrimaryAmount(entry)}</span>
                          </header>
+                          <Show when={ledgerSecondaryAmount(entry)}>
+                            {(secondary) => <p>{secondary()}</p>}
+                          </Show>
                          <p>{entry.actorDisplayName ?? copy().ledgerActorFallback}</p>
                        </article>
                      ))}
--- a/apps/miniapp/src/i18n.ts
+++ b/apps/miniapp/src/i18n.ts
@@ -66,6 +66,7 @@ export const dictionary = {
    householdSettingsTitle: 'Household settings',
    householdSettingsBody: 'Control household defaults and approve roommates who requested access.',
    billingSettingsTitle: 'Billing settings',
+    settlementCurrency: 'Settlement currency',
    billingCycleTitle: 'Current billing cycle',
    billingCycleEmpty: 'No open cycle',
    billingCycleStatus: 'Current cycle currency: {currency}',
@@ -182,6 +183,7 @@ export const dictionary = {
    householdSettingsTitle: 'Настройки household',
    householdSettingsBody: 'Здесь можно менять язык household и подтверждать новых соседей.',
    billingSettingsTitle: 'Настройки биллинга',
+    settlementCurrency: 'Валюта расчёта',
    billingCycleTitle: 'Текущий billing cycle',
    billingCycleEmpty: 'Нет открытого цикла',
    billingCycleStatus: 'Валюта текущего цикла: {currency}',
--- a/apps/miniapp/src/miniapp-api.ts
+++ b/apps/miniapp/src/miniapp-api.ts
@@ -45,6 +45,7 @@ export interface MiniAppMember {

 export interface MiniAppBillingSettings {
  householdId: string
+  settlementCurrency: 'USD' | 'GEL'
  rentAmountMinor: string | null
  rentCurrency: 'USD' | 'GEL'
  rentDueDay: number
@@ -67,6 +68,11 @@ export interface MiniAppDashboard {
  period: string
  currency: 'USD' | 'GEL'
  totalDueMajor: string
+  rentSourceAmountMajor: string
+  rentSourceCurrency: 'USD' | 'GEL'
+  rentDisplayAmountMajor: string
+  rentFxRateMicros: string | null
+  rentFxEffectiveDate: string | null
  members: {
    memberId: string
    displayName: string
@@ -82,6 +88,10 @@ export interface MiniAppDashboard {
    title: string
    amountMajor: string
    currency: 'USD' | 'GEL'
+    displayAmountMajor: string
+    displayCurrency: 'USD' | 'GEL'
+    fxRateMicros: string | null
+    fxEffectiveDate: string | null
    actorDisplayName: string | null
    occurredAt: string | null
  }[]
@@ -359,6 +369,7 @@ export async function fetchMiniAppAdminSettings(
 export async function updateMiniAppBillingSettings(
  initData: string,
  input: {
+    settlementCurrency?: 'USD' | 'GEL'
    rentAmountMajor?: string
    rentCurrency: 'USD' | 'GEL'
    rentDueDay: number
--- a/docs/specs/HOUSEBOT-079-settlement-currency-and-nbg-fx.md
+++ b/docs/specs/HOUSEBOT-079-settlement-currency-and-nbg-fx.md
@@ -0,0 +1,23 @@
+# HOUSEBOT-079 Settlement Currency And NBG FX
+
+## Goal
+
+Make household balances settle in a configurable household currency while preserving original entry currencies.
+
+## Scope
+
+- add a household `settlementCurrency` setting, defaulting to `GEL`
+- open new billing cycles in the settlement currency by default
+- keep rent rules in their original source currency
+- convert rent, utility bills, and purchase entries into the billing cycle currency for settlement
+- lock cycle exchange rates in the database once the configured reminder day has passed
+- use NBG as the FX source for GEL conversions
+- show both original and converted amounts in the mini app when they differ
+- default utility entry currency and bare purchase parsing currency to the household settlement currency
+
+## Notes
+
+- this slice does not add payment confirmation tracking yet
+- current FX behavior uses the configured reminder day as the target lock date
+- before the reminder day passes, the app may preview the latest available NBG rate without persisting it
+- after the reminder day passes, the rate is persisted per cycle and currency pair for deterministic future statements
--- a/packages/adapters-db/src/finance-repository.ts
+++ b/packages/adapters-db/src/finance-repository.ts
@@ -201,6 +201,89 @@ export function createDbFinanceRepository(
        })
    },

+    async getCycleExchangeRate(cycleId, sourceCurrency, targetCurrency) {
+      const rows = await db
+        .select({
+          cycleId: schema.billingCycleExchangeRates.cycleId,
+          sourceCurrency: schema.billingCycleExchangeRates.sourceCurrency,
+          targetCurrency: schema.billingCycleExchangeRates.targetCurrency,
+          rateMicros: schema.billingCycleExchangeRates.rateMicros,
+          effectiveDate: schema.billingCycleExchangeRates.effectiveDate,
+          source: schema.billingCycleExchangeRates.source
+        })
+        .from(schema.billingCycleExchangeRates)
+        .where(
+          and(
+            eq(schema.billingCycleExchangeRates.cycleId, cycleId),
+            eq(schema.billingCycleExchangeRates.sourceCurrency, sourceCurrency),
+            eq(schema.billingCycleExchangeRates.targetCurrency, targetCurrency)
+          )
+        )
+        .limit(1)
+
+      const row = rows[0]
+      if (!row) {
+        return null
+      }
+
+      return {
+        cycleId: row.cycleId,
+        sourceCurrency: toCurrencyCode(row.sourceCurrency),
+        targetCurrency: toCurrencyCode(row.targetCurrency),
+        rateMicros: row.rateMicros,
+        effectiveDate: row.effectiveDate,
+        source: 'nbg'
+      }
+    },
+
+    async saveCycleExchangeRate(input) {
+      const rows = await db
+        .insert(schema.billingCycleExchangeRates)
+        .values({
+          cycleId: input.cycleId,
+          sourceCurrency: input.sourceCurrency,
+          targetCurrency: input.targetCurrency,
+          rateMicros: input.rateMicros,
+          effectiveDate: input.effectiveDate,
+          source: input.source
+        })
+        .onConflictDoUpdate({
+          target: [
+            schema.billingCycleExchangeRates.cycleId,
+            schema.billingCycleExchangeRates.sourceCurrency,
+            schema.billingCycleExchangeRates.targetCurrency
+          ],
+          set: {
+            rateMicros: input.rateMicros,
+            effectiveDate: input.effectiveDate,
+            source: input.source,
+            updatedAt: instantToDate(nowInstant())
+          }
+        })
+        .returning({
+          cycleId: schema.billingCycleExchangeRates.cycleId,
+          sourceCurrency: schema.billingCycleExchangeRates.sourceCurrency,
+          targetCurrency: schema.billingCycleExchangeRates.targetCurrency,
+          rateMicros: schema.billingCycleExchangeRates.rateMicros,
+          effectiveDate: schema.billingCycleExchangeRates.effectiveDate,
+          source: schema.billingCycleExchangeRates.source
+        })
+
+      const row = rows[0]
+      if (!row) {
+        throw new Error('Failed to save billing cycle exchange rate')
+      }
+
+      return {
+        cycleId: row.cycleId,
+        sourceCurrency: toCurrencyCode(row.sourceCurrency),
+        targetCurrency: toCurrencyCode(row.targetCurrency),
+        rateMicros: row.rateMicros,
+        effectiveDate: row.effectiveDate,
+        source: 'nbg'
+      }
+    },
+
    async addUtilityBill(input) {
      await db.insert(schema.utilityBills).values({
        householdId,
--- a/packages/adapters-db/src/household-config-repository.ts
+++ b/packages/adapters-db/src/household-config-repository.ts
@@ -178,6 +178,7 @@ function toCurrencyCode(raw: string): CurrencyCode {

 function toHouseholdBillingSettingsRecord(row: {
  householdId: string
+  settlementCurrency: string
  rentAmountMinor: bigint | null
  rentCurrency: string
  rentDueDay: number
@@ -188,6 +189,7 @@ function toHouseholdBillingSettingsRecord(row: {
 }): HouseholdBillingSettingsRecord {
  return {
    householdId: row.householdId,
+    settlementCurrency: toCurrencyCode(row.settlementCurrency),
    rentAmountMinor: row.rentAmountMinor,
    rentCurrency: toCurrencyCode(row.rentCurrency),
    rentDueDay: row.rentDueDay,
@@ -862,6 +864,7 @@ export function createDbHouseholdConfigurationRepository(databaseUrl: string): {
      const rows = await db
        .select({
          householdId: schema.householdBillingSettings.householdId,
+          settlementCurrency: schema.householdBillingSettings.settlementCurrency,
          rentAmountMinor: schema.householdBillingSettings.rentAmountMinor,
          rentCurrency: schema.householdBillingSettings.rentCurrency,
          rentDueDay: schema.householdBillingSettings.rentDueDay,
@@ -888,6 +891,11 @@ export function createDbHouseholdConfigurationRepository(databaseUrl: string): {
      const rows = await db
        .update(schema.householdBillingSettings)
        .set({
+          ...(input.settlementCurrency
+            ? {
+                settlementCurrency: input.settlementCurrency
+              }
+            : {}),
          ...(input.rentAmountMinor !== undefined
            ? {
                rentAmountMinor: input.rentAmountMinor
@@ -928,6 +936,7 @@ export function createDbHouseholdConfigurationRepository(databaseUrl: string): {
        .where(eq(schema.householdBillingSettings.householdId, input.householdId))
        .returning({
          householdId: schema.householdBillingSettings.householdId,
+          settlementCurrency: schema.householdBillingSettings.settlementCurrency,
          rentAmountMinor: schema.householdBillingSettings.rentAmountMinor,
          rentCurrency: schema.householdBillingSettings.rentCurrency,
          rentDueDay: schema.householdBillingSettings.rentDueDay,
--- a/packages/application/src/finance-command-service.test.ts
+++ b/packages/application/src/finance-command-service.test.ts
@@ -2,24 +2,27 @@ import { describe, expect, test } from 'bun:test'

 import { instantFromIso, type Instant } from '@household/domain'
 import type {
+  ExchangeRateProvider,
+  FinanceCycleExchangeRateRecord,
  FinanceCycleRecord,
  FinanceMemberRecord,
  FinanceParsedPurchaseRecord,
  FinanceRentRuleRecord,
  FinanceRepository,
+  HouseholdConfigurationRepository,
  SettlementSnapshotRecord
 } from '@household/ports'

 import { createFinanceCommandService } from './finance-command-service'

 class FinanceRepositoryStub implements FinanceRepository {
+  householdId = 'household-1'
  member: FinanceMemberRecord | null = null
  members: readonly FinanceMemberRecord[] = []
  openCycleRecord: FinanceCycleRecord | null = null
  cycleByPeriodRecord: FinanceCycleRecord | null = null
  latestCycleRecord: FinanceCycleRecord | null = null
  rentRule: FinanceRentRuleRecord | null = null
-  utilityTotal: bigint = 0n
  purchases: readonly FinanceParsedPurchaseRecord[] = []
  utilityBills: readonly {
    id: string
@@ -29,13 +32,11 @@ class FinanceRepositoryStub implements FinanceRepository {
    createdByMemberId: string | null
    createdAt: Instant
  }[] = []
-
  lastSavedRentRule: {
    period: string
    amountMinor: bigint
    currency: 'USD' | 'GEL'
  } | null = null
-
  lastUtilityBill: {
    cycleId: string
    billName: string
@@ -43,8 +44,8 @@ class FinanceRepositoryStub implements FinanceRepository {
    currency: 'USD' | 'GEL'
    createdByMemberId: string
  } | null = null
-
  replacedSnapshot: SettlementSnapshotRecord | null = null
+  cycleExchangeRates = new Map<string, FinanceCycleExchangeRateRecord>()

  async getMemberByTelegramUserId(): Promise<FinanceMemberRecord | null> {
    return this.member
@@ -84,6 +85,24 @@ class FinanceRepositoryStub implements FinanceRepository {
    }
  }

+  async getCycleExchangeRate(
+    cycleId: string,
+    sourceCurrency: 'USD' | 'GEL',
+    targetCurrency: 'USD' | 'GEL'
+  ): Promise<FinanceCycleExchangeRateRecord | null> {
+    return this.cycleExchangeRates.get(`${cycleId}:${sourceCurrency}:${targetCurrency}`) ?? null
+  }
+
+  async saveCycleExchangeRate(
+    input: FinanceCycleExchangeRateRecord
+  ): Promise<FinanceCycleExchangeRateRecord> {
+    this.cycleExchangeRates.set(
+      `${input.cycleId}:${input.sourceCurrency}:${input.targetCurrency}`,
+      input
+    )
+    return input
+  }
+
  async addUtilityBill(input: {
    cycleId: string
    billName: string
@@ -99,7 +118,7 @@ class FinanceRepositoryStub implements FinanceRepository {
  }

  async getUtilityTotalForCycle(): Promise<bigint> {
-    return this.utilityTotal
+    return this.utilityBills.reduce((sum, bill) => sum + bill.amountMinor, 0n)
  }

  async listUtilityBillsForCycle() {
@@ -115,16 +134,76 @@ class FinanceRepositoryStub implements FinanceRepository {
  }
 }

+const householdConfigurationRepository: Pick<
+  HouseholdConfigurationRepository,
+  'getHouseholdBillingSettings'
+> = {
+  async getHouseholdBillingSettings(householdId) {
+    return {
+      householdId,
+      settlementCurrency: 'GEL',
+      rentAmountMinor: 70000n,
+      rentCurrency: 'USD',
+      rentDueDay: 20,
+      rentWarningDay: 17,
+      utilitiesDueDay: 4,
+      utilitiesReminderDay: 3,
+      timezone: 'Asia/Tbilisi'
+    }
+  }
+}
+
+const exchangeRateProvider: ExchangeRateProvider = {
+  async getRate(input) {
+    if (input.baseCurrency === input.quoteCurrency) {
+      return {
+        baseCurrency: input.baseCurrency,
+        quoteCurrency: input.quoteCurrency,
+        rateMicros: 1_000_000n,
+        effectiveDate: input.effectiveDate,
+        source: 'nbg'
+      }
+    }
+
+    if (input.baseCurrency === 'USD' && input.quoteCurrency === 'GEL') {
+      return {
+        baseCurrency: 'USD',
+        quoteCurrency: 'GEL',
+        rateMicros: 2_700_000n,
+        effectiveDate: input.effectiveDate,
+        source: 'nbg'
+      }
+    }
+
+    return {
+      baseCurrency: input.baseCurrency,
+      quoteCurrency: input.quoteCurrency,
+      rateMicros: 370_370n,
+      effectiveDate: input.effectiveDate,
+      source: 'nbg'
+    }
+  }
+}
+
+function createService(repository: FinanceRepositoryStub) {
+  return createFinanceCommandService({
+    householdId: repository.householdId,
+    repository,
+    householdConfigurationRepository,
+    exchangeRateProvider
+  })
+}
+
 describe('createFinanceCommandService', () => {
  test('setRent falls back to the open cycle period when one is active', async () => {
    const repository = new FinanceRepositoryStub()
    repository.openCycleRecord = {
      id: 'cycle-1',
      period: '2026-03',
-      currency: 'USD'
+      currency: 'GEL'
    }

-    const service = createFinanceCommandService(repository)
+    const service = createService(repository)
    const result = await service.setRent('700', undefined, undefined)

    expect(result).not.toBeNull()
@@ -143,12 +222,12 @@ describe('createFinanceCommandService', () => {
    repository.openCycleRecord = {
      id: 'cycle-1',
      period: '2026-03',
-      currency: 'USD'
+      currency: 'GEL'
    }
    repository.latestCycleRecord = {
      id: 'cycle-0',
      period: '2026-02',
-      currency: 'USD'
+      currency: 'GEL'
    }
    repository.rentRule = {
      amountMinor: 70000n,
@@ -159,20 +238,20 @@ describe('createFinanceCommandService', () => {
        id: 'utility-1',
        billName: 'Electricity',
        amountMinor: 12000n,
-        currency: 'USD',
+        currency: 'GEL',
        createdByMemberId: 'alice',
        createdAt: instantFromIso('2026-03-12T12:00:00.000Z')
      }
    ]

-    const service = createFinanceCommandService(repository)
+    const service = createService(repository)
    const result = await service.getAdminCycleState()

    expect(result).toEqual({
      cycle: {
        id: 'cycle-1',
        period: '2026-03',
-        currency: 'USD'
+        currency: 'GEL'
      },
      rentRule: {
        amountMinor: 70000n,
@@ -184,9 +263,9 @@ describe('createFinanceCommandService', () => {
          billName: 'Electricity',
          amount: expect.objectContaining({
            amountMinor: 12000n,
-            currency: 'USD'
+            currency: 'GEL'
          }),
-          currency: 'USD',
+          currency: 'GEL',
          createdByMemberId: 'alice',
          createdAt: instantFromIso('2026-03-12T12:00:00.000Z')
        }
@@ -196,7 +275,7 @@ describe('createFinanceCommandService', () => {

  test('addUtilityBill returns null when no open cycle exists', async () => {
    const repository = new FinanceRepositoryStub()
-    const service = createFinanceCommandService(repository)
+    const service = createService(repository)

    const result = await service.addUtilityBill('Electricity', '55.20', 'member-1')

@@ -204,12 +283,12 @@ describe('createFinanceCommandService', () => {
    expect(repository.lastUtilityBill).toBeNull()
  })

-  test('generateStatement persists settlement snapshot and returns member lines', async () => {
+  test('generateStatement settles into cycle currency and persists snapshot', async () => {
    const repository = new FinanceRepositoryStub()
    repository.latestCycleRecord = {
      id: 'cycle-2026-03',
      period: '2026-03',
-      currency: 'USD'
+      currency: 'GEL'
    }
    repository.members = [
      {
@@ -231,13 +310,12 @@ describe('createFinanceCommandService', () => {
      amountMinor: 70000n,
      currency: 'USD'
    }
-    repository.utilityTotal = 12000n
    repository.utilityBills = [
      {
        id: 'utility-1',
        billName: 'Electricity',
        amountMinor: 12000n,
-        currency: 'USD',
+        currency: 'GEL',
        createdByMemberId: 'alice',
        createdAt: instantFromIso('2026-03-12T12:00:00.000Z')
      }
@@ -253,29 +331,34 @@ describe('createFinanceCommandService', () => {
      }
    ]

-    const service = createFinanceCommandService(repository)
+    const service = createService(repository)
    const dashboard = await service.generateDashboard()
    const statement = await service.generateStatement()

    expect(dashboard).not.toBeNull()
-    expect(dashboard?.members.map((line) => line.netDue.amountMinor)).toEqual([39500n, 42500n])
+    expect(dashboard?.currency).toBe('GEL')
+    expect(dashboard?.rentSourceAmount.toMajorString()).toBe('700.00')
+    expect(dashboard?.rentDisplayAmount.toMajorString()).toBe('1890.00')
+    expect(dashboard?.members.map((line) => line.netDue.amountMinor)).toEqual([99000n, 102000n])
    expect(dashboard?.ledger.map((entry) => entry.title)).toEqual(['Soap', 'Electricity'])
-    expect(dashboard?.ledger.map((entry) => entry.currency)).toEqual(['GEL', 'USD'])
+    expect(dashboard?.ledger.map((entry) => entry.currency)).toEqual(['GEL', 'GEL'])
+    expect(dashboard?.ledger.map((entry) => entry.displayCurrency)).toEqual(['GEL', 'GEL'])
    expect(statement).toBe(
      [
        'Statement for 2026-03',
-        '- Alice: 395.00 USD',
-        '- Bob: 425.00 USD',
-        'Total: 820.00 USD'
+        'Rent: 700.00 USD (~1890.00 GEL)',
+        '- Alice: 990.00 GEL',
+        '- Bob: 1020.00 GEL',
+        'Total: 2010.00 GEL'
      ].join('\n')
    )
    expect(repository.replacedSnapshot).not.toBeNull()
    expect(repository.replacedSnapshot?.cycleId).toBe('cycle-2026-03')
-    expect(repository.replacedSnapshot?.currency).toBe('USD')
-    expect(repository.replacedSnapshot?.totalDueMinor).toBe(82000n)
+    expect(repository.replacedSnapshot?.currency).toBe('GEL')
+    expect(repository.replacedSnapshot?.totalDueMinor).toBe(201000n)
    expect(repository.replacedSnapshot?.lines.map((line) => line.netDueMinor)).toEqual([
-      39500n,
-      42500n
+      99000n,
+      102000n
    ])
  })
 })
--- a/packages/application/src/finance-command-service.ts
+++ b/packages/application/src/finance-command-service.ts
@@ -1,10 +1,12 @@
 import { createHash } from 'node:crypto'

 import type {
+  ExchangeRateProvider,
  FinanceCycleRecord,
  FinanceMemberRecord,
  FinanceRentRuleRecord,
-  FinanceRepository
+  FinanceRepository,
+  HouseholdConfigurationRepository
 } from '@household/ports'
 import {
  BillingCycleId,
@@ -13,6 +15,7 @@ import {
  Money,
  PurchaseEntryId,
  Temporal,
+  convertMoney,
  nowInstant,
  type CurrencyCode
 } from '@household/domain'
@@ -57,6 +60,25 @@ async function getCycleByPeriodOrLatest(
  return repository.getLatestCycle()
 }

+function billingPeriodLockDate(period: BillingPeriod, day: number): Temporal.PlainDate {
+  const firstDay = Temporal.PlainDate.from({
+    year: period.year,
+    month: period.month,
+    day: 1
+  })
+  const clampedDay = Math.min(day, firstDay.daysInMonth)
+
+  return Temporal.PlainDate.from({
+    year: period.year,
+    month: period.month,
+    day: clampedDay
+  })
+}
+
+function localDateInTimezone(timezone: string): Temporal.PlainDate {
+  return nowInstant().toZonedDateTimeISO(timezone).toPlainDate()
+}
+
 export interface FinanceDashboardMemberLine {
  memberId: string
  displayName: string
@@ -73,6 +95,10 @@ export interface FinanceDashboardLedgerEntry {
  title: string
  amount: Money
  currency: CurrencyCode
+  displayAmount: Money
+  displayCurrency: CurrencyCode
+  fxRateMicros: bigint | null
+  fxEffectiveDate: string | null
  actorDisplayName: string | null
  occurredAt: string | null
 }
@@ -81,6 +107,10 @@ export interface FinanceDashboard {
  period: string
  currency: CurrencyCode
  totalDue: Money
+  rentSourceAmount: Money
+  rentDisplayAmount: Money
+  rentFxRateMicros: bigint | null
+  rentFxEffectiveDate: string | null
  members: readonly FinanceDashboardMemberLine[]
  ledger: readonly FinanceDashboardLedgerEntry[]
 }
@@ -98,63 +128,204 @@ export interface FinanceAdminCycleState {
  }[]
 }

+interface FinanceCommandServiceDependencies {
+  householdId: string
+  repository: FinanceRepository
+  householdConfigurationRepository: Pick<
+    HouseholdConfigurationRepository,
+    'getHouseholdBillingSettings'
+  >
+  exchangeRateProvider: ExchangeRateProvider
+}
+
+interface ConvertedCycleMoney {
+  originalAmount: Money
+  settlementAmount: Money
+  fxRateMicros: bigint | null
+  fxEffectiveDate: string | null
+}
+
+async function convertIntoCycleCurrency(
+  dependencies: FinanceCommandServiceDependencies,
+  input: {
+    cycle: FinanceCycleRecord
+    period: BillingPeriod
+    lockDay: number
+    timezone: string
+    amount: Money
+  }
+): Promise<ConvertedCycleMoney> {
+  if (input.amount.currency === input.cycle.currency) {
+    return {
+      originalAmount: input.amount,
+      settlementAmount: input.amount,
+      fxRateMicros: null,
+      fxEffectiveDate: null
+    }
+  }
+
+  const existingRate = await dependencies.repository.getCycleExchangeRate(
+    input.cycle.id,
+    input.amount.currency,
+    input.cycle.currency
+  )
+
+  if (existingRate) {
+    return {
+      originalAmount: input.amount,
+      settlementAmount: convertMoney(input.amount, input.cycle.currency, existingRate.rateMicros),
+      fxRateMicros: existingRate.rateMicros,
+      fxEffectiveDate: existingRate.effectiveDate
+    }
+  }
+
+  const lockDate = billingPeriodLockDate(input.period, input.lockDay)
+  const currentLocalDate = localDateInTimezone(input.timezone)
+  const shouldPersist = Temporal.PlainDate.compare(currentLocalDate, lockDate) >= 0
+  const quote = await dependencies.exchangeRateProvider.getRate({
+    baseCurrency: input.amount.currency,
+    quoteCurrency: input.cycle.currency,
+    effectiveDate: lockDate.toString()
+  })
+
+  if (shouldPersist) {
+    await dependencies.repository.saveCycleExchangeRate({
+      cycleId: input.cycle.id,
+      sourceCurrency: quote.baseCurrency,
+      targetCurrency: quote.quoteCurrency,
+      rateMicros: quote.rateMicros,
+      effectiveDate: quote.effectiveDate,
+      source: quote.source
+    })
+  }
+
+  return {
+    originalAmount: input.amount,
+    settlementAmount: convertMoney(input.amount, input.cycle.currency, quote.rateMicros),
+    fxRateMicros: quote.rateMicros,
+    fxEffectiveDate: quote.effectiveDate
+  }
+}
+
 async function buildFinanceDashboard(
-  repository: FinanceRepository,
+  dependencies: FinanceCommandServiceDependencies,
  periodArg?: string
 ): Promise<FinanceDashboard | null> {
-  const cycle = await getCycleByPeriodOrLatest(repository, periodArg)
+  const cycle = await getCycleByPeriodOrLatest(dependencies.repository, periodArg)
  if (!cycle) {
    return null
  }

-  const members = await repository.listMembers()
+  const [members, rentRule, settings] = await Promise.all([
+    dependencies.repository.listMembers(),
+    dependencies.repository.getRentRuleForPeriod(cycle.period),
+    dependencies.householdConfigurationRepository.getHouseholdBillingSettings(
+      dependencies.householdId
+    )
+  ])
+
  if (members.length === 0) {
    throw new Error('No household members configured')
  }

-  const rentRule = await repository.getRentRuleForPeriod(cycle.period)
  if (!rentRule) {
    throw new Error('No rent rule configured for this cycle period')
  }

  const period = BillingPeriod.fromString(cycle.period)
  const { start, end } = monthRange(period)
-  const purchases = await repository.listParsedPurchasesForRange(start, end)
-  const utilityBills = await repository.listUtilityBillsForCycle(cycle.id)
-  const utilitiesMinor = await repository.getUtilityTotalForCycle(cycle.id)
+  const [purchases, utilityBills] = await Promise.all([
+    dependencies.repository.listParsedPurchasesForRange(start, end),
+    dependencies.repository.listUtilityBillsForCycle(cycle.id)
+  ])
+
+  const convertedRent = await convertIntoCycleCurrency(dependencies, {
+    cycle,
+    period,
+    lockDay: settings.rentWarningDay,
+    timezone: settings.timezone,
+    amount: Money.fromMinor(rentRule.amountMinor, rentRule.currency)
+  })
+
+  const convertedUtilityBills = await Promise.all(
+    utilityBills.map(async (bill) => {
+      const converted = await convertIntoCycleCurrency(dependencies, {
+        cycle,
+        period,
+        lockDay: settings.utilitiesReminderDay,
+        timezone: settings.timezone,
+        amount: Money.fromMinor(bill.amountMinor, bill.currency)
+      })
+
+      return {
+        bill,
+        converted
+      }
+    })
+  )
+
+  const convertedPurchases = await Promise.all(
+    purchases.map(async (purchase) => {
+      const converted = await convertIntoCycleCurrency(dependencies, {
+        cycle,
+        period,
+        lockDay: settings.rentWarningDay,
+        timezone: settings.timezone,
+        amount: Money.fromMinor(purchase.amountMinor, purchase.currency)
+      })
+
+      return {
+        purchase,
+        converted
+      }
+    })
+  )
+
+  const utilities = convertedUtilityBills.reduce(
+    (sum, current) => sum.add(current.converted.settlementAmount),
+    Money.zero(cycle.currency)
+  )

  const settlement = calculateMonthlySettlement({
    cycleId: BillingCycleId.from(cycle.id),
    period,
-    rent: Money.fromMinor(rentRule.amountMinor, rentRule.currency),
-    utilities: Money.fromMinor(utilitiesMinor, rentRule.currency),
+    rent: convertedRent.settlementAmount,
+    utilities,
    utilitySplitMode: 'equal',
    members: members.map((member) => ({
      memberId: MemberId.from(member.id),
      active: true,
      rentWeight: member.rentShareWeight
    })),
-    purchases: purchases.map((purchase) => ({
+    purchases: convertedPurchases.map(({ purchase, converted }) => ({
      purchaseId: PurchaseEntryId.from(purchase.id),
      payerId: MemberId.from(purchase.payerMemberId),
-      amount: Money.fromMinor(purchase.amountMinor, rentRule.currency)
+      amount: converted.settlementAmount
    }))
  })

-  await repository.replaceSettlementSnapshot({
+  await dependencies.repository.replaceSettlementSnapshot({
    cycleId: cycle.id,
    inputHash: computeInputHash({
      cycleId: cycle.id,
-      rentMinor: rentRule.amountMinor.toString(),
-      utilitiesMinor: utilitiesMinor.toString(),
-      purchaseCount: purchases.length,
+      rentMinor: convertedRent.settlementAmount.amountMinor.toString(),
+      utilitiesMinor: utilities.amountMinor.toString(),
+      purchaseMinors: convertedPurchases.map(({ purchase, converted }) => ({
+        id: purchase.id,
+        minor: converted.settlementAmount.amountMinor.toString(),
+        currency: converted.settlementAmount.currency
+      })),
      memberCount: members.length
    }),
    totalDueMinor: settlement.totalDue.amountMinor,
-    currency: rentRule.currency,
+    currency: cycle.currency,
    metadata: {
      generatedBy: 'bot-command',
-      source: 'finance-service'
+      source: 'finance-service',
+      rentSourceMinor: convertedRent.originalAmount.amountMinor.toString(),
+      rentSourceCurrency: convertedRent.originalAmount.currency,
+      rentFxRateMicros: convertedRent.fxRateMicros?.toString() ?? null,
+      rentFxEffectiveDate: convertedRent.fxEffectiveDate
    },
    lines: settlement.lines.map((line) => ({
      memberId: line.memberId.toString(),
@@ -178,23 +349,31 @@ async function buildFinanceDashboard(
  }))

  const ledger: FinanceDashboardLedgerEntry[] = [
-    ...utilityBills.map((bill) => ({
+    ...convertedUtilityBills.map(({ bill, converted }) => ({
      id: bill.id,
      kind: 'utility' as const,
      title: bill.billName,
-      amount: Money.fromMinor(bill.amountMinor, bill.currency),
+      amount: converted.originalAmount,
      currency: bill.currency,
+      displayAmount: converted.settlementAmount,
+      displayCurrency: cycle.currency,
+      fxRateMicros: converted.fxRateMicros,
+      fxEffectiveDate: converted.fxEffectiveDate,
      actorDisplayName: bill.createdByMemberId
        ? (memberNameById.get(bill.createdByMemberId) ?? null)
        : null,
      occurredAt: bill.createdAt.toString()
    })),
-    ...purchases.map((purchase) => ({
+    ...convertedPurchases.map(({ purchase, converted }) => ({
      id: purchase.id,
      kind: 'purchase' as const,
      title: purchase.description ?? 'Shared purchase',
-      amount: Money.fromMinor(purchase.amountMinor, purchase.currency),
+      amount: converted.originalAmount,
      currency: purchase.currency,
+      displayAmount: converted.settlementAmount,
+      displayCurrency: cycle.currency,
+      fxRateMicros: converted.fxRateMicros,
+      fxEffectiveDate: converted.fxEffectiveDate,
      actorDisplayName: memberNameById.get(purchase.payerMemberId) ?? null,
      occurredAt: purchase.occurredAt?.toString() ?? null
    }))
@@ -208,8 +387,12 @@ async function buildFinanceDashboard(

  return {
    period: cycle.period,
-    currency: rentRule.currency,
+    currency: cycle.currency,
    totalDue: settlement.totalDue,
+    rentSourceAmount: convertedRent.originalAmount,
+    rentDisplayAmount: convertedRent.settlementAmount,
+    rentFxRateMicros: convertedRent.fxRateMicros,
+    rentFxEffectiveDate: convertedRent.fxEffectiveDate,
    members: dashboardMembers,
    ledger
  }
@@ -244,7 +427,11 @@ export interface FinanceCommandService {
  generateStatement(periodArg?: string): Promise<string | null>
 }

-export function createFinanceCommandService(repository: FinanceRepository): FinanceCommandService {
+export function createFinanceCommandService(
+  dependencies: FinanceCommandServiceDependencies
+): FinanceCommandService {
+  const { repository, householdConfigurationRepository } = dependencies
+
  return {
    getMemberByTelegramUserId(telegramUserId) {
      return repository.getMemberByTelegramUserId(telegramUserId)
@@ -288,7 +475,10 @@ export function createFinanceCommandService(repository: FinanceRepository): Fina

    async openCycle(periodArg, currencyArg) {
      const period = BillingPeriod.fromString(periodArg).toString()
-      const currency = parseCurrency(currencyArg, 'USD')
+      const settings = await householdConfigurationRepository.getHouseholdBillingSettings(
+        dependencies.householdId
+      )
+      const currency = parseCurrency(currencyArg, settings.settlementCurrency)

      await repository.openCycle(period, currency)

@@ -311,13 +501,16 @@ export function createFinanceCommandService(repository: FinanceRepository): Fina
    },

    async setRent(amountArg, currencyArg, periodArg) {
-      const openCycle = await repository.getOpenCycle()
+      const [openCycle, settings] = await Promise.all([
+        repository.getOpenCycle(),
+        householdConfigurationRepository.getHouseholdBillingSettings(dependencies.householdId)
+      ])
      const period = periodArg ?? openCycle?.period
      if (!period) {
        return null
      }

-      const currency = parseCurrency(currencyArg, openCycle?.currency ?? 'USD')
+      const currency = parseCurrency(currencyArg, settings.rentCurrency)
      const amount = Money.fromMajor(amountArg, currency)

      await repository.saveRentRule(
@@ -334,12 +527,15 @@ export function createFinanceCommandService(repository: FinanceRepository): Fina
    },

    async addUtilityBill(billName, amountArg, createdByMemberId, currencyArg) {
-      const openCycle = await repository.getOpenCycle()
+      const [openCycle, settings] = await Promise.all([
+        repository.getOpenCycle(),
+        householdConfigurationRepository.getHouseholdBillingSettings(dependencies.householdId)
+      ])
      if (!openCycle) {
        return null
      }

-      const currency = parseCurrency(currencyArg, openCycle.currency)
+      const currency = parseCurrency(currencyArg, settings.settlementCurrency)
      const amount = Money.fromMajor(amountArg, currency)

      await repository.addUtilityBill({
@@ -358,7 +554,7 @@ export function createFinanceCommandService(repository: FinanceRepository): Fina
    },

    async generateStatement(periodArg) {
-      const dashboard = await buildFinanceDashboard(repository, periodArg)
+      const dashboard = await buildFinanceDashboard(dependencies, periodArg)
      if (!dashboard) {
        return null
      }
@@ -367,15 +563,21 @@ export function createFinanceCommandService(repository: FinanceRepository): Fina
        return `- ${line.displayName}: ${line.netDue.toMajorString()} ${dashboard.currency}`
      })

+      const rentLine =
+        dashboard.rentSourceAmount.currency === dashboard.rentDisplayAmount.currency
+          ? `Rent: ${dashboard.rentDisplayAmount.toMajorString()} ${dashboard.currency}`
+          : `Rent: ${dashboard.rentSourceAmount.toMajorString()} ${dashboard.rentSourceAmount.currency} (~${dashboard.rentDisplayAmount.toMajorString()} ${dashboard.currency})`
+
      return [
        `Statement for ${dashboard.period}`,
+        rentLine,
        ...statementLines,
        `Total: ${dashboard.totalDue.toMajorString()} ${dashboard.currency}`
      ].join('\n')
    },

    generateDashboard(periodArg) {
-      return buildFinanceDashboard(repository, periodArg)
+      return buildFinanceDashboard(dependencies, periodArg)
    }
  }
 }
--- a/packages/application/src/household-admin-service.test.ts
+++ b/packages/application/src/household-admin-service.test.ts
@@ -143,6 +143,7 @@ function createRepositoryStub() {
    },
    getHouseholdBillingSettings: async (householdId) => ({
      householdId,
+      settlementCurrency: 'GEL',
      rentAmountMinor: null,
      rentCurrency: 'USD',
      rentDueDay: 20,
@@ -153,6 +154,7 @@ function createRepositoryStub() {
    }),
    updateHouseholdBillingSettings: async (input) => ({
      householdId: input.householdId,
+      settlementCurrency: 'GEL',
      rentAmountMinor: input.rentAmountMinor ?? null,
      rentCurrency: input.rentCurrency ?? 'USD',
      rentDueDay: input.rentDueDay ?? 20,
--- a/packages/application/src/household-onboarding-service.test.ts
+++ b/packages/application/src/household-onboarding-service.test.ts
@@ -156,6 +156,7 @@ function createRepositoryStub() {
    async getHouseholdBillingSettings(householdId) {
      return {
        householdId,
+        settlementCurrency: 'GEL',
        rentAmountMinor: null,
        rentCurrency: 'USD',
        rentDueDay: 20,
@@ -168,6 +169,7 @@ function createRepositoryStub() {
    async updateHouseholdBillingSettings(input) {
      return {
        householdId: input.householdId,
+        settlementCurrency: 'GEL',
        rentAmountMinor: input.rentAmountMinor ?? null,
        rentCurrency: input.rentCurrency ?? 'USD',
        rentDueDay: input.rentDueDay ?? 20,
--- a/packages/application/src/household-setup-service.test.ts
+++ b/packages/application/src/household-setup-service.test.ts
@@ -250,6 +250,7 @@ function createRepositoryStub() {
    async getHouseholdBillingSettings(householdId) {
      return {
        householdId,
+        settlementCurrency: 'GEL',
        rentAmountMinor: null,
        rentCurrency: 'USD',
        rentDueDay: 20,
@@ -262,6 +263,7 @@ function createRepositoryStub() {
    async updateHouseholdBillingSettings(input) {
      return {
        householdId: input.householdId,
+        settlementCurrency: 'GEL',
        rentAmountMinor: input.rentAmountMinor ?? null,
        rentCurrency: input.rentCurrency ?? 'USD',
        rentDueDay: input.rentDueDay ?? 20,
--- a/packages/application/src/locale-preference-service.test.ts
+++ b/packages/application/src/locale-preference-service.test.ts
@@ -78,6 +78,7 @@ function createRepository(): HouseholdConfigurationRepository {
        : null,
    getHouseholdBillingSettings: async (householdId) => ({
      householdId,
+      settlementCurrency: 'GEL',
      rentAmountMinor: null,
      rentCurrency: 'USD',
      rentDueDay: 20,
@@ -88,6 +89,7 @@ function createRepository(): HouseholdConfigurationRepository {
    }),
    updateHouseholdBillingSettings: async (input) => ({
      householdId: input.householdId,
+      settlementCurrency: 'GEL',
      rentAmountMinor: input.rentAmountMinor ?? null,
      rentCurrency: input.rentCurrency ?? 'USD',
      rentDueDay: input.rentDueDay ?? 20,
--- a/packages/application/src/miniapp-admin-service.test.ts
+++ b/packages/application/src/miniapp-admin-service.test.ts
@@ -108,6 +108,7 @@ function repository(): HouseholdConfigurationRepository {
        : null,
    getHouseholdBillingSettings: async (householdId) => ({
      householdId,
+      settlementCurrency: 'GEL',
      rentAmountMinor: null,
      rentCurrency: 'USD',
      rentDueDay: 20,
@@ -118,6 +119,7 @@ function repository(): HouseholdConfigurationRepository {
    }),
    updateHouseholdBillingSettings: async (input) => ({
      householdId: input.householdId,
+      settlementCurrency: 'GEL',
      rentAmountMinor: input.rentAmountMinor ?? null,
      rentCurrency: input.rentCurrency ?? 'USD',
      rentDueDay: input.rentDueDay ?? 20,
@@ -177,6 +179,7 @@ describe('createMiniAppAdminService', () => {
      status: 'ok',
      settings: {
        householdId: 'household-1',
+        settlementCurrency: 'GEL',
        rentAmountMinor: null,
        rentCurrency: 'USD',
        rentDueDay: 20,
@@ -209,6 +212,7 @@ describe('createMiniAppAdminService', () => {
      status: 'ok',
      settings: {
        householdId: 'household-1',
+        settlementCurrency: 'GEL',
        rentAmountMinor: 70000n,
        rentCurrency: 'USD',
        rentDueDay: 21,
--- a/packages/application/src/miniapp-admin-service.ts
+++ b/packages/application/src/miniapp-admin-service.ts
@@ -36,6 +36,7 @@ export interface MiniAppAdminService {
  updateSettings(input: {
    householdId: string
    actorIsAdmin: boolean
+    settlementCurrency?: string
    rentAmountMajor?: string
    rentCurrency?: string
    rentDueDay: number
@@ -176,6 +177,9 @@ export function createMiniAppAdminService(

      let rentAmountMinor: bigint | null | undefined
      let rentCurrency: CurrencyCode | undefined
+      const settlementCurrency = input.settlementCurrency
+        ? parseCurrency(input.settlementCurrency)
+        : undefined

      if (input.rentAmountMajor && input.rentAmountMajor.trim().length > 0) {
        rentCurrency = parseCurrency(input.rentCurrency ?? 'USD')
@@ -187,6 +191,11 @@ export function createMiniAppAdminService(

      const settings = await repository.updateHouseholdBillingSettings({
        householdId: input.householdId,
+        ...(settlementCurrency
+          ? {
+              settlementCurrency
+            }
+          : {}),
        ...(rentAmountMinor !== undefined
          ? {
              rentAmountMinor
--- a/packages/application/src/purchase-parser.ts
+++ b/packages/application/src/purchase-parser.ts
@@ -17,6 +17,7 @@ export interface ParsePurchaseInput {

 export interface ParsePurchaseOptions {
  llmFallback?: PurchaseParserLlmFallback
+  defaultCurrency?: 'GEL' | 'USD'
 }

 const CURRENCY_PATTERN = '(?:₾|gel|lari|лари|usd|\\$|доллар(?:а|ов)?)'
@@ -60,7 +61,10 @@ function normalizeDescription(rawText: string, matchedFragment: string): string
  return cleaned
 }

-function parseWithRules(rawText: string): ParsedPurchaseResult | null {
+function parseWithRules(
+  rawText: string,
+  defaultCurrency: 'GEL' | 'USD'
+): ParsedPurchaseResult | null {
  const matches = Array.from(rawText.matchAll(AMOUNT_WITH_OPTIONAL_CURRENCY))

  if (matches.length !== 1) {
@@ -76,7 +80,7 @@ function parseWithRules(rawText: string): ParsedPurchaseResult | null {
  const amountMinor = toMinorUnits(match.groups.amount)

  const explicitCurrency = currency !== null
-  const resolvedCurrency = currency ?? 'GEL'
+  const resolvedCurrency = currency ?? defaultCurrency
  const confidence = explicitCurrency ? 92 : 78

  return {
@@ -118,7 +122,7 @@ export async function parsePurchaseMessage(
    return null
  }

-  const rulesResult = parseWithRules(rawText)
+  const rulesResult = parseWithRules(rawText, options.defaultCurrency ?? 'GEL')
  if (rulesResult) {
    return rulesResult
  }
--- a/packages/db/drizzle-checksums.json
+++ b/packages/db/drizzle-checksums.json
@@ -12,6 +12,7 @@
    "0008_lowly_spiral.sql": "4f016332d60f7ef1fef0311210a0fa1a0bfc1d9b6da1da4380a60c14d54a9681",
    "0009_quiet_wallflower.sql": "c5bcb6a01b6f22a9e64866ac0d11468105aad8b2afb248296370f15b462e3087",
    "0010_wild_molecule_man.sql": "46027a6ac770cdc2efd4c3eb5bb53f09d1b852c70fdc46a2434e5a7064587245",
-    "0011_previous_ezekiel_stane.sql": "d996e64d3854de22e36dedeaa94e46774399163d90263bbb05e0b9199af79b70"
+    "0011_previous_ezekiel_stane.sql": "d996e64d3854de22e36dedeaa94e46774399163d90263bbb05e0b9199af79b70",
+    "0012_clumsy_maestro.sql": "173797fb435c6acd7c268c624942d6f19a887c329bcef409a3dde1249baaeb8a"
  }
 }
--- a/packages/db/drizzle/0012_clumsy_maestro.sql
+++ b/packages/db/drizzle/0012_clumsy_maestro.sql
@@ -0,0 +1,16 @@
+CREATE TABLE "billing_cycle_exchange_rates" (
+	"id" uuid PRIMARY KEY DEFAULT gen_random_uuid() NOT NULL,
+	"cycle_id" uuid NOT NULL,
+	"source_currency" text NOT NULL,
+	"target_currency" text NOT NULL,
+	"rate_micros" bigint NOT NULL,
+	"effective_date" date NOT NULL,
+	"source" text DEFAULT 'nbg' NOT NULL,
+	"created_at" timestamp with time zone DEFAULT now() NOT NULL,
+	"updated_at" timestamp with time zone DEFAULT now() NOT NULL
+);
+--> statement-breakpoint
+ALTER TABLE "household_billing_settings" ADD COLUMN "settlement_currency" text DEFAULT 'GEL' NOT NULL;--> statement-breakpoint
+ALTER TABLE "billing_cycle_exchange_rates" ADD CONSTRAINT "billing_cycle_exchange_rates_cycle_id_billing_cycles_id_fk" FOREIGN KEY ("cycle_id") REFERENCES "public"."billing_cycles"("id") ON DELETE cascade ON UPDATE no action;--> statement-breakpoint
+CREATE UNIQUE INDEX "billing_cycle_exchange_rates_cycle_pair_unique" ON "billing_cycle_exchange_rates" USING btree ("cycle_id","source_currency","target_currency");--> statement-breakpoint
+CREATE INDEX "billing_cycle_exchange_rates_cycle_idx" ON "billing_cycle_exchange_rates" USING btree ("cycle_id");
--- a/packages/db/drizzle/meta/0012_snapshot.json
+++ b/packages/db/drizzle/meta/0012_snapshot.json
--- a/packages/db/drizzle/meta/_journal.json
+++ b/packages/db/drizzle/meta/_journal.json
@@ -85,6 +85,13 @@
      "when": 1773096404367,
      "tag": "0011_previous_ezekiel_stane",
      "breakpoints": true
+    },
+    {
+      "idx": 12,
+      "version": "7",
+      "when": 1773146577992,
+      "tag": "0012_clumsy_maestro",
+      "breakpoints": true
    }
  ]
 }
--- a/packages/db/src/schema.ts
+++ b/packages/db/src/schema.ts
@@ -26,6 +26,7 @@ export const householdBillingSettings = pgTable(
    householdId: uuid('household_id')
      .notNull()
      .references(() => households.id, { onDelete: 'cascade' }),
+    settlementCurrency: text('settlement_currency').default('GEL').notNull(),
    rentAmountMinor: bigint('rent_amount_minor', { mode: 'bigint' }),
    rentCurrency: text('rent_currency').default('USD').notNull(),
    rentDueDay: integer('rent_due_day').default(20).notNull(),
@@ -257,6 +258,31 @@ export const rentRules = pgTable(
  })
 )

+export const billingCycleExchangeRates = pgTable(
+  'billing_cycle_exchange_rates',
+  {
+    id: uuid('id').defaultRandom().primaryKey(),
+    cycleId: uuid('cycle_id')
+      .notNull()
+      .references(() => billingCycles.id, { onDelete: 'cascade' }),
+    sourceCurrency: text('source_currency').notNull(),
+    targetCurrency: text('target_currency').notNull(),
+    rateMicros: bigint('rate_micros', { mode: 'bigint' }).notNull(),
+    effectiveDate: date('effective_date').notNull(),
+    source: text('source').default('nbg').notNull(),
+    createdAt: timestamp('created_at', { withTimezone: true }).defaultNow().notNull(),
+    updatedAt: timestamp('updated_at', { withTimezone: true }).defaultNow().notNull()
+  },
+  (table) => ({
+    cyclePairUnique: uniqueIndex('billing_cycle_exchange_rates_cycle_pair_unique').on(
+      table.cycleId,
+      table.sourceCurrency,
+      table.targetCurrency
+    ),
+    cycleIdx: index('billing_cycle_exchange_rates_cycle_idx').on(table.cycleId)
+  })
+)
+
 export const utilityBills = pgTable(
  'utility_bills',
  {
@@ -517,6 +543,7 @@ export type HouseholdTopicBinding = typeof householdTopicBindings.$inferSelect
 export type HouseholdUtilityCategory = typeof householdUtilityCategories.$inferSelect
 export type Member = typeof members.$inferSelect
 export type BillingCycle = typeof billingCycles.$inferSelect
+export type BillingCycleExchangeRate = typeof billingCycleExchangeRates.$inferSelect
 export type UtilityBill = typeof utilityBills.$inferSelect
 export type PurchaseEntry = typeof purchaseEntries.$inferSelect
 export type PurchaseMessage = typeof purchaseMessages.$inferSelect
--- a/packages/domain/src/index.ts
+++ b/packages/domain/src/index.ts
@@ -1,7 +1,7 @@
 export { BillingPeriod } from './billing-period'
 export { DOMAIN_ERROR_CODE, DomainError } from './errors'
 export { BillingCycleId, HouseholdId, MemberId, PurchaseEntryId } from './ids'
-export { CURRENCIES, Money } from './money'
+export { CURRENCIES, FX_RATE_SCALE_MICROS, Money, convertMoney } from './money'
 export { normalizeSupportedLocale, SUPPORTED_LOCALES } from './locale'
 export {
  Temporal,
--- a/packages/domain/src/money.ts
+++ b/packages/domain/src/money.ts
@@ -1,6 +1,7 @@
 import { DOMAIN_ERROR_CODE, DomainError } from './errors'

 export const CURRENCIES = ['GEL', 'USD'] as const
+export const FX_RATE_SCALE_MICROS = 1_000_000n

 export type CurrencyCode = (typeof CURRENCIES)[number]

@@ -73,6 +74,23 @@ function formatMajorUnits(minor: bigint): string {
  return `${sign}${whole.toString()}.${fractionString}`
 }

+function divideRoundedHalfUp(dividend: bigint, divisor: bigint): bigint {
+  if (divisor === 0n) {
+    throw new DomainError(DOMAIN_ERROR_CODE.INVALID_MONEY_AMOUNT, 'Division by zero')
+  }
+
+  const sign = dividend < 0n ? -1n : 1n
+  const absoluteDividend = dividend < 0n ? -dividend : dividend
+  const quotient = absoluteDividend / divisor
+  const remainder = absoluteDividend % divisor
+
+  if (remainder * 2n >= divisor) {
+    return (quotient + 1n) * sign
+  }
+
+  return quotient * sign
+}
+
 export class Money {
  readonly amountMinor: bigint
  readonly currency: CurrencyCode
@@ -257,3 +275,23 @@ export class Money {
    }
  }
 }
+
+export function convertMoney(
+  amount: Money,
+  targetCurrency: CurrencyCode,
+  rateMicros: bigint
+): Money {
+  if (rateMicros <= 0n) {
+    throw new DomainError(
+      DOMAIN_ERROR_CODE.INVALID_MONEY_AMOUNT,
+      `Exchange rate must be positive: ${rateMicros.toString()}`
+    )
+  }
+
+  if (amount.currency === targetCurrency) {
+    return amount
+  }
+
+  const convertedMinor = divideRoundedHalfUp(amount.amountMinor * rateMicros, FX_RATE_SCALE_MICROS)
+  return Money.fromMinor(convertedMinor, targetCurrency)
+}
--- a/packages/ports/src/exchange-rates.ts
+++ b/packages/ports/src/exchange-rates.ts
@@ -0,0 +1,17 @@
+import type { CurrencyCode } from '@household/domain'
+
+export interface ExchangeRateQuote {
+  baseCurrency: CurrencyCode
+  quoteCurrency: CurrencyCode
+  rateMicros: bigint
+  effectiveDate: string
+  source: 'nbg'
+}
+
+export interface ExchangeRateProvider {
+  getRate(input: {
+    baseCurrency: CurrencyCode
+    quoteCurrency: CurrencyCode
+    effectiveDate: string
+  }): Promise<ExchangeRateQuote>
+}
--- a/packages/ports/src/finance.ts
+++ b/packages/ports/src/finance.ts
@@ -14,6 +14,15 @@ export interface FinanceCycleRecord {
  currency: CurrencyCode
 }

+export interface FinanceCycleExchangeRateRecord {
+  cycleId: string
+  sourceCurrency: CurrencyCode
+  targetCurrency: CurrencyCode
+  rateMicros: bigint
+  effectiveDate: string
+  source: 'nbg'
+}
+
 export interface FinanceRentRuleRecord {
  amountMinor: bigint
  currency: CurrencyCode
@@ -64,6 +73,14 @@ export interface FinanceRepository {
  openCycle(period: string, currency: CurrencyCode): Promise<void>
  closeCycle(cycleId: string, closedAt: Instant): Promise<void>
  saveRentRule(period: string, amountMinor: bigint, currency: CurrencyCode): Promise<void>
+  getCycleExchangeRate(
+    cycleId: string,
+    sourceCurrency: CurrencyCode,
+    targetCurrency: CurrencyCode
+  ): Promise<FinanceCycleExchangeRateRecord | null>
+  saveCycleExchangeRate(
+    input: FinanceCycleExchangeRateRecord
+  ): Promise<FinanceCycleExchangeRateRecord>
  addUtilityBill(input: {
    cycleId: string
    billName: string
--- a/packages/ports/src/household-config.ts
+++ b/packages/ports/src/household-config.ts
@@ -51,6 +51,7 @@ export interface HouseholdMemberRecord {

 export interface HouseholdBillingSettingsRecord {
  householdId: string
+  settlementCurrency: CurrencyCode
  rentAmountMinor: bigint | null
  rentCurrency: CurrencyCode
  rentDueDay: number
@@ -140,6 +141,7 @@ export interface HouseholdConfigurationRepository {
  getHouseholdBillingSettings(householdId: string): Promise<HouseholdBillingSettingsRecord>
  updateHouseholdBillingSettings(input: {
    householdId: string
+    settlementCurrency?: CurrencyCode
    rentAmountMinor?: bigint | null
    rentCurrency?: CurrencyCode
    rentDueDay?: number
--- a/packages/ports/src/index.ts
+++ b/packages/ports/src/index.ts
@@ -30,6 +30,7 @@ export type {
 } from './anonymous-feedback'
 export type {
  FinanceCycleRecord,
+  FinanceCycleExchangeRateRecord,
  FinanceMemberRecord,
  FinanceParsedPurchaseRecord,
  FinanceRentRuleRecord,
@@ -38,6 +39,7 @@ export type {
  SettlementSnapshotLineRecord,
  SettlementSnapshotRecord
 } from './finance'
+export type { ExchangeRateProvider, ExchangeRateQuote } from './exchange-rates'
 export {
  TELEGRAM_PENDING_ACTION_TYPES,
  type TelegramPendingActionRecord,
--- a/scripts/e2e/billing-flow.ts
+++ b/scripts/e2e/billing-flow.ts
@@ -9,6 +9,7 @@ import {
  createDbHouseholdConfigurationRepository
 } from '@household/adapters-db'
 import { createDbClient, schema } from '@household/db'
+import type { ExchangeRateProvider } from '@household/ports'

 import { createTelegramBot } from '../../apps/bot/src/bot'
 import { createFinanceCommandsService } from '../../apps/bot/src/finance-commands'
@@ -20,6 +21,27 @@ import {
 const chatId = '-100123456'
 const purchaseTopicId = 77
 const commandChatIdNumber = -100123456
+const exchangeRateProvider: ExchangeRateProvider = {
+  async getRate(input) {
+    if (input.baseCurrency === input.quoteCurrency) {
+      return {
+        baseCurrency: input.baseCurrency,
+        quoteCurrency: input.quoteCurrency,
+        rateMicros: 1_000_000n,
+        effectiveDate: input.effectiveDate,
+        source: 'nbg'
+      }
+    }
+
+    return {
+      baseCurrency: input.baseCurrency,
+      quoteCurrency: input.quoteCurrency,
+      rateMicros: 2_700_000n,
+      effectiveDate: input.effectiveDate,
+      source: 'nbg'
+    }
+  }
+}

 function unixSeconds(year: number, month: number, day: number): number {
  return Math.floor(Date.UTC(year, month - 1, day, 12, 0, 0) / 1000)
@@ -188,7 +210,12 @@ async function run(): Promise<void> {
    ingestionClient = createPurchaseMessageRepository(databaseUrl)
    financeRepositoryClient = createDbFinanceRepository(databaseUrl, ids.household)
    householdConfigurationRepositoryClient = createDbHouseholdConfigurationRepository(databaseUrl)
-    const financeService = createFinanceCommandService(financeRepositoryClient.repository)
+    const financeService = createFinanceCommandService({
+      householdId: ids.household,
+      repository: financeRepositoryClient.repository,
+      householdConfigurationRepository: householdConfigurationRepositoryClient.repository,
+      exchangeRateProvider
+    })
    const financeCommands = createFinanceCommandsService({
      householdConfigurationRepository: householdConfigurationRepositoryClient.repository,
      financeServiceForHousehold: () => financeService